Преглед изворни кода

Main Start/Stop Enable Update

ys-hwang пре 6 година
родитељ
комит
731efe15a8

+ 29 - 18
Dev/OHV/OHV.Module.Interactivity/PopUp/OpticalReadingConfigView.xaml

@@ -8,7 +8,7 @@
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              prism:ViewModelLocator.AutoWireViewModel="True"
              mc:Ignorable="d" 
-             Width="800"
+             Width="1000"
              Height="600"
              Background="#455a64">
 
@@ -45,10 +45,10 @@
                 <ColumnDefinition Width="*"/>
             </Grid.ColumnDefinitions>
 
-            <Border Grid.Column="0" Margin="23,22,23,17" BorderBrush="#FF00FFD3" BorderThickness="1" VerticalAlignment="Stretch" HorizontalAlignment="Stretch"/>
+            <!--<Border Grid.Column="0" Margin="23,22,23,17" BorderBrush="#FF00FFD3" BorderThickness="1" VerticalAlignment="Stretch" HorizontalAlignment="Stretch"/>-->
 
             <!--InPut-->
-            <StackPanel Orientation="Vertical"
+            <!--<StackPanel Orientation="Vertical"
                         VerticalAlignment="Center"
                         HorizontalAlignment="Center"
                         Grid.Column="0">
@@ -173,22 +173,22 @@
                            VerticalAlignment="Center"
                            HorizontalAlignment="Center"
                            Foreground="Orange"/>
-            </StackPanel>
+            </StackPanel>-->
 
             <!--OutPut-->
-            <Border Grid.Column="1" Margin="30,79" BorderBrush="#FF00FFD3" BorderThickness="1" VerticalAlignment="Stretch" HorizontalAlignment="Stretch"/>
+            <Border Grid.Column="0" Margin="30,10" BorderBrush="#FF00FFD3" BorderThickness="1" VerticalAlignment="Stretch" HorizontalAlignment="Stretch"/>
             <StackPanel VerticalAlignment="Center"
                         HorizontalAlignment="Center"
-                        Grid.Column="1">
+                        Grid.Column="0">
                 <materialDesign:Badged Margin="5"
                                        Badge="Detect Area#1"
                                        BadgeColorZoneMode="Dark">
-                    <Button Width="80"
-                                Height="200"
-                                Background="{Binding OpReaderOutFirst}">
+                    <Button Width="100"
+                            Height="240"
+                            Background="{Binding OpReaderOutFirst}">
                         <StackPanel>
-                            <TextBlock><Run Text="Slow"/></TextBlock>
-                            <TextBlock><Run Text="Stop"/></TextBlock>
+                            <TextBlock HorizontalAlignment="Center"><Run Text="Slow" FontSize="25"/></TextBlock>
+                            <TextBlock HorizontalAlignment="Center"><Run Text="Stop" FontSize="25"/></TextBlock>
                         </StackPanel>
                     </Button>
                 </materialDesign:Badged>
@@ -196,12 +196,12 @@
                 <materialDesign:Badged Margin="5"
                                        Badge="Detect Area#2"
                                        BadgeColorZoneMode="Dark">
-                    <Button Width="80"
-                            Height="100"
+                    <Button Width="100"
+                            Height="170"
                             Background="{Binding OpReaderOutSecond}">
                         <StackPanel>
-                            <TextBlock HorizontalAlignment="Center"><Run Text="Safety"/></TextBlock>
-                            <TextBlock HorizontalAlignment="Center"><Run Text="Stop"/></TextBlock>
+                            <TextBlock HorizontalAlignment="Center"><Run Text="Safety" FontSize="25"/></TextBlock>
+                            <TextBlock HorizontalAlignment="Center"><Run Text="Stop" FontSize="25"/></TextBlock>
                         </StackPanel>
                     </Button>
                 </materialDesign:Badged>
@@ -209,16 +209,27 @@
                 <materialDesign:Badged Margin="5"
                                        Badge="Detect Area#3"
                                        BadgeColorZoneMode="Dark">
-                    <Button Width="80"
-                            Height="60"
+                    <Button Width="100"
+                            Height="100"
                             Background="{Binding OpReaderOutThird}">
                         <StackPanel>
-                            <TextBlock><Run Text="Stop"/></TextBlock>
+                            <TextBlock><Run Text="Stop" FontSize="25"/></TextBlock>
                         </StackPanel>
                     </Button>
                 </materialDesign:Badged>
             </StackPanel>
 
+            <StackPanel Grid.Column="1"
+                        VerticalAlignment="Center"
+                        HorizontalAlignment="Center">
+                <StackPanel Orientation="Vertical">
+                    <TextBlock Margin="5"><Run Text="Pattern Result" Foreground="Silver" FontSize="20"/></TextBlock>
+                    <TextBlock Margin="5"><Run Text="Moving Detect = 21" Foreground="Silver" FontSize="18"/></TextBlock>
+                    <TextBlock Margin="5"><Run Text="Curve Detect = 31" Foreground="Silver" FontSize="18"/></TextBlock>
+                    <TextBlock Margin="5"><Run Text="Default = 10" Foreground="Silver" FontSize="18"/></TextBlock>
+                </StackPanel>
+            </StackPanel>
+
             <StackPanel Grid.Column="2"
                         VerticalAlignment="Center"
                         HorizontalAlignment="Center">

+ 8 - 4
Dev/OHV/OHV.Vehicle/Concept/D_MainWindow.xaml

@@ -42,7 +42,7 @@
                     OCS
                 </Button>
 
-                <Button Margin="10,0,10,0"
+                <!--<Button Margin="10,0,10,0"
                     Style="{DynamicResource MaterialDesignFloatingActionMiniButton}"
                     materialDesign:ShadowAssist.ShadowDepth="Depth5" Background="{Binding BatteryBrush, FallbackValue={x:Null}}">
                     Battery
@@ -52,7 +52,7 @@
                     Style="{DynamicResource MaterialDesignFloatingActionMiniButton}"
                     materialDesign:ShadowAssist.ShadowDepth="Depth5" Background="{Binding LaserBrush, FallbackValue={x:Null}}">
                     Laser
-                </Button>
+                </Button>-->
             </StackPanel>
 
             <StackPanel Orientation="Vertical" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0,0,10,0">
@@ -222,14 +222,18 @@
                 <DockPanel Grid.Row="4">
                     <Border BorderBrush="#FF00FFD3" BorderThickness="2" Margin="5">
                         <StackPanel Orientation="Vertical" VerticalAlignment="Center" HorizontalAlignment="Center">
-                            <Button Margin="15" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Height="60" Width="250" Command="{Binding StartCommand}">
+                            <Button Margin="15" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Height="60" Width="250" 
+                                    Command="{Binding StartCommand}"
+                                    IsEnabled="{Binding StartEnable}">
                                 <StackPanel Orientation="Horizontal">
                                     <materialDesign:PackIcon Kind="GooglePlay" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Height="40" Width="auto" Margin="0,0,20,0" Background="DarkGreen"/>
                                     <TextBlock Text="START" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="30"/>
                                 </StackPanel>
                             </Button>
 
-                            <Button Margin="15" HorizontalAlignment="Stretch" Height="60" Command="{Binding StopCommand}">
+                            <Button Margin="15" HorizontalAlignment="Stretch" Height="60" 
+                                    Command="{Binding StopCommand}"
+                                    IsEnabled="{Binding StopEnable}">
                                 <StackPanel Orientation="Horizontal">
                                     <materialDesign:PackIcon Kind="Stop" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Height="40" Width="auto" Margin="0,0,32,0" Background="Orange"/>
                                     <TextBlock Text="STOP" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="30"/>

+ 21 - 5
Dev/OHV/OHV.Vehicle/Concept/D_MainWindowViewModel.cs

@@ -140,6 +140,20 @@ namespace OHV.Vehicle.Concept
             set { this.SetProperty(ref this._lastBuildedTime, value); }
         }
 
+        bool _startEnable = true;
+        public bool StartEnable
+        {
+            get { return this._startEnable; }
+            set { this.SetProperty( ref this._startEnable , value ); }
+        }
+
+        bool _stopEnable = false;
+        public bool StopEnable
+        {
+            get { return this._stopEnable; }
+            set { this.SetProperty( ref this._stopEnable , value ); }
+        }
+
         IEventAggregator eventAggregator = null;
         VCSystem VCSystem = null;
         MessageController messageController;
@@ -239,7 +253,7 @@ namespace OHV.Vehicle.Concept
 
         private void ExecuteStopCommand()
         {
-            this.messageController.ShowConfirmationPopupView("Request Vehicle Auto Mode ?", r =>
+            this.messageController.ShowConfirmationPopupView(" Vehicle Stop ? ", r =>
             {
                 if (r.Result == ButtonResult.OK)
                 {
@@ -247,6 +261,9 @@ namespace OHV.Vehicle.Concept
                     {
                         Kind = VCSMessageEventArgs.eVCSMessageKind.ReqManualModeChange,
                     };
+
+                    this.StartEnable = true;
+                    this.StopEnable = false;
                     vcsMessagePublisher.Publish(msg);
                 }
             });
@@ -262,6 +279,8 @@ namespace OHV.Vehicle.Concept
                     {
                         Kind = VCSMessageEventArgs.eVCSMessageKind.ReqAutoModeChange,
                     };
+                    this.StartEnable = false;
+                    this.StopEnable = true;
                     vcsMessagePublisher.Publish(msg);
                 }
             });
@@ -274,7 +293,7 @@ namespace OHV.Vehicle.Concept
             switch (this.State)
             {
                 case HostConnectedEventArgs.eConnectedState.Disconnected:
-                    this.OcsBrush = Brushes.Yellow;
+                    this.OcsBrush = Brushes.Transparent;
                     break;
                 case HostConnectedEventArgs.eConnectedState.Connected:
                     this.OcsBrush = Brushes.LimeGreen;
@@ -326,9 +345,6 @@ namespace OHV.Vehicle.Concept
             {
                 var hisAlarm = args.Args as HisAlarm;
                 this.messageController.ShowNotificationView(args.MessageText);
-
-
-
             }
         }