OmagCUT 2.2b1 :

- aggiunta pagina di gestione delle Lucidature in Macchina
This commit is contained in:
Renzo Lanza
2020-02-03 15:31:00 +00:00
parent 7813bb2135
commit 6c14327874
13 changed files with 1550 additions and 38 deletions
+5
View File
@@ -61,6 +61,11 @@ Module ConstGen
' Sottodirettorio di default per pezzi prodotti da CSV
Public Const PRODUCEDPARTS_DFL_DIR As String = "ProducedParts"
' Sottodirettorio Machining dentro il quale trovare il file INI delle lucidature
Public Const MACHININGS_DIR As String = "Machinings"
' Nome file INI delle lucidature
Public Const KITS_FILE As String = "Kits"
' File dei pezzi rovinati
Public Const CURR_RUINED_EPL As String = "RuinedParts.epl"
+13
View File
@@ -237,4 +237,17 @@
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
+32 -32
View File
@@ -654,47 +654,47 @@ Public Class CurrentMachine
Friend ReadOnly Property WaterJettingActive As Double
Get
Return m_bWaterJetting AndAlso Not String.IsNullOrWhiteSpace( m_sCurrWaterJetting)
Return m_bWaterJetting AndAlso Not String.IsNullOrWhiteSpace(m_sCurrWaterJetting)
End Get
End Property
Friend Property dAdditionalTable As Double
Get
Select Case GetCurrentTable()
Case 3
Return m_dTab3AdditionalTable
Case 2
Return m_dTab2AdditionalTable
Case Else
Return m_dAdditionalTable
Case 3
Return m_dTab3AdditionalTable
Case 2
Return m_dTab2AdditionalTable
Case Else
Return m_dAdditionalTable
End Select
End Get
Set(value As Double)
Select Case GetCurrentTable()
Case 3
If Math.Abs(value - m_dTab3AdditionalTable) > EPS_SMALL And
Case 3
If Math.Abs(value - m_dTab3AdditionalTable) > EPS_SMALL And
WritePrivateProfileString(S_TABLE, K_TAB3_ADDITIONALTABLE, DoubleToString(value, 3), sMachIniFile) Then
' Aggiorno il valore corrente
m_dTab3AdditionalTable = value
' Aggiorno il progetto corrente
m_MainWindow.m_CurrentProjectPageUC.AdjustAdditionalTable()
End If
Case 2
If Math.Abs(value - m_dTab2AdditionalTable) > EPS_SMALL And
' Aggiorno il valore corrente
m_dTab3AdditionalTable = value
' Aggiorno il progetto corrente
m_MainWindow.m_CurrentProjectPageUC.AdjustAdditionalTable()
End If
Case 2
If Math.Abs(value - m_dTab2AdditionalTable) > EPS_SMALL And
WritePrivateProfileString(S_TABLE, K_TAB2_ADDITIONALTABLE, DoubleToString(value, 3), sMachIniFile) Then
' Aggiorno il valore corrente
m_dTab2AdditionalTable = value
' Aggiorno il progetto corrente
m_MainWindow.m_CurrentProjectPageUC.AdjustAdditionalTable()
End If
Case Else
If Math.Abs(value - m_dAdditionalTable) > EPS_SMALL And
' Aggiorno il valore corrente
m_dTab2AdditionalTable = value
' Aggiorno il progetto corrente
m_MainWindow.m_CurrentProjectPageUC.AdjustAdditionalTable()
End If
Case Else
If Math.Abs(value - m_dAdditionalTable) > EPS_SMALL And
WritePrivateProfileString(S_TABLE, K_ADDITIONALTABLE, DoubleToString(value, 3), sMachIniFile) Then
' Aggiorno il valore corrente
m_dAdditionalTable = value
' Aggiorno il progetto corrente
m_MainWindow.m_CurrentProjectPageUC.AdjustAdditionalTable()
End If
' Aggiorno il valore corrente
m_dAdditionalTable = value
' Aggiorno il progetto corrente
m_MainWindow.m_CurrentProjectPageUC.AdjustAdditionalTable()
End If
End Select
End Set
End Property
@@ -708,10 +708,10 @@ Public Class CurrentMachine
Friend ReadOnly Property PhotoOffset As Vector3d
Get
Select Case GetCurrentTable()
Case 2
Return New Vector3d(m_dTab2PhotoOffsetX, m_dTab2PhotoOffsetY, 0)
Case Else
Return New Vector3d(m_dPhotoOffsetX, m_dPhotoOffsetY, 0)
Case 2
Return New Vector3d(m_dTab2PhotoOffsetX, m_dTab2PhotoOffsetY, 0)
Case Else
Return New Vector3d(m_dPhotoOffsetX, m_dPhotoOffsetY, 0)
End Select
End Get
End Property
+4 -4
View File
@@ -23,8 +23,7 @@
<ColumnDefinition Width="2*"/>
<ColumnDefinition Width="2*"/>
<ColumnDefinition Width="2*"/>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="2*"/>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="2*"/>
@@ -33,8 +32,9 @@
<ToggleButton Name="AlarmsBtn" Style="{DynamicResource OmagCut_YellowToggleButton}"/>
<ToggleButton Name="ToolsDBBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowToggleButton}"/>
<ToggleButton Name="MachiningDBBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowToggleButton}"/>
<ToggleButton Name="TestingPageBtn" Grid.Column="3" Style="{DynamicResource OmagCut_YellowToggleButton}"/>
<ToggleButton Name="StatisticsBtn" Grid.Column="4" Style="{DynamicResource OmagCut_YellowToggleButton}"/>
<ToggleButton Name="PolishingsBtn" Grid.Column="3" Style="{DynamicResource OmagCut_YellowToggleButton}"/>
<ToggleButton Name="TestingPageBtn" Grid.Column="4" Style="{DynamicResource OmagCut_YellowToggleButton}"/>
<ToggleButton Name="StatisticsBtn" Grid.Column="5" Style="{DynamicResource OmagCut_YellowToggleButton}"/>
</Grid>
+133
View File
@@ -9,6 +9,7 @@ Public Class MachinePageUC
Friend m_AlarmsPageUC As AlarmsPageUC
Friend m_ToolsDbPageUC As ToolsDbPageUC
Friend m_MachiningDbPageUC As MachiningDbPageUC
Friend m_PolishingsPageUC As PolishingsPageUC
Friend m_MachineCNPageUC As MachineCNPageUC
Friend m_StatisticsPageUC As StatisticsPageUC
@@ -19,6 +20,7 @@ Public Class MachinePageUC
Alarms
ToolsDb
MachiningDb
Polishings
MachineCN
Statistics
End Enum
@@ -29,6 +31,7 @@ Public Class MachinePageUC
m_AlarmsPageUC = New AlarmsPageUC
m_ToolsDbPageUC = New ToolsDbPageUC
m_MachiningDbPageUC = New MachiningDbPageUC
m_PolishingsPageUC = New PolishingsPageUC
m_MachineCNPageUC = New MachineCNPageUC
m_StatisticsPageUC = New StatisticsPageUC
@@ -36,12 +39,14 @@ Public Class MachinePageUC
m_AlarmsPageUC.SetValue(Grid.RowProperty, 1)
m_ToolsDbPageUC.SetValue(Grid.RowProperty, 1)
m_MachiningDbPageUC.SetValue(Grid.RowProperty, 1)
m_PolishingsPageUC.SetValue(Grid.RowProperty, 1)
m_MachineCNPageUC.SetValue(Grid.RowProperty, 1)
m_StatisticsPageUC.SetValue(Grid.RowProperty, 1)
AlarmsBtn.Content = EgtMsg(MSG_MACHINEPAGEUC + 5)
ToolsDBBtn.Content = EgtMsg(MSG_MACHINEPAGEUC + 6)
MachiningDBBtn.Content = EgtMsg(MSG_MACHINEPAGEUC + 7)
PolishingsBtn.Content = EgtMsg(91091)
TestingPageBtn.Content = EgtMsg(MSG_MACHINEPAGEUC + 8)
StatisticsBtn.Content = EgtMsg(90709)
@@ -110,6 +115,19 @@ Public Class MachinePageUC
MachinePageGrid.Children.Remove(m_MachiningDbPageUC)
MachinePageGrid.Children.Add(m_AlarmsPageUC)
m_ActiveMachinePage = MachinePages.Alarms
Case MachinePages.Polishings
' Verifica ed eventuale salvataggio Lucidatura corrente
If Not m_PolishingsPageUC.SaveKit() Then
AlarmsBtn.IsChecked = False
PolishingsBtn.IsChecked = True
Return
End If
' passo alla pagina Dati Macchina
AlarmsBtn.IsChecked = True
PolishingsBtn.IsChecked = False
MachinePageGrid.Children.Remove(m_PolishingsPageUC)
MachinePageGrid.Children.Add(m_AlarmsPageUC)
m_ActiveMachinePage = MachinePages.Alarms
Case MachinePages.MachineCN
AlarmsBtn.IsChecked = True
TestingPageBtn.IsChecked = False
@@ -151,6 +169,19 @@ Public Class MachinePageUC
MachinePageGrid.Children.Remove(m_MachiningDbPageUC)
MachinePageGrid.Children.Add(m_ToolsDbPageUC)
m_ActiveMachinePage = MachinePages.ToolsDb
Case MachinePages.Polishings
' Verifica ed eventuale salvataggio Lucidatura corrente
If Not m_PolishingsPageUC.SaveKit() Then
ToolsDBBtn.IsChecked = False
PolishingsBtn.IsChecked = True
Return
End If
' passo alla pagina DB Utensili
ToolsDBBtn.IsChecked = True
PolishingsBtn.IsChecked = False
MachinePageGrid.Children.Remove(m_PolishingsPageUC)
MachinePageGrid.Children.Add(m_ToolsDbPageUC)
m_ActiveMachinePage = MachinePages.ToolsDb
Case MachinePages.MachineCN
ToolsDBBtn.IsChecked = True
TestingPageBtn.IsChecked = False
@@ -192,6 +223,19 @@ Public Class MachinePageUC
m_ActiveMachinePage = MachinePages.MachiningDb
Case MachinePages.MachiningDb
MachiningDBBtn.IsChecked = True
Case MachinePages.Polishings
' Verifica ed eventuale salvataggio Lucidatura corrente
If Not m_PolishingsPageUC.SaveKit() Then
MachiningDBBtn.IsChecked = False
PolishingsBtn.IsChecked = True
Return
End If
' passo alla pagina DB lavorazioni
MachiningDBBtn.IsChecked = True
PolishingsBtn.IsChecked = False
MachinePageGrid.Children.Remove(m_PolishingsPageUC)
MachinePageGrid.Children.Add(m_MachiningDbPageUC)
m_ActiveMachinePage = MachinePages.MachiningDb
Case MachinePages.MachineCN
MachiningDBBtn.IsChecked = True
TestingPageBtn.IsChecked = False
@@ -207,6 +251,63 @@ Public Class MachinePageUC
End Select
End Sub
Private Sub PolishingsBtn_Click(sender As Object, e As RoutedEventArgs) Handles PolishingsBtn.Click
Select Case m_ActiveMachinePage
Case MachinePages.Alarms
AlarmsBtn.IsChecked = False
PolishingsBtn.IsChecked = True
MachinePageGrid.Children.Remove(m_AlarmsPageUC)
MachinePageGrid.Children.Add(m_PolishingsPageUC)
m_ActiveMachinePage = MachinePages.Polishings
Case MachinePages.ToolsDb
' Verifica ed eventuale salvataggio utensile corrente
If Not m_ToolsDbPageUC.SaveCurrTool() Then
PolishingsBtn.IsChecked = False
ToolsDBBtn.IsChecked = True
Return
End If
' salvo il DB utensili
EgtSetCurrentContext(m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene.GetCtx())
EgtTdbSave()
' passo alla pagina Lucidature
PolishingsBtn.IsChecked = True
ToolsDBBtn.IsChecked = False
MachinePageGrid.Children.Remove(m_ToolsDbPageUC)
MachinePageGrid.Children.Add(m_PolishingsPageUC)
m_ActiveMachinePage = MachinePages.Polishings
Case MachinePages.MachiningDb
' Verifica ed eventuale salvataggio lavorazione corrente
If Not m_MachiningDbPageUC.SaveCurrMachining() Then
PolishingsBtn.IsChecked = False
MachiningDBBtn.IsChecked = True
Return
End If
' salvo il DB lavorazioni
EgtSetCurrentContext(m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene.GetCtx())
EgtMdbSave()
' passo alla pagina Lucidature
PolishingsBtn.IsChecked = True
MachiningDBBtn.IsChecked = False
MachinePageGrid.Children.Remove(m_MachiningDbPageUC)
MachinePageGrid.Children.Add(m_PolishingsPageUC)
m_ActiveMachinePage = MachinePages.Polishings
Case MachinePages.Polishings
PolishingsBtn.IsChecked = True
Case MachinePages.MachineCN
PolishingsBtn.IsChecked = True
TestingPageBtn.IsChecked = False
MachinePageGrid.Children.Remove(m_MachineCNPageUC)
MachinePageGrid.Children.Add(m_PolishingsPageUC)
m_ActiveMachinePage = MachinePages.Polishings
Case MachinePages.Statistics
PolishingsBtn.IsChecked = True
StatisticsBtn.IsChecked = False
MachinePageGrid.Children.Remove(m_StatisticsPageUC)
MachinePageGrid.Children.Add(m_PolishingsPageUC)
m_ActiveMachinePage = MachinePages.Polishings
End Select
End Sub
Private Sub TestingPageBtn_Checked(sender As Object, e As RoutedEventArgs) Handles TestingPageBtn.Checked
Select Case m_ActiveMachinePage
Case MachinePages.Alarms
@@ -247,6 +348,19 @@ Public Class MachinePageUC
MachinePageGrid.Children.Remove(m_MachiningDbPageUC)
MachinePageGrid.Children.Add(m_MachineCNPageUC)
m_ActiveMachinePage = MachinePages.MachineCN
Case MachinePages.Polishings
' Verifica ed eventuale salvataggio Lucidatura corrente
If Not m_PolishingsPageUC.SaveKit() Then
TestingPageBtn.IsChecked = False
PolishingsBtn.IsChecked = True
Return
End If
' passo alla pagina DB lavorazioni
TestingPageBtn.IsChecked = True
PolishingsBtn.IsChecked = False
MachinePageGrid.Children.Remove(m_PolishingsPageUC)
MachinePageGrid.Children.Add(m_MachineCNPageUC)
m_ActiveMachinePage = MachinePages.MachineCN
Case MachinePages.MachineCN
TestingPageBtn.IsChecked = True
Case MachinePages.Statistics
@@ -298,6 +412,19 @@ Public Class MachinePageUC
MachinePageGrid.Children.Remove(m_MachiningDbPageUC)
MachinePageGrid.Children.Add(m_StatisticsPageUC)
m_ActiveMachinePage = MachinePages.Statistics
Case MachinePages.Polishings
' Verifica ed eventuale salvataggio Lucidatura corrente
If Not m_PolishingsPageUC.SaveKit() Then
StatisticsBtn.IsChecked = False
PolishingsBtn.IsChecked = True
Return
End If
' passo alla pagina DB lavorazioni
StatisticsBtn.IsChecked = True
PolishingsBtn.IsChecked = False
MachinePageGrid.Children.Remove(m_PolishingsPageUC)
MachinePageGrid.Children.Add(m_StatisticsPageUC)
m_ActiveMachinePage = MachinePages.Statistics
Case MachinePages.MachineCN
StatisticsBtn.IsChecked = True
TestingPageBtn.IsChecked = False
@@ -328,6 +455,12 @@ Public Class MachinePageUC
MachinePageGrid.Children.Remove(m_MachiningDbPageUC)
MachinePageGrid.Children.Add(m_AlarmsPageUC)
m_ActiveMachinePage = MachinePages.Alarms
Case MachinePages.Polishings
AlarmsBtn.IsChecked = True
PolishingsBtn.IsChecked = False
MachinePageGrid.Children.Remove(m_PolishingsPageUC)
MachinePageGrid.Children.Add(m_AlarmsPageUC)
m_ActiveMachinePage = MachinePages.Alarms
Case MachinePages.MachineCN
AlarmsBtn.IsChecked = True
TestingPageBtn.IsChecked = False
+12
View File
@@ -51,6 +51,7 @@ Class MainWindow
Private m_sToolMakersDir As String = String.Empty
Private m_sIniFile As String = String.Empty
Private m_sMachIniFile As String = String.Empty
Private m_sKitIniFile As String = String.Empty
Private m_sLogFile As String = String.Empty
Private m_nDebug As Integer = 0
Private m_sVersion As String = "1.1a1"
@@ -209,6 +210,10 @@ Class MainWindow
Return m_sMachIniFile
End Function
Public Function GetKitIniFile() As String
Return m_sKitIniFile
End Function
Public Function GetLogFile() As String
Return m_sLogFile
End Function
@@ -282,6 +287,8 @@ Class MainWindow
GetPrivateProfileString(S_MACH, K_CURRMACH, "", m_sCurrMachine, m_sIniFile)
' Impostazione path MachIni file
m_sMachIniFile = m_sMachinesRoot & "\" & m_sCurrMachine & "\" & m_sCurrMachine & ".ini"
' Impostazione path KitIni file
m_sKitIniFile = m_sMachinesRoot & "\" & m_sCurrMachine & "\" & MACHININGS_DIR & "\" & KITS_FILE & ".ini"
' Imposto tipo di chiave
#If TRIAL Then
EgtSetLockType(KEY_TYPE.ANY)
@@ -1002,6 +1009,11 @@ Class MainWindow
' salvo il DB utensili
EgtSetCurrentContext(m_CurrentProjectPageUC.CurrentProjectScene.GetCtx())
EgtMdbSave()
Case MachinePageUC.MachinePages.Polishings
' Verifica ed eventuale salvataggio lucidatura corrente
If Not m_MachinePageUC.m_PolishingsPageUC.SaveKit() Then
Return False
End If
End Select
Return True
End Function
+2 -2
View File
@@ -62,5 +62,5 @@ Imports System.Windows
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.2.1.4")>
<Assembly: AssemblyFileVersion("2.2.1.4")>
<Assembly: AssemblyVersion("2.2.2.1")>
<Assembly: AssemblyFileVersion("2.2.2.1")>
+12
View File
@@ -232,6 +232,9 @@
<Compile Include="OmagCUTDictionary.xaml.vb">
<DependentUpon>OmagCUTDictionary.xaml</DependentUpon>
</Compile>
<Compile Include="PolishingsPageUC.xaml.vb">
<DependentUpon>PolishingsPageUC.xaml</DependentUpon>
</Compile>
<Compile Include="SideAngle.vb" />
<Compile Include="StatisticsPageUC.xaml.vb">
<DependentUpon>StatisticsPageUC.xaml</DependentUpon>
@@ -442,6 +445,10 @@
<SubType>Designer</SubType>
<Generator>XamlIntelliSenseFileGenerator</Generator>
</Page>
<Page Include="PolishingsPageUC.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="StatisticsPageUC.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
@@ -955,6 +962,11 @@
<ItemGroup>
<Resource Include="Resources\NewIcons\PartRotOn.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\Contour.png" />
<Resource Include="Resources\ZigZagX.png" />
<Resource Include="Resources\ZigZagY.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
<PropertyGroup>
<PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\OmagCUT\OmagCUTR32.exe
+219
View File
@@ -0,0 +1,219 @@
<UserControl x:Class="PolishingsPageUC"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:self="clr-namespace:OmagCUT.TreeViewItem"
mc:Ignorable="d"
d:DesignHeight="768" d:DesignWidth="1280" Initialized="PolishingsPage_Initialized" Loaded="PolishingsPage_Loaded">
<!-- Definizione della PolishingsPage -->
<Border Style="{DynamicResource OmagCut_PageBorder}">
<Grid Name="PolishingsPageGrid" >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="3*"/>
<ColumnDefinition Width="8*"/>
<ColumnDefinition Width="4*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="8*"/>
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<GroupBox Name="KitsGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="0"
Grid.Row="0" Grid.ColumnSpan="1" Grid.RowSpan="1" BorderThickness="0">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="7*"/>
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<ListBox Name="KitsLstBx" Grid.RowSpan="2">
<ListBox.ItemTemplate>
<DataTemplate>
<TextBlock Text="{Binding sName}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
</DataTemplate>
</ListBox.ItemTemplate>
</ListBox>
<EgtWPFLib:EgtTextBox Name="KitNameTxBx" Grid.Row="1" Width="240" Visibility="Hidden"
Style="{DynamicResource OmagCut_KeyboardTextBox}" />
<UniformGrid Grid.Row="2" Columns="3">
<Button Name="NewKitBtn" Grid.Column="0"
Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
<Button Name="SaveKitBtn" Grid.Column="1"
Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
<Button Name="RemoveKitBtn" Grid.Column="2"
Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
</UniformGrid>
</Grid>
</GroupBox>
<Border Style="{DynamicResource OmagCut_Border}" Grid.Column="1"
Grid.Row="0" Grid.ColumnSpan="2" Grid.RowSpan="1">
<Grid Name="KitParamGrd" Grid.Column="1">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="3*"/>
<ColumnDefinition Width="2*"/>
<ColumnDefinition Width="2*"/>
<ColumnDefinition Width="2*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<GroupBox Name="KitMachsGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="0"
Grid.Row="0" Grid.ColumnSpan="1" Grid.RowSpan="8" BorderThickness="0">
<!-- Definizione della Grid dei parametri delle lavorazioni -->
<Grid Name="KitMachGrd" Grid.Column="1">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="2*"/>
<ColumnDefinition Width="2*"/>
<ColumnDefinition Width="2*"/>
<ColumnDefinition Width="2*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
<RowDefinition Height="0.8*"/>
</Grid.RowDefinitions>
<ListBox Name="KitMachsLstBx" Grid.RowSpan="7" Grid.ColumnSpan="4">
<ListBox.ItemTemplate>
<DataTemplate>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="15"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<TextBlock Text="{Binding nId}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}" Grid.Column="0"/>
<CheckBox Name="ActiveChBx" IsChecked="{Binding Path=bActive, Mode=TwoWay}" Grid.Column="1" Click="CheckBox_Click" GotFocus="ActiveChBx_GotFocus"/>
<ComboBox Name="ToolCmBx" Grid.Column="2"
ItemsSource="{Binding Path=ToolList}"
SelectedIndex="{Binding Path=SelTool}"
Style="{StaticResource OmagCut_MachToolLeftComboBoxNoBorder}"
SelectionChanged="ToolCmBx_SelectionChanged"
GotFocus="ToolCmBx_GotFocus">
<ComboBox.ItemTemplate>
<DataTemplate>
<TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
</Grid>
</DataTemplate>
</ListBox.ItemTemplate>
</ListBox>
<EgtWPFLib:EgtTextBox Name="KitMachNameTxBx" Grid.Row="1" Width="240" Visibility="Hidden"
Style="{DynamicResource OmagCut_KeyboardTextBox}" />
<UniformGrid Grid.Row="13" Columns="4" Grid.ColumnSpan="4">
<Button Name="NewKitMachBtn" Grid.Column="0"
Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
<Button Name="RemoveKitMachBtn" Grid.Column="1"
Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
<Button Name="MoveUpKitMachBtn" Grid.Column="2"
Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
<Button Name="MoveDownKitMachBtn" Grid.Column="3"
Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
</UniformGrid>
</Grid>
</GroupBox>
<GroupBox Name="KitMachParamsGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="1"
Grid.Row="0" Grid.ColumnSpan="3" Grid.RowSpan="8">
<!-- Definizione della Grid dei parametri delle lavorazioni -->
<Grid Name="KitMachParamGrd" Grid.Column="1">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="0"/>
<ColumnDefinition Width="2*"/>
<ColumnDefinition Width="2*"/>
<ColumnDefinition Width="2*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="0.5*"/>
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
<RowDefinition Height="0.5*"/>
</Grid.RowDefinitions>
<Border Grid.Row="1" Grid.Column="1" Margin="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"/>
</Border>
<Border Grid.Row="3" Grid.Column="1" Margin="10">
<Image Source="Resources/ZigZagX.png" Stretch="Uniform"/>
</Border>
<TextBlock Name="MotionTxBl" Grid.Row="0" Grid.Column="1" Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Margin="30,0"/>
<TextBlock Name="RepeatTxBl" Grid.Row="0" Grid.Column="2" Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Margin="30,0"/>
<TextBlock Name="StepTxBl" Grid.Row="0" Grid.Column="3" Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Margin="30,0"/>
<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"/>
<GroupBox Name="LiLoGpBx" Grid.Row="4" Grid.Column="1" Grid.RowSpan="2" Grid.ColumnSpan="3" Style="{DynamicResource OmagCut_GroupBox}">
<Grid Name="LiLoGrd">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="2*"/>
<ColumnDefinition Width="2*"/>
<ColumnDefinition Width="2*"/>
<ColumnDefinition Width="2*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<TextBlock Name="LiLenTxBl" Grid.Row="0" Grid.Column="0" Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="LiLenTxBx" Grid.Row="0" Grid.Column="1" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="30,0"/>
<TextBlock Name="LiHeightTxBl" Grid.Row="0" Grid.Column="2" Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="LiHeightTxBx" Grid.Row="0" Grid.Column="3" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="30,0"/>
</Grid>
</GroupBox>
</Grid>
</GroupBox>
</Grid>
</Border>
</Grid>
</Border>
</UserControl>
File diff suppressed because it is too large Load Diff
Binary file not shown.

After

Width:  |  Height:  |  Size: 7.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB