OmagCUT :

- migliorie varie alla gestione dei kit di lucidatura.
This commit is contained in:
Dario Sassi
2020-02-17 12:26:01 +00:00
parent d5ce91e647
commit 3918092942
8 changed files with 402 additions and 476 deletions
+17
View File
@@ -0,0 +1,17 @@
Module ConstKitData
Public Const S_HEADER As String = "Header"
Public Const K_KIT As String = "Kit"
Public Const S_KIT As String = "Kit"
Public Const K_TOOL As String = "Tool"
Public Const K_TOOLNAME As String = "ToolName"
Public Const K_CONTOUR As String = "Contour"
Public Const K_ZIGZAGX As String = "ZigZagX"
Public Const K_STEPX As String = "StepX"
Public Const K_ZIGZAGY As String = "ZigZagY"
Public Const K_STEPY As String = "StepY"
Public Const K_LILEN As String = "LiLen"
Public Const K_LIHEIGHT As String = "LiHeight"
End Module
-13
View File
@@ -247,17 +247,4 @@
Public Const K_CURRMATERIAL As String = "CurrMaterial"
Public Const K_MATERIAL As String = "Material"
Public Const S_KIT As String = "Kit"
Public Const K_KITNAME As String = "Name"
Public Const K_TOOL As String = "Tool"
Public Const K_TOOLNAME As String = "ToolName"
Public Const K_CONTOUR As String = "Contour"
Public Const K_ZIGZAGX As String = "ZigZagX"
Public Const K_STEPX As String = "StepX"
Public Const K_ZIGZAGY As String = "ZigZagY"
Public Const K_STEPY As String = "StepY"
Public Const K_LILEN As String = "LiLen"
Public Const K_LIHEIGHT As String = "LiHeight"
End Module
+1
View File
@@ -194,6 +194,7 @@
<Compile Include="CompoTrfData.xaml.vb">
<DependentUpon>CompoTrfData.xaml</DependentUpon>
</Compile>
<Compile Include="ConstKitData.vb" />
<Compile Include="ConstMachIni.vb" />
<Compile Include="ConstMsg.vb" />
<Compile Include="ControlsMachineButtonUC.xaml.vb">
+6 -6
View File
@@ -172,10 +172,10 @@
<Image Source="Resources/Contour.png" Stretch="Uniform"/>
</Border>
<Border Grid.Row="2" Grid.Column="1" Margin="10">
<Image Source="Resources/ZigZagY.png" Stretch="Uniform"/>
<Image Source="Resources/ZigZagX.png" Stretch="Uniform"/>
</Border>
<Border Grid.Row="3" Grid.Column="1" Margin="10">
<Image Source="Resources/ZigZagX.png" Stretch="Uniform"/>
<Image Source="Resources/ZigZagY.png" Stretch="Uniform"/>
</Border>
<TextBlock Name="MotionTxBl" Grid.Row="0" Grid.Column="1" Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Margin="30,0" HorizontalAlignment="Center"/>
@@ -183,10 +183,10 @@
<TextBlock Name="StepTxBl" Grid.Row="0" Grid.Column="3" Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Margin="30,0" HorizontalAlignment="Center"/>
<EgtWPFLib:EgtTextBox Name="ContourTxBx" Grid.Row="1" Grid.Column="2" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="30,0"/>
<EgtWPFLib:EgtTextBox Name="ZigZagYTxBx" Grid.Row="2" Grid.Column="2" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="30,0"/>
<EgtWPFLib:EgtTextBox Name="StepYTxBx" Grid.Row="2" Grid.Column="3" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="30,0"/>
<EgtWPFLib:EgtTextBox Name="ZigZagXTxBx" Grid.Row="3" Grid.Column="2" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="30,0"/>
<EgtWPFLib:EgtTextBox Name="StepXTxBx" Grid.Row="3" Grid.Column="3" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="30,0"/>
<EgtWPFLib:EgtTextBox Name="ZigZagXTxBx" Grid.Row="2" Grid.Column="2" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="30,0"/>
<EgtWPFLib:EgtTextBox Name="StepXTxBx" Grid.Row="2" Grid.Column="3" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="30,0"/>
<EgtWPFLib:EgtTextBox Name="ZigZagYTxBx" Grid.Row="3" Grid.Column="2" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="30,0"/>
<EgtWPFLib:EgtTextBox Name="StepYTxBx" Grid.Row="3" Grid.Column="3" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="30,0"/>
<GroupBox Name="LiLoGpBx" Grid.Row="4" Grid.Column="1" Grid.RowSpan="2" Grid.ColumnSpan="3" Style="{DynamicResource OmagCut_GroupBox}">
<Grid Name="LiLoGrd">
+378 -457
View File
File diff suppressed because it is too large Load Diff
Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.4 KiB

After

Width:  |  Height:  |  Size: 800 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 918 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 913 B