-gestito spostamento da strategie available ad attive

EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdBTLPartListV.xaml.vb

@@ -21,18 +21,6 @@ Public Class OnlyProdBTLPartListV
       ' Evita il drag sulla selezione multipla
       s_isDraggingSelectionField = m_NameDataGridType.GetField("_isDraggingSelection", BindingFlags.Instance Or BindingFlags.NonPublic)
       s_endDraggingMethod = m_NameDataGridType.GetMethod("EndDragging", BindingFlags.Instance Or BindingFlags.NonPublic)
-      'SetSelButton(MouseButton.Right)
-   End Sub
-
-   Public Sub SetSelButton(SelButton As MouseButton)
-      Select Case SelButton
-         Case MouseButton.Right
-            m_SelectBtn = MouseButton.Right
-            m_HighlightBtn = MouseButton.Left
-         Case Else      ' MouseButton.Left
-            m_SelectBtn = MouseButton.Left
-            m_HighlightBtn = MouseButton.Right
-      End Select
    End Sub
 
    Public Sub DataGrid_PreviewMouseMove(sender As Object, e As MouseEventArgs)
@@ -51,10 +39,6 @@ Public Class OnlyProdBTLPartListV
             Dim BTLPartVM As BTLPartVM = DirectCast(Row.DataContext, BTLPartVM)
             Dim DataGridDetailsPresenter As Object = TreeHelperManager.FindVisualParents(Of Button, CheckBox, Primitives.DataGridDetailsPresenter)(e.OriginalSource)
             If Not IsNothing(DataGridDetailsPresenter) Then Return
-            'Dim parent = e.OriginalSource
-            'While Not IsNothing(parent)
-            '   parent = VisualTreeHelper.GetParent(parent)
-            'End While
 
             If Map.refProjectVM.BTLStructureVM.SelBTLParts.Contains(BTLPartVM) Then
                BTLPartVM.SetOpenFeatureList(Not BTLPartVM.bOpenFeatureList)
@@ -100,5 +84,4 @@ Public Class OnlyProdBTLPartListV
       End If
    End Sub
 
-
 End Class

EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerVM.vb

@@ -215,7 +215,7 @@ Public Class StrategyManagerVM
       ' Setto a true booleano per modifica
       SetbIsModifyStrategy(True)
       ' Setto indice per capire che la strategia è stata spostata in ActiveStrategyList
-      m_SelTreeItem.SelAvailableStrategy.SetIndexList(m_SelTreeItem.StrategyList.Count - 1)
+      m_SelTreeItem.SelAvailableStrategy.nIndexInList = 0
       ' Aggiorno le liste
       m_SelTreeItem.AvailableStrategyList_View.Refresh()
       m_SelTreeItem.ActiveStrategyList_View.Refresh()
@@ -240,8 +240,10 @@ Public Class StrategyManagerVM
    Public Sub RemoveSelectedStrategyToActiveStrategy()
       ' Controllo se SelectedActiveStrategy se è nullo esco
       If IsNothing(m_SelTreeItem.SelActiveStrategy) Then Return
+      ' Setto a true booleano per modifica
+      SetbIsModifyStrategy(True)
       ' Setto indice per capire che la strategia è stata spostata in StrategyList
-      m_SelTreeItem.SelActiveStrategy.SetIndexList(-1)
+      m_SelTreeItem.SelActiveStrategy.nIndexInList = -1
       ' Aggiorno le liste
       m_SelTreeItem.AvailableStrategyList_View.Refresh()
       m_SelTreeItem.ActiveStrategyList_View.Refresh()
@@ -289,12 +291,11 @@ Public Class StrategyManagerVM
    ''' </summary>
    Public Sub NewAiSetup()
       Dim sAISetupDirPath As String = Map.refMainWindowVM.MainWindowM.GetAISetupDirPath()
-      Dim sStrategyConfigurationFilePath As String = sAISetupDirPath & "\" & "Test1" & ".json"
-      Dim NewStrategy As New StrategySetup("Test1")
+      Dim sStrategyConfigurationFilePath As String = sAISetupDirPath & "\" & CUSTOMERCONFIG_FILE & ".json"
+      Dim NewStrategy As New StrategySetup(CUSTOMERCONFIG_FILE)
       m_StrategySetupList.Add(NewStrategy)
       SelStrategySetup = NewStrategy
       NotifyPropertyChanged(NameOf(StrategySetupList))
-      'SaveJson()
    End Sub
 
 #End Region    ' New
@@ -315,7 +316,7 @@ Public Class StrategyManagerVM
    ''' </summary>
    Public Sub Save()
       m_SelStrategySetup.Write()
-      'SaveJson()
+      SetbIsModifyStrategy(False)
    End Sub
 
 #End Region    ' SaveCommand
@@ -346,8 +347,9 @@ Public Class StrategyManagerVM
          ' Muovo l'elemento selezionato sopra di 1
          m_SelTreeItem.StrategyList.Move(IndexActiveStrategy, NewIndexActiveStrategy)
       End If
+      ' Setto a true booleano per modifica
+      SetbIsModifyStrategy(True)
       ' Aggiorno la lista
-      m_SelTreeItem.ActiveStrategyList_View.MoveCurrentToNext()
       m_SelTreeItem.ActiveStrategyList_View.Refresh()
    End Sub
 
@@ -378,6 +380,8 @@ Public Class StrategyManagerVM
          ' Muovo l'elemento selezionato sopra di 1
          m_SelTreeItem.StrategyList.Move(IndexActiveStrategy, NewIndexActiveStrategy)
       End If
+      ' Setto a true booleano per modifica
+      SetbIsModifyStrategy(True)
       ' Aggiorno la lista
       m_SelTreeItem.ActiveStrategyList_View.Refresh()
    End Sub
@@ -789,22 +793,9 @@ Public Class Strategy
    End Property
    Friend Sub SetIndexList(value As Integer)
       m_nIndexInList = value
-      'If nIndexInList > -1 Then
-      '   m_bActive = True
-      'Else
-      '   m_bActive = False
-      'End If
       NotifyPropertyChanged(NameOf(nIndexInList))
-      '  NotifyPropertyChanged(NameOf(bActive))
    End Sub
 
-   'Private m_bActive As Boolean
-   'Public ReadOnly Property bActive As Boolean
-   '   Get
-   '      Return m_bActive
-   '   End Get
-   'End Property
-
    Private m_sImageStrategy As String = "pack://application:,,,/Resources/NewPage/LogoProvaStrategy.png"
    Public Property sImageStrategy As String
       Get
@@ -839,10 +830,7 @@ Public Class Strategy
       m_ParentTopology = ParentTopology
       If IsNothing(JsonStrategy) Then Return
       m_sStrategyID = JsonStrategy.sStrategyID
-      '  m_nIndexInList = JsonStrategy.nIndexInList
-      'm_bActive = JsonStrategy.bActive
       ReadConfigurationStrategyJson()
-      'NotifyPropertyChanged(NameOf(ParameterList))
    End Sub
 
 #End Region    ' Constructor
@@ -860,19 +848,14 @@ Public Class Strategy
       ' Leggo il contenuto del file JSON e deserializzo
       Dim StrategyJson As String = File.ReadAllText(StrategyPath)
       Dim strategyConfig As JsonAvailableStrategy = JsonConvert.DeserializeObject(Of JsonAvailableStrategy)(StrategyJson)
-      ' Assegno ParamList per poter visualizzarla da interfaccia e controllo di che tipo è se Strategy o JsonStrategy
-      '  m_ParameterList = New ObservableCollection(Of StrategyParameter)(strategyConfig.ParameterList.Select(Function(p) StrategyParameter.NewStrategyParameter(p)).ToList())
    End Sub
 
    Friend Sub ReadConfiguration(ConfigurationStrategy As JsonStrategy)
       m_nIndexInList = ConfigurationStrategy.nIndexInList
       NotifyPropertyChanged(NameOf(nIndexInList))
-      'm_ParentTopology.NotifyPropertyChanged(NameOf(m_ParentTopology.AvailableStrategyList_View))
-      'm_ParentTopology.NotifyPropertyChanged(NameOf(m_ParentTopology.ActiveStrategyList_View))
       For Each Parameter In ConfigurationStrategy.ParameterList
          Dim DefaultParameter As StrategyParameter = m_ParameterList.FirstOrDefault(Function(x) x.sName = Parameter.sName)
          If IsNothing(DefaultParameter) Then
-            'm_ParameterList.Add(StrategyParameter.NewStrategyParameter(Parameter))
             ' verifico indici!!
          Else
             Select Case DefaultParameter.GetType()
@@ -903,13 +886,6 @@ End Class
 Public MustInherit Class StrategyParameter
    Inherits VMBase
 
-   'Public Enum StrategyParameterTypes As Integer
-   '   BOOLEAN_ = 1
-   '   DOUBLE_ = 2
-   '   STRING_ = 3
-   '   COMBO = 4
-   'End Enum
-
 #Region "FIELDS & PROPETIES"
 
    Private m_ParentStrategy As Strategy
@@ -958,13 +934,6 @@ Public MustInherit Class StrategyParameter
       End Set
    End Property
 
-   'Private m_Type As StrategyParameterTypes
-   'Public ReadOnly Property Type As StrategyParameterTypes
-   '   Get
-   '      Return m_Type
-   '   End Get
-   'End Property
-
    Private m_sMessageId As String
    Public Property sMessageId As String
       Get
@@ -1001,7 +970,6 @@ Public MustInherit Class StrategyParameter
       m_sNameNge = JsonGenericParameter.sNameNge
       m_sDescriptionShort = JsonGenericParameter.sDescriptionShort
       m_sDescriptionLong = JsonGenericParameter.sDescriptionLong
-      ' StringToDouble(JsonGenericParameter.sType, m_Type)
       m_sMessageId = JsonGenericParameter.sMessageId
       m_sMinUserLevel = JsonGenericParameter.sMinUserLevel
    End Sub
@@ -1010,17 +978,6 @@ Public MustInherit Class StrategyParameter
 
 #Region "METHODS"
 
-   Public Shared Function NewStrategyParameter(JsonGenericParameter As JsonDefaultStrategyParameter) As StrategyParameter
-      Select Case JsonGenericParameter.sType
-         Case "b"
-            Return New BooleanStrategyParameter(JsonGenericParameter)
-         Case "d"
-            Return New DoubleStrategyParameter(JsonGenericParameter)
-         Case "combo"
-            Return New ComboStrategyParameter(JsonGenericParameter)
-      End Select
-   End Function
-
    Friend MustOverride Function Serialize() As JsonStrategyParameter
 
 #End Region    ' Methods