update boatUI展示

git-svn-id: http://10.4.3.168:50001/svn/Furnace@55 dbcde07d-dcf5-c148-8a84-ac3097b7778e

FrameworkLocal/Common/CommonData/DeviceData/AITConfigData.cs

@@ -88,7 +88,11 @@ namespace Aitex.Core.Common.DeviceData
         {
              
         }
-
+        public enum ConfigEnum
+        {
+            Debug,
+            Release
+        }
         public void Update(IDeviceData data)
         {
             throw new NotImplementedException();

Furnace/FurnaceRT/Equipments/PMs/PMModule.cs

@@ -30,6 +30,7 @@ using MECF.Framework.Common.Device.Bases;
 using Aitex.Core.RT.Log;
 using FurnaceRT.Equipments.Boats;
 using MECF.Framework.Common.Event;
+using static Aitex.Core.Common.DeviceData.AITConfigData;
 
 namespace FurnaceRT.Equipments.PMs
 {
@@ -286,6 +287,7 @@ namespace FurnaceRT.Equipments.PMs
             DATA.Subscribe($"{Module}.Status", () => StringFsmStatus);
             DATA.Subscribe($"{Module}.IsOnline", () => IsOnline);
             DATA.Subscribe($"{Module}.IsProcessing", () => IsProcessing);
+            DATA.Subscribe($"{Module}.RunningMode", () => SC.ContainsItem("System.RunningMode") ? SC.GetStringValue("System.RunningMode") == ConfigEnum.Debug.ToString() : false);
 
             //DATA.Subscribe($"{Module}.WaferSize", () => WaferManager.Instance.GetWaferSize(_module, 0).ToString());
 

Furnace/FurnaceUI/Views/Maintenances/BoatRobotView.xaml

@@ -259,8 +259,8 @@
                                 </i:EventTrigger>
                             </i:Interaction.Triggers>
                         </Button>
-                        
-                        <StackPanel Orientation="Horizontal" Height="34" Margin="-405,80,0,0">
+
+                        <StackPanel  Visibility="{Binding RunningModeIsDebug,UpdateSourceTrigger=PropertyChanged,Converter={StaticResource bool2VisibilityConverter}}" Orientation="Horizontal" Height="34" Margin="-405,80,0,0">
                             <Label Content="From: "></Label>
                             <ComboBox x:Name="cbModulesCassetteRobot" Margin="0,0,3,0" Height="25" Width="120" ItemsSource="{Binding ZPositions}"  SelectedItem="{Binding ZAxisTestStartPosition}" />
                             <Label Content="To: "></Label>
@@ -277,12 +277,20 @@
                     </StackPanel>
                 </Border>
             </Grid>
-
-            <Image Source="/FurnaceUI;component/Resources/Images/Controls3/01.png" Canvas.Left="573" Canvas.Top="10"/>
-            <parts:BoatElevatorRobot RobotTarget="{Binding BoatPosition}" BoatStatus="{Binding BoatStatus}"  StationPosition="{Binding StationPosition3}" Canvas.Left="630" Canvas.Top="373" Visibility="{Binding IsShowBoatElevatorRobot, Converter={StaticResource bool2VisibilityConverter}}"/>
-            <TextBlock Text="Position 3 ----->" Canvas.Left="505" Canvas.Top="655" FontSize="14"/>
-            <TextBlock Text="Position 2 -------->" Canvas.Left="505" Canvas.Top="500" FontSize="14"/>
-            <TextBlock Text="Position 1 -------->" Canvas.Left="505" Canvas.Top="350" FontSize="14"/>
+         
+            <Canvas>
+                <Image Source="/FurnaceUI;component/Resources/Images/Controls3/01.png" Canvas.Left="573" Canvas.Top="10"/>
+                <parts:BoatElevatorRobot RobotTarget="{Binding BoatPosition}" BoatStatus="{Binding BoatStatus}"  StationPosition="{Binding StationPosition3}" Canvas.Left="630" Canvas.Top="373" Visibility="{Binding IsShowBoatElevatorRobot, Converter={StaticResource bool2VisibilityConverter}}"/>
+                <TextBlock Text="Position 3 ----->" Canvas.Left="505" Canvas.Top="655" FontSize="14"/>
+                <TextBlock Text="Position 2 -------->" Canvas.Left="505" Canvas.Top="500" FontSize="14"/>
+                <TextBlock Text="Position 1 -------->" Canvas.Left="505" Canvas.Top="350" FontSize="14"/>
+                <i:Interaction.Triggers>
+                    <i:EventTrigger EventName="MouseLeftButtonDown">
+                        <cal:ActionMessage MethodName="BoatModify"/>
+                    </i:EventTrigger>
+                </i:Interaction.Triggers>
+            </Canvas>
+           
             <Grid Margin="780,20,0,0" Visibility="{Binding IsBoatRAxisInstalled,Converter={StaticResource bool2VisibilityConverter}}">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="24"/>
@@ -431,7 +439,7 @@
                                 </i:EventTrigger>
                             </i:Interaction.Triggers>
                         </Button>
-                        <Button Content="CW Test" Width="92" Height="30" Margin="-520,0,0,0" IsEnabled="{Binding IsSystemStaus}">
+                        <Button Content="CW Test" Width="92" Height="30" Margin="-520,0,0,0" Visibility="{Binding RunningModeIsDebug,UpdateSourceTrigger=PropertyChanged,Converter={StaticResource bool2VisibilityConverter}}" IsEnabled="{Binding IsSystemStaus}">
                             <i:Interaction.Triggers>
                                 <i:EventTrigger EventName="Click">
                                     <cal:ActionMessage MethodName="BoatRotationServoTest">
@@ -440,7 +448,7 @@
                                 </i:EventTrigger>
                             </i:Interaction.Triggers>
                         </Button>
-                        <Button Content="CCW Test" Width="92" Height="30" Margin="-305,0,0,0" IsEnabled="{Binding IsSystemStaus}">
+                        <Button Content="CCW Test" Width="92" Height="30" Margin="-305,0,0,0" Visibility="{Binding RunningModeIsDebug,UpdateSourceTrigger=PropertyChanged,Converter={StaticResource bool2VisibilityConverter}}" IsEnabled="{Binding IsSystemStaus}">
                             <i:Interaction.Triggers>
                                 <i:EventTrigger EventName="Click">
                                     <cal:ActionMessage MethodName="BoatRotationServoTest">
@@ -449,7 +457,7 @@
                                 </i:EventTrigger>
                             </i:Interaction.Triggers>
                         </Button>
-                        <Button Content="Stop Test" Width="92" Height="30" Margin="-92,0,0,0" IsEnabled="{Binding IsSystemStaus}">
+                        <Button Content="Stop Test" Width="92" Height="30" Margin="-92,0,0,0" Visibility="{Binding RunningModeIsDebug,UpdateSourceTrigger=PropertyChanged,Converter={StaticResource bool2VisibilityConverter}}" IsEnabled="{Binding IsSystemStaus}">
                             <i:Interaction.Triggers>
                                 <i:EventTrigger EventName="Click">
                                     <cal:ActionMessage MethodName="BoatRotationServoStopTest">
@@ -509,7 +517,7 @@
                 </Border>
             </Grid>
 
-            <Grid Margin="780,515,0,0">
+            <Grid Visibility="{Binding RunningModeIsDebug,UpdateSourceTrigger=PropertyChanged,Converter={StaticResource bool2VisibilityConverter}}" Margin="780,515,0,0">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="24"/>
                     <RowDefinition Height="100"/>
@@ -554,7 +562,7 @@
             </Grid>
 
 
-            <Grid Margin="780,655,0,0">
+            <Grid Visibility="{Binding RunningModeIsDebug,UpdateSourceTrigger=PropertyChanged,Converter={StaticResource bool2VisibilityConverter}}" Margin="780,655,0,0">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="24"/>
                     <RowDefinition Height="50"/>

Furnace/FurnaceUI/Views/Maintenances/BoatRobotViewModel.cs

@@ -1,6 +1,10 @@
 using Aitex.Core.Util;
+using Caliburn.Micro.Core;
+using Caliburn.Micro;
 using FurnaceUI.Models;
+using FurnaceUI.Views.Operations;
 using MECF.Framework.Common.DataCenter;
+using MECF.Framework.Common.Equipment;
 using MECF.Framework.Common.OperationCenter;
 using System;
 using System.Collections.Generic;
@@ -9,6 +13,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Controls;
 
+
 namespace FurnaceUI.Views.Maintenances
 {
     public class BoatRobotViewModel : FurnaceUIViewModelBase
@@ -17,7 +22,8 @@ namespace FurnaceUI.Views.Maintenances
         public string RtStatus { get; set; }
         [Subscription("PM1.IsProcessing")]
         public bool IsProcessing { get; set; }
-
+        [Subscription("PM1.RunningMode")]
+        public bool RunningModeIsDebug { get; set; }
         public bool IsSystemStaus => (RtStatus != "AutoRunning");
 
         #region ZAxis Data
@@ -215,7 +221,12 @@ namespace FurnaceUI.Views.Maintenances
                 "CCW",
             };
         }
-
+        public void BoatModify()
+        {
+            var windowManager = IoC.Get<IWindowManager>();
+            BoatModifyViewModel boatModifyViewModel = new BoatModifyViewModel(ModuleName.PM1.ToString());
+            (windowManager as WindowManager)?.ShowDialogWithTitle(boatModifyViewModel, null, "Boat Wafer");
+        }
         protected override void InvokeAfterUpdateProperty(Dictionary<string, object> data)
         {
             InitData();
@@ -356,6 +367,10 @@ namespace FurnaceUI.Views.Maintenances
         }
         public void BoatZServoTest()
         {
+            if (string.IsNullOrEmpty(ZAxisTestStartPosition))
+            {
+                return;
+            }
             if (zPositionTranslate.Keys.Contains(ZAxisTestStartPosition) && zPositionTranslate.Keys.Contains(ZAxisTestStartPosition))
             {
                 InvokeClient.Instance.Service.DoOperation($"Boat.ZAxisMovingTest", zPositionTranslate[ZAxisTestStartPosition], zPositionTranslate[ZAxisTestEndPosition]);