diff --git a/AboutBox/AboutBoxWD.xaml b/AboutBox/AboutBoxWD.xaml index 87c117a..e386de8 100644 --- a/AboutBox/AboutBoxWD.xaml +++ b/AboutBox/AboutBoxWD.xaml @@ -1,9 +1,9 @@  + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + FontFamily="{DynamicResource OmagCut_Font}" + Title="AboutBoxWD" Height="469.15" Width="511.8" WindowStyle="None" ResizeMode="NoResize" + AllowsTransparency="True" Background="Transparent" ShowInTaskbar="False"> @@ -23,8 +23,8 @@ - - + + @@ -36,27 +36,27 @@ - + + VerticalAlignment="Center" FontSize="18" /> + VerticalAlignment="Center" FontSize="18"/> + VerticalAlignment="Center" FontSize="18"/> - + - + + VerticalAlignment="Center" FontSize="18"/> + VerticalAlignment="Center" FontSize="15" /> @@ -257,22 +257,19 @@ + Style="{DynamicResource OmagCut_YellowIconToggleButton}"> + Style="{DynamicResource OmagCut_YellowIconToggleButton}"> - - - diff --git a/CadCuts/CSVPage.xaml.vb b/CadCuts/CSVPage.xaml.vb index 58d3218..0a012f0 100644 --- a/CadCuts/CSVPage.xaml.vb +++ b/CadCuts/CSVPage.xaml.vb @@ -36,8 +36,8 @@ Public Class CSVPage ' Assegno la lista dei pezzi Csv come sorgente del treeview PartsTreeView.ItemsSource = m_ItemsList ' Messaggi - InsertBtn.Content = EgtMsg(MSG_CSVPAGEUC + 2) ' Inserisci - RemoveBtn.Content = EgtMsg(MSG_CSVPAGEUC + 4) ' Rimuovi + InsertBtn.Content = EgtMsg(91202) ' Inserisci + RemoveBtn.Content = EgtMsg(91204) ' Rimuovi ' Determino se versione semplificata m_bFull = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.CSV_AUTO) And (GetPrivateProfileInt(S_CSV, K_FULL, 1, m_MainWindow.GetIniFile()) <> 0) @@ -748,10 +748,10 @@ Public Class CSVPage ' Eventuale messaggi di pezzi liberi o da altre liste If bOther Then ' Pezzi non rimossi perché liberi - Dim sOut As String = EgtMsg(MSG_EGTMSGBOX + 13) + Dim sOut As String = EgtMsg(91113) If Not String.IsNullOrWhiteSpace(sOtherCsv) Then ' o di altre liste Csv - sOut &= EgtMsg(MSG_EGTMSGBOX + 14) & " (" & sOtherCsv.TrimEnd(", ".ToCharArray()) & ")" + sOut &= EgtMsg(91114) & " (" & sOtherCsv.TrimEnd(", ".ToCharArray()) & ")" End If Dim WarnMsg As New EgtMsgBox(m_MainWindow, "", sOut, EgtMsgBox.Buttons.OK, EgtMsgBox.Icons.NULL, 0, 1) End If diff --git a/CadCuts/CadCutPageUC.xaml b/CadCuts/CadCutPageUC.xaml index 8728cb8..d9d5f1b 100644 --- a/CadCuts/CadCutPageUC.xaml +++ b/CadCuts/CadCutPageUC.xaml @@ -7,7 +7,7 @@ d:DesignHeight="853.3" d:DesignWidth="1280" Initialized="CadCutPage_Initialized" Loaded="CadCutPage_Loaded" Unloaded="CadCutPage_Unloaded"> - + @@ -30,24 +30,25 @@ - - - - + - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + - - + + - + - + - + \ No newline at end of file diff --git a/CadCuts/ChooseTestToolWD.xaml.vb b/CadCuts/ChooseTestToolWD.xaml.vb index dd22649..523d3ad 100644 --- a/CadCuts/ChooseTestToolWD.xaml.vb +++ b/CadCuts/ChooseTestToolWD.xaml.vb @@ -1,5 +1,4 @@ Imports System.Collections.ObjectModel -Imports System.IO Imports EgtUILib Public Class ChooseTestToolWD @@ -19,7 +18,7 @@ Public Class ChooseTestToolWD Me.Left = Owner.Left + Owner.Width / 2 - Me.Width / 2 ' Definizione del collegamento tra ItemList e ListBox1 SetUpToolListBox.ItemsSource = m_SetUpToolList - FilePathTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 45) ' Selezionare l'utensile da tastare + FilePathTxBl.Text = EgtMsg(90945) ' Selezionare l'utensile da tastare End Sub Private Sub OpenFile_Loaded(sender As Object, e As EventArgs) Handles Me.Loaded diff --git a/CadCuts/EditValueWD.xaml b/CadCuts/EditValueWD.xaml index efb01a8..f5a3d6f 100644 --- a/CadCuts/EditValueWD.xaml +++ b/CadCuts/EditValueWD.xaml @@ -1,10 +1,10 @@  + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib" + FontFamily="{DynamicResource OmagCut_Font}" + ResizeMode="NoResize" WindowStyle="None" AllowsTransparency="True" Background="Transparent" + Title="EditValueWD" Height="255.9" Width="426.5" ShowInTaskbar="False"> @@ -23,9 +23,9 @@ + Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/> + Style="{DynamicResource OmagCut_CalculatorTextBox}"/> @@ -47,12 +47,12 @@ diff --git a/CadCuts/EditValueWD.xaml.vb b/CadCuts/EditValueWD.xaml.vb index 96a4133..b7a6f8e 100644 --- a/CadCuts/EditValueWD.xaml.vb +++ b/CadCuts/EditValueWD.xaml.vb @@ -1,7 +1,4 @@ -Imports System.IO -Imports EgtUILib -Imports EgtWPFLib -Imports System.Collections.ObjectModel +Imports System.Collections.ObjectModel Public Class EditValueWD diff --git a/CadCuts/FastGridSlabManager.xaml b/CadCuts/FastGridSlabManager.xaml index a2bf663..0c61324 100644 --- a/CadCuts/FastGridSlabManager.xaml +++ b/CadCuts/FastGridSlabManager.xaml @@ -7,7 +7,6 @@ mc:Ignorable="d" d:DesignHeight="853.3" d:DesignWidth="1280"> - @@ -46,7 +45,7 @@ Grid.Row="0" Grid.Column="0" Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/> @@ -67,11 +66,11 @@ + Style="{DynamicResource OmagCut_DisabledYellowToggleButton}"/> + Style="{DynamicResource OmagCut_DisabledYellowToggleButton}" /> + Style="{DynamicResource OmagCut_DisabledYellowToggleButton}" /> @@ -82,11 +81,11 @@ + Grid.Column="1" + Style="{DynamicResource OmagCut_DisabledYellowToggleButton}"/> + Grid.Column="2" + Style="{DynamicResource OmagCut_DisabledYellowToggleButton}"/> @@ -94,13 +93,13 @@ - + + + - + - + - + - + diff --git a/CadCuts/ModifStartEndWD.xaml.vb b/CadCuts/ModifStartEndWD.xaml.vb index 021e16f..daf4046 100644 --- a/CadCuts/ModifStartEndWD.xaml.vb +++ b/CadCuts/ModifStartEndWD.xaml.vb @@ -1,7 +1,5 @@ -Imports System.IO -Imports System.Collections.ObjectModel +Imports System.Collections.ObjectModel Imports EgtUILib -Imports EgtWPFLib Public Class ModifStartEndWD @@ -47,16 +45,16 @@ Public Class ModifStartEndWD Me.Left = Owner.Left + Owner.Width / 2 - Me.Width / 2 ' Imposto i messaggi letti dal file dei messaggi - ElongationTxbl.Text = EgtMsg(MSG_SPLITPAGEUC + 35) - HoleTxbl.Text = EgtMsg(90875) - LeadInTxbl.Text = EgtMsg(90769) - LeadOutTxbl.Text = EgtMsg(90771) - TangDistTxbl.Text = EgtMsg(90890) - PerpDistTxbl.Text = EgtMsg(90891) + ElongationTxbl.Text = EgtMsg(90375) ' Allungamento + HoleTxbl.Text = EgtMsg(90875) ' Foro di attacco + LeadInTxbl.Text = EgtMsg(90769) ' Attacco + LeadOutTxbl.Text = EgtMsg(90771) ' Uscita + TangDistTxbl.Text = EgtMsg(90890) ' Dist. tang. + PerpDistTxbl.Text = EgtMsg(90891) ' Dist. perp. ' Mostro/Nascondo elementi in base a Inizio/Fine Modif. If bIsLeadIn Then - TitleTxbl.Text = EgtMsg(MSG_SPLITPAGEUC + 33) + TitleTxbl.Text = EgtMsg(90373) ' Inizio Modif. HoleTxbl.Visibility = Windows.Visibility.Visible HoleChBx.Visibility = Windows.Visibility.Visible LeadInTxbl.Visibility = Windows.Visibility.Visible @@ -64,16 +62,16 @@ Public Class ModifStartEndWD LeadOutTxbl.Visibility = Windows.Visibility.Hidden LeadOutCmBx.Visibility = Windows.Visibility.Hidden LeadInType = New ObservableCollection(Of IdNameStruct)( - {New IdNameStruct(MCH_MIL_LI.NONE, EgtMsg(MSG_COMBOBOXPARAM + 42)), - New IdNameStruct(MCH_MIL_LI.LINEAR, EgtMsg(MSG_COMBOBOXPARAM + 46)), - New IdNameStruct(MCH_MIL_LI.TANGENT, EgtMsg(MSG_COMBOBOXPARAM + 47))}) + {New IdNameStruct(MCH_MIL_LI.NONE, EgtMsg(90842)), ' Nessuno + New IdNameStruct(MCH_MIL_LI.LINEAR, EgtMsg(90846)), ' Lineare + New IdNameStruct(MCH_MIL_LI.TANGENT, EgtMsg(90847))}) ' Tangente LeadInCmBx.ItemsSource = LeadInType LiTangDistTxBx.Visibility = Windows.Visibility.Visible LiPerpDistTxBx.Visibility = Windows.Visibility.Visible LoTangDistTxBx.Visibility = Windows.Visibility.Hidden LoPerpDistTxBx.Visibility = Windows.Visibility.Hidden Else - TitleTxbl.Text = EgtMsg(MSG_SPLITPAGEUC + 34) + TitleTxbl.Text = EgtMsg(90374) ' Fine Modif. HoleTxbl.Visibility = Windows.Visibility.Hidden HoleChBx.Visibility = Windows.Visibility.Hidden LeadInTxbl.Visibility = Windows.Visibility.Hidden @@ -81,10 +79,10 @@ Public Class ModifStartEndWD LeadOutTxbl.Visibility = Windows.Visibility.Visible LeadOutCmBx.Visibility = Windows.Visibility.Visible LeadOutType = New ObservableCollection(Of IdNameStruct)( - {New IdNameStruct(MCH_MIL_LO.NONE, EgtMsg(MSG_COMBOBOXPARAM + 42)), - New IdNameStruct(MCH_MIL_LO.LINEAR, EgtMsg(MSG_COMBOBOXPARAM + 46)), - New IdNameStruct(MCH_MIL_LO.TANGENT, EgtMsg(MSG_COMBOBOXPARAM + 47)), - New IdNameStruct(MCH_MIL_LO.AS_LI, EgtMsg(MSG_COMBOBOXPARAM + 50))}) + {New IdNameStruct(MCH_MIL_LO.NONE, EgtMsg(90842)), ' Nessuno + New IdNameStruct(MCH_MIL_LO.LINEAR, EgtMsg(90846)), ' Lineare + New IdNameStruct(MCH_MIL_LO.TANGENT, EgtMsg(90847)), ' Tangente + New IdNameStruct(MCH_MIL_LO.AS_LI, EgtMsg(90850))}) ' Come attacco LeadOutCmBx.ItemsSource = LeadOutType LiTangDistTxBx.Visibility = Windows.Visibility.Hidden LiPerpDistTxBx.Visibility = Windows.Visibility.Hidden diff --git a/CadCuts/MoveRawPartPage.xaml b/CadCuts/MoveRawPartPage.xaml index 5f80dd2..646dd46 100644 --- a/CadCuts/MoveRawPartPage.xaml +++ b/CadCuts/MoveRawPartPage.xaml @@ -1,173 +1,173 @@  + 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:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib" + xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + mc:Ignorable="d" + d:DesignHeight="853.3" d:DesignWidth="1280"> - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/CadCuts/MoveRawPartPage.xaml.vb b/CadCuts/MoveRawPartPage.xaml.vb index 74b04ab..509157f 100644 --- a/CadCuts/MoveRawPartPage.xaml.vb +++ b/CadCuts/MoveRawPartPage.xaml.vb @@ -1,5 +1,4 @@ -Imports System.Windows.Forms.Integration -Imports EgtUILib +Imports EgtUILib Public Class MoveRawPartPage ' Riferimento alla MainWindow @@ -41,11 +40,11 @@ Public Class MoveRawPartPage Private Sub MoveRawPartPage_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized ' Assegno testi - RemovePartBtn.Content = EgtMsg(MSG_MOVERAWPAGEUC + 1) 'Rimuovi - ModifyBtn.Content = EgtMsg(MSG_SPLITPAGEUC + 17) 'Modifica - ResetBtn.Content = EgtMsg(MSG_NESTPAGEUC + 6) 'Reset - ScrapsBtn.Content = EgtMsg(90366) 'Add Scraps - UnloadPartsBtn.Content = EgtMsg(90367) 'Move part + RemovePartBtn.Content = EgtMsg(90361) ' Rimuovi + ModifyBtn.Content = EgtMsg(90357) ' Modifica + ResetBtn.Content = EgtMsg(90336) ' Reset + ScrapsBtn.Content = EgtMsg(90366) ' Add Scraps + UnloadPartsBtn.Content = EgtMsg(90367) ' Move part End Sub Private Sub MoveRawPartPage_Loaded(sender As Object, e As EventArgs) Handles Me.Loaded @@ -61,7 +60,7 @@ Public Class MoveRawPartPage ' Se movimento con ventosa, verifico se lama troppo grande If Not m_bByHand And Not m_MainWindow.m_CurrentMachine.IsVacuumMovePossible() Then m_bByHand = True - m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_SPLITPAGEUC + 11)) ' Lama troppo grande per utilizzo ventosa + m_CurrProjPage.SetWarningMessage(EgtMsg(90351)) ' Lama troppo grande per utilizzo ventosa End If ' Deseleziono tutto EgtDeselectAll() @@ -407,12 +406,12 @@ Public Class MoveRawPartPage ' Aggiorno i dati m_bRawWithCups = False If VacuumCups.bOverWeight Then - m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_MOVERAWPAGEUC + 4)) 'Pezzo troppo pesante : non si può muovere + m_CurrProjPage.SetWarningMessage(EgtMsg(90364)) ' Pezzo troppo pesante : non si può muovere ElseIf VacuumCups.bExtraStroke Then - m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_MOVERAWPAGEUC + 5)) 'Pezzo oltre le corse : non si può muovere + m_CurrProjPage.SetWarningMessage(EgtMsg(90365)) ' Pezzo oltre le corse : non si può muovere Else ' Messaggio di avvertimento - m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_MOVERAWPAGEUC + 2)) 'Pezzo troppo piccolo : non si può muovere + m_CurrProjPage.SetWarningMessage(EgtMsg(90362)) ' Pezzo troppo piccolo : non si può muovere End If End If @@ -589,7 +588,7 @@ Public Class MoveRawPartPage VacuumCups.ptStartPointLift.y -= vtMove.y End If Else - m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_MOVERAWPAGEUC + 2)) 'Pezzo troppo piccolo : non si può muovere + m_CurrProjPage.SetWarningMessage(EgtMsg(90362)) 'Pezzo troppo piccolo : non si può muovere End If End If nRawId = EgtGetNextSelectedObj() @@ -632,7 +631,7 @@ Public Class MoveRawPartPage VacuumCups.ptStartPointLift.y -= vtMove.y End If Else - m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_MOVERAWPAGEUC + 2)) 'Pezzo troppo piccolo : non si può muovere + m_CurrProjPage.SetWarningMessage(EgtMsg(90362)) 'Pezzo troppo piccolo : non si può muovere End If End If nRawId = EgtGetNextSelectedObj() @@ -658,7 +657,7 @@ Public Class MoveRawPartPage VacuumCups.ptStartPointLift.x -= vtMove.x End If Else - m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_MOVERAWPAGEUC + 2)) 'Pezzo troppo piccolo : non si può muovere + m_CurrProjPage.SetWarningMessage(EgtMsg(90362)) 'Pezzo troppo piccolo : non si può muovere End If nRawId = EgtGetNextSelectedObj() End While @@ -683,7 +682,7 @@ Public Class MoveRawPartPage VacuumCups.ptStartPointLift.x -= vtMove.x End If Else - m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_MOVERAWPAGEUC + 2)) 'Pezzo troppo piccolo : non si può muovere + m_CurrProjPage.SetWarningMessage(EgtMsg(90362)) ' Pezzo troppo piccolo : non si può muovere End If nRawId = EgtGetNextSelectedObj() End While @@ -704,7 +703,7 @@ Public Class MoveRawPartPage Case 1 ' extra corsa sulla x-: devo ridurre del valore di extra corsa EgtGetOutstrokeInfo(sInfo) - m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_SIMULATIONPAGEUC + 2) & " " & sInfo) 'Extracorsa ... + m_CurrProjPage.SetWarningMessage(EgtMsg(90552) & " " & sInfo) ' Extracorsa ... ptEndPointLift.x -= vtMove.x Dim dMaxMove As Double = VacuumCups.GetExtraStrokeValue(sInfo) If Math.Abs(dMaxMove - vtMove.x) <= EPS_SMALL * 100 Then @@ -717,7 +716,7 @@ Public Class MoveRawPartPage Case 2 ' extra corsa sulla x+: devo ridurre del valore di extra corsa EgtGetOutstrokeInfo(sInfo) - m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_SIMULATIONPAGEUC + 2) & " " & sInfo) 'Extracorsa ... + m_CurrProjPage.SetWarningMessage(EgtMsg(90552) & " " & sInfo) ' Extracorsa ... ptEndPointLift.x -= vtMove.x Dim dMaxMove As Double = VacuumCups.GetExtraStrokeValue(sInfo) If Math.Abs(dMaxMove - vtMove.x) <= EPS_SMALL * 100 Then @@ -730,7 +729,7 @@ Public Class MoveRawPartPage Case 4 ' extra corsa sulla y- EgtGetOutstrokeInfo(sInfo) - m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_SIMULATIONPAGEUC + 2) & " " & sInfo) 'Extracorsa ... + m_CurrProjPage.SetWarningMessage(EgtMsg(90552) & " " & sInfo) ' Extracorsa ... ptEndPointLift.y -= vtMove.y Dim dMaxMove As Double = VacuumCups.GetExtraStrokeValue(sInfo) If Math.Abs(dMaxMove - vtMove.y) <= EPS_SMALL * 100 Then @@ -743,7 +742,7 @@ Public Class MoveRawPartPage Case 8 ' extra corsa sulla y+ EgtGetOutstrokeInfo(sInfo) - m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_SIMULATIONPAGEUC + 2) & " " & sInfo) 'Extracorsa ... + m_CurrProjPage.SetWarningMessage(EgtMsg(90552) & " " & sInfo) ' Extracorsa ... ptEndPointLift.y -= vtMove.y Dim dMaxMove As Double = VacuumCups.GetExtraStrokeValue(sInfo) If Math.Abs(dMaxMove - vtMove.y) <= EPS_SMALL * 100 Then @@ -788,7 +787,7 @@ Public Class MoveRawPartPage VacuumCups.dDegRotStartAng -= dAng End If Else - m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_MOVERAWPAGEUC + 2)) 'Pezzo troppo piccolo : non si può muovere + m_CurrProjPage.SetWarningMessage(EgtMsg(90362)) ' Pezzo troppo piccolo : non si può muovere End If nRawId = EgtGetNextSelectedObj() End While @@ -822,7 +821,7 @@ Public Class MoveRawPartPage VacuumCups.dDegRotStartAng -= dAng End If Else - m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_MOVERAWPAGEUC + 2)) 'Pezzo troppo piccolo : non si può muovere + m_CurrProjPage.SetWarningMessage(EgtMsg(90362)) ' Pezzo troppo piccolo : non si può muovere End If nRawId = EgtGetNextSelectedObj() End While @@ -843,7 +842,7 @@ Public Class MoveRawPartPage Case 16 ' extra corsa sulla c- EgtGetOutstrokeInfo(sInfo) - m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_SIMULATIONPAGEUC + 2) & " " & sInfo) 'Extracorsa ... + m_CurrProjPage.SetWarningMessage(EgtMsg(90552) & " " & sInfo) ' Extracorsa ... ptEndPointLift.Rotate(ptCenter, Vector3d.Z_AX(), -dAngDeg) dDegRotEndAng -= dAngDeg dAngDeg += VacuumCups.GetExtraStrokeValue(sInfo) + EPS_SMALL @@ -853,7 +852,7 @@ Public Class MoveRawPartPage Case 34 ' extra corsa sulla c+ EgtGetOutstrokeInfo(sInfo) - m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_SIMULATIONPAGEUC + 2) & " " & sInfo) 'Extracorsa ... + m_CurrProjPage.SetWarningMessage(EgtMsg(90552) & " " & sInfo) ' Extracorsa ... ptEndPointLift.Rotate(ptCenter, Vector3d.Z_AX(), -dAngDeg) dDegRotEndAng -= dAngDeg dAngDeg -= VacuumCups.GetExtraStrokeValue(sInfo) + EPS_SMALL @@ -1088,7 +1087,7 @@ Public Class MoveRawPartPage Else EgtMoveRawPart(nRawId, ptRawCen - ptNewRawCen) EgtRotateRawPart(nRawId, Vector3d.Z_AX(), -dAngRaw) - m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_MOVERAWPAGEUC + 3)) ' Posizione scelta già occupata + m_CurrProjPage.SetWarningMessage(EgtMsg(90363)) ' Posizione scelta già occupata End If ' Disabilito pezzo e nascondo le ventose EgtSetStatus(nRawId, GDB_ST.ON_) diff --git a/CadCuts/NestPageUC.xaml b/CadCuts/NestPageUC.xaml index d1ee8d6..d1d82ba 100644 --- a/CadCuts/NestPageUC.xaml +++ b/CadCuts/NestPageUC.xaml @@ -1,18 +1,18 @@  - + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + mc:Ignorable="d" + d:DesignHeight="853.3" d:DesignWidth="1280" Initialized="NestPage_Initialized" Loaded="NestPage_Loaded" Unloaded="NestPage_Unloaded"> + - + @@ -38,39 +38,39 @@ + Style="{DynamicResource OmagCut_YellowIconToggleButton}"> + Style="{DynamicResource OmagCut_CalculatorTextBox}"/> @@ -79,101 +79,101 @@ + Style="{DynamicResource OmagCut_CalculatorTextBox}"/> + Text="°"/> + Style="{DynamicResource OmagCut_YellowIconToggleButton}"> + VerticalAlignment="Center" /> - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + - - - diff --git a/CadCuts/NestPageUC.xaml.vb b/CadCuts/NestPageUC.xaml.vb index 6bac666..0d21a8f 100644 --- a/CadCuts/NestPageUC.xaml.vb +++ b/CadCuts/NestPageUC.xaml.vb @@ -1,7 +1,4 @@ -Imports System.ComponentModel -Imports System.Reflection -Imports System.Windows.Forms -Imports System.Windows.Forms.Integration +Imports System.Windows.Forms Imports EgtUILib Imports EgtWPFLib @@ -105,12 +102,12 @@ Public Class NestPageUC Private Sub NestPage_Initialized(sender As Object, e As EventArgs) ' Imposto i messaggi letti dal file dei messaggi - InsertPartBtn.ToolTip = EgtMsg(MSG_NESTPAGEUC + 1) 'Insert part - Inserisci pezzo - StorePartBtn.ToolTip = EgtMsg(MSG_NESTPAGEUC + 2) 'Store part - Parcheggia pezzo - RemovePartBtn.ToolTip = EgtMsg(MSG_NESTPAGEUC + 3) 'Remove part - Elimina pezzo - SelectAllBtn.ToolTip = EgtMsg(MSG_NESTPAGEUC + 4) 'Select All - Seleziona Tutto - DeselectAllBtn.ToolTip = EgtMsg(MSG_NESTPAGEUC + 5) 'Deselect All - Deseleziona Tutto - DragRettanleBtn.ToolTip = EgtMsg(91207) 'Strech + InsertPartBtn.ToolTip = EgtMsg(90331) ' Insert part - Inserisci pezzo + StorePartBtn.ToolTip = EgtMsg(90332) ' Store part - Parcheggia pezzo + RemovePartBtn.ToolTip = EgtMsg(90333) ' Remove part - Elimina pezzo + SelectAllBtn.ToolTip = EgtMsg(90334) ' Select All - Seleziona Tutto + DeselectAllBtn.ToolTip = EgtMsg(90335) ' Deselect All - Deseleziona Tutto + DragRettanleBtn.ToolTip = EgtMsg(91207) ' Strech ' Nascondo i pulsanti in uso quando attivo la modalità REG UG0_Reg.Visibility = Visibility.Hidden @@ -1319,7 +1316,7 @@ Math.Abs(e.Location.Y - m_locPrev.Y) < m_nRestRadius Then ' Se pezzo Trf, verifico compatibilità If Not VerifyTrfData(nTestId) Then ' Pezzi con spessore, materiale o finitura non compatibili - m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_NESTPAGEUC + 7)) + m_CurrProjPage.SetWarningMessage(EgtMsg(90337)) End If ' Applico le lavorazioni al pezzo Dim b3Curr As New BBox3d @@ -2343,7 +2340,7 @@ Math.Abs(e.Location.Y - m_locPrev.Y) < m_nRestRadius Then ' Eventuale segnalazione di pezzi Trf non adatti If bWrongTrf Then ' Pezzi con spessore, materiale o finitura non compatibili - m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_NESTPAGEUC + 7)) + m_CurrProjPage.SetWarningMessage(EgtMsg(90337)) End If End Sub @@ -2410,7 +2407,7 @@ Math.Abs(e.Location.Y - m_locPrev.Y) < m_nRestRadius Then ' Eventuale segnalazione di pezzi Trf non adatti If bWrongTrf Then ' Pezzi con spessore, materiale o finitura non compatibili - m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_NESTPAGEUC + 7)) + m_CurrProjPage.SetWarningMessage(EgtMsg(90337)) End If End Sub @@ -2462,7 +2459,7 @@ Math.Abs(e.Location.Y - m_locPrev.Y) < m_nRestRadius Then ' Aggiungo le lavorazioni standard Dim nWarn As Integer = 0 AddMachinings(nId, nWarn) - If nWarn = 1 Then m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_SPLITPAGEUC + 11)) ' Lama troppo grande per utilizzo ventosa + If nWarn = 1 Then m_CurrProjPage.SetWarningMessage(EgtMsg(90351)) ' Lama troppo grande per utilizzo ventosa Return True End Function @@ -2919,7 +2916,7 @@ Math.Abs(e.Location.Y - m_locPrev.Y) < m_nRestRadius Then ' Se non ci sono pezzi selezionati, esco subito If EgtGetFirstSelectedObj() = GDB_ID.NULL Then Return ' Chiedo conferma prima di procedere - Dim RemovePartWnd As EgtMsgBox = New EgtMsgBox(m_MainWindow, "", EgtMsg(MSG_EGTMSGBOX + 21), EgtMsgBox.Buttons.OK_CANCEL, EgtMsgBox.Icons.NULL) + Dim RemovePartWnd As EgtMsgBox = New EgtMsgBox(m_MainWindow, "", EgtMsg(91121), EgtMsgBox.Buttons.OK_CANCEL, EgtMsgBox.Icons.NULL) If RemovePartWnd.m_nPressedBtn = 0 Then Return End If @@ -2937,7 +2934,7 @@ Math.Abs(e.Location.Y - m_locPrev.Y) < m_nRestRadius Then Dim bEraseCsvParts As Boolean = False If bCsvParts Then ' Vuoi cancellare anche i pezzi da lista Csv ? - Dim EraseCsvParts As New EgtMsgBox(m_MainWindow, "", EgtMsg(MSG_EGTMSGBOX + 12), + Dim EraseCsvParts As New EgtMsgBox(m_MainWindow, "", EgtMsg(91112), EgtMsgBox.Buttons.YES_NO_CANCEL, EgtMsgBox.Icons.NULL) Select Case EraseCsvParts.m_nPressedBtn Case 0 ' Annulla diff --git a/CadCuts/OpenFileWD.xaml b/CadCuts/OpenFileWD.xaml index f74f90a..3a75cbb 100644 --- a/CadCuts/OpenFileWD.xaml +++ b/CadCuts/OpenFileWD.xaml @@ -1,9 +1,9 @@  + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib" + FontFamily="{DynamicResource OmagCut_Font}" + Title="OpenFile" Height="682.6" Width="426.6" WindowStyle="None" ResizeMode="NoResize" ShowInTaskbar="False" AllowsTransparency="True" Background="Transparent"> @@ -23,7 +23,7 @@ diff --git a/CadCuts/SelParkIndWD.xaml.vb b/CadCuts/SelParkIndWD.xaml.vb index a837d32..d8d088c 100644 --- a/CadCuts/SelParkIndWD.xaml.vb +++ b/CadCuts/SelParkIndWD.xaml.vb @@ -1,6 +1,5 @@ Imports System.ComponentModel Imports System.Globalization -Imports System.Windows.Ink Imports System.Xml Imports EgtUILib Imports OmagCUT.NestPageUC diff --git a/CadCuts/SelectPartFromFamilyWD.xaml b/CadCuts/SelectPartFromFamilyWD.xaml index b0224d7..7a556e7 100644 --- a/CadCuts/SelectPartFromFamilyWD.xaml +++ b/CadCuts/SelectPartFromFamilyWD.xaml @@ -5,68 +5,69 @@ FontFamily="{DynamicResource OmagCut_Font}" ResizeMode="NoResize" WindowStyle="None" AllowsTransparency="True" Background="Transparent" Title="SaveNameWD" Height="200" Width="400" ShowInTaskbar="False"> - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - + + + + + + + + - - - - + + - - + + + + + + + - - - - - - - + - - - - - - - - + + + + + + - + - + - + diff --git a/CadCuts/SelectTableWD.xaml b/CadCuts/SelectTableWD.xaml index 25c1d21..ffa983b 100644 --- a/CadCuts/SelectTableWD.xaml +++ b/CadCuts/SelectTableWD.xaml @@ -7,76 +7,76 @@ ResizeMode="NoResize" ShowInTaskbar="False" AllowsTransparency="True" Background="Transparent"> - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + diff --git a/CadCuts/SplitAuto.vb b/CadCuts/SplitAuto.vb index 835e9c2..4fea0d6 100644 --- a/CadCuts/SplitAuto.vb +++ b/CadCuts/SplitAuto.vb @@ -548,7 +548,7 @@ Public Module SplitAuto ' Reinserisco tutte le lavorazioni Dim nWarn As Integer = 0 AddMachinings(GDB_ID.NULL, nWarn) - If nWarn = 1 Then m_MainWindow.m_CurrentProjectPageUC.SetWarningMessage(EgtMsg(MSG_SPLITPAGEUC + 11)) ' Lama troppo grande per utilizzo ventosa + If nWarn = 1 Then m_MainWindow.m_CurrentProjectPageUC.SetWarningMessage(EgtMsg(90351)) ' Lama troppo grande per utilizzo ventosa ' Carico ventose LoadVacuumCups() ' Lancio calcolo separazione diff --git a/CadCuts/SplitPageUC.xaml b/CadCuts/SplitPageUC.xaml index 238ad4c..c2bf747 100644 --- a/CadCuts/SplitPageUC.xaml +++ b/CadCuts/SplitPageUC.xaml @@ -35,10 +35,10 @@ @@ -142,13 +142,13 @@ @@ -161,30 +161,30 @@ - + - + diff --git a/CadCuts/SplitPageUC.xaml.vb b/CadCuts/SplitPageUC.xaml.vb index c61d803..fac45ab 100644 --- a/CadCuts/SplitPageUC.xaml.vb +++ b/CadCuts/SplitPageUC.xaml.vb @@ -72,29 +72,29 @@ Public Class SplitPageUC ' Collego lista di oggetti a ListBox MachiningLsBx.ItemsSource = m_ItemList ' Assegno testi - OnOffBtn.ToolTip = EgtMsg(MSG_SPLITPAGEUC + 1) ' On/Off - AllOnBtn.ToolTip = EgtMsg(MSG_SPLITPAGEUC + 2) ' Tutti On - AllOffBtn.ToolTip = EgtMsg(MSG_SPLITPAGEUC + 3) ' Tutti Off - CutBtn.ToolTip = EgtMsg(MSG_SPLITPAGEUC + 4) ' Allunga/Accorcia - CutStartBtn.ToolTip = EgtMsg(MSG_SPLITPAGEUC + 5) ' Inizio Allunga/Accorcia - CutEndBtn.ToolTip = EgtMsg(MSG_SPLITPAGEUC + 6) ' Fine Allunga/Accorcia - OutCenStartBtn.ToolTip = EgtMsg(MSG_SPLITPAGEUC + 7) ' Inizio Centro/Fuori - OutCenEndBtn.ToolTip = EgtMsg(MSG_SPLITPAGEUC + 12) ' Fine Centro/Fuori - ModifStartBtn.ToolTip = EgtMsg(MSG_SPLITPAGEUC + 33) ' Inizio Modif. - ModifEndBtn.ToolTip = EgtMsg(MSG_SPLITPAGEUC + 34) ' Fine Modif. - InvertBtn.ToolTip = EgtMsg(MSG_SPLITPAGEUC + 36) ' Inverti - PauseBtn.ToolTip = EgtMsg(MSG_SPLITPAGEUC + 31) ' Pausa On/Off - AllOutStartBtn.ToolTip = EgtMsg(MSG_SPLITPAGEUC + 8) ' Inizi Tutti Fuori - AllCenStartBtn.ToolTip = EgtMsg(MSG_SPLITPAGEUC + 9) ' Inizi Tutti Centro - AllOutEndBtn.ToolTip = EgtMsg(MSG_SPLITPAGEUC + 13) ' Fine Tutti Fuori - AllCenEndBtn.ToolTip = EgtMsg(MSG_SPLITPAGEUC + 14) ' Fine Tutti Centro - AllExtendBtn.ToolTip = EgtMsg(MSG_SPLITPAGEUC + 15) ' Allunga Tutti - AllReduceBtn.ToolTip = EgtMsg(MSG_SPLITPAGEUC + 16) ' Accorc. Tutti - ModifyBtn.Content = EgtMsg(MSG_SPLITPAGEUC + 17) ' Modifica - AutoBtn.Content = EgtMsg(MSG_SPLITPAGEUC + 18) ' Auto - RestartBtn.Content = EgtMsg(MSG_SPLITPAGEUC + 19) ' Restart - BridgesWJBtn.ToolTip = EgtMsg(91214) ' Bridges - BridgesDeleteWJBtn.ToolTip = EgtMsg(91215) ' Remove bridges + OnOffBtn.ToolTip = EgtMsg(90341) ' On/Off + AllOnBtn.ToolTip = EgtMsg(90342) ' Tutti On + AllOffBtn.ToolTip = EgtMsg(90343) ' Tutti Off + CutBtn.ToolTip = EgtMsg(90344) ' Allunga/Accorcia + CutStartBtn.ToolTip = EgtMsg(90345) ' Inizio Allunga/Accorcia + CutEndBtn.ToolTip = EgtMsg(90346) ' Fine Allunga/Accorcia + OutCenStartBtn.ToolTip = EgtMsg(90347) ' Inizio Centro/Fuori + OutCenEndBtn.ToolTip = EgtMsg(90352) ' Fine Centro/Fuori + ModifStartBtn.ToolTip = EgtMsg(90373) ' Inizio Modif. + ModifEndBtn.ToolTip = EgtMsg(90374) ' Fine Modif. + InvertBtn.ToolTip = EgtMsg(90376) ' Inverti + PauseBtn.ToolTip = EgtMsg(90371) ' Pausa On/Off + AllOutStartBtn.ToolTip = EgtMsg(90348) ' Inizi Tutti Fuori + AllCenStartBtn.ToolTip = EgtMsg(90349) ' Inizi Tutti Centro + AllOutEndBtn.ToolTip = EgtMsg(90353) ' Fine Tutti Fuori + AllCenEndBtn.ToolTip = EgtMsg(90354) ' Fine Tutti Centro + AllExtendBtn.ToolTip = EgtMsg(90355) ' Allunga Tutti + AllReduceBtn.ToolTip = EgtMsg(90356) ' Accorc. Tutti + ModifyBtn.Content = EgtMsg(90357) ' Modifica + AutoBtn.Content = EgtMsg(90358) ' Auto + RestartBtn.Content = EgtMsg(90359) ' Restart + BridgesWJBtn.ToolTip = EgtMsg(91214) ' Bridges + BridgesDeleteWJBtn.ToolTip = EgtMsg(91215) ' Remove bridges End Sub Private Sub SplitPageUC_Loaded(sender As Object, e As EventArgs) Handles Me.Loaded @@ -109,7 +109,7 @@ Public Class SplitPageUC ' Se movimento con ventosa, verifico se lama troppo grande If Not m_bByHand And Not m_MainWindow.m_CurrentMachine.IsVacuumMovePossible() Then m_bByHand = True - m_MainWindow.m_CurrentProjectPageUC.SetWarningMessage(EgtMsg(MSG_SPLITPAGEUC + 11)) ' Lama troppo grande per utilizzo ventosa + m_MainWindow.m_CurrentProjectPageUC.SetWarningMessage(EgtMsg(90351)) ' Lama troppo grande per utilizzo ventosa End If ' Verifico se abilitato spostamento finale pezzi e se macchina lo consente m_bEnableOnAuxTab = Not m_bByHand AndAlso @@ -181,7 +181,7 @@ Public Class SplitPageUC If m_bShow Then Dim nPhaseRestart As Integer = m_MainWindow.m_CurrentProjectPageUC.GetProjectNcRestart() If nPhaseRestart = m_nCurrPhase Then - m_MainWindow.m_CurrentProjectPageUC.SetInfoMessage(EgtMsg(MSG_SPLITPAGEUC + 19) & " (" & m_nCurrPhase.ToString() & ")") + m_MainWindow.m_CurrentProjectPageUC.SetInfoMessage(EgtMsg(90359) & " (" & m_nCurrPhase.ToString() & ")") ' Restart Else m_MainWindow.m_CurrentProjectPageUC.ClearMessage() End If @@ -857,7 +857,7 @@ Public Class SplitPageUC End Sub Private Sub AddPauseText(ByRef sName As String) - sName &= " " & EgtMsg(MSG_SPLITPAGEUC + 32) ' Pausa + sName &= " " & EgtMsg(90372) ' Pausa End Sub Private Sub AddTopText(ByRef sName As String) @@ -869,7 +869,7 @@ Public Class SplitPageUC End Sub Private Sub RemovePauseText(ByRef sName As String) - sName = sName.Replace(EgtMsg(MSG_SPLITPAGEUC + 32), "") + sName = sName.Replace(EgtMsg(90372), "") ' Pausa sName = sName.TrimEnd() End Sub @@ -1681,7 +1681,7 @@ Public Class SplitPageUC ' ------------------ INIZIO PREPARAZIONE TASTIERINO VIRTUALE ------------------ If bFirstInd Then ' Dialogo richiesta valore - Dim ValWnd As New EditValueWD(m_MainWindow, "SAW: " & EgtMsg(MSG_SPLITPAGEUC + 35)) ' Allungamento + Dim ValWnd As New EditValueWD(m_MainWindow, "SAW: " & EgtMsg(90375)) ' Allungamento ValWnd.SetVal(dOrigUsal, bLen) If Not ValWnd.ShowDialog() Then Return ' carico il valore letto dal testierino virtuale @@ -1739,7 +1739,7 @@ Public Class SplitPageUC If bFirstMill Then ' ------------------ INIZIO PREPARAZIONE TASTIERINO VIRTUALE ------------------ ' Dialogo richiesta valore - Dim ValWnd As New EditValueWD(m_MainWindow, "MILL: " & EgtMsg(MSG_SPLITPAGEUC + 35)) ' Allungamento + Dim ValWnd As New EditValueWD(m_MainWindow, "MILL: " & EgtMsg(90375)) ' Allungamento ValWnd.SetVal(dOrigUsal, bLen) If Not ValWnd.ShowDialog() Then Return ' carico il valore letto dal testierino virtuale @@ -1777,7 +1777,7 @@ Public Class SplitPageUC EgtGetMachiningParam(MCH_MP.LIPERP, nOriginalPerpDist) EgtGetMachiningParam(MCH_MP.LEADINTYPE, nOriginalLeadInType) ' Dialogo richiesta valori - Dim ModifStartWnd As New ModifStartEndWD(m_MainWindow, "WJ: " & EgtMsg(MSG_SPLITPAGEUC + 33), bOriginalIsLeadIn, nOperId) ' Inizio Modif. + Dim ModifStartWnd As New ModifStartEndWD(m_MainWindow, "WJ: " & EgtMsg(90373), bOriginalIsLeadIn, nOperId) ' Inizio Modif. ModifStartWnd.SetElongation(dOriginalAddLen) ModifStartWnd.SetHole(bOriginalLiHole) ModifStartWnd.SetLiTangDist(nOriginalTangDist) @@ -1860,7 +1860,7 @@ Public Class SplitPageUC ' ------------------ INIZIO PREPARAZIONE TASTIERINO VIRTUALE ------------------ If bFirstInd Then ' Dialogo richiesta valore - Dim ValWnd As New EditValueWD(m_MainWindow, "SAW: " & EgtMsg(MSG_SPLITPAGEUC + 35)) ' Allungamento + Dim ValWnd As New EditValueWD(m_MainWindow, "SAW: " & EgtMsg(90375)) ' Allungamento ValWnd.SetVal(dOrigUeal, bLen) If Not ValWnd.ShowDialog() Then Return dUeal = ValWnd.GetVal(bLen) @@ -1915,7 +1915,7 @@ Public Class SplitPageUC ' ------------------ INIZIO PREPARAZIONE TASTIERINO VIRTUALE ------------------ If bFirstMill Then ' Dialogo richiesta valore - Dim ValWnd As New EditValueWD(m_MainWindow, "MILL: " & EgtMsg(MSG_SPLITPAGEUC + 35)) ' Allungamento + Dim ValWnd As New EditValueWD(m_MainWindow, "MILL: " & EgtMsg(90375)) ' Allungamento ValWnd.SetVal(dOrigUeal, bLen) If Not ValWnd.ShowDialog() Then Return dUeal = ValWnd.GetVal(bLen) @@ -1945,7 +1945,7 @@ Public Class SplitPageUC EgtGetMachiningParam(MCH_MP.LOTANG, nTangDist) EgtGetMachiningParam(MCH_MP.LOPERP, nPerpDist) ' Dialogo richiesta valore - Dim ModifStartWnd As New ModifStartEndWD(m_MainWindow, "WJ: " & EgtMsg(MSG_SPLITPAGEUC + 34), False, nOperId) ' Fine Modif. + Dim ModifStartWnd As New ModifStartEndWD(m_MainWindow, "WJ: " & EgtMsg(90374), False, nOperId) ' Fine Modif. ModifStartWnd.SetElongation(dAddLen) ModifStartWnd.SetLeadOutType(LeadOutType) ModifStartWnd.SetLoTangDist(nTangDist) @@ -2112,7 +2112,7 @@ Public Class SplitPageUC ' Altrimenti, imposto la ripartenza dalla fase corrente Else m_MainWindow.m_CurrentProjectPageUC.SetProjectNcRestart(m_nCurrPhase) - m_MainWindow.m_CurrentProjectPageUC.SetInfoMessage(EgtMsg(MSG_SPLITPAGEUC + 19) & " (" & m_nCurrPhase.ToString() & ")") + m_MainWindow.m_CurrentProjectPageUC.SetInfoMessage(EgtMsg(90359) & " (" & m_nCurrPhase.ToString() & ")") ' Restart End If End Sub diff --git a/CadCuts/VacuumCups.vb b/CadCuts/VacuumCups.vb index 6129754..94e7420 100644 --- a/CadCuts/VacuumCups.vb +++ b/CadCuts/VacuumCups.vb @@ -1,6 +1,4 @@ Imports EgtUILib -Imports System.Text.RegularExpressions -Imports System.Threading Module VacuumCups ' Tipo manipolatore con ventosa (0=assente, 1=dietro, 2=laterale) diff --git a/DirectCuts/ControlsDirectCutUC.xaml b/DirectCuts/ControlsDirectCutUC.xaml index 8241bde..2c65953 100644 --- a/DirectCuts/ControlsDirectCutUC.xaml +++ b/DirectCuts/ControlsDirectCutUC.xaml @@ -29,7 +29,7 @@ @@ -134,7 +134,7 @@ --> @@ -167,7 +167,7 @@ diff --git a/DirectCuts/ControlsDirectCutUC.xaml.vb b/DirectCuts/ControlsDirectCutUC.xaml.vb index 3284fcb..f866662 100644 --- a/DirectCuts/ControlsDirectCutUC.xaml.vb +++ b/DirectCuts/ControlsDirectCutUC.xaml.vb @@ -1,4 +1,5 @@ Imports EgtUILib + Public Class ControlsDirectCutUC ' Dichiarazione delle Page UserControl @@ -97,17 +98,17 @@ Public Class ControlsDirectCutUC m_VacuumMachineButton.SetValue(Grid.RowProperty, 1) ' ManualBtn.Content = EgtMsg(90201) - ManualTxt.Text = EgtMsg(90201) + ManualTxt.Text = EgtMsg(90201) ' Movimento manuale 'SingleCutBtn.Content = EgtMsg(90202) - SingleCutTxt.Text = EgtMsg(90202) + SingleCutTxt.Text = EgtMsg(90202) ' Taglio singolo 'SingleDrillBtn.Content = "Foro singolo" - SingleDrillTxt.Text = EgtMsg(90258) + SingleDrillTxt.Text = EgtMsg(90258) ' Foro singolo 'MultipleCutBtn.Content = EgtMsg(90203) - MultipleCutTxt.Text = EgtMsg(90203) + MultipleCutTxt.Text = EgtMsg(90203) ' Taglio multiplo 'GridCutBtn.Content = EgtMsg(90204) - GridCutTxt.Text = EgtMsg(90204) + GridCutTxt.Text = EgtMsg(90204) ' Taglio griglia 'FlatteningCutBtn.Content = EgtMsg(90206) - FlatteningCutTxt.Text = EgtMsg(90206) + FlatteningCutTxt.Text = EgtMsg(90206) ' Spianatura ' 90261=Squaring SquaringTxt.Text = EgtMsg(90261) ' 90409=Others diff --git a/DirectCuts/ControlsDirectCutUC1.xaml b/DirectCuts/ControlsDirectCutUC1.xaml index 0d020ed..32ce4c7 100644 --- a/DirectCuts/ControlsDirectCutUC1.xaml +++ b/DirectCuts/ControlsDirectCutUC1.xaml @@ -30,7 +30,7 @@ @@ -64,7 +64,7 @@ + Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/> diff --git a/DirectCuts/ControlsDirectCutUC1.xaml.vb b/DirectCuts/ControlsDirectCutUC1.xaml.vb index 45c5c4e..a4ba9a0 100644 --- a/DirectCuts/ControlsDirectCutUC1.xaml.vb +++ b/DirectCuts/ControlsDirectCutUC1.xaml.vb @@ -1,4 +1,5 @@ Imports EgtUILib + Public Class ControlsDirectCutUC1 ' Dichiarazione delle Page UserControl diff --git a/DirectCuts/ControlsMachineButtonUC.xaml b/DirectCuts/ControlsMachineButtonUC.xaml index e0ae147..592253b 100644 --- a/DirectCuts/ControlsMachineButtonUC.xaml +++ b/DirectCuts/ControlsMachineButtonUC.xaml @@ -1,13 +1,13 @@  + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + DataContext="Self" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:OmagCUT="clr-namespace:OmagCUT" + xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib" + mc:Ignorable="d" + d:DesignHeight="597.3" d:DesignWidth="256"> @@ -16,33 +16,33 @@ - + - + @@ -60,7 +60,7 @@ - + diff --git a/DirectCuts/ControlsMachineButtonUC.xaml.vb b/DirectCuts/ControlsMachineButtonUC.xaml.vb index 2e61c07..fd34cee 100644 --- a/DirectCuts/ControlsMachineButtonUC.xaml.vb +++ b/DirectCuts/ControlsMachineButtonUC.xaml.vb @@ -1,7 +1,6 @@ Imports System.Collections.ObjectModel Imports System.ComponentModel Imports EgtUILib -Imports EgtWPFLib Public Class ControlsMachineButtonUC Implements INotifyPropertyChanged diff --git a/DirectCuts/CopyTemplateUC.xaml b/DirectCuts/CopyTemplateUC.xaml index 4552d9c..d8b1eb1 100644 --- a/DirectCuts/CopyTemplateUC.xaml +++ b/DirectCuts/CopyTemplateUC.xaml @@ -1,14 +1,14 @@  + 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="597.3" d:DesignWidth="256"> + + + - - - @@ -35,17 +35,17 @@ - + - + - + - + @@ -56,12 +56,12 @@ - - - - - - + + + + + + @@ -72,21 +72,21 @@ - - - - - - + - + + diff --git a/DirectCuts/CopyTemplateUC.xaml.vb b/DirectCuts/CopyTemplateUC.xaml.vb index b17fe07..4540af8 100644 --- a/DirectCuts/CopyTemplateUC.xaml.vb +++ b/DirectCuts/CopyTemplateUC.xaml.vb @@ -45,18 +45,18 @@ Public Class CopyTemplateUC Private Sub CopyTemplate_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized ' Creo lista modalità di acquisizione punto - m_PointsModeArray(PT_MODE.SAW) = EgtMsg(MSG_DIRECTCUTPAGEUC + 24) - m_PointsModeArray(PT_MODE.LASER) = EgtMsg(MSG_DIRECTCUTPAGEUC + 12) - m_PointsModeArray(PT_MODE.DRAW) = EgtMsg(MSG_DIRECTCUTPAGEUC + 25) + m_PointsModeArray(PT_MODE.SAW) = EgtMsg(90224) ' Lama + m_PointsModeArray(PT_MODE.LASER) = EgtMsg(90212) ' Laser + m_PointsModeArray(PT_MODE.DRAW) = EgtMsg(90225) ' Disegno ' la associo alla combobox PointModeCmBx.ItemsSource = m_PointsModeArray - Point1Btn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 10) - LineBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 50) - ArcBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 51) - RemoveBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 52) - CloseBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 53) - SaveBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 54) + Point1Btn.ToolTip = EgtMsg(90210) ' Acquisisci P1 + LineBtn.ToolTip = EgtMsg(90250) ' Linea + ArcBtn.ToolTip = EgtMsg(90251) ' Arco + RemoveBtn.ToolTip = EgtMsg(90252) ' Rimuovi + CloseBtn.ToolTip = EgtMsg(90253) ' Chiudi + SaveBtn.ToolTip = EgtMsg(90254) ' Salva End Sub Private Sub CopyTemplate_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded diff --git a/DirectCuts/CustomGridUC.xaml b/DirectCuts/CustomGridUC.xaml index 22e874f..a06769f 100644 --- a/DirectCuts/CustomGridUC.xaml +++ b/DirectCuts/CustomGridUC.xaml @@ -35,9 +35,9 @@ Width="40" Height="40" HorizontalAlignment="Left" Margin="2,0,0,0"/> - - - @@ -229,30 +228,30 @@ - + - + - + - + - + @@ -264,15 +263,15 @@ - + - - + + diff --git a/DirectCuts/DirectCutPageUC.xaml.vb b/DirectCuts/DirectCutPageUC.xaml.vb index d5cb01a..d7c8c65 100644 --- a/DirectCuts/DirectCutPageUC.xaml.vb +++ b/DirectCuts/DirectCutPageUC.xaml.vb @@ -1,5 +1,4 @@ Imports EgtUILib -Imports EgtWPFLib Public Class DirectCutPageUC diff --git a/DirectCuts/FlatteningCut.xaml b/DirectCuts/FlatteningCut.xaml index 081cd1f..e749155 100644 --- a/DirectCuts/FlatteningCut.xaml +++ b/DirectCuts/FlatteningCut.xaml @@ -1,191 +1,193 @@  + 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"> - - + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - + + + - - - + + + - + - + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - - - + + + + + + + - - + + - - + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + diff --git a/DirectCuts/FlatteningCut.xaml.vb b/DirectCuts/FlatteningCut.xaml.vb index b3f7634..e9e1dcf 100644 --- a/DirectCuts/FlatteningCut.xaml.vb +++ b/DirectCuts/FlatteningCut.xaml.vb @@ -1,5 +1,4 @@ -Imports System.Reflection -Imports EgtUILib +Imports EgtUILib Imports EgtUILib.EgtInterface Imports OmagCUT.MainWindow @@ -84,34 +83,34 @@ Public Class FlatteningCut ' Per abilitare la spianatura con la FRESA deve essere imposatato a TRUE il flag "Usa Fresa" nella pagina MACCHINA (campo INCISIONI) Private Sub FlatteningCut_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized ' Creo lista modalità di acquisizione punto - m_PointsModeArray(PT_MODE.SAW) = EgtMsg(MSG_DIRECTCUTPAGEUC + 24) - m_PointsModeArray(PT_MODE.LASER) = EgtMsg(MSG_DIRECTCUTPAGEUC + 12) - m_PointsModeArray(PT_MODE.DRAW) = EgtMsg(MSG_DIRECTCUTPAGEUC + 25) + m_PointsModeArray(PT_MODE.SAW) = EgtMsg(90224) ' Lama + m_PointsModeArray(PT_MODE.LASER) = EgtMsg(90212) ' Laser + m_PointsModeArray(PT_MODE.DRAW) = EgtMsg(90225) ' Disegno ' la associo alla combobox PointModeCmBx.ItemsSource = m_PointsModeArray ' Creo lista tipo lavorazione - m_TypeArray(MACH_TYPE.ZIGZAG) = EgtMsg(MSG_COMBOBOXPARAM + 38) - m_TypeArray(MACH_TYPE.ONEWAY) = EgtMsg(MSG_COMBOBOXPARAM + 39) - m_TypeArray(MACH_TYPE.SPIRAL) = EgtMsg(MSG_COMBOBOXPARAM + 51) + m_TypeArray(MACH_TYPE.ZIGZAG) = EgtMsg(90838) ' ZigZag + m_TypeArray(MACH_TYPE.ONEWAY) = EgtMsg(90839) ' OneWay + m_TypeArray(MACH_TYPE.SPIRAL) = EgtMsg(90851) ' Spirale ' la associo alla combobox TypeCmBx.ItemsSource = m_TypeArray ' assegno messaggi - Point1Btn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 10) - Point2Btn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 11) - DepthTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 13) - LenghtTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 14) - DirectionTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 15) - WidthTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 26) - OverlapTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 27) - ZReleasedTxBl.Text = EgtMsg(91235) 'Z Svincolo - SideTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 23) - RotLockTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 29) - ChainedPathTxBl.Text = EgtMsg(91236) 'Chained path - SimulBtn.ToolTip = EgtMsg(MSG_CADCUTPAGEUC + 1) - OkBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 30) + Point1Btn.ToolTip = EgtMsg(90210) ' Acquisisci P1 + Point2Btn.ToolTip = EgtMsg(90211) ' Acquisisci P2 + DepthTxBl.Text = EgtMsg(90213) ' Affondamento + LenghtTxBl.Text = EgtMsg(90214) ' Lunghezza + DirectionTxBl.Text = EgtMsg(90215) ' Direzione + WidthTxBl.Text = EgtMsg(90226) ' Larghezza + OverlapTxBl.Text = EgtMsg(90227) ' Sovrapposizione + ZReleasedTxBl.Text = EgtMsg(91235) ' Z Svincolo + SideTxBl.Text = EgtMsg(90223) ' Tagli lato motore + RotLockTxBl.Text = EgtMsg(90229) ' Blocca Asse C + ChainedPathTxBl.Text = EgtMsg(91236) ' Chained path + SimulBtn.ToolTip = EgtMsg(90301) ' Simula + OkBtn.ToolTip = EgtMsg(90230) ' Esegui ' tipo di utensile in uso per la lavorazione - m_ToolsArray(TOOL.SAW) = EgtMsg(MSG_DIRECTCUTPAGEUC + 24) - m_ToolsArray(TOOL.MILL) = EgtMsg(91237) 'Mill + m_ToolsArray(TOOL.SAW) = EgtMsg(90224) ' Lama + m_ToolsArray(TOOL.MILL) = EgtMsg(91237) ' Mill SelToolCmBx.ItemsSource = m_ToolsArray ' Carico i dati dell'ultimo taglio m_dDepth = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_FLATT_DEPTH, m_dDepth, m_MainWindow.GetIniFile()) diff --git a/DirectCuts/GridCut.xaml b/DirectCuts/GridCut.xaml index c953a7f..c299a8c 100644 --- a/DirectCuts/GridCut.xaml +++ b/DirectCuts/GridCut.xaml @@ -45,29 +45,29 @@ - - + + Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/> + Style="{DynamicResource OmagCut_CalculatorTextBox}"/> + Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/> + Style="{DynamicResource OmagCut_CalculatorTextBox}"/> + Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/> + Style="{DynamicResource OmagCut_CalculatorTextBox}"/> @@ -86,24 +86,24 @@ + Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/> + Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/> + Style="{DynamicResource OmagCut_CalculatorTextBox}"/> + Style="{DynamicResource OmagCut_CalculatorTextBox}" /> + Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/> + Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/> + Style="{DynamicResource OmagCut_CalculatorTextBox}"/> + Style="{DynamicResource OmagCut_CalculatorTextBox}" /> @@ -117,7 +117,7 @@ + Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/> @@ -175,8 +175,8 @@ --> - + @@ -187,13 +187,13 @@ + Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/> + Style="{DynamicResource OmagCut_CalculatorTextBox}"/> + Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/> + Style="{DynamicResource OmagCut_CalculatorTextBox}"/> @@ -204,13 +204,13 @@ diff --git a/DirectCuts/GridCut.xaml.vb b/DirectCuts/GridCut.xaml.vb index 782a766..3528c57 100644 --- a/DirectCuts/GridCut.xaml.vb +++ b/DirectCuts/GridCut.xaml.vb @@ -66,25 +66,25 @@ Public Class GridCut Private Sub GridCut_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized ' Creo lista modalità di acquisizione punto - m_PointsModeArray(PT_MODE.SAW) = EgtMsg(MSG_DIRECTCUTPAGEUC + 24) - m_PointsModeArray(PT_MODE.LASER) = EgtMsg(MSG_DIRECTCUTPAGEUC + 12) - m_PointsModeArray(PT_MODE.DRAW) = EgtMsg(MSG_DIRECTCUTPAGEUC + 25) + m_PointsModeArray(PT_MODE.SAW) = EgtMsg(90224) ' Lama + m_PointsModeArray(PT_MODE.LASER) = EgtMsg(90212) ' Laser + m_PointsModeArray(PT_MODE.DRAW) = EgtMsg(90225) ' Disegno ' la associo alla combobox PointModeCmBx.ItemsSource = m_PointsModeArray ' assegno messaggi - Point1Btn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 10) - Point2Btn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 11) - DepthTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 13) - DirectionTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 15) - SideAngleTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 16) - NumPzXTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 19) - DimPzXTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 20) - NumPzYTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 21) - DimPzYTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 22) - SideTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 23) - SimulBtn.ToolTip = EgtMsg(MSG_CADCUTPAGEUC + 1) - OkBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 30) - GridCutTxt.Text = EgtMsg(90264) + Point1Btn.ToolTip = EgtMsg(90210) ' Acquisisci P1 + Point2Btn.ToolTip = EgtMsg(90211) ' Acquisisci P2 + DepthTxBl.Text = EgtMsg(90213) ' Affondamento + DirectionTxBl.Text = EgtMsg(90215) ' Direzione + SideAngleTxBl.Text = EgtMsg(90216) ' Inclinazione + NumPzXTxBl.Text = EgtMsg(90219) ' Numero X + DimPzXTxBl.Text = EgtMsg(90220) ' Dimensioni X + NumPzYTxBl.Text = EgtMsg(90221) ' Numero Y + DimPzYTxBl.Text = EgtMsg(90222) ' Dimensioni Y + SideTxBl.Text = EgtMsg(90223) ' Taglia lato motore + SimulBtn.ToolTip = EgtMsg(90301) ' Simula + OkBtn.ToolTip = EgtMsg(90230) ' Esegui + GridCutTxt.Text = EgtMsg(90264) ' Custom Grid ' Carico i dati dell'ultimo taglio m_dDepth = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_GRID_DEPTH, m_dDepth, m_MainWindow.GetIniFile()) m_dAngO = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_GRID_ANGH, m_dAngO, m_MainWindow.GetIniFile()) diff --git a/DirectCuts/MachineButtonsUC.xaml b/DirectCuts/MachineButtonsUC.xaml index d3e84fb..8e8d221 100644 --- a/DirectCuts/MachineButtonsUC.xaml +++ b/DirectCuts/MachineButtonsUC.xaml @@ -1,10 +1,10 @@  + 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"> @@ -20,52 +20,52 @@ - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + + - + diff --git a/DirectCuts/ManualAxesMoveUC.xaml b/DirectCuts/ManualAxesMoveUC.xaml index 886932d..5daaa2f 100644 --- a/DirectCuts/ManualAxesMoveUC.xaml +++ b/DirectCuts/ManualAxesMoveUC.xaml @@ -1,11 +1,11 @@  + 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"> @@ -26,7 +26,7 @@ + Style="{DynamicResource OmagCut_BlueIconToggleButton}"> @@ -41,52 +41,60 @@ + Style="{DynamicResource OmagCut_SingleUpperCaseCharacterTextBlock}" /> + Style="{DynamicResource OmagCut_CalculatorTextBox}"/> + Style="{DynamicResource OmagCut_SingleUpperCaseCharacterTextBlock}" /> + Style="{DynamicResource OmagCut_CalculatorTextBox}"/> - - + - + diff --git a/DirectCuts/MultipleCut.xaml b/DirectCuts/MultipleCut.xaml index c3e85c9..a2c2c71 100644 --- a/DirectCuts/MultipleCut.xaml +++ b/DirectCuts/MultipleCut.xaml @@ -1,11 +1,10 @@  + 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"> @@ -35,164 +34,164 @@ - - - + + + - - - + + + - + - + - + + Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/> + Style="{DynamicResource OmagCut_CalculatorTextBox}"/> + Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/> + Style="{DynamicResource OmagCut_CalculatorTextBox}"/> + Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/> + Style="{DynamicResource OmagCut_CalculatorTextBox}"/> + Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/> + Style="{DynamicResource OmagCut_CalculatorTextBox}"/> - - - - - - - - - - - - + + + + + + + + + + + + - + - - + + - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - + - + - + Style="{DynamicResource OmagCut_CalculatorTextBox}"/> + - + - + Style="{DynamicResource OmagCut_CalculatorTextBox}"/> + - + - + Style="{DynamicResource OmagCut_CalculatorTextBox}"/> + - - - + + + - + - + Style="{DynamicResource OmagCut_CalculatorTextBox}"/> + - + - + Style="{DynamicResource OmagCut_CalculatorTextBox}"/> + - + - + Style="{DynamicResource OmagCut_CalculatorTextBox}"/> + - + - + Style="{DynamicResource OmagCut_CalculatorTextBox}"/> + - + - + Style="{DynamicResource OmagCut_CalculatorTextBox}"/> + - + - - - + Style="{DynamicResource OmagCut_CalculatorTextBox}"/> + + + - + Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/> + @@ -245,13 +245,13 @@ + Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/> + Style="{DynamicResource OmagCut_CalculatorTextBox}"/> + Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/> + Style="{DynamicResource OmagCut_CalculatorTextBox}"/> @@ -261,16 +261,16 @@ - - - - + + + + diff --git a/DirectCuts/MultipleCut.xaml.vb b/DirectCuts/MultipleCut.xaml.vb index 7e79fdd..082c371 100644 --- a/DirectCuts/MultipleCut.xaml.vb +++ b/DirectCuts/MultipleCut.xaml.vb @@ -58,23 +58,23 @@ Public Class MultipleCut Private Sub MultipleCut_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized ' Creo lista modalità di acquisizione punto - m_PointsModeArray(PT_MODE.SAW) = EgtMsg(MSG_DIRECTCUTPAGEUC + 24) - m_PointsModeArray(PT_MODE.LASER) = EgtMsg(MSG_DIRECTCUTPAGEUC + 12) - m_PointsModeArray(PT_MODE.DRAW) = EgtMsg(MSG_DIRECTCUTPAGEUC + 25) + m_PointsModeArray(PT_MODE.SAW) = EgtMsg(90224) ' Lama + m_PointsModeArray(PT_MODE.LASER) = EgtMsg(90212) ' Laser + m_PointsModeArray(PT_MODE.DRAW) = EgtMsg(90225) ' Disegno ' la associo alla combobox PointModeCmBx.ItemsSource = m_PointsModeArray ' assegno messaggi - Point1Btn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 10) - Point2Btn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 11) - DepthTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 13) - LenghtTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 14) - DirectionTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 15) - SideAngleTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 16) - NumPzTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 17) - DimPzTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 18) - SideTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 23) - SimulBtn.ToolTip = EgtMsg(MSG_CADCUTPAGEUC + 1) - OkBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 30) + Point1Btn.ToolTip = EgtMsg(90210) ' Acquisisci P1 + Point2Btn.ToolTip = EgtMsg(90211) ' Acquisisci P2 + DepthTxBl.Text = EgtMsg(90213) ' Affondamento + LenghtTxBl.Text = EgtMsg(90214) ' Lunghezza + DirectionTxBl.Text = EgtMsg(90215) ' Direzione + SideAngleTxBl.Text = EgtMsg(90216) ' Inclinazione + NumPzTxBl.Text = EgtMsg(90217) ' Numero + DimPzTxBl.Text = EgtMsg(90218) ' Dimensioni + SideTxBl.Text = EgtMsg(90223) ' Tagli lato motore + SimulBtn.ToolTip = EgtMsg(90301) ' Simula + OkBtn.ToolTip = EgtMsg(90230) ' Esegui Num1TxBl.Text = "1" Num2TxBl.Text = "2" Num3TxBl.Text = "3" diff --git a/DirectCuts/Polishing.xaml b/DirectCuts/Polishing.xaml index 79a631d..b15a861 100644 --- a/DirectCuts/Polishing.xaml +++ b/DirectCuts/Polishing.xaml @@ -1,11 +1,10 @@  + 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"> @@ -36,13 +35,12 @@ - - + - + @@ -63,16 +61,16 @@ - - - - + + + + diff --git a/DirectCuts/Polishing.xaml.vb b/DirectCuts/Polishing.xaml.vb index bde48c5..59b4cdb 100644 --- a/DirectCuts/Polishing.xaml.vb +++ b/DirectCuts/Polishing.xaml.vb @@ -25,8 +25,8 @@ Public Class Polishing Private Sub Polishing_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized ' assegno messaggi - SimulBtn.ToolTip = EgtMsg(MSG_CADCUTPAGEUC + 1) - OkBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 30) + SimulBtn.ToolTip = EgtMsg(90301) ' Simula + OkBtn.ToolTip = EgtMsg(90230) ' Esegui End Sub Private Sub Polishing_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded diff --git a/DirectCuts/SawTestUC.xaml b/DirectCuts/SawTestUC.xaml index 9a92724..07f32f9 100644 --- a/DirectCuts/SawTestUC.xaml +++ b/DirectCuts/SawTestUC.xaml @@ -1,12 +1,11 @@  - + 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"> + @@ -37,46 +36,46 @@ - - - + + + - - - + + + - + - + - + + Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/> - + Style="{DynamicResource OmagCut_CalculatorTextBox}"/> + + Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/> + Style="{DynamicResource OmagCut_CalculatorTextBox}"/> + Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/> + Style="{DynamicResource OmagCut_CalculatorTextBox}"/> + Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/> + Style="{DynamicResource OmagCut_CalculatorTextBox}"/> @@ -85,17 +84,17 @@ - - - - - + + + + + diff --git a/DirectCuts/SawTestUC.xaml.vb b/DirectCuts/SawTestUC.xaml.vb index 2f06862..b0300ad 100644 --- a/DirectCuts/SawTestUC.xaml.vb +++ b/DirectCuts/SawTestUC.xaml.vb @@ -53,20 +53,20 @@ Public Class SawTestUC Private Sub SawTest_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized ' Creo lista modalità di acquisizione punto - m_PointsModeArray(PT_MODE.SAW) = EgtMsg(MSG_DIRECTCUTPAGEUC + 24) - m_PointsModeArray(PT_MODE.LASER) = EgtMsg(MSG_DIRECTCUTPAGEUC + 12) - m_PointsModeArray(PT_MODE.DRAW) = EgtMsg(MSG_DIRECTCUTPAGEUC + 25) + m_PointsModeArray(PT_MODE.SAW) = EgtMsg(90224) ' Lama + m_PointsModeArray(PT_MODE.LASER) = EgtMsg(90212) ' Laser + m_PointsModeArray(PT_MODE.DRAW) = EgtMsg(90225) ' Disegno ' la associo alla combobox PointModeCmBx.ItemsSource = m_PointsModeArray ' assegno messaggi - Point1Btn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 10) - Point2Btn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 11) - DepthTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 13) - LenghtTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 14) - DirectionTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 15) - OffsetTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 28) - SimulBtn.ToolTip = EgtMsg(MSG_CADCUTPAGEUC + 1) - OkBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 30) + Point1Btn.ToolTip = EgtMsg(90210) ' Acquisci P1 + Point2Btn.ToolTip = EgtMsg(90211) ' Acquisici P2 + DepthTxBl.Text = EgtMsg(90213) ' Affondamento + LenghtTxBl.Text = EgtMsg(90214) ' Lunghezza + DirectionTxBl.Text = EgtMsg(90215) ' Direzione + OffsetTxBl.Text = EgtMsg(90228) ' Offset + SimulBtn.ToolTip = EgtMsg(90301) ' Simula + OkBtn.ToolTip = EgtMsg(90230) ' Esegui ' Carico i dati dell'ultimo test m_dDepth = GetPrivateProfileDouble( S_DIRECTCUTS, K_DC_TEST_DEPTH, m_dDepth, m_MainWindow.GetIniFile()) m_dLen = GetPrivateProfileDouble( S_DIRECTCUTS, K_DC_TEST_LENGTH, m_dLen, m_MainWindow.GetIniFile()) diff --git a/DirectCuts/SingleCutAuto.xaml.vb b/DirectCuts/SingleCutAuto.xaml.vb index 52f7c61..3e0a1a9 100644 --- a/DirectCuts/SingleCutAuto.xaml.vb +++ b/DirectCuts/SingleCutAuto.xaml.vb @@ -1,4 +1,5 @@ Imports EgtUILib + Public Class SingleCutAuto ' Riferimenti a pagine Private m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow) @@ -86,19 +87,19 @@ Public Class SingleCutAuto Private Sub SingleCut_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized ' Creo lista modalità di acquisizione punto - m_PointsModeArray(PT_MODE.SAW) = EgtMsg(MSG_DIRECTCUTPAGEUC + 24) - m_PointsModeArray(PT_MODE.LASER) = EgtMsg(MSG_DIRECTCUTPAGEUC + 12) - m_PointsModeArray(PT_MODE.DRAW) = EgtMsg(MSG_DIRECTCUTPAGEUC + 25) + m_PointsModeArray(PT_MODE.SAW) = EgtMsg(90224) ' Lama + m_PointsModeArray(PT_MODE.LASER) = EgtMsg(90212) ' Laser + m_PointsModeArray(PT_MODE.DRAW) = EgtMsg(90225) ' Disegno ' la associo alla combobox PointModeCmBx.ItemsSource = m_PointsModeArray ' Assegno messaggi - Point1Btn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 10) - Point2Btn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 11) - DiamLamaTxBl.Text = "Diamtero lama" - ThickLamaTxBl.Text = "Spessore lama" - ThickMatTxBl.Text = "Spessore materiale" - SimulBtn.Content = EgtMsg(MSG_CADCUTPAGEUC + 1) - OkBtn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 30) + Point1Btn.Content = EgtMsg(90210) ' Acquisci P1 + Point2Btn.Content = EgtMsg(90211) ' Acquisci P2 + DiamLamaTxBl.Text = EgtMsg(90266) ' Diamtero lama + ThickLamaTxBl.Text = EgtMsg(90267) ' Spessore lama + ThickMatTxBl.Text = EgtMsg(90268) ' Spessore materiale + SimulBtn.Content = EgtMsg(90301) ' Simula + OkBtn.Content = EgtMsg(90230) ' Esegui m_RawHeight = GetPrivateProfileDouble(S_RAWPART, K_RAWHEIGHT, 30, m_MainWindow.GetIniFile()) ThickMatTxBx.Text = LenToString(m_RawHeight, 2) @@ -345,7 +346,7 @@ Public Class SingleCutAuto m_CurrProjPage.ClearMessage() Else OkBtn.IsEnabled = False - m_CurrProjPage.SetErrorMessage(EgtMsg(MSG_RAWPARTPAGEUC + 47)) ' Errore nella posizione o dimensione del grezzo + m_CurrProjPage.SetErrorMessage(EgtMsg(90547)) ' Errore nella posizione o dimensione del grezzo End If Return True End Function @@ -741,7 +742,7 @@ Public Class SingleCutAuto Dim bOk As Boolean = EgtGenerate(sCncPath, "OmagCut ver." & m_MainWindow.GetVersion()) ' Se errore in generazione, segnalo l'errore ed esco If Not bOk Then - m_CurrProjPage.SetErrorMessage(EgtMsg(90314)) 'Errore nella generazione del programma CN + m_CurrProjPage.SetErrorMessage(EgtMsg(90314)) ' Errore nella generazione del programma CN Return End If ' Download programma (eventuali errori sono segnalati dalla funzione) diff --git a/DirectCuts/SingleCutUC.xaml b/DirectCuts/SingleCutUC.xaml index 02f7838..e8489d0 100644 --- a/DirectCuts/SingleCutUC.xaml +++ b/DirectCuts/SingleCutUC.xaml @@ -1,14 +1,14 @@  - + 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"> + - + @@ -38,54 +38,56 @@ - + Style="{DynamicResource OmagCut_YellowIconToggleButton}"> + - + - + - + - + + Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/> - + Style="{DynamicResource OmagCut_CalculatorTextBox}"/> + + Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/> - + Style="{DynamicResource OmagCut_CalculatorTextBox}"/> + + Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/> - + Style="{DynamicResource OmagCut_CalculatorTextBox}"/> + + Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/> + Style="{DynamicResource OmagCut_CalculatorTextBox}"/> + Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/> + Style="{DynamicResource OmagCut_CalculatorTextBox}"/> - + Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/> + @@ -95,13 +97,13 @@ + Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/> + Style="{DynamicResource OmagCut_CalculatorTextBox}"/> + Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/> + Style="{DynamicResource OmagCut_CalculatorTextBox}"/> @@ -112,13 +114,13 @@ diff --git a/DirectCuts/SingleCutUC.xaml.vb b/DirectCuts/SingleCutUC.xaml.vb index 4519fbd..ac245a2 100644 --- a/DirectCuts/SingleCutUC.xaml.vb +++ b/DirectCuts/SingleCutUC.xaml.vb @@ -57,22 +57,22 @@ Public Class SingleCutUC Private Sub SingleCut_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized ' Creo lista modalità di acquisizione punto - m_PointsModeArray(PT_MODE.SAW) = EgtMsg(MSG_DIRECTCUTPAGEUC + 24) - m_PointsModeArray(PT_MODE.LASER) = EgtMsg(MSG_DIRECTCUTPAGEUC + 12) - m_PointsModeArray(PT_MODE.DRAW) = EgtMsg(MSG_DIRECTCUTPAGEUC + 25) + m_PointsModeArray(PT_MODE.SAW) = EgtMsg(90224) ' Lama + m_PointsModeArray(PT_MODE.LASER) = EgtMsg(90212) ' Laser + m_PointsModeArray(PT_MODE.DRAW) = EgtMsg(90225) ' Disegno ' la associo alla combobox PointModeCmBx.ItemsSource = m_PointsModeArray ' Assegno messaggi - Point1Btn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 10) - Point2Btn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 11) - DepthTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 13) - LenghtTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 14) - DirectionTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 15) - SideAngleTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 16) - OffsetTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 28) - SawThChBl.Text = EgtMsg(90232) ' Spessore lama - SimulBtn.ToolTip = EgtMsg(MSG_CADCUTPAGEUC + 1) - OkBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 30) + Point1Btn.ToolTip = EgtMsg(90210) ' Acquisci P1 + Point2Btn.ToolTip = EgtMsg(90211) ' Acquisci P2 + DepthTxBl.Text = EgtMsg(90213) ' Affondamento + LenghtTxBl.Text = EgtMsg(90214) ' Lunghezza + DirectionTxBl.Text = EgtMsg(90215) ' Direzione + SideAngleTxBl.Text = EgtMsg(90216) ' Inclinazione + OffsetTxBl.Text = EgtMsg(90228) ' Offset + SawThChBl.Text = EgtMsg(90232) ' Spessore lama + SimulBtn.ToolTip = EgtMsg(90301) ' Simula + OkBtn.ToolTip = EgtMsg(90230) ' Esegui ' Carico i dati dell'ultimo taglio m_dDepth = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_SING_DEPTH, m_dDepth, m_MainWindow.GetIniFile()) m_dLen = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_SING_LENGTH, m_dLen, m_MainWindow.GetIniFile()) diff --git a/DirectCuts/SingleDrillUC.xaml b/DirectCuts/SingleDrillUC.xaml index 8a72019..e44d040 100644 --- a/DirectCuts/SingleDrillUC.xaml +++ b/DirectCuts/SingleDrillUC.xaml @@ -1,97 +1,96 @@  + 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"> - - + + - - + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - + + + - + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - - - + + + + + + - + + + + - + + + diff --git a/DirectCuts/SingleDrillUC.xaml.vb b/DirectCuts/SingleDrillUC.xaml.vb index 3f2e53b..62b3fbd 100644 --- a/DirectCuts/SingleDrillUC.xaml.vb +++ b/DirectCuts/SingleDrillUC.xaml.vb @@ -1,6 +1,6 @@ Imports EgtUILib Imports OmagCUT.MainWindow -Imports System.Collections.ObjectModel + Public Class SingleDrillUC ' Riferimenti a pagine Private m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow) @@ -58,16 +58,16 @@ Public Class SingleDrillUC m_CurrentMachine = m_MainWindow.m_CurrentMachine ' Creo lista modalità di acquisizione punto - m_PointsModeArray(PT_MODE.DRILL) = EgtMsg(90752) - m_PointsModeArray(PT_MODE.LASER) = EgtMsg(MSG_DIRECTCUTPAGEUC + 12) - m_PointsModeArray(PT_MODE.DRAW) = EgtMsg(MSG_DIRECTCUTPAGEUC + 25) + m_PointsModeArray(PT_MODE.DRILL) = EgtMsg(90752) ' Foretto + m_PointsModeArray(PT_MODE.LASER) = EgtMsg(90212) ' Laser + m_PointsModeArray(PT_MODE.DRAW) = EgtMsg(90225) ' Disegno ' la associo alla combobox PointModeCmBx.ItemsSource = m_PointsModeArray ' Assegno messaggi - Point1Btn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 10) - SimulBtn.ToolTip = EgtMsg(MSG_CADCUTPAGEUC + 1) - OkBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 30) + Point1Btn.ToolTip = EgtMsg(90210) ' Acquisici P1 + SimulBtn.ToolTip = EgtMsg(90301) ' Simula + OkBtn.ToolTip = EgtMsg(90230) ' Esegui End Sub Private Sub SingleDrill_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded diff --git a/DirectCuts/SquaringUC.xaml b/DirectCuts/SquaringUC.xaml index e7e1540..fbe1521 100644 --- a/DirectCuts/SquaringUC.xaml +++ b/DirectCuts/SquaringUC.xaml @@ -1,11 +1,10 @@  + 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"> @@ -60,14 +59,14 @@ Style="{StaticResource OmagCut_CalculatorTextBox}"/>--> + Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/> + Style="{DynamicResource OmagCut_CalculatorTextBox}"/> + Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/> + Style="{DynamicResource OmagCut_CalculatorTextBox}"/> - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - + - - + + - - + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - + + - - - + + - + + + + + + + + + + + - - - - - - - - - + + + + + - + diff --git a/DrawImport/AlzFrontUC.xaml.vb b/DrawImport/AlzFrontUC.xaml.vb index aac72d5..148d45e 100644 --- a/DrawImport/AlzFrontUC.xaml.vb +++ b/DrawImport/AlzFrontUC.xaml.vb @@ -1,6 +1,4 @@ -Imports System.Globalization -Imports EgtUILib -Imports EgtWPFLib +Imports EgtUILib Public Class AlzFrontUC Private Const NUM_VAR As Integer = 10 @@ -76,9 +74,9 @@ Public Class AlzFrontUC m_MainWindow.m_DrawPageUC.DripCutBtn.IsEnabled = False ' nome dei parametri condivisi - Parameter1TxBl.Text = EgtMsg(91134) - Parameter2TxBl.Text = EgtMsg(91135) - Parameter5TxBl.Text = EgtMsg(91136) + Parameter1TxBl.Text = EgtMsg(91134) ' Altezza + Parameter2TxBl.Text = EgtMsg(91135) ' Delta angolo + Parameter5TxBl.Text = EgtMsg(91136) ' Spessore EgtZoom(ZM.ALL) End Sub @@ -195,10 +193,10 @@ Public Class AlzFrontUC If LoopId <> GDB_ID.NULL Then If m_nCount = 0 Then If m_CallingPage = MainWindow.Pages.Draw Then - m_MainWindow.m_DrawPageUC.MessageTxBx.Text = EgtMsg(MSG_DRAWPAGEUC + 7) ' Non ci sono lati modificabili + m_MainWindow.m_DrawPageUC.MessageTxBx.Text = EgtMsg(90387) ' Non ci sono lati modificabili m_MainWindow.m_DrawPageUC.MessageBrd.Background = Application.Current.FindResource("OmagCut_Yellow") Else - m_MainWindow.m_ImportPageUC.MessageTxBx.Text = EgtMsg(MSG_DRAWPAGEUC + 7) ' Non ci sono lati modificabili + m_MainWindow.m_ImportPageUC.MessageTxBx.Text = EgtMsg(90387) ' Non ci sono lati modificabili m_MainWindow.m_ImportPageUC.MessageBrd.Background = Application.Current.FindResource("OmagCut_Yellow") End If Else diff --git a/DrawImport/CompoCsvData.xaml b/DrawImport/CompoCsvData.xaml index 8e62c36..86a480a 100644 --- a/DrawImport/CompoCsvData.xaml +++ b/DrawImport/CompoCsvData.xaml @@ -1,13 +1,13 @@  - + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib" + FontFamily="{DynamicResource OmagCut_Font}" + ResizeMode="NoResize" WindowStyle="None" AllowsTransparency="True" Background="Transparent" + Title="ChooseMachining" Height="276.5" Width="426.5"> + - + @@ -27,19 +27,19 @@ + Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" HorizontalAlignment="Left"/> + Style="{DynamicResource OmagCut_KeyboardTextBox}"/> + Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" HorizontalAlignment="Left"/> + Style="{DynamicResource OmagCut_KeyboardTextBox}"/> + Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" HorizontalAlignment="Left"/> + Style="{DynamicResource OmagCut_KeyboardTextBox}"/> @@ -50,13 +50,15 @@ - - diff --git a/DrawImport/CompoCsvData.xaml.vb b/DrawImport/CompoCsvData.xaml.vb index 73daced..0350afe 100644 --- a/DrawImport/CompoCsvData.xaml.vb +++ b/DrawImport/CompoCsvData.xaml.vb @@ -1,5 +1,4 @@ -Imports System.Collections.ObjectModel -Imports EgtUILib +Imports EgtUILib Public Class CompoCsvData diff --git a/DrawImport/CompoDimensionUC.xaml b/DrawImport/CompoDimensionUC.xaml index 4032cd6..564ade5 100644 --- a/DrawImport/CompoDimensionUC.xaml +++ b/DrawImport/CompoDimensionUC.xaml @@ -1,11 +1,11 @@  + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + mc:Ignorable="d" + d:DesignHeight="597.1" d:DesignWidth="255.9"> @@ -26,54 +26,54 @@ - + + Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/> + Style="{DynamicResource OmagCut_CalculatorTextBox}"/> + Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/> + Style="{DynamicResource OmagCut_CalculatorTextBox}"/> + Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/> + Style="{DynamicResource OmagCut_CalculatorTextBox}"/> + Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/> + Style="{DynamicResource OmagCut_CalculatorTextBox}"/> + Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/> + Style="{DynamicResource OmagCut_CalculatorTextBox}"/> + Style="{DynamicResource OmagCut_CalculatorTextBox}"/> + Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/> + Style="{DynamicResource OmagCut_CalculatorTextBox}"/> + Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/> + Style="{DynamicResource OmagCut_CalculatorTextBox}"/> + Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/> + Style="{DynamicResource OmagCut_CalculatorTextBox}"/> + Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/> + Style="{DynamicResource OmagCut_CalculatorTextBox}"/> - + - diff --git a/DrawImport/CompoTrfData.xaml.vb b/DrawImport/CompoTrfData.xaml.vb index a85da58..bfcedaa 100644 --- a/DrawImport/CompoTrfData.xaml.vb +++ b/DrawImport/CompoTrfData.xaml.vb @@ -1,5 +1,4 @@ -Imports System.Collections.ObjectModel -Imports EgtUILib +Imports EgtUILib Public Class CompoTrfData @@ -14,12 +13,12 @@ Public Class CompoTrfData Private Sub CompoTrfData_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized Me.Top = Owner.Top + Owner.Height / 2 - Me.Height / 2 Me.Left = Owner.Left + Owner.Width / 2 - Me.Width / 2 - OrdCodeTxBl.Text = EgtMsg(MSG_DRAWPAGEUC + 10) 'Order Code - OrdDescTxBl.Text = EgtMsg(MSG_DRAWPAGEUC + 11) 'Order Description - PartCodeTxBl.Text = EgtMsg(MSG_DRAWPAGEUC + 16) 'Part Code - MatCodeTxBl.Text = EgtMsg(MSG_DRAWPAGEUC + 12) 'Material Code - SurfCodeTxBl.Text = EgtMsg(MSG_DRAWPAGEUC + 13) 'Surface Code - ThicknessTxBl.Text = EgtMsg(MSG_DRAWPAGEUC + 14) 'Thickness + OrdCodeTxBl.Text = EgtMsg(90390) ' Order Code + OrdDescTxBl.Text = EgtMsg(90391) ' Order Description + PartCodeTxBl.Text = EgtMsg(90396) ' Part Code + MatCodeTxBl.Text = EgtMsg(90392) ' Material Code + SurfCodeTxBl.Text = EgtMsg(90393) ' Surface Code + ThicknessTxBl.Text = EgtMsg(90394) ' Thickness End Sub Private Sub OkBtn_Click(sender As Object, e As RoutedEventArgs) Handles OkBtn.Click diff --git a/DrawImport/DrawPageUC.xaml b/DrawImport/DrawPageUC.xaml index d8c6fbe..11e92be 100644 --- a/DrawImport/DrawPageUC.xaml +++ b/DrawImport/DrawPageUC.xaml @@ -1,18 +1,18 @@  + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + mc:Ignorable="d" + d:DesignHeight="853.3" d:DesignWidth="1280" Initialized="DrawPage_Initialized" Loaded="DrawPage_Loaded" Unloaded="DrawPage_Unloaded"> - - + + @@ -32,13 +32,13 @@ + Style="{DynamicResource OmagCut_RightGrayYellowTextToggleButton}"/> + Style="{DynamicResource OmagCut_RightGrayYellowTextToggleButton}"/> + Style="{DynamicResource OmagCut_RightGrayYellowTextToggleButton}"/> + Style="{DynamicResource OmagCut_RightGrayYellowTextToggleButton}"/> @@ -65,21 +65,21 @@ - + - + - + + Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/> @@ -95,9 +95,10 @@ - + Style="{DynamicResource OmagCut_ToolsDBTextBlock}" /> + @@ -107,12 +108,13 @@ - + + Style="{DynamicResource OmagCut_KeyboardTextBox}"/> - + - + - + diff --git a/DrawImport/DrawPageUC.xaml.vb b/DrawImport/DrawPageUC.xaml.vb index 1dbdd44..1c31fba 100644 --- a/DrawImport/DrawPageUC.xaml.vb +++ b/DrawImport/DrawPageUC.xaml.vb @@ -1,5 +1,4 @@ -Imports System.Globalization -Imports EgtUILib +Imports EgtUILib Imports EgtWPFLib Public Class DrawPageUC @@ -411,7 +410,7 @@ Public Class DrawPageUC m_nSelectedLayer = GDB_ID.NULL SideAngle.WriteSideAngleForNest(DrawScene.GetCtx()) ' Messaggio di selezione da effettuare - MessageTxBx.Text = EgtMsg(MSG_DRAWPAGEUC + 6) ' Selezionare un contorno + MessageTxBx.Text = EgtMsg(90386) ' Selezionare un contorno MessageBrd.Background = Application.Current.FindResource("OmagCut_Green") Else Dim nLayId As Integer = EgtGetFirstNameInGroup(nPartId, NAME_OUTLOOP) @@ -1304,7 +1303,7 @@ Public Class DrawPageUC If EgtGetFirstNameInGroup(EgtGetFirstPart(), NAME_INLOOP) = GDB_ID.NULL Then m_nSelectedLayer = EgtGetFirstNameInGroup(EgtGetFirstPart(), NAME_OUTLOOP) Else - MessageTxBx.Text = EgtMsg(MSG_DRAWPAGEUC + 6) ' Selezionare un contorno + MessageTxBx.Text = EgtMsg(90386) ' Selezionare un contorno MessageBrd.Background = Application.Current.FindResource("OmagCut_Green") ' Aggiungo testi su lati già inclinati SideAngle.WriteSideAngleForNest(DrawScene.GetCtx()) @@ -1370,7 +1369,7 @@ Public Class DrawPageUC If EgtGetFirstNameInGroup(EgtGetFirstPart(), NAME_INLOOP) = GDB_ID.NULL Then m_nSelectedLayer = EgtGetFirstNameInGroup(EgtGetFirstPart(), NAME_OUTLOOP) Else - MessageTxBx.Text = EgtMsg(MSG_DRAWPAGEUC + 6) ' Selezionare un contorno + MessageTxBx.Text = EgtMsg(90386) ' Selezionare un contorno MessageBrd.Background = Application.Current.FindResource("OmagCut_Green") End If ' In ogni caso, nascondo layer delle misure @@ -1432,7 +1431,7 @@ Public Class DrawPageUC If EgtGetFirstNameInGroup(EgtGetFirstPart(), NAME_INLOOP) = GDB_ID.NULL Then m_nSelectedLayer = EgtGetFirstNameInGroup(EgtGetFirstPart(), NAME_OUTLOOP) Else - MessageTxBx.Text = EgtMsg(MSG_DRAWPAGEUC + 6) ' Selezionare un contorno + MessageTxBx.Text = EgtMsg(90386) ' Selezionare un contorno MessageBrd.Background = Application.Current.FindResource("OmagCut_Green") End If ' In ogni caso, nascondo layer delle misure @@ -1490,7 +1489,7 @@ Public Class DrawPageUC DripCutBtn.IsEnabled = False MessageGrid.Visibility = Windows.Visibility.Hidden BackBtn.Visibility = Windows.Visibility.Hidden - MessageTxBx.Text = EgtMsg(MSG_DRAWPAGEUC + 6) ' Selezionare un contorno + MessageTxBx.Text = EgtMsg(90386) ' Selezionare un contorno MessageBrd.Background = Application.Current.FindResource("OmagCut_Green") ' In ogni caso, nascondo layer delle misure Dim PartId As Integer = EgtGetFirstInGroup(GDB_ID.ROOT) diff --git a/DrawImport/FiloTopUC.xaml b/DrawImport/FiloTopUC.xaml index cb94ae1..7db4bb4 100644 --- a/DrawImport/FiloTopUC.xaml +++ b/DrawImport/FiloTopUC.xaml @@ -1,11 +1,11 @@  + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + mc:Ignorable="d" + d:DesignHeight="597.1" d:DesignWidth="255.9"> @@ -32,20 +32,21 @@ + Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" + FontSize="{DynamicResource FontSize_LowerCaseCharacter}"/> + Style="{DynamicResource OmagCut_CalculatorTextBox}"/> + Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" + FontSize="{DynamicResource FontSize_LowerCaseCharacter}"/> + Style="{DynamicResource OmagCut_CalculatorTextBox}"/> - - + Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" + FontSize="{DynamicResource FontSize_LowerCaseCharacter}"/> + + diff --git a/DrawImport/FiloTopUC.xaml.vb b/DrawImport/FiloTopUC.xaml.vb index cd06d8c..819f624 100644 --- a/DrawImport/FiloTopUC.xaml.vb +++ b/DrawImport/FiloTopUC.xaml.vb @@ -38,9 +38,9 @@ Public Class FiloTopUC m_CallingPage = m_MainWindow.m_ActivePage ' Imposto messaggi - ParameterTxBl.Text = EgtMsg(MSG_IMPORTPAGEUC + 10) ' Offset - Parameter2TxBl.Text = EgtMsg(MSG_IMPORTPAGEUC + 11) ' Affondamento - Parameter3TxBl.Text = EgtMsg(91138) + ParameterTxBl.Text = EgtMsg(90460) ' Offset + Parameter2TxBl.Text = EgtMsg(90461) ' Affondamento + Parameter3TxBl.Text = EgtMsg(91138) ' Arrotonda If m_CallingPage = MainWindow.Pages.Draw Then ' Imposto questa come pagina correntemente visualizzata nella drawpage diff --git a/DrawImport/ImportPageUC.xaml b/DrawImport/ImportPageUC.xaml index 2a52743..f5394fc 100644 --- a/DrawImport/ImportPageUC.xaml +++ b/DrawImport/ImportPageUC.xaml @@ -1,137 +1,139 @@  + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + mc:Ignorable="d" + d:DesignHeight="853.3" d:DesignWidth="1280" Initialized="ImportPage_Initialized" Loaded="ImportPage_Loaded" Unloaded="ImportPage_Unloaded"> - - - + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + - - - - - - + + + + + + + - - - - - - - - - - - - - - - - + + + - - - + + + + + + + - + - + + + + + + + diff --git a/DrawImport/ImportPageUC.xaml.vb b/DrawImport/ImportPageUC.xaml.vb index 334a7c2..3dcd62c 100644 --- a/DrawImport/ImportPageUC.xaml.vb +++ b/DrawImport/ImportPageUC.xaml.vb @@ -1,7 +1,5 @@ -Imports System.Collections.ObjectModel -Imports System.IO +Imports System.IO Imports EgtUILib -Imports System.Runtime.InteropServices Public Class ImportPageUC @@ -78,20 +76,20 @@ Public Class ImportPageUC Me.ImportPageGrid.Children.Add(ImportSceneHost) 'Imposto i messaggi letti dal file dei messaggi - UseLayerBtn.Content = EgtMsg(MSG_IMPORTPAGEUC + 1) 'Usa layer - Use layers - UseRegionBtn.Content = EgtMsg(MSG_IMPORTPAGEUC + 2) 'Usa regioni - Use regions - UseClosedCurveBtn.Content = EgtMsg(MSG_IMPORTPAGEUC + 6) 'Usa curve chiuse - Use closed curves - ResetBtn.Content = EgtMsg(MSG_IMPORTPAGEUC + 3) 'Reset - mmBtn.Content = EgtMsg(MSG_IMPORTPAGEUC + 4) 'mm - inchBtn.Content = EgtMsg(MSG_IMPORTPAGEUC + 5) 'inch - OrderListBtn.Content = EgtMsg(90398) 'Dati Csv - TopBtn.Content = EgtMsg(90384) 'Indica Lato Sopra - PartNumTxBl.Text = EgtMsg(MSG_IMPORTPAGEUC + 15) 'Numero - SideAngleBtn.Content = EgtMsg(MSG_IMPORTPAGEUC + 7) 'Inclina lati - FiloTopBtn.Content = EgtMsg(90400) 'Filo Top - DripCutBtn.Content = EgtMsg(MSG_IMPORTPAGEUC + 8) 'Incidi da sotto - EngraveBtn.Content = EgtMsg(91238) 'Engrave - DripDrillBtn.Content = EgtMsg(MSG_IMPORTPAGEUC + 14) 'Foro da sotto + UseLayerBtn.Content = EgtMsg(90451) ' Usa layer - Use layers + UseRegionBtn.Content = EgtMsg(90452) ' Usa regioni - Use regions + UseClosedCurveBtn.Content = EgtMsg(90456) ' Usa curve chiuse - Use closed curves + ResetBtn.Content = EgtMsg(90453) ' Reset + mmBtn.Content = EgtMsg(90454) ' mm + inchBtn.Content = EgtMsg(90455) ' inch + OrderListBtn.Content = EgtMsg(90398) ' Dati Csv + TopBtn.Content = EgtMsg(90384) ' Indica Lato Sopra + PartNumTxBl.Text = EgtMsg(90465) ' Quantità + SideAngleBtn.Content = EgtMsg(90457) ' Inclina lati + FiloTopBtn.Content = EgtMsg(90400) ' Filo Top + DripCutBtn.Content = EgtMsg(90458) ' Incidi da sotto + EngraveBtn.Content = EgtMsg(91238) ' Engrave + DripDrillBtn.Content = EgtMsg(90464) ' Foro da sotto Cad2dBtn.Content = "Cad 2d" 'Definizione del collegamento tra ItemList e ListBox1 diff --git a/DrawImport/InternalComponentPageUC.xaml b/DrawImport/InternalComponentPageUC.xaml index d14ab14..748f449 100644 --- a/DrawImport/InternalComponentPageUC.xaml +++ b/DrawImport/InternalComponentPageUC.xaml @@ -1,10 +1,10 @@  + 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"> @@ -30,7 +30,7 @@ + Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/> @@ -42,11 +42,11 @@ + Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/> - - - - - - - + - - - - - + + + + + - - - + + + diff --git a/DrawImport/InternalComponentPageUC.xaml.vb b/DrawImport/InternalComponentPageUC.xaml.vb index fb01bd5..d4e230f 100644 --- a/DrawImport/InternalComponentPageUC.xaml.vb +++ b/DrawImport/InternalComponentPageUC.xaml.vb @@ -21,7 +21,7 @@ Public Class InternalComponentPageUC ' bottone per selezionare la seconda pagina di componenti interni Compo9.SetValue(Grid.ColumnProperty, 0) Compo9.SetValue(Grid.ColumnSpanProperty, 2) - LabelCompo9.Text = EgtMsg(MSG_COMPONENTPAGEUC + 9) ' Altri + LabelCompo9.Text = EgtMsg(90409) ' Altri ImageCompo9.Visibility = Windows.Visibility.Hidden LabelCompo9.Visibility = Windows.Visibility.Visible ' Se i componenti interni sono più di 8 viene visualizzato il bottone "Altri" altrimenti no diff --git a/DrawImport/MainComponentPageUC.xaml b/DrawImport/MainComponentPageUC.xaml index c82c693..2dc8ab0 100644 --- a/DrawImport/MainComponentPageUC.xaml +++ b/DrawImport/MainComponentPageUC.xaml @@ -1,11 +1,11 @@  - + 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"> + @@ -20,9 +20,9 @@ - + - - - - - - - - @@ -123,15 +123,16 @@ - - + - + diff --git a/DrawImport/MainComponentPageUC.xaml.vb b/DrawImport/MainComponentPageUC.xaml.vb index 8696e41..95244f0 100644 --- a/DrawImport/MainComponentPageUC.xaml.vb +++ b/DrawImport/MainComponentPageUC.xaml.vb @@ -25,7 +25,7 @@ Public Class MainComponentPageUC m_SecondaryComponentPage.SetValue(Grid.RowSpanProperty, 4) ' Leggo messaggi da file ini - LabelCompo9.Text = EgtMsg(MSG_COMPONENTPAGEUC + 9) + LabelCompo9.Text = EgtMsg(90409) ' Altri End Sub @@ -319,7 +319,7 @@ Public Class MainComponentPageUC 'verifico presenza testo If nCompoName > 0 Then - Dim sCompoName As String = EgtMsg(MSG_COMPONENTPAGEUC + nCompoName) + Dim sCompoName As String = EgtMsg(90400 + nCompoName) 'verifico presenza immagine If sCompoImage.Length > 0 Then 'se la lunghezza del testo è maggiore di 15 lo taglio @@ -394,7 +394,7 @@ Public Class MainComponentPageUC 'verifico presenza testo If nCompoName > 0 Then - Dim sCompoName As String = EgtMsg(MSG_COMPONENTPAGEUC + nCompoName) + Dim sCompoName As String = EgtMsg(90400 + nCompoName) 'verifico presenza immagine If sCompoImage.Length > 0 Then 'se la lunghezza del testo è maggiore di 15 lo taglio diff --git a/DrawImport/SecondaryComponentPageUC.xaml b/DrawImport/SecondaryComponentPageUC.xaml index e0cc32c..f8222c9 100644 --- a/DrawImport/SecondaryComponentPageUC.xaml +++ b/DrawImport/SecondaryComponentPageUC.xaml @@ -1,11 +1,11 @@  - + 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" Loaded="SecondaryComponentPage_Loaded"> + @@ -20,7 +20,7 @@ - + @@ -43,7 +43,7 @@ + Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/> @@ -55,7 +55,7 @@ + Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/> @@ -67,7 +67,7 @@ + Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/> @@ -79,7 +79,7 @@ + Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/> @@ -91,7 +91,7 @@ + Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/> @@ -103,7 +103,7 @@ + Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/> @@ -115,7 +115,7 @@ + Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/> @@ -127,10 +127,10 @@ + Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/> - + @@ -138,11 +138,11 @@ - + - + - + diff --git a/DrawImport/SecondaryComponentPageUC.xaml.vb b/DrawImport/SecondaryComponentPageUC.xaml.vb index 8526c2b..0196b04 100644 --- a/DrawImport/SecondaryComponentPageUC.xaml.vb +++ b/DrawImport/SecondaryComponentPageUC.xaml.vb @@ -68,7 +68,7 @@ Public Class SecondaryComponentPageUC 'verifico presenza testo If nCompoName > 0 Then - Dim sCompoName As String = EgtMsg(MSG_COMPONENTPAGEUC + nCompoName) + Dim sCompoName As String = EgtMsg(90400 + nCompoName) 'verifico presenza immagine If sCompoImage.Length > 0 Then 'se la lunghezza del testo è maggiore di 20 lo taglio diff --git a/DrawImport/SideAngleOneForAllWindow.xaml b/DrawImport/SideAngleOneForAllWindow.xaml index d2a35c4..1437b10 100644 --- a/DrawImport/SideAngleOneForAllWindow.xaml +++ b/DrawImport/SideAngleOneForAllWindow.xaml @@ -59,9 +59,9 @@ - + - + @@ -71,11 +71,11 @@ diff --git a/DrawImport/SideAngleOneForAllWindow.xaml.vb b/DrawImport/SideAngleOneForAllWindow.xaml.vb index 1e5181e..d419403 100644 --- a/DrawImport/SideAngleOneForAllWindow.xaml.vb +++ b/DrawImport/SideAngleOneForAllWindow.xaml.vb @@ -6,7 +6,7 @@ InitializeComponent() ' Aggiungere le eventuali istruzioni di inizializzazione dopo la chiamata a InitializeComponent(). - TitleTxBl.Text = EgtUILib.EgtMsg(91253) + TitleTxBl.Text = EgtUILib.EgtMsg(91253) ' Seleziona Angolo e Tallone End Sub Private Sub OkBtn_Click(sender As Object, e As RoutedEventArgs) Handles OkBtn.Click diff --git a/DrawImport/SideAngleUc.xaml b/DrawImport/SideAngleUc.xaml index 370e2b0..28f6c85 100644 --- a/DrawImport/SideAngleUc.xaml +++ b/DrawImport/SideAngleUc.xaml @@ -41,8 +41,8 @@ - + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + - - - - - - - - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + - - - - - - - - - - - - - - + + + + - - - + - + - + diff --git a/Frames/FrameCutPageUC.xaml.vb b/Frames/FrameCutPageUC.xaml.vb index 2072072..71eba7b 100644 --- a/Frames/FrameCutPageUC.xaml.vb +++ b/Frames/FrameCutPageUC.xaml.vb @@ -1,5 +1,4 @@ -Imports System.Collections.ObjectModel -Imports EgtUILib +Imports EgtUILib Public Class FrameCutPageUC @@ -58,24 +57,24 @@ Public Class FrameCutPageUC UseInteraxisChBx.IsChecked = (GetPrivateProfileInt(S_FRAME, K_OFFSXINTERYSAWTH, 0, m_MainWindow.GetIniFile()) <> 1) ' Imposto i messaggi letti dal file dei messaggi - m_AlongAx.Add(EgtMsg(MSG_FRAMECUTPAGEUC + 1)) 'Lungo X - m_AlongAx.Add(EgtMsg(MSG_FRAMECUTPAGEUC + 2)) 'Lungo Y + m_AlongAx.Add(EgtMsg(90601)) ' Lungo X + m_AlongAx.Add(EgtMsg(90602)) ' Lungo Y If GetPrivateProfileInt(S_FRAME, K_ARC_ENABLE, 0, m_MainWindow.GetIniFile()) <> 0 And m_MainWindow.GetKeyOption( MainWindow.KEY_OPT.CURVED_FRAME) Then - m_AlongAx.Add(EgtMsg(MSG_FRAMECUTPAGEUC + 13)) 'Arco - m_AlongAx.Add(EgtMsg(MSG_FRAMECUTPAGEUC + 14)) 'Guida + m_AlongAx.Add(EgtMsg(90613)) ' Arco + m_AlongAx.Add(EgtMsg(90614)) ' Guida End If - SelSectionBtn.ToolTip = EgtMsg(MSG_FRAMECUTPAGEUC + 15) 'Sezione - SelGuideBtn.Content = EgtMsg(MSG_FRAMECUTPAGEUC + 16) 'Guida - ArcRadTxBl.Text = EgtMsg(MSG_FRAMECUTPAGEUC + 17) 'Rad - ArcAngTxBl.Text = EgtMsg(MSG_FRAMECUTPAGEUC + 18) 'Ang - MirrorPartBtn.ToolTip = EgtMsg(MSG_FRAMECUTPAGEUC + 7) 'Mirror cornice - RemovePartBtn.ToolTip = EgtMsg(MSG_FRAMECUTPAGEUC + 3) 'Rimuovi cornice - OffsZTxBl.Text = EgtMsg(MSG_FRAMECUTPAGEUC + 8) 'Distanza sopra - OffsXyTxBl.Text = EgtMsg(MSG_FRAMECUTPAGEUC + 9) 'Distanza inizio - OffsYyTxBl.Text = EgtMsg(MSG_FRAMECUTPAGEUC + 22) 'Distanza Y - OffsXInteryTxBl.Text = EgtMsg(90645) 'Interasse - Dim sChBxToolTip As String = EgtMsg(90646) 'Applica valore indicato\n altrienti spessore lama + SelSectionBtn.ToolTip = EgtMsg(90615) ' Sezione + SelGuideBtn.Content = EgtMsg(906116) ' Guida + ArcRadTxBl.Text = EgtMsg(90617) ' Rad + ArcAngTxBl.Text = EgtMsg(90618) ' Ang + MirrorPartBtn.ToolTip = EgtMsg(90607) ' Mirror cornice + RemovePartBtn.ToolTip = EgtMsg(90603) ' Rimuovi cornice + OffsZTxBl.Text = EgtMsg(90608) ' Distanza sopra + OffsXyTxBl.Text = EgtMsg(90609) ' Distanza inizio + OffsYyTxBl.Text = EgtMsg(90622) ' Distanza Y + OffsXInteryTxBl.Text = EgtMsg(90645) ' Interasse + Dim sChBxToolTip As String = EgtMsg(90646) ' Applica valore indicato\n altrienti spessore lama sChBxToolTip = sChBxToolTip.Replace("/n", "£") Dim sItems As String() = sChBxToolTip.Split("£") For Index As Integer = 0 To sItems.Count - 1 @@ -168,14 +167,14 @@ Public Class FrameCutPageUC ArcGrid.Visibility = Windows.Visibility.Collapsed OffsYyTxBl.Visibility = Windows.Visibility.Collapsed OffsYyTxBx.Visibility = Windows.Visibility.Collapsed - OffsXyTxBl.Text = EgtMsg(MSG_FRAMECUTPAGEUC + 9) 'Distanza inizio + OffsXyTxBl.Text = EgtMsg(90609) ' Distanza inizio Case 2 'Arco SelSectionBtn.Visibility = Windows.Visibility.Visible SelGuideBtn.Visibility = Windows.Visibility.Collapsed ArcGrid.Visibility = Windows.Visibility.Visible OffsYyTxBl.Visibility = Windows.Visibility.Visible OffsYyTxBx.Visibility = Windows.Visibility.Visible - OffsXyTxBl.Text = EgtMsg(MSG_FRAMECUTPAGEUC + 21) 'Distanza X + OffsXyTxBl.Text = EgtMsg(90621) ' Distanza X Case 3 'Guida SelSectionBtn.Visibility = Windows.Visibility.Visible SelGuideBtn.Visibility = Windows.Visibility.Visible @@ -183,7 +182,7 @@ Public Class FrameCutPageUC ArcGrid.Visibility = Windows.Visibility.Collapsed OffsYyTxBl.Visibility = Windows.Visibility.Visible OffsYyTxBx.Visibility = Windows.Visibility.Visible - OffsXyTxBl.Text = EgtMsg(MSG_FRAMECUTPAGEUC + 21) 'Distanza X + OffsXyTxBl.Text = EgtMsg(90621) ' Distanza X End Select End Sub @@ -482,10 +481,10 @@ Public Class FrameCutPageUC EgtErase( nPartId) If m_CurrAx <> 2 Then ' Errore : creazione cornice non riuscita - m_CurrProjPage.SetErrorMessage( EgtMsg(MSG_FRAMECUTPAGEUC + 20)) + m_CurrProjPage.SetErrorMessage(EgtMsg(90620)) Else ' Errore : raggio più piccolo della larghezza della sezione - m_CurrProjPage.SetErrorMessage( EgtMsg(MSG_FRAMECUTPAGEUC + 19)) + m_CurrProjPage.SetErrorMessage(EgtMsg(90619)) End If Return False End If diff --git a/Frames/FrameMachiningUC.xaml b/Frames/FrameMachiningUC.xaml index 7b1892f..25aad51 100644 --- a/Frames/FrameMachiningUC.xaml +++ b/Frames/FrameMachiningUC.xaml @@ -1,13 +1,13 @@  + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + DataContext="Self" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:OmagCUT="clr-namespace:OmagCUT" + xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib" + mc:Ignorable="d" + d:DesignHeight="597.3" d:DesignWidth="256"> @@ -31,68 +31,68 @@ + Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/> - + + Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/> - + - + + Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/> - + - + + Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/> + Style="{DynamicResource OmagCut_CalculatorTextBox}"/> + Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/> + Style="{DynamicResource OmagCut_CalculatorTextBox}"/> + Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/> + Style="{DynamicResource OmagCut_CheckBox_Single}" HorizontalAlignment="Center"/> + Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/> - + - + - + diff --git a/Frames/FrameMachiningUC.xaml.vb b/Frames/FrameMachiningUC.xaml.vb index 7f5ba4c..dd06ed3 100644 --- a/Frames/FrameMachiningUC.xaml.vb +++ b/Frames/FrameMachiningUC.xaml.vb @@ -1,5 +1,4 @@ Imports System.Collections.ObjectModel -Imports System.ComponentModel Imports EgtUILib Public Class FrameMachiningUC @@ -49,13 +48,13 @@ Public Class FrameMachiningUC OthSideChBx.IsChecked = m_bOtherSide ' Imposto i messaggi letti dal file dei messaggi - SawRoughingTxBl.Text = EgtMsg(MSG_FRAMECUTPAGEUC + 4) 'Sgrossatura - SawFinishingTxBl.Text = EgtMsg(MSG_FRAMECUTPAGEUC + 5) 'Finitura - SawSideFinTxBl.Text = EgtMsg(MSG_FRAMECUTPAGEUC + 6) 'Spatolatura - StartTrimTxBl.Text = EgtMsg(MSG_FRAMECUTPAGEUC + 10) 'Accorcia inizio - EndTrimTxBl.Text = EgtMsg(MSG_FRAMECUTPAGEUC + 11) 'Accorcia fine - SawSingleTxBl.Text = EgtMsg(MSG_FRAMECUTPAGEUC + 12) 'Taglio singolo - OthSideTxBl.Text = EgtMsg( 90623) 'Lato Opposto + SawRoughingTxBl.Text = EgtMsg(90604) ' Sgrossatura + SawFinishingTxBl.Text = EgtMsg(90605) ' Finitura + SawSideFinTxBl.Text = EgtMsg(90606) ' Spatolatura + StartTrimTxBl.Text = EgtMsg(90610) ' Accorcia inizio + EndTrimTxBl.Text = EgtMsg(90611) ' Accorcia fine + SawSingleTxBl.Text = EgtMsg(90612) ' Taglio singolo + OthSideTxBl.Text = EgtMsg(90623) ' Lato Opposto End Sub Private Sub FrameCutPage_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded diff --git a/Machine/AlarmsPageUC.xaml b/Machine/AlarmsPageUC.xaml index 04f37bf..3132e9b 100644 --- a/Machine/AlarmsPageUC.xaml +++ b/Machine/AlarmsPageUC.xaml @@ -7,381 +7,388 @@ mc:Ignorable="d" d:DesignHeight="768" d:DesignWidth="1280"> - - + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + - - + + - - + + - - + + - - + + - - + - + - + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + - - + + - - - - - - - - - - - - + + - - + + - - + - - + - - + + + + + + + + + + - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - + + - - + + - - + + - - + + - - + + - - - - - - - - - - - - - + + - - - - - - - + + + + + + - + - - - - - - - - - - - - - - - + - - - - - - - - + + + + + + + - - - - - - - - + - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Machine/AlarmsPageUC.xaml.vb b/Machine/AlarmsPageUC.xaml.vb index 0b053fe..f3ae7c9 100644 --- a/Machine/AlarmsPageUC.xaml.vb +++ b/Machine/AlarmsPageUC.xaml.vb @@ -1,5 +1,4 @@ -Imports System.Windows.Threading -Imports System.Collections.ObjectModel +Imports System.Collections.ObjectModel Imports System.IO Imports EgtUILib Imports EgtWPFLib @@ -56,37 +55,37 @@ Public Class AlarmsPageUC End If ' Imposto i messaggi letti dal file dei messaggi - CurrSawTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 1) + CurrSawTxBl.Text = EgtMsg(90901) ' Lama corrente CurrSawTiltedTxBl.Text = EgtMsg(91049) ' Current saw tilted - AuxiliaryToolTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 2) - CurrDrillTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 3) - CurrCupWheelTxBl.Text = EgtMsg(MSG_ALARMS2PAGEUC + 20) - CurrMillTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 4) - CurrWJetTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 0) - HolesOffsetTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 9) - HolesOverlapTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 10) - HolesToleranceTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 11) - OneHoleInCornerTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 26) - CutExtraLenTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 6) - AngleCutExtraLenTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 7) - CompleteCutsTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 8) - SafeZTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 5) - MaterialsGpBx.Header = EgtMsg(MSG_ALARMSPAGEUC + 13) - NewMatBtn.Content = EgtMsg(MSG_ALARMSPAGEUC + 14) - RemoveMatBtn.Content = EgtMsg(MSG_ALARMSPAGEUC + 15) - SetUpGpBx.Header = EgtMsg(MSG_ALARMSPAGEUC + 16) - HolesGpBx.Header = EgtMsg(MSG_ALARMSPAGEUC + 17) - ExtArcMinRadTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 18) - IntArcMaxSideAngTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 24) + AuxiliaryToolTxBl.Text = EgtMsg(90902) ' Utensile ausiliario + CurrDrillTxBl.Text = EgtMsg(90903) ' Foretto corrente + CurrCupWheelTxBl.Text = EgtMsg(91070) ' Scasso corrente + CurrMillTxBl.Text = EgtMsg(90904) ' Fresa corrente + CurrWJetTxBl.Text = EgtMsg(90900) ' Waterjet corrente + HolesOffsetTxBl.Text = EgtMsg(90909) ' Offset fori + HolesOverlapTxBl.Text = EgtMsg(90910) ' Sovrapp. fori + HolesToleranceTxBl.Text = EgtMsg(90911) ' Tolleranza fori + OneHoleInCornerTxBl.Text = EgtMsg(90926) ' Un solo foro in angolo + CutExtraLenTxBl.Text = EgtMsg(90906) ' Sicurezza tagli + AngleCutExtraLenTxBl.Text = EgtMsg(90907) ' Sicur. angoli + CompleteCutsTxBl.Text = EgtMsg(90908) ' Rispetta i tagli completi + SafeZTxBl.Text = EgtMsg(90905) ' Z Sicura + MaterialsGpBx.Header = EgtMsg(90913) ' Materiali + NewMatBtn.Content = EgtMsg(90914) ' Aggiungi + RemoveMatBtn.Content = EgtMsg(90915) ' Rimuovi + SetUpGpBx.Header = EgtMsg(90916) ' Utensili correnti + HolesGpBx.Header = EgtMsg(90917) ' Parametri fori + ExtArcMinRadTxBl.Text = EgtMsg(90918) ' Rmin archi est. + IntArcMaxSideAngTxBl.Text = EgtMsg(90924) ' Amax archi int. PreCutExitTxBl.Text = EgtMsg(91065) ' PreTaglio uscite - MachineParamGpBx.Header = EgtMsg(MSG_ALARMSPAGEUC + 19) - SawGpBx.Header = EgtMsg(MSG_ALARMSPAGEUC + 25) - DirectCutsParamGpBx.Header = EgtMsg(MSG_ALARMSPAGEUC + 27) ' Tagli diretti - FinalHomeTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 28) ' Home finale - MillingsParamGpBx.Header = EgtMsg(MSG_ALARMSPAGEUC + 29) ' Parametri fresature - CornerCutsTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 44) ' Sempre sugli angoli - InternalCutsTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 30) ' Sempre sugli interni - ShortTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 49) ' Accorciamento + MachineParamGpBx.Header = EgtMsg(90919) ' Parametri macchina + SawGpBx.Header = EgtMsg(90925) ' Parametri lama + DirectCutsParamGpBx.Header = EgtMsg(90927) ' Tagli diretti + FinalHomeTxBl.Text = EgtMsg(90928) ' Home finale + MillingsParamGpBx.Header = EgtMsg(90929) ' Parametri fresature + CornerCutsTxBl.Text = EgtMsg(90944) ' Sempre sugli angoli + InternalCutsTxBl.Text = EgtMsg(90930) ' Sempre sugli interni + ShortTxBl.Text = EgtMsg(90949) ' Accorciamento TopMillGpBx.Header = EgtMsg( 91061) ' Parametri incisioni TmEnableTxBl.Text = EgtMsg( 91062) ' Con fresa TmDepthTxBl.Text = EgtMsg( 91063) ' Profondità @@ -97,37 +96,37 @@ Public Class AlarmsPageUC HolesDiameterWJTxBl.Text = EgtMsg(91044) ' Diametro HolesOffsetWJTxBl.Text = EgtMsg(91045) ' Offset MinRadiusWJTxBl.Text = EgtMsg(91046) ' Raggio Minimo - OneHoleInCornerWJTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 26) + OneHoleInCornerWJTxBl.Text = EgtMsg(90926) ' Un solo foro in angolo '-- INIZIO -- nuovi parametro Rettifica tagli sottosquadra WJ RectificationWJParamGpBx.Header = EgtMsg(91047) ' Rettifica EnableRectificationTxBl.Text = EgtMsg(91048) ' Abilita (sottosquadra) '-- FINE -- nuovi parametro Rettifica tagli sottosquadra WJ - NestingParamGpBx.Header = EgtMsg(MSG_ALARMSPAGEUC + 31) ' Nesting + NestingParamGpBx.Header = EgtMsg(90931) ' Nesting AlignTxBl.Text = EgtMsg(90932) ' Allineato GhigliottinaTxBl.Text = EgtMsg(91066) ' Ghigliottina AutomaticTxBl.Text = EgtMsg(91059) ' Automatico - SetUpBtn.Content = EgtMsg(MSG_ALARMSPAGEUC + 33) ' Attrezzaggio - NewMatBtn.Content = EgtMsg(MSG_ALARMSPAGEUC + 34) ' Nuovo - RemoveMatBtn.Content = EgtMsg(MSG_ALARMSPAGEUC + 35) ' Elimina - AdditionalTableTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 36) ' Altezza sovratavola - AutoRawImageParamGpBx.Header = EgtMsg(MSG_ALARMSPAGEUC + 37) ' Contorno da Foto - BackImageBtn.Content = EgtMsg(MSG_ALARMSPAGEUC + 38) ' Sfondo - ThresholdTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 39) ' Soglia - ToleranceTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 40) ' Tolleranza - WashingTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 41) ' Lavaggio - SideAngCutProbeTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 50) ' Tastatura tagli inclinati - CutFredGpBx.Header = EgtMsg(MSG_ALARMSPAGEUC + 46) ' Tagli Feed inizio/fine - CfrLenTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 47) ' Lunghezza - CfrPercTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 48) ' Riduzione % - MachiningsGpBx.Header = EgtMsg(MSG_ALARMS2PAGEUC + 1) ' Lavorazioni - CurrSawingTxBl.Text = EgtMsg(MSG_ALARMS2PAGEUC + 2) ' Taglio lama + SetUpBtn.Content = EgtMsg(90933) ' Attrezzaggio + NewMatBtn.Content = EgtMsg(90934) ' Nuovo + RemoveMatBtn.Content = EgtMsg(90935) ' Elimina + AdditionalTableTxBl.Text = EgtMsg(90936) ' Altezza sovratavola + AutoRawImageParamGpBx.Header = EgtMsg(90937) ' Contorno da Foto + BackImageBtn.Content = EgtMsg(90938) ' Sfondo + ThresholdTxBl.Text = EgtMsg(90939) ' Soglia + ToleranceTxBl.Text = EgtMsg(90940) ' Tolleranza + WashingTxBl.Text = EgtMsg(90941) ' Lavaggio + SideAngCutProbeTxBl.Text = EgtMsg(90950) ' Tastatura tagli inclinati + CutFredGpBx.Header = EgtMsg(90946) ' Tagli Feed inizio/fine + CfrLenTxBl.Text = EgtMsg(90947) ' Lunghezza + CfrPercTxBl.Text = EgtMsg(90948) ' Riduzione % + MachiningsGpBx.Header = EgtMsg(91051) ' Lavorazioni + CurrSawingTxBl.Text = EgtMsg(91052) ' Taglio lama CurrSawingTiltedTxBl.Text = EgtMsg(91050) ' Taglio inclinato - CurrDrillingTxBl.Text = EgtMsg(MSG_ALARMS2PAGEUC + 3) ' Foratura - CurrMillingTxBl.Text = EgtMsg(MSG_ALARMS2PAGEUC + 4) ' Fresatura + CurrDrillingTxBl.Text = EgtMsg(91053) ' Foratura + CurrMillingTxBl.Text = EgtMsg(91054) ' Fresatura CurrPocketingTxBl.Text = EgtMsg(91069) ' Svuotatura - CurrWaterJettingTxBl.Text = EgtMsg(MSG_ALARMS2PAGEUC + 7) ' WaterJet - CurrDripSawingTxBl.Text = EgtMsg(MSG_ALARMS2PAGEUC + 5) ' DripSawing - CurrDripDrillingTxBl.Text = EgtMsg(MSG_ALARMS2PAGEUC + 6) ' DripDrilling + CurrWaterJettingTxBl.Text = EgtMsg(91057) ' WaterJet + CurrDripSawingTxBl.Text = EgtMsg(91055) ' DripSawing + CurrDripDrillingTxBl.Text = EgtMsg(91056) ' DripDrilling FrameGpBx.Header = EgtMsg(91068) ' Cornici FramePauseTxBl.Text = EgtMsg(91067) ' Inserisci pausa UseLaserOriginTxBl.Text = EgtMsg(91129) ' Usa laser per origine @@ -227,19 +226,19 @@ Public Class AlarmsPageUC m_AuxToolTypeList.Clear() ' creo l'elenco degli utensili ausiliri If m_CurrentMachine.bDrill Then - m_AuxToolTypeList.Add(New StringIdCmBx(1, EgtMsg(MSG_ALARMSPAGEUC + 21))) ' Foretto + m_AuxToolTypeList.Add(New StringIdCmBx(1, EgtMsg(90921))) ' Foretto End If If m_CurrentMachine.bMill Then - m_AuxToolTypeList.Add(New StringIdCmBx(2, EgtMsg(MSG_ALARMSPAGEUC + 22))) ' Fresa + m_AuxToolTypeList.Add(New StringIdCmBx(2, EgtMsg(90922))) ' Fresa End If If m_CurrentMachine.bCupWheel Then - m_AuxToolTypeList.Add(New StringIdCmBx(3, EgtMsg(MSG_TOOLSDBPAGEUC + 34))) ' Mola da scasso + m_AuxToolTypeList.Add(New StringIdCmBx(3, EgtMsg(90754))) ' Mola da scasso End If If m_CurrentMachine.bWaterJet Then - m_AuxToolTypeList.Add(New StringIdCmBx(4, EgtMsg(MSG_TOOLSDBPAGEUC + 35))) ' WaterJet + m_AuxToolTypeList.Add(New StringIdCmBx(4, EgtMsg(90755))) ' WaterJet End If ' Aggiungo elemento nessuno in fondo alla lista - m_AuxToolTypeList.Add(New StringIdCmBx(0, EgtMsg(MSG_ALARMSPAGEUC + 20))) ' Nessuno + m_AuxToolTypeList.Add(New StringIdCmBx(0, EgtMsg(90920))) ' Nessuno ' ComboBox per la selezione dell'utensile ausiliario AuxiliaryToolTxBl.Visibility = Windows.Visibility.Visible @@ -447,7 +446,7 @@ Public Class AlarmsPageUC (GetPrivateProfileInt(S_MACH_FRAME, K_MACH_PAUSE, 1, m_MainWindow.GetMachIniFile()) <> 0) ' Aggiorno messaggio sovratavola con numero tavola If GetTableCount() > 1 Then - AdditionalTableTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 36) & " " & GetCurrentTable().ToString() + AdditionalTableTxBl.Text = EgtMsg(90936) & " " & GetCurrentTable().ToString() ' Altezza sovratavola End If ' Leggo altezza sovratavola dVal = m_CurrentMachine.dAdditionalTable @@ -1331,7 +1330,7 @@ Public Class AlarmsPageUC ' Verifico condizioni di errore If nErr <> 0 Or String.IsNullOrWhiteSpace(CmdString) Then ' Errore in tastatura lama - Dim MsgBoxError As New EgtMsgBox(m_MainWindow, "", EgtMsg(MSG_DIRECTCUTPAGEUC + 44), EgtMsgBox.Buttons.OK, EgtMsgBox.Icons.NULL) + Dim MsgBoxError As New EgtMsgBox(m_MainWindow, "", EgtMsg(90244), EgtMsgBox.Buttons.OK, EgtMsgBox.Icons.NULL) ' Errore in tastatura lama EgtOutLog("ToolProbing Command error") Return End If @@ -1357,7 +1356,7 @@ Public Class AlarmsPageUC ' Mando file al CN If Not m_MainWindow.m_CNCommunication.SendProgram(FilePath, 900) Then ' Errore in tastatura lama - Dim MsgBoxError As New EgtMsgBox(m_MainWindow, "", EgtMsg(MSG_DIRECTCUTPAGEUC + 44), EgtMsgBox.Buttons.OK, EgtMsgBox.Icons.NULL) + Dim MsgBoxError As New EgtMsgBox(m_MainWindow, "", EgtMsg(90244), EgtMsgBox.Buttons.OK, EgtMsgBox.Icons.NULL) EgtOutLog("ToolProbing Send error") Return End If @@ -1371,7 +1370,7 @@ Public Class AlarmsPageUC System.Threading.Thread.Sleep(300) m_MainWindow.m_CNCommunication.m_CN.DGeneralFunctions_CycleStart() ' Creo MsgBox di attesa - Dim MsgBoxStateInfo As New EgtMsgBox(m_MainWindow, String.Format(EgtMsg(MSG_DIRECTCUTPAGEUC + 41), ToolForProbing.m_ToolName), EgtMsg(MSG_DIRECTCUTPAGEUC + 42), True, EgtMsgBox.Buttons.CANCEL, EgtMsgBox.Icons.NULL) + Dim MsgBoxStateInfo As New EgtMsgBox(m_MainWindow, String.Format(EgtMsg(90241), ToolForProbing.m_ToolName), EgtMsg(90242), True, EgtMsgBox.Buttons.CANCEL, EgtMsgBox.Icons.NULL) m_MainWindow.m_CNCommunication.m_CN.n_DReadELS_handle = 0 ' Definisco flag tastatura Dim bProbingOk As Boolean = False @@ -1406,7 +1405,7 @@ Public Class AlarmsPageUC System.Threading.Thread.Sleep(100) EgtOutLog("ToolProbing canceled by user") ' Tastatura interrotta dall'utente - Dim MsgBoxError As New EgtMsgBox(m_MainWindow, "", EgtMsg(MSG_DIRECTCUTPAGEUC + 46), EgtMsgBox.Buttons.OK, EgtMsgBox.Icons.NULL) + Dim MsgBoxError As New EgtMsgBox(m_MainWindow, "", EgtMsg(90246), EgtMsgBox.Buttons.OK, EgtMsgBox.Icons.NULL) Return End If Next @@ -1434,7 +1433,7 @@ Public Class AlarmsPageUC End If MsgBoxStateInfo.LoadingPrBr_Value = 100 ' Tastatura conclusa con successo - Dim sOut As String = EgtMsg(MSG_DIRECTCUTPAGEUC + 43) & " : " & DoubleToString(dVal, 1) + Dim sOut As String = EgtMsg(90243) & " : " & DoubleToString(dVal, 1) MsgBoxStateInfo.Text = sOut m_MainWindow.m_CurrentProjectPageUC.SetInfoMessage(sOut) EgtOutLog("ToolVal=" & dVal.ToString()) @@ -1473,7 +1472,7 @@ Public Class AlarmsPageUC System.Threading.Thread.Sleep(100) EgtOutLog("ToolProbing error") ' Errore in tastatura lama - Dim MsgBoxError As New EgtMsgBox(m_MainWindow, "", EgtMsg(MSG_DIRECTCUTPAGEUC + 44), EgtMsgBox.Buttons.OK, EgtMsgBox.Icons.NULL) + Dim MsgBoxError As New EgtMsgBox(m_MainWindow, "", EgtMsg(90244), EgtMsgBox.Buttons.OK, EgtMsgBox.Icons.NULL) End If End Sub diff --git a/Machine/ChooseToolWD.xaml b/Machine/ChooseToolWD.xaml index b798a88..53a872e 100644 --- a/Machine/ChooseToolWD.xaml +++ b/Machine/ChooseToolWD.xaml @@ -1,13 +1,13 @@  - + @@ -24,14 +24,14 @@ - + ItemsSource="{Binding ItemList}"> - + @@ -46,10 +46,10 @@ diff --git a/Machine/ChooseToolWD.xaml.vb b/Machine/ChooseToolWD.xaml.vb index b3569c0..27c20cf 100644 --- a/Machine/ChooseToolWD.xaml.vb +++ b/Machine/ChooseToolWD.xaml.vb @@ -1,5 +1,4 @@ Imports System.Collections.ObjectModel -Imports System.IO Imports EgtUILib Public Class ChooseToolWD @@ -19,7 +18,7 @@ Public Class ChooseToolWD Me.Left = Owner.Left + Owner.Width / 2 - Me.Width / 2 ' Definizione del collegamento tra ItemList e ListBox1 SetUpToolListBox.ItemsSource = m_SetUpToolList - FilePathTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 45) ' Selezionare l'utensile da tastare + FilePathTxBl.Text = EgtMsg(90945) ' Selezionare l'utensile da tastare End Sub Private Sub OpenFile_Loaded(sender As Object, e As EventArgs) Handles Me.Loaded diff --git a/Machine/CurrentMachine.vb b/Machine/CurrentMachine.vb index f2e65b1..ca38c94 100644 --- a/Machine/CurrentMachine.vb +++ b/Machine/CurrentMachine.vb @@ -1,5 +1,4 @@ Imports System.Collections.ObjectModel -Imports EgtWPFLib5 Imports EgtUILib Imports System.IO diff --git a/Machine/ImportExportMachiningWindowWD.xaml b/Machine/ImportExportMachiningWindowWD.xaml index 62d0bcb..13957dd 100644 --- a/Machine/ImportExportMachiningWindowWD.xaml +++ b/Machine/ImportExportMachiningWindowWD.xaml @@ -1,76 +1,78 @@ - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Machine/ImportExportMachiningWindowWD.xaml.vb b/Machine/ImportExportMachiningWindowWD.xaml.vb index f281e60..6580bc5 100644 --- a/Machine/ImportExportMachiningWindowWD.xaml.vb +++ b/Machine/ImportExportMachiningWindowWD.xaml.vb @@ -1,4 +1,5 @@ Imports EgtWPFLib5 + Public Class ImportExportMachiningWindowWD Private m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow) diff --git a/Machine/ImportExportToolWD.xaml b/Machine/ImportExportToolWD.xaml index aeebc07..4f663b7 100644 --- a/Machine/ImportExportToolWD.xaml +++ b/Machine/ImportExportToolWD.xaml @@ -1,75 +1,76 @@  - - + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib" + xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5" + FontFamily="{DynamicResource OmagCut_Font}" + ResizeMode="NoResize" WindowStyle="None" AllowsTransparency="True" Background="Transparent" + Title="SaveNameWD" Height="350" Width="426.5" ShowInTaskbar="False"> + + + - - - - - + + + + + - - - - + + + + - - - - - + + + + + - - + + - - - - - - + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - + + - - - + + + - - - - - - - - + + + + + + + + - - - - - + + + - + + + diff --git a/Machine/ImportExportToolWD.xaml.vb b/Machine/ImportExportToolWD.xaml.vb index 3341fca..c8127db 100644 --- a/Machine/ImportExportToolWD.xaml.vb +++ b/Machine/ImportExportToolWD.xaml.vb @@ -1,4 +1,5 @@ Imports EgtWPFLib5 + Public Class ImportExportToolWD Private m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow) diff --git a/Machine/MachineCNPageUC.xaml b/Machine/MachineCNPageUC.xaml index df2e7a8..b4b796d 100644 --- a/Machine/MachineCNPageUC.xaml +++ b/Machine/MachineCNPageUC.xaml @@ -1,161 +1,163 @@  + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + mc:Ignorable="d" d:DesignHeight="768" d:DesignWidth="1280"> - - + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - + + + + + - + - + - - - - - - - + + + + + + + - - diff --git a/RawPhoto/ChooseMachining.xaml.vb b/RawPhoto/ChooseMachining.xaml.vb index bb58a3f..c68d1b7 100644 --- a/RawPhoto/ChooseMachining.xaml.vb +++ b/RawPhoto/ChooseMachining.xaml.vb @@ -45,13 +45,13 @@ Public Class ChooseMachining CurrWJettingCmBx.ItemsSource = m_WJettingList CurrWJettingQualityCmBx.ItemsSource = m_CurrentMachine.Qualities - CurrSawingTxBl.Text = EgtMsg(MSG_CHOOSEMACHININGPAGEUC + 1) - CurrSawingTiltedTxBl.Text = EgtMsg(91023) ' Lavorazione inclinata - AuxiliaryMachiningTxBl.Text = EgtMsg(MSG_CHOOSEMACHININGPAGEUC + 2) - CurrDrillingTxBl.Text = EgtMsg(MSG_CHOOSEMACHININGPAGEUC + 3) - CurrMillingTxBl.Text = EgtMsg(MSG_CHOOSEMACHININGPAGEUC + 4) - CurrWJettingTxBl.Text = EgtMsg(MSG_CHOOSEMACHININGPAGEUC + 10) - CurrPocketingTxBl.Text = EgtMsg(90550) + CurrSawingTxBl.Text = EgtMsg(90536) ' Scegliere la lavorazione di lama + CurrSawingTiltedTxBl.Text = EgtMsg(91023) ' Lavorazione inclinata + AuxiliaryMachiningTxBl.Text = EgtMsg(90537) ' Scegliere la lavorazione secondaria + CurrDrillingTxBl.Text = EgtMsg(90538) ' Scegliere la foratura + CurrMillingTxBl.Text = EgtMsg(90539) ' Scegliere la fresatura + CurrWJettingTxBl.Text = EgtMsg(90545) ' Scegliere il waterjet + CurrPocketingTxBl.Text = EgtMsg(90550) ' Scegliere la svuotatura ' carico l'elenco delle lavorazioni della pagina (anche senza aver caricato la pagina) InitializeMachiningLists() @@ -211,11 +211,11 @@ Public Class ChooseMachining If m_bNotShowAuxilaryCmBx Then If Not m_CurrentMachine.MountedToolConfig = CurrentMachine.MountedToolConfigs.SAW Then If m_CurrentMachine.bDrilling Then - m_AuxMachTypeList.Add(New StringIdCmBx(1, EgtMsg(MSG_CHOOSEMACHININGPAGEUC + 6))) + m_AuxMachTypeList.Add(New StringIdCmBx(1, EgtMsg(90541))) ' Foratura If m_CurrentMachine.bMilling Then - m_AuxMachTypeList.Add(New StringIdCmBx(2, EgtMsg(MSG_CHOOSEMACHININGPAGEUC + 7))) + m_AuxMachTypeList.Add(New StringIdCmBx(2, EgtMsg(90542))) ' Fresatura If m_CurrentMachine.bPocketing Then - m_AuxMachTypeList.Add(New StringIdCmBx(4, EgtMsg(91069))) + m_AuxMachTypeList.Add(New StringIdCmBx(4, EgtMsg(91069))) ' Stime End If If m_CurrentMachine.MountedToolConfig = CurrentMachine.MountedToolConfigs.MANUALTOOLCHANGER Or m_CurrentMachine.MountedToolConfig = CurrentMachine.MountedToolConfigs.TOOLCHANGER Or @@ -224,14 +224,14 @@ Public Class ChooseMachining End If End If ElseIf m_CurrentMachine.bMilling Then - m_AuxMachTypeList.Add(New StringIdCmBx(2, EgtMsg(MSG_CHOOSEMACHININGPAGEUC + 7))) + m_AuxMachTypeList.Add(New StringIdCmBx(2, EgtMsg(90542))) ' Fresatura ElseIf m_CurrentMachine.bPocketing Then - m_AuxMachTypeList.Add(New StringIdCmBx(4, EgtMsg(91069))) + m_AuxMachTypeList.Add(New StringIdCmBx(4, EgtMsg(91069))) ' Stime ElseIf m_CurrentMachine.bWaterJetting Then - m_AuxMachTypeList.Add(New StringIdCmBx(5, EgtMsg(MSG_CHOOSEMACHININGPAGEUC + 11))) + m_AuxMachTypeList.Add(New StringIdCmBx(5, EgtMsg(90546))) ' Taglio waterjet End If ' Aggiungo "Nessuna" come ultimo elemento della lista - m_AuxMachTypeList.Add(New StringIdCmBx(0, EgtMsg(MSG_CHOOSEMACHININGPAGEUC + 5))) + m_AuxMachTypeList.Add(New StringIdCmBx(0, EgtMsg(90540))) ' Nessuna If m_CurrentMachine.sCurrDrilling <> String.Empty Then If m_CurrentMachine.sCurrMilling <> String.Empty Then diff --git a/RawPhoto/OtherRefTabWD.xaml b/RawPhoto/OtherRefTabWD.xaml index d5d61ae..5511d23 100644 --- a/RawPhoto/OtherRefTabWD.xaml +++ b/RawPhoto/OtherRefTabWD.xaml @@ -1,98 +1,98 @@  + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib" + FontFamily="{DynamicResource OmagCut_Font}" + ResizeMode="NoResize" WindowStyle="None" AllowsTransparency="True" Background="Transparent" + Title="ModifStartEndWD" Height="350" Width="320" ShowInTaskbar="False"> - - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - + - - - - - - - + + + + + + + - + - - - - - - - + + + + + + + - - + + - - + + - - - - - - - - + + + + + + + + - - + + + - + - + - + \ No newline at end of file diff --git a/RawPhoto/OtherRefTabWD.xaml.vb b/RawPhoto/OtherRefTabWD.xaml.vb index db53b5c..2d42d83 100644 --- a/RawPhoto/OtherRefTabWD.xaml.vb +++ b/RawPhoto/OtherRefTabWD.xaml.vb @@ -1,6 +1,4 @@ -Imports System.IO -Imports System.Reflection -Imports EgtUILib +Imports EgtUILib Imports EgtWPFLib Public Class OtherRefTabWD @@ -57,7 +55,7 @@ Public Class OtherRefTabWD Private Sub RefTabCmBx_SelectionChanged(sender As Object, e As SelectionChangedEventArgs) Handles RefTabCmBx.SelectionChanged If m_bModifX Or m_bModifY Then - Dim SaveCurrToolWnd = New EgtMsgBox(m_MainWindow, "", EgtMsg(MSG_EGTMSGBOX + 2), EgtMsgBox.Buttons.YES_NO_CANCEL, EgtMsgBox.Icons.NULL) + Dim SaveCurrToolWnd = New EgtMsgBox(m_MainWindow, "", EgtMsg(91102), EgtMsgBox.Buttons.YES_NO_CANCEL, EgtMsgBox.Icons.NULL) ' Salvare l'utensile corrente? Select Case SaveCurrToolWnd.m_nPressedBtn Case 0 ' Annulla ' annullo l'operazione di cambio indice diff --git a/RawPhoto/PhotoPageUC.xaml b/RawPhoto/PhotoPageUC.xaml index b99bd8c..14a1260 100644 --- a/RawPhoto/PhotoPageUC.xaml +++ b/RawPhoto/PhotoPageUC.xaml @@ -1,11 +1,11 @@  - + 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" Loaded="PhotoPage_Loaded" Initialized="PhotoPage_Initialized" Unloaded="PhotoPage_Unloaded"> + @@ -21,19 +21,19 @@ - + ItemsSource="{Binding ItemList}"/> + - + - - - + + + @@ -41,16 +41,16 @@ - + - + - + - + diff --git a/RawPhoto/PhotoPageUC.xaml.vb b/RawPhoto/PhotoPageUC.xaml.vb index 178b17e..2406ab1 100644 --- a/RawPhoto/PhotoPageUC.xaml.vb +++ b/RawPhoto/PhotoPageUC.xaml.vb @@ -1,7 +1,5 @@ -Imports System.Collections.ObjectModel -Imports System.IO +Imports System.IO Imports EgtUILib -Imports System.Runtime.InteropServices Public Class PhotoPageUC diff --git a/RawPhoto/RawPartPageUC.xaml b/RawPhoto/RawPartPageUC.xaml index e19b6ff..4ce6984 100644 --- a/RawPhoto/RawPartPageUC.xaml +++ b/RawPhoto/RawPartPageUC.xaml @@ -1,215 +1,215 @@  + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + mc:Ignorable="d" + d:DesignHeight="853.3" d:DesignWidth="1280" Loaded="RawPartPage_Loaded" Initialized="RawPartPage_Initialized" Unloaded="RawPartPage_Unloaded"> - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + + + + + - - + + + + + - - - - - - - - - - - - + + - - - - - - - + + + + + + + - - + + + + + + + - - - - - - - - - - - - - - - + + + + + + + - - - - - - - + + + + + + + + + + + + - - - - - - - + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + - - + - - - - - - - - - - - - - - + - + - - - - - - - - - - - - - + diff --git a/RawPhoto/RawPartPageUC.xaml.vb b/RawPhoto/RawPartPageUC.xaml.vb index 9bdf79b..ade295f 100644 --- a/RawPhoto/RawPartPageUC.xaml.vb +++ b/RawPhoto/RawPartPageUC.xaml.vb @@ -1,5 +1,4 @@ Imports System.IO -Imports System.Reflection Imports EgtUILib Imports EgtWPFLib @@ -162,39 +161,39 @@ Public Class RawPartPageUC KerfTxBx.Tag = KerfTxBl ' Creo lista modalità di definizione del grezzo - m_RawModeList(0) = EgtMsg(MSG_RAWPARTPAGEUC + 1) 'Rettangolo - m_RawModeList(1) = EgtMsg(MSG_RAWPARTPAGEUC + 2) 'Per Punti - m_RawModeList(2) = EgtMsg(MSG_RAWPARTPAGEUC + 30) 'Da Laser + m_RawModeList(0) = EgtMsg(90501) ' Rettangolo + m_RawModeList(1) = EgtMsg(90502) ' Per Punti + m_RawModeList(2) = EgtMsg(90530) ' Da Laser If m_MainWindow.m_CurrentMachine.bSaw Then - m_RawModeList(3) = EgtMsg(MSG_DIRECTCUTPAGEUC + 24) 'Da Lama + m_RawModeList(3) = EgtMsg(90224) ' Da Lama Else ' se non insrisco "Lama" allora ridimensiono il vettore ReDim Preserve m_RawModeList(2) End If - m_RawModeListEx(0) = EgtMsg(MSG_RAWPARTPAGEUC + 1) 'Rettangolo - m_RawModeListEx(1) = EgtMsg(MSG_RAWPARTPAGEUC + 2) 'Per Punti - m_RawModeListEx(2) = EgtMsg(MSG_RAWPARTPAGEUC + 30) 'Da Laser + m_RawModeListEx(0) = EgtMsg(90501) ' Rettangolo + m_RawModeListEx(1) = EgtMsg(90502) ' Per Punti + m_RawModeListEx(2) = EgtMsg(90530) ' Da Laser If m_MainWindow.m_CurrentMachine.bSaw Then - m_RawModeListEx(3) = EgtMsg(MSG_DIRECTCUTPAGEUC + 24) 'Da Lama - m_RawModeListEx(4) = EgtMsg(MSG_RAWPARTPAGEUC + 35) 'Da Fotografia + m_RawModeListEx(3) = EgtMsg(90224) ' Da Lama + m_RawModeListEx(4) = EgtMsg(90535) ' Da Fotografia Else ' se non insrisco "Lama" allora ridimensiono il vettore - m_RawModeListEx(3) = EgtMsg(MSG_RAWPARTPAGEUC + 35) 'Da Fotografia + m_RawModeListEx(3) = EgtMsg(90535) ' Da Fotografia ReDim Preserve m_RawModeListEx(3) End If RawModeCmBx.ItemsSource = m_RawModeList ' Creo la lista dei riferimenti tavola - m_OtherRefTabOrientationList(OTHERREFMODE.BL) = EgtMsg(91221) 'Bottom left - m_OtherRefTabOrientationList(OTHERREFMODE.BR) = EgtMsg(91222) 'Bottom right - m_OtherRefTabOrientationList(OTHERREFMODE.TR) = EgtMsg(91223) 'Top right - m_OtherRefTabOrientationList(OTHERREFMODE.TL) = EgtMsg(91224) 'Top left + m_OtherRefTabOrientationList(OTHERREFMODE.BL) = EgtMsg(91221) ' Bottom left + m_OtherRefTabOrientationList(OTHERREFMODE.BR) = EgtMsg(91222) ' Bottom right + m_OtherRefTabOrientationList(OTHERREFMODE.TR) = EgtMsg(91223) ' Top right + m_OtherRefTabOrientationList(OTHERREFMODE.TL) = EgtMsg(91224) ' Top left ' lista per selezione RawModeDamaged - m_RawModeDamagedList(0) = EgtMsg(MSG_RAWPARTPAGEUC + 2) 'Per Punti - m_RawModeDamagedList(1) = EgtMsg(MSG_RAWPARTPAGEUC + 30) 'Da Laser + m_RawModeDamagedList(0) = EgtMsg(90502) ' Per Punti + m_RawModeDamagedList(1) = EgtMsg(90530) ' Da Laser If m_MainWindow.m_CurrentMachine.bSaw Then - m_RawModeDamagedList(2) = EgtMsg(MSG_DIRECTCUTPAGEUC + 24) 'Da Lama + m_RawModeDamagedList(2) = EgtMsg(90224) ' Da Lama Else ReDim Preserve m_RawModeDamagedList(1) End If @@ -212,26 +211,25 @@ Public Class RawPartPageUC m_SmartMachiningPage = GetPrivateProfileInt(S_GENERAL, K_SMARTMACHININGPAGE, 0, m_MainWindow.GetIniFile()) <> 0 ' Imposto i messaggi letti dal file dei messaggi - OutlineBtn.Content = EgtMsg(MSG_RAWPARTPAGEUC + 33) 'Rectangle - Rettangolo - DamagedBtn.Content = EgtMsg(MSG_RAWPARTPAGEUC + 10) 'By points - Per punti - LengthTxBl.Text = EgtMsg(MSG_RAWPARTPAGEUC + 3) 'Length - Lunghezza - WidthTxBl.Text = EgtMsg(MSG_RAWPARTPAGEUC + 4) 'Width - Larghezza - HeightTxBl.Text = EgtMsg(MSG_RAWPARTPAGEUC + 5) 'Height - Spessore - OffsetXTxBl.Text = EgtMsg(MSG_RAWPARTPAGEUC + 6) 'Offset X - OffsetYTxBl.Text = EgtMsg(MSG_RAWPARTPAGEUC + 7) 'Offset Y - KerfTxBl.Text = EgtMsg(MSG_RAWPARTPAGEUC + 8) 'Kerf - MaterialGpBx.Header = EgtMsg(MSG_RAWPARTPAGEUC + 9) 'Material - Materiale - DamagedAreaGpBx.Header = EgtMsg(MSG_RAWPARTPAGEUC + 10) 'Damaged area - Zona rovinata - NewBtn.Content = EgtMsg(MSG_RAWPARTPAGEUC + 11) 'New - Nuovo - DeleteBtn.Content = EgtMsg(MSG_RAWPARTPAGEUC + 12) 'Delete - Cancella - PointsGpBx.Header = EgtMsg(MSG_RAWPARTPAGEUC + 13) 'Points - Punti - AddBtn.Content = EgtMsg(MSG_RAWPARTPAGEUC + 14) 'Add - Aggiungi - RemoveBtn.Content = EgtMsg(MSG_RAWPARTPAGEUC + 15) 'Remove - Rimuovi - CloseBtn.Content = EgtMsg(MSG_RAWPARTPAGEUC + 31) 'Close - Chiudi - RectangleBtn.Content = EgtMsg(90501) 'Rectangle - ConfirmPhotoBtn.Content = EgtMsg(MSG_RAWPARTPAGEUC + 24) 'Conferma - - OtherRefTabTxBl.Text = EgtMsg(91225) 'New Ref On Tab + OutlineBtn.Content = EgtMsg(90533) ' Contorno + DamagedBtn.Content = EgtMsg(90510) ' By points - Per punti + LengthTxBl.Text = EgtMsg(90503) ' Length - Lunghezza + WidthTxBl.Text = EgtMsg(90504) ' Width - Larghezza + HeightTxBl.Text = EgtMsg(90505) ' Height - Spessore + OffsetXTxBl.Text = EgtMsg(90506) ' Offset X + OffsetYTxBl.Text = EgtMsg(90507) ' Offset Y + KerfTxBl.Text = EgtMsg(90508) ' Kerf + MaterialGpBx.Header = EgtMsg(90509) ' Material - Materiale + DamagedAreaGpBx.Header = EgtMsg(90510) ' Damaged area - Zona rovinata + NewBtn.Content = EgtMsg(90511) ' New - Nuovo + DeleteBtn.Content = EgtMsg(90512) ' Delete - Cancella + PointsGpBx.Header = EgtMsg(90513) ' Points - Punti + AddBtn.Content = EgtMsg(90514) ' Add - Aggiungi + RemoveBtn.Content = EgtMsg(90515) ' Remove - Rimuovi + CloseBtn.Content = EgtMsg(90531) ' Close - Chiudi + RectangleBtn.Content = EgtMsg(90501) ' Rectangle + ConfirmPhotoBtn.Content = EgtMsg(90524) ' Conferma + OtherRefTabTxBl.Text = EgtMsg(91225) ' New Ref On Tab End Sub @@ -954,7 +952,7 @@ Public Class RawPartPageUC ' Reinserisco tutte le lavorazioni piane Dim nWarn As Integer = 0 AddMachinings(GDB_ID.NULL, nWarn) - If nWarn = 1 Then m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_SPLITPAGEUC + 11)) ' Lama troppo grande per utilizzo ventosa + If nWarn = 1 Then m_CurrProjPage.SetWarningMessage(EgtMsg(90351)) ' Lama troppo grande per utilizzo ventosa ' Aggiorno regioni per nesting m_MainWindow.m_CadCutPageUC.m_NestPage.UpdateNestRegions() m_MainWindow.m_CadCutPageUC.m_NestPage.EnableReferenceRegion(False) @@ -1806,7 +1804,7 @@ Public Class RawPartPageUC m_CurrProjPage.ClearMessage() Else OkBtn.IsEnabled = False - m_CurrProjPage.SetErrorMessage(EgtMsg(MSG_RAWPARTPAGEUC + 47)) ' Errore nella posizione o dimensione del grezzo + m_CurrProjPage.SetErrorMessage(EgtMsg(90547)) ' Errore nella posizione o dimensione del grezzo End If Return True End Function @@ -1862,7 +1860,7 @@ Public Class RawPartPageUC m_CurrProjPage.ClearMessage() Else OkBtn.IsEnabled = False - m_CurrProjPage.SetErrorMessage(EgtMsg(MSG_RAWPARTPAGEUC + 47)) ' Errore nella posizione o dimensione del grezzo + m_CurrProjPage.SetErrorMessage(EgtMsg(90547)) ' Errore nella posizione o dimensione del grezzo End If ' Aggiorno visualizzazione EgtZoom(ZM.ALL) @@ -2136,7 +2134,7 @@ Public Class RawPartPageUC UpdateRawPart() Else LengthTxBx.Text = LenToString(m_RawLength, 2) - m_CurrProjPage.SetErrorMessage(EgtMsg(MSG_RAWPARTPAGEUC + 16) & " " & LenToString(dMaxLen, 2)) 'Massima lunghezza = + m_CurrProjPage.SetErrorMessage(EgtMsg(90516) & " " & LenToString(dMaxLen, 2)) ' Massima lunghezza = End If End Sub @@ -2160,7 +2158,7 @@ Public Class RawPartPageUC UpdateRawPart() Else WidthTxBx.Text = LenToString(m_RawWidth, 2) - m_CurrProjPage.SetErrorMessage(EgtMsg(MSG_RAWPARTPAGEUC + 17) & " " & LenToString(dMaxWidth, 2)) 'Massima larghezza = + m_CurrProjPage.SetErrorMessage(EgtMsg(90517) & " " & LenToString(dMaxWidth, 2)) ' Massima larghezza = End If RefTabModeChange() End Sub @@ -2192,7 +2190,7 @@ Public Class RawPartPageUC End If Else HeightTxBx.Text = LenToString(m_RawHeight, 3) - m_CurrProjPage.SetErrorMessage(EgtMsg(MSG_RAWPARTPAGEUC + 18)) 'Non sono ammessi spessori negativi + m_CurrProjPage.SetErrorMessage(EgtMsg(90518)) ' Non sono ammessi spessori negativi End If RefTabModeChange() End Sub @@ -2215,7 +2213,7 @@ Public Class RawPartPageUC UpdateRawPart() Else OffsetXTxBx.Text = LenToString(m_RawOffsX, 2) - m_CurrProjPage.SetErrorMessage(EgtMsg(MSG_RAWPARTPAGEUC + 19) & " " & LenToString(dMinOffsetX, 2)) 'Minimo offset X = + m_CurrProjPage.SetErrorMessage(EgtMsg(90519) & " " & LenToString(dMinOffsetX, 2)) ' Minimo offset X = End If End Sub @@ -2237,7 +2235,7 @@ Public Class RawPartPageUC UpdateRawPart() Else OffsetYTxBx.Text = LenToString(m_RawOffsY, 2) - m_CurrProjPage.SetErrorMessage(EgtMsg(MSG_RAWPARTPAGEUC + 20) & " " & LenToString(dMinOffsetY, 2)) 'Minimo offset Y = + m_CurrProjPage.SetErrorMessage(EgtMsg(90520) & " " & LenToString(dMinOffsetY, 2)) ' Minimo offset Y = End If End Sub @@ -2549,10 +2547,10 @@ Public Class RawPartPageUC EgtDraw() ElseIf dKerf < dMinKerf Then KerfTxBx.Text = LenToString(m_RawKerf, 2) - m_CurrProjPage.SetErrorMessage(EgtMsg(MSG_RAWPARTPAGEUC + 21) & " " & LenToString(dMinKerf, 2)) 'Minimo kerf = + m_CurrProjPage.SetErrorMessage(EgtMsg(90521) & " " & LenToString(dMinKerf, 2)) ' Minimo kerf = Else KerfTxBx.Text = LenToString(m_RawKerf, 2) - m_CurrProjPage.SetErrorMessage(EgtMsg(MSG_RAWPARTPAGEUC + 22) & " " & LenToString(dMaxKerf, 2)) 'Massimo kerf = + m_CurrProjPage.SetErrorMessage(EgtMsg(90522) & " " & LenToString(dMaxKerf, 2)) ' Massimo kerf = End If ' Verifico se attivare la visualizzazione dell'area sicura (prendo la posizione corrente come posizione di partenza) DrawSafetyZone(m_RawHeight, m_CurrentMachine.dHighPieceZ, New Vector3d(0, 0, 0)) @@ -2615,7 +2613,7 @@ Public Class RawPartPageUC Writer.Close() ' Verifico se sono connesso alla macchina prima di continuare If Not m_MainWindow.m_bNCLink Then - m_CurrProjPage.SetWarningMessage(EgtMsg(90316)) 'Non connesso alla macchina + m_CurrProjPage.SetWarningMessage(EgtMsg(90316)) ' Non connesso alla macchina m_bProbingOn = False Return End If @@ -2635,7 +2633,7 @@ Public Class RawPartPageUC System.Threading.Thread.Sleep(300) m_MainWindow.m_CNCommunication.m_CN.DGeneralFunctions_CycleStart() ' Creo MsgBox di attesa - Dim MsgBoxStateInfo As New EgtMsgBox(m_MainWindow, EgtMsg(MSG_RAWPARTPAGEUC + 25), EgtMsg(MSG_RAWPARTPAGEUC + 26), True, EgtMsgBox.Buttons.CANCEL, EgtMsgBox.Icons.NULL) + Dim MsgBoxStateInfo As New EgtMsgBox(m_MainWindow, EgtMsg(90525), EgtMsg(90526), True, EgtMsgBox.Buttons.CANCEL, EgtMsgBox.Icons.NULL) ' Tastatura grezzo Tastatura in corso... Dim ProbingStateNameVar As String = String.Empty GetPrivateProfileString(S_MACH_PROBING, K_PROBINGSTATEVAR, "", ProbingStateNameVar, m_MainWindow.GetMachIniFile()) m_MainWindow.m_CNCommunication.m_CN.n_DReadELS_handle = 0 @@ -2685,8 +2683,8 @@ Public Class RawPartPageUC bRead = True Dim RawThickness As Double = m_MainWindow.m_CNCommunication.m_CN.d_DReadELS_value MsgBoxStateInfo.LoadingPrBr_Value = 100 - MsgBoxStateInfo.Text = EgtMsg(MSG_RAWPARTPAGEUC + 27) ' Tastatura completata con successo - m_MainWindow.m_CurrentProjectPageUC.SetInfoMessage(EgtMsg(MSG_RAWPARTPAGEUC + 27)) + MsgBoxStateInfo.Text = EgtMsg(90527) ' Tastatura completata con successo + m_MainWindow.m_CurrentProjectPageUC.SetInfoMessage(EgtMsg(90527)) EgtOutLog("RawThickness=" & RawThickness.ToString()) ' Costringo ad aggiornare UI UpdateUI() @@ -2714,7 +2712,7 @@ Public Class RawPartPageUC End If Else HeightTxBx.Text = LenToString(m_RawHeight, 3) - m_CurrProjPage.SetErrorMessage(EgtMsg(MSG_RAWPARTPAGEUC + 18)) 'Non sono ammessi spessori negativi + m_CurrProjPage.SetErrorMessage(EgtMsg(90518)) 'Non sono ammessi spessori negativi End If ' Chiudo msgbox System.Threading.Thread.Sleep(3000) @@ -2727,8 +2725,8 @@ Public Class RawPartPageUC End If ' Se tastatura non riuscita If Not bProbingOk Then - MsgBoxStateInfo.Text = EgtMsg(MSG_RAWPARTPAGEUC + 28) 'Errore nella tastatura del grezzo - m_MainWindow.m_CurrentProjectPageUC.SetErrorMessage(EgtMsg(MSG_RAWPARTPAGEUC + 28)) + MsgBoxStateInfo.Text = EgtMsg(90528) 'Errore nella tastatura del grezzo + m_MainWindow.m_CurrentProjectPageUC.SetErrorMessage(EgtMsg(90528)) EgtOutLog("RawProbing error") ' Costringo ad aggiornare GUI UpdateUI() diff --git a/RawPhoto/SlabIdWD.xaml b/RawPhoto/SlabIdWD.xaml index a5f08dd..9e59da1 100644 --- a/RawPhoto/SlabIdWD.xaml +++ b/RawPhoto/SlabIdWD.xaml @@ -1,10 +1,10 @@  + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib" + FontFamily="{DynamicResource OmagCut_Font}" + ResizeMode="NoResize" WindowStyle="None" AllowsTransparency="True" Background="Transparent" + Title="SaveNameWD" Height="305.9" Width="426.5" ShowInTaskbar="False"> @@ -25,14 +25,14 @@ + Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/> + Style="{DynamicResource OmagCut_KeyboardTextBox}"/> + Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/> + Style="{DynamicResource OmagCut_CalculatorTextBox}"/> @@ -45,12 +45,12 @@ diff --git a/RawPhoto/SlabIdWD.xaml.vb b/RawPhoto/SlabIdWD.xaml.vb index c35bf12..a11e2a1 100644 --- a/RawPhoto/SlabIdWD.xaml.vb +++ b/RawPhoto/SlabIdWD.xaml.vb @@ -1,6 +1,4 @@ -Imports System.IO -Imports EgtUILib -Imports EgtWPFLib +Imports EgtUILib Public Class SlabIdWD @@ -33,8 +31,8 @@ Public Class SlabIdWD Private Sub SlabIdWD_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized Me.Top = Owner.Top + Owner.Height / 2 - Me.Height / 2 Me.Left = Owner.Left + Owner.Width / 2 - Me.Width / 2 - BlockNameTxBl.Text = EgtMsg(90882) 'Blocco - SlabNbrTxBl.Text = EgtMsg(90883) 'Numero + BlockNameTxBl.Text = EgtMsg(90882) ' Blocco + SlabNbrTxBl.Text = EgtMsg(90883) ' Numero End Sub Private Sub SlabIdWD_Loaded(sender As Object, e As EventArgs) Handles Me.Loaded diff --git a/Simulation/SimulationPageUC.xaml b/Simulation/SimulationPageUC.xaml index 397007a..08985d0 100644 --- a/Simulation/SimulationPageUC.xaml +++ b/Simulation/SimulationPageUC.xaml @@ -1,11 +1,11 @@  + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + mc:Ignorable="d" + d:DesignHeight="853.3" d:DesignWidth="1280" Initialized="SimulationPage_Initialized" Loaded="SimulationPage_Loaded"> @@ -28,8 +28,8 @@ @@ -66,27 +66,28 @@ + Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/> + Style="{DynamicResource OmagCut_FixedTextBox}"/> + Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/> - + Style="{DynamicResource OmagCut_FixedTextBox}"/> + + Style="{DynamicResource OmagCut_FixedTextBox}"/> + Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/> + Style="{DynamicResource OmagCut_FixedTextBox}"/> + Background="{DynamicResource OmagCut_LightGray}"> @@ -94,9 +95,9 @@ + VerticalAlignment="Center" TextAlignment="Center" TextWrapping="Wrap" /> + Width="120" Style="{DynamicResource OmagCut_FixedTextBox}" TextAlignment="Right"/> @@ -104,9 +105,9 @@ + VerticalAlignment="Center" TextAlignment="Center" TextWrapping="Wrap" /> + Width="120" Style="{DynamicResource OmagCut_FixedTextBox}" TextAlignment="Right"/> @@ -114,9 +115,9 @@ + VerticalAlignment="Center" TextAlignment="Center" TextWrapping="Wrap" /> + Width="120" Style="{DynamicResource OmagCut_FixedTextBox}" TextAlignment="Right"/> @@ -124,9 +125,9 @@ + VerticalAlignment="Center" TextAlignment="Center" TextWrapping="Wrap" /> + Width="120" Style="{DynamicResource OmagCut_FixedTextBox}" TextAlignment="Right"/> @@ -134,9 +135,9 @@ + VerticalAlignment="Center" TextAlignment="Center" TextWrapping="Wrap" /> + Width="120" Style="{DynamicResource OmagCut_FixedTextBox}" TextAlignment="Right"/> @@ -144,9 +145,9 @@ + VerticalAlignment="Center" TextAlignment="Center" TextWrapping="Wrap" /> + Width="120" Style="{DynamicResource OmagCut_FixedTextBox}" TextAlignment="Right"/> @@ -154,9 +155,9 @@ + VerticalAlignment="Center" TextAlignment="Center" TextWrapping="Wrap" /> + Width="120" Style="{DynamicResource OmagCut_FixedTextBox}" TextAlignment="Right"/> @@ -164,9 +165,9 @@ + VerticalAlignment="Center" TextAlignment="Center" TextWrapping="Wrap" /> + Width="120" Style="{DynamicResource OmagCut_FixedTextBox}" TextAlignment="Right"/> @@ -174,9 +175,9 @@ + VerticalAlignment="Center" TextAlignment="Center" TextWrapping="Wrap" /> + Width="120" Style="{DynamicResource OmagCut_FixedTextBox}" TextAlignment="Right"/> @@ -184,9 +185,9 @@ + VerticalAlignment="Center" TextAlignment="Center" TextWrapping="Wrap" /> + Width="120" Style="{DynamicResource OmagCut_FixedTextBox}" TextAlignment="Right"/> @@ -194,9 +195,9 @@ + VerticalAlignment="Center" TextAlignment="Center" /> + VerticalAlignment="Center" TextAlignment="Right" Margin="0,0,20,0" /> @@ -204,9 +205,9 @@ + VerticalAlignment="Center" Margin="0,0,0,0" TextTrimming="CharacterEllipsis" /> + VerticalAlignment="Center" TextAlignment="Right" Margin="0,0,20,0" /> @@ -215,21 +216,21 @@ + Maximum="100" TickPlacement="BottomRight" TickFrequency="10" ValueChanged="SpeedSlider_ValueChanged" Margin="13,4,13,0" /> @@ -241,10 +242,10 @@ diff --git a/Simulation/SimulationPageUC.xaml.vb b/Simulation/SimulationPageUC.xaml.vb index 312721a..3f4fe91 100644 --- a/Simulation/SimulationPageUC.xaml.vb +++ b/Simulation/SimulationPageUC.xaml.vb @@ -1,6 +1,5 @@ Imports System.Runtime.InteropServices Imports EgtUILib -Imports EgtWPFLib Public Class SimulationPageUC ' Riferimenti a pagine @@ -46,17 +45,17 @@ Public Class SimulationPageUC ' Ripristino visibilità standard EgtSetMachineLook(MCH_LOOK.TAB) ' Visualizzo eventuali testi con dati su aree - m_CurrProjPage.SetAreasStatus( True) + m_CurrProjPage.SetAreasStatus(True) End Sub Private Sub SimulationPage_Initialized(sender As Object, e As EventArgs) ' Impostazioni box stime m_bEstim = (GetPrivateProfileInt(S_MACH_ESTIMATIONS, K_ENABLEEST, 0, m_MainWindow.GetMachIniFile()) <> 0) If Not m_bEstim Then EstimGrid.Visibility = Windows.Visibility.Hidden - TimeTxBl.Text = EgtMsg(MSG_SIMULATIONPAGEUC + 15) ' Tempo - CutLenTxBl.Text = EgtMsg(MSG_SIMULATIONPAGEUC + 16) ' Lunghezza - NetAreaTxBl.Text = EgtMsg(MSG_SIMULATIONPAGEUC + 17) ' Area pezzi - UsageTxBl.Text = EgtMsg(MSG_SIMULATIONPAGEUC + 18) ' Utilizzo + TimeTxBl.Text = EgtMsg(90565) ' Tempo + CutLenTxBl.Text = EgtMsg(90566) ' Lunghezza + NetAreaTxBl.Text = EgtMsg(90567) ' Area pezzi + UsageTxBl.Text = EgtMsg(90568) ' Utilizzo ' Impostazioni box assi m_SimulationAxesNum = GetPrivateProfileInt(S_AXES, K_SIMULATIONAXESNUM, 5, m_MainWindow.GetMachIniFile()) For Index As Integer = 0 To AxesUniformGrid.Children.Count - 1 @@ -118,9 +117,9 @@ Public Class SimulationPageUC If bOk Then m_CurrProjPage.SetOrderMachiningFlag() Dim bModif As Boolean = TestAllMachiningsForStrict() If bModif Then - m_CurrProjPage.SetWarningMessage(EgtMsg(90321)) 'Ridotte alcune lavorazioni per evitare interferenze + m_CurrProjPage.SetWarningMessage(EgtMsg(90321)) ' Ridotte alcune lavorazioni per evitare interferenze Else - m_CurrProjPage.SetInfoMessage(EgtMsg(90399)) 'Aggiornate tutte le lavorazioni + m_CurrProjPage.SetInfoMessage(EgtMsg(90399)) ' Aggiornate tutte le lavorazioni End If End If ' Costringo ad aggiornare UI @@ -137,10 +136,10 @@ Public Class SimulationPageUC bOk = UpdateVacuumsForDrip() And bOk ' Se errore in setup, lo segnalo If Not bSetup Then - m_CurrProjPage.SetErrorMessage(EgtMsg(90322) & " " & sMissingTools) 'Mancano gli utensili : ... + m_CurrProjPage.SetErrorMessage(EgtMsg(90322) & " " & sMissingTools) ' Mancano gli utensili : ... ' Se errore in generazione, segnalo l'errore ElseIf Not bOk Then - m_CurrProjPage.SetErrorMessage(EgtMsg(90314)) 'Errore nella generazione del programma CN + m_CurrProjPage.SetErrorMessage(EgtMsg(90314)) ' Errore nella generazione del programma CN End If ' Costringo ad aggiornare UI UpdateUI() @@ -225,7 +224,7 @@ Public Class SimulationPageUC ExecSim() ' Aggiorno bottone SetPlayPauseBtnToPlay() - ' Alrimenti imposto solo il nuovo stato + ' Alrimenti imposto solo il nuovo stato Else SetStatus(MCH_SIM_ST.UI_STEP) ' Aggiornamenti per bottone Play/Pause @@ -312,7 +311,7 @@ Public Class SimulationPageUC ' Se tagli diretti restart non valido ed esco If GetDirectCutPart() <> GDB_ID.NULL Then Return ' Info - m_CurrProjPage.SetInfoMessage( EgtMsg(90359) & " (" & m_nRestart.ToString() & ")") 'Restart (n) + m_CurrProjPage.SetInfoMessage(EgtMsg(90359) & " (" & m_nRestart.ToString() & ")") ' Restart (n) ' Salto While m_nStatus <> MCH_SIM_ST.UI_STOP ' Eseguo movimento @@ -323,16 +322,16 @@ Public Class SimulationPageUC Dim nPhase As Integer = EgtGetCurrPhase() Dim sOpeName As String = "" Dim nOpeType As Integer = 0 - EgtSimGetOperationInfo( sOpeName, nOpeType) - If ( nPhase = m_nRestart And nOpeType <> MCH_OY.DISP) Or nPhase > m_nRestart Then - Exit While + EgtSimGetOperationInfo(sOpeName, nOpeType) + If (nPhase = m_nRestart And nOpeType <> MCH_OY.DISP) Or nPhase > m_nRestart Then + Exit While End If End While ' Aggiorno visualizzazione EgtDraw() ShowCncData() ' Info - m_CurrProjPage.SetInfoMessage( EgtMsg(90359) & " (" & m_nRestart.ToString() & ")") 'Restart (n) + m_CurrProjPage.SetInfoMessage(EgtMsg(90359) & " (" & m_nRestart.ToString() & ")") ' Restart (n) ' Aspetto nuova partenza m_nStatus = MCH_SIM_ST.UI_PAUSE SetPlayPauseBtnToPlay() @@ -340,7 +339,7 @@ Public Class SimulationPageUC Private Sub ExecSim() m_bSimExecuting = True - EgtSimStart( False) + EgtSimStart(False) LoadCurrTools() SkipForRestart() EgtSimSetStep(SpeedSlider.Value * m_SliderX) @@ -358,29 +357,29 @@ Public Class SimulationPageUC ' Aggiornamenti per bottone Play/Pause SetPlayPauseBtnToPlay() End If - ' Se movimento non riuscito + ' Se movimento non riuscito Else SetStatus(MCH_SIM_ST.UI_STOP) ' Aggiornamenti per bottone Play/Pause SetPlayPauseBtnToPlay() Select Case nMove - Case MCH_SIM.END_ - m_CurrProjPage.SetInfoMessage(EgtMsg(MSG_SIMULATIONPAGEUC + 1)) 'Simulazione completata - Case MCH_SIM.STOP_ + Case MCH_SIM.END_ + m_CurrProjPage.SetInfoMessage(EgtMsg(90551)) ' Simulazione completata + Case MCH_SIM.STOP_ ' Simulazione fermata dall'utente (non necessita messaggio) - Case MCH_SIM.OUTSTROKE - Dim sInfo As String = String.Empty - EgtGetOutstrokeInfo(sInfo) - m_CurrProjPage.SetErrorMessage(EgtMsg(MSG_SIMULATIONPAGEUC + 2) & " " & sInfo) 'Extracorsa ... - Case MCH_SIM.DIR_ERR - m_CurrProjPage.SetErrorMessage(EgtMsg(MSG_SIMULATIONPAGEUC + 3)) 'Direzione utensile irraggiungibile - Case Else - If EgtGetLastMachMgrErrorId() <> 0 Then - Dim sErr As String = EgtGetLastMachMgrErrorString() - m_CurrProjPage.SetErrorMessage(sErr) - Else - m_CurrProjPage.SetErrorMessage(EgtMsg(MSG_SIMULATIONPAGEUC + 4)) 'Errore - End If + Case MCH_SIM.OUTSTROKE + Dim sInfo As String = String.Empty + EgtGetOutstrokeInfo(sInfo) + m_CurrProjPage.SetErrorMessage(EgtMsg(90552) & " " & sInfo) ' Extracorsa ... + Case MCH_SIM.DIR_ERR + m_CurrProjPage.SetErrorMessage(EgtMsg(90553)) ' Direzione utensile irraggiungibile + Case Else + If EgtGetLastMachMgrErrorId() <> 0 Then + Dim sErr As String = EgtGetLastMachMgrErrorString() + m_CurrProjPage.SetErrorMessage(sErr) + Else + m_CurrProjPage.SetErrorMessage(EgtMsg(90554)) ' Errore + End If End Select End If ' Aggiorno stato visualizzazione macchina (dipende anche da utensile) @@ -521,12 +520,12 @@ Public Class SimulationPageUC Private Sub MachViewModeBtn_Click(sender As Object, e As RoutedEventArgs) Handles MachViewModeBtn.Click ' aggiorno lo stato Select Case m_nMachLook - Case MCH_LOOK.ALL - m_nMachLook = MCH_LOOK.TAB_HEAD - Case MCH_LOOK.TAB_HEAD - m_nMachLook = MCH_LOOK.TAB_TOOL - Case Else - m_nMachLook = MCH_LOOK.ALL + Case MCH_LOOK.ALL + m_nMachLook = MCH_LOOK.TAB_HEAD + Case MCH_LOOK.TAB_HEAD + m_nMachLook = MCH_LOOK.TAB_TOOL + Case Else + m_nMachLook = MCH_LOOK.ALL End Select ' aggiorno lo stato della macchina e la sua visualizzazione EgtSetMachineLook(m_nMachLook) @@ -608,10 +607,10 @@ Public Class SimulationPageUC ' Se in Tagli Diretti If m_MainWindow.DirectCutBtn.IsChecked And Not m_MainWindow.CadCutBtn.IsChecked Then sFileName = "DirectCut" - ' Altrimenti in Tagli Cad + ' Altrimenti in Tagli Cad Else Dim nIndexTab As Integer = CamAuto.GetCurrentTable() - Dim sIndexTab As String = If( nIndexTab > 0, nIndexTab.ToString, "") + Dim sIndexTab As String = If(nIndexTab > 0, nIndexTab.ToString, "") sFileName = "CadCut" & sIndexTab End If Dim sCncPath As String = m_MainWindow.GetCncDir() & "\" & sFileName & m_MainWindow.m_CurrentMachine.sIsoFileExt @@ -623,9 +622,9 @@ Public Class SimulationPageUC ' Ripristino come fase corrente quella iniziale EgtSetCurrPhase(1) If bOk Then - m_CurrProjPage.SetInfoMessage(EgtMsg(90571) & sFileName & m_MainWindow.m_CurrentMachine.sIsoFileExt) ' Genarato file + m_CurrProjPage.SetInfoMessage(EgtMsg(90571) & sFileName & m_MainWindow.m_CurrentMachine.sIsoFileExt) ' Genarato file Else - m_CurrProjPage.SetErrorMessage(EgtMsg(90314)) 'Errore nella generazione del programma CN + m_CurrProjPage.SetErrorMessage(EgtMsg(90314)) ' Errore nella generazione del programma CN End If ' procedo all'apertura del file CadCut1 appena generato (solo se generazione corretta) If bOk And IsPressedShiftKey Then diff --git a/Utility/Utility.vb b/Utility/Utility.vb index 4f9bc7d..d3164ea 100644 --- a/Utility/Utility.vb +++ b/Utility/Utility.vb @@ -313,7 +313,7 @@ Module Utility Friend Function DistToString(vtDist As Vector3d) As String Dim nDec As Integer = If(EgtUiUnitsAreMM(), 1, 2) - Dim sDistance As String = EgtMsg(1301) 'Dist= + Dim sDistance As String = EgtMsg(1301) ' Dist= sDistance &= LenToString(vtDist.Len(), nDec) & vbCrLf sDistance &= " dX=" & LenToString(vtDist.x, nDec) sDistance &= " dY=" & LenToString(vtDist.y, nDec) diff --git a/VeinMatching/VeinMatchingWindow.xaml b/VeinMatching/VeinMatchingWindow.xaml index 547f7de..b96d8fa 100644 --- a/VeinMatching/VeinMatchingWindow.xaml +++ b/VeinMatching/VeinMatchingWindow.xaml @@ -1,80 +1,80 @@  + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + TextBlock.FontFamily="{DynamicResource OmagCut_Font}" + Height="500" Width="500" ShowInTaskbar="False" Initialized="Window_Initialized" MinWidth="300" MinHeight="300"> - - - - - - - - @@ -38,5 +38,5 @@ - + diff --git a/WorkInProgress/WorkInProgressPageUC.xaml.vb b/WorkInProgress/WorkInProgressPageUC.xaml.vb index 106c048..9c96455 100644 --- a/WorkInProgress/WorkInProgressPageUC.xaml.vb +++ b/WorkInProgress/WorkInProgressPageUC.xaml.vb @@ -1,5 +1,4 @@ Imports System.Windows.Threading -Imports System.Threading Imports EgtUILib Imports EgtWPFLib @@ -324,16 +323,16 @@ Public Class WorkInProgressPageUC ' Flag per riavvio programma Dim bRestart As Boolean = False #If TRIAL Then - Dim MissingKeyWnd As New EgtMsgBox(m_MainWindow, EgtMsg(MSG_MISSINGKEYWD + 1), EgtMsg(MSG_MISSINGKEYWD + 5) & " " & EgtMsg(MSG_MISSINGKEYWD + 7), EgtMsgBox.Buttons.OK, EgtMsgBox.Icons.NULL, 0, 1) + Dim MissingKeyWnd As New EgtMsgBox(m_MainWindow, EgtMsg(10101), EgtMsg(10105) & " " & EgtMsg(10107), EgtMsgBox.Buttons.OK, EgtMsgBox.Icons.NULL, 0, 1) #Else ' Se manca la chiave If m_MainWindow.GetKeyLevel() = -1 Or m_MainWindow.GetKeyLevel() = -2 Then If Not EgtGetNetHwKey() Then EgtOutLog("Missing Dongle") ' Box di avviso chiave mancante : "Chiave non presente. \n Inserirla e riavviare il programma." "Errore" - Dim sText As String = EgtMsg(MSG_MISSINGKEYWD + 2) & vbCrLf & EgtMsg(MSG_MISSINGKEYWD + 3) - Dim sTitle As String = EgtMsg(MSG_MISSINGKEYWD + 1) - 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 sText As String = EgtMsg(10102) & vbCrLf & EgtMsg(10103) + Dim sTitle As String = EgtMsg(10101) + Dim MissingKeyWnd As New EgtMsgBox(m_MainWindow, sTitle, sText, EgtMsgBox.Buttons.OK, EgtMsgBox.Icons.NULL) Else EgtOutLog("NetDongle is full") ' Box di avviso slot chiave di rete occupato : "Chiave di Rete completamente occupata. \n Uscire dal programma su un altro PC." "Errore" @@ -352,8 +351,8 @@ Public Class WorkInProgressPageUC EgtOutLog("Problems with Licence") ' Box di avviso licenza con problemi : "Programma senza licenza. \n Caricala e riavvia il programma." "Errore" Dim sKeyInfo As String = "" : EgtGetKeyInfo(sKeyInfo) - Dim sText As String = sKeyInfo & vbCrLf & EgtMsg(MSG_MISSINGKEYWD + 5) & vbCrLf & EgtMsg(MSG_MISSINGKEYWD + 6) - Dim sTitle As String = EgtMsg(MSG_MISSINGKEYWD + 1) + Dim sText As String = sKeyInfo & vbCrLf & EgtMsg(10105) & vbCrLf & EgtMsg(10106) + Dim sTitle As String = EgtMsg(10101) Dim MissingKeyWnd As New EgtMsgBox(m_MainWindow, sTitle, sText, EgtMsgBox.Buttons.OK, EgtMsgBox.Icons.NULL, 0, 2) If MissingKeyWnd.DialogResult = True Then ' Apro dialogo per richiesta file licenza