From 33253a52aec998b1888fe845905ea4047737e9fd Mon Sep 17 00:00:00 2001
From: mzhifa <mzhifa@foxmail.com>
Date: Thu, 30 Mar 2023 23:42:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E6=BA=90?=
 =?UTF-8?q?=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mseedChart.MainModule/RegionNames.cs                   | 4 ++--
 mseedChart.MainModule/ViewModels/ChartPlotViewModel.cs | 4 ++--
 mseedChart.MainModule/mseedChart.MainModule.csproj     | 6 ------
 mseedChart.MainModule/packages.config                  | 2 ++
 mseedChart/mseedChart.csproj                           | 9 +++++++++
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/mseedChart.MainModule/RegionNames.cs b/mseedChart.MainModule/RegionNames.cs
index 3ad6d96..ab5b00b 100644
--- a/mseedChart.MainModule/RegionNames.cs
+++ b/mseedChart.MainModule/RegionNames.cs
@@ -11,10 +11,10 @@ namespace mseedChart.Core
     {
         public const string ContentRegion = "ContentRegion";
 
-        public static string MseedFilePath="D:\\EwsCache\\Mseed";
+        public static string MseedFilePath= AppDomain.CurrentDomain.BaseDirectory + "EwsCache\\Mseed";
 
 
-        public static string TxtFilePath = "D:\\EwsCache\\Txt";
+        public static string TxtFilePath = AppDomain.CurrentDomain.BaseDirectory + "EwsCache\\Txt";
 
 
         public static string DataTypeString = "A";
diff --git a/mseedChart.MainModule/ViewModels/ChartPlotViewModel.cs b/mseedChart.MainModule/ViewModels/ChartPlotViewModel.cs
index e58ea29..7c7e0e0 100644
--- a/mseedChart.MainModule/ViewModels/ChartPlotViewModel.cs
+++ b/mseedChart.MainModule/ViewModels/ChartPlotViewModel.cs
@@ -283,7 +283,7 @@ namespace mseedChart.MainModule.ViewModels
             {
                 Directory.CreateDirectory(Path.GetDirectoryName(asciiSavePath));
             }
-            if (!File.Exists(dataFilePath + dataFileName + mseedStr))
+            //if (!File.Exists(dataFilePath + dataFileName + mseedStr))
             {
 
                 //TaskData taskData = new TaskData();
@@ -309,7 +309,7 @@ namespace mseedChart.MainModule.ViewModels
                 //};
                 //TaskQueue.Instance.AddTaskAndRuning(taskData);
             }
-            else
+           // else
             {
                 if (!File.Exists(asciiSavePath))
                 {
diff --git a/mseedChart.MainModule/mseedChart.MainModule.csproj b/mseedChart.MainModule/mseedChart.MainModule.csproj
index 3c7d913..389797a 100644
--- a/mseedChart.MainModule/mseedChart.MainModule.csproj
+++ b/mseedChart.MainModule/mseedChart.MainModule.csproj
@@ -54,18 +54,12 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>C:\Program Files (x86)\Arction\LightningChart .NET SDK v.10\LibNET4\Arction.Wpf.ChartingMVVM.LightningChart.dll</HintPath>
     </Reference>
-    <Reference Include="DryIoc, Version=4.7.7.0, Culture=neutral, PublicKeyToken=dfbf2bd50fcf7768, processorArchitecture=MSIL">
-      <HintPath>..\packages\DryIoc.dll.4.7.7\lib\net45\DryIoc.dll</HintPath>
-    </Reference>
     <Reference Include="Microsoft.Xaml.Behaviors, Version=1.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Xaml.Behaviors.Wpf.1.1.39\lib\net45\Microsoft.Xaml.Behaviors.dll</HintPath>
     </Reference>
     <Reference Include="Prism, Version=8.0.0.1909, Culture=neutral, PublicKeyToken=40ee6c3a2184dc59, processorArchitecture=MSIL">
       <HintPath>..\packages\Prism.Core.8.0.0.1909\lib\net47\Prism.dll</HintPath>
     </Reference>
-    <Reference Include="Prism.DryIoc.Wpf, Version=8.0.0.1909, Culture=neutral, PublicKeyToken=40ee6c3a2184dc59, processorArchitecture=MSIL">
-      <HintPath>..\packages\Prism.DryIoc.8.0.0.1909\lib\net47\Prism.DryIoc.Wpf.dll</HintPath>
-    </Reference>
     <Reference Include="Prism.Wpf, Version=8.0.0.1909, Culture=neutral, PublicKeyToken=40ee6c3a2184dc59, processorArchitecture=MSIL">
       <HintPath>..\packages\Prism.Wpf.8.0.0.1909\lib\net47\Prism.Wpf.dll</HintPath>
     </Reference>
diff --git a/mseedChart.MainModule/packages.config b/mseedChart.MainModule/packages.config
index 681992f..9270256 100644
--- a/mseedChart.MainModule/packages.config
+++ b/mseedChart.MainModule/packages.config
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Xaml.Behaviors.Wpf" version="1.1.39" targetFramework="net47" />
+  <package id="Prism.Core" version="8.0.0.1909" targetFramework="net47" />
+  <package id="Prism.Wpf" version="8.0.0.1909" targetFramework="net47" />
 </packages>
\ No newline at end of file
diff --git a/mseedChart/mseedChart.csproj b/mseedChart/mseedChart.csproj
index 9dbeaff..746db18 100644
--- a/mseedChart/mseedChart.csproj
+++ b/mseedChart/mseedChart.csproj
@@ -13,6 +13,15 @@
     <ProjectReference Include="..\mseedChart.MainModule\mseedChart.MainModule.csproj" />
   </ItemGroup>
   <ItemGroup>
+    <None Update="EwsCache\Txt\20230329\HA.20230329T061222.01A.txt">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="EwsCache\Txt\20230329\HA.20230329T063242.01A.txt">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="EwsCache\Txt\20230329\HA.20230329T064121.01A.txt">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Update="resources\N3102_staion_20230312.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>