From af0210797c179449a6d91480ee7c31461dbf65c9 Mon Sep 17 00:00:00 2001
From: gekoukate <1670391937@qq.com>
Date: Thu, 10 Aug 2023 20:17:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=85=8D=E7=BD=AE=E9=80=9A?=
 =?UTF-8?q?=E9=81=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ViewModels/ChartPlotRealDataViewModel.cs                | 2 +-
 StartServerWPF.sln                                          | 6 +++---
 mseedC/mseedC.vcxproj                                       | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/StartServerWPF.Modules.MseedChart/ViewModels/ChartPlotRealDataViewModel.cs b/StartServerWPF.Modules.MseedChart/ViewModels/ChartPlotRealDataViewModel.cs
index 74e02a8..6496f78 100644
--- a/StartServerWPF.Modules.MseedChart/ViewModels/ChartPlotRealDataViewModel.cs
+++ b/StartServerWPF.Modules.MseedChart/ViewModels/ChartPlotRealDataViewModel.cs
@@ -262,7 +262,7 @@ namespace StartServerWPF.Modules.MseedChart.ViewModels
         Dictionary<string,int> subNameList;
         private void Loaded()
         {
-            string station = "N05";//,N07,N08,N09,N10,N11,N12,N13,N14,N15,N16,N17,N18,N19,N20,N21,N22,N23,N24,N25,N26,N27";
+            string station = "N02,N05,N06,N08,N09,N10,N11,N12,N13,N14,N15,N16,N19,N20,N22,N23,N24,N25,N26";//,N07,N08,N09,N10,N11,N12,N13,N14,N15,N16,N17,N18,N19,N20,N21,N22,N23,N24,N25,N26,N27";
             var stations = station.Split(',');
             smList = _wavesModel.ReadWavesFromJson(stations);               
         }
diff --git a/StartServerWPF.sln b/StartServerWPF.sln
index 994435a..d890b79 100644
--- a/StartServerWPF.sln
+++ b/StartServerWPF.sln
@@ -11,7 +11,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartServerWPF.Assets", "St
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mseedC", "mseedC\mseedC.vcxproj", "{69F6D457-8FC8-440D-B390-8D7D76D88C05}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartServerWPF.Modules.Main", "StartServerWPF.Modules.Main\StartServerWPF.Modules.Main.csproj", "{9A6AF364-195E-4017-9CF8-D3E59928D124}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StartServerWPF.Modules.Main", "StartServerWPF.Modules.Main\StartServerWPF.Modules.Main.csproj", "{9A6AF364-195E-4017-9CF8-D3E59928D124}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -79,8 +79,8 @@ Global
 		{9A6AF364-195E-4017-9CF8-D3E59928D124}.Debug|x86.Build.0 = Debug|Any CPU
 		{9A6AF364-195E-4017-9CF8-D3E59928D124}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9A6AF364-195E-4017-9CF8-D3E59928D124}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9A6AF364-195E-4017-9CF8-D3E59928D124}.Release|x64.ActiveCfg = Release|Any CPU
-		{9A6AF364-195E-4017-9CF8-D3E59928D124}.Release|x64.Build.0 = Release|Any CPU
+		{9A6AF364-195E-4017-9CF8-D3E59928D124}.Release|x64.ActiveCfg = Release|x64
+		{9A6AF364-195E-4017-9CF8-D3E59928D124}.Release|x64.Build.0 = Release|x64
 		{9A6AF364-195E-4017-9CF8-D3E59928D124}.Release|x86.ActiveCfg = Release|Any CPU
 		{9A6AF364-195E-4017-9CF8-D3E59928D124}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
diff --git a/mseedC/mseedC.vcxproj b/mseedC/mseedC.vcxproj
index 1fcca6c..3b2a001 100644
--- a/mseedC/mseedC.vcxproj
+++ b/mseedC/mseedC.vcxproj
@@ -80,7 +80,7 @@
     <OutDir>..\ConsoleApp\bin\Debug</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>..\StartServerWPF.Start\bin\x64\Debug</OutDir>
+    <OutDir>$(SolutionDir)StartServer\bin\$(IntDir)net6.0-windows</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -119,12 +119,12 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;NOFDZIP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>H:\mzhifa\txgy\Txgy.WebSocket\StartServerWPF\mseedC\libmseed;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)\libmseed;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>H:\mzhifa\txgy\Txgy.WebSocket\StartServerWPF\mseedC\libmseed;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(ProjectDir)\libmseed;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>libmseed.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>