Skip to content

Commit

Permalink
mathnet package
Browse files Browse the repository at this point in the history
  • Loading branch information
tesar-tech committed Nov 22, 2021
1 parent f0dbf6b commit 66af6ce
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
7 changes: 6 additions & 1 deletion TremAn3.Core/TremAn3.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,12 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="MathNet.Numerics" Version="4.15.0" />
<PackageReference Include="MathNet.Numerics" Version="4.15.0" ExcludeAssets="All" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
</ItemGroup>

<ItemGroup>
<!-- https://github.com/mathnet/mathnet-numerics/issues/579 -->
<Reference Include="MathNet.Numerics.Ref" HintPath="$(NuGetPackageRoot)mathnet.numerics\4.15.0\lib\netstandard1.3\MathNet.Numerics.dll" />
</ItemGroup>
</Project>
3 changes: 2 additions & 1 deletion TremAn3/Views/MainPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
<VisualState.Setters>
<Setter Target="LandingGrid.Visibility" Value="Collapsed"/>
<Setter Target="MediaPlayback.Visibility" Value="Visible"/>
<Setter Target="PastMeasurements.Visibility" Value="Visible"/>
<!--<Setter Target="GridMediPlaybackAndPastMeasurements" Value="Visible"/>-->
<Setter Target="MediaPlayback.DrawingRectangle.Visibility" Value="Visible"/>
</VisualState.Setters>
Expand Down Expand Up @@ -84,7 +85,7 @@
<RowDefinition Height="{x:Bind helpers:StaticConverters.HeightOfMeasurementsInMainPage(ViewModel.PastMeasurementsViewModel.IsPastMeasurementsOpen), Mode=OneWay}"/>
</Grid.RowDefinitions>
<views:MediaPlaybackUc x:Name="MediaPlayback" Visibility="Collapsed"/>
<views:PastMeasurementsUc Grid.Row="1"/>
<views:PastMeasurementsUc x:Name="PastMeasurements" Visibility="Collapsed" Grid.Row="1"/>
</Grid>


Expand Down

0 comments on commit 66af6ce

Please sign in to comment.