diff --git a/Constants/ConstIni.vb b/Constants/ConstIni.vb index 12e26e8..0905dac 100644 --- a/Constants/ConstIni.vb +++ b/Constants/ConstIni.vb @@ -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" diff --git a/DoorParameters/Part.vb b/DoorParameters/Part.vb index 3cd06c7..d3d5a99 100644 --- a/DoorParameters/Part.vb +++ b/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.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 diff --git a/Guide/GuideV.xaml b/Guide/GuideV.xaml index 3453c60..29ea018 100644 --- a/Guide/GuideV.xaml +++ b/Guide/GuideV.xaml @@ -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}" diff --git a/Guide/GuideV.xaml.vb b/Guide/GuideV.xaml.vb index b1e840c..ad9b445 100644 --- a/Guide/GuideV.xaml.vb +++ b/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 diff --git a/MainWindow/MainWindowModel.vb b/MainWindow/MainWindowModel.vb index 13b1df2..0dec354 100644 --- a/MainWindow/MainWindowModel.vb +++ b/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, 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()) diff --git a/MainWindow/MainWindowV.xaml.vb b/MainWindow/MainWindowV.xaml.vb index 56d5d4f..1d4f6cb 100644 --- a/MainWindow/MainWindowV.xaml.vb +++ b/MainWindow/MainWindowV.xaml.vb @@ -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 diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index eaf15f6..03f5bed 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -72,5 +72,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + diff --git a/OptionsWindow/OptionModule.vb b/OptionsWindow/OptionModule.vb index 693a89d..e443134 100644 --- a/OptionsWindow/OptionModule.vb +++ b/OptionsWindow/OptionModule.vb @@ -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) diff --git a/Order/OrderVM.vb b/Order/OrderVM.vb index 8a1ed35..8d46136 100644 --- a/Order/OrderVM.vb +++ b/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) diff --git a/ProjectManager/SelectPartV.xaml b/ProjectManager/SelectPartV.xaml index b818329..2123829 100644 --- a/ProjectManager/SelectPartV.xaml +++ b/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}}">