Selaa lähdekoodia

ui 调整

git-svn-id: http://10.4.3.168:50001/svn/Furnace@5 dbcde07d-dcf5-c148-8a84-ac3097b7778e
Admin 8 kuukautta sitten
vanhempi
commit
156a23574f

+ 3 - 4
Furnace/FurnaceGasPanelUI/Views/Maintenances/GasXmlView.xaml

@@ -42,11 +42,10 @@
             ManipulationDelta="Canvas_ManipulationDelta"
             ManipulationCompleted="Canvas_ManipulationCompleted"
             IsManipulationEnabled="True"
-            
-                Width="1300"
-                Height="900"
+                Width="1450"
+                Height="1120"
             x:Name="draw"
-            Margin="0,-55,0,0" />
+            Margin="-50,-180,0,0" />
 
     </Grid>
 </UserControl>

+ 2 - 1
Furnace/FurnaceGasPanelUI/Views/Maintenances/GasXmlView.xaml.cs

@@ -157,6 +157,7 @@ namespace FurnaceGasPanelUI.Views.Maintenances
 
         private void Canvas_ManipulationStarting(object sender, ManipulationStartingEventArgs e)
         {
+            ScriptVariables.IsFetchRT = false;
             e.ManipulationContainer = draw;  // 设置操作容器为画布本身
             e.Mode = ManipulationModes.All;  // 启用所有操作类型
         }
@@ -176,7 +177,7 @@ namespace FurnaceGasPanelUI.Views.Maintenances
         private void Canvas_ManipulationCompleted(object sender, ManipulationCompletedEventArgs e)
         {
 
-
+            ScriptVariables.IsFetchRT = true;
         }
         #endregion
 

+ 2 - 2
Furnace/FurnaceRT/Config/GasXml/GasViewXml.xml

@@ -1466,7 +1466,7 @@
       </InnerPolyLine>
       <InnerText X="533.001698953495" Y="114.997798045934" Text="ADJ" RectWidth="23.9972465414048" RectHeight="24.0000000298352" TextHeight="0" LineSpacce="1" Alignment="4" FontSize="7" Id="7266057" Enable="True" />
     </Button>
-    <Button Id="5003431" Enable="True">
+    <!--<Button Id="5003431" Enable="True">
       <InnerPolyLine Id="5003431" Enable="True">
         <InnerLines>
           <InnerLine X1="5.7186319511892" Y1="862.743603743533" X2="115.718631951189" Y2="862.743603743533" Id="1003431" Enable="True" />
@@ -1476,7 +1476,7 @@
         </InnerLines>
       </InnerPolyLine>
       <InnerText X="60.7185612658769" Y="845.243300800951" Text="UI-TIN" RectWidth="109.999999999102" RectHeight="34.9998384304898" TextHeight="0" LineSpacce="1" Alignment="5" FontSize="16" Id="7030422" Enable="True" />
-    </Button>
+    </Button>-->
     <Button Id="5536060" Enable="True">
       <InnerPolyLine Id="5536060" Enable="True">
         <InnerLines>

+ 1 - 1
Furnace/FurnaceRT/Config/System.sccfg

@@ -51,7 +51,7 @@
 
 
 		<configs name="SetUp" display="" >
-			<config default="NTP" name="ToolType"  description="Tool Type" max="" min="" paramter="NTP;ELK;SiBCN;TiN" tag="ReadOnlySelection" unit="" type="String" />
+			<config default="TiN" name="ToolType"  description="Tool Type" max="" min="" paramter="NTP;ELK;SiBCN;TiN" tag="ReadOnlySelection" unit="" type="String" />
 			<config default="true" name="IsLP1Installed"  description="Is LP1 Installed" max="0" min="0" paramter="" tag="" unit="" type="Bool" />
 			<config default="true" name="IsLP2Installed"  description="Is LP2 Installed" max="0" min="0" paramter="" tag="" unit="" type="Bool" />
 			<config default="true" name="IsLP3Installed"  description="Is LP3 Installed" max="0" min="0" paramter="" tag="" unit="" type="Bool" />

+ 4 - 5
Furnace/FurnaceUI/Views/Editors/RecipeGasXmlView.xaml

@@ -88,11 +88,10 @@
                               ManipulationDelta="Canvas_ManipulationDelta"
                               ManipulationCompleted="Canvas_ManipulationCompleted"
                               IsManipulationEnabled="True"
-                              x:Name="draw"
-                              Width="1280"
-                              Height="870"
-                              Margin="0,10,0,30"
-                              />
+                                                            Width="1450"
+    Height="1120"
+x:Name="draw"
+Margin="-50,-180,0,0" />
 
 
     </Grid>

+ 4 - 5
Furnace/FurnaceUI/Views/Maintenances/Maintenances/ManualGasXmlView.xaml

@@ -71,11 +71,10 @@
                                 ManipulationDelta="Canvas_ManipulationDelta"
                                 ManipulationCompleted="Canvas_ManipulationCompleted"
                                 IsManipulationEnabled="True"
-                                x:Name="draw"
-                                Width="1300"
-                                Height="855"
-                                Margin="0,0,0,0"
-                                />
+                                   Width="1450"
+    Height="1120"
+x:Name="draw"
+Margin="-50,-180,0,0" />
 
 
     </Grid>