改用ComponentOne V2019.1.3

Project.FLY.ThickHeatAnalyst.Fix/FLY.HeatingHelper.UI/FLY.HeatingHelper.UI.csproj

@@ -41,33 +41,33 @@
     <StartupObject />
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="C1.WPF.4, Version=4.0.20183.611, Culture=neutral, PublicKeyToken=2aa4ec5576d6c3ce, processorArchitecture=MSIL">
+    <Reference Include="C1.WPF.4.5.2, Version=4.5.20193.685, Culture=neutral, PublicKeyToken=2aa4ec5576d6c3ce, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>C:\Program Files (x86)\ComponentOne\WPF Edition\bin\v4\C1.WPF.4.dll</HintPath>
+      <HintPath>C:\Program Files (x86)\ComponentOne\WPF Edition\bin\v452\C1.WPF.4.5.2.dll</HintPath>
     </Reference>
-    <Reference Include="C1.WPF.C1Chart.4, Version=4.0.20183.611, Culture=neutral, PublicKeyToken=2aa4ec5576d6c3ce, processorArchitecture=MSIL">
+    <Reference Include="C1.WPF.C1Chart.4.5.2, Version=4.5.20193.685, Culture=neutral, PublicKeyToken=2aa4ec5576d6c3ce, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>C:\Program Files (x86)\ComponentOne\WPF Edition\bin\v4\C1.WPF.C1Chart.4.dll</HintPath>
+      <HintPath>C:\Program Files (x86)\ComponentOne\WPF Edition\bin\v452\C1.WPF.C1Chart.4.5.2.dll</HintPath>
     </Reference>
-    <Reference Include="C1.WPF.C1Chart.Extended.4, Version=4.0.20183.611, Culture=neutral, PublicKeyToken=2aa4ec5576d6c3ce, processorArchitecture=MSIL">
+    <Reference Include="C1.WPF.C1Chart.Extended.4.5.2, Version=4.5.20193.685, Culture=neutral, PublicKeyToken=2aa4ec5576d6c3ce, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>C:\Program Files (x86)\ComponentOne\WPF Edition\bin\v4\C1.WPF.C1Chart.Extended.4.dll</HintPath>
+      <HintPath>C:\Program Files (x86)\ComponentOne\WPF Edition\bin\v452\C1.WPF.C1Chart.Extended.4.5.2.dll</HintPath>
     </Reference>
-    <Reference Include="C1.WPF.C1Chart3D.4, Version=4.0.20183.611, Culture=neutral, PublicKeyToken=2aa4ec5576d6c3ce, processorArchitecture=MSIL">
+    <Reference Include="C1.WPF.C1Chart3D.4.5.2, Version=4.5.20193.685, Culture=neutral, PublicKeyToken=2aa4ec5576d6c3ce, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>C:\Program Files (x86)\ComponentOne\WPF Edition\bin\v4\C1.WPF.C1Chart3D.4.dll</HintPath>
+      <HintPath>C:\Program Files (x86)\ComponentOne\WPF Edition\bin\v452\C1.WPF.C1Chart3D.4.5.2.dll</HintPath>
     </Reference>
-    <Reference Include="C1.WPF.DX.4, Version=4.0.20183.611, Culture=neutral, PublicKeyToken=2aa4ec5576d6c3ce, processorArchitecture=MSIL">
+    <Reference Include="C1.WPF.DX.4.5.2, Version=4.5.20193.685, Culture=neutral, PublicKeyToken=2aa4ec5576d6c3ce, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>C:\Program Files (x86)\ComponentOne\WPF Edition\bin\v4\C1.WPF.DX.4.dll</HintPath>
+      <HintPath>C:\Program Files (x86)\ComponentOne\WPF Edition\bin\v452\C1.WPF.DX.4.5.2.dll</HintPath>
     </Reference>
-    <Reference Include="C1.WPF.Extended.4, Version=4.0.20183.611, Culture=neutral, PublicKeyToken=2aa4ec5576d6c3ce, processorArchitecture=MSIL">
+    <Reference Include="C1.WPF.Extended.4.5.2, Version=4.5.20193.685, Culture=neutral, PublicKeyToken=2aa4ec5576d6c3ce, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>C:\Program Files (x86)\ComponentOne\WPF Edition\bin\v4\C1.WPF.Extended.4.dll</HintPath>
+      <HintPath>C:\Program Files (x86)\ComponentOne\WPF Edition\bin\v452\C1.WPF.Extended.4.5.2.dll</HintPath>
     </Reference>
-    <Reference Include="C1.WPF.FlexGrid.4, Version=4.0.20183.611, Culture=neutral, PublicKeyToken=2aa4ec5576d6c3ce, processorArchitecture=MSIL">
+    <Reference Include="C1.WPF.FlexGrid.4.5.2, Version=4.5.20193.685, Culture=neutral, PublicKeyToken=2aa4ec5576d6c3ce, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>C:\Program Files (x86)\ComponentOne\WPF Edition\bin\v4\C1.WPF.FlexGrid.4.dll</HintPath>
+      <HintPath>C:\Program Files (x86)\ComponentOne\WPF Edition\bin\v452\C1.WPF.FlexGrid.4.5.2.dll</HintPath>
     </Reference>
     <Reference Include="LiveCharts, Version=0.9.7.0, Culture=neutral, PublicKeyToken=0bc1f845d1ebb8df, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

Project.FLY.ThickHeatAnalyst.Fix/FLY.HeatingHelper.UI/Properties/licenses.licx

-C1.WPF.C1Chart.C1Chart, C1.WPF.C1Chart.4
-C1.WPF.C1Chart.C1ChartLegend, C1.WPF.C1Chart.4
-C1.WPF.C1Chart3D.C1Chart3D, C1.WPF.C1Chart3D.4
-C1.WPF.C1Chart3D.C1Chart3DLegend, C1.WPF.C1Chart3D.4
-C1.WPF.Extended.C1PropertyGrid, C1.WPF.Extended.4
-C1.WPF.FlexGrid.C1FlexGrid, C1.WPF.FlexGrid.4
-C1.WPF.C1NumericBox, C1.WPF.4
+C1.WPF.C1Chart.C1Chart, C1.WPF.C1Chart.4.5.2
+C1.WPF.C1Chart.C1ChartLegend, C1.WPF.C1Chart.4.5.2
+C1.WPF.C1Chart3D.C1Chart3D, C1.WPF.C1Chart3D.4.5.2
+C1.WPF.C1Chart3D.C1Chart3DLegend, C1.WPF.C1Chart3D.4.5.2
+C1.WPF.Extended.C1PropertyGrid, C1.WPF.Extended.4.5.2
+C1.WPF.FlexGrid.C1FlexGrid, C1.WPF.FlexGrid.4.5.2
\ No newline at end of file

Project.FLY.ThickHeatAnalyst.Fix/FLY.HeatingHelper.UI/UIModule/UC_FramePicker.xaml

@@ -5,7 +5,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:FLY.HeatingHelper.UI.UIModule"
              xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf"
-             xmlns:c1c="clr-namespace:C1.WPF.C1Chart;assembly=C1.WPF.C1Chart.4"
+             xmlns:c1c="clr-namespace:C1.WPF.C1Chart;assembly=C1.WPF.C1Chart.4.5.2"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="600">
     <UserControl.Resources>