Egalware/egtbeamwall
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

EgtBEAMWALL 3.1.5.1:

Browse Source 
-cambio versione
-pulizia codice
This commit is contained in:
Demetrio Cassarino
2026-05-13 11:26:01 +02:00
parent 67944bfdcb
commit 4b9ed93a7a
30 changed files with 314 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EgtBEAMWALL.Core/My Project/AssemblyInfo.vb
+2 -2
View File
@@ -38,5 +38,5 @@ Imports System.Windows
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("3.1.4.7")>
<Assembly: AssemblyFileVersion("3.1.4.7")>
<Assembly: AssemblyVersion("3.1.5.1")>
<Assembly: AssemblyFileVersion("3.1.5.1")>
EgtBEAMWALL.Core/Themes/Generic.xaml
+5 -1
View File
@@ -302,7 +302,11 @@
<!--#region Colori ComboBox-->
<SolidColorBrush x:Key="ComboBox.Static.Background" Color="{StaticResource BeamWall_Glacier_Color}"/>
<!--<SolidColorBrush x:Key="ComboBox.Static.Background" Color="{StaticResource BeamWall_Glacier_Color}"/>-->
<LinearGradientBrush x:Key="ComboBox.Static.Background" EndPoint="0,1" StartPoint="0,0">
<GradientStop Color="{StaticResource BeamWall_Gallery_Color}" Offset="0.0"/>
<GradientStop Color="{StaticResource BeamWall_Mercury_Color}" Offset="1.0"/>
</LinearGradientBrush>
<SolidColorBrush x:Key="ComboBox.Static.Border" Color="{StaticResource BeamWall_Glacier_Color}"/>
<SolidColorBrush x:Key="ComboBox.Static.Glyph" Color="{StaticResource BeamWall_White_Color}"/>
<SolidColorBrush x:Key="ComboBox.Static.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("3.1.4.7")]
[assembly: AssemblyFileVersion("3.1.4.7")]
[assembly: AssemblyVersion("3.1.5.1")]
[assembly: AssemblyFileVersion("3.1.5.1")]
EgtBEAMWALL.Optimizer/AddFeatureWnd/AddFeatureWndVM.vb
+1 -5
View File
@@ -106,11 +106,7 @@ Public Class AddFeatureWndVM
GetMacroListDefault(nGRPFromFileName, nPRCFromFileName, sMacroNameFromFileName, nIdMacroName)
' ricavo lista file Macro Custom
GetMacroListCustom(nGRPFromFileName, nPRCFromFileName, sMacroNameFromFileName, nIdMacroName)
If MacroCustomList.Count > 0 Then
MacroList_IsEnabled = True
Else
MacroList_IsEnabled = False
End If
MacroList_IsEnabled = If(MacroCustomList.Count > 0, True, False)
End If
End If
NotifyPropertyChanged(NameOf(nSelPRC))
EgtBEAMWALL.Optimizer/AddPartWnd/AddPartWndVM.vb
+2 -2
View File
@@ -147,7 +147,7 @@ Public Class AddPartWndVM
#Region "COMMANDS"
#Region "Ok"
#Region "Ok_Command"
Public ReadOnly Property Ok_Command As ICommand
Get
@@ -169,7 +169,7 @@ Public Class AddPartWndVM
End If
End Sub
#End Region ' Ok
#End Region ' Ok_Command
#End Region ' COMMANDS
EgtBEAMWALL.Optimizer/AddRawPartWnd/AddRawPartWndVM.vb
+2 -2
View File
@@ -143,7 +143,7 @@ Public Class AddRawPartWndVM
#Region "COMMANDS"
#Region "Ok"
#Region "Ok_Command"
Public ReadOnly Property Ok_Command As ICommand
Get
@@ -167,7 +167,7 @@ Public Class AddRawPartWndVM
RaiseEvent m_CloseWindow(True)
End Sub
#End Region ' Ok
#End Region ' Ok_Command
#End Region ' COMMANDS
EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndVM.vb
+4 -4
View File
@@ -829,7 +829,7 @@ Public Class BTLDataWndVM
#Region "COMMANDS"
#Region "Ok"
#Region "Ok_Command"
Public ReadOnly Property Ok_Command As ICommand
Get
@@ -856,9 +856,9 @@ Public Class BTLDataWndVM
RaiseEvent m_CloseWindow(True)
End Sub
#End Region ' Ok
#End Region ' Ok_Command
#Region "Cancel"
#Region "Cancel_Command"
Public ReadOnly Property Cancel_Command As ICommand
Get
@@ -873,7 +873,7 @@ Public Class BTLDataWndVM
RaiseEvent m_CloseWindow(False)
End Sub
#End Region ' Cancel
#End Region ' Cancel_Command
#End Region ' COMMANDS
EgtBEAMWALL.Optimizer/BTLPartManager/BTLPartManagerV.xaml
+5 -5
View File
@@ -20,7 +20,7 @@
<dxb:BarButtonItem Command="{Binding CopyPart_Command}"
ToolTip="{Binding CopyPart_ToolTip}"
IsEnabled="{Binding CopyPart_IsEnabled}"
Glyph="/Resources/LeftPanel/CopyPart.png"
Glyph="{StaticResource CopyPart_Image}"
Style="{StaticResource DropDownButton_BarButtonItem}">
<!--<Image Source="{StaticResource CopyPart_Image}"
Style="{StaticResource BTLDataWnd_Image}"/>-->
@@ -28,7 +28,7 @@
<dxb:BarButtonItem Command="{Binding RemovePart_Command}"
ToolTip="{Binding RemovePart_ToolTip}"
IsEnabled="{Binding RemovePart_IsEnabled}"
Glyph="/Resources/LeftPanel/RemovePart.png"
Glyph="{StaticResource Remove_Image}"
Style="{StaticResource DropDownButton_BarButtonItem}">
<!--<Image Source="{StaticResource Remove_Image}"
Style="{StaticResource BTLDataWnd_Image}"/>-->
@@ -36,7 +36,7 @@
<dxb:BarButtonItem ToolTip="{Binding Simulate_ToolTip}"
Command="{Binding Simulate_Command}"
IsEnabled="{Binding Simulate_IsEnabled}"
Glyph="/Resources/CALCPanel/Simulate.png"
Glyph="{StaticResource Simulate_Image}"
Style="{StaticResource DropDownButton_BarButtonItem}">
<!--<Image Source="{StaticResource Simulate_Image}"
Style="{StaticResource BTLDataWnd_Image}"/>-->
@@ -44,7 +44,7 @@
<dxb:BarButtonItem ToolTip="{Binding Edit_ToolTip}"
Command="{Binding Edit_Command}"
IsEnabled="{Binding Edit_IsEnabled}"
Glyph="/Resources/CALCPanel/Edit.png"
Glyph="{StaticResource Edit_Image}"
Style="{StaticResource DropDownButton_BarButtonItem}">
<!--<Image Source="{StaticResource Edit_Image}"
Style="{StaticResource BTLDataWnd_Image}"/>-->
@@ -52,7 +52,7 @@
<dxb:BarButtonItem Command="{Binding ResetCalc_Command}"
ToolTip="{Binding ResetCalc_ToolTip}"
IsEnabled="{Binding CALCPanel_IsEnabled}"
Glyph="/Resources/CALCPanel/ResetCalc.png"
Glyph="{StaticResource ResetCalc_Image}"
Style="{StaticResource DropDownButton_BarButtonItem}">
<!--<Image Source="{StaticResource ResetCalc_Image}"
Style="{StaticResource BTLDataWnd_Image}"/>-->
EgtBEAMWALL.Optimizer/BTLPartManager/BTLPartManagerVM.vb
+10 -12
View File
@@ -8,8 +8,6 @@ Public Class BTLPartManagerVM
#Region "FIELDS & PROPERTIES"
Private PADLOCK_IMAGE As String = "pack://application:,,,/Resources/NewPage/padlock.png"
Private m_BTLPartManager_IsEnabled As Boolean = True
Public ReadOnly Property BTLPartManager_IsEnabled As Boolean
Get
@@ -178,7 +176,7 @@ Public Class BTLPartManagerVM
#Region "COMMANDS"
#Region "CopyPart"
#Region "CopyPart_Command"
Public ReadOnly Property CopyPart_Command As ICommand
Get
@@ -202,9 +200,9 @@ Public Class BTLPartManagerVM
End If
End Sub
#End Region ' CopyPart
#End Region ' CopyPart_Command
#Region "RemovePart"
#Region "RemovePart_Command"
Public ReadOnly Property RemovePart_Command As ICommand
Get
@@ -288,9 +286,9 @@ Public Class BTLPartManagerVM
EgtSetCurrentContext(Map.refSceneHostVM.MainScene.GetCtx())
End Sub
#End Region ' RemovePart
#End Region ' RemovePart_Command
#Region "SimulateCommand"
#Region "Simulate_Command"
Public ReadOnly Property Simulate_Command As ICommand
Get
@@ -335,9 +333,9 @@ Public Class BTLPartManagerVM
Return True
End Function
#End Region ' SimulateCommand
#End Region ' Simulate_Command
#Region "Edit"
#Region "Edit_Command"
Public ReadOnly Property Edit_Command As ICommand
Get
@@ -371,9 +369,9 @@ Public Class BTLPartManagerVM
Map.refProjectVM.SetLeftPanel_Opacity(0.2)
End Sub
#End Region ' Edit
#End Region ' Edit_Command
#Region "ResetCalc"
#Region "ResetCalc_Command"
Public ReadOnly Property ResetCalc_Command As ICommand
Get
@@ -395,7 +393,7 @@ Public Class BTLPartManagerVM
End If
End Sub
#End Region ' ResetCalc
#End Region ' ResetCalc_Command
#End Region ' COMMANDS
EgtBEAMWALL.Optimizer/BTLViewModel/BTLFeatureVM.vb
+18 -12
View File
@@ -293,6 +293,12 @@ Public Class BTLFeatureVM
End Set
End Property
Public ReadOnly Property sFeature_Name As String
Get
Return $"[{nSelGRP}-{nPRC:000}] {sName}"
End Get
End Property
#Region "Messages"
Public ReadOnly Property Edit_ToolTip As String
@@ -481,7 +487,7 @@ Public Class BTLFeatureVM
#Region "COMMANDS"
#Region "DeleteFeature"
#Region "DeleteFeature_Command"
Public ReadOnly Property DeleteFeature_Command As ICommand
Get
@@ -496,9 +502,9 @@ Public Class BTLFeatureVM
Map.refFeatureListManagerVM.RemoveFeature()
End Sub
#End Region ' DeleteFeature
#End Region ' DeleteFeature_Command
#Region "Edit"
#Region "Edit_Command"
Public ReadOnly Property Edit_Command As ICommand
Get
@@ -514,9 +520,9 @@ Public Class BTLFeatureVM
Map.refFreeContourManagerVM.Open()
End Sub
#End Region ' Edit
#End Region ' Edit_Command
#Region "Save"
#Region "Save_Command"
Public ReadOnly Property Save_Command As ICommand
Get
@@ -537,9 +543,9 @@ Public Class BTLFeatureVM
Map.refFreeContourManagerVM.Close(True)
End Sub
#End Region ' Save
#End Region ' Save_Command
#Region "Cancel"
#Region "Cancel_Command"
Public ReadOnly Property Cancel_Command As ICommand
Get
@@ -555,9 +561,9 @@ Public Class BTLFeatureVM
Map.refFreeContourManagerVM.Close(False)
End Sub
#End Region ' Cancel
#End Region ' Cancel_Command
#Region "Strategy"
#Region "Strategy_Command"
Public ReadOnly Property Strategy_Command As ICommand
Get
@@ -576,9 +582,9 @@ Public Class BTLFeatureVM
Map.refForcedStrategyPanelVM.Init(BTLFeatureM)
End Sub
#End Region ' Strategy
#End Region ' Strategy_Command
#Region "EditFeature"
#Region "EditFeature_Command"
Public ReadOnly Property EditFeature_Command As ICommand
Get
@@ -607,7 +613,7 @@ Public Class BTLFeatureVM
EgtDraw()
End Sub
#End Region ' EditFeature
#End Region ' EditFeature_Command
#End Region ' COMMANDS
EgtBEAMWALL.Optimizer/BTLViewModel/BTLPartVM.vb
+34 -50
View File
@@ -18,6 +18,7 @@ Public Class BTLPartVM
Return m_BTLPartM
End Get
End Property
Private m_BTLStructureM As BTLStructureM
Public ReadOnly Property nPartId As Integer
@@ -2211,11 +2212,26 @@ Public Class BTLPartVM
Return True
End Function
Public Sub BackRotation(Optional bUpdateSection As Boolean = False, Optional bRedraw As Boolean = True)
' salvo sezione impostata
Dim CurrSection As SectionXMaterial = Map.refProjectVM.BTLStructureVM.SelSection
' ruoto
Rotation(False, Map.refProjectVM.BTLStructureVM.nPROJTYPE, bRedraw)
' imposto lock
bLockRotation = True
' se progetto travi e sezione precedente diversa da vuota (tutti i pezzi)
If bUpdateSection AndAlso Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.BEAM AndAlso CurrSection <> SectionXMaterial.Empty Then
' se esiste, imposto sezione inversa
Dim InverseSection As SectionXMaterial = Map.refProjectVM.BTLStructureVM.SectionList.FirstOrDefault(Function(x) x.dH = CurrSection.dW AndAlso x.dW = CurrSection.dH AndAlso x.sMaterial(0) = CurrSection.sMaterial(0))
If Not IsNothing(InverseSection) Then Map.refProjectVM.BTLStructureVM.SetSelSection(InverseSection)
End If
End Sub
#End Region ' METHODS
#Region "COMMANDS"
#Region "Invert"
#Region "Invert_Command"
Public ReadOnly Property Invert_Command As ICommand
Get
@@ -2237,41 +2253,9 @@ Public Class BTLPartVM
NotifyPropertyChanged(NameOf(sINVERTED))
End Sub
#End Region ' Invert
#End Region ' Invert_Command
#Region "BackRotation"
Public ReadOnly Property BackRotation_Command As ICommand
Get
If m_cmdBackRotation Is Nothing Then
m_cmdBackRotation = New Command(AddressOf BackRotationCmd)
End If
Return m_cmdBackRotation
End Get
End Property
Public Sub BackRotationCmd()
BackRotation(True)
End Sub
Public Sub BackRotation(Optional bUpdateSection As Boolean = False, Optional bRedraw As Boolean = True)
' salvo sezione impostata
Dim CurrSection As SectionXMaterial = Map.refProjectVM.BTLStructureVM.SelSection
' ruoto
Rotation(False, Map.refProjectVM.BTLStructureVM.nPROJTYPE, bRedraw)
' imposto lock
bLockRotation = True
' se progetto travi e sezione precedente diversa da vuota (tutti i pezzi)
If bUpdateSection AndAlso Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.BEAM AndAlso CurrSection <> SectionXMaterial.Empty Then
' se esiste, imposto sezione inversa
Dim InverseSection As SectionXMaterial = Map.refProjectVM.BTLStructureVM.SectionList.FirstOrDefault(Function(x) x.dH = CurrSection.dW AndAlso x.dW = CurrSection.dH AndAlso x.sMaterial(0) = CurrSection.sMaterial(0))
If Not IsNothing(InverseSection) Then Map.refProjectVM.BTLStructureVM.SetSelSection(InverseSection)
End If
End Sub
#End Region ' BackRotation
#Region "ForwardRotation"
#Region "ForwardRotation_Command"
Public ReadOnly Property ForwardRotation_Command As ICommand
Get
@@ -2300,7 +2284,7 @@ Public Class BTLPartVM
End If
End Sub
#End Region ' ForwardRotation
#End Region ' ForwardRotation_Command
' Comando inutilizzato ma conservato per eventuale rotazione a causa di importazione con rotazione sbagliata
#Region "XRotation"
@@ -2343,7 +2327,7 @@ Public Class BTLPartVM
#End Region ' XRotation
#Region "PartColour"
#Region "PartColour_Command"
Public ReadOnly Property PartColour_Command As ICommand
Get
@@ -2375,9 +2359,9 @@ Public Class BTLPartVM
Return True
End Function
#End Region ' PartColour
#End Region ' PartColour_Command
#Region "Verify"
#Region "Verify_Command"
Public ReadOnly Property Verify_Command As ICommand
Get
@@ -2395,9 +2379,9 @@ Public Class BTLPartVM
Return
End Sub
#End Region ' Verify
#End Region ' Verify_Command
#Region "AddToRawPart"
#Region "AddToRawPart_Command"
Public ReadOnly Property AddToRawPart_Command As ICommand
Get
@@ -2692,9 +2676,9 @@ Public Class BTLPartVM
Return True
End Function
#End Region ' AddToRawPart
#End Region ' AddToRawPart_Command
#Region "SelectAllFeature"
#Region "SelectAllFeature_Command"
Public ReadOnly Property SelectAllFeature_Command As ICommand
Get
@@ -2710,9 +2694,9 @@ Public Class BTLPartVM
NotifyPropertyChanged(NameOf(bDOALL))
End Sub
#End Region ' SelectAllFeature
#End Region ' SelectAllFeature_Command
#Region "DeselectAllFeature"
#Region "DeselectAllFeature_Command"
Public ReadOnly Property DeselectAllFeature_Command As ICommand
Get
@@ -2728,9 +2712,9 @@ Public Class BTLPartVM
NotifyPropertyChanged(NameOf(bDOALL))
End Sub
#End Region ' DeselectAllFeature
#End Region ' DeselectAllFeature_Command
#Region "SelectItemFeature"
#Region "SelectItemFeature_Command"
Public ReadOnly Property SelectItemFeature_Command As ICommand
Get
@@ -2752,9 +2736,9 @@ Public Class BTLPartVM
Next
End Sub
#End Region ' SelectItemFeature
#End Region ' SelectItemFeature_Command
#Region "DeselectItemFeature"
#Region "DeselectItemFeature_Command"
Public ReadOnly Property DeselectItemFeature_Command As ICommand
Get
@@ -2776,7 +2760,7 @@ Public Class BTLPartVM
Next
End Sub
#End Region ' DeselectItemFeature
#End Region ' DeselectItemFeature_Command
#End Region ' COMMANDS
EgtBEAMWALL.Optimizer/BTLViewModel/BTLStructureVM.vb
+8 -8
View File
@@ -1243,7 +1243,7 @@ Public Class BTLStructureVM
#Region "COMMANDS"
#Region "DeletePart"
#Region "DeletePart_Command"
Public ReadOnly Property DeletePart_Command As ICommand
Get
@@ -1258,9 +1258,9 @@ Public Class BTLStructureVM
Map.refBTLPartManagerVM.RemovePartCmd()
End Sub
#End Region ' DeletePart
#End Region ' DeletePart_Command
#Region "Data"
#Region "Data_Command"
Public ReadOnly Property Data_Command As ICommand
Get
@@ -1276,9 +1276,9 @@ Public Class BTLStructureVM
BTLDataWnd.ShowDialog()
End Sub
#End Region ' Data
#End Region ' Data_Command
#Region "AddPart"
#Region "AddPart_Command"
Public ReadOnly Property AddPart_Command As ICommand
Get
@@ -1330,9 +1330,9 @@ Public Class BTLStructureVM
End If
End Sub
#End Region ' AddPart
#End Region ' AddPart_Command
#Region "UpdateBTL"
#Region "UpdateBTL_Command"
Public ReadOnly Property UpdateBTL_Command As ICommand
Get
@@ -1872,7 +1872,7 @@ Public Class BTLStructureVM
EgtZoom(ZM.ALL)
End Sub
#End Region ' UpdateBTL
#End Region ' UpdateBTL_Command
#End Region ' Commands
EgtBEAMWALL.Optimizer/BlockedWnd/BlockedWndVM.vb
+4 -4
View File
@@ -112,7 +112,7 @@ Public Class BlockedWndVM
#Region "COMMANDS"
#Region "Save"
#Region "Save_Command"
Public ReadOnly Property Save_Command As ICommand
Get
@@ -130,9 +130,9 @@ Public Class BlockedWndVM
DbControllers.m_StatusMapController.UpdateAction("", ProjectManagerVM.CurrProd.nProdId, ProjectManagerVM.CurrProd.nProdId, StatusMapItemType.Comm, StatusMapOpType.ViewOptimStoped, "")
End Sub
#End Region ' Save
#End Region ' Save_Command
#Region "DoNotSave"
#Region "DoNotSave_Command"
Public ReadOnly Property DoNotSave_Command As ICommand
Get
@@ -148,7 +148,7 @@ Public Class BlockedWndVM
DbControllers.m_StatusMapController.UpdateAction("", ProjectManagerVM.CurrProd.nProdId, ProjectManagerVM.CurrProd.nProdId, StatusMapItemType.Comm, StatusMapOpType.ViewOptimStoped, "")
End Sub
#End Region ' DoNotSave
#End Region ' DoNotSave_Command
#End Region ' COMMANDS
EgtBEAMWALL.Optimizer/ForcedStrategyPanel/ForcedStrategyPanelVM.vb
-15
View File
@@ -145,21 +145,6 @@ Public Class ForcedStrategyPanelVM
m_StrategyList = New ObservableCollection(Of Strategy)((From JsonAvailableStrategy In JsonAvailableTopology.StrategyList
Select JsonAvailableStrategy.Deserialize(ProjectManagerVM.CurrProd.nType, -1)).ToList())
End If
If File.Exists(sAvailableStrategiesFilePath) Then
sReadedFile = File.ReadAllText(sAvailableStrategiesFilePath)
Dim JsonStrategyFeatureList As List(Of JsonAvailableStrategyFeature) = JsonConvert.DeserializeObject(Of List(Of JsonAvailableStrategyFeature))(sReadedFile)
Dim JsonAvailableStrategyFeature As JsonAvailableStrategyFeature = JsonStrategyFeatureList.FirstOrDefault(Function(x) x.nGrp = nGRP AndAlso x.nPrc = nPRC)
If IsNothing(JsonAvailableStrategyFeature) Then Return False
Dim JsonAvailableTopology As JsonAvailableTopology = JsonAvailableStrategyFeature.TopologyList.FirstOrDefault(Function(x) x.sName = sTopologyName)
If IsNothing(JsonAvailableTopology) Then
' ricavo topologia da feature
FindTopologyFromFeature(nFeatureId, sTopologyName)
JsonAvailableTopology = JsonAvailableStrategyFeature.TopologyList.FirstOrDefault(Function(x) x.sName = sTopologyName)
End If
If IsNothing(JsonAvailableTopology) Then Return False
m_StrategyList = New ObservableCollection(Of Strategy)((From JsonAvailableStrategy In JsonAvailableTopology.StrategyList
Select JsonAvailableStrategy.Deserialize(ProjectManagerVM.CurrProd.nType, -1)).ToList())
End If
' recupero custom
Dim nPartId As Integer = EgtGetParent(EgtGetParent(nFeatureId))
Dim nPartProjId As Integer = 0
EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersStrategyVM.vb
+1
View File
@@ -465,6 +465,7 @@ Public MustInherit Class ProjectParameters
End Select
End If
End Sub
#End Region ' Methods
End Class
EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListV.xaml
+132 -133
View File
@@ -71,7 +71,8 @@
RowMinHeight="28"
ShowGridMenu="OnShowGridMenu"
AlternationCount="2"
EvenRowBackground="LightBlue"
AlternateRowBackground="{StaticResource BeamWall_LinkWater}"
EvenRowBackground="{StaticResource BeamWall_BLackSqueeze}"
UseEvenRowBackground="True"
ShowGroupFooters="True"
GroupSummaryDisplayMode="AlignByColumns"
@@ -81,75 +82,55 @@
LeftGroupAreaIndent="0"
ShowSearchPanelResultInfo="True"
ShowSearchPanelNavigationButtons="True">
<dxg:TableView.RowStyle>
<Style TargetType="dxg:RowControl">
<Setter Property="IsEnabled" Value="{Binding Row.IsRowEnabled}"/>
</Style>
</dxg:TableView.RowStyle>
<dxg:TableView.ColumnHeaderStyle>
<Style TargetType="dxg:BaseGridHeader">
<Setter Property="Background" Value="{StaticResource DataGridColumnHeader.Static.Main.Background}"/>
<Setter Property="Foreground" Value="{StaticResource DataGridColumnHeader.Static.Main.Foreground}"/>
<Setter Property="FontWeight" Value="Bold"/>
<Setter Property="FontSize" Value="15"/>
<Setter Property="HorizontalContentAlignment" Value="Center"/>
<Setter Property="VerticalContentAlignment" Value="Center"/>
<!--<Setter Property="dxg:BaseGridColumnHeader.ShowFilterButtonOnHover" Value="False"/>-->
</Style>
</dxg:TableView.ColumnHeaderStyle>
<dxg:TableView.ColumnHeaderImageStyle>
<Style TargetType="Image">
<Setter Property="Height" Value="20"></Setter>
<Setter Property="Stretch" Value="Uniform"></Setter>
</Style>
</dxg:TableView.ColumnHeaderImageStyle>
ShowSearchPanelNavigationButtons="True"
ColumnHeaderStyle="{StaticResource HeaderStyle}"
ColumnHeaderImageStyle="{StaticResource HeaderImageStyle}"
RowStyle="{StaticResource RowStyle}">
<dxg:TableView.GroupRowTemplate>
<DataTemplate>
<Grid VerticalAlignment="Center">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<dxg:GridGroupExpandButton IsChecked="{Binding IsRowExpanded}"
Command="{Binding View.Commands.ChangeGroupExpanded}"
CommandParameter="{Binding RowHandle.Value}"/>
<TextBlock Grid.Column="1"
Text="{Binding GroupValue.Value, Converter={StaticResource ProjIdToBtlFileName}}"
Style="{StaticResource BTLPartList_TextBlock}"/>
<StackPanel Grid.Column="2"
Style="{StaticResource PartManager_StackPanel}">
<Button Command="{Binding Tag.Data_Command, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
CommandParameter="{Binding Path=Name}"
ToolTip="{Binding Tag.Data_ToolTip, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
Style="{StaticResource BTLPartList_Button}">
<Image Source="{StaticResource Adjustment_Image}"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button Command="{Binding Tag.AddPart_Command, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
CommandParameter="{Binding Path=Name}"
ToolTip="{Binding Tag.AddPart_ToolTip, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
Style="{StaticResource BTLPartList_Button}">
<Image Source="{StaticResource AddPart_Image}"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button Command="{Binding Tag.UpdateBTL_Command, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
CommandParameter="{Binding Path=Name}"
ToolTip="{Binding Tag.UpdateBTL_ToolTip, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
Style="{StaticResource BTLPartList_Button}">
<Image Source="{StaticResource UpdateBTL_Image}"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
</StackPanel>
</Grid>
<Border Style="{StaticResource TableView_Border}">
<Grid Style="{StaticResource TableView_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<dxg:GridGroupExpandButton IsChecked="{Binding IsRowExpanded}"
Command="{Binding View.Commands.ChangeGroupExpanded}"
CommandParameter="{Binding RowHandle.Value}"/>
<TextBlock Grid.Column="1"
Text="{Binding GroupValue.Value, Converter={StaticResource ProjIdToBtlFileName}}"
Style="{StaticResource BTLPartList_TextBlock}"/>
<StackPanel Grid.Column="2"
Style="{StaticResource TableView_StackPanel}">
<Button Command="{Binding Tag.Data_Command, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
CommandParameter="{Binding Path=Name}"
ToolTip="{Binding Tag.Data_ToolTip, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
Style="{StaticResource BTLPartList_Button}">
<Image Source="{StaticResource Adjustment_Image}"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button Command="{Binding Tag.AddPart_Command, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
CommandParameter="{Binding Path=Name}"
ToolTip="{Binding Tag.AddPart_ToolTip, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
Style="{StaticResource BTLPartList_Button}">
<Image Source="{StaticResource AddPart_Image}"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button Command="{Binding Tag.UpdateBTL_Command, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
CommandParameter="{Binding Path=Name}"
ToolTip="{Binding Tag.UpdateBTL_ToolTip, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
Style="{StaticResource BTLPartList_Button}">
<Image Source="{StaticResource UpdateBTL_Image}"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
</StackPanel>
</Grid>
</Border>
</DataTemplate>
</dxg:TableView.GroupRowTemplate>
<dxg:TableView.GroupRowStyle>
<Style TargetType="dxg:GroupRowControl">
<Setter Property="Background" Value="{StaticResource Grid.Static.ExpanderDown.Background}"/>
</Style>
</dxg:TableView.GroupRowStyle>
</dxg:TableView>
</dxg:GridControl.View>
<dxg:GridControl.TotalSummary>
@@ -242,10 +223,10 @@
<ListBox.ItemsPanel>
<ItemsPanelTemplate>
<WrapPanel Orientation="Vertical"
MaxHeight="{Binding ActualHeight, RelativeSource={RelativeSource AncestorType={x:Type EgwWPFBaseLib:EgwDataGrid}},
Converter={StaticResource FractionHeightConverter},
ConverterParameter={StaticResource FeatureWrapPanelHeight}}"
MinHeight="{Binding Parent.Children[0].ActualHeight, RelativeSource={RelativeSource AncestorType={x:Type Grid}}}"/>
MaxHeight="{Binding ActualHeight, RelativeSource={RelativeSource AncestorType={x:Type EgwWPFBaseLib:EgwDataGrid}},
Converter={StaticResource FractionHeightConverter},
ConverterParameter={StaticResource FeatureWrapPanelHeight}}"
MinHeight="{Binding Parent.Children[0].ActualHeight, RelativeSource={RelativeSource AncestorType={x:Type Grid}}}"/>
</ItemsPanelTemplate>
</ListBox.ItemsPanel>
<ListBox.ContextMenu>
@@ -279,12 +260,7 @@
<ColumnDefinition Width="50"/>
<ColumnDefinition Width="40"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto" SharedSizeGroup="Feature_Grp"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto" SharedSizeGroup="Feature_Prc"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto" SharedSizeGroup="Feature_Name"/>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<TextBlock Text="{Binding nPRID}"
@@ -296,69 +272,54 @@
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Border Width="{Binding ActualHeight, RelativeSource={RelativeSource self}}"
Background="{Binding Calc_Background}"/>
Background="{Binding Calc_Background}"/>
<Grid Grid.Column="1">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<TextBlock Grid.ColumnSpan="2"
Visibility="{Binding CALC_ROT_Visibility}"
Style="{StaticResource CALC_ROTFeature_TextBlock}"/>
Visibility="{Binding CALC_ROT_Visibility}"
Style="{StaticResource CALC_ROTFeature_TextBlock}"/>
<TextBlock Grid.Column="1"
Text="{Binding CALC_ERR_Letter}"
Foreground="{Binding CALC_ERR_Foreground}"
Style="{StaticResource CALC_ERR_Letter_TextBlock}"/>
Text="{Binding CALC_ERR_Letter}"
Foreground="{Binding CALC_ERR_Foreground}"
Style="{StaticResource CALC_ERR_Letter_TextBlock}"/>
</Grid>
<TextBlock Grid.Column="2"
Visibility="{Binding bStrategy_Visibility}"
Style="{StaticResource bStrategy_TextBlock}"/>
Visibility="{Binding bStrategy_Visibility}"
Style="{StaticResource bStrategy_TextBlock}"/>
</Grid>
<CheckBox Grid.Column="2"
IsChecked="{Binding bDO, UpdateSourceTrigger=PropertyChanged}"
Style="{StaticResource BTLPartList_CheckBox}"/>
IsChecked="{Binding bDO, UpdateSourceTrigger=PropertyChanged}"
Style="{StaticResource BTLPartList_CheckBox}"/>
<TextBlock Grid.Column="3"
Text="["
Style="{StaticResource Prod_TextBlock}"/>
<TextBlock Grid.Column="4"
Text="{Binding nSelGRP}"
Style="{StaticResource Prod_TextBlock}"/>
<TextBlock Grid.Column="5"
Text="-"
Style="{StaticResource Prod_TextBlock}"/>
<TextBlock Grid.Column="6"
Text="{Binding nPRC, StringFormat={}{0:000}}"
Style="{StaticResource Prod_TextBlock}"/>
<TextBlock Grid.Column="7"
Text="] "
Style="{StaticResource Prod_TextBlock}"/>
<TextBlock Grid.Column="8"
Text="{Binding sName}"
Style="{StaticResource Name_TextBlock}"/>
<Button Grid.Column="9"
Command="{Binding EditFeature_Command}"
Click="SelectButton_Click"
Style="{StaticResource EditFeature_Button}">
Text="{Binding sFeature_Name}" TextAlignment="Justify"
Style="{StaticResource Prod_TextBlock}"/>
<Button Grid.Column="4"
Command="{Binding EditFeature_Command}"
Click="SelectButton_Click"
Style="{StaticResource EditFeature_Button}">
<Image Source="{StaticResource Edit_Image}"
Style="{StaticResource BTLDataWnd_Image}"/>
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
</Grid>
</DataTemplate>
</ListBox.ItemTemplate>
</ListBox>
<StackPanel Grid.Row="1"
Grid.Column="1"
Style="{StaticResource BTLPartList_StackPanel}">
Grid.Column="1"
Style="{StaticResource BTLPartList_StackPanel}">
<TextBlock Text="STATUS:"
Style="{StaticResource Status_TextBlock}"/>
Style="{StaticResource Status_TextBlock}"/>
<TextBlock Text="{Binding Tag.SelBTLPart.sCALC_MSG, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLPartListV}}}"
Visibility="{Binding Tag.SelBTLPart.CALC_MSG_Visibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLPartListV}}}"
Style="{StaticResource SelBTLPart_TextBlock}"/>
Visibility="{Binding Tag.SelBTLPart.CALC_MSG_Visibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLPartListV}}}"
Style="{StaticResource SelBTLPart_TextBlock}"/>
<TextBlock Text="{Binding Tag.SelBTLPart.SelBTLFeatureVM.sCALC_MSG, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLPartListV}}}"
Style="{StaticResource SelBTLPart_TextBlock}"/>
Style="{StaticResource SelBTLPart_TextBlock}"/>
</StackPanel>
</Grid>
</DataTemplate>
@@ -760,7 +721,9 @@
</Style>
</EgwWPFBaseLib:EgwDataGrid.RowStyle>
<EgwWPFBaseLib:EgwDataGrid.Resources>
--><!--PDN - Nome--><!--
-->
<!--PDN - Nome-->
<!--
<DataGridTextColumn x:Key="colPDN" Binding="{Binding nPDN}">
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
@@ -768,7 +731,9 @@
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
</DataGridTextColumn>
--><!--Validità pezzo--><!--
-->
<!--Validità pezzo-->
<!--
<DataGridTemplateColumn x:Key="colCALC" CanUserResize="False"
SortMemberPath="nGlobalState">
<DataGridTemplateColumn.CellTemplate>
@@ -808,7 +773,9 @@
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
--><!--DO - Abilitazione--><!--
-->
<!--DO - Abilitazione-->
<!--
<DataGridTemplateColumn x:Key="colDO">
<DataGridTemplateColumn.HeaderTemplate>
<DataTemplate>
@@ -823,7 +790,9 @@
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
--><!--W - Larghezza--><!--
-->
<!--W - Larghezza-->
<!--
<DataGridTextColumn x:Key="colW" Binding="{Binding sW}" SortMemberPath="dW">
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
@@ -831,7 +800,9 @@
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
</DataGridTextColumn>
--><!--H - Altezza--><!--
-->
<!--H - Altezza-->
<!--
<DataGridTextColumn x:Key="colH" Binding="{Binding sH}" SortMemberPath="dH">
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
@@ -839,7 +810,9 @@
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
</DataGridTextColumn>
--><!--L - Lunghezza--><!--
-->
<!--L - Lunghezza-->
<!--
<DataGridTextColumn x:Key="colL" Binding="{Binding sL}" SortMemberPath="dL">
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
@@ -847,7 +820,9 @@
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
</DataGridTextColumn>
--><!--NAM - Descrizione--><!--
-->
<!--NAM - Descrizione-->
<!--
<DataGridTextColumn x:Key="colNAM" Binding="{Binding sNAM}">
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
@@ -855,7 +830,9 @@
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
</DataGridTextColumn>
--><!--MAT - Materiale--><!--
-->
<!--MAT - Materiale-->
<!--
<DataGridTextColumn x:Key="colMATERIAL" Binding="{Binding sMATERIAL}">
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
@@ -863,7 +840,9 @@
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
</DataGridTextColumn>
--><!--CNT - Richiesti da BTL--><!--
-->
<!--CNT - Richiesti da BTL-->
<!--
<DataGridTextColumn x:Key="colCNT" Binding="{Binding sCNT}" SortMemberPath="nCNT">
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
@@ -872,7 +851,9 @@
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
</DataGridTextColumn>
--><!--ADDED - Aggiunti--><!--
-->
<!--ADDED - Aggiunti-->
<!--
<DataGridTextColumn x:Key="colADDED" Binding="{Binding sADDED}" SortMemberPath="nADDED">
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
@@ -886,7 +867,9 @@
</Style>
</DataGridTextColumn.EditingElementStyle>
</DataGridTextColumn>
--><!--INPROD - IN OTTIMIZZAZIONE--><!--
-->
<!--INPROD - IN OTTIMIZZAZIONE-->
<!--
<DataGridTextColumn x:Key="colINPROD" Binding="{Binding nINPROD}">
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
@@ -895,7 +878,9 @@
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
</DataGridTextColumn>
--><!--DONE - PRODOTTI--><!--
-->
<!--DONE - PRODOTTI-->
<!--
<DataGridTextColumn x:Key="colDONE" Binding="{Binding nDONE}">
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
@@ -904,7 +889,9 @@
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
</DataGridTextColumn>
--><!--GRP - Gruppo--><!--
-->
<!--GRP - Gruppo-->
<!--
<DataGridTextColumn x:Key="colGROUP" Binding="{Binding sGROUP}">
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
@@ -912,7 +899,9 @@
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
</DataGridTextColumn>
--><!--STOREY - Sottogruppo--><!--
-->
<!--STOREY - Sottogruppo-->
<!--
<DataGridTextColumn x:Key="colSTOREY" Binding="{Binding sSTOREY}">
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
@@ -920,7 +909,9 @@
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
</DataGridTextColumn>
--><!--ROT - Rotazione--><!--
-->
<!--ROT - Rotazione-->
<!--
<DataGridTemplateColumn x:Key="colROT" SortMemberPath="dROT">
<DataGridTemplateColumn.HeaderTemplate>
<DataTemplate>
@@ -949,7 +940,9 @@
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
--><!--INV - Inversione--><!--
-->
<!--INV - Inversione-->
<!--
<DataGridTemplateColumn x:Key="colFLIP">
<DataGridTemplateColumn.HeaderTemplate>
<DataTemplate>
@@ -964,7 +957,9 @@
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
--><!--VER - Verifica--><!--
-->
<!--VER - Verifica-->
<!--
<DataGridTemplateColumn x:Key="colVERIFY">
<DataGridTemplateColumn.HeaderTemplate>
<DataTemplate>
@@ -984,7 +979,9 @@
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
--><!--ADD - Aggiungi al grezzo--><!--
-->
<!--ADD - Aggiungi al grezzo-->
<!--
<DataGridTemplateColumn x:Key="colADD">
<DataGridTemplateColumn.HeaderTemplate>
<DataTemplate>
@@ -1005,7 +1002,9 @@
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
--><!--SET - Opzioni--><!--
-->
<!--SET - Opzioni-->
<!--
<DataGridTemplateColumn x:Key="colSETTING">
<DataGridTemplateColumn.HeaderTemplate>
<DataTemplate>
EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListV.xaml.vb
-2
View File
@@ -1,11 +1,9 @@
Imports System.IO
Imports System.Reflection
Imports DevExpress.Data
Imports DevExpress.Skins
Imports DevExpress.Xpf.Bars
Imports DevExpress.Xpf.Core.Serialization
Imports DevExpress.Xpf.Grid
Imports DevExpress.Xpf.Data.grids
Imports EgtBEAMWALL.Core
Public Class BTLPartListV
EgtBEAMWALL.Optimizer/MachinePanel/MachinePanelV.xaml
+1 -3
View File
@@ -88,9 +88,7 @@
</TabControl.ItemContainerStyle>
<TabItem Header="EMPTY"/>
<TabItem Header="STRATEGIES">
<StackPanel>
<OPTIMIZER:StrategyManagerV DataContext="{StaticResource StrategyManagerVM}"/>
</StackPanel>
<OPTIMIZER:StrategyManagerV DataContext="{StaticResource StrategyManagerVM}" Margin="0,0,0,-25"/>
</TabItem>
<TabItem Header="PARAMETERS">
<StackPanel Style="{StaticResource PartManager_StackPanel}">
EgtBEAMWALL.Optimizer/MainMenu/MainMenuVM.vb
+1 -1
View File
@@ -637,7 +637,7 @@ Public Class MainMenuVM
Dim bEx As Boolean = False
Try
Dim sAddressArray As String() = sSupportAddress.Split(CType(",", Char()))
Dim SendFeedbackWindow As New EgtWPFLib5.MapiMailMessage("Aedifica Feedback - " & sKey)
Dim SendFeedbackWindow As New EgtWPFLib5.MapiMailMessage("AEdifica Feedback - " & sKey)
SendFeedbackWindow.Recipients.Add(sAddressArray(0))
For index As Integer = 1 To sAddressArray.Length() - 1
SendFeedbackWindow.Recipients.Add(sAddressArray(index), EgtWPFLib5.MapiMailMessage.RecipientType.CC)
EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb
+2 -2
View File
@@ -67,5 +67,5 @@ Imports System.Windows
' Revision
'
<Assembly: AssemblyVersion("3.1.4.7")>
<Assembly: AssemblyFileVersion("3.1.4.7")>
<Assembly: AssemblyVersion("3.1.5.1")>
<Assembly: AssemblyFileVersion("3.1.5.1")>
EgtBEAMWALL.Optimizer/Panel/LeftPanelBottomV.xaml
+1 -2
View File
@@ -16,8 +16,7 @@
Style="{StaticResource Bottom_WrapPanel}">
<OPTIMIZER:InstrumentPanelV DataContext="{StaticResource InstrumentPanelVM}"/>
<OPTIMIZER:ShowPanelV DataContext="{StaticResource ShowPanelVM}"/>
<OPTIMIZER:ShowBeamPanelV DataContext="{StaticResource ShowBeamPanelVM}"
Visibility="{Binding DataContext.ShowBeamPanel_Visibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:LeftPanelBottomV}}}"/>
<OPTIMIZER:ShowBeamPanelV DataContext="{StaticResource ShowBeamPanelVM}"/>
<OPTIMIZER:ViewPanelV DataContext="{StaticResource ViewPanelVM}"/>
</WrapPanel>
EgtBEAMWALL.Optimizer/Panel/LeftPanelTopV.xaml
-1
View File
@@ -9,7 +9,6 @@
</Grid.ColumnDefinitions>
<OPTIMIZER:LeftPanelV DataContext="{StaticResource LeftPanelVM}"
Tag="{Binding DataContext.BTLStructureVM, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:LeftPanelTopV}}}"
Visibility="{Binding DataContext.LeftPanel_Visibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:LeftPanelTopV}}}"
IsEnabled="{Binding DataContext.LeftPanel_IsEnabled, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:LeftPanelTopV}}}"
Opacity="{Binding DataContext.LeftPanel_Opacity, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:LeftPanelTopV}}}"/>
EgtBEAMWALL.Optimizer/Panel/TopPanelV.xaml
+1 -2
View File
@@ -11,8 +11,7 @@
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Border Style="{StaticResource TopPanel_Border}">
<OPTIMIZER:ProdManagerV DataContext="{DynamicResource ProdManagerVM}"
Visibility="{Binding DataContext.ProdManager_Visibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:TopPanelV}}}"/>
<OPTIMIZER:ProdManagerV DataContext="{DynamicResource ProdManagerVM}"/>
</Border>
<OPTIMIZER:CalcPanelV Grid.Column="1"
EgtBEAMWALL.Optimizer/ProdManager/ProdManagerVM.vb
+9 -1
View File
@@ -4,7 +4,6 @@ Imports System.IO.Compression
Imports System.Windows.Threading
Imports EgtBEAMWALL.Core
Imports EgtBEAMWALL.DataLayer.DatabaseModels
Imports EgtBEAMWALL.Optimizer.MainMenuVM
Imports EgtUILib
Imports EgtWPFLib5
Imports Newtonsoft.Json
@@ -993,6 +992,15 @@ Public Class ProdManagerVM
' Apro finestra parametri generali
Dim GeneralParametersWndVM As New GeneralParametersWndVM(nType)
' Controllo se la cartella AiSetUp è presente
GetFirstAiSetUp(nType)
Dim sDefaultConfigFile As String = String.Empty
If EgtUILib.GetPrivateProfileString(S_STRATEGY, K_DEFAULTCONFIG, "", sDefaultConfigFile, Map.refMainWindowVM.MainWindowM.sDefaultConfig) = 0 Then
SetFirstStrategy(GeneralParametersWndVM, sDefaultConfigFile)
End If
GeneralParametersWndVM.SetbSaveGeneralParameters(True)
GeneralParametersWndVM.SaveProjectParameters()
EgtBEAMWALL.Optimizer/Project/ProjectVM.vb
+15 -76
View File
@@ -60,32 +60,6 @@ Public Class ProjectVM
End Property
Private m_bLockUX As Boolean = False
Private m_FeatureManager_Visibility As Boolean = True
Public Property FeatureManager_Visibility As Visibility
Get
Return If(m_FeatureManager_Visibility, Visibility.Visible, Visibility.Collapsed)
End Get
Set(value As Visibility)
m_FeatureManager_Visibility = (value = Visibility.Visible)
End Set
End Property
Friend Sub SetFeatureManager_Visibility(IsVisible As Boolean)
m_FeatureManager_Visibility = IsVisible
End Sub
Private m_ShowBeamPanel_Visibility As Boolean = True
Public Property ShowBeamPanel_Visibility As Visibility
Get
Return If(m_ShowBeamPanel_Visibility, Visibility.Visible, Visibility.Collapsed)
End Get
Set(value As Visibility)
m_ShowBeamPanel_Visibility = (value = Visibility.Visible)
End Set
End Property
Friend Sub SetShowBeamPanel_Visibility(IsVisible As Boolean)
m_ShowBeamPanel_Visibility = IsVisible
End Sub
Private m_FreeContourManager_Visibility As Boolean = False
Public Property FreeContourManager_Visibility As Visibility
Get
@@ -100,32 +74,6 @@ Public Class ProjectVM
NotifyPropertyChanged(NameOf(FreeContourManager_Visibility))
End Sub
Private m_ProdManager_Visibility As Boolean = True
Public Property ProdManager_Visibility As Visibility
Get
Return If(m_ProdManager_Visibility, Visibility.Visible, Visibility.Collapsed)
End Get
Set(value As Visibility)
m_ProdManager_Visibility = (value = Visibility.Visible)
End Set
End Property
Friend Sub SetProdManager_Visibility(IsVisible As Boolean)
m_ProdManager_Visibility = IsVisible
End Sub
Private m_LeftPanel_Visibility As Boolean = True
Public Property LeftPanel_Visibility As Visibility
Get
Return If(m_LeftPanel_Visibility, Visibility.Visible, Visibility.Collapsed)
End Get
Set(value As Visibility)
m_LeftPanel_Visibility = (value = Visibility.Visible)
End Set
End Property
Friend Sub SetLeftPanel_Visibility(IsVisible As Boolean)
m_LeftPanel_Visibility = IsVisible
End Sub
Private m_LeftPanel_IsEnabled As Boolean = True
Public Property LeftPanel_IsEnabled As Boolean
Get
@@ -254,7 +202,7 @@ Public Class ProjectVM
Return m_FeatureList_Visibility
End Get
End Property
Sub SetFeatureListVisibility(bVisible As Boolean)
Friend Sub SetFeatureListVisibility(bVisible As Boolean)
m_FeatureList_Visibility = If(bVisible, Visibility.Visible, Visibility.Collapsed)
NotifyPropertyChanged(NameOf(FeatureList_Visibility))
End Sub
@@ -265,7 +213,7 @@ Public Class ProjectVM
Return m_RawPartManagerVisibility
End Get
End Property
Sub SetRawPartManagerVisibility(bVisible As Boolean)
Friend Sub SetRawPartManagerVisibility(bVisible As Boolean)
m_RawPartManagerVisibility = If(bVisible, Visibility.Visible, Visibility.Collapsed)
NotifyPropertyChanged(NameOf(RawPartManagerVisibility))
End Sub
@@ -276,7 +224,7 @@ Public Class ProjectVM
Return m_StrategyManagerVisibility
End Get
End Property
Sub SetStrategyManagerVisibility(bVisible As Boolean)
Friend Sub SetStrategyManagerVisibility(bVisible As Boolean)
m_StrategyManagerVisibility = If(bVisible, Visibility.Visible, Visibility.Collapsed)
NotifyPropertyChanged(NameOf(StrategyManagerVisibility))
End Sub
@@ -287,7 +235,7 @@ Public Class ProjectVM
Return m_SceneShowBuldingVisibility
End Get
End Property
Sub SetSceneShowBuldingVisibility(bVisible As Boolean)
Friend Sub SetSceneShowBuldingVisibility(bVisible As Boolean)
m_SceneShowBuldingVisibility = If(bVisible, Visibility.Visible, Visibility.Collapsed)
NotifyPropertyChanged(NameOf(SceneShowBuldingVisibility))
End Sub
@@ -298,7 +246,7 @@ Public Class ProjectVM
Return m_ManagerTabVisibility
End Get
End Property
Sub SetManagerTabVisibility(bVisible As Boolean)
Friend Sub SetManagerTabVisibility(bVisible As Boolean)
m_ManagerTabVisibility = If(bVisible, Visibility.Visible, Visibility.Collapsed)
NotifyPropertyChanged(NameOf(ManagerTabVisibility))
End Sub
@@ -545,11 +493,6 @@ Public Class ProjectVM
End Sub
Friend Sub NotifyAllPanelVisibility()
NotifyPropertyChanged(NameOf(FeatureManager_Visibility))
NotifyPropertyChanged(NameOf(ShowBeamPanel_Visibility))
End Sub
''' <summary>
''' Funzione che permette di eliminare un pezzo modificato e reinserirlo nell'assemblato
''' </summary>
@@ -597,31 +540,26 @@ Public Class ProjectVM
For Each GeneralParameter In m_GeneralParametersList
Select Case GeneralParameter.GetType()
Case GetType(BooleanGenericParameter)
SetbSaveGeneralParameters(False)
SetGeneralParametersIsEnable(False)
SetGeneralParameters(False)
EgtRemoveInfo(PartItem.nPartId, GeneralParameter.sNameNge)
EgtRemoveInfo(PartItem.nPartId, GeneralParameter.sNameNge & "_FORCED")
Case GetType(DoubleGenericParameter)
SetbSaveGeneralParameters(False)
SetGeneralParametersIsEnable(False)
SetGeneralParameters(False)
EgtRemoveInfo(PartItem.nPartId, GeneralParameter.sNameNge)
EgtRemoveInfo(PartItem.nPartId, GeneralParameter.sNameNge & "_FORCED")
Case GetType(ComboGenericParameter)
SetbSaveGeneralParameters(False)
SetGeneralParametersIsEnable(False)
SetGeneralParameters(False)
EgtRemoveInfo(PartItem.nPartId, GeneralParameter.sNameNge)
EgtRemoveInfo(PartItem.nPartId, GeneralParameter.sNameNge & "_FORCED")
Case GetType(StringGenericParameter)
SetbSaveGeneralParameters(False)
SetGeneralParametersIsEnable(False)
SetGeneralParameters(False)
EgtRemoveInfo(PartItem.nPartId, GeneralParameter.sNameNge)
EgtRemoveInfo(PartItem.nPartId, GeneralParameter.sNameNge & "_FORCED")
Case GetType(ListGenericParameter)
For Each Item As ToolParameter In DirectCast(GeneralParameter, ListGenericParameter).ListValue
If Item.bIsActive Then
sInfo &= Item.sUUID & "," & Item.sName & ";"
SetbSaveGeneralParameters(False)
SetGeneralParametersIsEnable(False)
SetGeneralParameters(False)
EgtRemoveInfo(PartItem.nPartId, GeneralParameter.sNameNge)
End If
Next
@@ -952,11 +890,12 @@ Public Class ProjectVM
EgtSetInfo(m_BTLStructureVM.SelBTLPart.BTLPartM.nPartId, AI_SETUP, m_SelStrategySetup)
End If
End Sub
#End Region ' Methods
#Region "COMMAND"
#Region "Ottimization"
#Region "Optimizer_Command"
Public ReadOnly Property Optimizer_Command As ICommand
Get
@@ -972,9 +911,9 @@ Public Class ProjectVM
StatisticWndV.ShowDialog()
End Sub
#End Region ' Ottimization
#End Region ' Optimizer_Command
#Region "Parameter"
#Region "Parameter_Command"
Public ReadOnly Property Parameter_Command As ICommand
Get
@@ -990,7 +929,7 @@ Public Class ProjectVM
PartParametersWnd.ShowDialog()
End Sub
#End Region ' Parameter
#End Region ' Parameter_Command
#Region "Back_Command"
EgtBEAMWALL.Optimizer/Statistics/PDFHelper.vb
-1
View File
@@ -384,7 +384,6 @@ Module PDFHelper
Dim paragraph As Paragraph = section.AddParagraph(EgtMsg(62590), "Heading2")
paragraph.Format.SpaceAfter = Unit.FromMillimeter(3.0)
' Controllo se bPreview è true mostra il PDF di preview se no il PDF completo
If bPreview Then
CreateRawPartPage(section, sMachGroupList, sPDN, sW, sH, sL, sDesc, sMaterial, Nothing, bPreview)
Else
EgtBEAMWALL.Optimizer/StatisticsWnd/StatisticWndV.xaml.vb
+1 -5
View File
@@ -12,11 +12,7 @@
End Sub
Private Sub Statistic_TabControl_SelectionChanged(sender As Object, e As SelectionChangedEventArgs)
If Statistic_TabControl.SelectedIndex = 0 Then
Me.Tag = Map.refProjectVM.BTLStructureVM
Else
Me.Tag = Map.refProjectVM
End If
Me.Tag = If(Statistic_TabControl.SelectedIndex = 0, Map.refProjectVM.BTLStructureVM, Map.refProjectVM)
End Sub
Private Sub CloseWindow(bDialogResult As Boolean) Handles m_StatisticsVM.m_CloseWindow
EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerVM.vb
+1 -1
View File
@@ -1927,7 +1927,7 @@ Public Class ListStrategyParameter
End Property
Friend Sub CloseToolList()
SetAvailableToolListVisibility(True)
SetAvailableToolListVisibility(False)
SetOpenToolListIsEnable(True)
End Sub
EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml
+50
View File
@@ -4,6 +4,7 @@
xmlns:EgtBEAMWALLCore="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
xmlns:dxb="http://schemas.devexpress.com/winfx/2008/xaml/bars"
xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
xmlns:theme="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero2">
<!--#region Panel ViewModel-->
@@ -2055,6 +2056,10 @@
<Setter Property="Margin" Value="5"/>
</Style>
<Style x:Key="TableView_StackPanel" TargetType="{x:Type StackPanel}" BasedOn="{StaticResource PartManager_StackPanel}">
<Setter Property="Margin" Value="0,0,5,0"/>
</Style>
<!--#endregion PartManager-->
<!--#region OptStatistics-->
@@ -2237,6 +2242,10 @@
<Setter Property="Margin" Value="5,5,5,0"/>
</Style>
<Style x:Key="TableView_Grid" TargetType="{x:Type Grid}">
<Setter Property="VerticalAlignment" Value="Center"/>
</Style>
<!--#endregion Grid-->
<!--#region GridSplitter-->
@@ -2583,6 +2592,10 @@
</Style.Triggers>
</Style>
<Style x:Key="TableView_Border" TargetType="{x:Type Border}">
<Setter Property="Background" Value="{StaticResource Grid.Static.ExpanderDown.Background}"/>
</Style>
<!--#region TopPanel_Border-->
<Style x:Key="TopPanel_Border" TargetType="{x:Type Border}">
@@ -2712,4 +2725,41 @@
<!-- ______________________________________________________________________________________________________________________________________________ -->
<!--#region DevExpress-->
<Style x:Key="HeaderStyle" TargetType="{x:Type dxg:BaseGridHeader}">
<Setter Property="Background" Value="{StaticResource DataGridColumnHeader.Static.Main.Background}"/>
<Setter Property="Foreground" Value="{StaticResource DataGridColumnHeader.Static.Main.Foreground}"/>
<Setter Property="FontWeight" Value="Bold"/>
<Setter Property="FontSize" Value="15"/>
<Setter Property="HorizontalContentAlignment" Value="Center"/>
<Setter Property="VerticalContentAlignment" Value="Center"/>
<!--<Setter Property="dxg:BaseGridColumnHeader.ShowFilterButtonOnHover" Value="False"/>-->
</Style>
<Style x:Key="HeaderImageStyle" TargetType="{x:Type Image}">
<Setter Property="Height" Value="20"/>
<Setter Property="Stretch" Value="Uniform"/>
</Style>
<Style x:Key="RowStyle" TargetType="{x:Type dxg:RowControl}">
<Setter Property="IsEnabled" Value="{Binding Row.IsRowEnabled}"/>
<Style.Triggers>
<Trigger Property="SelectionState" Value="Selected">
<Setter Property="Background" Value="{StaticResource RowDataGrid.Selected.Background}"/>
<Setter Property="Foreground" Value="{StaticResource RowDataGrid.Selected.Foreground}"/>
<Setter Property="BorderBrush" Value="{StaticResource RowDataGrid.Selected.Border}"/>
<Setter Property="FontWeight" Value="Bold"/>
</Trigger>
<Trigger Property="dxg:GridViewBase.IsFocusedRow" Value="True">
<Setter Property="Background" Value="{StaticResource RowDataGrid.Selected.Background}"/>
<Setter Property="Foreground" Value="{StaticResource RowDataGrid.Selected.Foreground}"/>
<Setter Property="BorderBrush" Value="{StaticResource RowDataGrid.Selected.Border}"/>
<Setter Property="FontWeight" Value="Bold"/>
</Trigger>
</Style.Triggers>
</Style>
<!--#endregion DevExpress-->
</ResourceDictionary>
EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb
+2 -2
View File
@@ -70,5 +70,5 @@ Imports System.Windows
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("3.1.4.7")>
<Assembly: AssemblyFileVersion("3.1.4.7")>
<Assembly: AssemblyVersion("3.1.5.1")>
<Assembly: AssemblyFileVersion("3.1.5.1")>