From 0fd4a678c2218c42d383e964a6b4aca975aa7b7a Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期一, 02 十二月 2024 14:32:51 +0800
Subject: [PATCH] 图表修改
---
WinFrmUI/Yw.WinFrmUI.Phart.Core/Yw.WinFrmUI.Phart.Core.csproj | 85 +++++++++++++++++++++++-------------------
1 files changed, 46 insertions(+), 39 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Phart.Core/Yw.WinFrmUI.Phart.Core.csproj b/WinFrmUI/Yw.WinFrmUI.Phart.Core/Yw.WinFrmUI.Phart.Core.csproj
index af08578..0b4b7c3 100644
--- a/WinFrmUI/Yw.WinFrmUI.Phart.Core/Yw.WinFrmUI.Phart.Core.csproj
+++ b/WinFrmUI/Yw.WinFrmUI.Phart.Core/Yw.WinFrmUI.Phart.Core.csproj
@@ -9,25 +9,25 @@
<ItemGroup>
<Compile Remove="v1 - 澶嶅埗\**" />
- <Compile Remove="v1\01-perform\01-pump-chart\05-import\**" />
+ <Compile Remove="v2\02-pump\05-import\**" />
<Compile Remove="v1\01-perform\01-cubic\**" />
<Compile Remove="bak\**" />
<Compile Remove="v2\01-base\01-single\**" />
<Compile Remove="v2\01-base\02-multi\**" />
<EmbeddedResource Remove="v1 - 澶嶅埗\**" />
- <EmbeddedResource Remove="v1\01-perform\01-pump-chart\05-import\**" />
+ <EmbeddedResource Remove="v2\02-pump\05-import\**" />
<EmbeddedResource Remove="v1\01-perform\01-cubic\**" />
<EmbeddedResource Remove="bak\**" />
<EmbeddedResource Remove="v2\01-base\01-single\**" />
<EmbeddedResource Remove="v2\01-base\02-multi\**" />
<None Remove="v1 - 澶嶅埗\**" />
- <None Remove="v1\01-perform\01-pump-chart\05-import\**" />
+ <None Remove="v2\02-pump\05-import\**" />
<None Remove="v1\01-perform\01-cubic\**" />
<None Remove="bak\**" />
<None Remove="v2\01-base\01-single\**" />
<None Remove="v2\01-base\02-multi\**" />
<Page Remove="v1 - 澶嶅埗\**" />
- <Page Remove="v1\01-perform\01-pump-chart\05-import\**" />
+ <Page Remove="v2\02-pump\05-import\**" />
<Page Remove="v1\01-perform\01-cubic\**" />
<Page Remove="bak\**" />
<Page Remove="v2\01-base\01-single\**" />
@@ -46,8 +46,15 @@
<Compile Remove="v1\01-perform\01-pump-chart\XtrPerform2dChart - 澶嶅埗.cs" />
<Compile Remove="v1\01-perform\01-pump-chart\XtrPerform2dChart - 澶嶅埗.Designer.cs" />
<Compile Remove="Title - 澶嶅埗.cs" />
- <Compile Remove="v2\02-pump\01-view\PumpVariableSpeedChart1.cs" />
- <Compile Remove="v2\02-pump\01-view\PumpVariableSpeedChart1.Designer.cs" />
+ <Compile Remove="v2\02-pump\01-chart\PumpParallelChart - 澶嶅埗.cs" />
+ <Compile Remove="v2\02-pump\01-chart\PumpParallelChart - 澶嶅埗.Designer.cs" />
+ <Compile Remove="v2\02-pump\01-chart\PumpVariableSpeedChart1.cs" />
+ <Compile Remove="v2\02-pump\01-chart\PumpVariableSpeedChart1.Designer.cs" />
+ <Compile Remove="v2\02-pump\02-ctrl\PumpParallelChartCtrl.cs" />
+ <Compile Remove="v2\02-pump\02-ctrl\PumpParallelChartCtrl.Designer.cs" />
+ <Compile Remove="v2\02-pump\02-ctrl\PumpParallelInfoCtrl.cs" />
+ <Compile Remove="v2\02-pump\02-ctrl\PumpParallelInfoCtrl.Designer.cs" />
+ <Compile Remove="v2\02-pump\99-viewmodel\PumpChartViewModel.cs" />
<Compile Remove="v2\02-pump\99-viewmodel\PumpWorkingInfoViewModel - 澶嶅埗.cs" />
<Compile Remove="v2\02-pump\99-viewmodel\PumpWorkingViewModel - 澶嶅埗.cs" />
</ItemGroup>
@@ -58,38 +65,41 @@
<EmbeddedResource Remove="v1\01-perform\01-pump-chart\01-chart\XtrPerform2dChartUpdate.resx" />
<EmbeddedResource Remove="v1\01-perform\01-pump-chart\03-chart-view\XtrPerform2dViewDlg.resx" />
<EmbeddedResource Remove="v1\01-perform\01-pump-chart\XtrPerform2dChart - 澶嶅埗.resx" />
- <EmbeddedResource Remove="v2\02-pump\01-view\PumpVariableSpeedChart1.resx" />
+ <EmbeddedResource Remove="v2\02-pump\01-chart\PumpParallelChart - 澶嶅埗.resx" />
+ <EmbeddedResource Remove="v2\02-pump\01-chart\PumpVariableSpeedChart1.resx" />
+ <EmbeddedResource Remove="v2\02-pump\02-ctrl\PumpParallelChartCtrl.resx" />
+ <EmbeddedResource Remove="v2\02-pump\02-ctrl\PumpParallelInfoCtrl.resx" />
</ItemGroup>
<ItemGroup>
- <Compile Include="v1\01-perform\01-pump-chart\05-import\01-excel\ImportPumpPerform2dByExcelCtrl.cs" />
- <Compile Include="v1\01-perform\01-pump-chart\05-import\01-excel\ImportPumpPerform2dByExcelCtrl.designer.cs" />
- <Compile Include="v1\01-perform\01-pump-chart\05-import\01-excel\ImportPumpPerform2dByExcelDlg.cs" />
- <Compile Include="v1\01-perform\01-pump-chart\05-import\01-excel\ImportPumpPerform2dByExcelDlg.Designer.cs" />
- <Compile Include="v1\01-perform\01-pump-chart\05-import\02-picture\CurvePictureBoxCtrl.cs" />
- <Compile Include="v1\01-perform\01-pump-chart\05-import\02-picture\curvePictureBoxCtrl.Designer.cs" />
- <Compile Include="v1\01-perform\01-pump-chart\05-import\02-picture\ImportPumpPerform2dByPictureCtrl.cs" />
- <Compile Include="v1\01-perform\01-pump-chart\05-import\02-picture\ImportPumpPerform2dByPictureCtrl.Designer.cs" />
- <Compile Include="v1\01-perform\01-pump-chart\05-import\02-picture\ImportPumpPerform2dByPictureDlg.cs" />
- <Compile Include="v1\01-perform\01-pump-chart\05-import\02-picture\ImportPumpPerform2dByPictureDlg.Designer.cs" />
- <Compile Include="v1\01-perform\01-pump-chart\05-import\02-picture\PickEqupPointDlg.cs" />
- <Compile Include="v1\01-perform\01-pump-chart\05-import\02-picture\PickEqupPointDlg.designer.cs" />
- <Compile Include="v1\01-perform\01-pump-chart\05-import\03-one-point\ImportPumpPerform2dByOnePointCtrl.cs" />
- <Compile Include="v1\01-perform\01-pump-chart\05-import\03-one-point\ImportPumpPerform2dByOnePointCtrl.designer.cs" />
- <Compile Include="v1\01-perform\01-pump-chart\05-import\03-one-point\ImportPumpPerform2dByOnePointDlg.cs" />
- <Compile Include="v1\01-perform\01-pump-chart\05-import\03-one-point\ImportPumpPerform2dByOnePointDlg.Designer.cs" />
+ <Compile Include="v2\02-pump\05-import\01-excel\PumpImportByExcelCtrl.cs" />
+ <Compile Include="v2\02-pump\05-import\01-excel\PumpImportByExcelCtrl.designer.cs" />
+ <Compile Include="v2\02-pump\05-import\01-excel\PumpImportByExcelDlg.cs" />
+ <Compile Include="v2\02-pump\05-import\01-excel\PumpImportByExcelDlg.Designer.cs" />
+ <Compile Include="v2\02-pump\05-import\02-picture\PumpPictureBoxCtrl.cs" />
+ <Compile Include="v2\02-pump\05-import\02-picture\PumpPictureBoxCtrl.Designer.cs" />
+ <Compile Include="v2\02-pump\05-import\02-picture\PumpImportByPictureCtrl.cs" />
+ <Compile Include="v2\02-pump\05-import\02-picture\PumpImportByPictureCtrl.Designer.cs" />
+ <Compile Include="v2\02-pump\05-import\02-picture\PumpImportByPictureDlg.cs" />
+ <Compile Include="v2\02-pump\05-import\02-picture\PumpImportByPictureDlg.Designer.cs" />
+ <Compile Include="v2\02-pump\05-import\02-picture\PickEqupPointDlg.cs" />
+ <Compile Include="v2\02-pump\05-import\02-picture\PickEqupPointDlg.designer.cs" />
+ <Compile Include="v2\02-pump\05-import\03-one-point\PumpImportByOnePointCtrl.cs" />
+ <Compile Include="v2\02-pump\05-import\03-one-point\PumpImportByOnePointCtrl.designer.cs" />
+ <Compile Include="v2\02-pump\05-import\03-one-point\PumpImportByOnePointDlg.cs" />
+ <Compile Include="v2\02-pump\05-import\03-one-point\PumpImportByOnePointDlg.Designer.cs" />
</ItemGroup>
<ItemGroup>
- <EmbeddedResource Include="v1\01-perform\01-pump-chart\05-import\01-excel\ImportPumpPerform2dByExcelCtrl.en-US.resx" />
- <EmbeddedResource Include="v1\01-perform\01-pump-chart\05-import\01-excel\ImportPumpPerform2dByExcelCtrl.resx" />
- <EmbeddedResource Include="v1\01-perform\01-pump-chart\05-import\01-excel\ImportPumpPerform2dByExcelDlg.resx" />
- <EmbeddedResource Include="v1\01-perform\01-pump-chart\05-import\02-picture\CurvePictureBoxCtrl.resx" />
- <EmbeddedResource Include="v1\01-perform\01-pump-chart\05-import\02-picture\ImportPumpPerform2dByPictureCtrl.resx" />
- <EmbeddedResource Include="v1\01-perform\01-pump-chart\05-import\02-picture\ImportPumpPerform2dByPictureDlg.resx" />
- <EmbeddedResource Include="v1\01-perform\01-pump-chart\05-import\02-picture\PickEqupPointDlg.resx" />
- <EmbeddedResource Include="v1\01-perform\01-pump-chart\05-import\03-one-point\ImportPumpPerform2dByOnePointCtrl.resx" />
- <EmbeddedResource Include="v1\01-perform\01-pump-chart\05-import\03-one-point\ImportPumpPerform2dByOnePointDlg.resx" />
+ <EmbeddedResource Include="v2\02-pump\05-import\01-excel\PumpImportByExcelCtrl.en-US.resx" />
+ <EmbeddedResource Include="v2\02-pump\05-import\01-excel\PumpImportByExcelCtrl.resx" />
+ <EmbeddedResource Include="v2\02-pump\05-import\01-excel\PumpImportByExcelDlg.resx" />
+ <EmbeddedResource Include="v2\02-pump\05-import\02-picture\PumpPictureBoxCtrl.resx" />
+ <EmbeddedResource Include="v2\02-pump\05-import\02-picture\PumpImportByPictureCtrl.resx" />
+ <EmbeddedResource Include="v2\02-pump\05-import\02-picture\PumpImportByPictureDlg.resx" />
+ <EmbeddedResource Include="v2\02-pump\05-import\02-picture\PickEqupPointDlg.resx" />
+ <EmbeddedResource Include="v2\02-pump\05-import\03-one-point\PumpImportByOnePointCtrl.resx" />
+ <EmbeddedResource Include="v2\02-pump\05-import\03-one-point\PumpImportByOnePointDlg.resx" />
</ItemGroup>
<ItemGroup>
@@ -121,22 +131,19 @@
<Compile Update="v1\01-perform\01-pump-chart\01-chart\02-perform-compare(浣滃簾)\PumpPerformCompareInfoCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="v1\01-perform\01-pump-chart\01-chart\03-serial-parallel\PumpParallelInfoCtrl.cs">
+ <Compile Update="v2\02-pump\01-chart\PumpWorkChart.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="v2\02-pump\01-view\PumpWorkChart.cs">
+ <Compile Update="v2\02-pump\01-chart\PumpWorkComparisonChart.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="v2\02-pump\01-view\PumpWorkComparisonChart.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="v2\02-pump\01-view\PumpVariableSpeedChart.cs">
+ <Compile Update="v2\02-pump\01-chart\PumpVariableSpeedChart.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Update="v1\01-perform\01-pump-chart\01-chart\04-variable-speed\PumpVariableSpeedInfoCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="v2\02-pump\01-view\PumpParallelChart.cs">
+ <Compile Update="v2\02-pump\01-chart\PumpParallelChart.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Update="v1\01-perform\01-pump-chart\01-chart\03-serial-parallel\PumpSingleSerialParallelInfoCtrl.cs">
--
Gitblit v1.9.3