Merge commit '306798a7d565c98afa158ece68d2dd9e361a3bb1' into Nuovo_Tema

2024-12-09 16:12:51 +01:00
parent 88f5ac3a9e 306798a7d5
commit 5e345284a3
13 changed files with 114 additions and 92 deletions
@@ -91,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"
@@ -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.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
@@ -3,8 +3,8 @@
                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
                            Title="{Binding Title}" Icon="/Resources/EgtDOOR.ico"
-                            TitleBarBrush="{DynamicResource EgalwareIndigo}"
-                            BorderBrush="{DynamicResource EgalwareIndigo}"
+                            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}"
@@ -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
@@ -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, 2612, 1, IniFile.m_nKeyLevel) And
+                            EgtGetKeyOptions(3279, 2612, 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())
@@ -32,33 +32,7 @@ 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
@@ -72,38 +46,48 @@ Class MainWindowV

   Private Sub RunBlindCode()
      If Map.refSceneManagerVM.bProtectKey Then
-         If Not IsNothing(m_args) Then
-            StartBlinProgdLog(IniFile.m_sTempDir & "\BlindProgLog.txt")
-            ' 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)
-               BlindProgLog("   File '.ddt' input : " & OptionModule.FileNameFromArgs)
-               ' Assegno i valore Width, Height, Thickness 
-               OptionModule.m_Width = Items(1)
-               BlindProgLog("      width : " & OptionModule.m_Width)
-               OptionModule.m_Height = Items(2)
-               BlindProgLog("      height : " & OptionModule.m_Height)
-               OptionModule.m_Thickness = Items(3)
-               BlindProgLog("      thickness : " & OptionModule.m_Thickness)
-               ' Indico il percoso di salvataggio file DDF
-               OptionModule.SaveFileNameFromArgs = Items(4)
-               BlindProgLog("   File '.ddf' output : " & OptionModule.SaveFileNameFromArgs)
-               ' 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
+         StartBlinProgdLog(IniFile.m_sTempDir & "\BlindProgLog.txt")
+         ' 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)
+            BlindProgLog("   File '.ddt' input : " & OptionModule.FileNameFromArgs)
+            ' Assegno i valore Width, Height, Thickness 
+            OptionModule.m_Width = Items(1)
+            BlindProgLog("      width : " & OptionModule.m_Width)
+            OptionModule.m_Height = Items(2)
+            BlindProgLog("      height : " & OptionModule.m_Height)
+            OptionModule.m_Thickness = Items(3)
+            BlindProgLog("      thickness : " & OptionModule.m_Thickness)
+            ' Indico il percoso di salvataggio file DDF
+            OptionModule.SaveFileNameFromArgs = Items(4)
+            BlindProgLog("   File '.ddf' output : " & OptionModule.SaveFileNameFromArgs)
+            ' Nuovo parametro da laggere per gestione Swing 
+            If Items.Length = 6 Then
+               OptionModule.ForcesSideSwing = Items(5)
+               BlindProgLog("      swing : " & OptionModule.ForcesSideSwing)
+            End If
+            ' abilito lettura dati 
+            OptionModule.AdjustDDT = True
+         Else
+            ' blocco lettura dati
+            OptionModule.AdjustDDT = False
+            ' TERMINO TUTTO SUBITO!
+            End
+         End If
+      End If
+   End Sub
+
 End Class
@@ -72,5 +72,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 

-<Assembly: AssemblyVersion("2.6.11.2")>
-<Assembly: AssemblyFileVersion("2.6.11.2")>
+<Assembly: AssemblyVersion("2.6.12.2")>
+<Assembly: AssemblyFileVersion("2.6.12.2")>
@@ -14,6 +14,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)
@@ -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)
@@ -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>

@@ -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
@@ -34,13 +41,22 @@
      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
+      m_nSelectedIndex = m_PartDoorList.IndexOf(Map.refPartPageVM.CurrPart.TypePart)
+      m_Selection = m_PartDoorList(m_nSelectedIndex)
   End Sub

 End Class
@@ -485,21 +485,23 @@ Public Class SceneManagerVM
      ' ottengo la posizione prevista nella grafica
      Dim IndexInList As Integer = DdfFile.GetIndexInList(TempList, CurrCompo)
      ' recupero la lista ordinata
-      Dim sCompoName As String = CurrCompo.SelFile
+      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)
-      If sNamePath = sCompoName Then
+      ' 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 = Path.GetFileNameWithoutExtension(LocalsPath) Then
+               If sNamePath.Trim = LocalsPath.Trim Then
                  nCounter += 1
               End If
            End If
@@ -511,7 +513,7 @@ Public Class SceneManagerVM

      While IndexInList < TempList.Count And nIdLay <> GDB_ID.NULL
         ' recupero l'ordinamento del layer
-         If sNamePath = sCompoName And IndexLay = IndexInList Then
+         If sNamePath.Contains(sCompoName) And IndexLay = IndexInList Then
            EgtSetMark(nIdLay)
            ' evidenzio la compo corrente
            TempList(IndexInList).SetMark()
@@ -519,7 +521,7 @@ Public Class SceneManagerVM
            ' ricerca terminata correttamente
            Return True
            Exit While
-         ElseIf sNamePath = sCompoName And IndexInList < IndexLay Then
+         ElseIf sNamePath.Contains(sCompoName) And IndexInList < IndexLay Then
            IndexInList += 1
         Else
            Return False
@@ -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
@@ -711,6 +715,8 @@ Public Module Utility
      sFilePath = sPath
      sFileBlindProgLog = New System.IO.StreamWriter(sPath, True)
      Dim sInfoStart As String = Date.Now.ToString & " Avvio programma in cieco"
+      sInfoStart &= vbCrLf & My.Application.Info.Version.Major.ToString() & "." & My.Application.Info.Version.Minor.ToString() &
+                                 (ChrW(97 - 1 + My.Application.Info.Version.Build)).ToString() & My.Application.Info.Version.Revision.ToString()
      sFileBlindProgLog.WriteLine(sInfoStart)
      sFileBlindProgLog.Close()
   End Sub