Optimizer 2.7.11.5
-modifica su importazione btl aggiunto aisetup
This commit is contained in:
@@ -207,10 +207,15 @@ Public Class BTLPartManagerVM
|
||||
|
||||
' Leggo info se presenti
|
||||
Dim sInfo As String = String.Empty
|
||||
Dim sDefaultConfigFile As String = String.Empty
|
||||
Dim sTrimDefaultConfig As String = String.Empty
|
||||
EgtGetInfo(Map.refProjectVM.BTLStructureVM.SelBTLPart.BTLPartM.nPartId, "AISETUP", Map.refProjectVM.SelStrategySetup)
|
||||
If IsNothing(Map.refProjectVM.SelStrategySetup) Then
|
||||
Dim nBTLInfoLayerId As Integer = EgtGetFirstNameInGroup(GDB_ID.ROOT, BTLINFO)
|
||||
EgtGetInfo(nBTLInfoLayerId, "AISETUP", Map.refProjectVM.SelStrategySetup)
|
||||
If Map.refProjectVM.SelStrategySetup Is String.Empty Then
|
||||
If GetMainPrivateProfileString(S_STRATEGY, K_DEFAULTCONFIG, "", sDefaultConfigFile) <> 0 Then
|
||||
sTrimDefaultConfig = System.IO.Path.GetFileNameWithoutExtension(sDefaultConfigFile)
|
||||
Map.refProjectVM.SelStrategySetup = sTrimDefaultConfig
|
||||
EgtSetInfo(Map.refProjectVM.BTLStructureVM.SelBTLPart.BTLPartM.nPartId, "AISETUP", Map.refProjectVM.SelStrategySetup)
|
||||
End If
|
||||
End If
|
||||
For Each GeneralParameter In Map.refProjectVM.GeneralParametersList
|
||||
Select Case GeneralParameter.GetType()
|
||||
|
||||
@@ -960,7 +960,7 @@
|
||||
<Version>2.7.10.1</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="EgwWPFBaseLib">
|
||||
<Version>2.7.11-beta.1</Version>
|
||||
<Version>2.7.11-beta.4</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="EntityFramework">
|
||||
<Version>6.4.4</Version>
|
||||
|
||||
@@ -130,7 +130,6 @@ Public Class GeneralParametersWndVM
|
||||
m_SelStrategySetup = sTrimDefaultConfig
|
||||
EgtGetInfo(nBTLInfoLayerId, "AISETUP", m_SelStrategySetup)
|
||||
End If
|
||||
|
||||
End If
|
||||
For Each GeneralParameter In m_GeneralParametersList
|
||||
Select Case GeneralParameter.GetType()
|
||||
@@ -199,9 +198,18 @@ Public Class GeneralParametersWndVM
|
||||
|
||||
Friend Sub SaveProjectParameters()
|
||||
Dim sInfo As String = String.Empty
|
||||
Dim sDefaultConfigFile As String = String.Empty
|
||||
Dim sTrimDefaultConfig As String = String.Empty
|
||||
Dim nBTLInfoLayerId As Integer = EgtGetFirstNameInGroup(GDB_ID.ROOT, PROJECTINFO)
|
||||
If m_bSaveGeneralParameters Then
|
||||
EgtSetInfo(nBTLInfoLayerId, "AISETUP", m_SelStrategySetup)
|
||||
If m_SelStrategySetup Is String.Empty Then
|
||||
If GetMainPrivateProfileString(S_STRATEGY, K_DEFAULTCONFIG, "", sDefaultConfigFile) <> 0 Then
|
||||
sTrimDefaultConfig = System.IO.Path.GetFileNameWithoutExtension(sDefaultConfigFile)
|
||||
m_SelStrategySetup = sTrimDefaultConfig
|
||||
EgtSetInfo(nBTLInfoLayerId, "AISETUP", m_SelStrategySetup)
|
||||
End If
|
||||
End If
|
||||
For Each GeneralParameter In m_GeneralParametersList
|
||||
Select Case GeneralParameter.GetType()
|
||||
Case GetType(BooleanGenericParameter)
|
||||
|
||||
@@ -214,6 +214,8 @@ Public Class RawPartListVM
|
||||
Sub New()
|
||||
' Aggiungo riferimento a Map
|
||||
Map.SetRefRawPartListVM(Me)
|
||||
NotifyPropertyChanged(NameOf(RawPartColumns))
|
||||
NotifyPropertyChanged(NameOf(PartInRawPartColumns))
|
||||
End Sub
|
||||
|
||||
#End Region ' CONSTRUCTOR
|
||||
|
||||
@@ -67,5 +67,5 @@ Imports System.Windows
|
||||
' Revision
|
||||
'
|
||||
|
||||
<Assembly: AssemblyVersion("2.7.11.4")>
|
||||
<Assembly: AssemblyFileVersion("2.7.11.4")>
|
||||
<Assembly: AssemblyVersion("2.7.11.5")>
|
||||
<Assembly: AssemblyFileVersion("2.7.11.5")>
|
||||
|
||||
@@ -2636,11 +2636,13 @@
|
||||
<Style x:Key="Dimension_TextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
|
||||
<Setter Property="Width" Value="55"/>
|
||||
<Setter Property="TextWrapping" Value="Wrap"/>
|
||||
<Setter Property="VerticalAlignment" Value="Center"/>
|
||||
</Style>
|
||||
|
||||
<Style x:Key="Qty_TextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
|
||||
<Setter Property="Width" Value="40"/>
|
||||
<Setter Property="TextWrapping" Value="Wrap"/>
|
||||
<Setter Property="VerticalAlignment" Value="Center"/>
|
||||
</Style>
|
||||
|
||||
<Style x:Key="FreeContour_TextBox" TargetType="{x:Type TextBox}" BasedOn="{StaticResource {x:Type TextBox}}">
|
||||
|
||||
Reference in New Issue
Block a user