no message

Dev/OHV/OHV.Module.Interactivity/PopUp/DriveServoView.xaml

@@ -16,6 +16,7 @@
              xmlns:c ="clr-namespace:GSG.NET.WPF.CalcBinding;assembly=GSG.NET.WPF"
              xmlns:media ="clr-namespace:System.Windows.Media;assembly=PresentationCore"
              xmlns:OHVCommonShareds="clr-namespace:OHV.Common.Shareds;assembly=OHV.Common"
+             xmlns:OHVCommonEvents="clr-namespace:OHV.Common.Events;assembly=OHV.Common"
              >
 
     <prism:Dialog.WindowStyle>
@@ -454,8 +455,8 @@
                 </StackPanel>
             </Grid>
 
-            <TextBlock Text="{DynamicResource SettingView_DriveWarning}" HorizontalAlignment="Left" TextWrapping="Wrap" TextAlignment="Center" Foreground="Red" VerticalAlignment="Top" Margin="0,526,0,-132" Grid.Row="1" Height="100" Width="1126" FontSize="78" Grid.ColumnSpan="2" Visibility="{c:Binding 'OcsState == OHVCommonShareds:eOcsState.DisConnect'}"/>
-            <!--<TextBlock Text="{DynamicResource SettingView_TCZState}" HorizontalAlignment="Left" TextWrapping="Wrap" TextAlignment="Center" Foreground="Red" VerticalAlignment="Top" Margin="0,-140,0,-194" Grid.Row="1" Height="100" Width="1126" FontSize="78" Grid.ColumnSpan="2" Visibility="{c:Binding 'IsTCZ == OHVCommonShareds:eTCZState.TCZ'}"/>-->
+            <TextBlock Text="{DynamicResource SettingView_DriveWarning}" HorizontalAlignment="Left" TextWrapping="Wrap" TextAlignment="Center" Foreground="Red" VerticalAlignment="Top" Margin="0,-140,0,-194" Grid.Row="1" Height="100" Width="1126" FontSize="78" Grid.ColumnSpan="2" Visibility="{c:Binding 'OcsState == OHVCommonShareds:eOcsState.DisConnect'}"/>
+            <TextBlock Text="{DynamicResource SettingView_TCZState}" HorizontalAlignment="Left" TextWrapping="Wrap" TextAlignment="Center" Foreground="Red" VerticalAlignment="Top" Margin="0,526,0,-132" Grid.Row="1" Height="100" Width="1126" FontSize="78" Grid.ColumnSpan="2" Visibility="{c:Binding 'IsTCZ == OHVCommonEvents:TCZEventArgs:eTCZState.TCZ'}"/>
 
             <!--<xctk:BusyIndicator x:Name="MyProgress" Grid.RowSpan="2" Grid.ColumnSpan="2" IsBusy="{Binding IsBusy, FallbackValue=true}" BusyContent="{Binding BusyText}"/>-->
 

Dev/OHV/OHV.Module.Interactivity/PopUp/DriveServoViewModel.cs

@@ -348,14 +348,10 @@ namespace OHV.Module.Interactivity.PopUp
                 this.OcsState = eOcsState.Connect;
             }
 
-            //if (vcSystem.ZmqManager.SetOperationState(eOperatationMode.ManualMode))
-            //{
-
-            //    if (!zmqManager.IsTCZ)
-            //    {
-            //        this.IsTCZ = eTCZState.TCZ;
-            //    }
-            //}
+            if(zmqManager.IsTCZ)
+            {
+                this.IsTCZ = eTCZState.TCZ;
+            }
 
             if (!vcSystem.ZmqManager.SetOperationState(eOperatationMode.ManualMode))
                 messageController.ShowNotificationView("Drive Manual Mode Change Fail", false);