diff --git a/CAM/CamAuto.vb b/CAM/CamAuto.vb index 2676876..0bbd66f 100644 --- a/CAM/CamAuto.vb +++ b/CAM/CamAuto.vb @@ -199,22 +199,22 @@ Friend Module CamAuto ' ripristina la lavorazone indicata di default per i tagli inclinati Private Sub SetResetDef_Machining(nEntId As Integer, sSawingTilted As String, bApplySawingTilted As Boolean, bOnlySideAng As Boolean) While nEntId <> GDB_ID.NULL - Dim sInfoSIdeAng As String = String.Empty - EgtGetInfo(nEntId, INFO_SIDE_ANGLE, sInfoSIdeAng) + Dim sInfoOrigSideAng As String = String.Empty + EgtGetInfo(nEntId, INFO_ORIG_SIDE_ANGLE, sInfoOrigSideAng) ' Se è un'entità associata ad una lavorazione inclinata - If Not String.IsNullOrEmpty(sInfoSIdeAng) Then + If Not String.IsNullOrEmpty(sInfoOrigSideAng) AndAlso sInfoOrigSideAng <> "0" Then If bApplySawingTilted Then ' forzo la lavorazione inclinata If String.IsNullOrEmpty(sSawingTilted) Then ' ma se non esiste nessuna lavorezione specifica applico qualla standard - EgtRemoveInfo(nEntId, DEF_MACHINING) + EgtRemoveInfo(nEntId, DEF_MACHINING_TILTED) Else ' Applico quella specificata - EgtSetInfo(nEntId, DEF_MACHINING, sSawingTilted) + EgtSetInfo(nEntId, DEF_MACHINING_TILTED, sSawingTilted) End If Else ' Rimuovo la lavorazione e applico quella standard - EgtRemoveInfo(nEntId, DEF_MACHINING) + EgtRemoveInfo(nEntId, DEF_MACHINING_TILTED) End If ElseIf Not bOnlySideAng Then @@ -1056,20 +1056,24 @@ Friend Module CamAuto If EgtGetTableId(MAIN_TAB) = GDB_ID.NULL Then Return 0 If EgtGetTableId(SECOND_TAB) = GDB_ID.NULL Then Return 1 If EgtGetTableId(THIRD_TAB) = GDB_ID.NULL Then Return 2 - Return 3 + If EgtGetTableId(FORTH_TAB) = GDB_ID.NULL Then Return 3 + Return 4 End Function Friend Function GetTableName(nInd As Integer) As String If nInd = 1 Then Return MAIN_TAB If nInd = 2 Then Return SECOND_TAB If nInd = 3 Then Return THIRD_TAB + If nInd = 4 Then Return FORTH_TAB Return "" End Function Friend Function GetCurrentTable() As Integer Dim sTabName As String = MAIN_TAB EgtGetTableName(sTabName) - If sTabName = THIRD_TAB Then + If sTabName = FORTH_TAB Then + Return 4 + ElseIf sTabName = THIRD_TAB Then Return 3 ElseIf sTabName = SECOND_TAB Then Return 2 diff --git a/CadCuts/ChangeToolWD.xaml.vb b/CadCuts/ChangeToolWD.xaml.vb index 1d09cbe..35ef9f3 100644 --- a/CadCuts/ChangeToolWD.xaml.vb +++ b/CadCuts/ChangeToolWD.xaml.vb @@ -54,6 +54,11 @@ Public Class ChangeToolWD Private Sub GetDiamAndThickDefaultSaw() m_DefaultSaw_Name = m_MainWindow.m_CurrentMachine.sCurrSaw + ' Dalla lavorazione corrente recupero il nome della lama + If EgtMdbSetCurrMachining(m_CurrSawing) Then + Dim sNameTool As String = String.Empty + If EgtMdbGetCurrMachiningParam(MCH_MP.TOOL, sNameTool) Then m_DefaultSaw_Name = sNameTool + End If If EgtTdbSetCurrTool(m_DefaultSaw_Name) Then ' Diametro lama lavorazione EgtTdbGetCurrToolParam(MCH_TP.DIAM, m_DefaultSaw_Diam) diff --git a/CadCuts/MoveRawPartPage.xaml.vb b/CadCuts/MoveRawPartPage.xaml.vb index e558c2c..74b04ab 100644 --- a/CadCuts/MoveRawPartPage.xaml.vb +++ b/CadCuts/MoveRawPartPage.xaml.vb @@ -44,8 +44,8 @@ Public Class MoveRawPartPage RemovePartBtn.Content = EgtMsg(MSG_MOVERAWPAGEUC + 1) 'Rimuovi ModifyBtn.Content = EgtMsg(MSG_SPLITPAGEUC + 17) 'Modifica ResetBtn.Content = EgtMsg(MSG_NESTPAGEUC + 6) 'Reset - ScrapsBtn.Content = "Add Scraps" - UnloadPartsBtn.Content = "Move part" + 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 @@ -124,10 +124,10 @@ Public Class MoveRawPartPage If m_SplitPage.m_bOnAuxTab And m_SplitPage.m_bEnableOnAuxTab Then ' assegnazione delle info tavola ausiliaria alla dispozione corrente (Spostato nella funzione Refresh) SetAuxTabInCurrDisposition() - UnloadPartsBtn.Content = "Go to MOVE part" + UnloadPartsBtn.Content = EgtMsg(90368) ' Go to MOVE part ' altrimenti, aggiorno visualizzazione ElseIf Not m_SplitPage.m_bOnAuxTab And m_SplitPage.m_bEnableOnAuxTab Then - UnloadPartsBtn.Content = "Go to UNLOAD part" + UnloadPartsBtn.Content = EgtMsg(90369) ' Go to UNLOAD part End If '---------------------------- AUX TABLE ---------------------------- EgtDraw() @@ -215,10 +215,10 @@ Public Class MoveRawPartPage Else UnloadPartsBtn.Visibility = Visibility.Visible If m_SplitPage.m_bOnAuxTab Then - UnloadPartsBtn.Content = "Go to MOVE part" + UnloadPartsBtn.Content = EgtMsg(90368) ' Go to MOVE part ' altrimenti, aggiorno visualizzazione Else - UnloadPartsBtn.Content = "Go to UNLOAD part" + UnloadPartsBtn.Content = EgtMsg(90369) ' Go to UNLOAD part End If End If ' Aggiorno interfaccia per taglio perpendicolare @@ -342,7 +342,7 @@ Public Class MoveRawPartPage If VerifyCollisionWithOtherRawPart(nId) Then ' mantengo la selezione del pezzo EgtSetStatus(nId, GDB_ST.SEL) - m_CurrProjPage.SetErrorMessage("Collisione pezzi") + m_CurrProjPage.SetErrorMessage(EgtMsg(91231)) ' Collisione pezzi Else ' Se con ventose, le nascondo If Not m_bByHand Then EgtSetStatus(GetVacuumId(), GDB_ST.OFF) @@ -352,7 +352,7 @@ Public Class MoveRawPartPage If VerifyCollisionWithOtherRawPart(m_CurrRawOnVacuum) Then ' mantengo la selezione del pezzo EgtSetStatus(m_CurrRawOnVacuum, GDB_ST.SEL) - m_CurrProjPage.SetErrorMessage("Collisione pezzi") + m_CurrProjPage.SetErrorMessage(EgtMsg(91231)) ' Collisione pezzi EgtDraw() ' esco dal ciclo, prima devo depositare correttamente il pezzo Exit While @@ -361,7 +361,7 @@ Public Class MoveRawPartPage If VerifyCollisionWithOtherRawPart(nId, True) Then ' mantengo la selezione del pezzo EgtSetStatus(m_CurrRawOnVacuum, GDB_ST.SEL) - m_CurrProjPage.SetErrorMessage("Collisione pezzi") + m_CurrProjPage.SetErrorMessage(EgtMsg(91231)) ' Collisione pezzi EgtDraw() ' esco dal ciclo, prima devo depositare correttamente il pezzo Exit While @@ -538,18 +538,18 @@ Public Class MoveRawPartPage If EgtGetInfo(nMyId, K_ISNEWSCRAPS, nVal) Then If nVal = 1 Or nVal = 2 Then ' 1 → è stato definito come nuovo grezzo oppure, 2 → è stato definito come nuovo grezzo ed è stato inserito nel DB delle lastre - ScrapsBtn.Content = "Remove Scrap" + ScrapsBtn.Content = EgtMsg(91228) ' Remove Scrap ScrapsBtn.IsEnabled = True And Not m_SplitPage.m_bShow Return True ElseIf nVal = 3 Then ' non è possibile rimuovere il grezzo in questa fase - ScrapsBtn.Content = "Defined as Scrap" + ScrapsBtn.Content = EgtMsg(91229) ' Defined as Scrap ScrapsBtn.IsEnabled = False Return True End If End If ' non è un nuovo grezzo - ScrapsBtn.Content = "Add Scrap" + ScrapsBtn.Content = EgtMsg(91230) ' Add Scrap ScrapsBtn.IsEnabled = True And Not m_SplitPage.m_bShow Return False End Function diff --git a/CadCuts/NestPageUC.xaml.vb b/CadCuts/NestPageUC.xaml.vb index 187c1db..6bac666 100644 --- a/CadCuts/NestPageUC.xaml.vb +++ b/CadCuts/NestPageUC.xaml.vb @@ -110,7 +110,7 @@ Public Class NestPageUC 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 = "Strech" + DragRettanleBtn.ToolTip = EgtMsg(91207) 'Strech ' Nascondo i pulsanti in uso quando attivo la modalità REG UG0_Reg.Visibility = Visibility.Hidden @@ -356,7 +356,7 @@ Public Class NestPageUC End While If nIdMy = GDB_ID.NULL Then m_MainWindow.m_CurrentProjectPageUC.ClearMessage() - m_MainWindow.m_CurrentProjectPageUC.SetErrorMessage("Select OUTLOOP") + m_MainWindow.m_CurrentProjectPageUC.SetErrorMessage(EgtMsg(91208)) ' Select OUTLOOP End If Return End Sub @@ -544,7 +544,7 @@ Public Class NestPageUC m_nIdSelectedOutLoopRettangle = nIdParent If Not IsRettangle(m_SideListRettangle) Then m_CurrProjPage.ClearMessage() - m_CurrProjPage.SetWarningMessage("Non è un rettangolo (0)") + m_CurrProjPage.SetWarningMessage(EgtMsg(91209)) ' Non è un rettangolo (0) Return End If ' recupero il gruppo della lavorazione associata @@ -553,13 +553,13 @@ Public Class NestPageUC ' se non esiste un gruppo di lavorazione associato allora esco If nIdPV = GDB_ID.NULL Then m_CurrProjPage.ClearMessage() - m_CurrProjPage.SetWarningMessage("Pezzo in parcheggio (1)") + m_CurrProjPage.SetWarningMessage(EgtMsg(91210)) ' Pezzo in parcheggio (1) Return End If ' se esiste ma è vuoto (pezzo scaricato da tavola) If EgtGetFirstInGroup(nIdPV) = GDB_ID.NULL Then m_CurrProjPage.ClearMessage() - m_CurrProjPage.SetWarningMessage("Pezzo in parcheggio (2)") + m_CurrProjPage.SetWarningMessage(EgtMsg(91211)) ' Pezzo in parcheggio (2) Return End If ' Devo verificare che sia una lavorazione solo di lama? @@ -1017,7 +1017,7 @@ Public Class NestPageUC AddPointRegBtn.IsChecked = False Else m_MainWindow.m_CurrentProjectPageUC.ClearMessage() - m_MainWindow.m_CurrentProjectPageUC.SetWarningMessage("Max spot for reg: " & m_nCountSpot.ToString) + m_MainWindow.m_CurrentProjectPageUC.SetWarningMessage(EgtMsg(91212) & m_nCountSpot.ToString) ' Max spot for reg: End If ElseIf RemovePointRegBtn.IsChecked Then ' Verifico se selezionato indicativo di pezzo @@ -1179,12 +1179,18 @@ Public Class NestPageUC Exit While Else ' verifico se l'elemento selezionato è il nome della tavola - If EgtGetType(nId) = GDB_TY.EXT_TEXT AndAlso (sNamePartId = MAIN_TAB Or sNamePartId = SECOND_TAB) Then + If EgtGetType(nId) = GDB_TY.EXT_TEXT AndAlso (sNamePartId = MAIN_TAB Or + sNamePartId = SECOND_TAB Or + sNamePartId = THIRD_TAB Or + sNamePartId = FORTH_TAB) Then + ' Apro la finestra per la selezione della tavola da usare Dim nRes As Integer = m_MainWindow.m_CadCutPageUC.m_ProjectMgr.ChangeTable() ' se non è stata eseguita nessuna scelta esco dal ciclo If nRes = 0 Then Exit While - ' imposto l'altra tavola - Dim sOtherTab = If(sNamePartId = MAIN_TAB, SECOND_TAB, MAIN_TAB) + + ' recupero il nome della tavola corrente + Dim sOtherTab As String = GetTableName(nRes) + EgtChangeTable(sOtherTab, True) m_CurrProjPage.AdjustAdditionalTable(True) EgtSetMachineLook(MCH_LOOK.TAB) @@ -2997,11 +3003,12 @@ Math.Abs(e.Location.Y - m_locPrev.Y) < m_nRestRadius Then If ParkIndBtn.IsChecked Then m_SelParkInd.UpdateList() End If - UpdateImageParkInd() + ' abilito la notofica di modifica + UpdateImageParkInd(False) End Sub ' Aggiorna immagine e restituisce il numero di parcheggi (+1) disponibili (+1 perchè conto anche il comando All_Off) - Private Function UpdateImageParkInd() As Integer + Private Function UpdateImageParkInd(Optional bDisableModified As Boolean = True) As Integer ' Carcico la lista dei parcheggi Dim ListparkInd As New List(Of ParkInd) SelParkIndWD.LoadParkInd(ListparkInd) @@ -3016,6 +3023,11 @@ Math.Abs(e.Location.Y - m_locPrev.Y) < m_nRestRadius Then End If ParkIndImg.Source = ImageConverter.ConvertFromString(s) Else + Dim bOldEnMod As Boolean = False + If bDisableModified Then + bOldEnMod = EgtGetEnableModified() + If bOldEnMod Then EgtDisableModified() + End If ' Se il comando non è abilitato allora provvedo a selezionare il primo parcheggio Dim CurrparkInd As ParkInd = SelParkIndWD.GetCurrentParkIndSelected() If Not IsNothing(CurrparkInd) Then @@ -3026,6 +3038,8 @@ Math.Abs(e.Location.Y - m_locPrev.Y) < m_nRestRadius Then SelParkIndWD.SetStatusPartInParkInd(ListparkInd(1), True) End If End If + ' Se necessario, ripristino precedente impostazione modificato + If bOldEnMod Then EgtEnableModified() End If Return nCount End Function @@ -3174,7 +3188,8 @@ Math.Abs(e.Location.Y - m_locPrev.Y) < m_nRestRadius Then If Not IsNothing(m_SelParkInd) Then m_SelParkInd.UpdateList() End If - UpdateImageParkInd() + ' abilito la notofica di modifica + UpdateImageParkInd(False) End Sub @@ -3701,7 +3716,7 @@ Math.Abs(e.Location.Y - m_locPrev.Y) < m_nRestRadius Then ' Verifico che almeno un punto sia stato inserito If m_nCountSpotCUT < 1 Then m_MainWindow.m_CurrentProjectPageUC.ClearMessage() - m_MainWindow.m_CurrentProjectPageUC.SetWarningMessage("Insert one spot reg to start.") + m_MainWindow.m_CurrentProjectPageUC.SetWarningMessage(EgtMsg(91213)) ' Insert one spot reg to start. End If ' recupero l'elenco non ordinato degli Id dei punti SpotReg (da Office) diff --git a/CadCuts/SelectPartFromFamilyWD.xaml.vb b/CadCuts/SelectPartFromFamilyWD.xaml.vb index fb86a0e..f6c9e51 100644 --- a/CadCuts/SelectPartFromFamilyWD.xaml.vb +++ b/CadCuts/SelectPartFromFamilyWD.xaml.vb @@ -33,8 +33,8 @@ Me.Top = Owner.Top + Owner.Height / 2 - Me.Height / 2 Me.Left = Owner.Left + Owner.Width / 2 - Me.Width / 2 - TitleWDTxbl.Text = "Selection parts" - NbrOfPartsMsg.Text = "Number of parts" + TitleWDTxbl.Text = EgtUILib.EgtMsg(91232) ' Selection parts + NbrOfPartsMsg.Text = EgtUILib.EgtMsg(91233) ' Number of parts NbrOfParts.Text = m_NumberOfParts.ToString End Sub diff --git a/CadCuts/SelectTableWD.xaml b/CadCuts/SelectTableWD.xaml new file mode 100644 index 0000000..25c1d21 --- /dev/null +++ b/CadCuts/SelectTableWD.xaml @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CadCuts/SelectTableWD.xaml.vb b/CadCuts/SelectTableWD.xaml.vb new file mode 100644 index 0000000..54d14bc --- /dev/null +++ b/CadCuts/SelectTableWD.xaml.vb @@ -0,0 +1,96 @@ +Imports System.ComponentModel + +Public Class SelectTableWD + Private m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow) + + Private m_nSelectedTable As Integer = 0 + Public ReadOnly Property nSelectedTable As Integer + Get + Return m_nSelectedTable + End Get + End Property + + Sub New(Owner As Window) + Me.Owner = Owner + Me.WindowStartupLocation = WindowStartupLocation.CenterOwner + InitializeComponent() + End Sub + + Public CurrTableList As New List(Of TableToChange) + + Private Sub ChangeTable_Initialized() Handles Me.Initialized + + Title.Text = EgtUILib.EgtMsg(91234) ' Seleziona la tavola da usare + ' recuepero l'inidce della tavola corrente + Dim nIndeXCurrTab As Integer = GetCurrentTable() + ' creo la lista delle tavole disponibili (attivo il bottone della tavola attualmente in uso) + For nInd As Integer = 0 To GetTableCount() - 1 + CurrTableList.Add(New TableToChange("Tab", (nInd + 1).ToString, ((nInd + 1) = nIndeXCurrTab))) + Next + End Sub + + Private Sub ChangeTable_Loaded() Handles Me.Loaded + TableList.ItemsSource = CurrTableList + End Sub + + Private Sub OkBtn_Click(sender As Object, e As RoutedEventArgs) Handles OkBtn.Click + ' recupero l'indice della tavola impostata + For Each ItemTab As TableToChange In CurrTableList + If ItemTab.IsActive Then + m_nSelectedTable = ItemTab.nIndex + Exit For + End If + Next + DialogResult = True + End Sub + +End Class + +Public Class TableToChange + Implements INotifyPropertyChanged + + Private Property m_sName As String = "Tab" + Public ReadOnly Property sName As String + Get + Return m_sName + End Get + End Property + + Public ReadOnly Property ImgTab As String + Get + Return DirectCast(Application.Current.MainWindow, MainWindow).GetResourcesDir() & "\MachineButtonsImage\table.png" + End Get + End Property + + Private Property m_nIndex As Integer = 3 + Public ReadOnly Property nIndex As Integer + Get + Return m_nIndex + End Get + End Property + + Private m_bIsActive As Boolean = False + Public Property IsActive As Boolean + Get + Return m_bIsActive + End Get + Set(value As Boolean) + m_bIsActive = value + NotifyPropertyChanged("IsActive") + End Set + End Property + + Public Sub New(Name As String, Ind As Integer, IsCurrent As Boolean) + m_sName = Name & " " & Ind.ToString + m_nIndex = Ind + m_bIsActive = IsCurrent + NotifyPropertyChanged("IsActive") + End Sub + + Public Event PropertyChanged(sender As Object, e As PropertyChangedEventArgs) Implements INotifyPropertyChanged.PropertyChanged + + Public Sub NotifyPropertyChanged(propName As String) + RaiseEvent PropertyChanged(Me, New PropertyChangedEventArgs(propName)) + End Sub + +End Class \ No newline at end of file diff --git a/CadCuts/SplitAuto.vb b/CadCuts/SplitAuto.vb index 7dbf37c..835e9c2 100644 --- a/CadCuts/SplitAuto.vb +++ b/CadCuts/SplitAuto.vb @@ -293,7 +293,7 @@ Public Module SplitAuto ' Se macchina con cambio utensile di lama If m_MainWindow.m_CurrentMachine.MountedToolConfig = CurrentMachine.MountedToolConfigs.TOOLCHANGERWITHSAW Then Dim sSawing As String = String.Empty, sSaw As String = String.Empty - m_MainWindow.m_CadCutPageUC.m_SplitPage.GetCurrSawingandSaw(nOperId, sSawing, sSaw) + m_MainWindow.m_CadCutPageUC.m_SplitPage.GetCurrSawingAndSaw(nOperId, sSawing, sSaw) ' Setto l'utensile corrente EgtTdbSetCurrTool(sSaw) ' recupero il colore della lavorazione direttamente dall'utensile diff --git a/CadCuts/SplitPageUC.xaml.vb b/CadCuts/SplitPageUC.xaml.vb index d359d74..c61d803 100644 --- a/CadCuts/SplitPageUC.xaml.vb +++ b/CadCuts/SplitPageUC.xaml.vb @@ -93,8 +93,8 @@ Public Class SplitPageUC ModifyBtn.Content = EgtMsg(MSG_SPLITPAGEUC + 17) ' Modifica AutoBtn.Content = EgtMsg(MSG_SPLITPAGEUC + 18) ' Auto RestartBtn.Content = EgtMsg(MSG_SPLITPAGEUC + 19) ' Restart - BridgesWJBtn.ToolTip = "Bridges" - BridgesDeleteWJBtn.ToolTip = "Remove bridges" + 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 @@ -237,7 +237,7 @@ Public Class SplitPageUC ' Visualizzo la posizione utensile solo se configurata If m_MainWindow.m_CurrentMachine.MountedToolConfig = CurrentMachine.MountedToolConfigs.TOOLCHANGERWITHSAW Then Dim sSawing As String = String.Empty, sSaw As String = String.Empty - GetCurrSawingandSaw(Mach.m_nId, sSawing, sSaw) + GetCurrSawingAndSaw(Mach.m_nId, sSawing, sSaw) ' Verifico che sia montata su un portautensile EgtTdbSetCurrTool(sSaw) EgtTdbGetCurrToolParam(MCH_TP.TCPOS, sTCPos) @@ -278,7 +278,7 @@ Public Class SplitPageUC ' recupero il nome del Layer EgtGetName(nIdParent, sLayer) ' solo se il nome del layer è quello associato ad un lato esterno allora procedo con l'evidenziazione - If sLayer = NAME_OUTLOOP Then + If sLayer = NAME_OUTLOOP Or sLayer = "WjRectification" Then If (EgtGetType(nIdMy) = GDB_TY.CRV_ARC OrElse EgtGetType(nIdMy) = GDB_TY.CRV_COMPO OrElse EgtGetType(nIdMy) = GDB_TY.CRV_LINE) AndAlso VerifySideIsAcceptable(nIdMy) Then If m_nIdSelectedSideWJ <> GDB_ID.NULL Or m_nIdSelectedSideWJ = nIdMy Then EgtDeselectObj(m_nIdSelectedSideWJ) @@ -311,7 +311,7 @@ Public Class SplitPageUC m_nIdSelectedSideWJ = GDB_ID.NULL nIdParentPart = GDB_ID.NULL m_CurrProjPage.ClearMessage() - m_CurrProjPage.SetWarningMessage("Bridge intersects part") + m_CurrProjPage.SetWarningMessage(EgtMsg(91216)) ' Bridge intersects part Return End If End If @@ -402,21 +402,22 @@ Public Class SplitPageUC Private Function VerifySideIsAcceptable(nMyId As Integer) As Boolean Dim dVal As Double = 0 ' verifico che l'entità selezionata non contenga questi parametri - If EgtGetInfo(nMyId, INFO_SIDE_ANGLE2, dVal) Then - If dVal <> 0 Then - Return False - End If - End If + ' If EgtGetInfo(nMyId, INFO_SIDE_ANGLE2, dVal) Then + ' If dVal <> 0 Then + ' Return False + ' End If + ' End If If EgtGetInfo(nMyId, INFO_SIDE_ANGLE, dVal) Then If dVal <> 0 Then Return False End If End If - If EgtGetInfo(nMyId, INFO_ORIG_SIDE_ANGLE, dVal) Then - If dVal <> 0 Then - Return False - End If - End If + ' ' Non bastano i controlli sopra...? + ' If EgtGetInfo(nMyId, INFO_ORIG_SIDE_ANGLE, dVal) Then + ' If dVal <> 0 Then + ' Return False + ' End If + ' End If ' altrimenti l'entità è accettabile Return True End Function @@ -655,8 +656,15 @@ Public Class SplitPageUC Dim SubEntId As Integer = GDB_ID.NULL EgtSetCurrMachining(nMchId) If Not EgtGetMachiningGeometry(0, EntId, SubEntId) Then Return + ' verifico se la lavorazione selezionata ha un angolo di inclinazione + Dim dSideAng As Double = 0.0 + EgtGetMachiningParam(MCH_MP.SIDEANGLE, dSideAng) + Dim sDefMach As String = DEF_MACHINING + If Math.Abs(dSideAng) > 0 Then + sDefMach = DEF_MACHINING_TILTED + End If ' Recupero il nome della lavorazione - EgtGetInfo(EntId, DEF_MACHINING, sSawing) + EgtGetInfo(EntId, sDefMach, sSawing) ' Apro pagina di selezione della lavorazione Dim m_ChangeToolPage = New ChangeToolWD(m_MainWindow) @@ -667,7 +675,7 @@ Public Class SplitPageUC ' se seleziono "Ok" allora resetto tutte le lavorazioni del progetto If m_ChangeToolPage.DialogResult Then - EgtSetInfo(EntId, DEF_MACHINING, m_ChangeToolPage.NewSawing) + EgtSetInfo(EntId, sDefMach, m_ChangeToolPage.NewSawing) Dim Index As Integer = 0 For Index = 0 To m_MachiningList.Count() - 1 If m_MachiningList(Index).m_nId = nMchId Then @@ -697,13 +705,20 @@ Public Class SplitPageUC End If End Sub - Public Sub GetCurrSawingandSaw(ByVal nMchId As Integer, ByRef sSawing As String, ByRef sNameTool As String) + Public Sub GetCurrSawingAndSaw(ByVal nMchId As Integer, ByRef sSawing As String, ByRef sNameTool As String) Dim EntId As Integer = GDB_ID.NULL Dim SubEntId As Integer = GDB_ID.NULL EgtSetCurrMachining(nMchId) If Not EgtGetMachiningGeometry(0, EntId, SubEntId) Then Return + ' verifico se la lavorazione selezionata ha un angolo di inclinazione + Dim dSideAng As Double = 0.0 + EgtGetMachiningParam(MCH_MP.SIDEANGLE, dSideAng) + Dim sDefMach As String = DEF_MACHINING + If Math.Abs(dSideAng) > EPS_ANG_SMALL Then + sDefMach = DEF_MACHINING_TILTED + End If ' Eventualmente recupero il nome della lavorazione - EgtGetInfo(EntId, DEF_MACHINING, sSawing) + EgtGetInfo(EntId, sDefMach, sSawing) If String.IsNullOrEmpty(sSawing) Then sSawing = m_MainWindow.m_CurrentMachine.sCurrSawing ' Imposto la lavorazione corrente EgtMdbSetCurrMachining(sSawing) @@ -846,7 +861,7 @@ Public Class SplitPageUC End Sub Private Sub AddTopText(ByRef sName As String) - sName &= " Top" + sName &= EgtMsg(91217) ' Top End Sub Private Sub AddFinalText(ByRef sName As String) @@ -936,12 +951,12 @@ Public Class SplitPageUC Private Sub SetLayNbArrTgBtn_Click() If LayNbArrTgBtn.IsChecked Then StatusOffNumbArrow(GDB_ST.ON_) - LayNbArrTgBtn.ToolTip = "Hide" + LayNbArrTgBtn.ToolTip = EgtMsg(91218) ' Hide Dim Img As ImageSource = ImageConverter.ConvertFromString("pack://application:,,,/Resources/NewIcons/LightArrowOn.png") LayNbArrImg.Source = Img Else StatusOffNumbArrow(GDB_ST.OFF) - LayNbArrTgBtn.ToolTip = "Show" + LayNbArrTgBtn.ToolTip = EgtMsg(91219) ' Show Dim Img As ImageSource = ImageConverter.ConvertFromString("pack://application:,,,/Resources/NewIcons/LightArrowOff.png") LayNbArrImg.Source = Img End If @@ -2425,7 +2440,7 @@ Public Class SplitPageUC ' eventualmente stampo messaggio If Not m_bAreHomogeneous Then m_MainWindow.m_CurrentProjectPageUC.ClearMessage() - m_MainWindow.m_CurrentProjectPageUC.SetWarningMessage("Lavorazioni non omogenee") + m_MainWindow.m_CurrentProjectPageUC.SetWarningMessage(EgtMsg(91220)) ' Lavorazioni non omogenee Else m_MainWindow.m_CurrentProjectPageUC.ClearMessage() End If diff --git a/Constants/ConstGen.vb b/Constants/ConstGen.vb index 727ada9..559241f 100644 --- a/Constants/ConstGen.vb +++ b/Constants/ConstGen.vb @@ -112,6 +112,7 @@ Module ConstGen Public Const MAIN_TAB As String = "MainTab" Public Const SECOND_TAB As String = "2ndTab" Public Const THIRD_TAB As String = "3rdTab" + Public Const FORTH_TAB As String = "4thTab" ' Nome tavola ausiliaria per spostamento finale pezzi Public Const AUX_TAB As String = "AuxTab" @@ -326,6 +327,8 @@ Module ConstGen Public Const SPLIT_CUT As String = "SplitCut" ' Forzo specifica lavorazione Public Const DEF_MACHINING As String = "Def_Machining" + ' Forzo specifica lavorazione solo per tagli con inclinazione + Public Const DEF_MACHINING_TILTED As String = "Def_Machining_Tilted" ' Nome di pezzo che è una cornice Public Const NAME_FRAME As String = "Frame" diff --git a/Constants/ConstMachIni.vb b/Constants/ConstMachIni.vb index 2dbb399..847f2b1 100644 --- a/Constants/ConstMachIni.vb +++ b/Constants/ConstMachIni.vb @@ -173,6 +173,7 @@ Public Const K_ADDITIONALTABLE As String = "AdditionalTable" Public Const K_TAB2_ADDITIONALTABLE As String = "Tab2AdditionalTable" Public Const K_TAB3_ADDITIONALTABLE As String = "Tab3AdditionalTable" + Public Const K_TAB4_ADDITIONALTABLE As String = "Tab4AdditionalTable" Public Const K_CENTER_RAW_ONX As String = "CenterRawOnX" Public Const K_CHANGETABWD As String = "ChangeTabWD" diff --git a/DirectCuts/DirectCutPageUC.xaml.vb b/DirectCuts/DirectCutPageUC.xaml.vb index a3ae609..d5cb01a 100644 --- a/DirectCuts/DirectCutPageUC.xaml.vb +++ b/DirectCuts/DirectCutPageUC.xaml.vb @@ -179,11 +179,11 @@ Public Class DirectCutPageUC Case K_REMOTE RemoteBtn.Visibility = Visibility.Visible RemoteBtn.Foreground = Brushes.White - RemoteBtn.Content = "Remote" + RemoteBtn.Content = EgtMsg(90262) 'Remote Case K_PARKING ParkingBtn.Visibility = Visibility.Visible ParkingBtn.Foreground = Brushes.White - ParkingBtn.ToolTip = "Parking" + ParkingBtn.ToolTip = EgtMsg(90263) 'Parking End Select Next End Sub diff --git a/DirectCuts/FlatteningCut.xaml.vb b/DirectCuts/FlatteningCut.xaml.vb index acbf87b..b3f7634 100644 --- a/DirectCuts/FlatteningCut.xaml.vb +++ b/DirectCuts/FlatteningCut.xaml.vb @@ -1,6 +1,7 @@ Imports System.Reflection Imports EgtUILib Imports EgtUILib.EgtInterface +Imports OmagCUT.MainWindow Public Class FlatteningCut @@ -11,6 +12,8 @@ Public Class FlatteningCut Private m_bActive As Boolean = False ' Flag di simulazione in corso Private m_bSimul As Boolean = False + ' Definizione del taglio diretto di questa pagina + Private Const FLATTENING As String = "Flattening" ' Origine tavola e dati grezzo Private m_bRawOk As Boolean = False @@ -100,15 +103,15 @@ Public Class FlatteningCut DirectionTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 15) WidthTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 26) OverlapTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 27) - ZReleasedTxBl.Text = "Z Svincolo" + ZReleasedTxBl.Text = EgtMsg(91235) 'Z Svincolo SideTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 23) RotLockTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 29) - ChainedPathTxBl.Text = "Chained path" + ChainedPathTxBl.Text = EgtMsg(91236) 'Chained path SimulBtn.ToolTip = EgtMsg(MSG_CADCUTPAGEUC + 1) OkBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 30) ' tipo di utensile in uso per la lavorazione m_ToolsArray(TOOL.SAW) = EgtMsg(MSG_DIRECTCUTPAGEUC + 24) - m_ToolsArray(TOOL.MILL) = "Mill" + 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()) @@ -725,7 +728,8 @@ Public Class FlatteningCut Dim ptStart As Point3d = m_ptTipP1 ptStart.z = 0 Dim nCutId = EgtCreateLinePDL(nLayerId, ptStart, m_dAngO, m_dLen) - EgtSetInfo(nCutId, INFO_DIRECTCUT, 1) + ' Inidico che è un taglio Diretto di tipo Flattening + EgtSetInfo(nCutId, INFO_DIRECTCUT, FlagDirectCuts.Flattening) ' Imposto affondamento e angolo di fianco sul taglio EgtSetInfo(nCutId, INFO_DEPTH, m_dDepth) If (m_nTool = TOOL.MILL) Then @@ -844,8 +848,8 @@ Public Class FlatteningCut End If End If End If - CutsList.Add(nCut2Id) - End If + CutsList.Add(nCut2Id) + End If ' ----------------------- CREO SEGMENTI PER CONCATENAMENTO CURVE ----------------------- Next @@ -876,7 +880,8 @@ Public Class FlatteningCut Dim ptNear As Point3d EgtStartPoint(CutsList(0), ptNear) Dim IdJointCurv As Integer = EgtCreateCurveCompoByChain(nLayerId, CutsList.ToArray, ptNear, True) - EgtSetInfo(IdJointCurv, INFO_DIRECTCUT, 1) + ' Inidico che è un taglio Diretto di tipo Flattening + EgtSetInfo(IdJointCurv, INFO_DIRECTCUT, FlagDirectCuts.Flattening) EgtSetInfo(IdJointCurv, INFO_STEP_TYPE, m_nMachType) EgtSetInfo(IdJointCurv, INFO_WIDTH, dThick) ' Se unisco il percorso devo per forza usare la fresa! diff --git a/DirectCuts/GridCut.xaml.vb b/DirectCuts/GridCut.xaml.vb index 70f9315..6dea16c 100644 --- a/DirectCuts/GridCut.xaml.vb +++ b/DirectCuts/GridCut.xaml.vb @@ -1,4 +1,5 @@ Imports EgtUILib +Imports OmagCUT.MainWindow Public Class GridCut ' Riferimenti a pagine @@ -78,21 +79,21 @@ Public Class GridCut SimulBtn.ToolTip = EgtMsg(MSG_CADCUTPAGEUC + 1) OkBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 30) ' 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()) - m_dAngV = GetPrivateProfileDouble( S_DIRECTCUTS, K_DC_GRID_ANGV, m_dAngV, m_MainWindow.GetIniFile()) - m_nNumX = GetPrivateProfileInt( S_DIRECTCUTS, K_DC_GRID_NUMX, m_nNumX, m_MainWindow.GetIniFile()) - m_dDimX = GetPrivateProfileDouble( S_DIRECTCUTS, K_DC_GRID_DIMX, m_dDimX, m_MainWindow.GetIniFile()) - m_nNumY = GetPrivateProfileInt( S_DIRECTCUTS, K_DC_GRID_NUMY, m_nNumY, m_MainWindow.GetIniFile()) + 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()) + m_dAngV = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_GRID_ANGV, m_dAngV, m_MainWindow.GetIniFile()) + m_nNumX = GetPrivateProfileInt(S_DIRECTCUTS, K_DC_GRID_NUMX, m_nNumX, m_MainWindow.GetIniFile()) + m_dDimX = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_GRID_DIMX, m_dDimX, m_MainWindow.GetIniFile()) + m_nNumY = GetPrivateProfileInt(S_DIRECTCUTS, K_DC_GRID_NUMY, m_nNumY, m_MainWindow.GetIniFile()) m_dDimY = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_GRID_DIMY, m_dDimY, m_MainWindow.GetIniFile()) ' --- INIZIO GESTIONE SPECIALE --- per macchina sinistrorsa m_bSawTh = (GetPrivateProfileInt(S_DIRECTCUTS, K_DC_SING_SAWTH, 0, m_MainWindow.GetIniFile()) <> 0) ' --- FINE GESTIONE SPECIALE --- per macchina sinistrorsa - m_bHeadSide = ( GetPrivateProfileInt( S_DIRECTCUTS, K_DC_GRID_HEADSIDE, 0, m_MainWindow.GetIniFile()) <> 0) - m_ptTipP1.x = GetPrivateProfileDouble( S_DIRECTCUTS, K_DC_GRID_POSX, m_ptTipP1.x, m_MainWindow.GetIniFile()) - m_ptTipP1.y = GetPrivateProfileDouble( S_DIRECTCUTS, K_DC_GRID_POSY, m_ptTipP1.y, m_MainWindow.GetIniFile()) + m_bHeadSide = (GetPrivateProfileInt(S_DIRECTCUTS, K_DC_GRID_HEADSIDE, 0, m_MainWindow.GetIniFile()) <> 0) + m_ptTipP1.x = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_GRID_POSX, m_ptTipP1.x, m_MainWindow.GetIniFile()) + m_ptTipP1.y = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_GRID_POSY, m_ptTipP1.y, m_MainWindow.GetIniFile()) End Sub Private Sub GridCut_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded @@ -131,7 +132,7 @@ Public Class GridCut m_bPointP1Ok = False m_bPointP2Ok = False ' Inizializzo primo punto acquisito dal disegno - m_ptPrev = m_ptTipP1 + ( m_ptTabOri - Point3d.ORIG()) + m_ptPrev = m_ptTipP1 + (m_ptTabOri - Point3d.ORIG()) m_ptPrev.z = m_ptRawMax.z ' Disegno crocetta che indica il punto acquisito CreateCross(m_nTempLay, m_ptPrev) @@ -140,13 +141,13 @@ Public Class GridCut SetCoordVisibility(True) ShowCoord() ' Assegno parametri di lavorazione - DepthTxBx.Text = LenToString( m_dDepth, 1) - DirectionTxBx.Text = DoubleToString( m_dAngO - m_MainWindow.m_CurrentMachine.dDeltaC, 2) - SideAngleTxBx.Text = DoubleToString( m_dAngV, 2) + DepthTxBx.Text = LenToString(m_dDepth, 1) + DirectionTxBx.Text = DoubleToString(m_dAngO - m_MainWindow.m_CurrentMachine.dDeltaC, 2) + SideAngleTxBx.Text = DoubleToString(m_dAngV, 2) NumPzXTxBx.Text = m_nNumX.ToString() - DimPzXTxBx.Text = LenToString( m_dDimX, 1) + DimPzXTxBx.Text = LenToString(m_dDimX, 1) NumPzYTxBx.Text = m_nNumY.ToString() - DimPzYTxBx.Text = LenToString( m_dDimY, 1) + DimPzYTxBx.Text = LenToString(m_dDimY, 1) SideChBx.IsChecked = m_bHeadSide ' --- INIZIO GESTIONE SPECIALE --- per macchina sinistrorsa @@ -167,16 +168,16 @@ Public Class GridCut Friend Sub GridCut_Unloaded(sender As Object, e As RoutedEventArgs) Handles Me.Unloaded ' Salvo i dati correnti - WritePrivateProfileString( S_DIRECTCUTS, K_DC_GRID_DEPTH, DoubleToString( m_dDepth, 2), m_MainWindow.GetIniFile()) - WritePrivateProfileString( S_DIRECTCUTS, K_DC_GRID_ANGH, DoubleToString( m_dAngO, 2), m_MainWindow.GetIniFile()) - WritePrivateProfileString( S_DIRECTCUTS, K_DC_GRID_ANGV, DoubleToString( m_dAngV, 2), m_MainWindow.GetIniFile()) - WritePrivateProfileString( S_DIRECTCUTS, K_DC_GRID_NUMX, m_nNumX.ToString(), m_MainWindow.GetIniFile()) - WritePrivateProfileString( S_DIRECTCUTS, K_DC_GRID_DIMX, DoubleToString( m_dDimX, 2), m_MainWindow.GetIniFile()) - WritePrivateProfileString( S_DIRECTCUTS, K_DC_GRID_NUMY, m_nNumY.ToString(), m_MainWindow.GetIniFile()) - WritePrivateProfileString( S_DIRECTCUTS, K_DC_GRID_DIMY, DoubleToString( m_dDimY, 2), m_MainWindow.GetIniFile()) - WritePrivateProfileString( S_DIRECTCUTS, K_DC_GRID_HEADSIDE, If( m_bHeadSide, "1", "0"), m_MainWindow.GetIniFile()) - WritePrivateProfileString( S_DIRECTCUTS, K_DC_GRID_POSX, DoubleToString( m_ptTipP1.x, 2), m_MainWindow.GetIniFile()) - WritePrivateProfileString( S_DIRECTCUTS, K_DC_GRID_POSY, DoubleToString( m_ptTipP1.y, 2), m_MainWindow.GetIniFile()) + WritePrivateProfileString(S_DIRECTCUTS, K_DC_GRID_DEPTH, DoubleToString(m_dDepth, 2), m_MainWindow.GetIniFile()) + WritePrivateProfileString(S_DIRECTCUTS, K_DC_GRID_ANGH, DoubleToString(m_dAngO, 2), m_MainWindow.GetIniFile()) + WritePrivateProfileString(S_DIRECTCUTS, K_DC_GRID_ANGV, DoubleToString(m_dAngV, 2), m_MainWindow.GetIniFile()) + WritePrivateProfileString(S_DIRECTCUTS, K_DC_GRID_NUMX, m_nNumX.ToString(), m_MainWindow.GetIniFile()) + WritePrivateProfileString(S_DIRECTCUTS, K_DC_GRID_DIMX, DoubleToString(m_dDimX, 2), m_MainWindow.GetIniFile()) + WritePrivateProfileString(S_DIRECTCUTS, K_DC_GRID_NUMY, m_nNumY.ToString(), m_MainWindow.GetIniFile()) + WritePrivateProfileString(S_DIRECTCUTS, K_DC_GRID_DIMY, DoubleToString(m_dDimY, 2), m_MainWindow.GetIniFile()) + WritePrivateProfileString(S_DIRECTCUTS, K_DC_GRID_HEADSIDE, If(m_bHeadSide, "1", "0"), m_MainWindow.GetIniFile()) + WritePrivateProfileString(S_DIRECTCUTS, K_DC_GRID_POSX, DoubleToString(m_ptTipP1.x, 2), m_MainWindow.GetIniFile()) + WritePrivateProfileString(S_DIRECTCUTS, K_DC_GRID_POSY, DoubleToString(m_ptTipP1.y, 2), m_MainWindow.GetIniFile()) ' Se non vado in simulazione If Not m_bSimul Then ' Dichiaro sottopagina da non riattivare @@ -315,7 +316,7 @@ Public Class GridCut DirectionTxBx.Text = DoubleToString(m_dAngO - m_MainWindow.m_CurrentMachine.dDeltaC, 2) SideAngleTxBx.Text = DoubleToString(m_dAngV, 2) - ' Altrimenti punto da click di mouse + ' Altrimenti punto da click di mouse Else ' Assegno punto selezionato nel disegno a m_ptTipP1 m_ptTipP1 = m_ptPrev @@ -405,7 +406,7 @@ Public Class GridCut m_dAngV = 90 - dTAngV SideAngleTxBx.Text = DoubleToString(m_dAngV, 2) - ' Altrimenti punto da click di mouse + ' Altrimenti punto da click di mouse Else ' Assegno punto selezionato nel disegno a m_ptTipP2 m_ptTipP2 = m_ptPrev @@ -544,9 +545,9 @@ Public Class GridCut m_CurrProjPage.SetWarningMessage("Trial Version") #Else ' Verifico non sia versione Ufficio - If m_MainWindow.GetKeyOption( MainWindow.KEY_OPT.OFFICE_TYPE) Then - m_CurrProjPage.SetWarningMessage( "Office Version") - Return + If m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.OFFICE_TYPE) Then + m_CurrProjPage.SetWarningMessage("Office Version") + Return End If ' Verifico ci sia un taglio valido If Not m_bCutOk Then Return @@ -632,9 +633,9 @@ Public Class GridCut Private Function MultiplyCut(nLayerId As Integer) As Boolean ' Recupero lo spessore del taglio della lama o del waterjet correntemente attiva Dim nType As Integer = 0 - EgtTdbGetCurrToolParam( MCH_TP.TYPE, nType) + EgtTdbGetCurrToolParam(MCH_TP.TYPE, nType) Dim dThick As Double = 0 - EgtTdbGetCurrToolParam( If( nType = MCH_TY.SAW_STD, MCH_TP.THICK, MCH_TP.DIAM), dThick) + EgtTdbGetCurrToolParam(If(nType = MCH_TY.SAW_STD, MCH_TP.THICK, MCH_TP.DIAM), dThick) ' Ricalcolo lo spessore in base all'inclinazione dThick = dThick / Math.Cos(m_dAngV * Math.PI / 180) ' Imposto angolo di rotazione a seconda del lato dei tagli paralleli @@ -656,7 +657,8 @@ Public Class GridCut If dDimPzY <> 0 And nNumPzY > 0 And dDimPzX <> 0 And nNumPzX > 0 Then Dim dLenX As Double = dThick + (dDimPzX + dThick) * nNumPzX Dim nCutParaId = EgtCreateLinePDL(nLayerId, ptStart, m_dAngO, dLenX + 0.1) - + ' Inidico che è un taglio Diretto di tipo GridCut + EgtSetInfo(nCutParaId, INFO_DIRECTCUT, FlagDirectCuts.GridCut) ' --- INIZIO GESTIONE SPECIALE --- per macchina sinistrorsa ' Recupero spessore lama corrente Dim sSawing As String = m_MainWindow.m_CurrentMachine.sCurrSawing @@ -683,7 +685,8 @@ Public Class GridCut ' Arretro il punto di partenza di uno spessore lama Dim vtDeltaPos As Vector3d = Vector3d.FromPolar(dThick + 0.1, m_dAngO - 90) Dim nCutPerpId = EgtCreateLinePDL(nLayerId, ptStart + vtDeltaPos, m_dAngO + 90, dLenY + 0.2) - + ' Inidico che è un taglio Diretto di tipo GridCut + EgtSetInfo(nCutPerpId, INFO_DIRECTCUT, FlagDirectCuts.GridCut) ' --- INIZIO GESTIONE SPECIALE --- per macchina sinistrorsa If m_bSawTh And Not String.IsNullOrEmpty(sSawing) Then EgtOffsetCurve(nCutPerpId, -dThick, OFF_TYPE.EXTEND) @@ -725,10 +728,10 @@ Public Class GridCut Private Sub NumPzsTxBx_EgtClosed(sender As Object, e As EventArgs) Handles NumPzXTxBx.EgtClosed, NumPzYTxBx.EgtClosed, DimPzXTxBx.EgtClosed, DimPzYTxBx.EgtClosed, SideChBx.Click - StringToInt( NumPzXTxBx.Text, m_nNumX) - StringToLen( DimPzXTxBx.Text, m_dDimX) - StringToInt( NumPzYTxBx.Text, m_nNumY) - StringToLen( DimPzYTxBx.Text, m_dDimY) + StringToInt(NumPzXTxBx.Text, m_nNumX) + StringToLen(DimPzXTxBx.Text, m_dDimX) + StringToInt(NumPzYTxBx.Text, m_nNumY) + StringToLen(DimPzYTxBx.Text, m_dDimY) m_bHeadSide = SideChBx.IsChecked ' Disegno il taglio CreateGridCut() diff --git a/DirectCuts/MachineButtonsUC.xaml.vb b/DirectCuts/MachineButtonsUC.xaml.vb index 5a18f7d..905aa90 100644 --- a/DirectCuts/MachineButtonsUC.xaml.vb +++ b/DirectCuts/MachineButtonsUC.xaml.vb @@ -136,7 +136,7 @@ Public Class MachineButtonsUC ElseIf StateFlagArray(nIndex) = K_ZBJOG Then CurrToggleBtn.Content = "Z - B" ElseIf StateFlagArray(nIndex) = K_REMOTE Then - CurrToggleBtn.Content = "Remote" + CurrToggleBtn.Content = EgtMsg(90262) 'Remote End If Catch ex As Exception EgtOutLog("Error loading content " & StateFlagArray(nIndex)) diff --git a/DirectCuts/SingleCutUC.xaml.vb b/DirectCuts/SingleCutUC.xaml.vb index 68830ef..4519fbd 100644 --- a/DirectCuts/SingleCutUC.xaml.vb +++ b/DirectCuts/SingleCutUC.xaml.vb @@ -1,5 +1,6 @@ Imports System.Windows.Threading Imports EgtUILib +Imports OmagCUT.MainWindow Public Class SingleCutUC @@ -147,6 +148,8 @@ Public Class SingleCutUC ' Deseleziono bottone primo punto Point1Btn.IsChecked = False + ' forzo la verifica dell'affondamento in relazione allo spessore del pezzo + DepthTxBx_EgtClosed(Nothing, Nothing) ' la visualizzazione dei comandi è gestita dalla DirectCutPageUC richiamando la funzione ReloadParam ' forzo la macchina ad essere visibile fin da subito @@ -159,7 +162,7 @@ Public Class SingleCutUC ' Aggiorno visualizzazione EgtDraw() - ' Avvi il timer + ' Avvio il timer m_RefreshTimer.Start() End Sub @@ -672,6 +675,8 @@ Public Class SingleCutUC ' Imposto affondamento e angolo di fianco sul taglio EgtSetInfo(nCutId, INFO_DEPTH, m_dDepth) EgtSetInfo(nCutId, INFO_SIDE_ANGLE, m_dAngV) + ' Inidico che è un taglio Diretto di tipo SingleCut + EgtSetInfo(nCutId, INFO_DIRECTCUT, FlagDirectCuts.SingleCut) ' Imposto se disabilitare l'inversine di direzione del taglio If Not m_MainWindow.m_CurrentMachine.bEnableInvert Then EgtSetInfo(nCutId, INFO_ENABLE_INVERT, 0) ' Creo layer per crocetta di riferimento diff --git a/DirectCuts/SingleDrillUC.xaml.vb b/DirectCuts/SingleDrillUC.xaml.vb index 1a5f43a..3f2e53b 100644 --- a/DirectCuts/SingleDrillUC.xaml.vb +++ b/DirectCuts/SingleDrillUC.xaml.vb @@ -1,4 +1,5 @@ Imports EgtUILib +Imports OmagCUT.MainWindow Imports System.Collections.ObjectModel Public Class SingleDrillUC ' Riferimenti a pagine @@ -438,7 +439,8 @@ Public Class SingleDrillUC End If Dim nCutId = EgtCreateCircle(nLayerId, ptStart, m_dDiameter / 2) - + ' Inidico che è un taglio Diretto di tipo SingleDrill + EgtSetInfo(nCutId, INFO_DIRECTCUT, FlagDirectCuts.SingleDrill) ' Calcolo punto di inserimento nel grezzo Dim ptMin, ptMax As Point3d EgtGetBBoxGlob(nPartId, GDB_BB.STANDARD, ptMin, ptMax) diff --git a/DirectCuts/SquaringUC.xaml.vb b/DirectCuts/SquaringUC.xaml.vb index 022a3cc..22385ca 100644 --- a/DirectCuts/SquaringUC.xaml.vb +++ b/DirectCuts/SquaringUC.xaml.vb @@ -1,4 +1,5 @@ Imports EgtUILib +Imports OmagCUT.MainWindow Public Class SquaringUC @@ -368,6 +369,8 @@ Public Class SquaringUC If dDimPzY <> 0 And nNumPzY > 0 And dDimPzX <> 0 And nNumPzX > 0 Then Dim dLenX As Double = dThick + (dDimPzX + dThick) * nNumPzX Dim nCutParaId = EgtCreateLinePDL(nLayerId, ptStart, m_dAngO, dLenX + 0.1) + ' Inidico che è un taglio Diretto di tipo Squaring + EgtSetInfo(nCutParaId, INFO_DIRECTCUT, FlagDirectCuts.Squaring) ' Imposto affondamento e angolo di fianco sul taglio (solo se non lama STD) If Not nType = MCH_TY.SAW_STD Then EgtSetInfo(nCutParaId, INFO_DEPTH, m_dDepth) diff --git a/DrawImport/CompoDimensionUC.xaml b/DrawImport/CompoDimensionUC.xaml index 02ee754..4032cd6 100644 --- a/DrawImport/CompoDimensionUC.xaml +++ b/DrawImport/CompoDimensionUC.xaml @@ -29,43 +29,43 @@ + Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/> + Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/> + Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/> + Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/> + Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/> + Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/> + Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/> + Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/> + Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/> + Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/> diff --git a/DrawImport/DrawPageUC.xaml b/DrawImport/DrawPageUC.xaml index 0bcb924..d8c6fbe 100644 --- a/DrawImport/DrawPageUC.xaml +++ b/DrawImport/DrawPageUC.xaml @@ -95,7 +95,7 @@ + Style="{DynamicResource OmagCut_ToolsDBTextBlock}" /> @@ -122,7 +122,7 @@ - diff --git a/DrawImport/ImportPageUC.xaml.vb b/DrawImport/ImportPageUC.xaml.vb index 728b3ee..334a7c2 100644 --- a/DrawImport/ImportPageUC.xaml.vb +++ b/DrawImport/ImportPageUC.xaml.vb @@ -84,13 +84,13 @@ Public Class ImportPageUC 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 + 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 + FiloTopBtn.Content = EgtMsg(90400) 'Filo Top DripCutBtn.Content = EgtMsg(MSG_IMPORTPAGEUC + 8) 'Incidi da sotto - EngraveBtn.Content = "Engrave" + EngraveBtn.Content = EgtMsg(91238) 'Engrave DripDrillBtn.Content = EgtMsg(MSG_IMPORTPAGEUC + 14) 'Foro da sotto Cad2dBtn.Content = "Cad 2d" diff --git a/DrawImport/SideAngle.vb b/DrawImport/SideAngle.vb index 3240254..c5ff1a9 100644 --- a/DrawImport/SideAngle.vb +++ b/DrawImport/SideAngle.vb @@ -228,7 +228,7 @@ Module SideAngle EgtSetInfo(EntId, INFO_HEEL, dHeel) Dim sSawingTilted As String = m_MainWindow.m_CurrentMachine.sCurrSawingTilted If Not String.IsNullOrEmpty(sSawingTilted) Then - EgtSetInfo(EntId, DEF_MACHINING, sSawingTilted) + EgtSetInfo(EntId, DEF_MACHINING_TILTED, sSawingTilted) End If End If End If diff --git a/DrawImport/SideAngleOneForAllWindow.xaml b/DrawImport/SideAngleOneForAllWindow.xaml new file mode 100644 index 0000000..d2a35c4 --- /dev/null +++ b/DrawImport/SideAngleOneForAllWindow.xaml @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/DrawImport/SideAngleOneForAllWindow.xaml.vb b/DrawImport/SideAngleOneForAllWindow.xaml.vb new file mode 100644 index 0000000..1e5181e --- /dev/null +++ b/DrawImport/SideAngleOneForAllWindow.xaml.vb @@ -0,0 +1,20 @@ +Public Class SideAngleOneForAllWindow + + Sub New() + + ' La chiamata è richiesta dalla finestra di progettazione. + InitializeComponent() + + ' Aggiungere le eventuali istruzioni di inizializzazione dopo la chiamata a InitializeComponent(). + TitleTxBl.Text = EgtUILib.EgtMsg(91253) + End Sub + + Private Sub OkBtn_Click(sender As Object, e As RoutedEventArgs) Handles OkBtn.Click + DialogResult = True + End Sub + + Private Sub ExitBtn_Click(sender As Object, e As RoutedEventArgs) Handles ExitBtn.Click + DialogResult = False + End Sub + +End Class diff --git a/DrawImport/SideAngleUc.xaml b/DrawImport/SideAngleUc.xaml index 91d2b14..370e2b0 100644 --- a/DrawImport/SideAngleUc.xaml +++ b/DrawImport/SideAngleUc.xaml @@ -1,17 +1,17 @@  + 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="636.9" d:DesignWidth="255.9"> - + @@ -34,182 +34,191 @@ --> - + - - - - + + + + -