-pulizia codice

EgtBEAMWALL.Optimizer/BTLPartManager/BTLPartManagerVM.vb

@@ -319,7 +319,6 @@ Public Class BTLPartManagerVM
    End Sub
 
    Private Function CreateBarToSimulate(ProjType As BWType, ByRef BarList As Bar()) As Boolean
-      'If SelPage = Pages.VIEW Then
       If Not IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart) Then
          Dim TempBarList(0) As EgtBEAMWALL.Core.Bar
          Dim Bar As New EgtBEAMWALL.Core.Bar With {.nBarId = Map.refProjectVM.BTLStructureVM.SelBTLPart.nPartId,
@@ -395,9 +394,9 @@ Public Class BTLPartManagerVM
       If (Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE AndAlso (IsNothing(ProjectManagerVM.CurrProj) OrElse IsNothing(Map.refProjectVM.BTLStructureVM)) AndAlso (IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM))) Then Return
       Dim SelPart As BTLPartVM = Map.refProjectVM.BTLStructureVM.SelBTLPart
       If IsNothing(SelPart) Then Return
-            If SelPart.nGlobalState <> CalcStates.NOTCALCULATED Then
-               SelPart.ResetCalcTotalPart()
-            End If
+      If SelPart.nGlobalState <> CalcStates.NOTCALCULATED Then
+         SelPart.ResetCalcTotalPart()
+      End If
    End Sub
 
 #End Region    ' ResetCalc

EgtBEAMWALL.Optimizer/ConfigurationPage/ConfigurationPageVM.vb

@@ -37,7 +37,7 @@ Public Class ConfigurationPageVM
          m_SelConfigSubPage = value
          If m_SelConfigSubPage = ConfigSubPages.GENERAL Then
             ' Controllo se il file CustomConfig Json è stato modificato
-            Map.refStrategyManagerVM.SaveCustomConfigJson()
+            If Map.refStrategyManagerVM.bIsModifyStrategy Then Map.refStrategyManagerVM.SaveCustomConfigJson()
             SetGeneral_Visibility(Visibility.Visible)
             SetStrategyManager_Visibility(Visibility.Collapsed)
             SetPDFEditor_Visibility(Visibility.Collapsed)
@@ -47,13 +47,13 @@ Public Class ConfigurationPageVM
             SetPDFEditor_Visibility(Visibility.Collapsed)
          ElseIf m_SelConfigSubPage = ConfigSubPages.MACHINE Then
             ' Controllo se il file CustomConfig Json è stato modificato
-            Map.refStrategyManagerVM.SaveCustomConfigJson()
+            If Map.refStrategyManagerVM.bIsModifyStrategy Then Map.refStrategyManagerVM.SaveCustomConfigJson()
             SetGeneral_Visibility(Visibility.Collapsed)
             SetStrategyManager_Visibility(Visibility.Collapsed)
             SetPDFEditor_Visibility(Visibility.Collapsed)
          ElseIf m_SelConfigSubPage = ConfigSubPages.PDFEDITOR Then
             ' Controllo se il file CustomConfig Json è stato modificato
-            Map.refStrategyManagerVM.SaveCustomConfigJson()
+            If Map.refStrategyManagerVM.bIsModifyStrategy Then Map.refStrategyManagerVM.SaveCustomConfigJson()
             SetPDFEditor_Visibility(Visibility.Visible)
             SetGeneral_Visibility(Visibility.Collapsed)
             SetStrategyManager_Visibility(Visibility.Collapsed)

EgtBEAMWALL.Optimizer/MainWindow/MainWindowM.vb

@@ -358,7 +358,7 @@ Public Class MainWindowM
    Private Sub ManageInstance()
       Dim bCreated As Boolean
       Try
-         m_objMutex = New Mutex(False, "Global\EgtBEAMWALL.ViewerOptimizer", bCreated)
+         m_objMutex = New Mutex(False, "Global\EgtBEAMWALL.Optimizer", bCreated)
       Catch
          bCreated = False
       End Try

EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerVM.vb

@@ -173,24 +173,6 @@ Public Class StrategyManagerVM
       End If
    End Sub
 
-   ''' <summary>
-   ''' Funzione che recupera le strategie filtrate
-   ''' </summary>
-   Friend Sub GetStrategyProduction()
-      ' Pulisco la lista
-      m_StrategyProductionList.Clear()
-      ' Recupero Feature selezionata
-      Dim selFeature As BTLFeatureVM = Map.refProjectVM.MachGroupPanelVM.SelectedMachGroup.SelPart.SelFeatureVM
-      ' Popolo la lista con le strategie
-      Dim AvailableStrategyItem As StrategyFeature = m_SelStrategySetup.StrategyFeatureList.FirstOrDefault(Function(AvailableStrategy) selFeature.nPRC = AvailableStrategy.nPRC AndAlso selFeature.nSelGRP = AvailableStrategy.nGRP)
-      ' Controllo se AvailableStrategyItem non è nullo
-      If Not IsNothing(AvailableStrategyItem) Then
-         ' Se esiste, popola la lista con le strategie
-         m_StrategyProductionList = New ObservableCollection(Of Strategy)(AvailableStrategyItem.TopologyList.SelectMany(Function(topology) topology.StrategyList))
-      End If
-      NotifyPropertyChanged(NameOf(StrategyProductionList))
-   End Sub
-
 #End Region ' Methods
 
 #Region "COMMANDS"
@@ -596,16 +578,6 @@ Public Class StrategyFeature
       End Set
    End Property
 
-   'Private m_bIsSelected As Boolean
-   'Public Property IsSelected As Boolean
-   '   Get
-   '      Return m_bIsSelected
-   '   End Get
-   '   Set(value As Boolean)
-   '      m_bIsSelected = value
-   '   End Set
-   'End Property
-
 #End Region    ' Fields & Propeties
 
 #Region "CONSTRUCTOR"

EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml

@@ -3026,7 +3026,7 @@
       <Setter Property="VerticalAlignment" Value="Center"/>
       <Setter Property="BorderThickness" Value="2"/>
       <Setter Property="Padding" Value="20,2,20,2"/>
-      <Setter Property="Margin" Value="2,2,20,2"/>
+      <Setter Property="Margin" Value="0,2,20,2"/>
       <Setter Property="CornerRadius" Value="2"/>
    </Style>