diff --git a/Machine/MachiningDbPageUC.xaml.vb b/Machine/MachiningDbPageUC.xaml.vb index 1d6572d..9604842 100644 --- a/Machine/MachiningDbPageUC.xaml.vb +++ b/Machine/MachiningDbPageUC.xaml.vb @@ -298,6 +298,10 @@ Public Class MachiningDbPageUC If TypeOf MachiningTreeView.SelectedItem Is CustomItem Then Dim SelectedItem As CustomItem = MachiningTreeView.SelectedItem EgtSetCurrentContext(m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene.GetCtx()) + ' Chiedo conferma della cancellazione + Dim sMsg As String = String.Format( EgtMsg(91151), SelectedItem.Name) + Dim EmbErase As New EgtMsgBox(m_MainWindow, "", sMsg, EgtMsgBox.Buttons.YES_NO, EgtMsgBox.Icons.NULL, 0, 1) + If EmbErase.m_nPressedBtn <> 1 Then Return ' Cancello la lavorazione EgtMdbRemoveMachining(SelectedItem.Name) ' Rimuovo dall'albero diff --git a/Machine/ToolsDbPageUC.xaml.vb b/Machine/ToolsDbPageUC.xaml.vb index 1f17c5f..f407c58 100644 --- a/Machine/ToolsDbPageUC.xaml.vb +++ b/Machine/ToolsDbPageUC.xaml.vb @@ -465,6 +465,10 @@ Public Class ToolsDbPageUC If TypeOf ToolTreeView.SelectedItem Is CustomItem Then Dim SelectedItem As CustomItem = ToolTreeView.SelectedItem EgtSetCurrentContext(m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene.GetCtx()) + ' Chiedo conferma della cancellazione + Dim sMsg As String = String.Format( EgtMsg(91151), SelectedItem.Name) + Dim EmbErase As New EgtMsgBox(m_MainWindow, "", sMsg, EgtMsgBox.Buttons.YES_NO, EgtMsgBox.Icons.NULL, 0, 1) + If EmbErase.m_nPressedBtn <> 1 Then Return ' Cancello l'utensile EgtTdbRemoveTool(SelectedItem.Name) ' Rimuovo il nome dell'albero diff --git a/Machine/WaterJetPageVM.vb b/Machine/WaterJetPageVM.vb index 1dceff8..5964d10 100644 --- a/Machine/WaterJetPageVM.vb +++ b/Machine/WaterJetPageVM.vb @@ -1,240 +1,4 @@ -'Imports System.Collections.ObjectModel -'Imports System.ComponentModel -'Imports EgtUILib -'Imports EgtWPFLib - -'Public Class WaterJetPageVM -' Private m_refWaterPageV As WaterJetPageUC - -' ' lista dei materiali -' Private m_ListMaterial As New ObservableCollection(Of MaterialWJ) -' Public ReadOnly Property ListMaterial As ObservableCollection(Of MaterialWJ) -' Get -' Return m_ListMaterial -' End Get -' End Property -' ' materiale selezionato -' Private m_SelectedMaterial As MaterialWJ -' Public Property SelectedMaterial As MaterialWJ -' Get -' Return m_SelectedMaterial -' End Get -' Set(value As MaterialWJ) -' m_SelectedMaterial = value -' End Set -' End Property -' ' submateriale selezionato -' Private m_SelectedSubMaterial As SubMaterialWJ -' Public Property SelectedSubMaterial As SubMaterialWJ -' Get -' Return m_SelectedSubMaterial -' End Get -' Set(value As SubMaterialWJ) -' m_SelectedSubMaterial = value -' End Set -' End Property -' ' lista parametri selezionata -' Private m_SelectedParam As ParamWJ -' Public Property SelectedParam As ParamWJ -' Get -' Return m_SelectedParam -' End Get -' Set(value As ParamWJ) -' m_SelectedParam = value -' End Set -' End Property - -' Private m_sNewMaterial As MaterialWJ -' Public Property sNewMaterial As String -' Get -' Return m_sNewMaterial.sMaterial -' End Get -' Set(value As String) -' m_sNewMaterial = New MaterialWJ(value) -' End Set -' End Property - -' Private m_NewMaterialVisibility As Visibility = Visibility.Hidden -' Public Property NewMaterialVisibility As Visibility -' Get -' Return m_NewMaterialVisibility -' End Get -' Set(value As Visibility) -' m_NewMaterialVisibility = value -' End Set -' End Property - -' Sub New(WaterJetPageV As WaterJetPageUC) -' m_refWaterPageV = WaterJetPageV -' ' Creo una lista di materiali come esempio -' ListMaterial.Add(New MaterialWJ("Marmo")) -' ListMaterial.Last.ListOfSubMaterial.Add(New SubMaterialWJ("Binaco")) -' ListMaterial.Last.ListOfSubMaterial.Last.ListOfParam.Add(New ParamWJ("10", "Bq1", "Bq2", "Bq3", "Bq4", "Bq5")) -' ListMaterial.Last.ListOfSubMaterial.Add(New SubMaterialWJ("Nero")) -' ListMaterial.Last.ListOfSubMaterial.Last.ListOfParam.Add(New ParamWJ("20", "Nq1", "Nq2", "Nq3", "Nq4", "Nq5")) -' ListMaterial.Add(New MaterialWJ("Granito")) -' ListMaterial.Last.ListOfSubMaterial.Add(New SubMaterialWJ("GR_Binaco")) -' ListMaterial.Last.ListOfSubMaterial.Last.ListOfParam.Add(New ParamWJ("15", "gBq1", "gBq2", "Bq3", "gBq4", "gBq5")) -' ListMaterial.Last.ListOfSubMaterial.Last.ListOfParam.Add(New ParamWJ("15.5", "g_Bq1", "g_Bq2", "g_Bq3", "g_Bq4", "g_Bq5")) -' ListMaterial.Last.ListOfSubMaterial.Last.ListOfParam.Add(New ParamWJ("15.8", "G_Bq1", "G_Bq2", "G_Bq3", "G_Bq4", "G_Bq5")) -' ListMaterial.Last.ListOfSubMaterial.Add(New SubMaterialWJ("GR_Nero")) -' ListMaterial.Last.ListOfSubMaterial.Last.ListOfParam.Add(New ParamWJ("18", "gNq1", "gNq2", "gNq3", "gNq4", "gNq5")) - -' SelectedMaterial = m_ListMaterial(0) -' SelectedSubMaterial = m_SelectedMaterial.ListOfSubMaterial(0) -' SelectedParam = SelectedSubMaterial.ListOfParam(0) -' End Sub - -' Private m_cmdOk As ICommand -' Public ReadOnly Property OkCommand() As ICommand -' Get -' If m_cmdOk Is Nothing Then -' m_cmdOk = New Command(AddressOf Ok) -' End If -' Return m_cmdOk -' End Get -' End Property - -' Private Sub Ok() -' ' Mostro textbox per il nome -' m_refWaterPageV.KitNameTxBx.Text = String.Empty -' m_refWaterPageV.KitNameTxBx.Visibility = Windows.Visibility.Visible -' m_refWaterPageV.KitsLstBx.SetValue(Grid.RowSpanProperty, 1) -' MessageBox.Show("Prova di Binding", "Prova di Binding", MessageBoxButton.OK, MessageBoxImage.Asterisk, MessageBoxResult.OK) -' m_refWaterPageV.KitNameTxBx.Visibility = Windows.Visibility.Hidden -' m_refWaterPageV.KitsLstBx.SetValue(Grid.RowSpanProperty, 2) -' End Sub - -'End Class - - -'Public Class MaterialWJ - -' Private m_sMaterial As String = String.Empty -' Public ReadOnly Property sMaterial As String -' Get -' Return m_sMaterial -' End Get -' End Property - -' Private m_ListOfSubMaterial As New ObservableCollection(Of SubMaterialWJ) -' Public Property ListOfSubMaterial As ObservableCollection(Of SubMaterialWJ) -' Get -' Return m_ListOfSubMaterial -' End Get -' Set(value As ObservableCollection(Of SubMaterialWJ)) -' m_ListOfSubMaterial = value -' End Set -' End Property - -' Sub New(sMat As String) -' m_sMaterial = sMat -' End Sub - -'End Class - -'Public Class SubMaterialWJ - -' Dim m_sSubMaterial As String -' Public Property sSubMaterial As String -' Get -' Return m_sSubMaterial -' End Get -' Set(value As String) -' m_sSubMaterial = value -' End Set -' End Property - -' Private m_ListOfParam As New ObservableCollection(Of ParamWJ) -' Public Property ListOfParam As ObservableCollection(Of ParamWJ) -' Get -' Return m_ListOfParam -' End Get -' Set(value As ObservableCollection(Of ParamWJ)) -' m_ListOfParam = value -' End Set -' End Property - -' Sub New(sName As String) -' m_sSubMaterial = sName -' End Sub -'End Class - -'Public Class ParamWJ - -' Private m_Thickness As String -' Private m_Q1 As String -' Private m_Q2 As String -' Private m_Q3 As String -' Private m_Q4 As String -' Private m_Q5 As String - -' Public Property Q1 As String -' Get -' Return m_Q1 -' End Get -' Set(value As String) -' m_Q1 = value -' End Set -' End Property - -' Public Property Thickness As String -' Get -' Return m_Thickness -' End Get -' Set(value As String) -' m_Thickness = value -' End Set -' End Property - -' Public Property Q2 As String -' Get -' Return m_Q2 -' End Get -' Set(value As String) -' m_Q2 = value -' End Set -' End Property - -' Public Property Q3 As String -' Get -' Return m_Q3 -' End Get -' Set(value As String) -' m_Q3 = value -' End Set -' End Property - -' Public Property Q4 As String -' Get -' Return m_Q4 -' End Get -' Set(value As String) -' m_Q4 = value -' End Set -' End Property - -' Public Property Q5 As String -' Get -' Return m_Q5 -' End Get -' Set(value As String) -' m_Q5 = value -' End Set -' End Property - -' Sub New(sT As String, sQ1 As String, sQ2 As String, sQ3 As String, sQ4 As String, sQ5 As String) -' m_Thickness = sT -' m_Q1 = sQ1 -' m_Q2 = sQ2 -' m_Q3 = sQ3 -' m_Q4 = sQ4 -' m_Q5 = sQ5 -' End Sub - -'End Class - -Imports System.Collections.ObjectModel +Imports System.Collections.ObjectModel Imports System.IO Imports EgtUILib Imports EgtWPFLib5 diff --git a/MainWindow.xaml.vb b/MainWindow.xaml.vb index c78ec42..da897a8 100644 --- a/MainWindow.xaml.vb +++ b/MainWindow.xaml.vb @@ -1340,7 +1340,6 @@ Class MainWindow End Sub Friend Sub EgtWPFInit() - 'EgtBasicInfo EgtWPFLib.InitializeEgtWPFLib.EgtBasicInfo_Initialization("C:/EgtDev/OmagCUT", 1280, 1024, 15, 12, "/#Century Gothic", @@ -1348,7 +1347,6 @@ Class MainWindow Application.Current.FindResource("FontSize_UpperCaseCharacter"), Application.Current.FindResource("FontSize_LowerCaseCharacter"), GetPrivateProfileInt(S_GENERAL, K_THEME, 0, GetIniFile())) - ' EgtMessageBox EgtWPFLib.InitializeEgtWPFLib.EgtMsgBox_Initialization(Application.Current.FindResource("OmagCut_WindowBorder"), Application.Current.FindResource("OmagCut_WindowGrayTextButton"), Nothing, diff --git a/NcComm/CNCommunication.vb b/NcComm/CNCommunication.vb index 9e402ef..738ca7e 100644 --- a/NcComm/CNCommunication.vb +++ b/NcComm/CNCommunication.vb @@ -2,8 +2,10 @@ Imports System.Globalization Imports System.IO Imports System.Text +Imports System.Windows.Interop Imports System.Windows.Threading Imports EgtUILib +Imports EgtWPFLib Imports EgtWPFLib.EgtMsgBox Imports EgtWPFLib5 Imports OmagCUT.CN_generico @@ -1636,7 +1638,7 @@ Public Class CNCommunication System.Threading.Thread.Sleep(m_MainWindow.m_CurrentMachine.nResetSendDelay) ' Se modalità invio a step per debug di Siemens If m_bStepByStepSend And m_nNCType = 3 Then - MessageBox.Show( "Reset Done, Press Ok to Continue", "Send Program Step by Step") + Dim EmbDbg As New EgtMsgBox(m_MainWindow, "Send Program Step by Step", "Reset Done, Press Ok to Continue", EgtMsgBox.Buttons.OK, EgtMsgBox.Icons.NULL, 0, 0) End If If m_nNCType = 1 Then ' Cancellazione eventuale file già presente con lo stesso nome (ignoro eventuale errore) @@ -1665,7 +1667,7 @@ Public Class CNCommunication System.Threading.Thread.Sleep(100) ' Se modalità invio a step per debug di Siemens If m_bStepByStepSend And m_nNCType = 3 Then - MessageBox.Show( "Download NC Prog Done, Press Ok to Continue", "Send Program Step by Step") + Dim EmbDbg As New EgtMsgBox(m_MainWindow, "Send Program Step by Step", "Download NC Prog Done, Press Ok to Continue", EgtMsgBox.Buttons.OK, EgtMsgBox.Icons.NULL, 0, 0) End If ' FANUC: genero un file 901 vuoto da spedire, attivare; poi rispedisco il file 900 If m_nNCType = 4 And Not bOk Then @@ -1710,7 +1712,7 @@ Public Class CNCommunication System.Threading.Thread.Sleep(100) ' Se modalità invio a step per debug di Siemens If m_bStepByStepSend And m_nNCType = 3 Then - MessageBox.Show( "ActivateProgram Done, Press Ok to Continue", "Send Program Step by Step") + Dim EmbDbg As New EgtMsgBox(m_MainWindow, "Send Program Step by Step", "ActivateProgram Done, Press Ok to Continue", EgtMsgBox.Buttons.OK, EgtMsgBox.Icons.NULL, 0, 0) End If ' Attivo la modalità AUTO prima per preparare il cyclo start bOk = bOk AndAlso (m_CN.DGeneralFunctions_WriteCncMode(0) = 0) @@ -1718,7 +1720,7 @@ Public Class CNCommunication System.Threading.Thread.Sleep(100) ' Se modalità invio a step per debug di Siemens If m_bStepByStepSend And m_nNCType = 3 Then - MessageBox.Show( "AUTO Mode Setting Done, Press Ok to Continue", "Send Program Step by Step") + Dim EmbDbg As New EgtMsgBox(m_MainWindow, "Send Program Step by Step", "AUTO Mode Setting Done, Press Ok to Continue", EgtMsgBox.Buttons.OK, EgtMsgBox.Icons.NULL, 0, 0) End If ' Modalità automatica EgtOutLog("DGeneralFunctions_WriteCncMode(0)")