diff --git a/Correlator/Dialog/LoadingDialog.xaml b/Correlator/Dialog/LoadingDialog.xaml
index 454d9bd..19d6a5d 100644
--- a/Correlator/Dialog/LoadingDialog.xaml
+++ b/Correlator/Dialog/LoadingDialog.xaml
@@ -4,8 +4,9 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
- Width="500"
- Height="90"
+ Title="相关仪"
+ Width="400"
+ Height="144"
AllowsTransparency="True"
Background="Transparent"
Closed="LoadingDialog_OnClosed"
@@ -14,31 +15,55 @@
WindowStartupLocation="CenterOwner"
WindowStyle="None"
mc:Ignorable="d">
+
+ BorderBrush="DarkGray"
+ BorderThickness="1">
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Correlator/Dialog/LoadingDialog.xaml b/Correlator/Dialog/LoadingDialog.xaml
index 454d9bd..19d6a5d 100644
--- a/Correlator/Dialog/LoadingDialog.xaml
+++ b/Correlator/Dialog/LoadingDialog.xaml
@@ -4,8 +4,9 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
- Width="500"
- Height="90"
+ Title="相关仪"
+ Width="400"
+ Height="144"
AllowsTransparency="True"
Background="Transparent"
Closed="LoadingDialog_OnClosed"
@@ -14,31 +15,55 @@
WindowStartupLocation="CenterOwner"
WindowStyle="None"
mc:Ignorable="d">
+
+ BorderBrush="DarkGray"
+ BorderThickness="1">
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Correlator/Dialog/LoadingDialog.xaml.cs b/Correlator/Dialog/LoadingDialog.xaml.cs
index db1659f..63363b3 100644
--- a/Correlator/Dialog/LoadingDialog.xaml.cs
+++ b/Correlator/Dialog/LoadingDialog.xaml.cs
@@ -1,5 +1,6 @@
using System;
using System.Windows;
+using System.Windows.Input;
using System.Windows.Threading;
namespace Correlator.Dialog
@@ -33,5 +34,11 @@
{
_runningTimer.Stop();
}
+
+ protected override void OnMouseLeftButtonDown(MouseButtonEventArgs e)
+ {
+ base.OnMouseLeftButtonDown(e);
+ DragMove();
+ }
}
}
\ No newline at end of file
diff --git a/Correlator/Dialog/LoadingDialog.xaml b/Correlator/Dialog/LoadingDialog.xaml
index 454d9bd..19d6a5d 100644
--- a/Correlator/Dialog/LoadingDialog.xaml
+++ b/Correlator/Dialog/LoadingDialog.xaml
@@ -4,8 +4,9 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
- Width="500"
- Height="90"
+ Title="相关仪"
+ Width="400"
+ Height="144"
AllowsTransparency="True"
Background="Transparent"
Closed="LoadingDialog_OnClosed"
@@ -14,31 +15,55 @@
WindowStartupLocation="CenterOwner"
WindowStyle="None"
mc:Ignorable="d">
+
+ BorderBrush="DarkGray"
+ BorderThickness="1">
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Correlator/Dialog/LoadingDialog.xaml.cs b/Correlator/Dialog/LoadingDialog.xaml.cs
index db1659f..63363b3 100644
--- a/Correlator/Dialog/LoadingDialog.xaml.cs
+++ b/Correlator/Dialog/LoadingDialog.xaml.cs
@@ -1,5 +1,6 @@
using System;
using System.Windows;
+using System.Windows.Input;
using System.Windows.Threading;
namespace Correlator.Dialog
@@ -33,5 +34,11 @@
{
_runningTimer.Stop();
}
+
+ protected override void OnMouseLeftButtonDown(MouseButtonEventArgs e)
+ {
+ base.OnMouseLeftButtonDown(e);
+ DragMove();
+ }
}
}
\ No newline at end of file
diff --git a/Correlator/ViewModels/MainWindowViewModel.cs b/Correlator/ViewModels/MainWindowViewModel.cs
index b9856ff..6283265 100644
--- a/Correlator/ViewModels/MainWindowViewModel.cs
+++ b/Correlator/ViewModels/MainWindowViewModel.cs
@@ -411,7 +411,7 @@
}
//是否已开始采集或者计算数据
- private bool _startButtonIsEnabled = true;
+ private bool _startButtonIsEnabled;
public bool StartButtonEnabled
{
@@ -528,6 +528,8 @@
BlueTransmitterSignal = 5;
BlueTransmitterState = true;
RuntimeCache.BlueSensorIsEnable = true;
+ //因为红色先收到信号,所以只需要等到蓝色也收到信号即可
+ StartButtonEnabled = true;
});
//加速度计