cloudflight
2024-05-04 e2d9a5985c505e9b992770641b0a13099fa08861
合并工具项目
已删除11个文件
已修改4个文件
836 ■■■■ 文件已修改
Hydro.ClientTool/Form1.Designer.cs 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Hydro.ClientTool/Form1.resx 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Hydro.ClientTool/Hydro.ClientTool.csproj 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HydroV1.1.sln 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Test/App.config 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Test/Form1.Designer.cs 75 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Test/Form1.cs 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Test/Form1.resx 168 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Test/Program.cs 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Test/Properties/AssemblyInfo.cs 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Test/Properties/Resources.Designer.cs 71 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Test/Properties/Resources.resx 117 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Test/Properties/Settings.Designer.cs 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Test/Properties/Settings.settings 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Test/Test.csproj 131 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Hydro.ClientTool/Form1.Designer.cs
@@ -28,25 +28,38 @@
        /// </summary>
        private void InitializeComponent()
        {
            this.button1 = new System.Windows.Forms.Button();
            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1));
            this.mapViewer1 = new Hydro.MapUI.MapViewer();
            this.SuspendLayout();
            // 
            // button1
            // mapViewer1
            // 
            this.button1.Location = new System.Drawing.Point(79, 95);
            this.button1.Name = "button1";
            this.button1.Size = new System.Drawing.Size(75, 23);
            this.button1.TabIndex = 0;
            this.button1.Text = "button1";
            this.button1.UseVisualStyleBackColor = true;
            this.button1.Click += new System.EventHandler(this.button1_Click);
            this.mapViewer1._IsEditMode = true;
            this.mapViewer1._newTemplate = ((Hydro.MapView.Template)(resources.GetObject("mapViewer1._newTemplate")));
            this.mapViewer1._ShowJunction = true;
            this.mapViewer1._ShowValve = true;
            this.mapViewer1._Template = null;
            this.mapViewer1.BackColor = System.Drawing.Color.Transparent;
            this.mapViewer1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.mapViewer1.junction_multiply = 1F;
            this.mapViewer1.Link_multiply = 1F;
            this.mapViewer1.Location = new System.Drawing.Point(0, 0);
            this.mapViewer1.MapCenter = ((System.Drawing.PointF)(resources.GetObject("mapViewer1.MapCenter")));
            this.mapViewer1.Name = "mapViewer1";
            this.mapViewer1.Rotation = 0D;
            this.mapViewer1.RotationF = 90D;
            this.mapViewer1.ShowStatusBar = true;
            this.mapViewer1.showToolBar = false;
            this.mapViewer1.Size = new System.Drawing.Size(800, 450);
            this.mapViewer1.TabIndex = 1;
            this.mapViewer1.zoom = 1F;
            // 
            // Form1
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.ClientSize = new System.Drawing.Size(800, 450);
            this.Controls.Add(this.button1);
            this.Controls.Add(this.mapViewer1);
            this.Name = "Form1";
            this.Text = "Form1";
            this.Load += new System.EventHandler(this.Form1_Load);
@@ -56,7 +69,7 @@
        #endregion
        private System.Windows.Forms.Button button1;
        private MapUI.MapViewer mapViewer1;
    }
}
Hydro.ClientTool/Form1.resx
@@ -117,4 +117,52 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <data name="mapViewer1._newTemplate" mimetype="application/x-microsoft.net.object.binary.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAERIeWRyby5NYXBWaWV3LCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1
        cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbAwDAAAAUVN5c3RlbS5EcmF3aW5nLCBWZXJzaW9u
        PTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49YjAzZjVmN2YxMWQ1MGEzYQwE
        AAAAkwFIeWRyby5NYXBWaWV3LCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGlj
        S2V5VG9rZW49bnVsbF1dLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWws
        IFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAABZIeWRyby5NYXBWaWV3LlRlbXBsYXRl
        GQAAAANfSUQVPE5hbWU+a19fQmFja2luZ0ZpZWxkGjxtYXBPcHRpb24+a19fQmFja2luZ0ZpZWxkCV9m
        aWxlUGF0aBc8T2ZmU2V0PmtfX0JhY2tpbmdGaWVsZA5CYWNrR3JvdW5kRWxldg5CYWNrR3JvdW5kSW1n
        WA5CYWNrR3JvdW5kSW1nWRNCYWNrR3JvdW5kSW1nSGVpZ2h0EkJhY2tHcm91bmRJbWdXaWR0aBZCYWNr
        R3JvdW5kSW1nUm90YUFuZ2xlEEJhY2tHcm91bmRQb2ludDEQQmFja0dyb3VuZFBvaW50MiA8SW1wb3J0
        RXhjZWxQYXRoPmtfX0JhY2tpbmdGaWVsZCE8SW1wb3J0RXhjZWxJbmRleD5rX19CYWNraW5nRmllbGQZ
        PE1heExldmVsPmtfX0JhY2tpbmdGaWVsZBU8VHlwZT5rX19CYWNraW5nRmllbGQYPFJlZ2lvbnM+a19f
        QmFja2luZ0ZpZWxkFjxOb2RlMT5rX19CYWNraW5nRmllbGQWPE5vZGUyPmtfX0JhY2tpbmdGaWVsZBI8
        WD5rX19CYWNraW5nRmllbGQSPFk+a19fQmFja2luZ0ZpZWxkGDxWaXNpYmxlPmtfX0JhY2tpbmdGaWVs
        ZBU8dmlldz5rX19CYWNraW5nRmllbGQYPENvbG91cnM+a19fQmFja2luZ0ZpZWxkAQEEAQQAAAAAAAAE
        BAEAAAQEAQEBAQEEBBdIeWRyby5NYXBWaWV3Lk1hcE9wdGlvbgIAAAAWSHlkcm8uTWFwVmlldy5Qb2lu
        dEYzRAIAAAALCwsLCwsVU3lzdGVtLkRyYXdpbmcuUG9pbnRGAwAAABVTeXN0ZW0uRHJhd2luZy5Qb2lu
        dEYDAAAACAgmSHlkcm8uTWFwVmlldy5NYXBWaWV3RW51bStUZW1wbGF0ZVR5cGUCAAAAOFN5c3RlbS5D
        b2xsZWN0aW9ucy5HZW5lcmljLkxpc3RgMVtbSHlkcm8uTWFwVmlldy5UUmVnaW9uBAAAABtIeWRyby5N
        YXBWaWV3Lk1hcERpbWVuc2lvbnMCAAAAN1N5c3RlbS5Db2xsZWN0aW9ucy5HZW5lcmljLkxpc3RgMVtb
        SHlkcm8uTWFwVmlldy5Db2xvdXIEAAAAAgAAAAYFAAAAJDAwMDAwMDAwLTAwMDAtMDAwMC0wMDAwLTAw
        MDAwMDAwMDAwMAYGAAAABuS4tOaXtgkHAAAACgkIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABff/
        //8VU3lzdGVtLkRyYXdpbmcuUG9pbnRGAgAAAAF4AXkAAAsLAwAAAAAAAAAAAAAAAfb////3////AAAA
        AAAAAAAKAAAAAGMAAAAF9f///yZIeWRyby5NYXBWaWV3Lk1hcFZpZXdFbnVtK1RlbXBsYXRlVHlwZQEA
        AAAHdmFsdWVfXwAIAgAAAAAAAAAJDAAAAAoKCgoKCgkNAAAABQcAAAAXSHlkcm8uTWFwVmlldy5NYXBP
        cHRpb24GAAAAHjxMaW5rX211bHRpcGx5PmtfX0JhY2tpbmdGaWVsZCI8anVuY3Rpb25fbXVsdGlwbHk+
        a19fQmFja2luZ0ZpZWxkGzxfU2hvd1ZhbHZlPmtfX0JhY2tpbmdGaWVsZB48X1Nob3dKdW5jdGlvbj5r
        X19CYWNraW5nRmllbGQcPF9TaG93U3RhdHVzPmtfX0JhY2tpbmdGaWVsZCM8X1Nob3dGbG93RGlyZWN0
        aW9uPmtfX0JhY2tpbmdGaWVsZAAAAAAAAAsLAQEBAQIAAADarCo/AACAPwEBAAAFCAAAABZIeWRyby5N
        YXBWaWV3LlBvaW50RjNEAwAAABI8WD5rX19CYWNraW5nRmllbGQSPFk+a19fQmFja2luZ0ZpZWxkEjxa
        PmtfX0JhY2tpbmdGaWVsZAAAAAsLCwIAAAAAAAAAAAAAAAAAAAAFDAAAADhTeXN0ZW0uQ29sbGVjdGlv
        bnMuR2VuZXJpYy5MaXN0YDFbW0h5ZHJvLk1hcFZpZXcuVFJlZ2lvbgMAAAAGX2l0ZW1zBV9zaXplCF92
        ZXJzaW9uBAAAF0h5ZHJvLk1hcFZpZXcuVFJlZ2lvbltdAgAAAAgIBAAAAAkOAAAAAAAAAAAAAAAFDQAA
        ADdTeXN0ZW0uQ29sbGVjdGlvbnMuR2VuZXJpYy5MaXN0YDFbW0h5ZHJvLk1hcFZpZXcuQ29sb3VyAwAA
        AAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAWSHlkcm8uTWFwVmlldy5Db2xvdXJbXQIAAAAICAQAAAAJ
        DwAAAAAAAAAAAAAABw4AAAAAAQAAAAAAAAAEFUh5ZHJvLk1hcFZpZXcuVFJlZ2lvbgIAAAAHDwAAAAAB
        AAAAAAAAAAQUSHlkcm8uTWFwVmlldy5Db2xvdXICAAAACw==
</value>
  </data>
  <data name="mapViewer1.MapCenter" mimetype="application/x-microsoft.net.object.binary.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFFTeXN0ZW0uRHJhd2luZywgVmVyc2lvbj00LjAuMC4wLCBDdWx0
        dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWIwM2Y1ZjdmMTFkNTBhM2EFAQAAABVTeXN0ZW0uRHJh
        d2luZy5Qb2ludEYCAAAAAXgBeQAACwsCAAAAAAAAAAAAAAAL
</value>
  </data>
</root>
Hydro.ClientTool/Hydro.ClientTool.csproj
@@ -22,6 +22,7 @@
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <PlatformTarget>AnyCPU</PlatformTarget>
@@ -80,14 +81,50 @@
    <None Include="App.config" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\Hydraulic\Hydro.CodeProvider\Hydro.CodeProvider.csproj">
      <Project>{791f7359-a30d-4401-b712-0e8e841840d9}</Project>
      <Name>Hydro.CodeProvider</Name>
    </ProjectReference>
    <ProjectReference Include="..\Hydraulic\Hydro.CommonBase\Hydro.CommonBase.csproj">
      <Project>{84e17ba3-ba03-43c1-9d19-8ce64508f2b5}</Project>
      <Name>Hydro.CommonBase</Name>
    </ProjectReference>
    <ProjectReference Include="..\Hydraulic\Hydro.ConfigModel\Hydro.ConfigModel.csproj">
      <Project>{5f33ce64-2329-422c-9dda-903ceef25a6e}</Project>
      <Name>Hydro.ConfigModel</Name>
    </ProjectReference>
    <ProjectReference Include="..\Hydraulic\Hydro.Core\Hydro.Core.csproj">
      <Project>{ca211620-16a7-4953-929d-723a5f9d3239}</Project>
      <Name>Hydro.Core</Name>
    </ProjectReference>
    <ProjectReference Include="..\Hydraulic\Hydro.HydraulicCore\HydraulicCore.vcxproj">
      <Project>{d2b8356f-0ea6-4167-8119-57b3e49a55cf}</Project>
      <Name>Hydro.HydraulicCore</Name>
    </ProjectReference>
    <ProjectReference Include="..\Hydraulic\Hydro.HydraulicModel\Hydro.HydraulicModel.csproj">
      <Project>{d66081c0-21b2-4b2a-a4ad-dae293271972}</Project>
      <Name>Hydro.HydraulicModel</Name>
    </ProjectReference>
    <ProjectReference Include="..\Hydraulic\Hydro.HydraulicOptimizer\Hydro.HydraulicOptimizer.csproj">
      <Project>{0f5c43e6-97ba-457c-954d-62eab47a38a9}</Project>
      <Name>Hydro.HydraulicOptimizer</Name>
    </ProjectReference>
    <ProjectReference Include="..\Hydraulic\Hydro.Inp2.2\Hydro.Inp2.2.csproj">
      <Project>{fffbe974-ba86-420d-aa27-6db215017c8c}</Project>
      <Name>Hydro.Inp2.2</Name>
    </ProjectReference>
    <ProjectReference Include="..\Hydraulic\Hydro.MapUI\Hydro.MapUI.csproj">
      <Project>{50a0264a-17c1-4132-bf90-91e4ba593c88}</Project>
      <Name>Hydro.MapUI</Name>
    </ProjectReference>
    <ProjectReference Include="..\Hydraulic\Hydro.MapView\Hydro.MapView.csproj">
      <Project>{18e2e3d7-508e-4781-a760-ba852564e409}</Project>
      <Name>Hydro.MapView</Name>
    </ProjectReference>
    <ProjectReference Include="..\Hydraulic\Hydro.Revit2022\Hydro.Revit2022.csproj">
      <Project>{78653bed-368a-470d-a021-929f2e583313}</Project>
      <Name>Hydro.Revit2022</Name>
    </ProjectReference>
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
HydroV1.1.sln
@@ -29,8 +29,6 @@
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hydro.HydraulicOptimizer", "Hydraulic\Hydro.HydraulicOptimizer\Hydro.HydraulicOptimizer.csproj", "{0F5C43E6-97BA-457C-954D-62EAB47A38A9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test", "Test\Test.csproj", "{AB9E43B0-B848-417E-85C3-B350062F1B20}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hydro.ClientTool", "Hydro.ClientTool\Hydro.ClientTool.csproj", "{A87A91DE-3A66-4305-8C4D-61927C4F2D4F}"
EndProject
Global
@@ -382,36 +380,6 @@
        {0F5C43E6-97BA-457C-954D-62EAB47A38A9}.Release|x64.Build.0 = Release|Any CPU
        {0F5C43E6-97BA-457C-954D-62EAB47A38A9}.Release|x86.ActiveCfg = Release|Any CPU
        {0F5C43E6-97BA-457C-954D-62EAB47A38A9}.Release|x86.Build.0 = Release|Any CPU
        {AB9E43B0-B848-417E-85C3-B350062F1B20}.Debug_new|Any CPU.ActiveCfg = Debug|Any CPU
        {AB9E43B0-B848-417E-85C3-B350062F1B20}.Debug_new|Any CPU.Build.0 = Debug|Any CPU
        {AB9E43B0-B848-417E-85C3-B350062F1B20}.Debug_new|x64.ActiveCfg = Debug|Any CPU
        {AB9E43B0-B848-417E-85C3-B350062F1B20}.Debug_new|x64.Build.0 = Debug|Any CPU
        {AB9E43B0-B848-417E-85C3-B350062F1B20}.Debug_new|x86.ActiveCfg = Debug|Any CPU
        {AB9E43B0-B848-417E-85C3-B350062F1B20}.Debug_new|x86.Build.0 = Debug|Any CPU
        {AB9E43B0-B848-417E-85C3-B350062F1B20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
        {AB9E43B0-B848-417E-85C3-B350062F1B20}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {AB9E43B0-B848-417E-85C3-B350062F1B20}.Debug|x64.ActiveCfg = Debug|Any CPU
        {AB9E43B0-B848-417E-85C3-B350062F1B20}.Debug|x64.Build.0 = Debug|Any CPU
        {AB9E43B0-B848-417E-85C3-B350062F1B20}.Debug|x86.ActiveCfg = Debug|Any CPU
        {AB9E43B0-B848-417E-85C3-B350062F1B20}.Debug|x86.Build.0 = Debug|Any CPU
        {AB9E43B0-B848-417E-85C3-B350062F1B20}.Debug1|Any CPU.ActiveCfg = Debug|Any CPU
        {AB9E43B0-B848-417E-85C3-B350062F1B20}.Debug1|Any CPU.Build.0 = Debug|Any CPU
        {AB9E43B0-B848-417E-85C3-B350062F1B20}.Debug1|x64.ActiveCfg = Debug|Any CPU
        {AB9E43B0-B848-417E-85C3-B350062F1B20}.Debug1|x64.Build.0 = Debug|Any CPU
        {AB9E43B0-B848-417E-85C3-B350062F1B20}.Debug1|x86.ActiveCfg = Debug|Any CPU
        {AB9E43B0-B848-417E-85C3-B350062F1B20}.Debug1|x86.Build.0 = Debug|Any CPU
        {AB9E43B0-B848-417E-85C3-B350062F1B20}.dll_test|Any CPU.ActiveCfg = Debug|Any CPU
        {AB9E43B0-B848-417E-85C3-B350062F1B20}.dll_test|Any CPU.Build.0 = Debug|Any CPU
        {AB9E43B0-B848-417E-85C3-B350062F1B20}.dll_test|x64.ActiveCfg = Debug|Any CPU
        {AB9E43B0-B848-417E-85C3-B350062F1B20}.dll_test|x64.Build.0 = Debug|Any CPU
        {AB9E43B0-B848-417E-85C3-B350062F1B20}.dll_test|x86.ActiveCfg = Debug|Any CPU
        {AB9E43B0-B848-417E-85C3-B350062F1B20}.dll_test|x86.Build.0 = Debug|Any CPU
        {AB9E43B0-B848-417E-85C3-B350062F1B20}.Release|Any CPU.ActiveCfg = Release|Any CPU
        {AB9E43B0-B848-417E-85C3-B350062F1B20}.Release|Any CPU.Build.0 = Release|Any CPU
        {AB9E43B0-B848-417E-85C3-B350062F1B20}.Release|x64.ActiveCfg = Release|Any CPU
        {AB9E43B0-B848-417E-85C3-B350062F1B20}.Release|x64.Build.0 = Release|Any CPU
        {AB9E43B0-B848-417E-85C3-B350062F1B20}.Release|x86.ActiveCfg = Release|Any CPU
        {AB9E43B0-B848-417E-85C3-B350062F1B20}.Release|x86.Build.0 = Release|Any CPU
        {A87A91DE-3A66-4305-8C4D-61927C4F2D4F}.Debug_new|Any CPU.ActiveCfg = Debug|Any CPU
        {A87A91DE-3A66-4305-8C4D-61927C4F2D4F}.Debug_new|Any CPU.Build.0 = Debug|Any CPU
        {A87A91DE-3A66-4305-8C4D-61927C4F2D4F}.Debug_new|x64.ActiveCfg = Debug|Any CPU
@@ -458,7 +426,6 @@
        {D2B8356F-0EA6-4167-8119-57B3E49A55CF} = {F976F42E-15B8-40BB-8132-80FBE0CAAD43}
        {D66081C0-21B2-4B2A-A4AD-DAE293271972} = {F976F42E-15B8-40BB-8132-80FBE0CAAD43}
        {0F5C43E6-97BA-457C-954D-62EAB47A38A9} = {F976F42E-15B8-40BB-8132-80FBE0CAAD43}
        {AB9E43B0-B848-417E-85C3-B350062F1B20} = {5B5DE24F-D205-4B5A-A439-8EA61C1B23C7}
    EndGlobalSection
    GlobalSection(ExtensibilityGlobals) = postSolution
        SolutionGuid = {04D92980-B7F3-4AC8-B744-D6A674322C27}
Test/App.config
文件已删除
Test/Form1.Designer.cs
文件已删除
Test/Form1.cs
文件已删除
Test/Form1.resx
文件已删除
Test/Program.cs
文件已删除
Test/Properties/AssemblyInfo.cs
文件已删除
Test/Properties/Resources.Designer.cs
文件已删除
Test/Properties/Resources.resx
文件已删除
Test/Properties/Settings.Designer.cs
文件已删除
Test/Properties/Settings.settings
文件已删除
Test/Test.csproj
文件已删除