-sistemato scena assemblato

EgtBEAMWALL.Optimizer/MainMenu/MainMenuVM.vb

@@ -561,6 +561,11 @@ Public Class MainMenuVM
    Private Function InitCONFIG() As Boolean
       Map.refMainWindowVM.NotifyPropertyChanged(NameOf(Map.refMainWindowVM.nSelTabPage))
       Map.refMainMenuVM.NotifyPropertyChanged(NameOf(Map.refMainMenuVM.SendFeedbackIsEnabled))
+      If Not IsNothing(Map.refStrategyManagerVM) AndAlso Not IsNothing(Map.refStrategyManagerVM.sSelectedAISetUp) Then
+         Map.refStrategyManagerVM.ReadAvailableStrategyJson(Map.refStrategyManagerVM.sSelectedAISetUp)
+      Else
+         Map.refStrategyManagerVM.ReadAvailableStrategyJson(CUSTOMERCONFIG_FILE)
+      End If
       Return True
    End Function
 

EgtBEAMWALL.Optimizer/SceneShowBulding/SceneShowBuldingV.xaml.vb

@@ -22,8 +22,8 @@ Public Class SceneShowBuldingV
          ' Imposto focus pulsante su false 
          SceneShowBulding.SetFocusOnMove(False)
          ' Recupero e imposto handle finestra principale
-         Dim hMainWnd As IntPtr = New WindowInteropHelper(Application.Current.MainWindow).Handle
-         EgtSetMainWindowHandle(hMainWnd)
+         'Dim hMainWnd As IntPtr = New WindowInteropHelper(Application.Current.MainWindow).Handle
+         'EgtSetMainWindowHandle(hMainWnd)
          EgtSetCurrentContext(SceneShowBulding.GetCtx())
          ' Imposto direttorio ausiliario per import/gestione BTL
          Dim sBtlAuxDir As String = String.Empty
@@ -86,20 +86,17 @@ Public Class SceneShowBuldingV
       Dim nShowMode As Integer = GetMainPrivateProfileInt(S_SCENE, K_SHOWMODE, SM.SHADING)
       'Map.refShowPanelVM.SetShowMode(DirectCast(nShowMode, SM))
       EgtSetShowMode(DirectCast(nShowMode, SM))
-      '' visualizzazione avanzata dei triangoli costituenti le superfici
-      'Dim bShowTriaAdv As Boolean = (GetMainPrivateProfileInt(S_SCENE, K_SHOWTRIAADV, 1) <> 0)
-      'EgtSetShowTriaAdv(bShowTriaAdv)
-      '' tipo visualizzazione per Zmap
-      'Dim nShowZmap As Integer = GetMainPrivateProfileInt(S_SCENE, K_SHOWZMAP, 1)
-      'EgtSetShowZmap(DirectCast(nShowZmap, ZSM), False)
-      '' dimensione lineare max in pixel delle textures
-      'Dim nTxrMaxLinPix As Integer = GetMainPrivateProfileInt(S_SCENE, K_TEXMAXLINPIX, 4096)
-      'EgtSetTextureMaxLinPixels(nTxrMaxLinPix)
-      '' tipo snap point
-      'SceneShowBulding.SetSnapPointType(SP.PT_SKETCH)
-      '' visualizzazione assemblato
-      'Dim nShowBuilding As Boolean = GetMainPrivateProfileInt(S_SCENE, K_SHOWBUILDING, 0) <> 0
-      'Map.refShowBeamPanelVM.SetShowBuilding(nShowBuilding)
+      ' visualizzazione avanzata dei triangoli costituenti le superfici
+      Dim bShowTriaAdv As Boolean = (GetMainPrivateProfileInt(S_SCENE, K_SHOWTRIAADV, 1) <> 0)
+      EgtSetShowTriaAdv(bShowTriaAdv)
+      ' tipo visualizzazione per Zmap
+      Dim nShowZmap As Integer = GetMainPrivateProfileInt(S_SCENE, K_SHOWZMAP, 1)
+      EgtSetShowZmap(DirectCast(nShowZmap, ZSM), False)
+      ' dimensione lineare max in pixel delle textures
+      Dim nTxrMaxLinPix As Integer = GetMainPrivateProfileInt(S_SCENE, K_TEXMAXLINPIX, 4096)
+      EgtSetTextureMaxLinPixels(nTxrMaxLinPix)
+      ' tipo snap point
+      SceneShowBulding.SetSnapPointType(SP.PT_SKETCH)
       ' imposto parametri geometrici griglia
       EgtSetGridGeo(100, 1, 10, 100)
    End Sub

EgtBEAMWALL.Optimizer/ShowBeamPanel/ShowBeamPanelVM.vb

@@ -1,7 +1,6 @@
 Imports EgtUILib
 Imports EgtWPFLib5
 Imports EgtBEAMWALL.Core
-Imports Windows.UI.Xaml.Controls.Maps
 
 Public Class ShowBeamPanelVM
    Inherits VMBase

EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerVM.vb

@@ -387,7 +387,7 @@ Public Class StrategyManagerVM
    ''' <summary>
    ''' Funzione che legge il file json AVAILABLESTRATEGYLIST
    ''' </summary>
-   Private Sub ReadAvailableStrategyJson(fileCostumerConfig As String)
+   Friend Sub ReadAvailableStrategyJson(fileCostumerConfig As String)
       Try
          ' ------------------------------- Carico DefaultConfiguration --------------------------------------------
          ' Recupero file AvailableStrategyPathJson
@@ -418,10 +418,10 @@ Public Class StrategyManagerVM
             m_CustomerConfigurationList = JsonConvert.DeserializeObject(Of ObservableCollection(Of StrategyFeature))(sJsonCustomerConfigPath)
             ' Controllo se le due liste sono uguali
             If m_AvailableStrategyList.SequenceEqual(m_CustomerConfigurationList) Then
-               MessageBox.Show("OK")
+               'MessageBox.Show("OK")
             Else
                If m_bMatchingJson Then
-                  CompareCollections(m_AvailableStrategyList, m_CustomerConfigurationList)
+                  'CompareCollections(m_AvailableStrategyList, m_CustomerConfigurationList)
                End If
             End If
             ' Aggiorno la lista