Aggiornamento versione

Assembly/Assembly.vb

@@ -1045,7 +1045,15 @@ Public Class Assembly
    End Enum
 
    ' carico il valore finale restituito dalla lettura dell'assembalto (di default errore)
-   Public bOk As ResultReadingAssembInfo = ResultReadingAssembInfo.ErrorInAssembInfo
+   Private m_bOk As ResultReadingAssembInfo = ResultReadingAssembInfo.ErrorInAssembInfo
+   Public Property bOk As ResultReadingAssembInfo
+      Get
+         Return m_bOk
+      End Get
+      Set(value As ResultReadingAssembInfo)
+         m_bOk = value
+      End Set
+   End Property
 
    ' vettore di righe del file ddf in lettura
    Private FileContent() As String
@@ -1497,7 +1505,13 @@ Public Class Assembly
                sDoorPiece = sDoorPiece.Remove(sDoorPiece.LastIndexOf("_"c) + 1)
             End If
             Map.refCompoPanelVM.GoBackVisibility = Visibility.Visible
-            Map.refMainWindowVM.SelectedPage = MainWindowVM.ListPageEnum.nAssemblyPage
+            ' verifico che la lettura dell'assemblato sia andato a buon fine
+            If Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.SelAssembly.bOk = Assembly.ResultReadingAssembInfo.MissingAssembInfo Then
+               ' forzo l'apertura della pagina DOOR
+               Map.refMainWindowVM.SelectedPage = MainWindowVM.ListPageEnum.nDDFPage
+            Else
+               Map.refMainWindowVM.SelectedPage = MainWindowVM.ListPageEnum.nAssemblyPage
+            End If
          Else
             ' significa che stiamo per leggere una porta singola, cerco una porta
             If Not Local_Door.TypePart.Contains("DO_") Then
@@ -1726,7 +1740,7 @@ Public Class Assembly
    ' controllo degli oggetti caricati nell'assemblato
    Private Function ControlAssemblyInformation() As Boolean
       Dim ErrorMessages As String = String.Empty
-      Select Case bOk
+      Select Case m_bOk
          Case ResultReadingAssembInfo.CorrectAssembInfo
             If OptionModule.m_ConfigurationSoftware = ConfigType.Door Then
                ' 50520=The current ddf is an assembly
@@ -1780,9 +1794,9 @@ Public Class Assembly
    Public Function ControlAssembly(Optional ByVal bSaving As Boolean = False) As String
       ' se è una porta singola oppure le info generali non sono state caricate correttamente non controllo l'assemblato
       If bSaving Then
-         If bOk <> ResultReadingAssembInfo.MissingAssembInfo Then Return String.Empty
+         If m_bOk <> ResultReadingAssembInfo.MissingAssembInfo Then Return String.Empty
       Else
-         If bOk = ResultReadingAssembInfo.ErrorInAssembInfo OrElse bOk = ResultReadingAssembInfo.MissingAssembInfo Then Return String.Empty
+         If m_bOk = ResultReadingAssembInfo.ErrorInAssembInfo OrElse m_bOk = ResultReadingAssembInfo.MissingAssembInfo Then Return String.Empty
       End If
       Dim WritingError As String = String.Empty
       Dim DoorTypeList As String = String.Empty
@@ -2498,6 +2512,7 @@ Public Class Assembly
             Map.refSceneManagerVM.RefreshBtn()
 
          Case "Height"
+            If m_bOk <> ResultReadingAssembInfo.CorrectAssembInfo Then Return
             HeightJamb()
             HeightDoor()
             TopRabbetJamb()
@@ -2507,6 +2522,7 @@ Public Class Assembly
             UpDateAllCompo()
 
          Case "Width"
+            If m_bOk <> ResultReadingAssembInfo.CorrectAssembInfo Then Return
             TopBottomWidth()
             TopRabbetJamb()
             BottomRabbetJamb()
@@ -2515,10 +2531,12 @@ Public Class Assembly
             UpDateAllCompo()
 
          Case "Thickness"
+            If m_bOk <> ResultReadingAssembInfo.CorrectAssembInfo Then Return
             TopRabbetJamb()
             UpDateAllCompo()
 
          Case "Swing"
+            If m_bOk <> ResultReadingAssembInfo.CorrectAssembInfo Then Return
             UpDateCompolistOnJamb()
             SwingJamb()
             SetPartDoorCurrAssembly()
@@ -2526,6 +2544,7 @@ Public Class Assembly
             'UpDateAllCompo()
 
          Case "DoorNumber"
+            If m_bOk <> ResultReadingAssembInfo.CorrectAssembInfo Then Return
             ClearRefOnAssembly()
             SetPartDoorCurrAssembly()
             ReverseDoor()

AssemblyManager/AssemblyManagerVM.vb

@@ -131,32 +131,65 @@ Public Class AssemblyManagerVM
             ' 50540 = The current ddf is a part of a frame, do you want to save?
             If MessageBox.Show(EgtMsg(50540), EgtMsg(50144), MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No) = MessageBoxResult.Yes Then
                DdfFile.SaveErrorCompo = True
-               DdfFile.WriteDDFPart(SavedAssName.SelAssembly.ListPartDoor(0).Door, SavedAssName.Name, True, False)
+               Dim _IsDDF As Boolean = IsCurrentFileDDF(SavedAssName.Name)
+               DdfFile.WriteDDFPart(SavedAssName.SelAssembly.ListPartDoor(0).Door, SavedAssName.Name, _IsDDF, False)
                DdfFile.SaveErrorCompo = False
             Else
                Return False
             End If
          Else
             DdfFile.SaveErrorCompo = True
-            DdfFile.WriteDDFPart(SavedAssName.SelAssembly.ListPartDoor(0).Door, SavedAssName.Name, True, False)
+            Dim _IsDDF As Boolean = IsCurrentFileDDF(SavedAssName.Name)
+            DdfFile.WriteDDFPart(SavedAssName.SelAssembly.ListPartDoor(0).Door, SavedAssName.Name, _IsDDF, False)
             DdfFile.SaveErrorCompo = False
          End If
       Else
-         ' se il ddf che sto leggendo è composto dal al massimo due parti significa che c'è un errore
+         ' Se il ddf che sto leggendo è composto dal al massimo due parti significa che c'è un errore
          If SavedAssName.SelAssembly.bOk = Assembly.ResultReadingAssembInfo.CorrectAssembInfo AndAlso
                SavedAssName.SelAssembly.ListPartDoor.Count < 3 Then
-            ' se sto salvando meno di tre componenti significa che mancano qualche pezzo per essere un assemblato
+            ' Se sto salvando meno di tre componenti significa che mancano qualche pezzo per essere un assemblato
             SavedAssName.SelAssembly.bOk = Assembly.ResultReadingAssembInfo.MissingAssembInfo
          End If
          Dim ErrorMessage As String = SavedAssName.SelAssembly.ControlAssembly(True)
+         Dim m_MessageBoxResult As MessageBoxResult = MessageBoxResult.Cancel
          If Not String.IsNullOrEmpty(ErrorMessage) Then
-            If Not MessageBox.Show(ErrorMessage, EgtMsg(50144), MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No) = MessageBoxResult.Yes Then
-               Return False
+            ' Richiedo di scegliere se salvare come porta singola oppure come assemblato (altrimenti annullo il salvataggio)
+            If GetMainPrivateProfileInt(S_GENERAL, K_SAVEASSINGLEDOOR, 0) <> 0 Then
+               ' 50732=Save as Assembly (YES), Single door (NO).
+               m_MessageBoxResult = MessageBox.Show(EgtMsg(50732), EgtMsg(50144), MessageBoxButton.YesNoCancel, MessageBoxImage.Warning, MessageBoxResult.No)
+               If m_MessageBoxResult = MessageBoxResult.Cancel Then
+                  ' interrompo il salvataggio
+                  Return False
+               End If
+               If m_MessageBoxResult = MessageBoxResult.Yes Then
+                  ' Procedo a sovrascrivere il file come ASSEMBALTO
+                  DdfFile.SaveErrorCompo = True
+                  DdfFile.WriteDDFAssembly(SavedAssName.SelAssembly, SavedAssName.Name, True)
+                  DdfFile.SaveErrorCompo = False
+               ElseIf m_MessageBoxResult = MessageBoxResult.No Then
+                  ' Procedo a sovrascrivere il file come SINGLE DOOR
+                  DdfFile.SaveErrorCompo = True
+                  Dim _IsDDF As Boolean = IsCurrentFileDDF(SavedAssName.Name)
+                  DdfFile.WriteDDFPart(SavedAssName.SelAssembly.ListPartDoor(0).Door, SavedAssName.Name, _IsDDF, False)
+                  DdfFile.SaveErrorCompo = False
+               End If
+            Else
+               ' Avviso che sto per salvare una porta singola come assemblato (altrimenti annullo il salvataggio)
+               If Not MessageBox.Show(ErrorMessage, EgtMsg(50144), MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No) = MessageBoxResult.Yes Then
+                  Return False
+               End If
+               ' Procedo a sovrascrivere il file
+               DdfFile.SaveErrorCompo = True
+               DdfFile.WriteDDFAssembly(SavedAssName.SelAssembly, SavedAssName.Name, True)
+               DdfFile.SaveErrorCompo = False
             End If
+         Else
+            ' Non ci sono errori: procedo a sovrascrivere il file
+            DdfFile.SaveErrorCompo = True
+            DdfFile.WriteDDFAssembly(SavedAssName.SelAssembly, SavedAssName.Name, True)
+            DdfFile.SaveErrorCompo = False
          End If
-         DdfFile.SaveErrorCompo = True
-         DdfFile.WriteDDFAssembly(SavedAssName.SelAssembly, SavedAssName.Name, True)
-         DdfFile.SaveErrorCompo = False
+
       End If
       ' controllo che il salvataggio sia andato a buon fine
 
@@ -984,7 +1017,10 @@ Public Class AssemblyManagerVM
          If OptionModule.AdjustDDT Then
             DdfFile.WriteDDFPart(OpenedAssName.SelAssembly.ListPartDoor(0).Door, OptionModule.SaveFileNameFromArgs, True, False)
             ' TERMINO TUTTO SUBITO
-            End
+            EgtOutLog("Scrittura file '.ddf' terminata")
+            EgtExit()
+            Application.Current.Shutdown(0)
+            Return True
          End If
          ' aggiorno elenco quotature
          Map.refDimensioningPanelVM.LoadHardwareDimList()
@@ -1011,7 +1047,16 @@ Public Class AssemblyManagerVM
          If Assembly.Refreshing Then EgtZoom(ZM.ALL)
          m_CurrProject.SelAssemblyName.SelAssembly.MatchCompo()
          m_CurrProject.SelAssemblyName.SelAssembly.UpDateAllOrigValue()
-         Map.refMainWindowVM.SelectedPage = MainWindowVM.ListPageEnum.nAssemblyPage
+         ' Se mancano le info per generare l'assemblato accedo direttamente alla prima porta
+         If m_CurrProject.SelAssemblyName.SelAssembly.bOk = Assembly.ResultReadingAssembInfo.MissingAssembInfo Then
+            If m_CurrProject.SelAssemblyName.SelAssembly.ListPartDoorOfDoor.Count > 0 Then
+               Map.refAssemblyPageVM.JambBtn(m_CurrProject.SelAssemblyName.SelAssembly.ListPartDoorOfDoor(0).Type)
+            Else
+               Map.refMainWindowVM.SelectedPage = MainWindowVM.ListPageEnum.nAssemblyPage
+            End If
+         Else
+            Map.refMainWindowVM.SelectedPage = MainWindowVM.ListPageEnum.nAssemblyPage
+         End If
       End If
       ' ogni progetto salvato è l'ultimo da aprire, anche se il programma è chiuso dall'HardwareManager
       ' controllo che esiste almeno un file aperto

Constants/ConstIni.vb

@@ -42,6 +42,7 @@ Module ConstIni
    Public Const K_EGTCAMEXE As String = "EgtCam5Exe"
    Public Const K_REFRESHTIME As String = "RefreshTime"
    Public Const K_DDFVERSION As String = "DDFVersion"
+   Public Const K_SAVEASSINGLEDOOR As String = "SaveAsSingleDoor"
 
    Public Const S_LANGUAGES As String = "Languages"
    Public Const K_LANGUAGE As String = "Language"
@@ -90,7 +91,8 @@ Module ConstIni
    Public Const K_DDFFUNCTION As String = "DdfFun"
    Public Const K_MYPROJECTDIR As String = "ProjectDirectory"
    Public Const K_TEMPLATEDIR As String = "TemplateDirectory"
-   Public Const K_MACHINDIR As String = "MachinDirectory"
+   ' Correzione nome Chiave valore ver 2.6k2 "MachineDirectory"
+   Public Const K_MACHINDIR As String = "MachineDirectory"
    Public Const K_MTABLE As String = "MTable"
 
    Public Const S_REPORT As String = "Report"

DoorParameters/Compo.vb

@@ -10,11 +10,7 @@ Module Modified
          Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.IsModified = True
          If Not IsNothing(Map.refPartPageVM) AndAlso Not IsNothing(Map.refPartPageVM.CurrPart) Then
             For Each Compo In Map.refPartPageVM.CurrPart.CompoList
-               Compo.BorderColor = DirectCast(New BrushConverter().ConvertFrom("#DCDCDC"), SolidColorBrush)
-               Compo.BackGroundColor = DirectCast(New BrushConverter().ConvertFrom("#FFFFFF"), SolidColorBrush)
-               Compo.Foreground = DirectCast(New BrushConverter().ConvertFrom("#000000"), SolidColorBrush)
-               Compo.BorderThickness = 1
-               Compo.FontBold = FontWeights.Normal
+               Compo.ResetMark()
             Next
          End If
       Else

DoorParameters/Part.vb

@@ -1535,7 +1535,7 @@ Public Class Part
       ' ontengo la posizione prevista nella grafica
       Dim IndexInList As Integer = DdfFile.GetIndexInList(TempList, m_SelCompo)
       ' recupero la lista ordinata
-      Dim sCompoName As String = m_SelCompo.SelFile
+      Dim sCompoName As String = m_SelCompo.TemplateSelItem
       ' recupero il primo part disponibile
       Dim nIdFirstPart As Integer = EgtGetFirstPart()
       Dim nIdLay As Integer = EgtGetFirstLayer(nIdFirstPart)
@@ -1543,12 +1543,12 @@ Public Class Part
       While nIdLay <> GDB_ID.NULL
          Dim sInfoPath As String = String.Empty
          If EgtGetInfo(nIdLay, "Path", sInfoPath) Then
-            Dim sNamePath As String = Path.GetFileNameWithoutExtension(sInfoPath)
-            If sNamePath = sCompoName And IndexLay = IndexInList Then
+            Dim sNamePath As String = sInfoPath
+            If sNamePath.Contains(sCompoName) And IndexLay = IndexInList Then
                EgtSetMark(nIdLay)
                m_SelCompo.SetMark()
                Exit While
-            ElseIf sNamePath = sCompoName And IndexLay < IndexInList Then
+            ElseIf sNamePath.Contains(sCompoName) And IndexLay < IndexInList Then
                IndexLay = IndexLay + 1
             End If
          End If
@@ -1873,6 +1873,7 @@ Public Class Part
       ' Messaggi di errore generici, se la stringa dei messaggi contiene delle informazioni allora visualizzo
       If Not String.IsNullOrWhiteSpace(sErrorInfo) Then
          Dim sTitle As String = EgtMsg(50101)
+         If Not IsNothing(ReadDoor) AndAlso Not IsNothing(ReadDoor.TypePart) Then sTitle &= ReadDoor.TypePart.ToString
          ' 50541 = {0} in reading {1}.
          If Not IsNothing(ReadDoor) Then String.Format(EgtMsg(50541), sTitle, ReadDoor.TypePart)
          MessageBox.Show(sErrorInfo, sTitle, MessageBoxButton.OK, MessageBoxImage.Error)
@@ -2172,6 +2173,10 @@ Public Class Part
          MessageBox.Show(String.Format(EgtMsg(50141), ConstIni.K_SWING_INI) & EgtMsg(50159), EgtMsg(50101), MessageBoxButton.OK, MessageBoxImage.Error)
       Else
          ' carico il valore nella porta corrente
+         If m_refPartDoor.IsTemplate And OptionModule.AdjustDDT AndAlso Not String.IsNullOrEmpty(OptionModule.ForcesSideSwing) Then
+            Swing = Swing.Remove(0, 1)
+            Swing = OptionModule.ForcesSideSwing & Swing
+         End If
          m_Swing = Swing
          OptionModule.SetCurrSwing(m_SwingAlias, m_Swing)
          If IsNothing(m_SwingAlias) Then Return -1
@@ -3493,10 +3498,11 @@ Public Class Part
          ElseIf nPartDoor > 1 Then
             ' Assemblati
             Dim WdSelPartV As New SelectPartV()
-            Dim WdSelPartVM As New SelectPartVM("Selezione della porta", "Selezione anta", nPartDoor, 1)
+            ' 50233=Selezione della porta, 50234=Selezione anta
+            Dim WdSelPartVM As New SelectPartVM(EgtMsg(50233), EgtMsg(50234), nPartDoor, 1)
             WdSelPartV.DataContext = WdSelPartVM
             WdSelPartV.ShowDialog()
-            Dim nSelection As Integer = CInt(WdSelPartVM.Selection.Split(" "c)(1)) - 1
+            Dim nSelection As Integer = WdSelPartVM.nSelectedIndex
             ' Apro una finestra per chiedere quale anta usare come riferimento
             Dim LocalPartDoor As PartDoor = Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.SelAssembly.ListPartDoor(nSelection)
             Me.m_Width = LocalPartDoor.Door.m_Width

Guide/GuideV.xaml

@@ -1,19 +1,17 @@
 <EgtWPFLib5:EgtCustomWindow x:Class="GuideV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-   Title="{Binding Title}" Icon="/Resources/EgtDOOR.ico"
-   TitleBarBrush="{StaticResource EgaltechBlue1}"
-   BorderBrush="{StaticResource EgaltechBlue1}"
-   WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="True"
-   IsMinimizable="True" WindowStartupLocation="CenterScreen" ShowInTaskbar="False"
-   CloseCommand="{Binding CloseOptionsCommand,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}"
-   Height="800" Width="1500">
-   
+                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                            Title="{Binding Title}" Icon="/Resources/EgtDOOR.ico"
+                            TitleBarBrush="{StaticResource EgaltechBlue1}"
+                            BorderBrush="{StaticResource EgaltechBlue1}"
+                            WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="True"
+                            IsMinimizable="True" WindowStartupLocation="CenterScreen" ShowInTaskbar="False"
+                            CloseCommand="{Binding CloseOptionsCommand,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}"
+                            Height="800" Width="1500">
 
    <DockPanel Margin="5">
       <WebBrowser x:Name="DoorBrowser"/>
    </DockPanel>
 
-   
 </EgtWPFLib5:EgtCustomWindow>

Guide/GuideV.xaml.vb

@@ -20,10 +20,10 @@ Public Class GuideV
       Dim sHelpDir As String = String.Empty
       If OptionModule.m_SmartHelp = HelpPage.LocalHost Then
          sHelpDir = IniFile.m_sHelpDir.Replace("C:", "file://127.0.0.1/c$")
-         DoorBrowser.Navigate(New Uri(sHelpDir & "\" & m_Language & "\" & GuideVM.m_AddressGuide & ".html"))
+         DoorBrowser.Source = New Uri(sHelpDir & "\" & m_Language & "\" & GuideVM.m_AddressGuide & ".html")
       ElseIf OptionModule.m_SmartHelp = HelpPage.WebBrowserVB Then
          sHelpDir = IniFile.m_sHelpDir
-         DoorBrowser.Navigate(New Uri(sHelpDir & "\" & m_Language & "\" & GuideVM.m_AddressGuide & ".html"))
+         DoorBrowser.Source = New Uri(sHelpDir & "\" & m_Language & "\" & GuideVM.m_AddressGuide & ".html")
       Else
          sHelpDir = IniFile.m_sHelpDir
          Try

MainWindow/MainWindowModel.vb

@@ -76,8 +76,8 @@ Friend Class MainWindowModel
       m_bAutoNest = Not String.IsNullOrWhiteSpace(sNestKey)
 
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(3279, 2611, 1, IniFile.m_nKeyLevel) And
-                            EgtGetKeyOptions(3279, 2611, 1, IniFile.m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(3279, 2701, 1, IniFile.m_nKeyLevel) And
+                            EgtGetKeyOptions(3279, 2701, 1, IniFile.m_nKeyOptions)
       'Inizializzazione generale di EgtInterface
       m_nDebug = GetMainPrivateProfileInt(S_GENERAL, K_DEBUG, 0)
       Dim sLogFile As String = IniFile.m_sTempDir & "\" & GENLOG_FILE_NAME.Replace("#", m_nInstance.ToString())

MainWindow/MainWindowV.xaml.vb

@@ -1,4 +1,5 @@
 Imports EgtWPFLib5
+Imports EgtUILib
 
 Class MainWindowV
 
@@ -12,6 +13,7 @@ Class MainWindowV
       InitializeComponent()
       ' Per leggere più argomenti devono essere scritti ognuno tra doppi apici e separati da spazio
       ' Esempio:"Argomento 1 di prova" "Argomento 2 di prova" 
+      EgtOutLog("   1 Numero argomenti: " & args.Length.ToString)
       If args.Length > 0 Then
          m_args = args
          RunBlindCode()
@@ -27,38 +29,12 @@ Class MainWindowV
 
    Private Sub MainWindowV_ContentRendered(sender As Object, e As EventArgs) Handles Me.ContentRendered
       ' se è assente la chiave di protezione non mostro la finestra Launcher
-      If Map.refSceneManagerVM.bProtectKey Then
-         If Not IsNothing(m_args) Then
-            ' leggo gli argomenti: Il programma si chiude appena termina la scrittura del file DDF
-            Dim Items() As String = m_args(0).Split(";"c)
-            If Items.Length = 5 Then
-               ' Avvio progetto - LauncherOpt.Open_last_project (1)
-               OptionModule.m_bLauncherOpenOnce = True
-               ' Indico il percorso del file
-               OptionModule.FileNameFromArgs = Items(0)
-               ' Assegno i valore Width, Height, Thickness 
-               OptionModule.m_Width = Items(1)
-               OptionModule.m_Height = Items(2)
-               OptionModule.m_Thickness = Items(3)
-               ' Indico il percoso di salvataggio file DDF
-               OptionModule.SaveFileNameFromArgs = Items(4)
-               ' abilito lettura dati 
-               OptionModule.AdjustDDT = True
-            Else
-               ' blocco lettura dati
-               OptionModule.AdjustDDT = False
-               ' TERMINO TUTTO SUBITO!
-               End
-            End If
-         End If
-         Map.refMainWindowVM.SetLauncher()
-         Map.refMainWindowVM.ShowErrorCompoLoad()
-      End If
+      RunBlindCode()
    End Sub
 
    Private Sub MainWindowV_Unloaded(sender As Object, e As System.ComponentModel.CancelEventArgs) Handles Me.Closing
       ' Salvo posizione finestra (se non minimizzata)
-      If WindowState <> WindowState.Minimized Then
+      If WindowState <> WindowState.Minimized And Not OptionModule.AdjustDDT Then
          WinPosFromWindowToIni(Me, S_GENERAL, K_WINPLACE)
       End If
    End Sub
@@ -67,32 +43,49 @@ Class MainWindowV
 
    Private Sub RunBlindCode()
       If Map.refSceneManagerVM.bProtectKey Then
-         If Not IsNothing(m_args) Then
-            ' leggo gli argomenti: Il programma si chiude appena termina la scrittura del file DDF
-            Dim Items() As String = m_args(0).Split(";"c)
-            If Items.Length = 5 Then
-               ' Avvio progetto - LauncherOpt.Open_last_project (1)
-               OptionModule.m_bLauncherOpenOnce = True
-               ' Indico il percorso del file
-               OptionModule.FileNameFromArgs = Items(0)
-               ' Assegno i valore Width, Height, Thickness 
-               OptionModule.m_Width = Items(1)
-               OptionModule.m_Height = Items(2)
-               OptionModule.m_Thickness = Items(3)
-               ' Indico il percoso di salvataggio file DDF
-               OptionModule.SaveFileNameFromArgs = Items(4)
-               ' abilito lettura dati 
-               OptionModule.AdjustDDT = True
-            Else
-               ' blocco lettura dati
-               OptionModule.AdjustDDT = False
-               ' TERMINO TUTTO SUBITO!
-               End
-            End If
-         End If
+         ReadArgs()
          Map.refMainWindowVM.SetLauncher()
          Map.refMainWindowVM.ShowErrorCompoLoad()
       End If
    End Sub
 
+   ' Lettura degli argomenti e scrittura di un file di Log con i parametri caricati
+   Private Sub ReadArgs()
+      If Not IsNothing(m_args) Then
+         ' leggo gli argomenti: Il programma si chiude appena termina la scrittura del file DDF
+         Dim Items() As String = m_args(0).Split(";"c)
+         EgtOutLog("   Argomenti: " & m_args.ToString)
+         If Items.Length >= 5 Then
+            ' Avvio progetto - LauncherOpt.Open_last_project (1)
+            OptionModule.m_bLauncherOpenOnce = True
+            ' Indico il percorso del file
+            OptionModule.FileNameFromArgs = Items(0)
+            EgtOutLog("   File '.ddt' input : " & OptionModule.FileNameFromArgs)
+            ' Assegno i valore Width, Height, Thickness 
+            OptionModule.m_Width = Items(1)
+            EgtOutLog("      width : " & OptionModule.m_Width)
+            OptionModule.m_Height = Items(2)
+            EgtOutLog("      height : " & OptionModule.m_Height)
+            OptionModule.m_Thickness = Items(3)
+            EgtOutLog("      thickness : " & OptionModule.m_Thickness)
+            ' Indico il percoso di salvataggio file DDF
+            OptionModule.SaveFileNameFromArgs = Items(4)
+            EgtOutLog("   File '.ddf' output : " & OptionModule.SaveFileNameFromArgs)
+            ' Nuovo parametro da laggere per gestione Swing 
+            If Items.Length = 6 Then
+               OptionModule.ForcesSideSwing = Items(5)
+               EgtOutLog("      swing : " & OptionModule.ForcesSideSwing)
+            End If
+            ' abilito lettura dati 
+            OptionModule.AdjustDDT = True
+         Else
+            EgtOutLog("   Argomenti non conformi")
+            ' blocco lettura dati
+            OptionModule.AdjustDDT = False
+            ' TERMINO TUTTO SUBITO!
+            End
+         End If
+      End If
+   End Sub
+
 End Class

MainWindow/MainWindowVM.vb

@@ -65,10 +65,13 @@ Public Class MainWindowVM
          Return m_SelectedPage
       End Get
       Set(value As ListPageEnum)
-         m_SelectedPage = value
-         NotifyPropertyChanged("PageControl")
-         If Not IsNothing(Map.refInstrumentPanelVM) Then
-            Map.refInstrumentPanelVM.NotifyPropertyChanged("DimensionVisibility")
+         ' Verifico che sia una vera modifica
+         If m_SelectedPage <> value Then
+            m_SelectedPage = value
+            NotifyPropertyChanged("PageControl")
+            If Not IsNothing(Map.refInstrumentPanelVM) Then
+               Map.refInstrumentPanelVM.NotifyPropertyChanged("DimensionVisibility")
+            End If
          End If
       End Set
    End Property
@@ -86,20 +89,20 @@ Public Class MainWindowVM
    Public ReadOnly Property PageControl As ContentControl
       Get
          If m_SelectedPage = ListPageEnum.nDDFPage Then
-            If OptionModule.m_SingleDoor then
+            If OptionModule.m_SingleDoor Then
                VisibilityAssemblyManager = Visibility.Hidden
             Else
                VisibilityAssemblyManager = Visibility.Visible
-            End If           
+            End If
             NotifyPropertyChanged("AssemblyManagerControl")
             NotifyPropertyChanged("ProjectManagerControl")
             Return m_PartPage
          ElseIf m_SelectedPage = ListPageEnum.nAssemblyPage Then
-            If OptionModule.m_SingleDoor then
+            If OptionModule.m_SingleDoor Then
                VisibilityAssemblyManager = Visibility.Hidden
             Else
                VisibilityAssemblyManager = Visibility.Visible
-            End If 
+            End If
             NotifyPropertyChanged("AssemblyManagerControl")
             NotifyPropertyChanged("ProjectManagerControl")
             Return m_AssemblyPage
@@ -109,11 +112,11 @@ Public Class MainWindowVM
             NotifyPropertyChanged("ProjectManagerControl")
             Return m_HardwarePage
          Else
-            If OptionModule.m_SingleDoor then
+            If OptionModule.m_SingleDoor Then
                VisibilityAssemblyManager = Visibility.Hidden
             Else
                VisibilityAssemblyManager = Visibility.Visible
-            End If 
+            End If
             NotifyPropertyChanged("AssemblyManagerControl")
             NotifyPropertyChanged("ProjectManagerControl")
             Return Nothing
@@ -139,7 +142,7 @@ Public Class MainWindowVM
 
    Public ReadOnly Property ProjectManagerControl As ContentControl
       Get
-         If m_SelectedPage <> ListPageEnum.nHardwarePage then
+         If m_SelectedPage <> ListPageEnum.nHardwarePage Then
             Return m_ProjectManager
          Else
             ProjectNameMsg = "HardwareManager"
@@ -155,6 +158,7 @@ Public Class MainWindowVM
    End Property
 
    Sub New()
+      EgtOutLog("  Creazione e inizializzazone MainWondowVM ")
       Map.SetRefMainWindowVM(Me)
       m_AssemblyPage = New AssemblyPageV
       m_AssemblyPage.DataContext = New AssemblyPageVM
@@ -168,7 +172,6 @@ Public Class MainWindowVM
       m_HardwarePage.DataContext = New HardwarePageVM
       m_AssemblyManager = New AssemblyManagerV
       m_AssemblyManager.DataContext = New AssemblyManagerVM
-      ' inserisco la scena
       m_SceneManager = New SceneManagerV
       m_SceneManager.DataContext = New SceneManagerVM
       Dim OptionsPage As OptionsVM = OptionPage
@@ -313,7 +316,7 @@ Public Class MainWindowVM
       If m_SelectedPage = ListPageEnum.nHardwarePage Then Return
       If StartReload Then Return
       ' 50545 = It has been deleted file: {0}, {1}.
-      Dim Message As String = String.Format(EgtMsg(50545), e.FullPath,  e.ChangeType)
+      Dim Message As String = String.Format(EgtMsg(50545), e.FullPath, e.ChangeType)
       selectedWatcher = WatcherCalling.OnDeleted
       Application.Current.Dispatcher.BeginInvoke(New Action(Sub()
                                                                RaiseEvent Er(Message, e.FullPath)
@@ -326,7 +329,7 @@ Public Class MainWindowVM
       If m_SelectedPage = ListPageEnum.nHardwarePage Then Return
       If StartReload Then Return
       ' 50543 = It has been renamed file: {0}, {1}.
-      Dim Message As String = String.Format(EgtMsg(50543), e.FullPath,  e.ChangeType)
+      Dim Message As String = String.Format(EgtMsg(50543), e.FullPath, e.ChangeType)
       selectedWatcher = WatcherCalling.OnRenamed
       Application.Current.Dispatcher.BeginInvoke(New Action(Sub()
                                                                RaiseEvent Er(Message, e.FullPath)
@@ -339,7 +342,7 @@ Public Class MainWindowVM
       If m_SelectedPage = ListPageEnum.nHardwarePage Then Return
       If StartReload Then Return
       ' 50544 = It has been created new file: {0}, {1}.
-      Dim Message As String =String.Format(EgtMsg(50544), e.FullPath,  e.ChangeType)
+      Dim Message As String = String.Format(EgtMsg(50544), e.FullPath, e.ChangeType)
       selectedWatcher = WatcherCalling.OnCreated
       Application.Current.Dispatcher.BeginInvoke(New Action(Sub()
                                                                RaiseEvent Er(Message, e.FullPath)

My Project/AssemblyInfo.vb

@@ -32,7 +32,7 @@ Imports System.Windows
 
 <Assembly: AssemblyCompany("Egalware s.r.l.")>
 <Assembly: AssemblyProduct("EgtDOORCreator")>
-<Assembly: AssemblyCopyright("Copyright ©  2016-2024 by Egalware s.r.l.")>
+<Assembly: AssemblyCopyright("Copyright ©  2016-2025 by Egalware s.r.l.")>
 <Assembly: AssemblyTrademark("")> 
 <Assembly: ComVisible(false)>
 
@@ -72,5 +72,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.6.11.1")>
-<Assembly: AssemblyFileVersion("2.6.11.1")>
+<Assembly: AssemblyVersion("2.7.1.1")>
+<Assembly: AssemblyFileVersion("2.7.1.1")>

OptionsWindow/OptionModule.vb

@@ -11,6 +11,8 @@ Friend Module OptionModule
    Friend AdjustDDT As Boolean = False
    Friend FileNameFromArgs As String = String.Empty
    Friend SaveFileNameFromArgs As String = String.Empty
+   ' Forza la scrittura dello swing Left(L..) oppure Right(R..)
+   Friend ForcesSideSwing As String = String.Empty
 
    ' Parametri che contengono lista delle lingue disponibili e lingua selezionata
    Friend m_LanguageList As New ObservableCollection(Of Language)

Order/OrderVM.vb

@@ -66,10 +66,18 @@ Public Class OrderVM
       End Get
    End Property
 
+   Private Function VerifyNotIsNothing() As Boolean
+      If IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName) OrElse
+         IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.SelAssembly) OrElse
+         Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.SelAssembly.ListPartDoor.Count > 0 Then
+         Return False
+      End If
+      Return True
+   End Function
+
    Public Property Customer As String
       Get
-         If IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName) AndAlso
-            Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.SelAssembly.ListPartDoor.Count > 0 Then Return Nothing
+         If Not VerifyNotIsNothing() Then Return Nothing
          Return Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.SelAssembly.ListPartDoor(0).Door.Customer
       End Get
       Set(value As String)
@@ -83,8 +91,7 @@ Public Class OrderVM
 
    Public Property Elevation As String
       Get
-         If IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName) AndAlso
-            Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.SelAssembly.ListPartDoor.Count > 0 Then Return Nothing
+         If Not VerifyNotIsNothing() Then Return Nothing
          Return Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.SelAssembly.ListPartDoor(0).Door.Elevation
       End Get
       Set(value As String)
@@ -98,8 +105,7 @@ Public Class OrderVM
 
    Public Property Project As String
       Get
-         If IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName) AndAlso
-            Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.SelAssembly.ListPartDoor.Count > 0 Then Return Nothing
+         If Not VerifyNotIsNothing() Then Return Nothing
          Return Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.SelAssembly.ListPartDoor(0).Door.Project
       End Get
       Set(value As String)
@@ -113,8 +119,7 @@ Public Class OrderVM
 
    Public Property PO As String
       Get
-         If IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName) AndAlso
-            Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.SelAssembly.ListPartDoor.Count > 0 Then Return Nothing
+         If Not VerifyNotIsNothing() Then Return Nothing
          Return Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.SelAssembly.ListPartDoor(0).Door.PO
       End Get
       Set(value As String)
@@ -128,8 +133,7 @@ Public Class OrderVM
 
    Public Property Line As String
       Get
-         If IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName) AndAlso
-            Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.SelAssembly.ListPartDoor.Count > 0 Then Return Nothing
+         If Not VerifyNotIsNothing() Then Return Nothing
          Return Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.SelAssembly.ListPartDoor(0).Door.Line
       End Get
       Set(value As String)

ProjectManager/ProjectManagerVM.vb

@@ -1006,6 +1006,10 @@ Public Class ProjectManagerVM
             Else
                EgtOutLog("LastProject '" & OptionModule.m_sLastProject & "' is not a file or does not exist!")
                Map.refMainWindowVM.SelectedPage = MainWindowVM.ListPageEnum.nNothingSelected
+               If OptionModule.AdjustDDT Then
+                  EgtExit()
+                  Application.Current.Shutdown(3)
+               End If
                Return
             End If
          Else

ProjectManager/SelectPartV.xaml

@@ -6,7 +6,7 @@
    Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
    WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="False"
    IsMinimizable="False" WindowStartupLocation="CenterScreen" ShowInTaskbar="False"
-   Height="100" Width="300" Topmost="True"
+   Height="110" Width="300" Topmost="True"
    DataContext="{Binding RelativeSource={RelativeSource Self}}">
 
     <!--<EgtWPFLib5:EgtCustomWindow.Resources>
@@ -30,7 +30,8 @@
         </UniformGrid>
         
 
-        <Button IsDefault="True" Name="OkBtn" Grid.Row="2" Grid.ColumnSpan="2"
+        <Button IsDefault="True" Name="OkBtn" Grid.Row="2" Grid.ColumnSpan="2" HorizontalAlignment="Right"
+                Margin="0,0,5,0"
                Content="{Binding SaveMsg}" Style="{DynamicResource EgtWPFLib5_InputButton}"/>
     </Grid>
 

ProjectManager/SelectPartVM.vb

@@ -7,6 +7,13 @@
       End Get
    End Property
 
+   Private m_SaveMsg As String = "Ok"
+   Public ReadOnly Property SaveMsg As String
+      Get
+         Return m_SaveMsg
+      End Get
+   End Property
+
    Private m_PartDoorMsg As String = "Select part"
    Public ReadOnly Property PartDoorMsg As String
       Get
@@ -31,16 +38,31 @@
       End Get
       Set(value As String)
          m_Selection = value
+         m_nSelectedIndex = m_PartDoorList.IndexOf(m_Selection)
       End Set
    End Property
 
+   Private m_nSelectedIndex As Integer = 0
+   Public ReadOnly Property nSelectedIndex As Integer
+      Get
+         Return m_nSelectedIndex
+      End Get
+   End Property
+
+
    Sub New(TitleWd As String, MsgWd As String, nParts As Integer, nIndex As Integer)
       m_Title = TitleWd
       m_PartDoorMsg = MsgWd
-      For Index As Integer = 0 To nParts - 1
-         m_PartDoorList.Add("Door " & nParts.ToString)
+      For Each ItemDoor As PartDoor In Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.SelAssembly.ListPartDoor
+         m_PartDoorList.Add(ItemDoor.Type)
       Next
-      m_Selection = "Door " & nIndex.ToString
+      If Not IsNothing(Map.refPartPageVM) AndAlso Not IsNothing(Map.refPartPageVM.CurrPart) AndAlso
+      Not IsNothing(Map.refPartPageVM.CurrPart.TypePart) Then
+         m_nSelectedIndex = m_PartDoorList.IndexOf(Map.refPartPageVM.CurrPart.TypePart)
+      Else
+         m_nSelectedIndex = 0
+      End If
+      m_Selection = m_PartDoorList(m_nSelectedIndex)
    End Sub
 
 End Class

SceneManager/SceneManagerVM.vb

@@ -172,7 +172,7 @@ Public Class SceneManagerVM
             ' Chiudo il programma
             End
          End If
-      Return m_ProjectSceneHost
+         Return m_ProjectSceneHost
       End Get
    End Property
 
@@ -346,7 +346,7 @@ Public Class SceneManagerVM
       ElseIf Map.refMainWindowVM.SelectedPage = MainWindowVM.ListPageEnum.nAssemblyPage Then
          If Not EnableRefresh Then Return
          ' Verifico esista elemento selezionato
-         If IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName) orelse IsNothing(Map.refAssemblyPageVM.CurrAssembly) Then Return
+         If IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName) OrElse IsNothing(Map.refAssemblyPageVM.CurrAssembly) Then Return
          DdfFile.WriteDDFAssembly(Map.refAssemblyPageVM.CurrAssembly, sTempFile, True)
          ExecDoors(m_ProjectScene, sTempFile, False)
          ' mantengo i layer accesi
@@ -445,6 +445,7 @@ Public Class SceneManagerVM
          Return
       End If
       Dim LocalCompoList As ObservableCollection(Of Compo) = Map.refPartPageVM.CurrPart.CompoList
+      ' Ripulisco la scena da i Mark
       Map.refPartPageVM.CurrPart.ResetAllMark()
       ' Se la lista dei componenti è vuota allora esco
       If Map.refPartPageVM.CurrPart.CompoList.Count < 1 Then Return
@@ -464,7 +465,7 @@ Public Class SceneManagerVM
             If Not sNameLayer.StartsWith("AUX") Or Not sNameLayer.StartsWith("SOLID") Or Not sNameLayer.StartsWith("DIM") Then
                ' scorro l'elenco dei componenti fino a trovare un riscontro tra i nomi e i parametri
                For Each ItemCompo As Compo In LocalCompoList
-                  MatchCompoFromScena(nIdParent, ItemCompo, LocalCompoList)
+                  If MatchCompoFromScena(nIdParent, ItemCompo, LocalCompoList) Then Exit While
                Next
             End If
          End If
@@ -473,36 +474,62 @@ Public Class SceneManagerVM
       End While
    End Sub
 
-   Private Sub MatchCompoFromScena(nIdLay As Integer, CurrCompo As Compo, CompoList As ObservableCollection(Of Compo))
-      If IsNothing(CurrCompo) Then Return
-      'ResetAllMark()
+   Private Function MatchCompoFromScena(nIdLay As Integer, CurrCompo As Compo, CompoList As ObservableCollection(Of Compo)) As Boolean
+      If IsNothing(CurrCompo) Then Return True
       ' recupero la lista dei compo dello stesso tipo
       Dim TempList As ObservableCollection(Of Compo) = DdfFile.GetCurrentListSameCompoType(CompoList, CurrCompo.CompoType.DDFName)
       ' recupero la lista dei compo con lo stesso nome
       TempList = DdfFile.GetCurrentListSameCompoDDFName(TempList, CurrCompo.SelFile, CurrCompo.SelBrandPart)
       ' riordino la lista appena trovata secondo le regole di stampa DDF
       DdfFile.GetOrderedListSameCompo(TempList)
-      ' ontengo la posizione prevista nella grafica
+      ' ottengo la posizione prevista nella grafica
       Dim IndexInList As Integer = DdfFile.GetIndexInList(TempList, CurrCompo)
       ' recupero la lista ordinata
-      Dim sCompoName As String = CurrCompo.SelFile
-      ' recupero il primo part disponibile
-      Dim IndexLay As Integer = 0
-      If nIdLay <> GDB_ID.NULL Then
-         Dim sInfoPath As String = String.Empty
-         If EgtGetInfo(nIdLay, "Path", sInfoPath) Then
-            Dim sNamePath As String = Path.GetFileNameWithoutExtension(sInfoPath)
-            If sNamePath = sCompoName And IndexLay = IndexInList Then
-               EgtSetMark(nIdLay)
-               ' evidenzio la compo corrente
-               CurrCompo.SetMark()
-            ElseIf sNamePath = sCompoName And IndexLay < IndexInList Then
-               IndexLay = IndexLay + 1
+      Dim sCompoName As String = CurrCompo.TemplateSelItem
+      ' oridnamento del layer
+      Dim IndexLay As Integer = -1
+      ' recupero il nome della comaponente selezionata con MouseOver
+      Dim sInfoPath As String = String.Empty
+      If Not EgtGetInfo(nIdLay, "Path", sInfoPath) Then Return True
+      ' Dim sNamePath As String = Path.GetFileNameWithoutExtension(sInfoPath)
+      Dim sNamePath As String = sInfoPath
+      'If sNamePath = sCompoName Then
+      If sNamePath.Contains(sCompoName) Then
+         Dim nCurrLayId As Integer = nIdLay
+         Dim nCounter As Integer = 1
+         While nCurrLayId <> GDB_ID.NULL
+            nCurrLayId = EgtGetNext(nCurrLayId)
+            Dim LocalsPath As String = String.Empty
+            If EgtGetInfo(nCurrLayId, "Path", LocalsPath) Then
+               If sNamePath.Trim = LocalsPath.Trim Then
+                  nCounter += 1
+               End If
             End If
-         End If
+         End While
+         IndexLay = TempList.Count - nCounter
       End If
-      EgtDraw()
-   End Sub
+      ' la compo passata non ha lo stesso nome, quindi mi aspetto un'altra compo
+      If IndexLay = -1 Then Return False
+
+      While IndexInList < TempList.Count And nIdLay <> GDB_ID.NULL
+         ' recupero l'ordinamento del layer
+         If sNamePath.Contains(sCompoName) And IndexLay = IndexInList Then
+            EgtSetMark(nIdLay)
+            ' evidenzio la compo corrente
+            TempList(IndexInList).SetMark()
+            EgtDraw()
+            ' ricerca terminata correttamente
+            Return True
+            Exit While
+         ElseIf sNamePath.Contains(sCompoName) And IndexInList < IndexLay Then
+            IndexInList += 1
+         Else
+            Return False
+         End If
+      End While
+      ' prova con un'altra compo
+      Return False
+   End Function
 
 #End Region    ' Event scene
 

Utility.vb

@@ -22,6 +22,10 @@ Public Module Utility
 
    ' CurrFile deve arrivare già senza estensione!
    Private Function GenerateLockFileName(ByVal CurrDirectory As String, Optional ByVal CurrFile As String = "") As String
+      ' Se in modalità Modifica file DDT allora non bloccare il file
+      If OptionModule.AdjustDDT Then
+         Return String.Empty
+      End If
       If OptionModule.ReadOnlyDDF Then
          Return String.Empty
       End If
@@ -266,6 +270,18 @@ Public Module Utility
       Return Index
    End Function
 
+   ' Verifica se il file/path indicato è ddf (true)
+   Friend Function IsCurrentFileDDF(sFileName As String) As Boolean
+      Dim IsDDF As Boolean = True
+      If Not String.IsNullOrEmpty(sFileName) AndAlso Path.HasExtension(sFileName) Then
+         Dim sExtension As String = Path.GetExtension(sFileName)
+         If sExtension.ToLower = DDT_EXTENSION Then
+            IsDDF = False
+         End If
+      End If
+      Return IsDDF
+   End Function
+
 #Region "PARAM LUA"
 
    ' elimina i commenti nel file lua