- correzione disabilitazione parametri LeadOut in CurrMachining

- cambiata gestione della modalita' di modifica selezionata - corezione impostazione pagina modifica dopo apertura progetto - verifica che non ci siano operazioni di modifica in corso prima di far partire slice - correzione errore su chiusura percorso disegnato - disabilitata interfaccia quando comando in corso in modifica
2023-04-17 20:00:50 +02:00
parent 554b1a662e
commit cc41ca8d82
11 changed files with 235 additions and 36 deletions
@@ -40,6 +40,10 @@ Public Class ShellNumberPanelVM
         Return m_SelShellNumber
      End Get
      Set(value As ShellNumberEntity)
+         If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse Map.refShellNumberPanelVM.bCPlaneObj_IsActive Then
+            NotifyPropertyChanged(NameOf(SelShellNumber))
+            Return
+         End If
         m_SelShellNumber = value
         EgtDeselectAll()
         If Not IsNothing(value) Then
@@ -354,6 +358,8 @@ Public Class ShellNumberPanelVM
            NotifyPropertyChanged(NameOf(bRotate_IsChecked))
            Map.refRightPanelVM.SetSelPanel(RightPanelVM.Panels.SHELLNUMBERPARAM)
            NotifyPropertyChanged(NameOf(ShellNumberList_IsEnabled))
+            ' disattivo lista shell number
+            SetShellNumberListIsEnabled(False)
         Else
            NotifyPropertyChanged(NameOf(m_bMachParam_IsChecked))
         End If
@@ -371,11 +377,17 @@ Public Class ShellNumberPanelVM
      End Get
   End Property

+   Private m_ShellNumberList_IsEnabled As Boolean = False
   Public ReadOnly Property ShellNumberList_IsEnabled As Boolean
      Get
-         Return Not m_bMachParam_IsChecked
+         Return If(m_ShellNumberList.Count > 0, m_ShellNumberList_IsEnabled, False)
      End Get
   End Property
+   Friend Sub SetShellNumberListIsEnabled(bValue As Boolean)
+      m_ShellNumberList_IsEnabled = bValue
+      NotifyPropertyChanged(NameOf(ShellNumberList_IsEnabled))
+   End Sub
+
   ' riferimento griglia all'ingresso in questa pagina
   Private m_OriginalGridFrame As New Frame3d

@@ -393,6 +405,8 @@ Public Class ShellNumberPanelVM
      End Get
   End Property

+   Private m_bEscOnLine2P As Boolean = False
+
 #Region "Tooltip"

   Public ReadOnly Property Import_ToolTip As String
@@ -576,6 +590,8 @@ Public Class ShellNumberPanelVM
         SelShellNumber = m_ShellNumberList(0)
         NotifyPropertyChanged(NameOf(SelShellNumber))
      End If
+      ' abilito lista shell number
+      SetShellNumberListIsEnabled(True)
      Map.refSceneHostVM.MainScene.SetStatusNull()
   End Sub

@@ -620,6 +636,8 @@ Public Class ShellNumberPanelVM
            EgtSelectObj(m_SelShellNumber.nExtrusionId)
      End Select
      EgtDraw()
+      ' disattivo il resto dell'interfaccia
+      ManageInterface(False)
      Return True
   End Function

@@ -629,6 +647,7 @@ Public Class ShellNumberPanelVM
   End Sub

   Friend Sub OnExecCmdEnd(command As Controller.CMD)
+      m_bEscOnLine2P = False
      Select Case command
         Case Controller.CMD.MODIFYCURVE, Controller.CMD.ADDPOINTCURVE, Controller.CMD.REMOVEPOINTCURVE
            ' leggo altezza estrusione
@@ -668,6 +687,10 @@ Public Class ShellNumberPanelVM
            ' Imposto flag di ricalcolo slice
            EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_SLICE, True)
      End Select
+      ' se non ho creato percorso riabilito interfaccia
+      If Not m_bIsCreatingPath Then
+         ManageInterface(True)
+      End If
      If command <> Controller.CMD.LINE2P AndAlso command <> Controller.CMD.EXTRUDE Then Return
      ' se finita creazione estrusione
      If m_bIsCreatingExtrusion Then
@@ -738,6 +761,9 @@ Public Class ShellNumberPanelVM
            If Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.EXTRUDE) Then
               m_bIsCreatingExtrusion = True
               Map.refControllerInputPanelVM.IsChecked = True
+               If Not EgtCurveIsClosed(nNewEntityId) Then
+                  m_bEscOnLine2P = True
+               End If
            Else
               ' cancello layer
               EgtErase(nNewExtrusionLayerId)
@@ -762,6 +788,13 @@ Public Class ShellNumberPanelVM
            ' rimetto la selezione scena a null
            Map.refSceneHostVM.MainScene.SetStatusNull()
         End If
+         ' se esc su creazione percorso, lo annullo, altrimenti riabilito interfaccia
+         If m_bEscOnLine2P Then
+            m_bEscOnLine2P = False
+         Else
+            If m_bIsCreatingExtrusion Then m_bIsCreatingExtrusion = False
+            ManageInterface(True)
+         End If
      End If
   End Sub

@@ -797,6 +830,18 @@ Public Class ShellNumberPanelVM
      Return nShellNumberIndex + 1
   End Function

+   Friend Sub ManageInterface(bValue As Boolean)
+      ' disabilito ProjManager, TopPanel, TFS, Slider, bottoni e uscita dal programma
+      Map.refProjManagerVM.SetProjCmdIsEnabled(bValue)
+      Map.refTopPanelVM.SetTopPanelIsEnabled(bValue)
+      Map.refViewLayerManagerVM.SetViewLayerManagerIsEnabled(bValue)
+      Map.refSliderManagerVM.SetLayerIndexIsEnabled(bValue)
+      Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(bValue)
+      Map.refSliceManagerVM.SetButtonsIsEnabled(bValue)
+      SetShellNumberListIsEnabled(bValue)
+   End Sub
+
+
 #End Region    ' METHODS

 #Region "COMMANDS"
@@ -820,7 +865,9 @@ Public Class ShellNumberPanelVM
   ''' </summary>
   Public Sub Import(ByVal param As Object)
      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      ManageInterface(False)
      Map.refSceneHostVM.InsertShellNumber()
+      ManageInterface(True)
   End Sub

 #End Region ' Import
@@ -844,6 +891,7 @@ Public Class ShellNumberPanelVM
   ''' </summary>
   Public Sub Line2P(ByVal param As Object)
      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      ManageInterface(False)
      Dim nNewShellNumberLayerId As Integer = EgtGetFirstNameInGroup(m_nPartId, LAY_NEWRIB)
      If nNewShellNumberLayerId = GDB_ID.NULL Then nNewShellNumberLayerId = EgtCreateGroup(m_nPartId)
      EgtSetName(nNewShellNumberLayerId, LAY_NEWRIB)
@@ -892,6 +940,7 @@ Public Class ShellNumberPanelVM
         End If
         NotifyPropertyChanged(NameOf(SelShellNumber))
      End If
+      SetShellNumberListIsEnabled(True)
   End Sub

 #End Region    ' Delete
@@ -1316,6 +1365,7 @@ Public Class ShellNumberPanelVM
   ''' </summary>
   Public Sub CPlaneObj(ByVal param As Object)
      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      ManageInterface(False)
      ' salvo selezione precedente e deseleziono altri oggetti
      m_PrevSelObjs.Clear()
      Dim nSelObjId As Integer = EgtGetFirstSelectedObj()