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

EgtBEAMWALL 3.1.2.2;

Browse Source 
-piccola modifca a EgtColorPicker
-sistemato assemblato con nuovo pezzo
-aggiornato aggiornamento assemblato
This commit is contained in:
Demetrio Cassarino
2026-02-12 16:50:00 +01:00
parent f64b0b152b
commit 801aa5cb6e
16 changed files with 86 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EgtBEAMWALL.Core/EgtColorPicker/EgtColorPickerV.xaml.vb
+1 -1
View File
@@ -44,7 +44,7 @@ Public Class EgtColorPickerV
#Region "EVENTS"
Private Sub CloseWindow(DialogResult As MessageBoxResult) Handles m_EgtColorPickerVM.OnCloseWindow
Private Sub CloseWindow(DialogResult As Boolean) Handles m_EgtColorPickerVM.OnCloseWindow
Me.DialogResult = DialogResult
Me.Close()
End Sub
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.2.1")>
<Assembly: AssemblyFileVersion("3.1.2.1")>
<Assembly: AssemblyVersion("3.1.2.2")>
<Assembly: AssemblyFileVersion("3.1.2.2")>
EgtBEAMWALL.Core/Themes/Generic.xaml
+2 -1
View File
@@ -472,6 +472,7 @@
</Style>
<Style x:Key="EgtColorPicker_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource DialogWindow_TextBlock}">
<Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
<Setter Property="Margin" Value="5,18,5,10"/>
</Style>
@@ -1922,7 +1923,7 @@
</Style>
<Style x:Key="EgtColorPicker_UniformGrid" TargetType="{x:Type UniformGrid}">
<Setter Property="Margin" Value="10,10,10,0"/>
<Setter Property="Margin" Value="10,10,10,5"/>
</Style>
<Style x:Key="EgtManageDialog_UniformGrid" TargetType="{x:Type UniformGrid}">
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.2.1")]
[assembly: AssemblyFileVersion("3.1.2.1")]
[assembly: AssemblyVersion("3.1.2.2")]
[assembly: AssemblyFileVersion("3.1.2.2")]
EgtBEAMWALL.Optimizer/BTLPartManager/BTLPartManagerVM.vb
+16 -2
View File
@@ -351,6 +351,7 @@ Public Class BTLPartManagerVM
End If
' Eseguo cancellazione
EgtBeamSetPart(BTLPartToDelete.nPartId)
RemoveScenePart(BTLPartToDelete)
' seleziono elemento precedente
Dim Index As Integer = Map.refProjectVM.BTLStructureVM.BTLPartVMList.IndexOf(BTLPartToDelete)
Dim FilteredIndex As Integer = Map.refProjectVM.BTLStructureVM.BTLPartVMList_View.IndexOf(BTLPartToDelete)
@@ -378,6 +379,21 @@ Public Class BTLPartManagerVM
End If
End Sub
Private Sub RemoveScenePart(BTLPartToDelete As BTLPartVM)
' Rimuovo pezzo dalla scena
Dim IdAsseBase As Integer = Map.refProdManagerVM.ListProjAsseBase(BTLPartToDelete.nPROJ)
' Setto il nuovo contesto
EgtSetCurrentContext(Map.refSceneShowBuldingVM.SceneShowBulding.GetCtx())
If EgtBeamGetBuildingIsOn(IdAsseBase) Then EgtBeamShowBuilding(IdAsseBase, False)
Dim DeletePartId As Integer = Map.refSceneShowBuldingVM.MapInfo(BTLPartToDelete.nPartId)
EgtErase(DeletePartId)
Map.refSceneShowBuldingVM.MapInfo.Remove(BTLPartToDelete.nPartId)
EgtBeamShowBuilding(IdAsseBase, True)
EgtZoom(ZM.ALL)
' Ritorno al contesto corrente
EgtSetCurrentContext(Map.refSceneHostVM.MainScene.GetCtx())
End Sub
#End Region ' RemovePart
#Region "SimulateCommand"
@@ -463,8 +479,6 @@ Public Class BTLPartManagerVM
Public Sub ResetCalc()
If IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.BTLStructureVM) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM) Then Return
Map.refMyStatusBarVM.SetLoadingProgress(0)
Map.refMyStatusBarVM.SetOutputMessage("")
Map.refShowBeamPanelVM.ShowBuilding_IsEnabled = True
Dim SelPart As BTLPartVM = Map.refProjectVM.BTLStructureVM.SelBTLPart
If IsNothing(SelPart) Then Return
EgtBEAMWALL.Optimizer/BTLViewModel/BTLPartVM.vb
+1 -7
View File
@@ -2329,15 +2329,11 @@ Public Class BTLPartVM
Private Function SelectColor(Col As Color3d, ByRef NewCol As Color3d) As Boolean
' Creo dialogo colori
'Dim ColorDlg As New System.Windows.Forms.ColorDialog With {
' .FullOpen = True,
' .Color = Col.ToColor()
'}
Dim ColorDlg As New EgtColorPickerV(Application.Current.MainWindow, New EgtColorPickerVM()) With {
.Color = Col.ToColor()
}
' Visualizzo dialogo
If ColorDlg.ShowDialog() <> Forms.DialogResult.OK Then Return False
If ColorDlg.ShowDialog() = False Then Return False
' Recupero colore scelto
NewCol.FromColor(ColorDlg.Color)
Return True
@@ -2379,8 +2375,6 @@ Public Class BTLPartVM
Friend Sub Verify()
If IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.BTLStructureVM) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM) Then Return
Map.refMyStatusBarVM.SetLoadingProgress(0)
Map.refMyStatusBarVM.SetOutputMessage("")
Map.refCALCPanelVM.Verify(ProjectType.PROJ)
Return
End Sub
EgtBEAMWALL.Optimizer/BTLViewModel/BTLStructureVM.vb
+6 -6
View File
@@ -148,18 +148,18 @@ Public Class BTLStructureVM
' Mostro le strategie forzate
Dim bValue As Boolean = False
Dim bValueForced As Boolean = False
For Each FeatureParam In SelBTLPart.BTLFeatureVMList
For Each FeatureParam As BTLFeatureVM In SelBTLPart.BTLFeatureVMList
bValue = False
EgtGetInfo(FeatureParam.nFeatureId, ConstBeam.STRATEGY & FeatureParam.nFeatureId & "_FORCED", bValue)
If bValue Then
SelBTLPart.SetStrategyModify_Visibility(Visibility.Visible)
FeatureParam.SetbStrategy_Visibility(Visibility.Visible)
End If
For Each StrategySetupParam In Map.refStrategyManagerVM.StrategySetupList
For Each StrategyFeatureParam In StrategySetupParam.StrategyFeatureList
For Each TopologyParam In StrategyFeatureParam.TopologyList
For Each StrategyParam In TopologyParam.StrategyList
For Each Param In StrategyParam.ParameterList
For Each StrategySetupParam As StrategySetup In Map.refStrategyManagerVM.StrategySetupList
For Each StrategyFeatureParam As StrategyFeature In StrategySetupParam.StrategyFeatureList
For Each TopologyParam As Topology In StrategyFeatureParam.TopologyList
For Each StrategyParam As Strategy In TopologyParam.StrategyList
For Each Param As StrategyParameter In StrategyParam.ParameterList
bValueForced = False
EgtGetInfo(FeatureParam.nFeatureId, StrategyParam.sStrategyId & "_" & Param.sNameNge & "_FORCED", bValueForced)
If bValueForced Then FeatureParam.SetbStrategy_Visibility(Visibility.Visible)
EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListV.xaml
-2
View File
@@ -52,8 +52,6 @@
Style="{StaticResource BTLPartList_Expander}">
<Expander.Header>
<StackPanel Style="{StaticResource PartManager_StackPanel}">
<!--<TextBlock Text="{Binding Path=Name}"
Style="{StaticResource BTLPartList_TextBlock}"/>-->
<TextBlock Text="{Binding Path=Name, Converter={StaticResource ProjIdToBtlFileName}}"
Style="{StaticResource BTLPartList_TextBlock}"/>
<Button Command="{Binding Tag.Data_Command, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
EgtBEAMWALL.Optimizer/LeftPanel/LeftPanelVM.vb
-4
View File
@@ -216,8 +216,6 @@ Public Class LeftPanelVM
If (IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.BTLStructureVM) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM)) Then Return
' imposto flag per calcolo
Map.refCALCPanelVM.SetCalculating(True)
Map.refMyStatusBarVM.SetLoadingProgress(0)
Map.refMyStatusBarVM.SetOutputMessage("")
For PartIndex As Integer = 0 To Map.refProjectVM.BTLStructureVM.BTLPartVMList.Count - 1
Map.refProjectVM.BTLStructureVM.BTLPartVMList(PartIndex).SetIsRowEnabled(False)
Next
@@ -328,8 +326,6 @@ Public Class LeftPanelVM
Public Sub ResetCalc()
If (IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.BTLStructureVM) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM)) Then Return
Map.refMyStatusBarVM.SetLoadingProgress(0)
Map.refMyStatusBarVM.SetOutputMessage("")
Map.refShowBeamPanelVM.ShowBuilding_IsEnabled = True
For Each Part In Map.refProjectVM.BTLStructureVM.BTLPartVMList
If Part.nGlobalState <> CalcStates.NOTCALCULATED Then
EgtBEAMWALL.Optimizer/MachGroupPanel/MyMachGroupVM.vb
-4
View File
@@ -969,8 +969,6 @@ Public Class MyMachGroupVM
Friend Sub Verify()
If ((IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.BTLStructureVM) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM))) Then Return
Map.refMyStatusBarVM.SetLoadingProgress(0)
Map.refMyStatusBarVM.SetOutputMessage("")
Map.refCALCPanelVM.Verify(ProjectType.PROD)
Return
End Sub
@@ -1249,8 +1247,6 @@ Public Class MyMachGroupVM
Public Sub ResetCalc()
If ((IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.BTLStructureVM) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM))) Then Return
Map.refMyStatusBarVM.SetLoadingProgress(0)
Map.refMyStatusBarVM.SetOutputMessage("")
Map.refShowBeamPanelVM.ShowBuilding_IsEnabled = True
Dim SelMachGroup As MyMachGroupVM = Map.refMachGroupPanelVM.SelectedMachGroup
If IsNothing(SelMachGroup) Then Return
EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb
+2 -2
View File
@@ -67,5 +67,5 @@ Imports System.Windows
' Revision
'
<Assembly: AssemblyVersion("3.1.2.1")>
<Assembly: AssemblyFileVersion("3.1.2.1")>
<Assembly: AssemblyVersion("3.1.2.2")>
<Assembly: AssemblyFileVersion("3.1.2.2")>
EgtBEAMWALL.Optimizer/ProdManager/ProdManagerVM.vb
+32
View File
@@ -1080,6 +1080,9 @@ Public Class ProdManagerVM
Map.refProjectVM.BTLStructureVM = New BTLStructureVM(BTLStructureM.CreateBTLStructure(0))
CopyBuilding()
' Controllo se ci sono strategie forzate
ForcedStrategy(Map.refProjectVM.BTLStructureVM.BTLPartVMList)
If IsNothing(Map.refProjectVM.BTLStructureVM) Then
m_MruFiles.Remove(sFilePath)
If Not IsNothing(ProjectManagerVM.CurrProd) AndAlso sFilePath <> ProjectManagerVM.CurrProd.sProdPath Then
@@ -1385,6 +1388,35 @@ Public Class ProdManagerVM
EgtSetCurrentContext(Map.refSceneHostVM.MainScene.GetCtx())
End Sub
Private Sub ForcedStrategy(BTLPartVMList As ObservableCollection(Of BTLPartVM))
' Mostro le strategie forzate
Dim bValue As Boolean = False
Dim bValueForced As Boolean = False
For Each BTLPartParam As BTLPartVM In BTLPartVMList
For Each FeatureParam As BTLFeatureVM In BTLPartParam.BTLFeatureVMList
bValue = False
EgtGetInfo(FeatureParam.nFeatureId, ConstBeam.STRATEGY & FeatureParam.nFeatureId & "_FORCED", bValue)
If bValue Then
BTLPartParam.SetStrategyModify_Visibility(Visibility.Visible)
FeatureParam.SetbStrategy_Visibility(Visibility.Visible)
End If
For Each StrategySetupParam As StrategySetup In Map.refStrategyManagerVM.StrategySetupList
For Each StrategyFeatureParam As StrategyFeature In StrategySetupParam.StrategyFeatureList
For Each TopologyParam As Topology In StrategyFeatureParam.TopologyList
For Each StrategyParam As Strategy In TopologyParam.StrategyList
For Each Param As StrategyParameter In StrategyParam.ParameterList
bValueForced = False
EgtGetInfo(FeatureParam.nFeatureId, StrategyParam.sStrategyId & "_" & Param.sNameNge & "_FORCED", bValueForced)
If bValueForced Then FeatureParam.SetbStrategy_Visibility(Visibility.Visible)
Next
Next
Next
Next
Next
Next
Next
End Sub
#End Region ' Methods
#Region "COMMANDS"
EgtBEAMWALL.Optimizer/Project/ProjectVM.vb
+20 -9
View File
@@ -547,21 +547,32 @@ Public Class ProjectVM
''' </summary>
Friend Sub UpdatePart()
Dim IdAsseBase As Integer = Map.refProdManagerVM.ListProjAsseBase(Map.refProjectVM.BTLStructureVM.SelBTLPart.nPROJ)
Dim IdPart As Integer = Map.refSceneShowBuldingVM.MapInfo(Map.refProjectVM.BTLStructureVM.SelBTLPart.BTLPartM.nPartId)
Dim IdPart As Integer = 0
Dim NewId As Integer = 0
' Setto il nuovo contesto
EgtSetCurrentContext(Map.refSceneShowBuldingVM.SceneShowBulding.GetCtx())
If EgtBeamGetBuildingIsOn(IdAsseBase) Then EgtBeamShowBuilding(IdAsseBase, False)
If Map.refSceneShowBuldingVM.MapInfo.TryGetValue(Map.refProjectVM.BTLStructureVM.SelBTLPart.BTLPartM.nPartId, IdPart) Then
EgtErase(IdPart)
If EgtBeamGetBuildingIsOn(IdAsseBase) Then EgtBeamShowBuilding(IdAsseBase, False)
Dim NewId As Integer = EgtCopyEx(Map.refSceneHostVM.MainScene.GetCtx(), Map.refProjectVM.BTLStructureVM.SelBTLPart.BTLPartM.nPartId, Map.refSceneShowBuldingVM.SceneShowBulding.GetCtx(), 0)
EgtErase(IdPart)
EgtChangeId(NewId, IdPart)
EgtBeamCalcSolid(IdPart)
EgtBeamShowSolid(IdPart, True)
EgtBeamShowBuilding(IdAsseBase, True)
NewId = EgtCopyEx(Map.refSceneHostVM.MainScene.GetCtx(), Map.refProjectVM.BTLStructureVM.SelBTLPart.BTLPartM.nPartId, Map.refSceneShowBuldingVM.SceneShowBulding.GetCtx(), 0)
EgtChangeId(NewId, IdPart)
EgtBeamCalcSolid(IdPart)
EgtBeamShowSolid(IdPart, True)
EgtBeamShowBuilding(IdAsseBase, True)
Else
NewId = EgtCopyEx(Map.refSceneHostVM.MainScene.GetCtx(), Map.refProjectVM.BTLStructureVM.SelBTLPart.BTLPartM.nPartId, Map.refSceneShowBuldingVM.SceneShowBulding.GetCtx(), 0)
Map.refSceneShowBuldingVM.MapInfo.Add(Map.refProjectVM.BTLStructureVM.SelBTLPart.BTLPartM.nPartId, NewId)
EgtBeamCalcSolid(NewId)
EgtBeamShowSolid(NewId, True)
EgtZoom(ZM.ALL)
End If
' Ritorno al contesto corrente
EgtSetCurrentContext(Map.refSceneHostVM.MainScene.GetCtx())
EgtBEAMWALL.Optimizer/RawPartManager/RawPartManagerVM.vb
-4
View File
@@ -776,8 +776,6 @@ Public Class RawPartManagerVM
Friend Sub VerifyAll()
If ((IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.BTLStructureVM) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM))) Then Return
Map.refCALCPanelVM.SetCalculating(True)
Map.refMyStatusBarVM.SetLoadingProgress(0)
Map.refMyStatusBarVM.SetOutputMessage("")
For PartIndex = 0 To Map.refMachGroupPanelVM.MachGroupVMList.Count - 1
DirectCast(Map.refMachGroupPanelVM.MachGroupVMList(PartIndex), MyMachGroupVM).SetIsRowEnabled(False)
Next
@@ -800,8 +798,6 @@ Public Class RawPartManagerVM
Public Sub ResetCalc()
If IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.BTLStructureVM) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM) Then Return
Map.refMyStatusBarVM.SetLoadingProgress(0)
Map.refMyStatusBarVM.SetOutputMessage("")
Map.refShowBeamPanelVM.ShowBuilding_IsEnabled = True
For Each MachGroup As MyMachGroupVM In Map.refProjectVM.MachGroupPanelVM.MachGroupVMList
If MachGroup.nProduction_State >= ItemState.Assigned Then Continue For
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.2.1")>
<Assembly: AssemblyFileVersion("3.1.2.1")>
<Assembly: AssemblyVersion("3.1.2.2")>
<Assembly: AssemblyFileVersion("3.1.2.2")>
ExtLibs/EgtWPFLib5.dll
BIN
View File
Binary file not shown.