diff --git a/Correlator/Converter/VisibilityConverter.cs b/Correlator/Converter/VisibilityConverter.cs
deleted file mode 100644
index a2a372c..0000000
--- a/Correlator/Converter/VisibilityConverter.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System;
-using System.Globalization;
-using System.Windows;
-using System.Windows.Data;
-
-namespace Correlator.Converter
-{
- public class VisibilityConverter : IValueConverter
- {
- public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
- {
- try
- {
- var p = System.Convert.ToInt32(parameter);
-
- switch (p)
- {
- case 0 when (bool)value:
- return Visibility.Collapsed;
- case 0:
- return Visibility.Visible;
- case 1:
- return value.ToString() == "0" ? Visibility.Collapsed : Visibility.Visible;
- case 2:
- return value.ToString() == "1" ? Visibility.Collapsed : Visibility.Visible;
- default:
- return null;
- }
- }
- catch
- {
- return null;
- }
- }
-
- public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
- {
- return null;
- }
- }
-}
\ No newline at end of file
diff --git a/Correlator/Converter/VisibilityConverter.cs b/Correlator/Converter/VisibilityConverter.cs
deleted file mode 100644
index a2a372c..0000000
--- a/Correlator/Converter/VisibilityConverter.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System;
-using System.Globalization;
-using System.Windows;
-using System.Windows.Data;
-
-namespace Correlator.Converter
-{
- public class VisibilityConverter : IValueConverter
- {
- public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
- {
- try
- {
- var p = System.Convert.ToInt32(parameter);
-
- switch (p)
- {
- case 0 when (bool)value:
- return Visibility.Collapsed;
- case 0:
- return Visibility.Visible;
- case 1:
- return value.ToString() == "0" ? Visibility.Collapsed : Visibility.Visible;
- case 2:
- return value.ToString() == "1" ? Visibility.Collapsed : Visibility.Visible;
- default:
- return null;
- }
- }
- catch
- {
- return null;
- }
- }
-
- public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
- {
- return null;
- }
- }
-}
\ No newline at end of file
diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj
index 7d21804..90ddb15 100644
--- a/Correlator/Correlator.csproj
+++ b/Correlator/Correlator.csproj
@@ -202,7 +202,6 @@
-
diff --git a/Correlator/Converter/VisibilityConverter.cs b/Correlator/Converter/VisibilityConverter.cs
deleted file mode 100644
index a2a372c..0000000
--- a/Correlator/Converter/VisibilityConverter.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System;
-using System.Globalization;
-using System.Windows;
-using System.Windows.Data;
-
-namespace Correlator.Converter
-{
- public class VisibilityConverter : IValueConverter
- {
- public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
- {
- try
- {
- var p = System.Convert.ToInt32(parameter);
-
- switch (p)
- {
- case 0 when (bool)value:
- return Visibility.Collapsed;
- case 0:
- return Visibility.Visible;
- case 1:
- return value.ToString() == "0" ? Visibility.Collapsed : Visibility.Visible;
- case 2:
- return value.ToString() == "1" ? Visibility.Collapsed : Visibility.Visible;
- default:
- return null;
- }
- }
- catch
- {
- return null;
- }
- }
-
- public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
- {
- return null;
- }
- }
-}
\ No newline at end of file
diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj
index 7d21804..90ddb15 100644
--- a/Correlator/Correlator.csproj
+++ b/Correlator/Correlator.csproj
@@ -202,7 +202,6 @@
-
diff --git a/Correlator/ViewModels/MainWindowViewModel.cs b/Correlator/ViewModels/MainWindowViewModel.cs
index e295fa2..426b759 100644
--- a/Correlator/ViewModels/MainWindowViewModel.cs
+++ b/Correlator/ViewModels/MainWindowViewModel.cs
@@ -103,14 +103,14 @@
///
/// 红色发射机信号强度0-5
///
- private int _redTransmitterSignalIntensity;
+ private int _redTransmitterSignal;
- public int RedTransmitterSignalIntensity
+ public int RedTransmitterSignal
{
- get => _redTransmitterSignalIntensity;
+ get => _redTransmitterSignal;
private set
{
- _redTransmitterSignalIntensity = value;
+ _redTransmitterSignal = value;
RaisePropertyChanged();
}
}
@@ -118,14 +118,14 @@
///
/// 蓝色发射机信号强度0-5
///
- private int _blueTransmitterSignalIntensity;
+ private int _blueTransmitterSignal;
- public int BlueTransmitterSignalIntensity
+ public int BlueTransmitterSignal
{
- get => _blueTransmitterSignalIntensity;
+ get => _blueTransmitterSignal;
private set
{
- _blueTransmitterSignalIntensity = value;
+ _blueTransmitterSignal = value;
RaisePropertyChanged();
}
}
@@ -495,7 +495,7 @@
//新协议不计算实际信号
RedTransmitterBattery = Convert.ToInt32(dev.Cell);
- RedTransmitterSignalIntensity = 5;
+ RedTransmitterSignal = 5;
RedTransmitterState = true;
RuntimeCache.RedSensorIsEnable = true;
});
@@ -506,7 +506,7 @@
//新协议不计算实际信号
BlueTransmitterBattery = Convert.ToInt32(dev.Cell);
- BlueTransmitterSignalIntensity = 5;
+ BlueTransmitterSignal = 5;
BlueTransmitterState = true;
RuntimeCache.BlueSensorIsEnable = true;
});
@@ -1128,11 +1128,11 @@
ConnectColorBrush = "LightGray";
RedTransmitterBattery = 0;
- RedTransmitterSignalIntensity = 0;
+ RedTransmitterSignal = 0;
RedTransmitterState = false;
BlueTransmitterBattery = 0;
- BlueTransmitterSignalIntensity = 0;
+ BlueTransmitterSignal = 0;
BlueTransmitterState = false;
RuntimeCache.RedSensorIsEnable = false;
diff --git a/Correlator/Converter/VisibilityConverter.cs b/Correlator/Converter/VisibilityConverter.cs
deleted file mode 100644
index a2a372c..0000000
--- a/Correlator/Converter/VisibilityConverter.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System;
-using System.Globalization;
-using System.Windows;
-using System.Windows.Data;
-
-namespace Correlator.Converter
-{
- public class VisibilityConverter : IValueConverter
- {
- public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
- {
- try
- {
- var p = System.Convert.ToInt32(parameter);
-
- switch (p)
- {
- case 0 when (bool)value:
- return Visibility.Collapsed;
- case 0:
- return Visibility.Visible;
- case 1:
- return value.ToString() == "0" ? Visibility.Collapsed : Visibility.Visible;
- case 2:
- return value.ToString() == "1" ? Visibility.Collapsed : Visibility.Visible;
- default:
- return null;
- }
- }
- catch
- {
- return null;
- }
- }
-
- public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
- {
- return null;
- }
- }
-}
\ No newline at end of file
diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj
index 7d21804..90ddb15 100644
--- a/Correlator/Correlator.csproj
+++ b/Correlator/Correlator.csproj
@@ -202,7 +202,6 @@
-
diff --git a/Correlator/ViewModels/MainWindowViewModel.cs b/Correlator/ViewModels/MainWindowViewModel.cs
index e295fa2..426b759 100644
--- a/Correlator/ViewModels/MainWindowViewModel.cs
+++ b/Correlator/ViewModels/MainWindowViewModel.cs
@@ -103,14 +103,14 @@
///
/// 红色发射机信号强度0-5
///
- private int _redTransmitterSignalIntensity;
+ private int _redTransmitterSignal;
- public int RedTransmitterSignalIntensity
+ public int RedTransmitterSignal
{
- get => _redTransmitterSignalIntensity;
+ get => _redTransmitterSignal;
private set
{
- _redTransmitterSignalIntensity = value;
+ _redTransmitterSignal = value;
RaisePropertyChanged();
}
}
@@ -118,14 +118,14 @@
///
/// 蓝色发射机信号强度0-5
///
- private int _blueTransmitterSignalIntensity;
+ private int _blueTransmitterSignal;
- public int BlueTransmitterSignalIntensity
+ public int BlueTransmitterSignal
{
- get => _blueTransmitterSignalIntensity;
+ get => _blueTransmitterSignal;
private set
{
- _blueTransmitterSignalIntensity = value;
+ _blueTransmitterSignal = value;
RaisePropertyChanged();
}
}
@@ -495,7 +495,7 @@
//新协议不计算实际信号
RedTransmitterBattery = Convert.ToInt32(dev.Cell);
- RedTransmitterSignalIntensity = 5;
+ RedTransmitterSignal = 5;
RedTransmitterState = true;
RuntimeCache.RedSensorIsEnable = true;
});
@@ -506,7 +506,7 @@
//新协议不计算实际信号
BlueTransmitterBattery = Convert.ToInt32(dev.Cell);
- BlueTransmitterSignalIntensity = 5;
+ BlueTransmitterSignal = 5;
BlueTransmitterState = true;
RuntimeCache.BlueSensorIsEnable = true;
});
@@ -1128,11 +1128,11 @@
ConnectColorBrush = "LightGray";
RedTransmitterBattery = 0;
- RedTransmitterSignalIntensity = 0;
+ RedTransmitterSignal = 0;
RedTransmitterState = false;
BlueTransmitterBattery = 0;
- BlueTransmitterSignalIntensity = 0;
+ BlueTransmitterSignal = 0;
BlueTransmitterState = false;
RuntimeCache.RedSensorIsEnable = false;
diff --git a/Correlator/ViewModels/NumericKeypadDialogViewModel.cs b/Correlator/ViewModels/NumericKeypadDialogViewModel.cs
index c75d639..58abe83 100644
--- a/Correlator/ViewModels/NumericKeypadDialogViewModel.cs
+++ b/Correlator/ViewModels/NumericKeypadDialogViewModel.cs
@@ -189,10 +189,6 @@
TextBoxName = RuntimeCache.FillDataTextBox,
NumberValue = number.ToString()
});
-
- //重置数字键盘参数
- NumberCache.Clear();
- RuntimeCache.FillDataTextBox = "PipeDiameterTextBox";
});
}
diff --git a/Correlator/Converter/VisibilityConverter.cs b/Correlator/Converter/VisibilityConverter.cs
deleted file mode 100644
index a2a372c..0000000
--- a/Correlator/Converter/VisibilityConverter.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System;
-using System.Globalization;
-using System.Windows;
-using System.Windows.Data;
-
-namespace Correlator.Converter
-{
- public class VisibilityConverter : IValueConverter
- {
- public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
- {
- try
- {
- var p = System.Convert.ToInt32(parameter);
-
- switch (p)
- {
- case 0 when (bool)value:
- return Visibility.Collapsed;
- case 0:
- return Visibility.Visible;
- case 1:
- return value.ToString() == "0" ? Visibility.Collapsed : Visibility.Visible;
- case 2:
- return value.ToString() == "1" ? Visibility.Collapsed : Visibility.Visible;
- default:
- return null;
- }
- }
- catch
- {
- return null;
- }
- }
-
- public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
- {
- return null;
- }
- }
-}
\ No newline at end of file
diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj
index 7d21804..90ddb15 100644
--- a/Correlator/Correlator.csproj
+++ b/Correlator/Correlator.csproj
@@ -202,7 +202,6 @@
-
diff --git a/Correlator/ViewModels/MainWindowViewModel.cs b/Correlator/ViewModels/MainWindowViewModel.cs
index e295fa2..426b759 100644
--- a/Correlator/ViewModels/MainWindowViewModel.cs
+++ b/Correlator/ViewModels/MainWindowViewModel.cs
@@ -103,14 +103,14 @@
///
/// 红色发射机信号强度0-5
///
- private int _redTransmitterSignalIntensity;
+ private int _redTransmitterSignal;
- public int RedTransmitterSignalIntensity
+ public int RedTransmitterSignal
{
- get => _redTransmitterSignalIntensity;
+ get => _redTransmitterSignal;
private set
{
- _redTransmitterSignalIntensity = value;
+ _redTransmitterSignal = value;
RaisePropertyChanged();
}
}
@@ -118,14 +118,14 @@
///
/// 蓝色发射机信号强度0-5
///
- private int _blueTransmitterSignalIntensity;
+ private int _blueTransmitterSignal;
- public int BlueTransmitterSignalIntensity
+ public int BlueTransmitterSignal
{
- get => _blueTransmitterSignalIntensity;
+ get => _blueTransmitterSignal;
private set
{
- _blueTransmitterSignalIntensity = value;
+ _blueTransmitterSignal = value;
RaisePropertyChanged();
}
}
@@ -495,7 +495,7 @@
//新协议不计算实际信号
RedTransmitterBattery = Convert.ToInt32(dev.Cell);
- RedTransmitterSignalIntensity = 5;
+ RedTransmitterSignal = 5;
RedTransmitterState = true;
RuntimeCache.RedSensorIsEnable = true;
});
@@ -506,7 +506,7 @@
//新协议不计算实际信号
BlueTransmitterBattery = Convert.ToInt32(dev.Cell);
- BlueTransmitterSignalIntensity = 5;
+ BlueTransmitterSignal = 5;
BlueTransmitterState = true;
RuntimeCache.BlueSensorIsEnable = true;
});
@@ -1128,11 +1128,11 @@
ConnectColorBrush = "LightGray";
RedTransmitterBattery = 0;
- RedTransmitterSignalIntensity = 0;
+ RedTransmitterSignal = 0;
RedTransmitterState = false;
BlueTransmitterBattery = 0;
- BlueTransmitterSignalIntensity = 0;
+ BlueTransmitterSignal = 0;
BlueTransmitterState = false;
RuntimeCache.RedSensorIsEnable = false;
diff --git a/Correlator/ViewModels/NumericKeypadDialogViewModel.cs b/Correlator/ViewModels/NumericKeypadDialogViewModel.cs
index c75d639..58abe83 100644
--- a/Correlator/ViewModels/NumericKeypadDialogViewModel.cs
+++ b/Correlator/ViewModels/NumericKeypadDialogViewModel.cs
@@ -189,10 +189,6 @@
TextBoxName = RuntimeCache.FillDataTextBox,
NumberValue = number.ToString()
});
-
- //重置数字键盘参数
- NumberCache.Clear();
- RuntimeCache.FillDataTextBox = "PipeDiameterTextBox";
});
}
diff --git a/Correlator/Views/MainWindow.xaml b/Correlator/Views/MainWindow.xaml
index 0936218..30c4902 100644
--- a/Correlator/Views/MainWindow.xaml
+++ b/Correlator/Views/MainWindow.xaml
@@ -31,7 +31,6 @@
-
@@ -408,7 +407,7 @@
Height="82"
Margin="10,0,10,10"
VerticalAlignment="Bottom"
- Source="{Binding RedTransmitterSignalIntensity, ConverterParameter=0, Converter={StaticResource SignalImageConverter}}" />
+ Source="{Binding RedTransmitterSignal, ConverterParameter=0, Converter={StaticResource SignalImageConverter}}" />
@@ -418,7 +417,7 @@
Height="82"
Margin="10,0,10,10"
VerticalAlignment="Bottom"
- Source="{Binding BlueTransmitterSignalIntensity, ConverterParameter=1, Converter={StaticResource SignalImageConverter}}" />
+ Source="{Binding BlueTransmitterSignal, ConverterParameter=1, Converter={StaticResource SignalImageConverter}}" />
@@ -580,67 +579,60 @@
-
-
-
-
-
-
+ HorizontalAlignment="Left">
+
+
+
+
-
+
-
-
-
-
-
+
+
+
+
+
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+ HorizontalAlignment="Right">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ Grid.Row="1"
+ Margin="10,5"
+ HorizontalAlignment="Right"
+ Orientation="Horizontal">
+
+
+
+
+
-
-
+
+