-aggiunto finestre personalizzate messagebox e colorpicker

2024-07-25 10:12:29 +02:00
parent 2cfc921f3c
commit 4b8f4e9679
41 changed files with 1066 additions and 313 deletions
@@ -39,7 +39,7 @@ Public Class SimulationExpanderVM
      End Get
      Set(value As Boolean)
         m_bOnlySimulation = value
-         NotifyPropertyChanged("bOnlySimulation")
+         NotifyPropertyChanged(NameOf(bOnlySimulation))
      End Set
   End Property

@@ -102,12 +102,15 @@ Public Class SimulationExpanderVM
      If Not EgtGenerate(sCncFile, sInfo) Then
         Dim nErr = EgtGetLastMachMgrErrorId()
         If nErr = 1000 Then
-            MessageBox.Show(EgtMsg(5333), EgtMsg(5320), MessageBoxButton.OK, MessageBoxImage.Information)
+            'MessageBox.Show(EgtMsg(5333), EgtMsg(5320), MessageBoxButton.OK, MessageBoxImage.Information)
+            EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(5333), EgtMsg(5320), MessageBoxButton.OK, MessageBoxImage.Information)
         ElseIf nErr <> 0 Then
            Dim sErr As String = EgtGetLastMachMgrErrorString()
-            MessageBox.Show(sErr, EgtMsg(5305), MessageBoxButton.OK, MessageBoxImage.Exclamation)
+            'MessageBox.Show(sErr, EgtMsg(5305), MessageBoxButton.OK, MessageBoxImage.Exclamation)
+            EgtMessageBoxV.Show(Application.Current.MainWindow, sErr, EgtMsg(5305), MessageBoxButton.OK, MessageBoxImage.Exclamation)
         Else
-            MessageBox.Show(EgtMsg(5306), EgtMsg(5305), MessageBoxButton.OK, MessageBoxImage.Error)
+            'MessageBox.Show(EgtMsg(5306), EgtMsg(5305), MessageBoxButton.OK, MessageBoxImage.Error)
+            EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(5306), EgtMsg(5305), MessageBoxButton.OK, MessageBoxImage.Error)
         End If
         bNcView = False
      Else
@@ -165,9 +168,9 @@ Public Class SimulationExpanderVM
         Map.refTopCommandBarVM.DrawIsEnabled = False
         Map.refOperationsListExpanderVM.OpersListViewIsEnabled = False
         Map.refOperationParametersExpanderVM.OperParamsViewIsEnabled = False
-         Map.refEstimationsExpanderVM.Estimation_IsEnabled =False
+         Map.refEstimationsExpanderVM.Estimation_IsEnabled = False
         Map.refMachGroupPanelVM.SetMachGroupState(False)
-         Map.refEstimationsExpanderVM.NotifyPropertyChanged("Estimation_IsEnabled")
+         Map.refEstimationsExpanderVM.NotifyPropertyChanged(NameOf(Map.refEstimationsExpanderVM.Estimation_IsEnabled))
      End If
      Return True
   End Function
@@ -196,7 +199,7 @@ Public Class SimulationExpanderVM

   Friend Function UpdateAllMachinings() As Boolean
      ' Se disabilitato, esco
-      If GetPrivateProfileInt( S_MACH, K_AUTOUPDATEALLMACHININGS, 1) = 0 Then Return True   
+      If GetPrivateProfileInt(S_MACH, K_AUTOUPDATEALLMACHININGS, 1) = 0 Then Return True
      ' Eseguo ricalcolo
      Dim bModified As Boolean = EgtGetModified()
      Dim sErr As String = String.Empty
@@ -204,9 +207,11 @@ Public Class SimulationExpanderVM
      ' In caso di errori, li segnalo
      If Not bOk Then
         If Not String.IsNullOrEmpty(sErr) Then
-            MessageBox.Show(sErr, EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Exclamation)
+            'MessageBox.Show(sErr, EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Exclamation)
+            EgtMessageBoxV.Show(Application.Current.MainWindow, sErr, EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Exclamation)
         Else
-            MessageBox.Show(EgtMsg(MSG_SIMULATION + 6), EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Error)
+            'MessageBox.Show(EgtMsg(MSG_SIMULATION + 6), EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Error)
+            EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_SIMULATION + 6), EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Error)
         End If
      End If
      If Not bModified Then EgtResetModified()
@@ -226,9 +231,11 @@ Public Class SimulationExpanderVM
      If Not bOk Then
         If EgtGetLastMachMgrErrorId() <> 0 Then
            Dim sErr As String = EgtGetLastMachMgrErrorString()
-            MessageBox.Show(sErr, EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Exclamation)                     '.... - ERRORE
+            'MessageBox.Show(sErr, EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Exclamation)                     '.... - ERRORE
+            EgtMessageBoxV.Show(Application.Current.MainWindow, sErr, EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Exclamation)                     '.... - ERRORE
         Else
-            MessageBox.Show(EgtMsg(MSG_MESSAGEBOX + 10), EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Error)    'Errore sconosciuto - ERRORE
+            'MessageBox.Show(EgtMsg(MSG_MESSAGEBOX + 10), EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Error)    'Errore sconosciuto - ERRORE
+            EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_MESSAGEBOX + 10), EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Error)    'Errore sconosciuto - ERRORE
         End If
      End If
      ' Imposto stato corrente
@@ -268,9 +275,11 @@ Public Class SimulationExpanderVM
      If Not EgtSimStart(False) Then
         If EgtGetLastMachMgrErrorId() <> 0 Then
            Dim sErr As String = EgtGetLastMachMgrErrorString()
-            MessageBox.Show(sErr, EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Exclamation)                     '.... - ERRORE
+            'MessageBox.Show(sErr, EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Exclamation)                     '.... - ERRORE
+            EgtMessageBoxV.Show(Application.Current.MainWindow, sErr, EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Exclamation)                     '.... - ERRORE
         Else
-            MessageBox.Show(EgtMsg(MSG_MESSAGEBOX + 10), EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Error)    'Errore sconosciuto - ERRORE
+            'MessageBox.Show(EgtMsg(MSG_MESSAGEBOX + 10), EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Error)    'Errore sconosciuto - ERRORE
+            EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_MESSAGEBOX + 10), EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Error)    'Errore sconosciuto - ERRORE
         End If
         SetSimulationStatus(MCH_SIM_ST.UI_STOP)
      End If
@@ -291,7 +300,7 @@ Public Class SimulationExpanderVM
                  SetShowPlay(True)
                  NotifyPropertyChanged(NameOf(PlayPauseImage))
               End If
-            ' Se movimento con collisione
+               ' Se movimento con collisione
            ElseIf nMove = MCH_SIM.COLLISION Then
               If m_bStopOnNextCollision Then
                  ' Imposto stato Pausa
@@ -301,11 +310,12 @@ Public Class SimulationExpanderVM
                  SetShowPlay(True)
                  NotifyPropertyChanged(NameOf(PlayPauseImage))
                  ' Messaggio
-                  MessageBox.Show(EgtMsg(MSG_SIMULATION + 19), EgtMsg(MSG_SIMULATION + 15), MessageBoxButton.OK, MessageBoxImage.Warning)
+                  'MessageBox.Show(EgtMsg(MSG_MESSAGEBOX + 10), EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Error)    'Errore sconosciuto - ERRORE
+                  EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_SIMULATION + 19), EgtMsg(MSG_SIMULATION + 15), MessageBoxButton.OK, MessageBoxImage.Warning)
               Else
                  m_bStopOnNextCollision = True
               End If
-            ' Altrimenti movimento non riuscito
+               ' Altrimenti movimento non riuscito
            Else
               SetSimulationStatus(MCH_SIM_ST.UI_STOP)
               ' Aggiornamenti per bottone Play/Pause
@@ -321,15 +331,19 @@ Public Class SimulationExpanderVM
                  Case MCH_SIM.OUTSTROKE
                     Dim sInfo As String = String.Empty
                     EgtGetOutstrokeInfo(sInfo)
-                     MessageBox.Show(EgtMsg(MSG_SIMULATION + 2) & " " & sInfo, EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Stop)        'Extracorsa ...
+                     'MessageBox.Show(EgtMsg(MSG_SIMULATION + 2) & " " & sInfo, EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Stop)        'Extracorsa ...
+                     EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_SIMULATION + 2) & " " & sInfo, EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Stop)        'Extracorsa ...
                  Case MCH_SIM.DIR_ERR
-                     MessageBox.Show(EgtMsg(MSG_SIMULATION + 3), EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Stop)         'Direzione utensile irraggiungibile
+                     'MessageBox.Show(EgtMsg(MSG_SIMULATION + 3), EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Stop)         'Direzione utensile irraggiungibile
+                     EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_SIMULATION + 3), EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Stop)         'Direzione utensile irraggiungibile
                  Case Else
                     If EgtGetLastMachMgrErrorId() <> 0 Then
                        Dim sErr As String = EgtGetLastMachMgrErrorString()
-                        MessageBox.Show(sErr, EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Exclamation)                     '.... - ERRORE
+                        'MessageBox.Show(sErr, EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Exclamation)                     '.... - ERRORE
+                        EgtMessageBoxV.Show(Application.Current.MainWindow, sErr, EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Exclamation)                     '.... - ERRORE
                     Else
-                        MessageBox.Show(EgtMsg(MSG_SIMULATION + 4), EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Error)     'Errore - ERRORE
+                        'MessageBox.Show(EgtMsg(MSG_SIMULATION + 4), EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Error)     'Errore - ERRORE
+                        EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_SIMULATION + 4), EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Error)     'Errore - ERRORE
                     End If
               End Select
            End If
@@ -366,7 +380,7 @@ Public Class SimulationExpanderVM
      End If
      Map.refEstimationsExpanderVM.NotifyPropertyChanged(NameOf(Map.refEstimationsExpanderVM.Estimation_IsEnabled))
      If IniFile.m_bSimulEndExitApp Then
-         refMainWindowVM.CloseApplication( Nothing)
+         refMainWindowVM.CloseApplication(Nothing)
      End If
   End Sub

@@ -399,7 +413,8 @@ Public Class SimulationExpanderVM
      If bAskSave Then
         If String.IsNullOrEmpty(sCurrFilePath) OrElse EgtGetModified() Then
            ' Il progetto deve essere salvato prima di poter essere generato. Vuoi farlo ?
-            If MessageBox.Show(EgtMsg(MSG_SIMULATION + 31), EgtMsg(MSG_SIMULATION + 15), MessageBoxButton.YesNo, MessageBoxImage.Warning) = MessageBoxResult.No Then
+            'If MessageBox.Show(EgtMsg(MSG_SIMULATION + 31), EgtMsg(MSG_SIMULATION + 15), MessageBoxButton.YesNo, MessageBoxImage.Warning) = MessageBoxResult.No Then
+            If EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_SIMULATION + 31), EgtMsg(MSG_SIMULATION + 15), MessageBoxButton.YesNo, MessageBoxImage.Warning) = MessageBoxResult.No Then
               ' Abbandono
               Return False
            Else
@@ -413,11 +428,11 @@ Public Class SimulationExpanderVM
         End If
      End If
      sCncFile = ""
-      #If PLATFORM = "x64" Then
+#If PLATFORM = "x64" Then
         sInfo = "EgtCAM5 64bit ver." & Map.refMainWindowVM.Version() & " - " & sCurrFilePath
-      #Else
-         sInfo = "EgtCAM5 ver." & Map.refMainWindowVM.Version() & " - " & sCurrFilePath
-      #End If
+#Else
+      sInfo = "EgtCAM5 ver." & Map.refMainWindowVM.Version() & " - " & sCurrFilePath
+#End If
      If EgtGetInfo(EgtGetCurrMachGroup(), KEY_MCHGRP_NCNAME, sCncFile) AndAlso Not String.IsNullOrWhiteSpace(sCncFile) Then
         sCncFile = Path.GetDirectoryName(sCurrFilePath) & "\" & sCncFile
      Else
@@ -435,7 +450,7 @@ Public Class SimulationExpanderVM
      Return True
   End Function

-   Friend Sub SimulationExpander_Update_CncData( nFlag As Integer)
+   Friend Sub SimulationExpander_Update_CncData(nFlag As Integer)
      If Simulation_IsExpanded Then
         ShowCncData()
         ' Se fermo per Collisione rilevata da script Lua