diff --git a/PipeGallery.sln b/PipeGallery.sln
index 1d7db57..3ce323f 100644
--- a/PipeGallery.sln
+++ b/PipeGallery.sln
@@ -1,10 +1,12 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
+# Visual Studio Version 17
+VisualStudioVersion = 17.3.32819.101
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PipeGallery", "PipeGallery\PipeGallery.csproj", "{FB422BF3-8715-42B6-9D6B-535A2C8079E3}"
EndProject
+Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Correlator", "..\..\Setup Project\相关仪\Correlator\Correlator.vdproj", "{22C1AFF0-9FA7-41D6-B859-CEA89A4715EA}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -15,8 +17,13 @@
{FB422BF3-8715-42B6-9D6B-535A2C8079E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FB422BF3-8715-42B6-9D6B-535A2C8079E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FB422BF3-8715-42B6-9D6B-535A2C8079E3}.Release|Any CPU.Build.0 = Release|Any CPU
+ {22C1AFF0-9FA7-41D6-B859-CEA89A4715EA}.Debug|Any CPU.ActiveCfg = Debug
+ {22C1AFF0-9FA7-41D6-B859-CEA89A4715EA}.Release|Any CPU.ActiveCfg = Release
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {D54F993F-9061-42BA-A718-E69B335466D8}
+ EndGlobalSection
EndGlobal
diff --git a/PipeGallery.sln b/PipeGallery.sln
index 1d7db57..3ce323f 100644
--- a/PipeGallery.sln
+++ b/PipeGallery.sln
@@ -1,10 +1,12 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
+# Visual Studio Version 17
+VisualStudioVersion = 17.3.32819.101
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PipeGallery", "PipeGallery\PipeGallery.csproj", "{FB422BF3-8715-42B6-9D6B-535A2C8079E3}"
EndProject
+Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Correlator", "..\..\Setup Project\相关仪\Correlator\Correlator.vdproj", "{22C1AFF0-9FA7-41D6-B859-CEA89A4715EA}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -15,8 +17,13 @@
{FB422BF3-8715-42B6-9D6B-535A2C8079E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FB422BF3-8715-42B6-9D6B-535A2C8079E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FB422BF3-8715-42B6-9D6B-535A2C8079E3}.Release|Any CPU.Build.0 = Release|Any CPU
+ {22C1AFF0-9FA7-41D6-B859-CEA89A4715EA}.Debug|Any CPU.ActiveCfg = Debug
+ {22C1AFF0-9FA7-41D6-B859-CEA89A4715EA}.Release|Any CPU.ActiveCfg = Release
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {D54F993F-9061-42BA-A718-E69B335466D8}
+ EndGlobalSection
EndGlobal
diff --git a/PipeGallery/Converter/SignalIntensityImageConverter.cs b/PipeGallery/Converter/SignalIntensityImageConverter.cs
index 9ba84b8..0ac4aea 100644
--- a/PipeGallery/Converter/SignalIntensityImageConverter.cs
+++ b/PipeGallery/Converter/SignalIntensityImageConverter.cs
@@ -1,4 +1,5 @@
using System;
+using System.Globalization;
using System.Windows.Data;
using System.Windows.Media.Imaging;
@@ -6,7 +7,7 @@
{
public class SignalIntensityImageConverter : IValueConverter
{
- public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+ public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
try
{
@@ -18,29 +19,17 @@
switch (signalIntensity)
{
case 0:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\l_icon0.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/l_icon0.png", UriKind.RelativeOrAbsolute));
case 1:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\l_icon1.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/l_icon1.png", UriKind.RelativeOrAbsolute));
case 2:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\l_icon2.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/l_icon2.png", UriKind.RelativeOrAbsolute));
case 3:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\l_icon3.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/l_icon3.png", UriKind.RelativeOrAbsolute));
case 4:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\l_icon4.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/l_icon4.png", UriKind.RelativeOrAbsolute));
case 5:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\l_icon5.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/l_icon5.png", UriKind.RelativeOrAbsolute));
}
}
else if (p == 1)
@@ -49,29 +38,17 @@
switch (signalIntensity)
{
case 0:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\r_icon0.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/r_icon0.png", UriKind.RelativeOrAbsolute));
case 1:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\r_icon1.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/r_icon1.png", UriKind.RelativeOrAbsolute));
case 2:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\r_icon2.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/r_icon2.png", UriKind.RelativeOrAbsolute));
case 3:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\r_icon3.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/r_icon3.png", UriKind.RelativeOrAbsolute));
case 4:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\r_icon4.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/r_icon4.png", UriKind.RelativeOrAbsolute));
case 5:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\r_icon5.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/r_icon5.png", UriKind.RelativeOrAbsolute));
}
}
else if (p == 2)
@@ -79,15 +56,11 @@
bool fault = (bool)value;
if (fault)
{
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\d1_r.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/d1_r.png", UriKind.RelativeOrAbsolute));
}
else
{
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\d2_r.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/d2_r.png", UriKind.RelativeOrAbsolute));
}
}
else if (p == 3)
@@ -95,15 +68,11 @@
bool fault = (bool)value;
if (fault)
{
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\d1_b.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/d1_b.png", UriKind.RelativeOrAbsolute));
}
else
{
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\d2_b.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/d2_b.png", UriKind.RelativeOrAbsolute));
}
}
else if (p == 4)
@@ -112,29 +81,17 @@
switch (signalIntensity)
{
case 0:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon1.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon1.png", UriKind.RelativeOrAbsolute));
case 1:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon2.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon2.png", UriKind.RelativeOrAbsolute));
case 2:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon3.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon3.png", UriKind.RelativeOrAbsolute));
case 3:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon4.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon4.png", UriKind.RelativeOrAbsolute));
case 4:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon5.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon5.png", UriKind.RelativeOrAbsolute));
case 5:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon6.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon6.png", UriKind.RelativeOrAbsolute));
}
}
else if (p == 5)
@@ -143,29 +100,17 @@
switch (signalIntensity)
{
case 0:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon1.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon1.png", UriKind.RelativeOrAbsolute));
case 1:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon7.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon7.png", UriKind.RelativeOrAbsolute));
case 2:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon8.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon8.png", UriKind.RelativeOrAbsolute));
case 3:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon9.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon9.png", UriKind.RelativeOrAbsolute));
case 4:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon10.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon10.png", UriKind.RelativeOrAbsolute));
case 5:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon11.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon11.png", UriKind.RelativeOrAbsolute));
}
}
else if (p == 6)
@@ -174,29 +119,17 @@
switch (signalIntensity)
{
case 0:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyl_icon1.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyl_icon1.png", UriKind.RelativeOrAbsolute));
case 1:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyl_icon2.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyl_icon2.png", UriKind.RelativeOrAbsolute));
case 2:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyl_icon3.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyl_icon3.png", UriKind.RelativeOrAbsolute));
case 3:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyl_icon4.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyl_icon4.png", UriKind.RelativeOrAbsolute));
case 4:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyl_icon5.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyl_icon5.png", UriKind.RelativeOrAbsolute));
case 5:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyl_icon6.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyl_icon6.png", UriKind.RelativeOrAbsolute));
}
}
else if (p == 7)
@@ -205,42 +138,26 @@
switch (signalIntensity)
{
case 0:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyr_icon1.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyr_icon1.png", UriKind.RelativeOrAbsolute));
case 1:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyr_icon2.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyr_icon2.png", UriKind.RelativeOrAbsolute));
case 2:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyr_icon3.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyr_icon3.png", UriKind.RelativeOrAbsolute));
case 3:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyr_icon4.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyr_icon4.png", UriKind.RelativeOrAbsolute));
case 4:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyr_icon5.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyr_icon5.png", UriKind.RelativeOrAbsolute));
case 5:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyr_icon6.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyr_icon6.png", UriKind.RelativeOrAbsolute));
}
}
else if (p == 8)
{
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyl_icon7.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyl_icon7.png", UriKind.RelativeOrAbsolute));
}
else if (p == 9)
{
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyr_icon7.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyr_icon7.png", UriKind.RelativeOrAbsolute));
}
return null;
@@ -252,7 +169,7 @@
}
public object ConvertBack(object value, Type targetType, object parameter,
- System.Globalization.CultureInfo culture)
+ CultureInfo culture)
{
throw new NotImplementedException();
}
diff --git a/PipeGallery.sln b/PipeGallery.sln
index 1d7db57..3ce323f 100644
--- a/PipeGallery.sln
+++ b/PipeGallery.sln
@@ -1,10 +1,12 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
+# Visual Studio Version 17
+VisualStudioVersion = 17.3.32819.101
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PipeGallery", "PipeGallery\PipeGallery.csproj", "{FB422BF3-8715-42B6-9D6B-535A2C8079E3}"
EndProject
+Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Correlator", "..\..\Setup Project\相关仪\Correlator\Correlator.vdproj", "{22C1AFF0-9FA7-41D6-B859-CEA89A4715EA}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -15,8 +17,13 @@
{FB422BF3-8715-42B6-9D6B-535A2C8079E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FB422BF3-8715-42B6-9D6B-535A2C8079E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FB422BF3-8715-42B6-9D6B-535A2C8079E3}.Release|Any CPU.Build.0 = Release|Any CPU
+ {22C1AFF0-9FA7-41D6-B859-CEA89A4715EA}.Debug|Any CPU.ActiveCfg = Debug
+ {22C1AFF0-9FA7-41D6-B859-CEA89A4715EA}.Release|Any CPU.ActiveCfg = Release
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {D54F993F-9061-42BA-A718-E69B335466D8}
+ EndGlobalSection
EndGlobal
diff --git a/PipeGallery/Converter/SignalIntensityImageConverter.cs b/PipeGallery/Converter/SignalIntensityImageConverter.cs
index 9ba84b8..0ac4aea 100644
--- a/PipeGallery/Converter/SignalIntensityImageConverter.cs
+++ b/PipeGallery/Converter/SignalIntensityImageConverter.cs
@@ -1,4 +1,5 @@
using System;
+using System.Globalization;
using System.Windows.Data;
using System.Windows.Media.Imaging;
@@ -6,7 +7,7 @@
{
public class SignalIntensityImageConverter : IValueConverter
{
- public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+ public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
try
{
@@ -18,29 +19,17 @@
switch (signalIntensity)
{
case 0:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\l_icon0.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/l_icon0.png", UriKind.RelativeOrAbsolute));
case 1:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\l_icon1.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/l_icon1.png", UriKind.RelativeOrAbsolute));
case 2:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\l_icon2.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/l_icon2.png", UriKind.RelativeOrAbsolute));
case 3:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\l_icon3.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/l_icon3.png", UriKind.RelativeOrAbsolute));
case 4:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\l_icon4.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/l_icon4.png", UriKind.RelativeOrAbsolute));
case 5:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\l_icon5.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/l_icon5.png", UriKind.RelativeOrAbsolute));
}
}
else if (p == 1)
@@ -49,29 +38,17 @@
switch (signalIntensity)
{
case 0:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\r_icon0.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/r_icon0.png", UriKind.RelativeOrAbsolute));
case 1:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\r_icon1.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/r_icon1.png", UriKind.RelativeOrAbsolute));
case 2:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\r_icon2.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/r_icon2.png", UriKind.RelativeOrAbsolute));
case 3:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\r_icon3.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/r_icon3.png", UriKind.RelativeOrAbsolute));
case 4:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\r_icon4.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/r_icon4.png", UriKind.RelativeOrAbsolute));
case 5:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\r_icon5.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/r_icon5.png", UriKind.RelativeOrAbsolute));
}
}
else if (p == 2)
@@ -79,15 +56,11 @@
bool fault = (bool)value;
if (fault)
{
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\d1_r.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/d1_r.png", UriKind.RelativeOrAbsolute));
}
else
{
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\d2_r.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/d2_r.png", UriKind.RelativeOrAbsolute));
}
}
else if (p == 3)
@@ -95,15 +68,11 @@
bool fault = (bool)value;
if (fault)
{
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\d1_b.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/d1_b.png", UriKind.RelativeOrAbsolute));
}
else
{
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\d2_b.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/d2_b.png", UriKind.RelativeOrAbsolute));
}
}
else if (p == 4)
@@ -112,29 +81,17 @@
switch (signalIntensity)
{
case 0:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon1.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon1.png", UriKind.RelativeOrAbsolute));
case 1:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon2.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon2.png", UriKind.RelativeOrAbsolute));
case 2:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon3.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon3.png", UriKind.RelativeOrAbsolute));
case 3:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon4.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon4.png", UriKind.RelativeOrAbsolute));
case 4:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon5.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon5.png", UriKind.RelativeOrAbsolute));
case 5:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon6.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon6.png", UriKind.RelativeOrAbsolute));
}
}
else if (p == 5)
@@ -143,29 +100,17 @@
switch (signalIntensity)
{
case 0:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon1.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon1.png", UriKind.RelativeOrAbsolute));
case 1:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon7.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon7.png", UriKind.RelativeOrAbsolute));
case 2:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon8.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon8.png", UriKind.RelativeOrAbsolute));
case 3:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon9.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon9.png", UriKind.RelativeOrAbsolute));
case 4:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon10.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon10.png", UriKind.RelativeOrAbsolute));
case 5:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon11.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon11.png", UriKind.RelativeOrAbsolute));
}
}
else if (p == 6)
@@ -174,29 +119,17 @@
switch (signalIntensity)
{
case 0:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyl_icon1.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyl_icon1.png", UriKind.RelativeOrAbsolute));
case 1:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyl_icon2.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyl_icon2.png", UriKind.RelativeOrAbsolute));
case 2:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyl_icon3.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyl_icon3.png", UriKind.RelativeOrAbsolute));
case 3:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyl_icon4.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyl_icon4.png", UriKind.RelativeOrAbsolute));
case 4:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyl_icon5.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyl_icon5.png", UriKind.RelativeOrAbsolute));
case 5:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyl_icon6.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyl_icon6.png", UriKind.RelativeOrAbsolute));
}
}
else if (p == 7)
@@ -205,42 +138,26 @@
switch (signalIntensity)
{
case 0:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyr_icon1.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyr_icon1.png", UriKind.RelativeOrAbsolute));
case 1:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyr_icon2.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyr_icon2.png", UriKind.RelativeOrAbsolute));
case 2:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyr_icon3.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyr_icon3.png", UriKind.RelativeOrAbsolute));
case 3:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyr_icon4.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyr_icon4.png", UriKind.RelativeOrAbsolute));
case 4:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyr_icon5.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyr_icon5.png", UriKind.RelativeOrAbsolute));
case 5:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyr_icon6.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyr_icon6.png", UriKind.RelativeOrAbsolute));
}
}
else if (p == 8)
{
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyl_icon7.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyl_icon7.png", UriKind.RelativeOrAbsolute));
}
else if (p == 9)
{
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyr_icon7.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyr_icon7.png", UriKind.RelativeOrAbsolute));
}
return null;
@@ -252,7 +169,7 @@
}
public object ConvertBack(object value, Type targetType, object parameter,
- System.Globalization.CultureInfo culture)
+ CultureInfo culture)
{
throw new NotImplementedException();
}
diff --git a/PipeGallery/Correlator/ClassCalculate.cs b/PipeGallery/Correlator/ClassCalculate.cs
index 70dd40c..9a56005 100644
--- a/PipeGallery/Correlator/ClassCalculate.cs
+++ b/PipeGallery/Correlator/ClassCalculate.cs
@@ -5,6 +5,7 @@
using System.Windows.Forms;
using MathWorks.MATLAB.NET.Arrays;
using Newtonsoft.Json.Linq;
+using PipeGallery.Manage;
using PipeGallery.ViewModel;
namespace PipeGallery.Correlator
@@ -86,7 +87,7 @@
+ DateTime.Now.ToString("HHmmss") + ".txt";
FileStream fileStream = new FileStream(filename, FileMode.OpenOrCreate, FileAccess.ReadWrite);
- String locateData = "";
+ String locateData = DateTime.Now.ToString();
foreach (double d in vec1)
{
locateData += ((decimal)d).ToString("G") + "#";
@@ -121,7 +122,7 @@
MWNumericArray[] dis = new MWNumericArray[3] { 0, 0, 0 };
- MWNumericArray[] velo = new MWNumericArray[3] { 1, 1, 1 };
+ MWNumericArray[] velo = new MWNumericArray[3] { 1, 0, 0 };
for (int i = 0; i < CalculteSatus.MaterialDatas.Count && i < 3; i++)
@@ -130,53 +131,54 @@
velo[i] = CalculteSatus.MaterialDatas[i].Soundspeed;
}
-
- while (CalculteSatus.currNum <= CalculteSatus.totalNum)
- {
- if (CorrelatorDataSaveThread.isNoFilter)
- {
- if (HomePageViewModel.Instance.StartState)
- {
- Caculator((MWNumericArray)vec1, (MWNumericArray)vec2, fs, dis, velo);
-
- //Caculator((MWNumericArray)vec1, (MWNumericArray)vec2, fs, dis, material, diamLow, diamHigh, CalculteSatus.SoundSpeed);
- }
- else
- {
- break;
- }
- }
- //else//滤波功能，暂时使用不到，先注释掉
- //{
- // int count = CorrelatorDataSaveThread.devDataValueMap[device2].Count;
-
- // for (int i = 0; i < 7; i++)
- // {
- // if (HomePageViewModel.Instance.StartState)
- // {
- // int count1 = CorrelatorDataSaveThread.devDataValueMap[device2].Count;
-
- // if (count + i == count1)
- // {
- // vec1 = CorrelatorDataSaveThread.devDataValueMap[device1][count - 1];//采集数据
- // vec2 = CorrelatorDataSaveThread.devDataValueMap[device2][count - 1];
-
- // //Caculator((MWNumericArray)vec1, (MWNumericArray)vec2, fs, dis, material, diamLow, diamHigh, CalculteSatus.SoundSpeed);
- // }
- // else
- // {
- // Thread.Sleep(2000);
- // i--;
- // }
- // }
- // else
- // {
- // i = 8;
- // }
- // }
- // break;
- //}
- }
+ //TODO 2022-11-29 暂时只测试一次，方便定位
+ Caculator((MWNumericArray)vec1, (MWNumericArray)vec2, fs, dis, velo);
+ // while (CalculteSatus.currNum <= CalculteSatus.totalNum)
+ // {
+ // if (CorrelatorDataSaveThread.isNoFilter)
+ // {
+ // if (HomePageViewModel.Instance.StartState)
+ // {
+ // Caculator((MWNumericArray)vec1, (MWNumericArray)vec2, fs, dis, velo);
+ //
+ // //Caculator((MWNumericArray)vec1, (MWNumericArray)vec2, fs, dis, material, diamLow, diamHigh, CalculteSatus.SoundSpeed);
+ // }
+ // else
+ // {
+ // break;
+ // }
+ // }
+ // //else//滤波功能，暂时使用不到，先注释掉
+ // //{
+ // // int count = CorrelatorDataSaveThread.devDataValueMap[device2].Count;
+ //
+ // // for (int i = 0; i < 7; i++)
+ // // {
+ // // if (HomePageViewModel.Instance.StartState)
+ // // {
+ // // int count1 = CorrelatorDataSaveThread.devDataValueMap[device2].Count;
+ //
+ // // if (count + i == count1)
+ // // {
+ // // vec1 = CorrelatorDataSaveThread.devDataValueMap[device1][count - 1];//采集数据
+ // // vec2 = CorrelatorDataSaveThread.devDataValueMap[device2][count - 1];
+ //
+ // // //Caculator((MWNumericArray)vec1, (MWNumericArray)vec2, fs, dis, material, diamLow, diamHigh, CalculteSatus.SoundSpeed);
+ // // }
+ // // else
+ // // {
+ // // Thread.Sleep(2000);
+ // // i--;
+ // // }
+ // // }
+ // // else
+ // // {
+ // // i = 8;
+ // // }
+ // // }
+ // // break;
+ // //}
+ // }
CalculteSatus.disAs.Add(HomePageViewModel.Instance.TransmitterADistance);
CalculteSatus.disBs.Add(HomePageViewModel.Instance.TransmitterBDistance);
@@ -207,9 +209,9 @@
//MWNumericArray vecBMW = vec2;//传感器B数据
//MWNumericArray fs = 7500;//采样率
//MWNumericArray dis = CalculteSatus.lengthData; // 97.5是距离，用户输入
- //MWNumericArray material = PipeMaterial.MaterialMap[CalculteSatus.MaterialData];//管材
- //MWNumericArray diamLow = lowDiameter; //管径范围下限，要准确无误
- //MWNumericArray diamHigh = highDiameter; //管径范围上限，要准确无误
+ MWNumericArray material = PipeMaterial.MaterialMap[CalculteSatus.MaterialData]; //管材
+ MWNumericArray diamLow = CalculteSatus.lowDiameter; //管径范围下限，要准确无误
+ MWNumericArray diamHigh = CalculteSatus.highDiameter; //管径范围上限，要准确无误
//MWNumericArray velo = getVelo(CalculteSatus.MaterialData, lowDiameter, highDiameter);//声速
MWNumericArray currNum = CalculteSatus.currNum; //当前数据调用次数，从1开始，不超过totalNum，每次调用后会返回totalNum
MWNumericArray maxSnrIn = CalculteSatus.maxSnrIn; //currNum = 1时赋值-1，currNum > 1时赋值上次调用返回的snr
@@ -222,7 +224,9 @@
//接口调用：
Object[] outList = correlator.locating(11, vecAMW, vecBMW, fs, dis[0], velo[0], dis[1], velo[1], dis[2],
- velo[2], currNum, maxSnrIn, maxFreLowIn, maxFreHighIn, cutFreLow, cutFreHigh);
+ velo[2], material, diamLow, diamHigh, currNum, maxSnrIn, maxFreLowIn, maxFreHighIn, cutFreLow,
+ cutFreHigh);
+ LogHelper.Info("算法结果数据：" + outList);
//Object[] outList = CorrelatorDataSaveThread.isNoFilter ? correlator.locating(11, vecAMW, vecBMW, fs, dis, velo, material, diamLow, diamHigh, currNum, maxSnrIn, maxFreLowIn, maxFreHighIn, cutFreLow, cutFreHigh) :
//correlator.typicalFreInter(7, vecAMW, vecBMW, fs, CorrelatorDataSaveThread.filterInfo.LowPass, CorrelatorDataSaveThread.filterInfo.HighPass, dis, velo);
diff --git a/PipeGallery.sln b/PipeGallery.sln
index 1d7db57..3ce323f 100644
--- a/PipeGallery.sln
+++ b/PipeGallery.sln
@@ -1,10 +1,12 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
+# Visual Studio Version 17
+VisualStudioVersion = 17.3.32819.101
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PipeGallery", "PipeGallery\PipeGallery.csproj", "{FB422BF3-8715-42B6-9D6B-535A2C8079E3}"
EndProject
+Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Correlator", "..\..\Setup Project\相关仪\Correlator\Correlator.vdproj", "{22C1AFF0-9FA7-41D6-B859-CEA89A4715EA}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -15,8 +17,13 @@
{FB422BF3-8715-42B6-9D6B-535A2C8079E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FB422BF3-8715-42B6-9D6B-535A2C8079E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FB422BF3-8715-42B6-9D6B-535A2C8079E3}.Release|Any CPU.Build.0 = Release|Any CPU
+ {22C1AFF0-9FA7-41D6-B859-CEA89A4715EA}.Debug|Any CPU.ActiveCfg = Debug
+ {22C1AFF0-9FA7-41D6-B859-CEA89A4715EA}.Release|Any CPU.ActiveCfg = Release
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {D54F993F-9061-42BA-A718-E69B335466D8}
+ EndGlobalSection
EndGlobal
diff --git a/PipeGallery/Converter/SignalIntensityImageConverter.cs b/PipeGallery/Converter/SignalIntensityImageConverter.cs
index 9ba84b8..0ac4aea 100644
--- a/PipeGallery/Converter/SignalIntensityImageConverter.cs
+++ b/PipeGallery/Converter/SignalIntensityImageConverter.cs
@@ -1,4 +1,5 @@
using System;
+using System.Globalization;
using System.Windows.Data;
using System.Windows.Media.Imaging;
@@ -6,7 +7,7 @@
{
public class SignalIntensityImageConverter : IValueConverter
{
- public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+ public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
try
{
@@ -18,29 +19,17 @@
switch (signalIntensity)
{
case 0:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\l_icon0.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/l_icon0.png", UriKind.RelativeOrAbsolute));
case 1:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\l_icon1.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/l_icon1.png", UriKind.RelativeOrAbsolute));
case 2:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\l_icon2.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/l_icon2.png", UriKind.RelativeOrAbsolute));
case 3:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\l_icon3.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/l_icon3.png", UriKind.RelativeOrAbsolute));
case 4:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\l_icon4.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/l_icon4.png", UriKind.RelativeOrAbsolute));
case 5:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\l_icon5.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/l_icon5.png", UriKind.RelativeOrAbsolute));
}
}
else if (p == 1)
@@ -49,29 +38,17 @@
switch (signalIntensity)
{
case 0:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\r_icon0.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/r_icon0.png", UriKind.RelativeOrAbsolute));
case 1:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\r_icon1.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/r_icon1.png", UriKind.RelativeOrAbsolute));
case 2:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\r_icon2.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/r_icon2.png", UriKind.RelativeOrAbsolute));
case 3:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\r_icon3.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/r_icon3.png", UriKind.RelativeOrAbsolute));
case 4:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\r_icon4.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/r_icon4.png", UriKind.RelativeOrAbsolute));
case 5:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\r_icon5.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/r_icon5.png", UriKind.RelativeOrAbsolute));
}
}
else if (p == 2)
@@ -79,15 +56,11 @@
bool fault = (bool)value;
if (fault)
{
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\d1_r.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/d1_r.png", UriKind.RelativeOrAbsolute));
}
else
{
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\d2_r.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/d2_r.png", UriKind.RelativeOrAbsolute));
}
}
else if (p == 3)
@@ -95,15 +68,11 @@
bool fault = (bool)value;
if (fault)
{
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\d1_b.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/d1_b.png", UriKind.RelativeOrAbsolute));
}
else
{
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\d2_b.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/d2_b.png", UriKind.RelativeOrAbsolute));
}
}
else if (p == 4)
@@ -112,29 +81,17 @@
switch (signalIntensity)
{
case 0:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon1.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon1.png", UriKind.RelativeOrAbsolute));
case 1:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon2.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon2.png", UriKind.RelativeOrAbsolute));
case 2:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon3.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon3.png", UriKind.RelativeOrAbsolute));
case 3:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon4.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon4.png", UriKind.RelativeOrAbsolute));
case 4:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon5.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon5.png", UriKind.RelativeOrAbsolute));
case 5:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon6.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon6.png", UriKind.RelativeOrAbsolute));
}
}
else if (p == 5)
@@ -143,29 +100,17 @@
switch (signalIntensity)
{
case 0:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon1.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon1.png", UriKind.RelativeOrAbsolute));
case 1:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon7.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon7.png", UriKind.RelativeOrAbsolute));
case 2:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon8.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon8.png", UriKind.RelativeOrAbsolute));
case 3:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon9.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon9.png", UriKind.RelativeOrAbsolute));
case 4:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon10.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon10.png", UriKind.RelativeOrAbsolute));
case 5:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon11.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon11.png", UriKind.RelativeOrAbsolute));
}
}
else if (p == 6)
@@ -174,29 +119,17 @@
switch (signalIntensity)
{
case 0:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyl_icon1.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyl_icon1.png", UriKind.RelativeOrAbsolute));
case 1:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyl_icon2.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyl_icon2.png", UriKind.RelativeOrAbsolute));
case 2:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyl_icon3.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyl_icon3.png", UriKind.RelativeOrAbsolute));
case 3:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyl_icon4.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyl_icon4.png", UriKind.RelativeOrAbsolute));
case 4:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyl_icon5.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyl_icon5.png", UriKind.RelativeOrAbsolute));
case 5:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyl_icon6.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyl_icon6.png", UriKind.RelativeOrAbsolute));
}
}
else if (p == 7)
@@ -205,42 +138,26 @@
switch (signalIntensity)
{
case 0:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyr_icon1.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyr_icon1.png", UriKind.RelativeOrAbsolute));
case 1:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyr_icon2.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyr_icon2.png", UriKind.RelativeOrAbsolute));
case 2:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyr_icon3.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyr_icon3.png", UriKind.RelativeOrAbsolute));
case 3:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyr_icon4.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyr_icon4.png", UriKind.RelativeOrAbsolute));
case 4:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyr_icon5.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyr_icon5.png", UriKind.RelativeOrAbsolute));
case 5:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyr_icon6.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyr_icon6.png", UriKind.RelativeOrAbsolute));
}
}
else if (p == 8)
{
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyl_icon7.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyl_icon7.png", UriKind.RelativeOrAbsolute));
}
else if (p == 9)
{
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyr_icon7.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyr_icon7.png", UriKind.RelativeOrAbsolute));
}
return null;
@@ -252,7 +169,7 @@
}
public object ConvertBack(object value, Type targetType, object parameter,
- System.Globalization.CultureInfo culture)
+ CultureInfo culture)
{
throw new NotImplementedException();
}
diff --git a/PipeGallery/Correlator/ClassCalculate.cs b/PipeGallery/Correlator/ClassCalculate.cs
index 70dd40c..9a56005 100644
--- a/PipeGallery/Correlator/ClassCalculate.cs
+++ b/PipeGallery/Correlator/ClassCalculate.cs
@@ -5,6 +5,7 @@
using System.Windows.Forms;
using MathWorks.MATLAB.NET.Arrays;
using Newtonsoft.Json.Linq;
+using PipeGallery.Manage;
using PipeGallery.ViewModel;
namespace PipeGallery.Correlator
@@ -86,7 +87,7 @@
+ DateTime.Now.ToString("HHmmss") + ".txt";
FileStream fileStream = new FileStream(filename, FileMode.OpenOrCreate, FileAccess.ReadWrite);
- String locateData = "";
+ String locateData = DateTime.Now.ToString();
foreach (double d in vec1)
{
locateData += ((decimal)d).ToString("G") + "#";
@@ -121,7 +122,7 @@
MWNumericArray[] dis = new MWNumericArray[3] { 0, 0, 0 };
- MWNumericArray[] velo = new MWNumericArray[3] { 1, 1, 1 };
+ MWNumericArray[] velo = new MWNumericArray[3] { 1, 0, 0 };
for (int i = 0; i < CalculteSatus.MaterialDatas.Count && i < 3; i++)
@@ -130,53 +131,54 @@
velo[i] = CalculteSatus.MaterialDatas[i].Soundspeed;
}
-
- while (CalculteSatus.currNum <= CalculteSatus.totalNum)
- {
- if (CorrelatorDataSaveThread.isNoFilter)
- {
- if (HomePageViewModel.Instance.StartState)
- {
- Caculator((MWNumericArray)vec1, (MWNumericArray)vec2, fs, dis, velo);
-
- //Caculator((MWNumericArray)vec1, (MWNumericArray)vec2, fs, dis, material, diamLow, diamHigh, CalculteSatus.SoundSpeed);
- }
- else
- {
- break;
- }
- }
- //else//滤波功能，暂时使用不到，先注释掉
- //{
- // int count = CorrelatorDataSaveThread.devDataValueMap[device2].Count;
-
- // for (int i = 0; i < 7; i++)
- // {
- // if (HomePageViewModel.Instance.StartState)
- // {
- // int count1 = CorrelatorDataSaveThread.devDataValueMap[device2].Count;
-
- // if (count + i == count1)
- // {
- // vec1 = CorrelatorDataSaveThread.devDataValueMap[device1][count - 1];//采集数据
- // vec2 = CorrelatorDataSaveThread.devDataValueMap[device2][count - 1];
-
- // //Caculator((MWNumericArray)vec1, (MWNumericArray)vec2, fs, dis, material, diamLow, diamHigh, CalculteSatus.SoundSpeed);
- // }
- // else
- // {
- // Thread.Sleep(2000);
- // i--;
- // }
- // }
- // else
- // {
- // i = 8;
- // }
- // }
- // break;
- //}
- }
+ //TODO 2022-11-29 暂时只测试一次，方便定位
+ Caculator((MWNumericArray)vec1, (MWNumericArray)vec2, fs, dis, velo);
+ // while (CalculteSatus.currNum <= CalculteSatus.totalNum)
+ // {
+ // if (CorrelatorDataSaveThread.isNoFilter)
+ // {
+ // if (HomePageViewModel.Instance.StartState)
+ // {
+ // Caculator((MWNumericArray)vec1, (MWNumericArray)vec2, fs, dis, velo);
+ //
+ // //Caculator((MWNumericArray)vec1, (MWNumericArray)vec2, fs, dis, material, diamLow, diamHigh, CalculteSatus.SoundSpeed);
+ // }
+ // else
+ // {
+ // break;
+ // }
+ // }
+ // //else//滤波功能，暂时使用不到，先注释掉
+ // //{
+ // // int count = CorrelatorDataSaveThread.devDataValueMap[device2].Count;
+ //
+ // // for (int i = 0; i < 7; i++)
+ // // {
+ // // if (HomePageViewModel.Instance.StartState)
+ // // {
+ // // int count1 = CorrelatorDataSaveThread.devDataValueMap[device2].Count;
+ //
+ // // if (count + i == count1)
+ // // {
+ // // vec1 = CorrelatorDataSaveThread.devDataValueMap[device1][count - 1];//采集数据
+ // // vec2 = CorrelatorDataSaveThread.devDataValueMap[device2][count - 1];
+ //
+ // // //Caculator((MWNumericArray)vec1, (MWNumericArray)vec2, fs, dis, material, diamLow, diamHigh, CalculteSatus.SoundSpeed);
+ // // }
+ // // else
+ // // {
+ // // Thread.Sleep(2000);
+ // // i--;
+ // // }
+ // // }
+ // // else
+ // // {
+ // // i = 8;
+ // // }
+ // // }
+ // // break;
+ // //}
+ // }
CalculteSatus.disAs.Add(HomePageViewModel.Instance.TransmitterADistance);
CalculteSatus.disBs.Add(HomePageViewModel.Instance.TransmitterBDistance);
@@ -207,9 +209,9 @@
//MWNumericArray vecBMW = vec2;//传感器B数据
//MWNumericArray fs = 7500;//采样率
//MWNumericArray dis = CalculteSatus.lengthData; // 97.5是距离，用户输入
- //MWNumericArray material = PipeMaterial.MaterialMap[CalculteSatus.MaterialData];//管材
- //MWNumericArray diamLow = lowDiameter; //管径范围下限，要准确无误
- //MWNumericArray diamHigh = highDiameter; //管径范围上限，要准确无误
+ MWNumericArray material = PipeMaterial.MaterialMap[CalculteSatus.MaterialData]; //管材
+ MWNumericArray diamLow = CalculteSatus.lowDiameter; //管径范围下限，要准确无误
+ MWNumericArray diamHigh = CalculteSatus.highDiameter; //管径范围上限，要准确无误
//MWNumericArray velo = getVelo(CalculteSatus.MaterialData, lowDiameter, highDiameter);//声速
MWNumericArray currNum = CalculteSatus.currNum; //当前数据调用次数，从1开始，不超过totalNum，每次调用后会返回totalNum
MWNumericArray maxSnrIn = CalculteSatus.maxSnrIn; //currNum = 1时赋值-1，currNum > 1时赋值上次调用返回的snr
@@ -222,7 +224,9 @@
//接口调用：
Object[] outList = correlator.locating(11, vecAMW, vecBMW, fs, dis[0], velo[0], dis[1], velo[1], dis[2],
- velo[2], currNum, maxSnrIn, maxFreLowIn, maxFreHighIn, cutFreLow, cutFreHigh);
+ velo[2], material, diamLow, diamHigh, currNum, maxSnrIn, maxFreLowIn, maxFreHighIn, cutFreLow,
+ cutFreHigh);
+ LogHelper.Info("算法结果数据：" + outList);
//Object[] outList = CorrelatorDataSaveThread.isNoFilter ? correlator.locating(11, vecAMW, vecBMW, fs, dis, velo, material, diamLow, diamHigh, currNum, maxSnrIn, maxFreLowIn, maxFreHighIn, cutFreLow, cutFreHigh) :
//correlator.typicalFreInter(7, vecAMW, vecBMW, fs, CorrelatorDataSaveThread.filterInfo.LowPass, CorrelatorDataSaveThread.filterInfo.HighPass, dis, velo);
diff --git a/PipeGallery/MainWindow.xaml b/PipeGallery/MainWindow.xaml
index e33b11b..746bc2f 100644
--- a/PipeGallery/MainWindow.xaml
+++ b/PipeGallery/MainWindow.xaml
@@ -5,10 +5,8 @@
Title="相关仪"
Background="Transparent"
Left="0"
- ResizeMode="NoResize"
Top="0"
WindowStartupLocation="Manual"
- WindowState="Maximized"
- WindowStyle="None">
+ WindowState="Maximized">
diff --git a/PipeGallery.sln b/PipeGallery.sln
index 1d7db57..3ce323f 100644
--- a/PipeGallery.sln
+++ b/PipeGallery.sln
@@ -1,10 +1,12 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
+# Visual Studio Version 17
+VisualStudioVersion = 17.3.32819.101
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PipeGallery", "PipeGallery\PipeGallery.csproj", "{FB422BF3-8715-42B6-9D6B-535A2C8079E3}"
EndProject
+Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Correlator", "..\..\Setup Project\相关仪\Correlator\Correlator.vdproj", "{22C1AFF0-9FA7-41D6-B859-CEA89A4715EA}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -15,8 +17,13 @@
{FB422BF3-8715-42B6-9D6B-535A2C8079E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FB422BF3-8715-42B6-9D6B-535A2C8079E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FB422BF3-8715-42B6-9D6B-535A2C8079E3}.Release|Any CPU.Build.0 = Release|Any CPU
+ {22C1AFF0-9FA7-41D6-B859-CEA89A4715EA}.Debug|Any CPU.ActiveCfg = Debug
+ {22C1AFF0-9FA7-41D6-B859-CEA89A4715EA}.Release|Any CPU.ActiveCfg = Release
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {D54F993F-9061-42BA-A718-E69B335466D8}
+ EndGlobalSection
EndGlobal
diff --git a/PipeGallery/Converter/SignalIntensityImageConverter.cs b/PipeGallery/Converter/SignalIntensityImageConverter.cs
index 9ba84b8..0ac4aea 100644
--- a/PipeGallery/Converter/SignalIntensityImageConverter.cs
+++ b/PipeGallery/Converter/SignalIntensityImageConverter.cs
@@ -1,4 +1,5 @@
using System;
+using System.Globalization;
using System.Windows.Data;
using System.Windows.Media.Imaging;
@@ -6,7 +7,7 @@
{
public class SignalIntensityImageConverter : IValueConverter
{
- public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+ public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
try
{
@@ -18,29 +19,17 @@
switch (signalIntensity)
{
case 0:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\l_icon0.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/l_icon0.png", UriKind.RelativeOrAbsolute));
case 1:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\l_icon1.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/l_icon1.png", UriKind.RelativeOrAbsolute));
case 2:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\l_icon2.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/l_icon2.png", UriKind.RelativeOrAbsolute));
case 3:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\l_icon3.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/l_icon3.png", UriKind.RelativeOrAbsolute));
case 4:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\l_icon4.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/l_icon4.png", UriKind.RelativeOrAbsolute));
case 5:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\l_icon5.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/l_icon5.png", UriKind.RelativeOrAbsolute));
}
}
else if (p == 1)
@@ -49,29 +38,17 @@
switch (signalIntensity)
{
case 0:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\r_icon0.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/r_icon0.png", UriKind.RelativeOrAbsolute));
case 1:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\r_icon1.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/r_icon1.png", UriKind.RelativeOrAbsolute));
case 2:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\r_icon2.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/r_icon2.png", UriKind.RelativeOrAbsolute));
case 3:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\r_icon3.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/r_icon3.png", UriKind.RelativeOrAbsolute));
case 4:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\r_icon4.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/r_icon4.png", UriKind.RelativeOrAbsolute));
case 5:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\r_icon5.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/r_icon5.png", UriKind.RelativeOrAbsolute));
}
}
else if (p == 2)
@@ -79,15 +56,11 @@
bool fault = (bool)value;
if (fault)
{
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\d1_r.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/d1_r.png", UriKind.RelativeOrAbsolute));
}
else
{
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\d2_r.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/d2_r.png", UriKind.RelativeOrAbsolute));
}
}
else if (p == 3)
@@ -95,15 +68,11 @@
bool fault = (bool)value;
if (fault)
{
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\d1_b.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/d1_b.png", UriKind.RelativeOrAbsolute));
}
else
{
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\d2_b.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/d2_b.png", UriKind.RelativeOrAbsolute));
}
}
else if (p == 4)
@@ -112,29 +81,17 @@
switch (signalIntensity)
{
case 0:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon1.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon1.png", UriKind.RelativeOrAbsolute));
case 1:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon2.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon2.png", UriKind.RelativeOrAbsolute));
case 2:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon3.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon3.png", UriKind.RelativeOrAbsolute));
case 3:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon4.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon4.png", UriKind.RelativeOrAbsolute));
case 4:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon5.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon5.png", UriKind.RelativeOrAbsolute));
case 5:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon6.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon6.png", UriKind.RelativeOrAbsolute));
}
}
else if (p == 5)
@@ -143,29 +100,17 @@
switch (signalIntensity)
{
case 0:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon1.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon1.png", UriKind.RelativeOrAbsolute));
case 1:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon7.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon7.png", UriKind.RelativeOrAbsolute));
case 2:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon8.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon8.png", UriKind.RelativeOrAbsolute));
case 3:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon9.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon9.png", UriKind.RelativeOrAbsolute));
case 4:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon10.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon10.png", UriKind.RelativeOrAbsolute));
case 5:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon11.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon11.png", UriKind.RelativeOrAbsolute));
}
}
else if (p == 6)
@@ -174,29 +119,17 @@
switch (signalIntensity)
{
case 0:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyl_icon1.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyl_icon1.png", UriKind.RelativeOrAbsolute));
case 1:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyl_icon2.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyl_icon2.png", UriKind.RelativeOrAbsolute));
case 2:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyl_icon3.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyl_icon3.png", UriKind.RelativeOrAbsolute));
case 3:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyl_icon4.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyl_icon4.png", UriKind.RelativeOrAbsolute));
case 4:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyl_icon5.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyl_icon5.png", UriKind.RelativeOrAbsolute));
case 5:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyl_icon6.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyl_icon6.png", UriKind.RelativeOrAbsolute));
}
}
else if (p == 7)
@@ -205,42 +138,26 @@
switch (signalIntensity)
{
case 0:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyr_icon1.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyr_icon1.png", UriKind.RelativeOrAbsolute));
case 1:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyr_icon2.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyr_icon2.png", UriKind.RelativeOrAbsolute));
case 2:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyr_icon3.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyr_icon3.png", UriKind.RelativeOrAbsolute));
case 3:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyr_icon4.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyr_icon4.png", UriKind.RelativeOrAbsolute));
case 4:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyr_icon5.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyr_icon5.png", UriKind.RelativeOrAbsolute));
case 5:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyr_icon6.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyr_icon6.png", UriKind.RelativeOrAbsolute));
}
}
else if (p == 8)
{
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyl_icon7.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyl_icon7.png", UriKind.RelativeOrAbsolute));
}
else if (p == 9)
{
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyr_icon7.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyr_icon7.png", UriKind.RelativeOrAbsolute));
}
return null;
@@ -252,7 +169,7 @@
}
public object ConvertBack(object value, Type targetType, object parameter,
- System.Globalization.CultureInfo culture)
+ CultureInfo culture)
{
throw new NotImplementedException();
}
diff --git a/PipeGallery/Correlator/ClassCalculate.cs b/PipeGallery/Correlator/ClassCalculate.cs
index 70dd40c..9a56005 100644
--- a/PipeGallery/Correlator/ClassCalculate.cs
+++ b/PipeGallery/Correlator/ClassCalculate.cs
@@ -5,6 +5,7 @@
using System.Windows.Forms;
using MathWorks.MATLAB.NET.Arrays;
using Newtonsoft.Json.Linq;
+using PipeGallery.Manage;
using PipeGallery.ViewModel;
namespace PipeGallery.Correlator
@@ -86,7 +87,7 @@
+ DateTime.Now.ToString("HHmmss") + ".txt";
FileStream fileStream = new FileStream(filename, FileMode.OpenOrCreate, FileAccess.ReadWrite);
- String locateData = "";
+ String locateData = DateTime.Now.ToString();
foreach (double d in vec1)
{
locateData += ((decimal)d).ToString("G") + "#";
@@ -121,7 +122,7 @@
MWNumericArray[] dis = new MWNumericArray[3] { 0, 0, 0 };
- MWNumericArray[] velo = new MWNumericArray[3] { 1, 1, 1 };
+ MWNumericArray[] velo = new MWNumericArray[3] { 1, 0, 0 };
for (int i = 0; i < CalculteSatus.MaterialDatas.Count && i < 3; i++)
@@ -130,53 +131,54 @@
velo[i] = CalculteSatus.MaterialDatas[i].Soundspeed;
}
-
- while (CalculteSatus.currNum <= CalculteSatus.totalNum)
- {
- if (CorrelatorDataSaveThread.isNoFilter)
- {
- if (HomePageViewModel.Instance.StartState)
- {
- Caculator((MWNumericArray)vec1, (MWNumericArray)vec2, fs, dis, velo);
-
- //Caculator((MWNumericArray)vec1, (MWNumericArray)vec2, fs, dis, material, diamLow, diamHigh, CalculteSatus.SoundSpeed);
- }
- else
- {
- break;
- }
- }
- //else//滤波功能，暂时使用不到，先注释掉
- //{
- // int count = CorrelatorDataSaveThread.devDataValueMap[device2].Count;
-
- // for (int i = 0; i < 7; i++)
- // {
- // if (HomePageViewModel.Instance.StartState)
- // {
- // int count1 = CorrelatorDataSaveThread.devDataValueMap[device2].Count;
-
- // if (count + i == count1)
- // {
- // vec1 = CorrelatorDataSaveThread.devDataValueMap[device1][count - 1];//采集数据
- // vec2 = CorrelatorDataSaveThread.devDataValueMap[device2][count - 1];
-
- // //Caculator((MWNumericArray)vec1, (MWNumericArray)vec2, fs, dis, material, diamLow, diamHigh, CalculteSatus.SoundSpeed);
- // }
- // else
- // {
- // Thread.Sleep(2000);
- // i--;
- // }
- // }
- // else
- // {
- // i = 8;
- // }
- // }
- // break;
- //}
- }
+ //TODO 2022-11-29 暂时只测试一次，方便定位
+ Caculator((MWNumericArray)vec1, (MWNumericArray)vec2, fs, dis, velo);
+ // while (CalculteSatus.currNum <= CalculteSatus.totalNum)
+ // {
+ // if (CorrelatorDataSaveThread.isNoFilter)
+ // {
+ // if (HomePageViewModel.Instance.StartState)
+ // {
+ // Caculator((MWNumericArray)vec1, (MWNumericArray)vec2, fs, dis, velo);
+ //
+ // //Caculator((MWNumericArray)vec1, (MWNumericArray)vec2, fs, dis, material, diamLow, diamHigh, CalculteSatus.SoundSpeed);
+ // }
+ // else
+ // {
+ // break;
+ // }
+ // }
+ // //else//滤波功能，暂时使用不到，先注释掉
+ // //{
+ // // int count = CorrelatorDataSaveThread.devDataValueMap[device2].Count;
+ //
+ // // for (int i = 0; i < 7; i++)
+ // // {
+ // // if (HomePageViewModel.Instance.StartState)
+ // // {
+ // // int count1 = CorrelatorDataSaveThread.devDataValueMap[device2].Count;
+ //
+ // // if (count + i == count1)
+ // // {
+ // // vec1 = CorrelatorDataSaveThread.devDataValueMap[device1][count - 1];//采集数据
+ // // vec2 = CorrelatorDataSaveThread.devDataValueMap[device2][count - 1];
+ //
+ // // //Caculator((MWNumericArray)vec1, (MWNumericArray)vec2, fs, dis, material, diamLow, diamHigh, CalculteSatus.SoundSpeed);
+ // // }
+ // // else
+ // // {
+ // // Thread.Sleep(2000);
+ // // i--;
+ // // }
+ // // }
+ // // else
+ // // {
+ // // i = 8;
+ // // }
+ // // }
+ // // break;
+ // //}
+ // }
CalculteSatus.disAs.Add(HomePageViewModel.Instance.TransmitterADistance);
CalculteSatus.disBs.Add(HomePageViewModel.Instance.TransmitterBDistance);
@@ -207,9 +209,9 @@
//MWNumericArray vecBMW = vec2;//传感器B数据
//MWNumericArray fs = 7500;//采样率
//MWNumericArray dis = CalculteSatus.lengthData; // 97.5是距离，用户输入
- //MWNumericArray material = PipeMaterial.MaterialMap[CalculteSatus.MaterialData];//管材
- //MWNumericArray diamLow = lowDiameter; //管径范围下限，要准确无误
- //MWNumericArray diamHigh = highDiameter; //管径范围上限，要准确无误
+ MWNumericArray material = PipeMaterial.MaterialMap[CalculteSatus.MaterialData]; //管材
+ MWNumericArray diamLow = CalculteSatus.lowDiameter; //管径范围下限，要准确无误
+ MWNumericArray diamHigh = CalculteSatus.highDiameter; //管径范围上限，要准确无误
//MWNumericArray velo = getVelo(CalculteSatus.MaterialData, lowDiameter, highDiameter);//声速
MWNumericArray currNum = CalculteSatus.currNum; //当前数据调用次数，从1开始，不超过totalNum，每次调用后会返回totalNum
MWNumericArray maxSnrIn = CalculteSatus.maxSnrIn; //currNum = 1时赋值-1，currNum > 1时赋值上次调用返回的snr
@@ -222,7 +224,9 @@
//接口调用：
Object[] outList = correlator.locating(11, vecAMW, vecBMW, fs, dis[0], velo[0], dis[1], velo[1], dis[2],
- velo[2], currNum, maxSnrIn, maxFreLowIn, maxFreHighIn, cutFreLow, cutFreHigh);
+ velo[2], material, diamLow, diamHigh, currNum, maxSnrIn, maxFreLowIn, maxFreHighIn, cutFreLow,
+ cutFreHigh);
+ LogHelper.Info("算法结果数据：" + outList);
//Object[] outList = CorrelatorDataSaveThread.isNoFilter ? correlator.locating(11, vecAMW, vecBMW, fs, dis, velo, material, diamLow, diamHigh, currNum, maxSnrIn, maxFreLowIn, maxFreHighIn, cutFreLow, cutFreHigh) :
//correlator.typicalFreInter(7, vecAMW, vecBMW, fs, CorrelatorDataSaveThread.filterInfo.LowPass, CorrelatorDataSaveThread.filterInfo.HighPass, dis, velo);
diff --git a/PipeGallery/MainWindow.xaml b/PipeGallery/MainWindow.xaml
index e33b11b..746bc2f 100644
--- a/PipeGallery/MainWindow.xaml
+++ b/PipeGallery/MainWindow.xaml
@@ -5,10 +5,8 @@
Title="相关仪"
Background="Transparent"
Left="0"
- ResizeMode="NoResize"
Top="0"
WindowStartupLocation="Manual"
- WindowState="Maximized"
- WindowStyle="None">
+ WindowState="Maximized">
diff --git a/PipeGallery/PipeGallery.csproj b/PipeGallery/PipeGallery.csproj
index d3c25a1..86fc3f3 100644
--- a/PipeGallery/PipeGallery.csproj
+++ b/PipeGallery/PipeGallery.csproj
@@ -26,19 +26,19 @@
2
false
-
- AnyCPU
- pdbonly
- true
- ..\bin\
- TRACE
- prompt
- 3
- false
-
-
- app.manifest
-
+
+ AnyCPU
+ pdbonly
+ true
+ ..\bin\
+ TRACE
+ prompt
+ 3
+ false
+
+
+ app.manifest
+
False
@@ -46,7 +46,7 @@
False
- ..\bin\CorrelatorSingle.dll
+ C:\Users\Administrator\Desktop\dll\国外\CorrelatorSingle.dll
False
@@ -82,26 +82,26 @@
-
-
-
- MSBuild:Compile
- Designer
-
-
- BaseControl.xaml
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ MSBuild:Compile
+ Designer
+
+
+ BaseControl.xaml
+
+
+
+
+
+
+
+
+
+
+
+
@@ -558,46 +558,46 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+ Other similar extension points exist, see Microsoft.Common.targets.
+
+
+
+
+ -->
\ No newline at end of file
diff --git a/PipeGallery.sln b/PipeGallery.sln
index 1d7db57..3ce323f 100644
--- a/PipeGallery.sln
+++ b/PipeGallery.sln
@@ -1,10 +1,12 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
+# Visual Studio Version 17
+VisualStudioVersion = 17.3.32819.101
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PipeGallery", "PipeGallery\PipeGallery.csproj", "{FB422BF3-8715-42B6-9D6B-535A2C8079E3}"
EndProject
+Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Correlator", "..\..\Setup Project\相关仪\Correlator\Correlator.vdproj", "{22C1AFF0-9FA7-41D6-B859-CEA89A4715EA}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -15,8 +17,13 @@
{FB422BF3-8715-42B6-9D6B-535A2C8079E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FB422BF3-8715-42B6-9D6B-535A2C8079E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FB422BF3-8715-42B6-9D6B-535A2C8079E3}.Release|Any CPU.Build.0 = Release|Any CPU
+ {22C1AFF0-9FA7-41D6-B859-CEA89A4715EA}.Debug|Any CPU.ActiveCfg = Debug
+ {22C1AFF0-9FA7-41D6-B859-CEA89A4715EA}.Release|Any CPU.ActiveCfg = Release
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {D54F993F-9061-42BA-A718-E69B335466D8}
+ EndGlobalSection
EndGlobal
diff --git a/PipeGallery/Converter/SignalIntensityImageConverter.cs b/PipeGallery/Converter/SignalIntensityImageConverter.cs
index 9ba84b8..0ac4aea 100644
--- a/PipeGallery/Converter/SignalIntensityImageConverter.cs
+++ b/PipeGallery/Converter/SignalIntensityImageConverter.cs
@@ -1,4 +1,5 @@
using System;
+using System.Globalization;
using System.Windows.Data;
using System.Windows.Media.Imaging;
@@ -6,7 +7,7 @@
{
public class SignalIntensityImageConverter : IValueConverter
{
- public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+ public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
try
{
@@ -18,29 +19,17 @@
switch (signalIntensity)
{
case 0:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\l_icon0.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/l_icon0.png", UriKind.RelativeOrAbsolute));
case 1:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\l_icon1.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/l_icon1.png", UriKind.RelativeOrAbsolute));
case 2:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\l_icon2.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/l_icon2.png", UriKind.RelativeOrAbsolute));
case 3:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\l_icon3.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/l_icon3.png", UriKind.RelativeOrAbsolute));
case 4:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\l_icon4.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/l_icon4.png", UriKind.RelativeOrAbsolute));
case 5:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\l_icon5.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/l_icon5.png", UriKind.RelativeOrAbsolute));
}
}
else if (p == 1)
@@ -49,29 +38,17 @@
switch (signalIntensity)
{
case 0:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\r_icon0.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/r_icon0.png", UriKind.RelativeOrAbsolute));
case 1:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\r_icon1.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/r_icon1.png", UriKind.RelativeOrAbsolute));
case 2:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\r_icon2.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/r_icon2.png", UriKind.RelativeOrAbsolute));
case 3:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\r_icon3.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/r_icon3.png", UriKind.RelativeOrAbsolute));
case 4:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\r_icon4.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/r_icon4.png", UriKind.RelativeOrAbsolute));
case 5:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\r_icon5.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/r_icon5.png", UriKind.RelativeOrAbsolute));
}
}
else if (p == 2)
@@ -79,15 +56,11 @@
bool fault = (bool)value;
if (fault)
{
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\d1_r.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/d1_r.png", UriKind.RelativeOrAbsolute));
}
else
{
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\d2_r.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/d2_r.png", UriKind.RelativeOrAbsolute));
}
}
else if (p == 3)
@@ -95,15 +68,11 @@
bool fault = (bool)value;
if (fault)
{
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\d1_b.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/d1_b.png", UriKind.RelativeOrAbsolute));
}
else
{
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\d2_b.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/d2_b.png", UriKind.RelativeOrAbsolute));
}
}
else if (p == 4)
@@ -112,29 +81,17 @@
switch (signalIntensity)
{
case 0:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon1.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon1.png", UriKind.RelativeOrAbsolute));
case 1:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon2.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon2.png", UriKind.RelativeOrAbsolute));
case 2:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon3.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon3.png", UriKind.RelativeOrAbsolute));
case 3:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon4.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon4.png", UriKind.RelativeOrAbsolute));
case 4:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon5.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon5.png", UriKind.RelativeOrAbsolute));
case 5:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon6.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon6.png", UriKind.RelativeOrAbsolute));
}
}
else if (p == 5)
@@ -143,29 +100,17 @@
switch (signalIntensity)
{
case 0:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon1.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon1.png", UriKind.RelativeOrAbsolute));
case 1:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon7.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon7.png", UriKind.RelativeOrAbsolute));
case 2:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon8.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon8.png", UriKind.RelativeOrAbsolute));
case 3:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon9.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon9.png", UriKind.RelativeOrAbsolute));
case 4:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon10.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon10.png", UriKind.RelativeOrAbsolute));
case 5:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon11.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon11.png", UriKind.RelativeOrAbsolute));
}
}
else if (p == 6)
@@ -174,29 +119,17 @@
switch (signalIntensity)
{
case 0:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyl_icon1.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyl_icon1.png", UriKind.RelativeOrAbsolute));
case 1:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyl_icon2.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyl_icon2.png", UriKind.RelativeOrAbsolute));
case 2:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyl_icon3.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyl_icon3.png", UriKind.RelativeOrAbsolute));
case 3:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyl_icon4.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyl_icon4.png", UriKind.RelativeOrAbsolute));
case 4:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyl_icon5.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyl_icon5.png", UriKind.RelativeOrAbsolute));
case 5:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyl_icon6.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyl_icon6.png", UriKind.RelativeOrAbsolute));
}
}
else if (p == 7)
@@ -205,42 +138,26 @@
switch (signalIntensity)
{
case 0:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyr_icon1.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyr_icon1.png", UriKind.RelativeOrAbsolute));
case 1:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyr_icon2.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyr_icon2.png", UriKind.RelativeOrAbsolute));
case 2:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyr_icon3.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyr_icon3.png", UriKind.RelativeOrAbsolute));
case 3:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyr_icon4.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyr_icon4.png", UriKind.RelativeOrAbsolute));
case 4:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyr_icon5.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyr_icon5.png", UriKind.RelativeOrAbsolute));
case 5:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyr_icon6.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyr_icon6.png", UriKind.RelativeOrAbsolute));
}
}
else if (p == 8)
{
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyl_icon7.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyl_icon7.png", UriKind.RelativeOrAbsolute));
}
else if (p == 9)
{
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyr_icon7.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyr_icon7.png", UriKind.RelativeOrAbsolute));
}
return null;
@@ -252,7 +169,7 @@
}
public object ConvertBack(object value, Type targetType, object parameter,
- System.Globalization.CultureInfo culture)
+ CultureInfo culture)
{
throw new NotImplementedException();
}
diff --git a/PipeGallery/Correlator/ClassCalculate.cs b/PipeGallery/Correlator/ClassCalculate.cs
index 70dd40c..9a56005 100644
--- a/PipeGallery/Correlator/ClassCalculate.cs
+++ b/PipeGallery/Correlator/ClassCalculate.cs
@@ -5,6 +5,7 @@
using System.Windows.Forms;
using MathWorks.MATLAB.NET.Arrays;
using Newtonsoft.Json.Linq;
+using PipeGallery.Manage;
using PipeGallery.ViewModel;
namespace PipeGallery.Correlator
@@ -86,7 +87,7 @@
+ DateTime.Now.ToString("HHmmss") + ".txt";
FileStream fileStream = new FileStream(filename, FileMode.OpenOrCreate, FileAccess.ReadWrite);
- String locateData = "";
+ String locateData = DateTime.Now.ToString();
foreach (double d in vec1)
{
locateData += ((decimal)d).ToString("G") + "#";
@@ -121,7 +122,7 @@
MWNumericArray[] dis = new MWNumericArray[3] { 0, 0, 0 };
- MWNumericArray[] velo = new MWNumericArray[3] { 1, 1, 1 };
+ MWNumericArray[] velo = new MWNumericArray[3] { 1, 0, 0 };
for (int i = 0; i < CalculteSatus.MaterialDatas.Count && i < 3; i++)
@@ -130,53 +131,54 @@
velo[i] = CalculteSatus.MaterialDatas[i].Soundspeed;
}
-
- while (CalculteSatus.currNum <= CalculteSatus.totalNum)
- {
- if (CorrelatorDataSaveThread.isNoFilter)
- {
- if (HomePageViewModel.Instance.StartState)
- {
- Caculator((MWNumericArray)vec1, (MWNumericArray)vec2, fs, dis, velo);
-
- //Caculator((MWNumericArray)vec1, (MWNumericArray)vec2, fs, dis, material, diamLow, diamHigh, CalculteSatus.SoundSpeed);
- }
- else
- {
- break;
- }
- }
- //else//滤波功能，暂时使用不到，先注释掉
- //{
- // int count = CorrelatorDataSaveThread.devDataValueMap[device2].Count;
-
- // for (int i = 0; i < 7; i++)
- // {
- // if (HomePageViewModel.Instance.StartState)
- // {
- // int count1 = CorrelatorDataSaveThread.devDataValueMap[device2].Count;
-
- // if (count + i == count1)
- // {
- // vec1 = CorrelatorDataSaveThread.devDataValueMap[device1][count - 1];//采集数据
- // vec2 = CorrelatorDataSaveThread.devDataValueMap[device2][count - 1];
-
- // //Caculator((MWNumericArray)vec1, (MWNumericArray)vec2, fs, dis, material, diamLow, diamHigh, CalculteSatus.SoundSpeed);
- // }
- // else
- // {
- // Thread.Sleep(2000);
- // i--;
- // }
- // }
- // else
- // {
- // i = 8;
- // }
- // }
- // break;
- //}
- }
+ //TODO 2022-11-29 暂时只测试一次，方便定位
+ Caculator((MWNumericArray)vec1, (MWNumericArray)vec2, fs, dis, velo);
+ // while (CalculteSatus.currNum <= CalculteSatus.totalNum)
+ // {
+ // if (CorrelatorDataSaveThread.isNoFilter)
+ // {
+ // if (HomePageViewModel.Instance.StartState)
+ // {
+ // Caculator((MWNumericArray)vec1, (MWNumericArray)vec2, fs, dis, velo);
+ //
+ // //Caculator((MWNumericArray)vec1, (MWNumericArray)vec2, fs, dis, material, diamLow, diamHigh, CalculteSatus.SoundSpeed);
+ // }
+ // else
+ // {
+ // break;
+ // }
+ // }
+ // //else//滤波功能，暂时使用不到，先注释掉
+ // //{
+ // // int count = CorrelatorDataSaveThread.devDataValueMap[device2].Count;
+ //
+ // // for (int i = 0; i < 7; i++)
+ // // {
+ // // if (HomePageViewModel.Instance.StartState)
+ // // {
+ // // int count1 = CorrelatorDataSaveThread.devDataValueMap[device2].Count;
+ //
+ // // if (count + i == count1)
+ // // {
+ // // vec1 = CorrelatorDataSaveThread.devDataValueMap[device1][count - 1];//采集数据
+ // // vec2 = CorrelatorDataSaveThread.devDataValueMap[device2][count - 1];
+ //
+ // // //Caculator((MWNumericArray)vec1, (MWNumericArray)vec2, fs, dis, material, diamLow, diamHigh, CalculteSatus.SoundSpeed);
+ // // }
+ // // else
+ // // {
+ // // Thread.Sleep(2000);
+ // // i--;
+ // // }
+ // // }
+ // // else
+ // // {
+ // // i = 8;
+ // // }
+ // // }
+ // // break;
+ // //}
+ // }
CalculteSatus.disAs.Add(HomePageViewModel.Instance.TransmitterADistance);
CalculteSatus.disBs.Add(HomePageViewModel.Instance.TransmitterBDistance);
@@ -207,9 +209,9 @@
//MWNumericArray vecBMW = vec2;//传感器B数据
//MWNumericArray fs = 7500;//采样率
//MWNumericArray dis = CalculteSatus.lengthData; // 97.5是距离，用户输入
- //MWNumericArray material = PipeMaterial.MaterialMap[CalculteSatus.MaterialData];//管材
- //MWNumericArray diamLow = lowDiameter; //管径范围下限，要准确无误
- //MWNumericArray diamHigh = highDiameter; //管径范围上限，要准确无误
+ MWNumericArray material = PipeMaterial.MaterialMap[CalculteSatus.MaterialData]; //管材
+ MWNumericArray diamLow = CalculteSatus.lowDiameter; //管径范围下限，要准确无误
+ MWNumericArray diamHigh = CalculteSatus.highDiameter; //管径范围上限，要准确无误
//MWNumericArray velo = getVelo(CalculteSatus.MaterialData, lowDiameter, highDiameter);//声速
MWNumericArray currNum = CalculteSatus.currNum; //当前数据调用次数，从1开始，不超过totalNum，每次调用后会返回totalNum
MWNumericArray maxSnrIn = CalculteSatus.maxSnrIn; //currNum = 1时赋值-1，currNum > 1时赋值上次调用返回的snr
@@ -222,7 +224,9 @@
//接口调用：
Object[] outList = correlator.locating(11, vecAMW, vecBMW, fs, dis[0], velo[0], dis[1], velo[1], dis[2],
- velo[2], currNum, maxSnrIn, maxFreLowIn, maxFreHighIn, cutFreLow, cutFreHigh);
+ velo[2], material, diamLow, diamHigh, currNum, maxSnrIn, maxFreLowIn, maxFreHighIn, cutFreLow,
+ cutFreHigh);
+ LogHelper.Info("算法结果数据：" + outList);
//Object[] outList = CorrelatorDataSaveThread.isNoFilter ? correlator.locating(11, vecAMW, vecBMW, fs, dis, velo, material, diamLow, diamHigh, currNum, maxSnrIn, maxFreLowIn, maxFreHighIn, cutFreLow, cutFreHigh) :
//correlator.typicalFreInter(7, vecAMW, vecBMW, fs, CorrelatorDataSaveThread.filterInfo.LowPass, CorrelatorDataSaveThread.filterInfo.HighPass, dis, velo);
diff --git a/PipeGallery/MainWindow.xaml b/PipeGallery/MainWindow.xaml
index e33b11b..746bc2f 100644
--- a/PipeGallery/MainWindow.xaml
+++ b/PipeGallery/MainWindow.xaml
@@ -5,10 +5,8 @@
Title="相关仪"
Background="Transparent"
Left="0"
- ResizeMode="NoResize"
Top="0"
WindowStartupLocation="Manual"
- WindowState="Maximized"
- WindowStyle="None">
+ WindowState="Maximized">
diff --git a/PipeGallery/PipeGallery.csproj b/PipeGallery/PipeGallery.csproj
index d3c25a1..86fc3f3 100644
--- a/PipeGallery/PipeGallery.csproj
+++ b/PipeGallery/PipeGallery.csproj
@@ -26,19 +26,19 @@
2
false
-
- AnyCPU
- pdbonly
- true
- ..\bin\
- TRACE
- prompt
- 3
- false
-
-
- app.manifest
-
+
+ AnyCPU
+ pdbonly
+ true
+ ..\bin\
+ TRACE
+ prompt
+ 3
+ false
+
+
+ app.manifest
+
False
@@ -46,7 +46,7 @@
False
- ..\bin\CorrelatorSingle.dll
+ C:\Users\Administrator\Desktop\dll\国外\CorrelatorSingle.dll
False
@@ -82,26 +82,26 @@
-
-
-
- MSBuild:Compile
- Designer
-
-
- BaseControl.xaml
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ MSBuild:Compile
+ Designer
+
+
+ BaseControl.xaml
+
+
+
+
+
+
+
+
+
+
+
+
@@ -558,46 +558,46 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+ Other similar extension points exist, see Microsoft.Common.targets.
+
+
+
+
+ -->
\ No newline at end of file
diff --git a/bin/CorrelatorSingle.dll b/bin/CorrelatorSingle.dll
index fd5c607..e86c578 100644
--- a/bin/CorrelatorSingle.dll
+++ b/bin/CorrelatorSingle.dll
Binary files differ
diff --git a/PipeGallery.sln b/PipeGallery.sln
index 1d7db57..3ce323f 100644
--- a/PipeGallery.sln
+++ b/PipeGallery.sln
@@ -1,10 +1,12 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
+# Visual Studio Version 17
+VisualStudioVersion = 17.3.32819.101
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PipeGallery", "PipeGallery\PipeGallery.csproj", "{FB422BF3-8715-42B6-9D6B-535A2C8079E3}"
EndProject
+Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Correlator", "..\..\Setup Project\相关仪\Correlator\Correlator.vdproj", "{22C1AFF0-9FA7-41D6-B859-CEA89A4715EA}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -15,8 +17,13 @@
{FB422BF3-8715-42B6-9D6B-535A2C8079E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FB422BF3-8715-42B6-9D6B-535A2C8079E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FB422BF3-8715-42B6-9D6B-535A2C8079E3}.Release|Any CPU.Build.0 = Release|Any CPU
+ {22C1AFF0-9FA7-41D6-B859-CEA89A4715EA}.Debug|Any CPU.ActiveCfg = Debug
+ {22C1AFF0-9FA7-41D6-B859-CEA89A4715EA}.Release|Any CPU.ActiveCfg = Release
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {D54F993F-9061-42BA-A718-E69B335466D8}
+ EndGlobalSection
EndGlobal
diff --git a/PipeGallery/Converter/SignalIntensityImageConverter.cs b/PipeGallery/Converter/SignalIntensityImageConverter.cs
index 9ba84b8..0ac4aea 100644
--- a/PipeGallery/Converter/SignalIntensityImageConverter.cs
+++ b/PipeGallery/Converter/SignalIntensityImageConverter.cs
@@ -1,4 +1,5 @@
using System;
+using System.Globalization;
using System.Windows.Data;
using System.Windows.Media.Imaging;
@@ -6,7 +7,7 @@
{
public class SignalIntensityImageConverter : IValueConverter
{
- public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+ public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
try
{
@@ -18,29 +19,17 @@
switch (signalIntensity)
{
case 0:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\l_icon0.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/l_icon0.png", UriKind.RelativeOrAbsolute));
case 1:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\l_icon1.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/l_icon1.png", UriKind.RelativeOrAbsolute));
case 2:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\l_icon2.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/l_icon2.png", UriKind.RelativeOrAbsolute));
case 3:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\l_icon3.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/l_icon3.png", UriKind.RelativeOrAbsolute));
case 4:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\l_icon4.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/l_icon4.png", UriKind.RelativeOrAbsolute));
case 5:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\l_icon5.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/l_icon5.png", UriKind.RelativeOrAbsolute));
}
}
else if (p == 1)
@@ -49,29 +38,17 @@
switch (signalIntensity)
{
case 0:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\r_icon0.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/r_icon0.png", UriKind.RelativeOrAbsolute));
case 1:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\r_icon1.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/r_icon1.png", UriKind.RelativeOrAbsolute));
case 2:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\r_icon2.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/r_icon2.png", UriKind.RelativeOrAbsolute));
case 3:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\r_icon3.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/r_icon3.png", UriKind.RelativeOrAbsolute));
case 4:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\r_icon4.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/r_icon4.png", UriKind.RelativeOrAbsolute));
case 5:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\r_icon5.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/r_icon5.png", UriKind.RelativeOrAbsolute));
}
}
else if (p == 2)
@@ -79,15 +56,11 @@
bool fault = (bool)value;
if (fault)
{
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\d1_r.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/d1_r.png", UriKind.RelativeOrAbsolute));
}
else
{
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\d2_r.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/d2_r.png", UriKind.RelativeOrAbsolute));
}
}
else if (p == 3)
@@ -95,15 +68,11 @@
bool fault = (bool)value;
if (fault)
{
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\d1_b.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/d1_b.png", UriKind.RelativeOrAbsolute));
}
else
{
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\d2_b.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/d2_b.png", UriKind.RelativeOrAbsolute));
}
}
else if (p == 4)
@@ -112,29 +81,17 @@
switch (signalIntensity)
{
case 0:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon1.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon1.png", UriKind.RelativeOrAbsolute));
case 1:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon2.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon2.png", UriKind.RelativeOrAbsolute));
case 2:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon3.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon3.png", UriKind.RelativeOrAbsolute));
case 3:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon4.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon4.png", UriKind.RelativeOrAbsolute));
case 4:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon5.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon5.png", UriKind.RelativeOrAbsolute));
case 5:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon6.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon6.png", UriKind.RelativeOrAbsolute));
}
}
else if (p == 5)
@@ -143,29 +100,17 @@
switch (signalIntensity)
{
case 0:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon1.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon1.png", UriKind.RelativeOrAbsolute));
case 1:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon7.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon7.png", UriKind.RelativeOrAbsolute));
case 2:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon8.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon8.png", UriKind.RelativeOrAbsolute));
case 3:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon9.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon9.png", UriKind.RelativeOrAbsolute));
case 4:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon10.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon10.png", UriKind.RelativeOrAbsolute));
case 5:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\gl_icon11.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/gl_icon11.png", UriKind.RelativeOrAbsolute));
}
}
else if (p == 6)
@@ -174,29 +119,17 @@
switch (signalIntensity)
{
case 0:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyl_icon1.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyl_icon1.png", UriKind.RelativeOrAbsolute));
case 1:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyl_icon2.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyl_icon2.png", UriKind.RelativeOrAbsolute));
case 2:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyl_icon3.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyl_icon3.png", UriKind.RelativeOrAbsolute));
case 3:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyl_icon4.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyl_icon4.png", UriKind.RelativeOrAbsolute));
case 4:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyl_icon5.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyl_icon5.png", UriKind.RelativeOrAbsolute));
case 5:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyl_icon6.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyl_icon6.png", UriKind.RelativeOrAbsolute));
}
}
else if (p == 7)
@@ -205,42 +138,26 @@
switch (signalIntensity)
{
case 0:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyr_icon1.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyr_icon1.png", UriKind.RelativeOrAbsolute));
case 1:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyr_icon2.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyr_icon2.png", UriKind.RelativeOrAbsolute));
case 2:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyr_icon3.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyr_icon3.png", UriKind.RelativeOrAbsolute));
case 3:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyr_icon4.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyr_icon4.png", UriKind.RelativeOrAbsolute));
case 4:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyr_icon5.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyr_icon5.png", UriKind.RelativeOrAbsolute));
case 5:
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyr_icon6.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyr_icon6.png", UriKind.RelativeOrAbsolute));
}
}
else if (p == 8)
{
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyl_icon7.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyl_icon7.png", UriKind.RelativeOrAbsolute));
}
else if (p == 9)
{
- return new BitmapImage(new Uri(
- AppDomain.CurrentDomain.BaseDirectory + @"Resource\Image\tyr_icon7.png",
- UriKind.RelativeOrAbsolute));
+ return new BitmapImage(new Uri(@"/Image/tyr_icon7.png", UriKind.RelativeOrAbsolute));
}
return null;
@@ -252,7 +169,7 @@
}
public object ConvertBack(object value, Type targetType, object parameter,
- System.Globalization.CultureInfo culture)
+ CultureInfo culture)
{
throw new NotImplementedException();
}
diff --git a/PipeGallery/Correlator/ClassCalculate.cs b/PipeGallery/Correlator/ClassCalculate.cs
index 70dd40c..9a56005 100644
--- a/PipeGallery/Correlator/ClassCalculate.cs
+++ b/PipeGallery/Correlator/ClassCalculate.cs
@@ -5,6 +5,7 @@
using System.Windows.Forms;
using MathWorks.MATLAB.NET.Arrays;
using Newtonsoft.Json.Linq;
+using PipeGallery.Manage;
using PipeGallery.ViewModel;
namespace PipeGallery.Correlator
@@ -86,7 +87,7 @@
+ DateTime.Now.ToString("HHmmss") + ".txt";
FileStream fileStream = new FileStream(filename, FileMode.OpenOrCreate, FileAccess.ReadWrite);
- String locateData = "";
+ String locateData = DateTime.Now.ToString();
foreach (double d in vec1)
{
locateData += ((decimal)d).ToString("G") + "#";
@@ -121,7 +122,7 @@
MWNumericArray[] dis = new MWNumericArray[3] { 0, 0, 0 };
- MWNumericArray[] velo = new MWNumericArray[3] { 1, 1, 1 };
+ MWNumericArray[] velo = new MWNumericArray[3] { 1, 0, 0 };
for (int i = 0; i < CalculteSatus.MaterialDatas.Count && i < 3; i++)
@@ -130,53 +131,54 @@
velo[i] = CalculteSatus.MaterialDatas[i].Soundspeed;
}
-
- while (CalculteSatus.currNum <= CalculteSatus.totalNum)
- {
- if (CorrelatorDataSaveThread.isNoFilter)
- {
- if (HomePageViewModel.Instance.StartState)
- {
- Caculator((MWNumericArray)vec1, (MWNumericArray)vec2, fs, dis, velo);
-
- //Caculator((MWNumericArray)vec1, (MWNumericArray)vec2, fs, dis, material, diamLow, diamHigh, CalculteSatus.SoundSpeed);
- }
- else
- {
- break;
- }
- }
- //else//滤波功能，暂时使用不到，先注释掉
- //{
- // int count = CorrelatorDataSaveThread.devDataValueMap[device2].Count;
-
- // for (int i = 0; i < 7; i++)
- // {
- // if (HomePageViewModel.Instance.StartState)
- // {
- // int count1 = CorrelatorDataSaveThread.devDataValueMap[device2].Count;
-
- // if (count + i == count1)
- // {
- // vec1 = CorrelatorDataSaveThread.devDataValueMap[device1][count - 1];//采集数据
- // vec2 = CorrelatorDataSaveThread.devDataValueMap[device2][count - 1];
-
- // //Caculator((MWNumericArray)vec1, (MWNumericArray)vec2, fs, dis, material, diamLow, diamHigh, CalculteSatus.SoundSpeed);
- // }
- // else
- // {
- // Thread.Sleep(2000);
- // i--;
- // }
- // }
- // else
- // {
- // i = 8;
- // }
- // }
- // break;
- //}
- }
+ //TODO 2022-11-29 暂时只测试一次，方便定位
+ Caculator((MWNumericArray)vec1, (MWNumericArray)vec2, fs, dis, velo);
+ // while (CalculteSatus.currNum <= CalculteSatus.totalNum)
+ // {
+ // if (CorrelatorDataSaveThread.isNoFilter)
+ // {
+ // if (HomePageViewModel.Instance.StartState)
+ // {
+ // Caculator((MWNumericArray)vec1, (MWNumericArray)vec2, fs, dis, velo);
+ //
+ // //Caculator((MWNumericArray)vec1, (MWNumericArray)vec2, fs, dis, material, diamLow, diamHigh, CalculteSatus.SoundSpeed);
+ // }
+ // else
+ // {
+ // break;
+ // }
+ // }
+ // //else//滤波功能，暂时使用不到，先注释掉
+ // //{
+ // // int count = CorrelatorDataSaveThread.devDataValueMap[device2].Count;
+ //
+ // // for (int i = 0; i < 7; i++)
+ // // {
+ // // if (HomePageViewModel.Instance.StartState)
+ // // {
+ // // int count1 = CorrelatorDataSaveThread.devDataValueMap[device2].Count;
+ //
+ // // if (count + i == count1)
+ // // {
+ // // vec1 = CorrelatorDataSaveThread.devDataValueMap[device1][count - 1];//采集数据
+ // // vec2 = CorrelatorDataSaveThread.devDataValueMap[device2][count - 1];
+ //
+ // // //Caculator((MWNumericArray)vec1, (MWNumericArray)vec2, fs, dis, material, diamLow, diamHigh, CalculteSatus.SoundSpeed);
+ // // }
+ // // else
+ // // {
+ // // Thread.Sleep(2000);
+ // // i--;
+ // // }
+ // // }
+ // // else
+ // // {
+ // // i = 8;
+ // // }
+ // // }
+ // // break;
+ // //}
+ // }
CalculteSatus.disAs.Add(HomePageViewModel.Instance.TransmitterADistance);
CalculteSatus.disBs.Add(HomePageViewModel.Instance.TransmitterBDistance);
@@ -207,9 +209,9 @@
//MWNumericArray vecBMW = vec2;//传感器B数据
//MWNumericArray fs = 7500;//采样率
//MWNumericArray dis = CalculteSatus.lengthData; // 97.5是距离，用户输入
- //MWNumericArray material = PipeMaterial.MaterialMap[CalculteSatus.MaterialData];//管材
- //MWNumericArray diamLow = lowDiameter; //管径范围下限，要准确无误
- //MWNumericArray diamHigh = highDiameter; //管径范围上限，要准确无误
+ MWNumericArray material = PipeMaterial.MaterialMap[CalculteSatus.MaterialData]; //管材
+ MWNumericArray diamLow = CalculteSatus.lowDiameter; //管径范围下限，要准确无误
+ MWNumericArray diamHigh = CalculteSatus.highDiameter; //管径范围上限，要准确无误
//MWNumericArray velo = getVelo(CalculteSatus.MaterialData, lowDiameter, highDiameter);//声速
MWNumericArray currNum = CalculteSatus.currNum; //当前数据调用次数，从1开始，不超过totalNum，每次调用后会返回totalNum
MWNumericArray maxSnrIn = CalculteSatus.maxSnrIn; //currNum = 1时赋值-1，currNum > 1时赋值上次调用返回的snr
@@ -222,7 +224,9 @@
//接口调用：
Object[] outList = correlator.locating(11, vecAMW, vecBMW, fs, dis[0], velo[0], dis[1], velo[1], dis[2],
- velo[2], currNum, maxSnrIn, maxFreLowIn, maxFreHighIn, cutFreLow, cutFreHigh);
+ velo[2], material, diamLow, diamHigh, currNum, maxSnrIn, maxFreLowIn, maxFreHighIn, cutFreLow,
+ cutFreHigh);
+ LogHelper.Info("算法结果数据：" + outList);
//Object[] outList = CorrelatorDataSaveThread.isNoFilter ? correlator.locating(11, vecAMW, vecBMW, fs, dis, velo, material, diamLow, diamHigh, currNum, maxSnrIn, maxFreLowIn, maxFreHighIn, cutFreLow, cutFreHigh) :
//correlator.typicalFreInter(7, vecAMW, vecBMW, fs, CorrelatorDataSaveThread.filterInfo.LowPass, CorrelatorDataSaveThread.filterInfo.HighPass, dis, velo);
diff --git a/PipeGallery/MainWindow.xaml b/PipeGallery/MainWindow.xaml
index e33b11b..746bc2f 100644
--- a/PipeGallery/MainWindow.xaml
+++ b/PipeGallery/MainWindow.xaml
@@ -5,10 +5,8 @@
Title="相关仪"
Background="Transparent"
Left="0"
- ResizeMode="NoResize"
Top="0"
WindowStartupLocation="Manual"
- WindowState="Maximized"
- WindowStyle="None">
+ WindowState="Maximized">
diff --git a/PipeGallery/PipeGallery.csproj b/PipeGallery/PipeGallery.csproj
index d3c25a1..86fc3f3 100644
--- a/PipeGallery/PipeGallery.csproj
+++ b/PipeGallery/PipeGallery.csproj
@@ -26,19 +26,19 @@
2
false
-
- AnyCPU
- pdbonly
- true
- ..\bin\
- TRACE
- prompt
- 3
- false
-
-
- app.manifest
-
+
+ AnyCPU
+ pdbonly
+ true
+ ..\bin\
+ TRACE
+ prompt
+ 3
+ false
+
+
+ app.manifest
+
False
@@ -46,7 +46,7 @@
False
- ..\bin\CorrelatorSingle.dll
+ C:\Users\Administrator\Desktop\dll\国外\CorrelatorSingle.dll
False
@@ -82,26 +82,26 @@
-
-
-
- MSBuild:Compile
- Designer
-
-
- BaseControl.xaml
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ MSBuild:Compile
+ Designer
+
+
+ BaseControl.xaml
+
+
+
+
+
+
+
+
+
+
+
+
@@ -558,46 +558,46 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+ Other similar extension points exist, see Microsoft.Common.targets.
+
+
+
+
+ -->
\ No newline at end of file
diff --git a/bin/CorrelatorSingle.dll b/bin/CorrelatorSingle.dll
index fd5c607..e86c578 100644
--- a/bin/CorrelatorSingle.dll
+++ b/bin/CorrelatorSingle.dll
Binary files differ
diff --git a/bin/number.json b/bin/number.json
index ca35adb..d5ac6a0 100644
--- a/bin/number.json
+++ b/bin/number.json
@@ -1 +1 @@
-{"date":"20201222","pipe":1,"locate":1,"listen":5}
\ No newline at end of file
+{"date":"20221201","pipe":7,"locate":2,"listen":1}
\ No newline at end of file