-gestito in strategie tipo non presente

EgtBEAMWALL.Optimizer/BTLViewModel/BTLPartVM.vb

@@ -2330,7 +2330,7 @@ Public Class BTLPartVM
    ''' Execute the Open.  This method is invoked by the OpenCommand.
    ''' </summary>
    Friend Sub Verify()
-      If ((IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.BTLStructureVM) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM))) Then Return
+      If IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.BTLStructureVM) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM) Then Return
       Map.refCALCPanelVM.Verify(ProjectType.PROJ)
       Return
    End Sub

EgtBEAMWALL.Optimizer/InstrumentPanel/MyInstrumentPanelVM.vb

@@ -29,12 +29,8 @@ Public Class MyInstrumentPanelVM
    End Property
 
    ' Definizione comandi
-   Private m_cmdData As ICommand
    Private m_cmdChangeParameter As ICommand
    Private m_cmdChangeMaterial As ICommand
-   Private m_cmdStatistics As ICommand
-   Private m_cmdVisualization As ICommand
-   Private m_cmdOptimizer As ICommand
 
 #Region "Messages"
 

EgtBEAMWALL.Optimizer/StrategyManager/JsonAvailableStrategyHelper.vb

@@ -189,15 +189,18 @@ Public Class JsonAvailableStrategy
       End If
       ' Leggo il contenuto del file JSON e deserializzo
       Dim StrategyJson As String = File.ReadAllText(StrategyPath)
-      Dim strategyConfig As JsonDefaultStrategy = JsonConvert.DeserializeObject(Of JsonDefaultStrategy)(StrategyJson)
-      Strategy.sStrategyName = strategyConfig.sStrategyName
+      Dim StrategyConfig As JsonDefaultStrategy = JsonConvert.DeserializeObject(Of JsonDefaultStrategy)(StrategyJson)
+      Strategy.sStrategyName = StrategyConfig.sStrategyName
       Dim sImagePath As String = Map.refMainWindowVM.MainWindowM.GetStandardDirPath(StrategyType) & "\" & sStrategyId & "\" & sStrategyId & ".png"
       If File.Exists(sImagePath) Then
          Strategy.sStrategyImagePath = sImagePath
       End If
-      If strategyConfig.sStrategyId <> m_sStrategyId Then EgtOutLog("Error! Strategy name wrong in " & m_sStrategyId)
-      For Each Parameter In strategyConfig.ParameterList
-         Strategy.ParameterList.Add(Parameter.Deserialize())
+      If StrategyConfig.sStrategyId <> m_sStrategyId Then EgtOutLog("Error! Strategy name wrong in " & m_sStrategyId)
+      For Each Parameter In StrategyConfig.ParameterList
+         Dim NewParameter As StrategyParameter = Parameter.Deserialize()
+         If Not IsNothing(NewParameter) Then
+            Strategy.ParameterList.Add(Parameter.Deserialize())
+         End If
       Next
       Return Strategy
    End Function
@@ -438,6 +441,9 @@ Public Class JsonDefaultStrategyParameter
          Case "s"
             StrategyParameter = New StringStrategyParameter()
             DirectCast(StrategyParameter, StringStrategyParameter).SetValue(m_sValue)
+         Case Else
+            EgtOutLog("Tipo: " & m_sType & "  non presente")
+            Return Nothing
       End Select
       StrategyParameter.sName = m_sName
       StrategyParameter.sNameNge = m_sNameNge

EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerVM.vb

@@ -50,6 +50,7 @@ Public Class StrategyManagerVM
          ' deseleziono eventuale strategia precedentemente selezionata
          If Not IsNothing(m_SelTreeItem) Then
             m_SelTreeItem.IsSelected = False
+            m_SelTreeItem.StrategyList.Clear()
             'SelTreeItem = Nothing
          End If
          m_SelStrategySetup = value
@@ -726,9 +727,9 @@ Public Class Topology
          If value Then
             refUpdateSelTreeItem(Me)
          Else
-            SelActiveStrategy = Nothing
-            SelAvailableStrategy = Nothing
-            m_StrategyList.Clear()
+            m_SelActiveStrategy = Nothing
+            m_SelAvailableStrategy = Nothing
+            'm_StrategyList.Clear()
          End If
          m_AvailableStrategyList_View.Refresh()
          m_ActiveStrategyList_View.Refresh()