Egalware/OmagCUT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OmagCUT :

Browse Source 
- Aggiunta possibilità di avere fino a dieci assi in simulazione.
- Aggiunta possibilità di avere fino a nove assi nella barra di stato della macchina.
- Aggiunta opzione per avere barra di stato macchina sul lato destro per i pc 16:9.
- Implementazione variabili che permettono di correggere l'aspetto degli elementi grafici per la visualizzazione in 16:9.
- Migliorie grafiche varie.
This commit is contained in:
Emmanuele Sassi
2016-11-18 17:53:37 +00:00
parent d439303413
commit 8ecec9c42a
51 changed files with 632 additions and 616 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AlarmsPageUC.xaml
+54 -44
View File
@@ -7,11 +7,6 @@
mc:Ignorable="d"
d:DesignHeight="768" d:DesignWidth="1280">
<!-- Chiamata al Dictionary -->
<UserControl.Resources>
<ResourceDictionary Source="OmagCutDictionary.xaml"/>
</UserControl.Resources>
<!-- Definizione della ImportPage -->
<Border Style="{StaticResource OmagCut_PageBorder}" >
@@ -28,8 +23,10 @@
<RowDefinition Height="1.5*"/>
<RowDefinition Height="1.5*"/>
<RowDefinition Height="0.5*"/>
<RowDefinition Height="2*"/>
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
<RowDefinition Height="0.5*"/>
<RowDefinition Height="0.5*"/>
</Grid.RowDefinitions>
<Grid Grid.RowSpan="3">
@@ -61,10 +58,10 @@
<TextBlock Name="CurrSawTxBl" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="3"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
<ComboBox x:Name="CurrSawCmBx" Grid.Column="1" Grid.Row="1" Height="40" >
<ComboBox x:Name="CurrSawCmBx" Grid.Column="1" Grid.Row="1" Style="{StaticResource OmagCut_ComboBox}">
<ComboBox.ItemTemplate>
<DataTemplate>
<Label Content="{Binding}" FontSize="20" />
<TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
@@ -72,10 +69,10 @@
<TextBlock Name="AuxiliaryToolTxBl" Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="3"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
Visibility="Hidden"/>
<ComboBox Name="AuxiliaryToolCmBx" Grid.Column="1" Grid.Row="3" Height="40" Visibility="Hidden">
<ComboBox Name="AuxiliaryToolCmBx" Grid.Column="1" Grid.Row="3" Style="{StaticResource OmagCut_ComboBox}" Visibility="Hidden">
<ComboBox.ItemTemplate>
<DataTemplate>
<Label Content="{Binding sName}" FontSize="20" />
<TextBlock Text="{Binding sName}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
@@ -83,10 +80,10 @@
<TextBlock Name="CurrDrillTxBl" Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="3"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
Visibility="Hidden"/>
<ComboBox Name="CurrDrillCmBx" Grid.Column="1" Grid.Row="3" Height="40" Visibility="Hidden">
<ComboBox Name="CurrDrillCmBx" Grid.Column="1" Grid.Row="3" Style="{StaticResource OmagCut_ComboBox}" Visibility="Hidden">
<ComboBox.ItemTemplate>
<DataTemplate>
<Label Content="{Binding}" FontSize="20" />
<TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
@@ -102,7 +99,7 @@
</ComboBox.ItemTemplate>
</ComboBox>
<Button Name="SetUpBtn" Grid.Column="1" Grid.Row="3" Grid.RowSpan="2" Visibility="Hidden" Content="Attrezzaggio"
<Button Name="SetUpBtn" Grid.Column="1" Grid.Row="3" Grid.RowSpan="2" Visibility="Hidden"
Style="{StaticResource OmagCut_YellowTextButton}"/>
</Grid>
@@ -128,30 +125,30 @@
<TextBlock Name="HolesOffsetTxBl" Grid.Column="0" Grid.Row="0"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="HolesOffsetTxBx" Grid.Column="1" Grid.Row="0" Width="150"
<EgtWPFLib:EgtTextBox Name="HolesOffsetTxBx" Grid.Column="1" Grid.Row="0" Margin="10,0,10,0"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
<TextBlock Name="HolesOverlapTxBl" Grid.Column="0" Grid.Row="1"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="HolesOverlapTxBx" Grid.Column="1" Grid.Row="1" Width="150"
<EgtWPFLib:EgtTextBox Name="HolesOverlapTxBx" Grid.Column="1" Grid.Row="1" Margin="10,0,10,0"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
<TextBlock Name="HolesToleranceTxBl" Grid.Column="0" Grid.Row="2"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="HolesToleranceTxBx" Grid.Column="1" Grid.Row="2" Width="150"
<EgtWPFLib:EgtTextBox Name="HolesToleranceTxBx" Grid.Column="1" Grid.Row="2" Margin="10,0,10,0"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
<TextBlock Name="OneHoleInCornerTxBl" Grid.Column="0" Grid.Row="3" Grid.ColumnSpan="2"
Style="{StaticResource OmagCut_ToolsDBTextBlock}" />
<CheckBox Name="OneHoleInCornerChBx" Grid.Column="0" Grid.Row="3" Grid.ColumnSpan="2" Height="40" Width="40"
HorizontalAlignment="Right" Margin="0,0,11,0"/>
<CheckBox Name="OneHoleInCornerChBx" Grid.Column="0" Grid.Row="3" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_CheckBox_Single}"
HorizontalAlignment="Right" Margin="0,0,10,0"/>
</Grid>
</GroupBox>
<GroupBox Name="MaterialsGpBx" Style="{StaticResource OmagCut_GroupBox}" Grid.Column="0"
Grid.Row="3" Grid.ColumnSpan="2" Grid.RowSpan="3">
Grid.Row="3" Grid.ColumnSpan="2" Grid.RowSpan="4">
<Grid>
<Grid.RowDefinitions>
@@ -172,9 +169,9 @@
Style="{StaticResource OmagCut_KeyboardTextBox}" />
<UniformGrid Grid.Row="2" Columns="2">
<Button Name="NewMatBtn" Grid.Column="1" Content="Nuovo"
<Button Name="NewMatBtn" Grid.Column="1"
Style="{StaticResource OmagCut_RightGrayGradientYellowTextButton}"/>
<Button Name="RemoveMatBtn" Grid.Column="1" Content="Elimina"
<Button Name="RemoveMatBtn" Grid.Column="1"
Style="{StaticResource OmagCut_RightGrayGradientYellowTextButton}"/>
</UniformGrid>
@@ -197,17 +194,17 @@
<TextBlock Name="CutExtraLenTxBl" Grid.Column="0" Grid.Row="0"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="CutExtraLenTxBx" Grid.Column="1" Grid.Row="0" Width="150"
<EgtWPFLib:EgtTextBox Name="CutExtraLenTxBx" Grid.Column="1" Grid.Row="0" Margin="10,0,10,0"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
<TextBlock Name="AngleCutExtraLenTxBl" Grid.Column="0" Grid.Row="1"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="AngleCutExtraLenTxBx" Grid.Column="1" Grid.Row="1" Width="150"
<EgtWPFLib:EgtTextBox Name="AngleCutExtraLenTxBx" Grid.Column="1" Grid.Row="1" Margin="10,0,10,0"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
<TextBlock Name="ExtArcMinRadTxBl" Grid.Column="0" Grid.Row="2" FontSize="20"
<TextBlock Name="ExtArcMinRadTxBl" Grid.Column="0" Grid.Row="2"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="ExtArcMinRadTxBx" Grid.Column="1" Grid.Row="2" Width="150"
<EgtWPFLib:EgtTextBox Name="ExtArcMinRadTxBx" Grid.Column="1" Grid.Row="2" Margin="10,0,10,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
</Grid>
@@ -216,16 +213,16 @@
<GroupBox Name="MachineParamGpBx" Style="{StaticResource OmagCut_GroupBox}" Grid.Column="1" Grid.Row="2">
<Grid Grid.Column="2" Grid.Row="1">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="2*"/>
<ColumnDefinition Width="2*"/>
</Grid.ColumnDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="2*"/>
<ColumnDefinition Width="2*"/>
</Grid.ColumnDefinitions>
<TextBlock Name="SafeZTxBl" Grid.Column="0" FontSize="20"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="SafeZTxBx" Grid.Column="1" Width="150"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
</Grid>
<TextBlock Name="SafeZTxBl" Grid.Column="0"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="SafeZTxBx" Grid.Column="1" Margin="10,0,10,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
</Grid>
</GroupBox>
@@ -234,8 +231,8 @@
<TextBlock Name="InternalCutsTxBl"
Style="{StaticResource OmagCut_ToolsDBTextBlock}" />
<CheckBox Name="InternalCutsChBx" Height="40" Width="40"
HorizontalAlignment="Right" Margin="0,0,11,0"/>
<CheckBox Name="InternalCutsChBx" Style="{StaticResource OmagCut_CheckBox_Single}"
HorizontalAlignment="Right" Margin="0,0,10,0"/>
</Grid>
@@ -246,8 +243,8 @@
<TextBlock Name="FinalHomeTxBl"
Style="{StaticResource OmagCut_ToolsDBTextBlock}" />
<CheckBox Name="FinalHomeChBx" Height="40" Width="40"
HorizontalAlignment="Right" Margin="0,0,11,0"/>
<CheckBox Name="FinalHomeChBx" Style="{StaticResource OmagCut_CheckBox_Single}"
HorizontalAlignment="Right" Margin="0,0,10,0"/>
</Grid>
@@ -262,24 +259,37 @@
<Grid.RowDefinitions>
<RowDefinition Height="0.5*"/>
<RowDefinition Height="0.5*"/>
<RowDefinition Height="0.5*"/>
<RowDefinition Height="0.5*"/>
</Grid.RowDefinitions>
<TextBlock Name="CompleteCutsTxBl" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2"
Style="{StaticResource OmagCut_ToolsDBTextBlock}" />
<CheckBox Name="CompleteCutsChBx" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2" Height="40" Width="40"
HorizontalAlignment="Right" Margin="0,0,11,0"/>
<CheckBox Name="CompleteCutsChBx" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_CheckBox_Single}"
HorizontalAlignment="Right" Margin="0,0,10,0"/>
<TextBlock Name="AlignTxBl" Grid.Row="1" Grid.ColumnSpan="2"
Style="{StaticResource OmagCut_ToolsDBTextBlock}" />
<CheckBox Name="AlignChBx" Grid.Row="1" Grid.ColumnSpan="2" Height="40" Width="40"
HorizontalAlignment="Right" Margin="0,0,11,0"/>
<CheckBox Name="AlignChBx" Grid.Row="1" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_CheckBox_Single}"
HorizontalAlignment="Right" Margin="0,0,10,0"/>
</Grid>
</GroupBox>
<Border Style="{StaticResource OmagCut_NoNameGroupBorder}" Grid.Column="2" Grid.Row="6">
<Grid >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="2*"/>
<ColumnDefinition Width="2*"/>
</Grid.ColumnDefinitions>
<TextBlock Name="AdditionalTableTxBl" Grid.Column="0"
Style="{StaticResource OmagCut_ToolsDBTextBlock}" />
<EgtWPFLib:EgtTextBox Name="AdditionalTableTxBx" Grid.Column="1" Margin="10,0,10,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
</Grid>
</Border>
</Grid>
</Border>
AlarmsPageUC.xaml.vb
+19 -2
View File
@@ -63,6 +63,10 @@ Public Class AlarmsPageUC
InternalCutsTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 30) ' Sempre sugli interni
NestingParamGpBx.Header = EgtMsg(MSG_ALARMSPAGEUC + 31) ' Nesting
AlignTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 32) ' Allineato
SetUpBtn.Content = EgtMsg(MSG_ALARMSPAGEUC + 33)
NewMatBtn.Content = EgtMsg(MSG_ALARMSPAGEUC + 34)
RemoveMatBtn.Content = EgtMsg(MSG_ALARMSPAGEUC + 35)
AdditionalTableTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 36)
End Sub
Private Sub AlarmsPage_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
@@ -193,7 +197,9 @@ Public Class AlarmsPageUC
' Flag per nesting allineato
AlignChBx.IsChecked =
(GetPrivateProfileInt(S_MACH_NEST, K_MACH_NEST_ALIGNED, 0, m_MainWindow.GetMachIniFile()) <> 0)
' Leggo altezza sovratavola
dVal = GetPrivateProfileDouble(S_TABLE, K_ADDITIONALTABLE, 0, m_MainWindow.GetMachIniFile())
AdditionalTableTxBx.Text = LenToString(dVal, 2)
End Sub
Private Sub AuxiliaryToolCmBx_SelectionChanged(sender As Object, e As SelectionChangedEventArgs) Handles AuxiliaryToolCmBx.SelectionChanged
@@ -400,7 +406,12 @@ Public Class AlarmsPageUC
' Se pezzi in interferenza
If Not NestPage.VerifyPartsNesting(False) Then
' Ci sono interferenze, alcuni pezzi saranno parcheggiati. Vuoi continuare ?
Dim Dlg As New EgtMsgBox(m_MainWindow, "", EgtMsg(91105), EgtMsgBox.Buttons.OK_CANCEL, EgtMsgBox.Icons.NULL, 1, 1)
Dim Dlg As EgtMsgBox
If m_MainWindow.IsSiemensPc Then
Dlg = New EgtMsgBox(m_MainWindow, Me.ActualWidth / 15 * 5.5, EgtMsgBox.WidthType.PIXEL, "", EgtMsg(91105), EgtMsgBox.Buttons.OK_CANCEL, EgtMsgBox.Icons.NULL, 1, 1)
Else
Dlg = New EgtMsgBox(m_MainWindow, "", EgtMsg(91105), EgtMsgBox.Buttons.OK_CANCEL, EgtMsgBox.Icons.NULL, 1, 1)
End If
If Dlg.DialogResult = 1 Then ' Ok
NestPage.StoreCollisionParts(False)
WritePrivateProfileString(S_MACH_NEST, K_MACH_REDUCEDCUT, "0", m_MainWindow.GetMachIniFile())
@@ -437,6 +448,12 @@ Public Class AlarmsPageUC
End If
End Sub
Private Sub AdditionalTableTxBx_EgtClosed(sender As Object, e As EventArgs) Handles AdditionalTableTxBx.EgtClosed
Dim dAdditionalTable As Double = 0
StringToLen(AdditionalTableTxBx.Text, dAdditionalTable)
WritePrivateProfileString(S_TABLE, K_ADDITIONALTABLE, DoubleToString(dAdditionalTable, 2), m_MainWindow.GetMachIniFile())
End Sub
Friend Sub NcError()
If m_CN.sz_NC_error_messages.Count > 0 Then
'NCErrorMessages.Text = m_CN.sz_NC_error_messages(0)
CNCommunication.vb
+2 -2
View File
@@ -602,8 +602,8 @@ Public Class CNCommunication
sA1 = m_sA1
sA2 = m_sA2
sA3 = m_sA3
sA1 = m_sA4
sA2 = m_sA5
sA4 = m_sA4
sA5 = m_sA5
Return m_bAxesOk
End Function
CSVPage.xaml
-4
View File
@@ -6,10 +6,6 @@
xmlns:self="clr-namespace:OmagCUT.TreeViewItem"
mc:Ignorable="d"
d:DesignHeight="853.3" d:DesignWidth="1280">
<!-- Chiamata al Dictionary -->
<UserControl.Resources>
<ResourceDictionary Source="OmagCUTDictionary.xaml"></ResourceDictionary>
</UserControl.Resources>
<!-- Definizione della SplitPage -->
<Grid Name="SplitPageGrid" >
CadCutPageUC.xaml
+1 -6
View File
@@ -6,12 +6,7 @@
mc:Ignorable="d"
d:DesignHeight="853.3" d:DesignWidth="1280" Initialized="CadCutPage_Initialized" Loaded="CadCutPage_Loaded" Unloaded="CadCutPage_Unloaded">
<!-- Chiamata al Dictionary -->
<UserControl.Resources>
<ResourceDictionary Source="OmagCutDictionary.xaml"/>
</UserControl.Resources>
<!-- Definizione della CadCutPage -->
<!-- Definizione della CadCutPage -->
<Grid Name="CadCutPageGrid" >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="3*"/>
CopyTemplateUC.xaml
+3 -3
View File
@@ -39,11 +39,11 @@
</Grid>
<ComboBox Name="PointModeCmBx" Grid.Row="1" Grid.ColumnSpan="2" Height="40" Width="200"
MaxDropDownHeight="300">
<ComboBox Name="PointModeCmBx" Grid.Row="1" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_ComboBox}"
Margin="6,0,6,0">
<ComboBox.ItemTemplate>
<DataTemplate>
<Label Content="{Binding}" FontSize="20" />
<TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
CurrentProjectPageUC.xaml
+1 -6
View File
@@ -7,12 +7,7 @@
mc:Ignorable="d"
d:DesignHeight="853.3" d:DesignWidth="1280"
Initialized="CurrentProjectPage_Initialized" Loaded="CurrentProjectPage_Loaded">
<!-- Chiamata al Dictionary -->
<UserControl.Resources>
<ResourceDictionary Source="OmagCutDictionary.xaml"/>
</UserControl.Resources>
<!-- Definizione della CurrentProjectPage -->
<Grid Name="CurrentProjectPageGrid" >
<Grid.ColumnDefinitions>
CurrentProjectPageUC.xaml.vb
+7 -2
View File
@@ -99,7 +99,12 @@ Public Class CurrentProjectPageUC
If Not CurrentProjectScene.Init() Then
' Rimuovo l'host della scena perchè altrimenti rimarrebbe il buco!!
Me.CurrentProjectPageGrid.Children.Remove(CurrentProjectSceneHost)
Dim MissingKeyWnd As New EgtMsgBox(m_MainWindow, EgtMsg(MSG_MISSINGKEYWD + 1), EgtMsg(MSG_MISSINGKEYWD + 2) & " " & EgtMsg(MSG_MISSINGKEYWD + 3), EgtMsgBox.Buttons.OK, EgtMsgBox.Icons.NULL)
Dim MissingKeyWnd As EgtMsgBox
If m_MainWindow.IsSiemensPc Then
MissingKeyWnd = New EgtMsgBox(m_MainWindow, Me.ActualWidth / 15 * 5, EgtMsgBox.WidthType.PIXEL, EgtMsg(MSG_MISSINGKEYWD + 1), EgtMsg(MSG_MISSINGKEYWD + 2) & " " & EgtMsg(MSG_MISSINGKEYWD + 3), EgtMsgBox.Buttons.OK, EgtMsgBox.Icons.NULL)
Else
MissingKeyWnd = New EgtMsgBox(m_MainWindow, EgtMsg(MSG_MISSINGKEYWD + 1), EgtMsg(MSG_MISSINGKEYWD + 2) & " " & EgtMsg(MSG_MISSINGKEYWD + 3), EgtMsgBox.Buttons.OK, EgtMsgBox.Icons.NULL)
End If
m_MainWindow.Close()
End If
' Verifico abilitazione prodotto
@@ -119,7 +124,7 @@ Public Class CurrentProjectPageUC
NewProject()
End If
EgtResetModified()
' Altrimenti ne imposto uno nuovo
' Altrimenti ne imposto uno nuovo
Else
m_nCurrProj = GetPrivateProfileInt(S_GENERAL, K_LASTPROJ, 0, m_MainWindow.GetIniFile())
NewProject()
DirectCutPageUC.xaml
+3 -8
View File
@@ -6,11 +6,6 @@
mc:Ignorable="d"
d:DesignHeight="853.3" d:DesignWidth="1280">
<!-- Chiamata al Dictionary -->
<UserControl.Resources>
<ResourceDictionary Source="OmagCutDictionary.xaml"/>
</UserControl.Resources>
<!-- Definizione della DirectCutPage -->
<Grid Name="DirectCutPageGrid" >
<Grid.ColumnDefinitions>
@@ -42,7 +37,7 @@
<Button Name="MachViewModeBtn" Grid.Column="3"
Style="{StaticResource OmagCut_RightGrayGradientYellowButton}">
<Image Source="Resources/MHT.png" Style="{StaticResource OmagCut_ButtonIcon}"/>
<Image Source="Resources/MHT.png" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
</Button>
</Grid>
@@ -92,12 +87,12 @@
<Button Name="ManualModeBtn" Grid.Column="2"
Style="{StaticResource OmagCut_YellowGradientYellowIconButton}">
<Image Source="Resources/Manual.png" Style="{StaticResource OmagCut_ButtonIcon}"/>
<Image Source="Resources/Manual.png" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
</Button>
<Button Name="SawProbingBtn" Grid.Column="1"
Style="{StaticResource OmagCut_YellowGradientYellowIconButton}">
<Image Source="Resources/SawProbe.png" Style="{StaticResource OmagCut_ButtonIcon}"/>
<Image Source="Resources/SawProbe.png" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
</Button>
</Grid>
DirectCutPageUC.xaml.vb
+6 -6
View File
@@ -277,11 +277,11 @@ Public Class DirectCutPageUC
m_MainWindow.m_CNCommunication.m_CN.ReadEls_Add_Parameter(SawDiameterNameVar, 1)
Dim SawDiam As Double = 0
For I = 0 To 20
' Se NUM Axium o Siemens devo rileggere la variabile ad ogni ciclo
If m_MainWindow.m_CNCommunication.m_nNCType = 1 Or
m_MainWindow.m_CNCommunication.m_nNCType = 3 Then
m_MainWindow.m_CNCommunication.m_CN.ReadEls_Add_Parameter(SawDiameterNameVar, 1)
End If
' Se NUM Axium o Siemens devo rileggere la variabile ad ogni ciclo
If m_MainWindow.m_CNCommunication.m_nNCType = 1 Or
m_MainWindow.m_CNCommunication.m_nNCType = 3 Then
m_MainWindow.m_CNCommunication.m_CN.ReadEls_Add_Parameter(SawDiameterNameVar, 1)
End If
If m_MainWindow.m_CNCommunication.m_CN.n_DReadELS_handle = 1 Then
SawDiam = m_MainWindow.m_CNCommunication.m_CN.d_DReadELS_value
MsgBoxStateInfo.LoadingPrBr_Value = 100
@@ -310,7 +310,7 @@ Public Class DirectCutPageUC
End If
System.Threading.Thread.Sleep(100)
Next
' Altrimenti tastatura non riuscita o interrotta dall'utente
' Altrimenti tastatura non riuscita o interrotta dall'utente
Else
m_MainWindow.m_CurrentProjectPageUC.SetErrorMessage(EgtMsg(MSG_DIRECTCUTPAGEUC + 44))
MsgBoxStateInfo.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 44) ' Errore in tastatura lama
DrawPageUC.xaml
+1 -6
View File
@@ -6,12 +6,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
mc:Ignorable="d"
d:DesignHeight="853.3" d:DesignWidth="1280" Initialized="DrawPage_Initialized" Loaded="DrawPage_Loaded" Unloaded="DrawPage_Unloaded">
<!-- Chiamata al Dictionary -->
<UserControl.Resources>
<ResourceDictionary Source="OmagCutDictionary.xaml"/>
</UserControl.Resources>
<!-- Definizione della DrawPage -->
<Border Background="{StaticResource OmagCut_Gray}">
<Grid Name="DrawPageGrd" >
FlatteningCut.xaml
+8 -14
View File
@@ -7,11 +7,6 @@
mc:Ignorable="d"
d:DesignHeight="597.3" d:DesignWidth="256">
<!-- Chiamata al Dictionary -->
<UserControl.Resources>
<ResourceDictionary Source="OmagCutDictionary.xaml"/>
</UserControl.Resources>
<Border CornerRadius="{StaticResource Page_CornerRadius}" Background="{StaticResource OmagCut_LightGray}">
<!-- Definizione della Grid MultipleCut -->
@@ -46,41 +41,40 @@
</Grid>
<ComboBox Name="PointModeCmBx" Grid.Row="1" Grid.ColumnSpan="2" Height="38" Width="200"
MaxDropDownHeight="300">
<ComboBox Name="PointModeCmBx" Grid.Row="1" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_ComboBox}" Margin="6,0,6,0">
<ComboBox.ItemTemplate>
<DataTemplate>
<Label Content="{Binding}" FontSize="20" />
<TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
<TextBlock Name="DepthTxBl" Grid.Column="0" Grid.Row="2"
Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="DepthTxBx" Grid.Column="1" Grid.Row="2" Width="75"
<EgtWPFLib:EgtTextBox Name="DepthTxBx" Grid.Column="1" Grid.Row="2" Margin="0,0,6,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
<TextBlock Name="DirectionTxBl" Grid.Column="0" Grid.Row="3"
Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="DirectionTxBx" Grid.Column="1" Grid.Row="3" Width="75"
<EgtWPFLib:EgtTextBox Name="DirectionTxBx" Grid.Column="1" Grid.Row="3" Margin="0,0,6,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
<TextBlock Name="LenghtTxBl" Grid.Column="0" Grid.Row="4"
Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="LenghtTxBx" Grid.Column="1" Grid.Row="4" Width="75"
<EgtWPFLib:EgtTextBox Name="LenghtTxBx" Grid.Column="1" Grid.Row="4" Margin="0,0,6,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
<TextBlock Name="WidthTxBl" Grid.Column="0" Grid.Row="5"
Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="WidthTxBx" Grid.Column="1" Grid.Row="5" Width="75"
<EgtWPFLib:EgtTextBox Name="WidthTxBx" Grid.Column="1" Grid.Row="5" Margin="0,0,6,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
<TextBlock Name="OverlapTxBl" Grid.Column="0" Grid.Row="6"
Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="OverlapTxBx" Grid.Column="1" Grid.Row="6" Width="75"
<EgtWPFLib:EgtTextBox Name="OverlapTxBx" Grid.Column="1" Grid.Row="6" Margin="0,0,6,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
<CheckBox Name="SideChBx" Grid.Row="7" Grid.ColumnSpan="2" Height="40" Width="220" FontSize="20"/>
<CheckBox Name="SideChBx" Grid.Row="7" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_CheckBox}" Margin="6,0,6,0"/>
<Button Name="OkBtn" Grid.Column="0" Grid.Row="11" Style="{StaticResource OmagCut_GradientBlueTextButton}"/>
FrameCutPageUC.xaml
+1 -6
View File
@@ -6,12 +6,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
mc:Ignorable="d"
d:DesignHeight="853.3" d:DesignWidth="1280">
<!-- Chiamata al Dictionary -->
<UserControl.Resources>
<ResourceDictionary Source="OmagCutDictionary.xaml"/>
</UserControl.Resources>
<!-- Definizione della FrameCutPage -->
<Grid Name="FrameCutPageGrid" >
<Grid.ColumnDefinitions>
GridCut.xaml
+11 -16
View File
@@ -1,17 +1,12 @@
<UserControl x:Class="GridCut"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
mc:Ignorable="d"
d:DesignHeight="597.3" d:DesignWidth="256">
<!-- Chiamata al Dictionary -->
<UserControl.Resources>
<ResourceDictionary Source="OmagCutDictionary.xaml"/>
</UserControl.Resources>
<Border CornerRadius="{StaticResource Page_CornerRadius}" Background="{StaticResource OmagCut_LightGray}">
<!-- Definizione della Grid MultipleCut -->
@@ -45,28 +40,28 @@
</Grid>
<ComboBox Name="PointModeCmBx" Grid.Row="1" Grid.ColumnSpan="2" Height="38" Width="200"
MaxDropDownHeight="300">
<ComboBox Name="PointModeCmBx" Grid.Row="1" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_ComboBox}"
Margin="6,0,6,0">
<ComboBox.ItemTemplate>
<DataTemplate>
<Label Content="{Binding}" FontSize="20" />
<TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
<TextBlock Name="DepthTxBl" Grid.Column="0" Grid.Row="2"
Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="DepthTxBx" Grid.Column="1" Grid.Row="2" Width="75"
<EgtWPFLib:EgtTextBox Name="DepthTxBx" Grid.Column="1" Grid.Row="2" Margin="0,0,6,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
<TextBlock Name="DirectionTxBl" Grid.Column="0" Grid.Row="3"
Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="DirectionTxBx" Grid.Column="1" Grid.Row="3" Width="75"
<EgtWPFLib:EgtTextBox Name="DirectionTxBx" Grid.Column="1" Grid.Row="3" Margin="0,0,6,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
<TextBlock Name="SideAngleTxBl" Grid.Column="0" Grid.Row="4"
Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="SideAngleTxBx" Grid.Column="1" Grid.Row="4" Width="75"
<EgtWPFLib:EgtTextBox Name="SideAngleTxBx" Grid.Column="1" Grid.Row="4" Margin="0,0,6,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
<Grid Grid.Row="5" Grid.ColumnSpan="2">
@@ -106,7 +101,7 @@
</Grid>
<CheckBox Name="SideChBx" Grid.Row="6" Grid.ColumnSpan="2" Height="40" Width="220" FontSize="20"/>
<CheckBox Name="SideChBx" Grid.Row="6" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_CheckBox}" Margin="6,0,6,0"/>
<Button Name="OkBtn" Grid.Column="0" Grid.Row="11" Style="{StaticResource OmagCut_GradientBlueTextButton}"/>
ImportPageUC.xaml
+2 -7
View File
@@ -5,12 +5,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
mc:Ignorable="d"
d:DesignHeight="853.3" d:DesignWidth="1280" Initialized="ImportPage_Initialized" Loaded="ImportPage_Loaded" Unloaded="ImportPage_Unloaded">
<!-- Chiamata al Dictionary -->
<UserControl.Resources>
<ResourceDictionary Source="OmagCutDictionary.xaml"/>
</UserControl.Resources>
<!-- Definizione della ImportPage -->
<Border>
<Grid Name="ImportPageGrid" >
@@ -47,7 +42,7 @@
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<Label Name="FilePathTxBl" Foreground="White" FontSize="20" VerticalAlignment="Center"/>
<TextBlock Name="FilePathTxBl" Foreground="White" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
<ListBox Name="FileListBox" Grid.Row="1" Grid.RowSpan="3" ItemTemplate="{DynamicResource DataTemplateItem}"
ItemsSource="{Binding ItemList}"/>
ImportPageUC.xaml.vb
+2 -2
View File
@@ -183,7 +183,7 @@ Public Class ImportPageUC
Dim TempPath As New Text.StringBuilder(260)
PathCompactPathEx(TempPath, m_sCurrDir, 22, 0)
' lo visualizzo
FilePathTxBl.Content = TempPath.ToString
FilePathTxBl.Text = TempPath.ToString
' pulisco la lista
m_MainWindow.m_ImportItemList.Clear()
' per risalire al direttorio padre
@@ -217,7 +217,7 @@ Public Class ImportPageUC
' dir corrente vuoto
m_sCurrDir = ""
' lo visualizzo
FilePathTxBl.Content = m_sCurrDir
FilePathTxBl.Text = m_sCurrDir
' pulisco la lista
m_MainWindow.m_ImportItemList.Clear()
' elenco dei dischi
InternalComponentPageUC.xaml
+6 -6
View File
@@ -1,10 +1,10 @@
<UserControl x:Class="InternalComponentPageUC"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
mc:Ignorable="d"
d:DesignHeight="768" d:DesignWidth="256">
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
mc:Ignorable="d"
d:DesignHeight="768" d:DesignWidth="256">
<!-- Definizione della MainComponentPage -->
<Grid Name="MainComponentPageGrid" Background="{StaticResource OmagCut_Gray}">
MachineButtonsUC.xaml
+6 -11
View File
@@ -1,15 +1,10 @@
<UserControl x:Class="MachineButtonsUC"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
mc:Ignorable="d"
d:DesignHeight="85.3" d:DesignWidth="853" Loaded="MachineButtons_Loaded">
<!-- Chiamata al Dictionary -->
<UserControl.Resources>
<ResourceDictionary Source="OmagCutDictionary.xaml"/>
</UserControl.Resources>
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
mc:Ignorable="d"
d:DesignHeight="85.3" d:DesignWidth="853" Loaded="MachineButtons_Loaded">
<!-- Definizione del controllo MachineButton -->
<Grid Name="MachineButtonsGrid">
MachineCNPageUC.xaml
+1 -6
View File
@@ -7,11 +7,6 @@
mc:Ignorable="d"
d:DesignHeight="768" d:DesignWidth="1280">
<!-- Chiamata al Dictionary -->
<UserControl.Resources>
<ResourceDictionary Source="OmagCutDictionary.xaml"/>
</UserControl.Resources>
<!-- Definizione della ImportPage -->
<Border Background="{StaticResource OmagCut_Gray}" >
@@ -79,7 +74,7 @@
<ColumnDefinition Width="1.5*"/>
</Grid.ColumnDefinitions>
<EgtWPFLib:EgtTextBox Name="MDITxBx" Width="470" Style="{StaticResource OmagCut_KeyboardTextBox}"/>
<EgtWPFLib:EgtTextBox Name="MDITxBx" Margin="10,0,10,0" Style="{StaticResource OmagCut_KeyboardTextBox}"/>
<Button Name="MDIConfirmBtn" Grid.Column="1"
Style="{StaticResource OmagCut_RightGrayGradientYellowTextButton}"/>
MachinePageUC.xaml
+1 -6
View File
@@ -5,12 +5,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
mc:Ignorable="d"
d:DesignHeight="853.3" d:DesignWidth="1280">
<!-- Chiamata al Dictionary -->
<UserControl.Resources>
<ResourceDictionary Source="OmagCutDictionary.xaml"/>
</UserControl.Resources>
<!-- Definizione della MachinePage -->
<Border >
MachineStatusUC.xaml
+1 -6
View File
@@ -6,11 +6,6 @@
mc:Ignorable="d"
d:DesignHeight="85.3" d:DesignWidth="1280" Initialized="MachineStatus_Initialized" Loaded="MachineStatus_Loaded">
<!-- Chiamata al Dictionary -->
<UserControl.Resources>
<ResourceDictionary Source="OmagCUTDictionary.xaml" />
</UserControl.Resources>
<!-- ** Definizione della MachineStatusBar ** -->
<Grid Name="MachineStatusGrid" Background="{StaticResource OmagCut_DarkGray}">
<Grid.ColumnDefinitions>
@@ -26,7 +21,7 @@
<Grid Name="CurrMachineStatusGrid" Grid.Row="1">
<Image Name="MachineStatusImage"
Style="{StaticResource OmagCut_MachineStatusIcon}"/>
Style="{DynamicResource OmagCut_MachineStatusIcon}"/>
</Grid>
<UniformGrid Name="AxisUniformGrid" Grid.Column="2" Grid.Row="1" Columns="8">
MachineStatusUC.xaml.vb
+20 -5
View File
@@ -59,25 +59,40 @@ Public Class MachineStatusUC
Dim BaseColumn As New ColumnDefinition()
BaseColumn.Width = New GridLength(1, GridUnitType.Star)
MachineStatusGrid.ColumnDefinitions.Add(BaseColumn)
Dim VerticalRow As New RowDefinition
VerticalRow.Height = New GridLength(m_AxesNumber + 2, GridUnitType.Star)
MachineStatusGrid.RowDefinitions.Add(VerticalRow)
Dim StatusRow As New RowDefinition
StatusRow.Height = New GridLength(1, GridUnitType.Star)
MachineStatusGrid.RowDefinitions.Add(StatusRow)
Dim VerticalRow As New RowDefinition
VerticalRow.Height = New GridLength(11, GridUnitType.Star)
MachineStatusGrid.RowDefinitions.Add(VerticalRow)
' rimuovo A dallo UniformGrid degli assi
AxisUniformGrid.Children.Remove(ConsumptionGrid)
AxisUniformGrid.SetValue(Grid.RowProperty, 0)
' porto A in stato macchina
CurrMachineStatusGrid.SetValue(Grid.ColumnProperty, 1)
CurrMachineStatusGrid.SetValue(Grid.RowProperty, 0)
CurrMachineStatusGrid.SetValue(Grid.RowProperty, 1)
CurrMachineStatusGrid.ColumnDefinitions.Clear()
CurrMachineStatusGrid.RowDefinitions.Clear()
Dim SingleColumn As New ColumnDefinition()
SingleColumn.Width = New GridLength(1, GridUnitType.Star)
CurrMachineStatusGrid.ColumnDefinitions.Add(SingleColumn)
Dim DoubleColumn As New ColumnDefinition()
DoubleColumn.Width = New GridLength(2, GridUnitType.Star)
DoubleColumn.Width = New GridLength(1.5, GridUnitType.Star)
CurrMachineStatusGrid.ColumnDefinitions.Add(DoubleColumn)
Dim StatusBorderRow As New RowDefinition()
StatusBorderRow.Height = New GridLength(2, GridUnitType.Pixel)
CurrMachineStatusGrid.RowDefinitions.Add(StatusBorderRow)
Dim SingleRow As New RowDefinition()
SingleRow.Height = New GridLength(1, GridUnitType.Star)
CurrMachineStatusGrid.RowDefinitions.Add(SingleRow)
ConsumptionGrid.SetValue(Grid.ColumnProperty, 1)
CurrMachineStatusGrid.Children.Add(ConsumptionGrid)
Dim StatusBorder As New Border
StatusBorder.Background = Application.Current.FindResource("OmagCut_White")
StatusBorder.SetValue(Grid.ColumnSpanProperty, 2)
CurrMachineStatusGrid.Children.Add(StatusBorder)
MachineStatusImage.SetValue(Grid.RowProperty, 1)
ConsumptionGrid.SetValue(Grid.RowProperty, 1)
' modifico uniformgrid
AxisUniformGrid.Columns = 1
AxisUniformGrid.Rows = m_AxesNumber + 2
MachiningDbPageUC.xaml
+66 -82
View File
@@ -8,11 +8,6 @@
mc:Ignorable="d"
d:DesignHeight="768" d:DesignWidth="1280" Initialized="MachiningDbPage_Initialized" Loaded="MachiningDbPage_Loaded">
<!-- Chiamata al Dictionary -->
<UserControl.Resources>
<ResourceDictionary Source="OmagCutDictionary.xaml"/>
</UserControl.Resources>
<!-- Definizione della MachiningDbPage -->
<Border Style="{StaticResource OmagCut_PageBorder}">
@@ -226,41 +221,38 @@
<TextBlock Name="NameTxBl" Grid.Column="0" Grid.Row="0" Grid.RowSpan="3"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="NameTxBx" Grid.Column="1" Grid.Row="0" Grid.RowSpan="3" Width="150"
Style="{StaticResource OmagCut_KeyboardTextBox}" />
<EgtWPFLib:EgtTextBox Name="NameTxBx" Grid.Column="1" Grid.Row="0" Grid.RowSpan="3"
Style="{StaticResource OmagCut_LeftCalculatorTextBoxNoBorder}" />
<TextBlock Name="DepthTxBl" Grid.Column="0" Grid.Row="3" Grid.RowSpan="3"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="DepthTxBx" Grid.Column="1" Grid.Row="3" Grid.RowSpan="3" Width="150"
Style="{StaticResource OmagCut_KeyboardTextBox}" />
<EgtWPFLib:EgtTextBox Name="DepthTxBx" Grid.Column="1" Grid.Row="3" Grid.RowSpan="3"
Style="{StaticResource OmagCut_LeftCalculatorTextBoxNoBorder}" />
<!-- Parametri Taglio -->
<TextBlock Name="SideAngleTxBl" Grid.Column="2" Grid.Row="3" Grid.RowSpan="3"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="SideAngleTxBx" Grid.Column="3" Grid.Row="3" Grid.RowSpan="3" Width="150"
<EgtWPFLib:EgtTextBox Name="SideAngleTxBx" Grid.Column="3" Grid.Row="3" Grid.RowSpan="3" Margin="0,0,15,0"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
<TextBlock Name="StepTypeTxBl" Grid.Column="0" Grid.Row="6" Grid.RowSpan="3"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
<ComboBox Name="StepTypeCmBx" Grid.Column="1" Grid.Row="6" Grid.RowSpan="3" Width="150" Height="40" HorizontalAlignment="Center"
VerticalAlignment="Center" >
<ComboBox Name="StepTypeCmBx" Grid.Column="1" Grid.Row="6" Grid.RowSpan="3" Style="{StaticResource OmagCut_LeftComboBoxNoBorder}">
<ComboBox.ItemTemplate>
<DataTemplate>
<Label Content="{Binding}" FontSize="20" />
<TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
<TextBlock Name="AcrossTxBl" Grid.Row="3" Grid.Column="2" Grid.RowSpan="3"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
<CheckBox Name="AcrossChBx" Grid.Row="3" Grid.Column="3" Grid.RowSpan="3" Height="40" Width="40"
HorizontalAlignment="Center"/>
<CheckBox Name="AcrossChBx" Grid.Row="3" Grid.Column="3" Grid.RowSpan="3" Style="{StaticResource OmagCut_CheckBox_Single}"/>
<TextBlock Name="InvertTxBl" Grid.Row="6" Grid.Column="2" Grid.RowSpan="3"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
<CheckBox Name="InvertChBx" Grid.Row="6" Grid.Column="3" Grid.RowSpan="3" Height="40" Width="40"
HorizontalAlignment="Center"/>
<CheckBox Name="InvertChBx" Grid.Row="6" Grid.Column="3" Grid.RowSpan="3" Style="{StaticResource OmagCut_CheckBox_Single}"/>
<Border Name="SideBrd" Grid.Column="0" Grid.Row="9" Grid.ColumnSpan="4" Grid.RowSpan="3"
Style="{StaticResource OmagCut_NoNameGroupBorder}">
@@ -278,22 +270,20 @@
<TextBlock Name="WorkSideTxBl" Grid.Column="0"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
<ComboBox Name="WorkSideCmBx" Grid.Column="1" Grid.Row="5" Width="150" Height="40" HorizontalAlignment="Center"
VerticalAlignment="Center" >
<ComboBox Name="WorkSideCmBx" Grid.Column="1" Grid.Row="5" Style="{StaticResource OmagCut_LeftComboBoxInBorder}">
<ComboBox.ItemTemplate>
<DataTemplate>
<Label Content="{Binding}" FontSize="20" />
<TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
<TextBlock Name="HeadSideTxBl" Grid.Column="2"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
<ComboBox Name="HeadSideCmBx" Grid.Column="4" Grid.Row="5" Width="150" Height="40" HorizontalAlignment="Center"
VerticalAlignment="Center" >
<ComboBox Name="HeadSideCmBx" Grid.Column="4" Grid.Row="5" Style="{StaticResource OmagCut_RightComboBoxInBorder}">
<ComboBox.ItemTemplate>
<DataTemplate>
<Label Content="{Binding}" FontSize="20" />
<TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
@@ -319,16 +309,15 @@
<TextBlock Name="StartPosTxBl" Grid.Column="0" Grid.Row="0"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="StartPosTxBx" Grid.Column="1" Grid.Row="0" Width="150"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
<EgtWPFLib:EgtTextBox Name="StartPosTxBx" Grid.Column="1" Grid.Row="0"
Style="{StaticResource OmagCut_MachLeftCalculatorTextBoxInBorder}" />
<TextBlock Name="LeadInTypeTxBl" Grid.Column="2" Grid.Row="0"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
<ComboBox Name="LeadInTypeCmBx" Grid.Column="3" Grid.Row="0" Width="150" Height="40" HorizontalAlignment="Center"
VerticalAlignment="Center" >
<ComboBox Name="LeadInTypeCmBx" Grid.Column="3" Grid.Row="0" Style="{StaticResource OmagCut_RightComboBoxInBorder}">
<ComboBox.ItemTemplate>
<DataTemplate>
<Label Content="{Binding}" FontSize="20" />
<TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
@@ -336,33 +325,30 @@
<!--Questo è solo per sgrossatura con lama-->
<TextBlock Name="LeadLinkTypeTxBl" Grid.Column="2" Grid.Row="0"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
<ComboBox Name="LeadLinkTypeCmBx" Grid.Column="3" Grid.Row="0" Width="150" Height="40" HorizontalAlignment="Center"
VerticalAlignment="Center" >
<ComboBox Name="LeadLinkTypeCmBx" Grid.Column="3" Grid.Row="0" Style="{StaticResource OmagCut_RightComboBoxInBorder}">
<ComboBox.ItemTemplate>
<DataTemplate>
<Label Content="{Binding}" FontSize="20" />
<TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
<TextBlock Name="ExtLinkTypeTxBl" Grid.Column="0" Grid.Row="1"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
<ComboBox Name="ExtLinkTypeCmBx" Grid.Column="1" Grid.Row="1" Width="150" Height="40" HorizontalAlignment="Center"
VerticalAlignment="Center" >
<ComboBox Name="ExtLinkTypeCmBx" Grid.Column="1" Grid.Row="1" Style="{StaticResource OmagCut_LeftComboBoxInBorder}">
<ComboBox.ItemTemplate>
<DataTemplate>
<Label Content="{Binding}" FontSize="20" />
<TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
<TextBlock Name="LeadOutTypeTxBl" Grid.Column="2" Grid.Row="1"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
<ComboBox Name="LeadOutTypeCmBx" Grid.Column="3" Grid.Row="1" Width="150" Height="40" HorizontalAlignment="Center"
VerticalAlignment="Center" >
<ComboBox Name="LeadOutTypeCmBx" Grid.Column="3" Grid.Row="1" Style="{StaticResource OmagCut_RightComboBoxInBorder}">
<ComboBox.ItemTemplate>
<DataTemplate>
<Label Content="{Binding}" FontSize="20" />
<TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
@@ -387,19 +373,18 @@
<TextBlock Name="CurveUseTxBl" Grid.Column="0"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
<ComboBox Name="CurveUseCmBx" Grid.Column="1" Grid.Row="0" Width="150" Height="40" HorizontalAlignment="Center"
VerticalAlignment="Center" >
<ComboBox Name="CurveUseCmBx" Grid.Column="1" Grid.Row="0" Style="{StaticResource OmagCut_LeftComboBoxInBorder}">
<ComboBox.ItemTemplate>
<DataTemplate>
<Label Content="{Binding}" FontSize="20" />
<TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
<TextBlock Name="ApproxTxBl" Grid.Column="2"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="ApproxTxBx" Grid.Column="3" Width="150"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
<EgtWPFLib:EgtTextBox Name="ApproxTxBx" Grid.Column="3"
Style="{StaticResource OmagCut_MachRightCalculatorTextBoxInBorder}" />
</Grid>
@@ -425,18 +410,18 @@
<TextBlock Name="StepSideAngTxBl" Grid.Column="2" Grid.Row="0"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="StepSideAngTxBx" Grid.Column="3" Grid.Row="0" Width="150"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
<EgtWPFLib:EgtTextBox Name="StepSideAngTxBx" Grid.Column="3" Grid.Row="0"
Style="{StaticResource OmagCut_CalculatorTextBoxInGroupBox}" />
<TextBlock Name="ArcIntTxBl" Grid.Column="0" Grid.Row="1"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="ArcIntTxBx" Grid.Column="1" Grid.Row="1" Width="150"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
<EgtWPFLib:EgtTextBox Name="ArcIntTxBx" Grid.Column="1" Grid.Row="1"
Style="{StaticResource OmagCut_CalculatorTextBoxInGroupBox}"/>
<TextBlock Name="ArcExtTxBl" Grid.Column="2" Grid.Row="1"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="ArcExtTxBx" Grid.Column="3" Grid.Row="1" Width="150"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
<EgtWPFLib:EgtTextBox Name="ArcExtTxBx" Grid.Column="3" Grid.Row="1"
Style="{StaticResource OmagCut_CalculatorTextBoxInGroupBox}"/>
</Grid>
@@ -449,7 +434,7 @@
<TextBlock Name="ThrouAddLenTxBl" Grid.Column="2" Grid.Row="6" Grid.RowSpan="3"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="ThrouAddLenTxBx" Grid.Column="3" Grid.Row="6" Grid.RowSpan="3" Width="150"
<EgtWPFLib:EgtTextBox Name="ThrouAddLenTxBx" Grid.Column="3" Grid.Row="6" Grid.RowSpan="3" Margin="0,0,15,0"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
<GroupBox Name="LowLenGpBx" Grid.Column="0" Grid.Row="9" Grid.ColumnSpan="4" Grid.RowSpan="4"
@@ -468,13 +453,13 @@
<TextBlock Name="StartsLowLenTxBl" Grid.Column="0"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="StartsLowLenTxBx" Grid.Column="1" Grid.Row="3" Width="150"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
<EgtWPFLib:EgtTextBox Name="StartsLowLenTxBx" Grid.Column="1" Grid.Row="3"
Style="{StaticResource OmagCut_CalculatorTextBoxInGroupBox}" />
<TextBlock Name="EndsLowLenTxBl" Grid.Column="2"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="EndsLowLenTxBx" Grid.Column="3" Grid.Row="3" Width="150"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
<EgtWPFLib:EgtTextBox Name="EndsLowLenTxBx" Grid.Column="3" Grid.Row="3"
Style="{StaticResource OmagCut_CalculatorTextBoxInGroupBox}" />
</Grid>
@@ -496,13 +481,13 @@
<TextBlock Name="DrillStepTxBl" Grid.Column="0" Grid.Row="0"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="StepTxBx" Grid.Column="1" Grid.Row="0" Width="150"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
<EgtWPFLib:EgtTextBox Name="StepTxBx" Grid.Column="1" Grid.Row="0"
Style="{StaticResource OmagCut_LeftCalculatorTextBoxInBorder}" />
<TextBlock Name="ReturnPosTxBl" Grid.Column="2" Grid.Row="0"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="ReturnPosTxBx" Grid.Column="3" Grid.Row="0" Width="150"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
<EgtWPFLib:EgtTextBox Name="ReturnPosTxBx" Grid.Column="3" Grid.Row="0"
Style="{StaticResource OmagCut_MachRightCalculatorTextBoxInBorder}" />
</Grid>
@@ -529,8 +514,8 @@
<TextBlock Name="SideStepTxBl" Grid.Column="2"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="SideStepTxBx" Grid.Column="3" Grid.Row="3" Width="150"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
<EgtWPFLib:EgtTextBox Name="SideStepTxBx" Grid.Column="3" Grid.Row="3"
Style="{StaticResource OmagCut_CalculatorTextBoxInGroupBox}" />
</Grid>
@@ -567,13 +552,13 @@
<TextBlock Name="MinThicknessTxBl" Grid.Column="0" Grid.Row="1"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="MinThicknessTxBx" Grid.Column="1" Grid.Row="1" Width="150"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
<EgtWPFLib:EgtTextBox Name="MinThicknessTxBx" Grid.Column="1" Grid.Row="1"
Style="{StaticResource OmagCut_MachLeftCalculatorTextBoxInBorder}" />
<TextBlock Name="MaxThicknessTxBl" Grid.Column="2" Grid.Row="1"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="MaxThicknessTxBx" Grid.Column="3" Grid.Row="1" Width="150"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
<EgtWPFLib:EgtTextBox Name="MaxThicknessTxBx" Grid.Column="3" Grid.Row="1"
Style="{StaticResource OmagCut_MachRightCalculatorTextBoxInBorder}" />
</Grid>
</Border>
@@ -628,11 +613,10 @@
<TextBlock Name="ToolTxBl" Grid.Column="0" Grid.RowSpan="3"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
<ComboBox Name="ToolCmBx" Grid.Column="1" Grid.Row="0" Grid.RowSpan="3" Width="150" Height="40" HorizontalAlignment="Center"
VerticalAlignment="Center" >
<ComboBox Name="ToolCmBx" Grid.Column="1" Grid.Row="0" Grid.RowSpan="3" Style="{StaticResource OmagCut_MachToolLeftComboBoxNoBorder}">
<ComboBox.ItemTemplate>
<DataTemplate>
<Label Content="{Binding}" FontSize="20" />
<TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
@@ -645,8 +629,8 @@
<TextBlock Name="SpeedTxBl" Grid.Column="0"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="SpeedTxBx" Grid.Column="1" Width="150"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
<EgtWPFLib:EgtTextBox Name="SpeedTxBx" Grid.Column="1"
Style="{StaticResource OmagCut_MachToolCalculatorTextBox}" />
</Grid>
@@ -668,28 +652,28 @@
<TextBlock Name="FeedTxBl" Grid.Column="0" Grid.Row="0"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="FeedTxBx" Grid.Column="1" Grid.Row="0" Width="150"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
<EgtWPFLib:EgtTextBox Name="FeedTxBx" Grid.Column="1" Grid.Row="0"
Style="{StaticResource OmagCut_CalculatorTextBoxInGroupBox}"/>
<TextBlock Name="TipFeedTxBl" Grid.Column="0" Grid.Row="1"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="TipFeedTxBx" Grid.Column="1" Grid.Row="1" Width="150"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
<EgtWPFLib:EgtTextBox Name="TipFeedTxBx" Grid.Column="1" Grid.Row="1"
Style="{StaticResource OmagCut_CalculatorTextBoxInGroupBox}" />
<TextBlock Name="StartFeedTxBl" Grid.Column="0" Grid.Row="2"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="StartFeedTxBx" Grid.Column="1" Grid.Row="2" Width="150"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
<EgtWPFLib:EgtTextBox Name="StartFeedTxBx" Grid.Column="1" Grid.Row="2"
Style="{StaticResource OmagCut_CalculatorTextBoxInGroupBox}" />
<TextBlock Name="EndFeedTxBl" Grid.Column="0" Grid.Row="3"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="EndFeedTxBx" Grid.Column="1" Grid.Row="3" Width="150"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
<EgtWPFLib:EgtTextBox Name="EndFeedTxBx" Grid.Column="1" Grid.Row="3"
Style="{StaticResource OmagCut_CalculatorTextBoxInGroupBox}" />
<TextBlock Name="VertFeedTxBl" Grid.Column="0" Grid.Row="4"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="VertFeedTxBx" Grid.Column="1" Grid.Row="4" Width="150"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
<EgtWPFLib:EgtTextBox Name="VertFeedTxBx" Grid.Column="1" Grid.Row="4"
Style="{StaticResource OmagCut_CalculatorTextBoxInGroupBox}" />
</Grid>
@@ -710,13 +694,13 @@
<TextBlock Name="RadOffsetTxBl" Grid.Column="0" Grid.Row="0"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="RadOffsetTxBx" Grid.Column="1" Grid.Row="0" Width="150"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
<EgtWPFLib:EgtTextBox Name="RadOffsetTxBx" Grid.Column="1" Grid.Row="0"
Style="{StaticResource OmagCut_CalculatorTextBoxInGroupBox}" />
<TextBlock Name="LonOffsetTxBl" Grid.Column="0" Grid.Row="1"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="LonOffsetTxBx" Grid.Column="1" Grid.Row="1" Width="150"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
<EgtWPFLib:EgtTextBox Name="LonOffsetTxBx" Grid.Column="1" Grid.Row="1"
Style="{StaticResource OmagCut_CalculatorTextBoxInGroupBox}" />
</Grid>
MachiningDbPageUC.xaml.vb
+15
View File
@@ -580,6 +580,7 @@ Public Class MachiningDbPageUC
StartPosTxBx.SetValue(Grid.RowProperty, 0)
StartPosTxBl.SetValue(Grid.RowSpanProperty, 1)
StartPosTxBx.SetValue(Grid.RowSpanProperty, 1)
StartPosTxBx.Style = Application.Current.FindResource("OmagCut_MachLeftCalculatorTextBoxInBorder")
End If
StartPosTxBl.Visibility = Windows.Visibility.Visible
StartPosTxBx.Visibility = Windows.Visibility.Visible
@@ -591,11 +592,13 @@ Public Class MachiningDbPageUC
SawStepGrd.Children.Add(StepTxBx)
StepTxBx.SetValue(Grid.ColumnProperty, 1)
StepTxBx.SetValue(Grid.RowProperty, 0)
StepTxBx.Style = Application.Current.FindResource("OmagCut_CalculatorTextBoxInGroupBox")
ElseIf SawRouStepGrd.Children.Contains(StepTxBx) Then
SawRouStepGrd.Children.Remove(StepTxBx)
SawStepGrd.Children.Add(StepTxBx)
StepTxBx.SetValue(Grid.ColumnProperty, 1)
StepTxBx.SetValue(Grid.RowProperty, 0)
StepTxBx.Style = Application.Current.FindResource("OmagCut_CalculatorTextBoxInGroupBox")
End If
DrillStepBrd.Visibility = Windows.Visibility.Hidden
SawRouStepGpBx.Visibility = Windows.Visibility.Hidden
@@ -654,6 +657,7 @@ Public Class MachiningDbPageUC
StartPosTxBx.SetValue(Grid.RowProperty, 0)
StartPosTxBl.SetValue(Grid.RowSpanProperty, 1)
StartPosTxBx.SetValue(Grid.RowSpanProperty, 1)
'StartPosTxBx.Style = Application.Current.FindResource("OmagCut_LeftCalculatorTextBoxInBorder")
End If
StartPosTxBl.Visibility = Windows.Visibility.Visible
StartPosTxBx.Visibility = Windows.Visibility.Visible
@@ -665,11 +669,13 @@ Public Class MachiningDbPageUC
SawStepGrd.Children.Add(StepTxBx)
StepTxBx.SetValue(Grid.ColumnProperty, 1)
StepTxBx.SetValue(Grid.RowProperty, 0)
'StepTxBx.Style = Application.Current.FindResource("OmagCut_CalculatorTextBoxInBorder")
ElseIf SawRouStepGrd.Children.Contains(StepTxBx) Then
SawRouStepGrd.Children.Remove(StepTxBx)
SawStepGrd.Children.Add(StepTxBx)
StepTxBx.SetValue(Grid.ColumnProperty, 1)
StepTxBx.SetValue(Grid.RowProperty, 0)
'StepTxBx.Style = Application.Current.FindResource("OmagCut_CalculatorTextBoxInBorder")
End If
StepTxBx.Visibility = Windows.Visibility.Visible
SawStepGpBx.Visibility = Windows.Visibility.Visible
@@ -717,6 +723,7 @@ Public Class MachiningDbPageUC
StartPosTxBx.SetValue(Grid.RowProperty, 6)
StartPosTxBl.SetValue(Grid.RowSpanProperty, 3)
StartPosTxBx.SetValue(Grid.RowSpanProperty, 3)
StartPosTxBx.Style = Application.Current.FindResource("OmagCut_LeftCalculatorTextBoxNoBorder")
End If
StartPosTxBl.Visibility = Windows.Visibility.Visible
StartPosTxBx.Visibility = Windows.Visibility.Visible
@@ -728,11 +735,13 @@ Public Class MachiningDbPageUC
DrillStepGrd.Children.Add(StepTxBx)
StepTxBx.SetValue(Grid.ColumnProperty, 1)
StepTxBx.SetValue(Grid.RowProperty, 2)
StepTxBx.Style = Application.Current.FindResource("OmagCut_MachLeftCalculatorTextBoxInBorder")
ElseIf SawRouStepGrd.Children.Contains(StepTxBx) Then
SawRouStepGrd.Children.Remove(StepTxBx)
DrillStepGrd.Children.Add(StepTxBx)
StepTxBx.SetValue(Grid.ColumnProperty, 1)
StepTxBx.SetValue(Grid.RowProperty, 2)
StepTxBx.Style = Application.Current.FindResource("OmagCut_MachLeftCalculatorTextBoxInBorder")
End If
StepTxBx.Visibility = Windows.Visibility.Visible
SawStepGpBx.Visibility = Windows.Visibility.Hidden
@@ -788,6 +797,7 @@ Public Class MachiningDbPageUC
StartPosTxBx.SetValue(Grid.RowProperty, 0)
StartPosTxBl.SetValue(Grid.RowSpanProperty, 1)
StartPosTxBx.SetValue(Grid.RowSpanProperty, 1)
StartPosTxBx.Style = Application.Current.FindResource("OmagCut_MachLeftCalculatorTextBoxInBorder")
End If
StartPosTxBl.Visibility = Windows.Visibility.Visible
StartPosTxBx.Visibility = Windows.Visibility.Visible
@@ -799,11 +809,13 @@ Public Class MachiningDbPageUC
SawRouStepGrd.Children.Add(StepTxBx)
StepTxBx.SetValue(Grid.ColumnProperty, 1)
StepTxBx.SetValue(Grid.RowProperty, 0)
StepTxBx.Style = Application.Current.FindResource("OmagCut_CalculatorTextBoxInGroupBox")
ElseIf SawStepGrd.Children.Contains(StepTxBx) Then
SawStepGrd.Children.Remove(StepTxBx)
SawRouStepGrd.Children.Add(StepTxBx)
StepTxBx.SetValue(Grid.ColumnProperty, 1)
StepTxBx.SetValue(Grid.RowProperty, 0)
StepTxBx.Style = Application.Current.FindResource("OmagCut_CalculatorTextBoxInGroupBox")
End If
StepTxBx.Visibility = Windows.Visibility.Visible
DrillStepBrd.Visibility = Windows.Visibility.Hidden
@@ -877,6 +889,7 @@ Public Class MachiningDbPageUC
StartPosTxBx.SetValue(Grid.RowProperty, 0)
StartPosTxBl.SetValue(Grid.RowSpanProperty, 1)
StartPosTxBx.SetValue(Grid.RowSpanProperty, 1)
StartPosTxBx.Style = Application.Current.FindResource("OmagCut_MachLeftCalculatorTextBoxInBorder")
End If
StartPosTxBl.Visibility = Windows.Visibility.Visible
StartPosTxBx.Visibility = Windows.Visibility.Visible
@@ -892,11 +905,13 @@ Public Class MachiningDbPageUC
SawRouStepGrd.Children.Add(StepTxBx)
StepTxBx.SetValue(Grid.ColumnProperty, 1)
StepTxBx.SetValue(Grid.RowProperty, 0)
StepTxBx.Style = Application.Current.FindResource("OmagCut_CalculatorTextBoxInGroupBox")
ElseIf SawStepGrd.Children.Contains(StepTxBx) Then
SawStepGrd.Children.Remove(StepTxBx)
SawRouStepGrd.Children.Add(StepTxBx)
StepTxBx.SetValue(Grid.ColumnProperty, 1)
StepTxBx.SetValue(Grid.RowProperty, 0)
StepTxBx.Style = Application.Current.FindResource("OmagCut_CalculatorTextBoxInGroupBox")
End If
StepTxBx.Visibility = Windows.Visibility.Visible
ReturnPosTxBl.Visibility = Windows.Visibility.Hidden
MainComponentPageUC.xaml
+1 -6
View File
@@ -5,12 +5,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
mc:Ignorable="d"
d:DesignHeight="768" d:DesignWidth="256">
<!-- Chiamata al Dictionary -->
<UserControl.Resources>
<ResourceDictionary Source="OmagCutDictionary.xaml"/>
</UserControl.Resources>
<!-- Definizione della MainComponentPage -->
<Grid Name="MainComponentPageGrid">
<Grid.RowDefinitions>
MainWindow.xaml
+2 -7
View File
@@ -5,12 +5,7 @@
Title="MainWindow" Height="1024" Width="1280" ResizeMode="NoResize" WindowStyle="None"
FontFamily="./Resources/Fonts/#Century Gothic"
Icon="Resources/LogoOmag.jpg">
<!-- Chiamata al Dictionary -->
<Window.Resources>
<ResourceDictionary Source="OmagCUTDictionary.xaml" />
</Window.Resources>
<!-- ** Definizione della Grid della MainWindow ** -->
<Grid Name="MainWindowGrid" Background="{StaticResource OmagCut_Gray}">
<Grid.ColumnDefinitions>
@@ -54,7 +49,7 @@
<ToggleButton Name="FrameCutBtn" Grid.Column="3" Style="{StaticResource OmagCut_BlueToggleButton}"/>
<ToggleButton Name="MachineBtn" Grid.Column="4" Style="{StaticResource OmagCut_BlueToggleButton}"/>
<ToggleButton Name="OptionsBtn" Grid.Column="5" Style="{StaticResource OmagCut_BlueIconToggleButton}">
<Image Source="Resources/Options.png" Style="{StaticResource OmagCut_ButtonIcon}"/>
<Image Source="Resources/Options.png" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
</ToggleButton>
</Grid>
MainWindow.xaml.vb
+38 -9
View File
@@ -89,6 +89,9 @@ Class MainWindow
' Timer per linea di produzione
Private m_ProdLineTimer As New DispatcherTimer(DispatcherPriority.ApplicationIdle)
' Variabile che indica il tipo di pc su cui gira il programma
Private m_bIsSiemensPc As Boolean = False
Friend Enum Pages
WorkInProgress
DirectCut
@@ -166,6 +169,10 @@ Class MainWindow
Return m_nKeyOptions
End Function
Public Function IsSiemensPc() As Boolean
Return m_bIsSiemensPc
End Function
Private Sub MainWindow_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
' Verifico sia l'unica istanza
ManageSingleIstance()
@@ -300,15 +307,32 @@ Class MainWindow
m_OptionsPageUC = New OptionsPageUC
' Creazione gestore comunicazione con macchina CN
m_CNCommunication = New CNCommunication
' Imposto tipologia di pc su cui gira il programma
m_bIsSiemensPc = If(GetPrivateProfileInt(S_GENERAL, K_SIEMENSPC, 0, GetIniFile()) = 0, False, True)
' Posizionamento nella griglia della MachineStatusBar
Dim PcType As Integer = GetPrivateProfileInt(S_GENERAL, K_SIEMENSPC, 0, m_sIniFile)
If PcType = 0 Then
If Not m_bIsSiemensPc Then
m_MachineStatusUC.SetValue(Grid.RowProperty, 2)
MainWindowGrid.ColumnDefinitions.RemoveAt(MainWindowGrid.ColumnDefinitions.Count - 1)
Else
m_MachineStatusUC.SetValue(Grid.ColumnProperty, 2)
m_MachineStatusUC.SetValue(Grid.RowSpanProperty, 3)
MainWindowGrid.RowDefinitions.RemoveAt(MainWindowGrid.RowDefinitions.Count - 1)
Application.Current.Resources("FontSize_LowerCaseCharacter") = New FontSizeConverter().ConvertFrom(CStr("17"))
Application.Current.Resources("ComboBox_Height") = New LengthConverter().ConvertFrom(CStr("35"))
Application.Current.Resources("FontSize_GroupBoxHeader") = New LengthConverter().ConvertFrom(CStr("19"))
Application.Current.Resources("CheckBox_Height") = New LengthConverter().ConvertFrom(CStr("35"))
Application.Current.Resources("TextBoxInGroupBox_Margin") = New Thickness(2, 0, 9, 0)
Application.Current.Resources("RightTextBoxInBorder_Margin") = New Thickness(1, 0, 12, 0)
Application.Current.Resources("LeftTextBoxInBorder_Margin") = New Thickness(4, 0, 9, 0)
Application.Current.Resources("LeftTextBoxNoBorder_Margin") = New Thickness(6, 0, 9, 0)
Application.Current.Resources("RightComboBoxInBorder_Margin") = New Thickness(2, 0, 11, 0)
Application.Current.Resources("MachRightTextBoxInBorder_Margin") = New Thickness(2, 0, 11, 0)
Application.Current.Resources("MachLeftTextBoxInBorder_Margin") = New Thickness(4, 0, 9, 0)
Application.Current.Resources("LeftComboBoxInBorder_Margin") = New Thickness(4, 0, 9, 0)
Application.Current.Resources("MachToolLeftTextBoxNoBorder_Margin") = New Thickness(3, 0, 15, 0)
Application.Current.Resources("ArrowImage_Height") = New LengthConverter().ConvertFrom(CStr("52"))
Application.Current.Resources("ScaleImage_Height") = New LengthConverter().ConvertFrom(CStr("60"))
Application.Current.Resources("MachineStatusImage_Height") = New LengthConverter().ConvertFrom(CStr("65"))
End If
' Posizionemento nella griglia delle Page UserControl
m_WorkInProgressPageUC.SetValue(Grid.ColumnProperty, 0)
@@ -720,14 +744,19 @@ Class MainWindow
Dim bPrjToSave As Boolean = False
EgtSetCurrentContext(m_CurrentProjectPageUC.CurrentProjectScene.GetCtx())
If EgtGetModified() Then
Dim SaveCurrProj As New EgtMsgBox(Me, "", EgtMsg(MSG_EGTMSGBOX + 1), EgtMsgBox.Buttons.YES_NO_CANCEL, EgtMsgBox.Icons.NULL)
Dim SaveCurrProj As EgtMsgBox
If IsSiemensPc() Then
SaveCurrProj = New EgtMsgBox(Me, Me.ActualWidth / 17 * 5, EgtMsgBox.WidthType.PIXEL, "", EgtMsg(MSG_EGTMSGBOX + 1), EgtMsgBox.Buttons.YES_NO_CANCEL, EgtMsgBox.Icons.NULL)
Else
SaveCurrProj = New EgtMsgBox(Me, "", EgtMsg(MSG_EGTMSGBOX + 1), EgtMsgBox.Buttons.YES_NO_CANCEL, EgtMsgBox.Icons.NULL)
End If
Select Case SaveCurrProj.DialogResult
Case 0 ' Annulla
Return
Case 1 ' Si
bPrjToSave = True
Case 2 ' No
bPrjToSave = False
Case 0 ' Annulla
Return
Case 1 ' Si
bPrjToSave = True
Case 2 ' No
bPrjToSave = False
End Select
End If
' Uscita da pagina corrente definizione grezzo
ManualAxesMoveUC.xaml
+7 -12
View File
@@ -7,11 +7,6 @@
mc:Ignorable="d"
d:DesignHeight="597.3" d:DesignWidth="256">
<!-- Chiamata al Dictionary -->
<UserControl.Resources>
<ResourceDictionary Source="OmagCutDictionary.xaml"/>
</UserControl.Resources>
<Border Style="{StaticResource OmagCut_Page2Border}">
<!-- Definizione della Grid laterale -->
@@ -47,29 +42,29 @@
<TextBlock x:Name="FeedTxBl" Grid.Column="0" Grid.Row="0"
Style="{StaticResource OmagCut_SingleUpperCaseCharacterTextBlock}" />
<EgtWPFLib:EgtTextBox Name="FeedTxBx" Grid.Column="1" Margin="10.5,0,10.5,0"
<EgtWPFLib:EgtTextBox Name="FeedTxBx" Grid.Column="1" Margin="6,0,6,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
<TextBlock x:Name="SpeedTxBl" Grid.Column="0" Grid.Row="1"
Style="{StaticResource OmagCut_SingleUpperCaseCharacterTextBlock}" />
<EgtWPFLib:EgtTextBox Name="SpeedTxBx" Grid.Column="1" Grid.Row="1" Margin="10.5,0,10.5,0"
<EgtWPFLib:EgtTextBox Name="SpeedTxBx" Grid.Column="1" Grid.Row="1" Margin="6,0,6,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
</Grid>
<Button x:Name="L1Btn" Grid.Row="1" Height="60" Width="60" Style="{StaticResource OmagCut_RightGrayGradientYellowTextButton}"/>
<EgtWPFLib:EgtTextBox Name="L1TxBx" Grid.Column="1" Grid.Row="1" Width="150"
<EgtWPFLib:EgtTextBox Name="L1TxBx" Grid.Column="1" Grid.Row="1" Margin="0,0,6,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
<Button x:Name="L2Btn" Grid.Row="2" Height="60" Width="60" Style="{StaticResource OmagCut_RightGrayGradientYellowTextButton}"/>
<EgtWPFLib:EgtTextBox x:Name="L2TxBx" Grid.Column="1" Grid.Row="2" Width="150"
<EgtWPFLib:EgtTextBox x:Name="L2TxBx" Grid.Column="1" Grid.Row="2" Margin="0,0,6,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
<Button x:Name="L3Btn" Grid.Row="3" Height="60" Width="60" Style="{StaticResource OmagCut_RightGrayGradientYellowTextButton}"/>
<EgtWPFLib:EgtTextBox x:Name="L3TxBx" Grid.Column="1" Grid.Row="3" Width="150"
<EgtWPFLib:EgtTextBox x:Name="L3TxBx" Grid.Column="1" Grid.Row="3" Margin="0,0,6,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
<Button x:Name="R1Btn" Grid.Row="4" Height="60" Width="60" Style="{StaticResource OmagCut_RightGrayGradientYellowTextButton}"/>
<EgtWPFLib:EgtTextBox x:Name="R1TxBx" Grid.Column="1" Grid.Row="4" Width="150"
<EgtWPFLib:EgtTextBox x:Name="R1TxBx" Grid.Column="1" Grid.Row="4" Margin="0,0,6,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
<Button x:Name="R2Btn" Grid.Row="5" Height="60" Width="60" Style="{StaticResource OmagCut_RightGrayGradientYellowTextButton}"/>
<EgtWPFLib:EgtTextBox x:Name="R2TxBx" Grid.Column="1" Grid.Row="5" Width="150"
<EgtWPFLib:EgtTextBox x:Name="R2TxBx" Grid.Column="1" Grid.Row="5" Margin="0,0,6,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
<Grid Grid.Row="7" Grid.ColumnSpan="2">
MultipleCut.xaml
+8 -13
View File
@@ -7,11 +7,6 @@
mc:Ignorable="d"
d:DesignHeight="597.3" d:DesignWidth="256">
<!-- Chiamata al Dictionary -->
<UserControl.Resources>
<ResourceDictionary Source="OmagCutDictionary.xaml"/>
</UserControl.Resources>
<Border CornerRadius="{StaticResource Page_CornerRadius}" Background="{StaticResource OmagCut_LightGray}">
<!-- Definizione della Grid MultipleCut -->
@@ -45,33 +40,33 @@
</Grid>
<ComboBox Name="PointModeCmBx" Grid.Row="1" Grid.ColumnSpan="2" Height="38" Width="200"
MaxDropDownHeight="300">
<ComboBox Name="PointModeCmBx" Grid.Row="1" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_ComboBox}"
Margin="6,0,6,0">
<ComboBox.ItemTemplate>
<DataTemplate>
<Label Content="{Binding}" FontSize="20" />
<TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
<TextBlock Name="DepthTxBl" Grid.Column="0" Grid.Row="2"
Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="DepthTxBx" Grid.Column="1" Grid.Row="2" Width="75"
<EgtWPFLib:EgtTextBox Name="DepthTxBx" Grid.Column="1" Grid.Row="2" Margin="0,0,6,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
<TextBlock Name="LenghtTxBl" Grid.Column="0" Grid.Row="3"
Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="LenghtTxBx" Grid.Column="1" Grid.Row="3" Width="75"
<EgtWPFLib:EgtTextBox Name="LenghtTxBx" Grid.Column="1" Grid.Row="3" Margin="0,0,6,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
<TextBlock Name="DirectionTxBl" Grid.Column="0" Grid.Row="4"
Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="DirectionTxBx" Grid.Column="1" Grid.Row="4" Width="75"
<EgtWPFLib:EgtTextBox Name="DirectionTxBx" Grid.Column="1" Grid.Row="4" Margin="0,0,6,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
<TextBlock Name="SideAngleTxBl" Grid.Column="0" Grid.Row="5"
Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="SideAngleTxBx" Grid.Column="1" Grid.Row="5" Width="75"
<EgtWPFLib:EgtTextBox Name="SideAngleTxBx" Grid.Column="1" Grid.Row="5" Margin="0,0,6,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
<Grid Grid.Row="6" Grid.ColumnSpan="2">
@@ -111,7 +106,7 @@
</Grid>
<CheckBox Name="SideChBx" Grid.Row="7" Grid.ColumnSpan="2" Height="40" Width="220" FontSize="20"/>
<CheckBox Name="SideChBx" Grid.Row="7" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_CheckBox}" Margin="6,0,6,0"/>
<Button Name="OkBtn" Grid.Column="0" Grid.Row="11" Style="{StaticResource OmagCut_GradientBlueTextButton}"/>
My Project/AssemblyInfo.vb
+2 -2
View File
@@ -60,5 +60,5 @@ Imports System.Windows
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("1.6.23.3")>
<Assembly: AssemblyFileVersion("1.6.23.3")>
<Assembly: AssemblyVersion("1.6.23.4")>
<Assembly: AssemblyFileVersion("1.6.23.4")>
NestPageUC.xaml
+6 -16
View File
@@ -6,12 +6,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
mc:Ignorable="d"
d:DesignHeight="853.3" d:DesignWidth="1280" Initialized="NestPage_Initialized" Loaded="NestPage_Loaded" Unloaded="NestPage_Unloaded">
<!-- Chiamata al Dictionary -->
<UserControl.Resources>
<ResourceDictionary Source="OmagCUTDictionary.xaml"></ResourceDictionary>
</UserControl.Resources>
<!-- Definizione della NestPage -->
<Grid Name="NestPageGrid" >
<Grid.ColumnDefinitions>
@@ -46,23 +41,19 @@
HorizontalAlignment="Center" FontSize="15" />
<Button Name="UpBtn" Grid.Column="1" Grid.Row="1"
Style="{StaticResource OmagCut_TopGrayGradientYellowButton}">
<Image Source="Resources/UpArrow.png" Width="65" Height="65" HorizontalAlignment="Center"
VerticalAlignment="Center" />
<Image Source="Resources/UpArrow.png" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
</Button>
<Button Name="LeftBtn" Grid.Column="0" Grid.Row="2"
Style="{StaticResource OmagCut_LeftGrayGradientYellowButton}">
<Image Source="Resources/LeftArrow.png" Width="65" Height="65" HorizontalAlignment="Center"
VerticalAlignment="Center" />
<Image Source="Resources/LeftArrow.png" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
</Button>
<ToggleButton Name="MaximizeMoveBtn" Grid.Column="1" Grid.Row="2"
Style="{StaticResource OmagCut_YellowIconToggleButton}">
<Image Source="Resources/MaxMove.png" Width="65" Height="65" HorizontalAlignment="Center"
VerticalAlignment="Center" />
<Image Source="Resources/MaxMove.png" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
</ToggleButton>
<Button Name="RightBtn" Grid.Column="2" Grid.Row="2"
Style="{StaticResource OmagCut_RightGrayGradientYellowButton}">
<Image Source="Resources/RightArrow.png" Width="65" Height="65" HorizontalAlignment="Center"
VerticalAlignment="Center" />
<Image Source="Resources/RightArrow.png" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
</Button>
<EgtWPFLib:EgtTextBox Name="StepMoveTxBx" Grid.Column="0" Grid.Row="3" Width="50"
@@ -70,8 +61,7 @@
<Button Name="DownBtn" Grid.Column="1" Grid.Row="3"
Style="{StaticResource OmagCut_BottomGrayGradientYellowButton}">
<Image Source="Resources/DownArrow.png" Width="65" Height="65" HorizontalAlignment="Center"
VerticalAlignment="Center" />
<Image Source="Resources/DownArrow.png" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
</Button>
<Grid Grid.Column="2" Grid.Row="3" HorizontalAlignment="Center" VerticalAlignment="Center">
OmagCUTDictionary.xaml
+226 -136
View File
@@ -80,7 +80,22 @@
<system:Double x:Key="FontSize_LowerBarValue">24</system:Double> <!--18pt-->
<system:Double x:Key="FontSize_LowerBarOverride">18.6</system:Double> <!--14pt-->
<system:Double x:Key="FontSize_UnitOfMeasure">13.3</system:Double> <!--10pt-->
<system:Double x:Key="FontSize_GroupBoxHeader">22</system:Double>
<system:Double x:Key="ComboBox_Height">40</system:Double>
<system:Double x:Key="ComboBoxTextBlock_Height">40</system:Double>
<system:Double x:Key="ArrowImage_Height">65</system:Double>
<system:Double x:Key="ScaleImage_Height">65</system:Double>
<system:Double x:Key="MachineStatusImage_Height">75</system:Double>
<Thickness x:Key="Button_MarginThickness">1</Thickness>
<Thickness x:Key="TextBoxInGroupBox_Margin">3,0,9,0</Thickness>
<Thickness x:Key="RightTextBoxInBorder_Margin">2,0,11,0</Thickness>
<Thickness x:Key="MachRightTextBoxInBorder_Margin">2,0,10,0</Thickness>
<Thickness x:Key="LeftTextBoxInBorder_Margin">5,0,8,0</Thickness>
<Thickness x:Key="MachLeftTextBoxInBorder_Margin">4,0,8,0</Thickness>
<Thickness x:Key="LeftTextBoxNoBorder_Margin">6,0,8,0</Thickness>
<Thickness x:Key="MachToolLeftTextBoxNoBorder_Margin">4,0,15,0</Thickness>
<Thickness x:Key="LeftComboBoxInBorder_Margin">4,0,8,0</Thickness>
<Thickness x:Key="RightComboBoxInBorder_Margin">2,0,10,0</Thickness>
<CornerRadius x:Key="Page_CornerRadius">9.5</CornerRadius> <!--2.5mm-->
<!-- ______________________________________________________________________________________________________________________ -->
@@ -157,7 +172,7 @@
<Style x:Key="OmagCut_Button_Wrap" TargetType="{x:Type Button}" BasedOn="{StaticResource OmagCut_Button}">
<Setter Property="ContentTemplate" Value="{StaticResource Button_DataTemplate_Wrap}" />
<Setter Property="FontSize" Value="{StaticResource FontSize_LowerCaseCharacter}" />
<Setter Property="FontSize" Value="{DynamicResource FontSize_LowerCaseCharacter}" />
</Style>
<!--BlueIconOmagCutButton-->
@@ -205,6 +220,7 @@
<Style x:Key="OmagCut_YellowGradientYellowTextButton" TargetType="{x:Type Button}" BasedOn="{StaticResource OmagCut_Button_Wrap}">
<Setter Property="Background" Value="{StaticResource OmagCut_GradientYellow}"/>
<Setter Property="BorderBrush" Value="{StaticResource OmagCut_Yellow}"/>
<Setter Property="FontSize" Value="{DynamicResource FontSize_LowerCaseCharacter}"/>
<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
</Style>
@@ -268,13 +284,16 @@
<Style x:Key="OmagCut_CheckBox" TargetType="{x:Type CheckBox}" BasedOn="{StaticResource {x:Type CheckBox}}">
<Setter Property="FontSize" Value="{StaticResource FontSize_LowerCaseCharacter}"/>
<Setter Property="Height" Value="{StaticResource CheckBox_Height}"/>
<Setter Property="Height" Value="{DynamicResource CheckBox_Height}"/>
</Style>
<Style x:Key="OmagCut_CheckBox_Wrap" TargetType="{x:Type CheckBox}" BasedOn="{StaticResource OmagCut_CheckBox}">
<Setter Property="ContentTemplate" Value="{StaticResource CheckBox_DataTemplate_Wrap}" />
</Style>
<Style x:Key="OmagCut_CheckBox_Single" TargetType="{x:Type CheckBox}" BasedOn="{StaticResource OmagCut_CheckBox}">
<Setter Property="Width" Value="{DynamicResource CheckBox_Height}"/>
</Style>
<!-- ______________________________________________________________________________________________________________________ -->
@@ -359,6 +378,7 @@
<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
<Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
<Setter Property="FontSize" Value="20" />
<Setter Property="VerticalContentAlignment" Value="Center" />
<Setter Property="FontWeight" Value="Normal" />
<Setter Property="MinWidth" Value="50"/>
<Setter Property="MinHeight" Value="32"/>
@@ -447,6 +467,7 @@
<Setter Property="SnapsToDevicePixels" Value="true" />
<Setter Property="HorizontalAlignment" Value="Stretch" />
<Setter Property="VerticalAlignment" Value="Stretch" />
<Setter Property="Height" Value="{StaticResource ComboBoxTextBlock_Height}" />
<Setter Property="FontSize" Value="20" />
<Setter Property="FontWeight" Value="Normal" />
<Setter Property="OverridesDefaultStyle" Value="true"/>
@@ -460,10 +481,11 @@
BorderThickness="2"
CornerRadius="0"
Background="Transparent"
BorderBrush="Transparent">
BorderBrush="Transparent"
>
<TextBlock TextAlignment="Center">
<ContentPresenter />
<TextBlock TextAlignment="Center" VerticalAlignment="Center">
<ContentPresenter/>
</TextBlock>
</Border>
<ControlTemplate.Triggers>
@@ -477,13 +499,40 @@
</Setter>
</Style>
<Style x:Key="OmagCut_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource {x:Type ComboBox}}">
<Setter Property="Height" Value="{DynamicResource ComboBox_Height}"/>
<Setter Property="VerticalContentAlignment" Value="Center"/>
</Style>
<Style x:Key="OmagCut_LeftComboBoxNoBorder" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource {x:Type ComboBox}}">
<Setter Property="Height" Value="{DynamicResource ComboBox_Height}"/>
<Setter Property="VerticalContentAlignment" Value="Center"/>
<Setter Property="Margin" Value="{DynamicResource LeftTextBoxNoBorder_Margin}"/>
</Style>
<Style x:Key="OmagCut_MachToolLeftComboBoxNoBorder" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource {x:Type ComboBox}}">
<Setter Property="Height" Value="{DynamicResource ComboBox_Height}"/>
<Setter Property="VerticalContentAlignment" Value="Center"/>
<Setter Property="Margin" Value="{DynamicResource MachToolLeftTextBoxNoBorder_Margin}"/>
</Style>
<Style x:Key="OmagCut_LeftComboBoxInBorder" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource {x:Type ComboBox}}">
<Setter Property="Height" Value="{DynamicResource ComboBox_Height}"/>
<Setter Property="VerticalContentAlignment" Value="Center"/>
<Setter Property="Margin" Value="{DynamicResource LeftComboBoxInBorder_Margin}"/>
</Style>
<Style x:Key="OmagCut_RightComboBoxInBorder" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource {x:Type ComboBox}}">
<Setter Property="Height" Value="{DynamicResource ComboBox_Height}"/>
<Setter Property="VerticalContentAlignment" Value="Center"/>
<Setter Property="Margin" Value="{DynamicResource RightComboBoxInBorder_Margin}"/>
</Style>
<!-- ______________________________________________________________________________________________________________________ -->
<!--GroupBox-->
<DataTemplate x:Key="GroupBoxHeaderTemplate">
<TextBlock Text="{Binding}" FontSize="22"/>
<TextBlock Text="{Binding}" FontSize="{DynamicResource FontSize_GroupBoxHeader}"/>
</DataTemplate>
<Style x:Key="OmagCut_GroupBox" TargetType="{x:Type GroupBox}" BasedOn="{StaticResource {x:Type GroupBox}}">
@@ -506,11 +555,25 @@
<Setter Property="Height" Value="65"/>
</Style>
<Style x:Key="OmagCut_ArrowButtonIcon" TargetType="{x:Type Image}" >
<Setter Property="HorizontalAlignment" Value="Center"/>
<Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="Width" Value="{DynamicResource ArrowImage_Height}"/>
<Setter Property="Height" Value="{DynamicResource ArrowImage_Height}"/>
</Style>
<Style x:Key="OmagCut_ScaleButtonIcon" TargetType="{x:Type Image}" >
<Setter Property="HorizontalAlignment" Value="Center"/>
<Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="Width" Value="{DynamicResource ScaleImage_Height}"/>
<Setter Property="Height" Value="{DynamicResource ScaleImage_Height}"/>
</Style>
<Style x:Key="OmagCut_MachineStatusIcon" TargetType="{x:Type Image}" >
<Setter Property="HorizontalAlignment" Value="Center"/>
<Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="Width" Value="75"/>
<Setter Property="Height" Value="75"/>
<Setter Property="Width" Value="{DynamicResource MachineStatusImage_Height}"/>
<Setter Property="Height" Value="{DynamicResource MachineStatusImage_Height}"/>
</Style>
<!--Style di un immagine in una ListBox-->
@@ -522,117 +585,6 @@
<!-- ______________________________________________________________________________________________________________________ -->
<!-- ListBox -->
<!--DataTemplate solo testo-->
<DataTemplate x:Key="NameIdLsBxItem">
<TextBlock Text="{Binding Name}" Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" />
</DataTemplate>
<!--DataTemplate testo ed immagine-->
<DataTemplate x:Key="DataTemplateItem">
<Grid >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<!--<Image Grid.Column="0" Source="{Binding PictureString}" Height="32" Width="32" Margin="0,8,6,4" />-->
<Image Grid.Column="0" Source="{Binding PictureString}" Style="{StaticResource OmagCut_ListBoxIcon}" />
<!--<TextBlock Grid.Column="1" Text="{Binding Name}" FontSize="15" VerticalAlignment="Center" />-->
<TextBlock Grid.Column="1" Text="{Binding Name}" Style="{StaticResource OmagCut_ListBoxTextBlock}" />
</Grid>
</DataTemplate>
<Style TargetType="{x:Type ListBox}">
<Setter Property="Background" Value="{StaticResource OmagCut_TreeViewGradientGray}"/>
<Setter Property="BorderBrush" Value="{StaticResource OmagCut_Blue}"/>
<Setter Property="BorderThickness" Value="{StaticResource BorderThickness}"/>
<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
<Setter Property="ScrollViewer.CanContentScroll" Value="true"/>
<Setter Property="ScrollViewer.PanningMode" Value="Both"/>
<Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
<Setter Property="VerticalContentAlignment" Value="Center"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type ListBox}">
<Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" CornerRadius="9.5" Padding="1" SnapsToDevicePixels="true">
<ScrollViewer Focusable="false" Padding="{TemplateBinding Padding}" Style="{StaticResource FavsScrollViewer}">
<ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
</ScrollViewer>
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsEnabled" Value="false">
<Setter Property="Background" TargetName="Bd" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"/>
</Trigger>
<Trigger Property="IsGrouping" Value="false">
<Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<!-- ListBoxItem -->
<Style TargetType="{x:Type ListBoxItem}">
<Setter Property="Background" Value="Transparent"/>
<Setter Property="BorderBrush" Value="Transparent"/>
<Setter Property="BorderThickness" Value="2"/>
<Setter Property="Margin" Value="1,0,1,0"/>
<Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
<Setter Property="VerticalContentAlignment" Value="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
<Setter Property="Padding" Value="2"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type ListBoxItem}">
<Border x:Name="Bd"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
Background="{TemplateBinding Background}"
Padding="{TemplateBinding Padding}"
Margin="{TemplateBinding Margin}"
SnapsToDevicePixels="true">
<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsSelected" Value="true">
<Setter Property="Background" TargetName="Bd" Value="LightGray"/>
<Setter Property="BorderBrush" TargetName="Bd" Value="White"/>
</Trigger>
<MultiTrigger>
<MultiTrigger.Conditions>
<Condition Property="IsSelected" Value="false"/>
<Condition Property="IsMouseOver" Value="true"/>
</MultiTrigger.Conditions>
<Setter Property="Background" TargetName="Bd" Value="LightGray"/>
<Setter Property="BorderBrush" TargetName="Bd" Value="LightGray"/>
</MultiTrigger>
<MultiTrigger>
<MultiTrigger.Conditions>
<Condition Property="IsSelected" Value="true"/>
<Condition Property="Selector.IsSelectionActive" Value="false"/>
</MultiTrigger.Conditions>
<Setter Property="Background" TargetName="Bd" Value="LightGray"/>
<Setter Property="BorderBrush" TargetName="Bd" Value="White"/>
</MultiTrigger>
<Trigger Property="IsEnabled" Value="false">
<Setter Property="Foreground" Value="{StaticResource OmagCut_White}"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<!-- ______________________________________________________________________________________________________________________ -->
<!-- ScrollBar & it's component (RepeatButton, Thumb) -->
<!-- SrollViewer ScrollBar Repeat Buttons (The part in the middle, not the thumb the long area between the
@@ -838,6 +790,133 @@
<!-- ______________________________________________________________________________________________________________________ -->
<!-- ListBox -->
<!--TextBlock per elementi delle ListBox-->
<Style x:Key="OmagCut_LowerCaseCharacterTextBlock" TargetType="{x:Type TextBlock}">
<Setter Property="TextWrapping" Value="Wrap"/>
<Setter Property="FontSize" Value="{DynamicResource FontSize_LowerCaseCharacter}"/>
<Setter Property="VerticalAlignment" Value="Center"/>
</Style>
<Style x:Key="OmagCut_ListBoxTextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource OmagCut_LowerCaseCharacterTextBlock}">
<Setter Property="TextWrapping" Value="NoWrap"/>
</Style>
<Style x:Key="OmagCut_CurrProjSummeryTextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource OmagCut_LowerCaseCharacterTextBlock}">
<Setter Property="TextWrapping" Value="NoWrap"/>
<Setter Property="Margin" Value="6,0,0,0"/>
</Style>
<!--DataTemplate solo testo-->
<DataTemplate x:Key="NameIdLsBxItem">
<TextBlock Text="{Binding Name}" Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" />
</DataTemplate>
<!--DataTemplate testo ed immagine-->
<DataTemplate x:Key="DataTemplateItem">
<Grid >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<!--<Image Grid.Column="0" Source="{Binding PictureString}" Height="32" Width="32" Margin="0,8,6,4" />-->
<Image Grid.Column="0" Source="{Binding PictureString}" Style="{StaticResource OmagCut_ListBoxIcon}" />
<!--<TextBlock Grid.Column="1" Text="{Binding Name}" FontSize="15" VerticalAlignment="Center" />-->
<TextBlock Grid.Column="1" Text="{Binding Name}" Style="{StaticResource OmagCut_ListBoxTextBlock}" />
</Grid>
</DataTemplate>
<Style TargetType="{x:Type ListBox}">
<Setter Property="Background" Value="{StaticResource OmagCut_TreeViewGradientGray}"/>
<Setter Property="BorderBrush" Value="{StaticResource OmagCut_Blue}"/>
<Setter Property="BorderThickness" Value="{StaticResource BorderThickness}"/>
<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
<Setter Property="ScrollViewer.CanContentScroll" Value="true"/>
<Setter Property="ScrollViewer.PanningMode" Value="Both"/>
<Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
<Setter Property="VerticalContentAlignment" Value="Center"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type ListBox}">
<Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" CornerRadius="9.5" Padding="1" SnapsToDevicePixels="true">
<ScrollViewer Focusable="false" Padding="{TemplateBinding Padding}" Style="{StaticResource FavsScrollViewer}">
<ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
</ScrollViewer>
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsEnabled" Value="false">
<Setter Property="Background" TargetName="Bd" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"/>
</Trigger>
<Trigger Property="IsGrouping" Value="false">
<Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<!-- ListBoxItem -->
<Style TargetType="{x:Type ListBoxItem}">
<Setter Property="Background" Value="Transparent"/>
<Setter Property="BorderBrush" Value="Transparent"/>
<Setter Property="BorderThickness" Value="2"/>
<Setter Property="Margin" Value="1,0,1,0"/>
<Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
<Setter Property="VerticalContentAlignment" Value="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
<Setter Property="Padding" Value="2"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type ListBoxItem}">
<Border x:Name="Bd"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
Background="{TemplateBinding Background}"
Padding="{TemplateBinding Padding}"
Margin="{TemplateBinding Margin}"
SnapsToDevicePixels="true">
<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsSelected" Value="true">
<Setter Property="Background" TargetName="Bd" Value="LightGray"/>
<Setter Property="BorderBrush" TargetName="Bd" Value="White"/>
</Trigger>
<MultiTrigger>
<MultiTrigger.Conditions>
<Condition Property="IsSelected" Value="false"/>
<Condition Property="IsMouseOver" Value="true"/>
</MultiTrigger.Conditions>
<Setter Property="Background" TargetName="Bd" Value="LightGray"/>
<Setter Property="BorderBrush" TargetName="Bd" Value="LightGray"/>
</MultiTrigger>
<MultiTrigger>
<MultiTrigger.Conditions>
<Condition Property="IsSelected" Value="true"/>
<Condition Property="Selector.IsSelectionActive" Value="false"/>
</MultiTrigger.Conditions>
<Setter Property="Background" TargetName="Bd" Value="LightGray"/>
<Setter Property="BorderBrush" TargetName="Bd" Value="White"/>
</MultiTrigger>
<Trigger Property="IsEnabled" Value="false">
<Setter Property="Foreground" Value="{StaticResource OmagCut_White}"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<!-- ______________________________________________________________________________________________________________________ -->
<!--TextBlock-->
<Style x:Key="OmagCut_UpperCaseCharacterTextBlock" TargetType="{x:Type TextBlock}">
@@ -845,22 +924,6 @@
<Setter Property="FontSize" Value="{StaticResource FontSize_UpperCaseCharacter}"/>
</Style>
<Style x:Key="OmagCut_LowerCaseCharacterTextBlock" TargetType="{x:Type TextBlock}">
<Setter Property="TextWrapping" Value="Wrap"/>
<Setter Property="FontSize" Value="{StaticResource FontSize_LowerCaseCharacter}"/>
<Setter Property="VerticalAlignment" Value="Center"/>
</Style>
<Style x:Key="OmagCut_CurrProjSummeryTextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource OmagCut_LowerCaseCharacterTextBlock}">
<Setter Property="TextWrapping" Value="NoWrap"/>
<Setter Property="Margin" Value="6,1,0,1"/>
</Style>
<!--TextBlock per elementi delle ListBox-->
<Style x:Key="OmagCut_ListBoxTextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource OmagCut_LowerCaseCharacterTextBlock}">
<Setter Property="TextWrapping" Value="NoWrap"/>
</Style>
<Style x:Key="OmagCut_ToolsDBTextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource OmagCut_LowerCaseCharacterTextBlock}">
<Setter Property="TextWrapping" Value="Wrap"/>
<Setter Property="Margin" Value="10,0,0,0"/>
@@ -918,8 +981,9 @@
<Setter Property="Background" Value="Transparent"/>
<Setter Property="BorderBrush" Value="Black"/>
<Setter Property="BorderThickness" Value="1"/>
<Setter Property="FontSize" Value="{StaticResource FontSize_LowerCaseCharacter}"/>
<Setter Property="FontSize" Value="{DynamicResource FontSize_LowerCaseCharacter}"/>
<Setter Property="TextAlignment" Value="Center"/>
<Setter Property="VerticalContentAlignment" Value="Center"/>
<Setter Property="Padding" Value="1"/>
</Style>
@@ -933,6 +997,32 @@
<Setter Property="KeyboardDimension" Value="300"/>
</Style>
<Style x:Key="OmagCut_MachToolCalculatorTextBox" TargetType="{x:Type EgtWPFLib:EgtTextBox}" BasedOn="{StaticResource OmagCut_CalculatorTextBox}">
<Setter Property="Margin" Value="{DynamicResource MachToolLeftTextBoxNoBorder_Margin}"/>
</Style>
<Style x:Key="OmagCut_CalculatorTextBoxInGroupBox" TargetType="{x:Type EgtWPFLib:EgtTextBox}" BasedOn="{StaticResource OmagCut_CalculatorTextBox}">
<Setter Property="Margin" Value="{DynamicResource TextBoxInGroupBox_Margin}"/>
</Style>
<Style x:Key="OmagCut_RightCalculatorTextBoxInBorder" TargetType="{x:Type EgtWPFLib:EgtTextBox}" BasedOn="{StaticResource OmagCut_CalculatorTextBox}">
<Setter Property="Margin" Value="{DynamicResource RightTextBoxInBorder_Margin}"/>
</Style>
<Style x:Key="OmagCut_MachRightCalculatorTextBoxInBorder" TargetType="{x:Type EgtWPFLib:EgtTextBox}" BasedOn="{StaticResource OmagCut_CalculatorTextBox}">
<Setter Property="Margin" Value="{DynamicResource MachRightTextBoxInBorder_Margin}"/>
</Style>
<Style x:Key="OmagCut_LeftCalculatorTextBoxInBorder" TargetType="{x:Type EgtWPFLib:EgtTextBox}" BasedOn="{StaticResource OmagCut_CalculatorTextBox}">
<Setter Property="Margin" Value="{DynamicResource LeftTextBoxInBorder_Margin}"/>
</Style>
<Style x:Key="OmagCut_MachLeftCalculatorTextBoxInBorder" TargetType="{x:Type EgtWPFLib:EgtTextBox}" BasedOn="{StaticResource OmagCut_CalculatorTextBox}">
<Setter Property="Margin" Value="{DynamicResource MachLeftTextBoxInBorder_Margin}"/>
</Style>
<Style x:Key="OmagCut_LeftCalculatorTextBoxNoBorder" TargetType="{x:Type EgtWPFLib:EgtTextBox}" BasedOn="{StaticResource OmagCut_CalculatorTextBox}">
<Setter Property="Margin" Value="{DynamicResource LeftTextBoxNoBorder_Margin}"/>
</Style>
<Style x:Key="OmagCut_FixedTextBox" TargetType="{x:Type EgtWPFLib:EgtTextBox}" BasedOn="{StaticResource OmagCut_TextBox}">
<Setter Property="BorderBrush" Value="{StaticResource OmagCut_Gray}"/>
<Setter Property="IsReadOnly" Value="True"/>
OpenFileWD.xaml
-5
View File
@@ -5,11 +5,6 @@
FontFamily="./Resources/Fonts/#Century Gothic"
Title="OpenFile" Height="682.6" Width="426.6" WindowStyle="None" ResizeMode="NoResize" ShowInTaskbar="False" AllowsTransparency="True" Background="Transparent">
<!-- Chiamata al Dictionary -->
<Window.Resources>
<ResourceDictionary Source="OmagCutDictionary.xaml"/>
</Window.Resources>
<Border Style="{StaticResource OmagCut_Border}">
<Grid>
<Grid.ColumnDefinitions>
OpenPageUC.xaml
+3 -8
View File
@@ -5,12 +5,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
mc:Ignorable="d"
d:DesignHeight="853.3" d:DesignWidth="1280" Initialized="OpenPage_Initialized" Loaded="OpenPage_Loaded" Unloaded="OpenPage_Unloaded">
<!-- Chiamata al Dictionary -->
<UserControl.Resources>
<ResourceDictionary Source="OmagCutDictionary.xaml"/>
</UserControl.Resources>
<!-- Definizione della OpenPage -->
<Border>
<Grid Name="OpenPageGrid" >
@@ -33,8 +28,8 @@
</Grid.ColumnDefinitions>
</Grid>
<Label Name="FilePathTxBl" Foreground="White" FontSize="20" VerticalAlignment="Center"/>
<TextBlock Name="FilePathTxBl" Foreground="White" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
<ListBox Name="FileListBox" Grid.Row="1" Grid.RowSpan="2" ItemTemplate="{DynamicResource DataTemplateItem}"
ItemsSource="{Binding ItemList}"/>
OpenPageUC.xaml.vb
+2 -2
View File
@@ -103,7 +103,7 @@ Public Class OpenPageUC
Dim TempPath As New Text.StringBuilder(260)
PathCompactPathEx(TempPath, m_sCurrDir, 22, 0)
' lo visualizzo
FilePathTxBl.Content = TempPath.ToString
FilePathTxBl.Text = TempPath.ToString
' pulisco la lista
m_MainWindow.m_OpenItemList.Clear()
' per risalire al direttorio padre
@@ -137,7 +137,7 @@ Public Class OpenPageUC
' dir corrente vuoto
m_sCurrDir = ""
' lo visualizzo
FilePathTxBl.Content = m_sCurrDir
FilePathTxBl.Text = m_sCurrDir
' pulisco la lista
m_MainWindow.m_OpenItemList.Clear()
' elenco dei dischi
PhotoPageUC.xaml
+1 -6
View File
@@ -6,11 +6,6 @@
mc:Ignorable="d"
d:DesignHeight="853.3" d:DesignWidth="1280" Loaded="PhotoPage_Loaded" Initialized="PhotoPage_Initialized" Unloaded="PhotoPage_Unloaded">
<!-- Chiamata al Dictionary -->
<UserControl.Resources>
<ResourceDictionary Source="OmagCutDictionary.xaml"/>
</UserControl.Resources>
<!-- Definizione della ImportPage -->
<Grid Name="PhotoPageGrid" >
<Grid.ColumnDefinitions>
@@ -24,7 +19,7 @@
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<Label Name="FilePathTxBl" Foreground="White" FontSize="20" VerticalAlignment="Center"/>
<TextBlock Name="FilePathTxBl" Foreground="White" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
<ListBox Name="FileListBox" Grid.Row="1" Grid.RowSpan="2" ItemTemplate="{DynamicResource DataTemplateItem}"
ItemsSource="{Binding ItemList}"/>
PhotoPageUC.xaml.vb
+2 -2
View File
@@ -33,7 +33,7 @@ Public Class PhotoPageUC
Dim TempPath As New Text.StringBuilder(260)
PathCompactPathEx(TempPath, m_sCurrDir, 22, 0)
' lo visualizzo
FilePathTxBl.Content = TempPath.ToString
FilePathTxBl.Text = TempPath.ToString
' pulisco la lista
m_MainWindow.m_PhotoItemList.Clear()
' per risalire al direttorio padre
@@ -68,7 +68,7 @@ Public Class PhotoPageUC
' dir corrente vuoto
m_sCurrDir = ""
' lo visualizzo
FilePathTxBl.Content = m_sCurrDir
FilePathTxBl.Text = m_sCurrDir
' pulisco la lista
m_MainWindow.m_PhotoItemList.Clear()
' elenco dei dischi
ProjectMgrUC.xaml
+6 -6
View File
@@ -1,10 +1,10 @@
<UserControl x:Class="ProjectMgrUC"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
mc:Ignorable="d"
d:DesignHeight="85.3" d:DesignWidth="1023.6">
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
mc:Ignorable="d"
d:DesignHeight="85.3" d:DesignWidth="1023.6">
<!-- Definizione della Grid inferiore -->
<Grid Name="LowerButtonGrid" Grid.Column="1" Grid.Row="2" >
ProjectMgrUC.xaml.vb
-1
View File
@@ -14,7 +14,6 @@ Public Class ProjectMgrUC
Friend m_SaveNameWD As SaveNameWD
Private Sub ProjectMgrUC_Initialized(sender As Object, e As EventArgs) Handles Me.Loaded
' Imposto i messaggi letti dal file dei messaggi
NewBtn.Content = EgtMsg(MSG_CADCUTPAGEUC + 3)
LoadBtn.Content = EgtMsg(MSG_CADCUTPAGEUC + 4)
RawPartPageUC.xaml
+23 -30
View File
@@ -6,12 +6,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
mc:Ignorable="d"
d:DesignHeight="853.3" d:DesignWidth="1280" Loaded="RawPartPage_Loaded" Initialized="RawPartPage_Initialized" Unloaded="RawPartPage_Unloaded">
<!-- Chiamata al Dictionary -->
<UserControl.Resources>
<ResourceDictionary Source="OmagCUTDictionary.xaml"></ResourceDictionary>
</UserControl.Resources>
<!-- Definizione della RowPartPage -->
<Grid Name="RowPartPageGrid" >
<Grid.ColumnDefinitions>
@@ -42,12 +37,11 @@
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="1*"/>
<RowDefinition Height="3.5*"/>
<RowDefinition Height="4*"/>
<RowDefinition Height="1*"/>
<RowDefinition Height="1.5*"/>
<RowDefinition Height="1.*"/>
<RowDefinition Height="0.5*"/>
<RowDefinition Height="0.5*"/>
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
@@ -63,7 +57,7 @@
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="0.5*"/>
<RowDefinition Height="1*"/>
<RowDefinition Height="0.5*"/>
<RowDefinition Height="0.5*"/>
<RowDefinition Height="0.5*"/>
@@ -72,47 +66,47 @@
<RowDefinition Height="0.5*"/>
</Grid.RowDefinitions>
<ComboBox Name="RawModeCmBx" Grid.Row="0" Grid.ColumnSpan="2" Height="40" Width="200"
MaxDropDownHeight="300">
<ComboBox Name="RawModeCmBx" Grid.Row="0" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_ComboBox}"
MaxDropDownHeight="300" Margin="6,0,6,0">
<ComboBox.ItemTemplate>
<DataTemplate>
<Label Content="{Binding}" FontSize="20" />
<TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
<TextBlock Name="LengthTxBl" Grid.Row="1" Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="LengthTxBx" Grid.Column="1" Grid.Row="1" Width="90"
<EgtWPFLib:EgtTextBox Name="LengthTxBx" Grid.Column="1" Grid.Row="1" Margin="13,0,6,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
<TextBlock Name="WidthTxBl" Grid.Row="2" Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="WidthTxBx" Grid.Column="1" Grid.Row="2" Width="90"
<EgtWPFLib:EgtTextBox Name="WidthTxBx" Grid.Column="1" Grid.Row="2" Margin="13,0,6,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
<TextBlock Name="HeightTxBl" Grid.Row="3" Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="HeightTxBx" Grid.Column="1" Grid.Row="3" Width="90"
<EgtWPFLib:EgtTextBox Name="HeightTxBx" Grid.Column="1" Grid.Row="3" Margin="13,0,6,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
<TextBlock Name="OffsetXTxBl" Grid.Row="4" Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="OffsetXTxBx" Grid.Column="1" Grid.Row="4" Width="90"
<EgtWPFLib:EgtTextBox Name="OffsetXTxBx" Grid.Column="1" Grid.Row="4" Margin="13,0,6,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
<TextBlock Name="OffsetYTxBl" Grid.Row="5" Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="OffsetYTxBx" Grid.Column="1" Grid.Row="5" Width="90"
<EgtWPFLib:EgtTextBox Name="OffsetYTxBx" Grid.Column="1" Grid.Row="5" Margin="13,0,6,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
<TextBlock Name="KerfTxBl" Grid.Row="6" Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="KerfTxBx" Grid.Column="1" Grid.Row="6" Width="90"
<EgtWPFLib:EgtTextBox Name="KerfTxBx" Grid.Column="1" Grid.Row="6" Margin="13,0,6,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
</Grid>
<!-- Definizione della Grid per il materiale -->
<GroupBox Name="MaterialGpBx" Grid.Row="2" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_GroupBox}">
<ComboBox Name="MaterialsCmbx" Height="40" Width="200"
MaxDropDownHeight="600">
<ComboBox.ItemTemplate>
<DataTemplate>
<Label Content="{Binding sName}" FontSize="20" />
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
<ComboBox Name="MaterialsCmbx" Style="{StaticResource OmagCut_ComboBox}"
MaxDropDownHeight="600">
<ComboBox.ItemTemplate>
<DataTemplate>
<TextBlock Text="{Binding sName}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
</GroupBox>
@@ -148,9 +142,8 @@
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<ToggleButton Name="NewBtn" Style="{StaticResource OmagCut_YellowToggleButton}" Margin="0,10,0,0"/>
<ToggleButton Name="DeleteBtn" Grid.Column="1" Style="{StaticResource OmagCut_YellowToggleButton}"
Margin="0,10,0,0"/>
<ToggleButton Name="NewBtn" Style="{StaticResource OmagCut_YellowToggleButton}"/>
<ToggleButton Name="DeleteBtn" Grid.Column="1" Style="{StaticResource OmagCut_YellowToggleButton}"/>
</Grid>
</GroupBox>
RawPartPageUC.xaml.vb
+2
View File
@@ -129,6 +129,8 @@ Public Class RawPartPageUC
Private Sub RawPartPage_Loaded(sender As Object, e As RoutedEventArgs)
m_CurrProjPage = m_MainWindow.m_CurrentProjectPageUC
m_bActive = True
' correggo differenza tra machinebuttons che ha 10 colonne e spazio disponibile solo per 9 facendolo sbordare(non si vede perchè la parte che avanza è vuota)
m_MachineButtons.Width = LowerButtonGrid.ActualWidth / 12 * 10
' Colori standard
GetPrivateProfileColor(S_RAWPART, K_RAWCOLOR, m_RawCol, m_MainWindow.GetIniFile())
GetPrivateProfileColor(S_RAWPART, K_KERFCOLOR, m_KerfCol, m_MainWindow.GetIniFile())
SaveNameWD.xaml.vb
+6 -1
View File
@@ -33,7 +33,12 @@ Public Class SaveNameWD
End If
' Verifico se il nome inserito è già utilizzato
If File.Exists(sPath) Then
Dim ConfirmWD As New EgtMsgBox(m_MainWindow, "", EgtMsg(MSG_EGTMSGBOX + 6), EgtMsgBox.Buttons.OK_CANCEL, EgtMsgBox.Icons.NULL)
Dim ConfirmWD As EgtMsgBox
If m_MainWindow.IsSiemensPc() Then
ConfirmWD = New EgtMsgBox(m_MainWindow, m_MainWindow.ActualWidth / 15 * 4.5, EgtMsgBox.WidthType.PIXEL, "", EgtMsg(MSG_EGTMSGBOX + 6), EgtMsgBox.Buttons.OK_CANCEL, EgtMsgBox.Icons.NULL)
Else
ConfirmWD = New EgtMsgBox(m_MainWindow, "", EgtMsg(MSG_EGTMSGBOX + 6), EgtMsgBox.Buttons.OK_CANCEL, EgtMsgBox.Icons.NULL)
End If
Select Case ConfirmWD.DialogResult
Case 0 'Cancel
' Esco
SawTestUC.xaml
+6 -11
View File
@@ -7,11 +7,6 @@
mc:Ignorable="d"
d:DesignHeight="597.3" d:DesignWidth="256">
<!-- Chiamata al Dictionary -->
<UserControl.Resources>
<ResourceDictionary Source="OmagCutDictionary.xaml"/>
</UserControl.Resources>
<Border CornerRadius="{StaticResource Page_CornerRadius}" Background="{StaticResource OmagCut_LightGray}">
<!-- Definizione della Grid SingleCut -->
@@ -48,28 +43,28 @@
</Grid>
<ComboBox Name="PointModeCmBx" Grid.Row="1" Grid.ColumnSpan="2" Height="38" Width="200"
MaxDropDownHeight="300">
<ComboBox Name="PointModeCmBx" Grid.Row="1" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_ComboBox}"
Margin="6,0,6,0">
<ComboBox.ItemTemplate>
<DataTemplate>
<Label Content="{Binding}" FontSize="20" />
<TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
<TextBlock Name="DepthTxBl" Grid.Column="0" Grid.Row="2"
Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="DepthTxBx" Grid.Column="1" Grid.Row="2" Width="75"
<EgtWPFLib:EgtTextBox Name="DepthTxBx" Grid.Column="1" Grid.Row="2" Margin="0,0,6,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
<TextBlock Name="LenghtTxBl" Grid.Column="0" Grid.Row="3"
Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="LenghtTxBx" Grid.Column="1" Grid.Row="3" Width="75"
<EgtWPFLib:EgtTextBox Name="LenghtTxBx" Grid.Column="1" Grid.Row="3" Margin="0,0,6,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
<TextBlock Name="DirectionTxBl" Grid.Column="0" Grid.Row="4"
Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="DirectionTxBx" Grid.Column="1" Grid.Row="4" Width="75"
<EgtWPFLib:EgtTextBox Name="DirectionTxBx" Grid.Column="1" Grid.Row="4" Margin="0,0,6,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
<!--<TextBlock Name="SideAngleTxBl" Grid.Column="0" Grid.Row="5"
SceneButtonsUC.xaml
-5
View File
@@ -5,11 +5,6 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
mc:Ignorable="d"
d:DesignHeight="85.3" d:DesignWidth="597.1">
<!-- Chiamata al Dictionary -->
<UserControl.Resources>
<ResourceDictionary Source="OmagCutDictionary.xaml"/>
</UserControl.Resources>
<!-- Definizione del controllo SceneButton -->
<Grid Name="SceneButtonsGrid">
SecondaryComponentPageUC.xaml
+1 -6
View File
@@ -5,12 +5,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
mc:Ignorable="d"
d:DesignHeight="768" d:DesignWidth="256" Loaded="SecondaryComponentPage_Loaded">
<!-- Chiamata al Dictionary -->
<UserControl.Resources>
<ResourceDictionary Source="OmagCutDictionary.xaml"/>
</UserControl.Resources>
<!-- Definizione della SecondaryComponentPage -->
<Grid Name="SecondaryComponentPageGrid">
<Grid.RowDefinitions>
SimulationPageUC.xaml
+1 -6
View File
@@ -7,11 +7,6 @@
mc:Ignorable="d"
d:DesignHeight="853.3" d:DesignWidth="1280" Initialized="SimulationPage_Initialized" Loaded="SimulationPage_Loaded">
<!-- Chiamata al Dictionary -->
<UserControl.Resources>
<ResourceDictionary Source="OmagCUTDictionary.xaml"></ResourceDictionary>
</UserControl.Resources>
<!-- Definizione della SimulationPage -->
<Grid Name="SimulationPageGrid" >
<Grid.ColumnDefinitions>
@@ -34,7 +29,7 @@
<Button Name="MachViewModeBtn" Grid.Column="1"
Style="{StaticResource OmagCut_RightGrayGradientYellowButton}">
<Image Source="Resources/MHT.png" Style="{StaticResource OmagCut_ButtonIcon}"/>
<Image Source="Resources/MHT.png" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
</Button>
</Grid>
SingleCutUC.xaml
+6 -12
View File
@@ -7,11 +7,6 @@
mc:Ignorable="d"
d:DesignHeight="597.3" d:DesignWidth="256">
<!-- Chiamata al Dictionary -->
<UserControl.Resources>
<ResourceDictionary Source="OmagCutDictionary.xaml"/>
</UserControl.Resources>
<Border CornerRadius="{StaticResource Page_CornerRadius}" Background="{StaticResource OmagCut_LightGray}">
<!-- Definizione della Grid SingleCut -->
@@ -48,33 +43,32 @@
</Grid>
<ComboBox Name="PointModeCmBx" Grid.Row="1" Grid.ColumnSpan="2" Height="38" Width="200"
MaxDropDownHeight="300">
<ComboBox Name="PointModeCmBx" Grid.Row="1" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_ComboBox}" Margin="6,0,6,0">
<ComboBox.ItemTemplate>
<DataTemplate>
<Label Content="{Binding}" FontSize="20" />
<TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
<TextBlock Name="DepthTxBl" Grid.Column="0" Grid.Row="2"
Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="DepthTxBx" Grid.Column="1" Grid.Row="2" Width="75"
<EgtWPFLib:EgtTextBox Name="DepthTxBx" Grid.Column="1" Grid.Row="2" Margin="0,0,6,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
<TextBlock Name="LenghtTxBl" Grid.Column="0" Grid.Row="3"
Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="LenghtTxBx" Grid.Column="1" Grid.Row="3" Width="75"
<EgtWPFLib:EgtTextBox Name="LenghtTxBx" Grid.Column="1" Grid.Row="3" Margin="0,0,6,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
<TextBlock Name="DirectionTxBl" Grid.Column="0" Grid.Row="4"
Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="DirectionTxBx" Grid.Column="1" Grid.Row="4" Width="75"
<EgtWPFLib:EgtTextBox Name="DirectionTxBx" Grid.Column="1" Grid.Row="4" Margin="0,0,6,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
<TextBlock Name="SideAngleTxBl" Grid.Column="0" Grid.Row="5"
Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="SideAngleTxBx" Grid.Column="1" Grid.Row="5" Width="75"
<EgtWPFLib:EgtTextBox Name="SideAngleTxBx" Grid.Column="1" Grid.Row="5" Margin="0,0,6,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
<TextBlock Name="SawTipTxBl" Grid.Column="0" Grid.Row="10" Grid.ColumnSpan="2"
SplitPageUC.xaml
+6 -11
View File
@@ -1,15 +1,10 @@
<UserControl x:Class="SplitPageUC"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
mc:Ignorable="d"
d:DesignHeight="853.3" d:DesignWidth="1280" Initialized="SplitPageUC_Initialized">
<!-- Chiamata al Dictionary -->
<UserControl.Resources>
<ResourceDictionary Source="OmagCUTDictionary.xaml"></ResourceDictionary>
</UserControl.Resources>
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
mc:Ignorable="d"
d:DesignHeight="853.3" d:DesignWidth="1280" Initialized="SplitPageUC_Initialized">
<!-- Definizione della SplitPage -->
<Grid Name="SplitPageGrid" >
ToolsDbPageUC.xaml
+32 -39
View File
@@ -8,11 +8,6 @@
mc:Ignorable="d"
d:DesignHeight="768" d:DesignWidth="1280" Initialized="ToolsDbPage_Initialized" Loaded="ToolsDbPage_Loaded">
<!-- Chiamata al Dictionary -->
<UserControl.Resources>
<ResourceDictionary Source="OmagCutDictionary.xaml"/>
</UserControl.Resources>
<!-- Definizione della ImportPage -->
<Border Style="{StaticResource OmagCut_PageBorder}">
@@ -226,8 +221,8 @@
<TextBlock Name="NameTxBl" Grid.Column="0" Grid.Row="0" Grid.RowSpan="3"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="NameTxBx" Grid.Column="1" Grid.Row="0" Grid.RowSpan="3" Width="150"
Style="{StaticResource OmagCut_KeyboardTextBox}" />
<EgtWPFLib:EgtTextBox Name="NameTxBx" Grid.Column="1" Grid.Row="0" Grid.RowSpan="3"
Style="{StaticResource OmagCut_LeftCalculatorTextBoxNoBorder}"/>
<Border Name="TCPosBrd" Grid.Column="2" Grid.Row="0" Grid.ColumnSpan="2" Grid.RowSpan="3"
BorderThickness="0" BorderBrush="Black" CornerRadius="3">
@@ -240,7 +235,7 @@
<TextBlock Name="TCPosTxBl" Grid.Column="0"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="TCPosTxBx" Grid.Column="1" Grid.Row="0" Width="150"
<EgtWPFLib:EgtTextBox Name="TCPosTxBx" Grid.Column="1" Grid.Row="0" Margin="0,0,15,0"
Style="{StaticResource OmagCut_KeyboardTextBox}" />
</Grid>
@@ -259,12 +254,12 @@
</Grid.ColumnDefinitions>
<TextBlock Name="HeadTxBl" Grid.Column="0" Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="HeadTxBx" Grid.Column="1" Width="140"
Style="{StaticResource OmagCut_KeyboardTextBox}" />
<EgtWPFLib:EgtTextBox Name="HeadTxBx" Grid.Column="1"
Style="{StaticResource OmagCut_LeftCalculatorTextBoxInBorder}" />
<TextBlock Name="ExitTxBl" Grid.Column="2" Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="ExitTxBx" Grid.Column="3" Width="140"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
<EgtWPFLib:EgtTextBox Name="ExitTxBx" Grid.Column="3"
Style="{StaticResource OmagCut_RightCalculatorTextBoxInBorder}" />
</Grid>
@@ -282,13 +277,13 @@
</Grid.ColumnDefinitions>
<TextBlock Name="SpeedTxBl" Grid.Column="0" Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="SpeedTxBx" Grid.Column="1" Width="140"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
<EgtWPFLib:EgtTextBox Name="SpeedTxBx" Grid.Column="1"
Style="{StaticResource OmagCut_CalculatorTextBoxInGroupBox}" />
<TextBlock Name="MaxSpeedTxBl" Grid.Column="2"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="MaxSpeedTxBx" Grid.Column="3" Width="140"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
<EgtWPFLib:EgtTextBox Name="MaxSpeedTxBx" Grid.Column="3"
Style="{StaticResource OmagCut_CalculatorTextBoxInGroupBox}" />
</Grid>
@@ -311,22 +306,22 @@
<TextBlock Name="FeedTxBl" Grid.Column="0" Grid.Row="0"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="FeedTxBx" Grid.Column="1" Grid.Row="0" Width="140"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
<EgtWPFLib:EgtTextBox Name="FeedTxBx" Grid.Column="1" Grid.Row="0"
Style="{StaticResource OmagCut_CalculatorTextBoxInGroupBox}" />
<TextBlock Name="TipFeedTxBl" Grid.Column="2" Grid.Row="0"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="TipFeedTxBx" Grid.Column="3" Grid.Row="0" Width="140"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
<EgtWPFLib:EgtTextBox Name="TipFeedTxBx" Grid.Column="3" Grid.Row="0"
Style="{StaticResource OmagCut_CalculatorTextBoxInGroupBox}" />
<TextBlock Name="StartFeedTxBl" Grid.Column="0" Grid.Row="1"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="StartFeedTxBx" Grid.Column="1" Grid.Row="1" Width="140"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
<EgtWPFLib:EgtTextBox Name="StartFeedTxBx" Grid.Column="1" Grid.Row="1"
Style="{StaticResource OmagCut_CalculatorTextBoxInGroupBox}" />
<TextBlock Name="EndFeedTxBl" Grid.Column="2" Grid.Row="1"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="EndFeedTxBx" Grid.Column="3" Grid.Row="1" Width="140"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
<EgtWPFLib:EgtTextBox Name="EndFeedTxBx" Grid.Column="3" Grid.Row="1"
Style="{StaticResource OmagCut_CalculatorTextBoxInGroupBox}" />
</Grid>
@@ -334,19 +329,17 @@
<TextBlock Name="CoolantTxBl" Grid.Column="0" Grid.Row="16" Grid.RowSpan="3"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
<ComboBox Name="CoolantCmBx" Grid.Column="1" Grid.Row="16" Grid.RowSpan="3" Width="140" Height="38"
HorizontalAlignment="Center"
VerticalAlignment="Center" >
<ComboBox Name="CoolantCmBx" Grid.Column="1" Grid.Row="16" Grid.RowSpan="3" Style="{StaticResource OmagCut_LeftComboBoxNoBorder}">
<ComboBox.ItemTemplate>
<DataTemplate>
<Label Content="{Binding}" FontSize="20" />
<TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
<TextBlock Name="CorrTxBl" Grid.Column="2" Grid.Row="16" Grid.RowSpan="3"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="CorrTxBx" Grid.Column="3" Grid.Row="16" Grid.RowSpan="3" Width="140"
<EgtWPFLib:EgtTextBox Name="CorrTxBx" Grid.Column="3" Grid.Row="16" Grid.RowSpan="3" Margin="0,0,15,0"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
<GroupBox Name="OffsetGpBx" Grid.Column="0" Grid.Row="19" Grid.ColumnSpan="4" Grid.RowSpan="4"
@@ -362,13 +355,13 @@
<TextBlock Name="RadOffsetTxBl" Grid.Column="0"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="RadOffsetTxBx" Grid.Column="1" Width="140"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
<EgtWPFLib:EgtTextBox Name="RadOffsetTxBx" Grid.Column="1"
Style="{StaticResource OmagCut_CalculatorTextBoxInGroupBox}" />
<TextBlock Name="LonOffsetTxBl" Grid.Column="2"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="LonOffsetTxBx" Grid.Column="3" Width="140"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
<EgtWPFLib:EgtTextBox Name="LonOffsetTxBx" Grid.Column="3"
Style="{StaticResource OmagCut_CalculatorTextBoxInGroupBox}" />
</Grid>
@@ -387,12 +380,12 @@
<TextBlock Name="MaxAbsorptionTxBl" Grid.Column="0"
Style="{StaticResource OmagCut_ToolsDBTextBlock}" Grid.ColumnSpan="1" ScrollViewer.VerticalScrollBarVisibility="Disabled" TextWrapping="Wrap"/>
<EgtWPFLib:EgtTextBox Name="MaxAbsorptionTxBx" Grid.Column="1" Width="140"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
<EgtWPFLib:EgtTextBox Name="MaxAbsorptionTxBx" Grid.Column="1"
Style="{StaticResource OmagCut_LeftCalculatorTextBoxInBorder}" />
<TextBlock Name="MinFeedTxBl" Grid.Column="2" Style="{StaticResource OmagCut_ToolsDBTextBlock}" />
<EgtWPFLib:EgtTextBox Name="MinFeedTxBx" Grid.Column="3" Width="140"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
<EgtWPFLib:EgtTextBox Name="MinFeedTxBx" Grid.Column="3"
Style="{StaticResource OmagCut_RightCalculatorTextBoxInBorder}" />
</Grid>
@@ -400,8 +393,8 @@
<TextBlock Name="MaxMatTxBl" Grid.Column="0" Grid.Row="27" Grid.RowSpan="3"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="MaxMatTxBx" Grid.Column="1" Grid.Row="27" Grid.RowSpan="3" Width="140"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
<EgtWPFLib:EgtTextBox Name="MaxMatTxBx" Grid.Column="1" Grid.Row="27" Grid.RowSpan="3"
Style="{StaticResource OmagCut_LeftCalculatorTextBoxNoBorder}" />
</Grid>
ToolsDbPageUC.xaml.vb
+6 -1
View File
@@ -922,7 +922,12 @@ Public Class ToolsDbPageUC
Friend Function SaveCurrTool() As Boolean
SetToolParams()
If EgtTdbIsCurrToolModified() Then
Dim SaveCurrToolWnd As New EgtMsgBox(m_MainWindow, "", EgtMsg(MSG_EGTMSGBOX + 2), EgtMsgBox.Buttons.YES_NO_CANCEL, EgtMsgBox.Icons.NULL)
Dim SaveCurrToolWnd As EgtMsgBox
If m_MainWindow.IsSiemensPc Then
SaveCurrToolWnd = New EgtMsgBox(m_MainWindow, Me.ActualWidth / 15 * 5, EgtMsgBox.WidthType.PIXEL, "", EgtMsg(MSG_EGTMSGBOX + 2), EgtMsgBox.Buttons.YES_NO_CANCEL, EgtMsgBox.Icons.NULL)
Else
SaveCurrToolWnd = New EgtMsgBox(m_MainWindow, "", EgtMsg(MSG_EGTMSGBOX + 2), EgtMsgBox.Buttons.YES_NO_CANCEL, EgtMsgBox.Icons.NULL)
End If
Select Case SaveCurrToolWnd.DialogResult
Case 0 ' Annulla
Return False
WorkInProgressPageUC.xaml
+2 -7
View File
@@ -6,12 +6,7 @@
mc:Ignorable="d"
d:DesignHeight="853" d:DesignWidth="1280"
Initialized="WorkInProgressPage_Initialized" Loaded="WorkInProgressPage_Loaded" Unloaded="WorkInProgressPage_Unloaded">
<!-- Chiamata al Dictionary -->
<UserControl.Resources>
<ResourceDictionary Source="OmagCutDictionary.xaml"/>
</UserControl.Resources>
<!-- Definizione della WorkInProgressPage -->
<Grid Name="WorkInProgressPageGrid">
<Grid.RowDefinitions>
@@ -29,7 +24,7 @@
<Button Name="MachViewModeBtn" Grid.Column="1"
Style="{StaticResource OmagCut_RightGrayGradientYellowButton}">
<Image Source="Resources/MHT.png" Style="{StaticResource OmagCut_ButtonIcon}"/>
<Image Source="Resources/MHT.png" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
</Button>
</Grid>