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

Optimizer 2.7.11.96

Browse Source 
-modifica su pulsanti di importazione, salvataggo e apertura
This commit is contained in:
Demetrio Cassarino
2025-11-21 14:55:31 +01:00
parent 7ed7ad27ee
commit 9e4ed436ab
16 changed files with 174 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EgtBEAMWALL.Optimizer/BTLViewModel/BTLPartVM.vb
+3 -1
View File
@@ -1567,6 +1567,9 @@ Public Class BTLPartVM
' EgtDeselectAll()
End If
If Not IsNothing(Map.refFeatureListManagerVM) Then Map.refFeatureListManagerVM.FeatureSelectionChanged()
Map.refProdManagerVM.SetBtlImage("pack://application:,,,/Resources/NewPage/down.png")
Map.refProdManagerVM.SetOpenImage("pack://application:,,,/Resources/NewPage/down.png")
Map.refProdManagerVM.SetSaveImage("pack://application:,,,/Resources/NewPage/down.png")
EgtDraw()
NotifyPropertyChanged(NameOf(SelBTLFeatureVM))
' se modalità building, la tolgo
@@ -1576,7 +1579,6 @@ Public Class BTLPartVM
Map.refShowBeamPanelVM.SetShowBuilding(False)
Map.refProjectVM.SetManagerTabVisibility(Visibility.Visible)
If Not IsNothing(Map.refProjectVM.MachGroupPanelVM) Then Map.refProjectVM.SetFeatureListVisibility(Visibility.Visible)
End If
End Set
End Property
EgtBEAMWALL.Optimizer/BTLViewModel/BTLStructureVM.vb
+3
View File
@@ -208,6 +208,9 @@ Public Class BTLStructureVM
Map.refShowBeamPanelVM.bShowAll = False
Core.ViewPanelVM.BWSetView(If(Core.ViewPanelVM.Type = BWType.BEAM, VT.ISO_SW, VT.TOP), False)
EgtZoom(ZM.ALL)
Map.refProdManagerVM.SetBtlImage("pack://application:,,,/Resources/NewPage/down.png")
Map.refProdManagerVM.SetOpenImage("pack://application:,,,/Resources/NewPage/down.png")
Map.refProdManagerVM.SetSaveImage("pack://application:,,,/Resources/NewPage/down.png")
NotifyPropertyChanged(NameOf(SelBTLPart))
If Not bIsReselect AndAlso m_SelBTLParts.Count = 1 Then
BtlPart.SetOpenFeatureList(True)
EgtBEAMWALL.Optimizer/EgtBEAMWALL.Optimizer.vbproj
+21 -1
View File
@@ -945,7 +945,9 @@
<Resource Include="Resources\ViewPanel\ZoomIn.png" />
<Resource Include="Resources\ViewPanel\ZoomOut.png" />
</ItemGroup>
<ItemGroup />
<ItemGroup>
<Resource Include="Resources\NewPage\down.png" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="BouncyCastle">
<Version>1.8.5</Version>
@@ -1116,6 +1118,24 @@
<ItemGroup>
<Resource Include="Resources\NewPage\adjustment.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\NewPage\up.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\NewPage\openfolder.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\NewPage\fileimport.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\NewPage\newdocument.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\NewPage\export.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\NewPage\import.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
<PropertyGroup>
<PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\EgtBEAMWALL\EgtBEAMWALL.OptimizerR32.exe
EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb
+2 -2
View File
@@ -67,5 +67,5 @@ Imports System.Windows
' Revision
'
<Assembly: AssemblyVersion("2.7.11.6")>
<Assembly: AssemblyFileVersion("2.7.11.5")>
<Assembly: AssemblyVersion("2.7.11.7")>
<Assembly: AssemblyFileVersion("2.7.11.7")>
EgtBEAMWALL.Optimizer/ProdManager/ProdManagerV.xaml
+93 -58
View File
@@ -4,95 +4,130 @@
IsEnabled="{Binding OnlyProdManager_IsEnabled}"
Style="{StaticResource OnlyProdPartManager_StackPanel}">
<!--Barra superiore dei comandi-->
<Button Command="{Binding ShowPopUpStartBtnCommand}"
Name="StartBtn" Margin="0,0,2.5,0"
Style="{StaticResource ToolBarOnlyProdManagerNew_Button}">
<Image Source="/Resources/NewPage/play.png" Stretch="Uniform"/>
</Button>
<Border CornerRadius="5"
BorderThickness="2"
BorderBrush="{StaticResource BeamWall_Teal}"
Background="{StaticResource BeamWall_Teal}">
<StackPanel Style="{StaticResource OnlyProdPartManager_StackPanel}">
<Button Command="{Binding ImportBTL_Command}"
ToolTip="{Binding ImportBTL_ToolTip}"
Width="50"
Style="{StaticResource ToolBarOnlyProdManagerNew_Button}">
<Image Source="/Resources/NewPage/fileimport.png" Stretch="Fill"/>
</Button>
<Button Name="ImportBtn"
Command="{Binding ShowPopUpStartBtnCommand}"
Height="30" Width="15"
Style="{StaticResource ToolBarOnlyProdManagerNew_Button}">
<Image Source="{Binding BtlImage}" Stretch="Uniform"/>
</Button>
</StackPanel>
</Border>
<Popup IsOpen="{Binding IsStartBtnOpen}"
AllowsTransparency="True"
PopupAnimation="Scroll"
StaysOpen="False"
PlacementTarget="{Binding ElementName=StartBtn}">
<StackPanel Orientation="Vertical">
<Button Command="{Binding New_Command}"
ToolTip="{Binding NewToolTip}"
Style="{StaticResource ToolBarOnlyProdManagerNew_Button}">
<Image Source="/Resources/ProjectManager/New.png" Stretch="Uniform"/>
</Button>
PlacementTarget="{Binding ElementName=ImportBtn}">
<Border CornerRadius="5"
BorderThickness="2"
BorderBrush="{StaticResource BeamWall_Teal}"
Background="{StaticResource BeamWall_FountainBlue}">
<StackPanel Orientation="Vertical">
<Button Command="{Binding New_Command}"
ToolTip="{Binding NewToolTip}"
Style="{StaticResource OnlyProdLeftPanel_Button}">
<Image Source="/Resources/NewPage/newdocument.png" Stretch="Uniform"/>
</Button>
<Button Command="{Binding AddProj_Command}"
ToolTip="{Binding AddProj_ToolTip}"
Visibility="{Binding AddProj_Visibility}"
Style="{StaticResource OnlyProdLeftPanel_Button}">
<Image Source="/Resources/ProjectManager/AddProj.png" Stretch="Uniform"/>
</Button>
</StackPanel>
</Border>
</Popup>
<Border CornerRadius="5" Margin="10,0,0,0"
BorderThickness="2"
BorderBrush="{StaticResource BeamWall_Teal}"
Background="{StaticResource BeamWall_Teal}">
<StackPanel Style="{StaticResource OnlyProdPartManager_StackPanel}">
<Button Command="{Binding OpenCommand}"
ToolTip="{Binding OpenToolTip}"
ContextMenuService.Placement="Bottom"
ContextMenuService.Placement="Bottom"
Tag="{Binding}"
Style="{StaticResource ToolBarOnlyProdManager_Button}">
Style="{StaticResource ToolBarOnlyProdManagerNew_Button}">
<Button.ContextMenu>
<ContextMenu ItemsSource="{Binding MruFileNames}">
<ContextMenu.Resources>
<Style TargetType="{x:Type MenuItem}">
<Setter Property="Command"
Value="{Binding PlacementTarget.Tag.OpenMruFileCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}" />
Value="{Binding PlacementTarget.Tag.OpenMruFileCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}" />
<Setter Property="CommandParameter" Value="{Binding}" />
</Style>
</ContextMenu.Resources>
</ContextMenu>
</Button.ContextMenu>
<Image Source="/Resources/ProjectManager/Open.png" Stretch="Uniform"/>
<Image Source="/Resources/NewPage/openfolder.png" Stretch="Uniform"/>
</Button>
<Button Command="{Binding ImportBTL_Command}"
ToolTip="{Binding ImportBTL_ToolTip}"
Style="{StaticResource ToolBarOnlyProdManager_Button}">
<Image Source="/Resources/ProjectManager/ImportBTL.png" Stretch="Uniform"/>
</Button>
<Button Command="{Binding ImportProject_Command}"
ToolTip="{Binding ImportProject_ToolTip}"
Style="{StaticResource ToolBarOnlyProdManager_Button}">
<Image Source="/Resources/ProjectManager/ImportProject.png" Stretch="Uniform"/>
<Button Name="OpenBtn"
Command="{Binding ShowPopUpSaveBtnCommand}"
Height="30" Width="15"
Style="{StaticResource ToolBarOnlyProdManagerNew_Button}">
<Image Source="{Binding OpenImage}" Stretch="Uniform"/>
</Button>
</StackPanel>
</Popup>
<Button Command="{Binding ShowPopUpSaveBtnCommand}"
Name="SaveBtn" Margin="0,0,2.5,0"
Style="{StaticResource ToolBarOnlyProdManagerNew_Button}">
<Image Source="/Resources/NewPage/diskette.png" Stretch="Uniform"/>
</Button>
</Border>
<Popup IsOpen="{Binding IsSaveBtnOpen}"
AllowsTransparency="True"
PopupAnimation="Scroll"
StaysOpen="False"
PlacementTarget="{Binding ElementName=SaveBtn}">
<StackPanel Orientation="Vertical">
<Button Command="{Binding SaveCommand}"
ToolTip="{Binding SaveToolTip}"
Style="{StaticResource ToolBarOnlyProdManager_Button}">
<Image Source="/Resources/ProjectManager/Save.png" Stretch="Uniform"/>
PlacementTarget="{Binding ElementName=OpenBtn}">
<Border CornerRadius="5"
BorderThickness="2"
BorderBrush="{StaticResource BeamWall_Teal}"
Background="{StaticResource BeamWall_FountainBlue}">
<Button Command="{Binding ImportProject_Command}"
ToolTip="{Binding ImportProject_ToolTip}"
Style="{StaticResource OnlyProdLeftPanel_Button}">
<Image Source="/Resources/NewPage/import.png" Stretch="Uniform"/>
</Button>
<Button Command="{Binding ExportProject_Command}"
ToolTip="{Binding ExportProject_ToolTip}"
Style="{StaticResource ToolBarOnlyProdManager_Button}">
<Image Source="/Resources/ProjectManager/ExportProject.png" Stretch="Uniform"/>
</Button>
</StackPanel>
</Border>
</Popup>
<Button Command="{Binding ShowPopUpBtlBtnCommand}"
Name="BtlBtn"
Style="{StaticResource ToolBarOnlyProdManagerNew_Button}">
<Image Source="/Resources/NewPage/add.png" Stretch="Uniform"/>
</Button>
<Border CornerRadius="5" Margin="10,0,0,0"
BorderThickness="2"
BorderBrush="{StaticResource BeamWall_Teal}"
Background="{StaticResource BeamWall_Teal}">
<StackPanel Style="{StaticResource OnlyProdPartManager_StackPanel}">
<Button Command="{Binding ShowPopUpSaveBtnCommand}"
Style="{StaticResource ToolBarOnlyProdManagerNew_Button}">
<Image Source="/Resources/NewPage/diskette.png" Stretch="Uniform"/>
</Button>
<Button Name="SaveBtn"
Command="{Binding ShowPopUpBtlBtnCommand}"
Height="30" Width="15"
Style="{StaticResource ToolBarOnlyProdManagerNew_Button}">
<Image Source="{Binding SaveImage}" Stretch="Uniform"/>
</Button>
</StackPanel>
</Border>
<Popup IsOpen="{Binding IsBtlBtnOpen}"
AllowsTransparency="True"
PopupAnimation="Scroll"
StaysOpen="False"
PlacementTarget="{Binding ElementName=BtlBtn}">
<StackPanel Orientation="Vertical">
<Button Command="{Binding AddProj_Command}"
ToolTip="{Binding AddProj_ToolTip}"
Visibility="{Binding AddProj_Visibility}"
Style="{StaticResource ToolBarOnlyProdManager_Button}">
<Image Source="/Resources/ProjectManager/AddProj.png" Stretch="Uniform"/>
PlacementTarget="{Binding ElementName=SaveBtn}">
<Border CornerRadius="5"
BorderThickness="2"
BorderBrush="{StaticResource BeamWall_Teal}"
Background="{StaticResource BeamWall_FountainBlue}">
<Button Command="{Binding ExportProject_Command}"
ToolTip="{Binding ExportProject_ToolTip}"
Style="{StaticResource OnlyProdLeftPanel_Button}">
<Image Source="/Resources/NewPage/export.png" Stretch="Uniform"/>
</Button>
</StackPanel>
</Border>
</Popup>
</StackPanel>
EgtBEAMWALL.Optimizer/ProdManager/ProdManagerVM.vb
+49
View File
@@ -175,6 +175,39 @@ Public Class ProdManagerVM
End Set
End Property
Private m_BtlImage As String = "pack://application:,,,/Resources/NewPage/down.png"
Public ReadOnly Property BtlImage As String
Get
Return m_BtlImage
End Get
End Property
Friend Sub SetBtlImage(value As String)
m_BtlImage = value
NotifyPropertyChanged(NameOf(BtlImage))
End Sub
Private m_OpenImage As String = "pack://application:,,,/Resources/NewPage/down.png"
Public ReadOnly Property OpenImage As String
Get
Return m_OpenImage
End Get
End Property
Friend Sub SetOpenImage(value As String)
m_OpenImage = value
NotifyPropertyChanged(NameOf(OpenImage))
End Sub
Private m_SaveImage As String = "pack://application:,,,/Resources/NewPage/down.png"
Public ReadOnly Property SaveImage As String
Get
Return m_SaveImage
End Get
End Property
Friend Sub SetSaveImage(value As String)
m_SaveImage = value
NotifyPropertyChanged(NameOf(SaveImage))
End Sub
' Definizione comandi
Private m_cmdNew As ICommand
Private m_cmdOpen As ICommand
@@ -1415,6 +1448,7 @@ Public Class ProdManagerVM
End Property
Public Sub NewProject()
SetBtlImage("pack://application:,,,/Resources/NewPage/down.png")
CreateNewProd(False)
Return
End Sub
@@ -1522,6 +1556,7 @@ Public Class ProdManagerVM
End Property
Public Function ExportProject(Optional sExportFileName As String = Nothing) As String
SetSaveImage("pack://application:,,,/Resources/NewPage/down.png")
If ProdFileVM.VerifyProjectModification(CurrProd) = MessageBoxResult.Cancel Then Return Nothing
If IsNothing(CurrProd) Then Return Nothing
@@ -1613,6 +1648,7 @@ Public Class ProdManagerVM
End Property
Public Sub ImportProject()
SetOpenImage("pack://application:,,,/Resources/NewPage/down.png")
Dim TempCurrProd As ProjectFileVM = CurrProd
' lista di tutti gli errori riscontrati
Dim ErrorList As New List(Of String)
@@ -1877,6 +1913,7 @@ Public Class ProdManagerVM
End Property
Public Sub AddProj()
SetBtlImage("pack://application:,,,/Resources/NewPage/down.png")
If Not CreateNewProj(CurrProd, 0) Then
MessageBox.Show("Errore! Aggiunta file fallita!")
End If
@@ -2056,8 +2093,12 @@ Public Class ProdManagerVM
Public Sub ShowPopUpStartBtn(ByVal param As Object)
If m_IsStartBtnOpen Then
SetBtlImage("pack://application:,,,/Resources/NewPage/down.png")
SetOpenImage("pack://application:,,,/Resources/NewPage/up.png")
SetSaveImage("pack://application:,,,/Resources/NewPage/up.png")
SetIsStartBtnOpen(False)
Else
SetBtlImage("pack://application:,,,/Resources/NewPage/up.png")
SetIsStartBtnOpen(True)
End If
End Sub
@@ -2077,8 +2118,12 @@ Public Class ProdManagerVM
Public Sub ShowPopUpSaveBtn(ByVal param As Object)
If m_IsSaveBtnOpen Then
SetOpenImage("pack://application:,,,/Resources/NewPage/down.png")
SetSaveImage("pack://application:,,,/Resources/NewPage/up.png")
SetBtlImage("pack://application:,,,/Resources/NewPage/up.png")
SetIsSaveBtnOpen(False)
Else
SetOpenImage("pack://application:,,,/Resources/NewPage/up.png")
SetIsSaveBtnOpen(True)
End If
End Sub
@@ -2098,8 +2143,12 @@ Public Class ProdManagerVM
Public Sub ShowPopUpBtlBtn(ByVal param As Object)
If m_IsBtlBtnOpen Then
SetSaveImage("pack://application:,,,/Resources/NewPage/down.png")
SetOpenImage("pack://application:,,,/Resources/NewPage/up.png")
SetBtlImage("pack://application:,,,/Resources/NewPage/up.png")
SetIsBtlBtnOpen(False)
Else
SetSaveImage("pack://application:,,,/Resources/NewPage/up.png")
SetIsBtlBtnOpen(True)
End If
End Sub
EgtBEAMWALL.Optimizer/Resources/NewPage/SaveModify.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 963 B

After

Width:  |  Height:  |  Size: 899 B

EgtBEAMWALL.Optimizer/Resources/NewPage/down.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

EgtBEAMWALL.Optimizer/Resources/NewPage/export.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

EgtBEAMWALL.Optimizer/Resources/NewPage/fileimport.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

EgtBEAMWALL.Optimizer/Resources/NewPage/import.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

EgtBEAMWALL.Optimizer/Resources/NewPage/newdocument.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1003 B

EgtBEAMWALL.Optimizer/Resources/NewPage/openfolder.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

EgtBEAMWALL.Optimizer/Resources/NewPage/up.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerV.xaml
+1 -1
View File
@@ -40,7 +40,7 @@
ToolTip="{Binding NewToolTip}"
Margin="10,0,10,0"
Style="{StaticResource SaveOptionPanel_Button}">
<Image Source="/Resources/ProjectManager/New.png" Stretch="Uniform"/>
<Image Source="/Resources/NewPage/newdocument.png" Stretch="Uniform"/>
</Button>
<Button Command="{Binding OpenFileNameCustomConfigCommand}"
ToolTip="{Binding SaveAsToolTip}"
EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerVM.vb
+2 -2
View File
@@ -110,13 +110,13 @@ Public Class StrategyManagerVM
If m_bIsModifyStrategy Then
SetSaveImage("pack://application:,,,/Resources/NewPage/SaveModify.png")
Else
SetSaveImage("pack://application:,,,/Resources/ProjectManager/Save.png")
SetSaveImage("pack://application:,,,/Resources/NewPage/diskette.png")
End If
NotifyPropertyChanged(NameOf(bIsModifyStrategy))
End Sub
' Immagine SaveCommand
Private m_SaveImage As String = "pack://application:,,,/Resources/ProjectManager/Save.png"
Private m_SaveImage As String = "pack://application:,,,/Resources/NewPage/diskette.png"
Public ReadOnly Property SaveImage As String
Get
Return m_SaveImage