diff --git a/AssemblyManager/AssemblyManagerVM.vb b/AssemblyManager/AssemblyManagerVM.vb
index 79c00f5..9b77d31 100644
--- a/AssemblyManager/AssemblyManagerVM.vb
+++ b/AssemblyManager/AssemblyManagerVM.vb
@@ -57,6 +57,8 @@ Public Class AssemblyManagerVM
' creo nuovo assemblato
m_CurrProject.SelAssemblyName.SelAssembly = CreateNewAssembly(CurrProject.SelAssemblyName.Name)
If OptionModule.m_ConfigurationSoftware = ConfigType.Door Then
+ ' ricarico la lista completa degli swing
+ NewAssName.SelAssembly.GetArrayPartDoor(0).Door.SwingTypeList = OptionModule.m_SwingTypeList
DdfFile.WriteDDFPart(NewAssName.SelAssembly.GetArrayPartDoor(0).Door, sTempFile, False, False)
ExecDoors(Map.refSceneManagerVM.ProjectScene, sTempFile)
Map.refMainWindowVM.SelectedPage = MainWindowVM.ListPageEnum.nDDFPage
@@ -215,7 +217,7 @@ Public Class AssemblyManagerVM
' carico l'assemblato che sto creando in locale (così da poter gestire i Jamb)
m_CurrProject.SelAssemblyName.SelAssembly = Local_SelAssembly
CreateDoor(Local_SelAssembly)
- ' calcolo la dimensione dei Jambs in funzione del numero di porte visibili
+ ' calcolo la dimensione dei Jambs in funzione del numero di porte visibili ed assegno gli swing
Local_SelAssembly.DoorVisibilityNew()
Local_SelAssembly.TopRabbetJamb()
'Local_SelAssembly.HingeRabbetJamb()
diff --git a/CompoMatch.vb b/CompoMatch.vb
index 05986d1..c56dd04 100644
--- a/CompoMatch.vb
+++ b/CompoMatch.vb
@@ -17,11 +17,13 @@ Module CompoMatch
EgtLuaSetGlobIntVar("STU.DoorNumber", DoorNumber)
EgtLuaSetGlobStringVar("STU.CompoPath", sCompoDir)
EgtLuaSetGlobStringVar("STU.Template", sTemplate)
+
' Chiamo funzione di Matching tra componente di anta e componente di telaio
If Not EgtLuaCallFunction("STU.Matching") Then
EgtOutLog("Matching error: STU.Matching")
Return False
End If
+
' Recupero il componente di telaio
EgtLuaGetGlobStringVar("STU.OutTemplate", sFrameTemplate)
EgtLuaResetGlobVar("STU")
diff --git a/Constants/ConstIni.vb b/Constants/ConstIni.vb
index 13f6cb0..9dd1848 100644
--- a/Constants/ConstIni.vb
+++ b/Constants/ConstIni.vb
@@ -146,5 +146,6 @@ 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"
End Module
diff --git a/DoorParameters/Compo.vb b/DoorParameters/Compo.vb
index 9b2ee4a..02663cd 100644
--- a/DoorParameters/Compo.vb
+++ b/DoorParameters/Compo.vb
@@ -783,8 +783,6 @@ End Class
Public Class CompoParam
Friend Shared m_rfSetTitle As Action
- Friend m_IsModifyCompoParam As Boolean = False
-
Private m_Name As String
Public Property Name As String
Get
@@ -845,14 +843,14 @@ Public Class TextBoxParam
Set(value As String)
m_Value = value
NotifyPropertyChanged("ToolTipValue")
- m_IsModifyCompoParam = True
+ Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.IsModified = True
' se la componente non ha un riferimento esce
If IsNothing(CurrCompo.refJambCompo) Then Return
' se fallisce il caricamento dei parametri esce
If Not LoadCompoParam(CurrCompo) Then Return
If Not UpdateParam() Then MessageBox.Show("No matching param ", EgtMsg(50101), MessageBoxButton.OK, MessageBoxImage.Error)
ResetCompoParam()
- Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.IsModified = True
+
End Set
End Property
Public Sub SetValue(sValue As String)
@@ -970,7 +968,6 @@ Public Class ComboBoxParam
End Get
Set(value As String)
m_SelItem = value
- m_IsModifyCompoParam = True
Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.IsModified = True
End Set
End Property
diff --git a/DoorParameters/Part.vb b/DoorParameters/Part.vb
index 1ce84f0..19c8fa1 100644
--- a/DoorParameters/Part.vb
+++ b/DoorParameters/Part.vb
@@ -60,6 +60,7 @@ Public Class Part
End Get
Set(value As List(Of String))
m_SwingTypeList = value
+ NotifyPropertyChanged("SwingTypeList")
End Set
End Property
@@ -569,10 +570,7 @@ Public Class Part
'-----------------------------------------------------------------------------------------------------------------------------------------------
' questa parte qui viene ignorata se l'oggetto chiamente è un Frame o una Porta Inattiva
If Not IsNothing(Me.m_TypePart) AndAlso Not Me.m_TypePart.Contains("F") Then
-
If Not IsNothing(Map.refAssemblyPageVM.CurrAssembly.LeftJamb) Then
- '' definisco un riferimento ad una variabile che sarà usata nel jamb
- 'Dim CompoTypeJamb As CompoType
' costruisco un riferimnto in locale dell'assemblato
Dim CurrAssembly As Assembly = Map.refAssemblyPageVM.CurrAssembly
' il nome del file associato alla componente
@@ -589,7 +587,6 @@ Public Class Part
Else
CreateRefCompo(CurrCompoType, NewCompo, CurrAssembly, FrameCompoFileConfig, FrameCompoFile, Me)
End If
-
End If
End If
End If
@@ -691,20 +688,20 @@ Public Class Part
' significa che le componenrti stanno solo sulle porte
If CurrDoor.TypePart = "DO_1" And Not CurrDoor.Swing.Contains("I") Then
NewCompo.refJambCompo = CurrAssembly.GetArrayPartDoor(1).Door.AddRefCompo(CurrCompoType)
- NewCompo.refJambCompo.SetTemplateSelItemRefCompo(FrameCompoFile, NewCompo.refJambCompo)
+ NewCompo.refJambCompo.SetTemplateSelItem(FrameCompoFile)
NewCompo.refJambCompo.IsReadOnly = True
ElseIf CurrDoor.TypePart = "DO_2" And Not CurrDoor.Swing.Contains("I") Then
NewCompo.refJambCompo = CurrAssembly.GetArrayPartDoor(0).Door.AddRefCompo(CurrCompoType)
- NewCompo.refJambCompo.SetTemplateSelItemRefCompo(FrameCompoFile, NewCompo.refJambCompo)
+ NewCompo.refJambCompo.SetTemplateSelItem(FrameCompoFile)
NewCompo.refJambCompo.IsReadOnly = True
End If
Case "Top"
NewCompo.refJambCompo = CurrAssembly.TopJamb.AddRefCompo(CompoTypeJamb)
- NewCompo.refJambCompo.SetTemplateSelItemRefCompo(FrameCompoFile, NewCompo.refJambCompo)
+ NewCompo.refJambCompo.SetTemplateSelItem(FrameCompoFile)
NewCompo.refJambCompo.IsReadOnly = True
Case "Bottom"
NewCompo.refJambCompo = CurrAssembly.BottomJamb.AddRefCompo(CompoTypeJamb)
- NewCompo.refJambCompo.SetTemplateSelItemRefCompo(FrameCompoFile, NewCompo.refJambCompo)
+ NewCompo.refJambCompo.SetTemplateSelItem(FrameCompoFile)
NewCompo.refJambCompo.IsReadOnly = True
End Select
End Select
diff --git a/DoorParameters/PartPageV.xaml b/DoorParameters/PartPageV.xaml
index cc90dc4..47a9d49 100644
--- a/DoorParameters/PartPageV.xaml
+++ b/DoorParameters/PartPageV.xaml
@@ -113,16 +113,13 @@
Style="{StaticResource DoorParamsTxBl}"
Margin="2,0,0,2" Visibility="{Binding CurrPart.VisibilityWeight}"/>
-
+ Visibility="{Binding CurrPart.VisibilityWeight}"/>
-
-
-
+
-
+
diff --git a/IniFile.vb b/IniFile.vb
index 3253e2b..37c136c 100644
--- a/IniFile.vb
+++ b/IniFile.vb
@@ -36,6 +36,8 @@ Friend Module IniFile
Friend m_DefaultIniFile As String = String.Empty
' Path MyProject directory
Friend m_MyProjectDir As String = String.Empty
+ ' direttorio dei file della macchina
+ Friend m_MachinProject As String = String.Empty
' Path Template directory
Friend m_TemplateDir As String = String.Empty
' Path Compo directory
diff --git a/MainWindow/MainWindowVM.vb b/MainWindow/MainWindowVM.vb
index 1e57376..7f00893 100644
--- a/MainWindow/MainWindowVM.vb
+++ b/MainWindow/MainWindowVM.vb
@@ -15,7 +15,9 @@ Public Class MainWindowVM
Return m_ProjectNameMsg
End Get
Set(value As String)
- m_ProjectNameMsg = "EgtDOORCreator - " & SetTitle(value)
+ ' sostituisco il nome del direttorio con il path completo
+ 'm_ProjectNameMsg = "EgtDOORCreator - " & SetTitle(value)
+ m_ProjectNameMsg = "EgtDOORCreator - " & value
NotifyPropertyChanged("ProjectNameMsg")
End Set
End Property
diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index 1133079..3638bd2 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 1430347..e7617c1 100644
--- a/OptionsWindow/OptionModule.vb
+++ b/OptionsWindow/OptionModule.vb
@@ -175,6 +175,17 @@ Friend Module OptionModule
End If
End If
+ Dim sMachinDir As String = String.Empty
+ If GetMainPrivateProfileString(S_DOORS, K_MACHINDIR, "", sMachinDir) <> 0 Then
+ If Not Directory.Exists(sMachinDir) Then
+ ' manntego l'accesso a quello di default
+ EgtOutLog("Warning : " & sMachinDir & " does not exist")
+ ' controllo che il direttorio che era stato passato di default esista
+ Else
+ IniFile.m_MachinProject = sMachinDir
+ End If
+ End If
+
' leggo il tipo di Bevel selezionato
Dim BevelUp As Visibility
DefaultGetPrivateProfilesBevel(S_EDGE, K_BEVELU_INI, BevelUp)
@@ -207,13 +218,11 @@ Friend Module OptionModule
Dim WeightVisibility As Visibility = Visibility.Collapsed
DefaultGetPrivateProfilesVisibility(S_SIZE, K_WEIGHTISCHECKED_INI, WeightVisibility)
Part.IsCheckedWeight = WeightVisibility
-
' carico il valori associati al tipo di spigolo
Dim EdgeTypeList As New ObservableCollection(Of String)
DefaultGetPrivateProfileObservableCollection(S_EDGE, K_EDGETYPE_LIST_INI, EdgeTypeList)
m_StaticEdgeTypeList = EdgeTypeList
OptionsVM.CreateEdgeTypeList()
-
' carico i valori associati agli spigoli
Dim LockEdgeType As String = String.Empty
DefaultGetPrivateProfileString(S_EDGE, K_LOCKEDGE, "", LockEdgeType)
diff --git a/OptionsWindow/OptionsV.xaml b/OptionsWindow/OptionsV.xaml
index 6c64867..ce601e0 100644
--- a/OptionsWindow/OptionsV.xaml
+++ b/OptionsWindow/OptionsV.xaml
@@ -12,10 +12,10 @@
-
-
+
+
-
+
@@ -27,9 +27,10 @@
+
-
+
@@ -102,7 +103,7 @@
-
+
+ Margin="5,8,0,14"
+ IsEnabled="{Binding IsChecked, ElementName=Weight}" HorizontalAlignment="Left" Width="109"/>
-
+
@@ -391,7 +392,7 @@
IsEnabled="{Binding IsChecked, ElementName=BottomAssembly}"
Padding="1"
Margin="5,2.5,10,2.5"/>
-
+
@@ -402,7 +403,7 @@
-
+
-
+
@@ -443,7 +444,7 @@
-
+
-
-
+
+
@@ -470,7 +471,7 @@
Style="{StaticResource DoorParamsChBx}"
IsChecked="{Binding BevelUpIsChecked}"/>
+ VerticalAlignment="Center"/>
+ Command="{Binding BrowseCommand}" Margin="5"
+ CommandParameter="MyProject"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+