Browse Source

no message

jangwon 4 years ago
parent
commit
c0c7ddf85d

+ 1 - 1
Dev/OHV/OHV.Module.Interactivity/PopUp/DriveServoView.xaml

@@ -455,7 +455,7 @@
             </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_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'}"/>-->
 
             <!--<xctk:BusyIndicator x:Name="MyProgress" Grid.RowSpan="2" Grid.ColumnSpan="2" IsBusy="{Binding IsBusy, FallbackValue=true}" BusyContent="{Binding BusyText}"/>-->
 

+ 8 - 7
Dev/OHV/OHV.Module.Interactivity/PopUp/DriveServoViewModel.cs

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