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 @@ False C:\Program Files (x86)\Arction\LightningChart .NET SDK v.10\LibNET4\Arction.Wpf.ChartingMVVM.LightningChart.dll - - ..\packages\DryIoc.dll.4.7.7\lib\net45\DryIoc.dll - ..\packages\Microsoft.Xaml.Behaviors.Wpf.1.1.39\lib\net45\Microsoft.Xaml.Behaviors.dll ..\packages\Prism.Core.8.0.0.1909\lib\net47\Prism.dll - - ..\packages\Prism.DryIoc.8.0.0.1909\lib\net47\Prism.DryIoc.Wpf.dll - ..\packages\Prism.Wpf.8.0.0.1909\lib\net47\Prism.Wpf.dll 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 @@  + + \ 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 @@ + + Always + + + Always + + + Always + Always