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

Optimizer 2.7.11.23

Browse Source 
-sistemato errore assemza chiave
-aggiunto evidenziazione feature in trave
This commit is contained in:
Demetrio Cassarino
2025-12-22 16:57:36 +01:00
parent b128b56c4b
commit bf08cf4f86
19 changed files with 25 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EgtBEAMWALL.Core/EgtColorPicker/EgtColorPickerV.xaml.vb
+2 -3
View File
@@ -1,6 +1,5 @@
Imports EgtWPFLib5
Imports System.Windows
Imports System.Windows.Forms
Public Class EgtColorPickerV
@@ -8,7 +7,7 @@ Public Class EgtColorPickerV
Private WithEvents m_EgtColorPickerVM As EgtColorPickerVM
Private Shadows DialogResult As DialogResult
Private Shadows DialogResult As Boolean
Public Property CustomColors As Integer()
Get
@@ -58,7 +57,7 @@ Public Class EgtColorPickerV
''' Apre una finestra EgtColorPicker
''' </summary>
''' <returns></returns>
Public Overloads Function ShowDialog() As DialogResult
Public Overloads Function ShowDialog() As Boolean
MyBase.ShowDialog()
Return Me.DialogResult
End Function
EgtBEAMWALL.Core/MachGroupPanel/PartVM.vb
+5
View File
@@ -195,9 +195,14 @@ Public MustInherit Class PartVM
Return m_SelFeatureVM
End Get
Set(value As BTLFeatureVM)
If Not IsNothing(m_SelFeatureVM) Then
Dim OldSelFeatureVM As BTLFeatureVM = m_SelFeatureVM
EgtResetMark(OldSelFeatureVM.nFeatureId)
End If
m_SelFeatureVM = value
If Not IsNothing(m_SelFeatureVM) Then
DirectCast(m_SelFeatureVM, BTLFeatureVM).SelGeomFeature()
EgtSetMark(m_SelFeatureVM.nFeatureId)
Else
EgtDeselectAll()
End If
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("2.7.11.10")>
<Assembly: AssemblyFileVersion("2.7.11.10")>
<Assembly: AssemblyVersion("2.7.11.23")>
<Assembly: AssemblyFileVersion("2.7.11.23")>
EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersStrategyV.xaml.vb
+1 -3
View File
@@ -1,6 +1,4 @@
Imports System.Windows.Forms
Public Class GeneralParametersStrategyV
Public Class GeneralParametersStrategyV
#Region "FIELDS & PROPERTIES"
EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersStrategyVM.vb
+2 -3
View File
@@ -3,7 +3,6 @@ Imports System.ComponentModel
Imports System.Globalization
Imports System.IO
Imports System.Reflection
Imports System.Windows.Forms
Imports EgtBEAMWALL.Core
Imports EgtBEAMWALL.Optimizer.MainMenuVM
Imports EgtUILib
@@ -141,7 +140,7 @@ Public Class GeneralParametersStrategyVM
Map.refStrategyManagerVM.Save()
Map.refStrategyManagerVM.SetbIsModifyStrategy(True)
' Chiudo finestra
RaiseEvent m_CloseWindow(DialogResult.OK)
RaiseEvent m_CloseWindow(True)
End Sub
#End Region ' Ok_Command
@@ -159,7 +158,7 @@ Public Class GeneralParametersStrategyVM
Public Sub Close()
' Chiudo finestra senza fare niente
RaiseEvent m_CloseWindow(DialogResult.Cancel)
RaiseEvent m_CloseWindow(False)
End Sub
#End Region ' CloseCommand
EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersWndVM.vb
+1 -2
View File
@@ -1,6 +1,5 @@
Imports System.Collections.ObjectModel
Imports System.IO
Imports System.Windows.Forms
Imports EgtBEAMWALL.Core
Imports EgtBEAMWALL.Optimizer.MainMenuVM
Imports EgtUILib
@@ -272,7 +271,7 @@ Public Class GeneralParametersWndVM
SaveProjectParameters()
Map.refProdManagerVM.Save()
' Chiudo finestra
RaiseEvent m_CloseWindow(DialogResult.OK)
RaiseEvent m_CloseWindow(True)
End Sub
#End Region ' Ok_Command
EgtBEAMWALL.Optimizer/MainWindow/MainWindowVM.vb
-1
View File
@@ -1,7 +1,6 @@
Imports System.Collections.ObjectModel
Imports System.IO
Imports System.Threading
Imports System.Windows.Forms
Imports System.Windows.Threading
Imports EgtBEAMWALL.Core
Imports EgtBEAMWALL.Core.ConstGen
EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb
+2 -2
View File
@@ -67,5 +67,5 @@ Imports System.Windows
' Revision
'
<Assembly: AssemblyVersion("2.7.11.22")>
<Assembly: AssemblyFileVersion("2.7.11.22")>
<Assembly: AssemblyVersion("2.7.11.23")>
<Assembly: AssemblyFileVersion("2.7.11.23")>
EgtBEAMWALL.Optimizer/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb
-1
View File
@@ -1,5 +1,4 @@
Imports System.IO
Imports System.Windows.Forms
Imports EgtBEAMWALL.Core
Imports EgtBEAMWALL.Core.ConstBeam
Imports EgtUILib
EgtBEAMWALL.Optimizer/ProdManager/ProdManagerVM.vb
-1
View File
@@ -1469,7 +1469,6 @@ Public Class ProdManagerVM
.Filter = "ProjectExport (*.ngexp)|*.ngexp",
.FileName = CurrProd.nProdId.ToString("0000") & " - " & CurrProd.sBTLFileName & " - ProjectExport"}
If IsNothing(sExportFileName) Then
'If ExportDlg.ShowDialog() <> System.Windows.Forms.DialogResult.OK Then Return Nothing
If ExportDlg.ShowDialog() <> True Then Return Nothing
End If
EgtBEAMWALL.Optimizer/SaveAsStrategyWnd/SaveAsStrategyV.xaml.vb
+2 -4
View File
@@ -1,6 +1,4 @@
Imports System.Windows.Forms
Public Class SaveAsStrategyV
Public Class SaveAsStrategyV
#Region "FIELDS & PROPERTIES"
@@ -14,7 +12,7 @@ Public Class SaveAsStrategyV
m_SaveAsStrategyVM = Me.DataContext
End Sub
Private Sub CloseWindow(DialogResult As DialogResult) Handles m_SaveAsStrategyVM.m_CloseWindow
Private Sub CloseWindow(DialogResult As Boolean) Handles m_SaveAsStrategyVM.m_CloseWindow
Me.DialogResult = DialogResult
Me.Close()
End Sub
EgtBEAMWALL.Optimizer/SaveAsStrategyWnd/SaveAsStrategyVM.vb
+3 -4
View File
@@ -1,5 +1,4 @@
Imports EgtWPFLib5
Imports System.Windows.Forms
Imports System.Collections.ObjectModel
Imports EgtUILib
@@ -9,7 +8,7 @@ Public Class SaveAsStrategyVM
#Region "FIELDS & PROPERTIES"
' Evento per chiusura finestra
Public Event m_CloseWindow(bDialogResult As DialogResult)
Public Event m_CloseWindow(bDialogResult As Boolean)
' Nome file json customconfig
Private m_sFileNameCustomConfig As String
@@ -175,7 +174,7 @@ Public Class SaveAsStrategyVM
Map.refStrategyManagerVM.SetbIsModifyStrategy(True)
End If
NotifyPropertyChanged(NameOf(StrategySetupList))
RaiseEvent m_CloseWindow(DialogResult.Cancel)
RaiseEvent m_CloseWindow(True)
End Sub
#End Region ' SaveAsCommand
@@ -193,7 +192,7 @@ Public Class SaveAsStrategyVM
Public Sub Close()
' Chiudo finestra senza fare niente
RaiseEvent m_CloseWindow(DialogResult.Cancel)
RaiseEvent m_CloseWindow(False)
End Sub
#End Region ' CloseCommand
EgtBEAMWALL.Optimizer/SceneHost/MySceneHostVM.vb
-1
View File
@@ -3,7 +3,6 @@ Imports System.IO
Imports EgtUILib
Imports EgtWPFLib5
Imports EgtBEAMWALL.Core
Imports System.Windows.Forms
Public Class MySceneHostVM
Inherits EgtWPFLib5.SceneHostVM
EgtBEAMWALL.Optimizer/Statistics/StatisticsVM.vb
+2 -3
View File
@@ -1,6 +1,5 @@
Imports System.Collections.ObjectModel
Imports System.IO
Imports System.Windows.Forms
Imports EgtBEAMWALL.Core
Imports EgtUILib
Imports EgtWPFLib5
@@ -11,7 +10,7 @@ Public Class StatisticsVM
#Region "FIELDS & PROPERTIES"
' Evento per chiusura finestra
Public Event m_CloseWindow(bDialogResult As DialogResult)
Public Event m_CloseWindow(bDialogResult As Boolean)
Public Enum StatisticsTab As Integer
OPTIMIZER = 0
@@ -398,7 +397,7 @@ Public Class StatisticsVM
{S_RAWPARTSTATISTICS, RawPartStatisticsColumns}}
EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), DataGridColumnDictionary)
' Chiudo finestra senza fare niente
RaiseEvent m_CloseWindow(DialogResult.Cancel)
RaiseEvent m_CloseWindow(False)
End Sub
#End Region ' CloseCommand
EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerVM.vb
-1
View File
@@ -295,7 +295,6 @@ Public Class StrategyManagerVM
m_StrategySetupList.Add(New StrategySetup(Path.GetFileNameWithoutExtension(AiSetup)))
Next
If m_StrategySetupList.Count > 0 Then
'SelStrategySetup = m_StrategySetupList(0)
' Controllo se presente file default config
If GetMainPrivateProfileString(S_STRATEGY, K_DEFAULTCONFIG, "", sDefaultConfigFile) <> 0 Then
sTrimDefaultConfigFile = System.IO.Path.GetFileNameWithoutExtension(sDefaultConfigFile)
EgtBEAMWALL.Optimizer/WarehouseWnd/WarehouseWndVM.vb
+1 -30
View File
@@ -1,7 +1,6 @@
Imports EgtWPFLib5
Imports EgtUILib
Imports System.Collections.ObjectModel
Imports System.Windows.Forms
Imports EgtBEAMWALL.Core
Imports System.IO
@@ -908,7 +907,7 @@ Public Class WarehouseWndVM
Public Sub RemoveParam()
If Not IsNothing(SelSParam) Then
If SelSParam.Equals(SelCurrentS) Then
If MessageBox.Show(Application.Current.MainWindow, RemoveCurrent_Msg, Attention_Msg, MessageBoxButtons.YesNo, MessageBoxIcon.Question) = DialogResult.Yes Then
If MessageBox.Show(Application.Current.MainWindow, RemoveCurrent_Msg, Attention_Msg, MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then
SParamList.Remove(SelSParam)
m_RemovedParamsCount += 1
If SParamList.Count > 0 Then
@@ -1033,34 +1032,6 @@ Public Class WarehouseWndVM
NotifyPropertyChanged(NameOf(SParamColumns))
End Sub
'Public Shared Sub CheckExistingSectionXMaterial()
' Dim NewSectXMatList As New List(Of SectionXMaterialToBeAdded)
' ' Ricavo la lista dei SectionXMaterial presenti in Warehouse
' Dim WhSectXMatList As List(Of SectionXMaterial) = GetSectionXMaterialsFromWarehouse()
' For Each SectionListItem In Map.refProjectVM.BTLStructureVM.SectionList
' Dim Index As Integer = 0
' Dim bEqual As Boolean = False
' ' Confronto l'Item di SectionList con ciascuno di quelli presenti nella Warehouse
' For Each SectXMatListItem In WhSectXMatList
' If SectionListItem = WhSectXMatList(Index) Then
' ' Se l'Item di SectionList equivale ad uno presente nella Warehouse setto bEqual a True ed esco dal For
' bEqual = True
' Exit For
' End If
' Index += 1
' Next
' ' Se l'Item di SectionList non equivale a nessuno di quelli della Warehouse lo aggiungo alla lista
' If Not bEqual And IsSectionValid(SectionListItem) Then
' NewSectXMatList.Add(New SectionXMaterialToBeAdded(SectionListItem))
' End If
' Next
' ' Se nel BTL importato ci sono SectionXMaterial non presenti nell'INI della Warehouse mostro il dialog per la gestione di questi
' If NewSectXMatList.Count > 0 Then
' Dim AddSectionXMaterialWnd As New AddSectionXMaterialWndV(Application.Current.MainWindow, New AddSectionXMaterialWndVM(NewSectXMatList))
' AddSectionXMaterialWnd.ShowDialog()
' End If
'End Sub
Public Shared Sub UpdateSectionXMaterial()
' aggiungo tutte le sezioni al magazzino (verifica se esiste gia' viene fatta all'interno della funzione)
For Each SectionItem In Map.refProjectVM.BTLStructureVM.SectionList
EgtBEAMWALL.Supervisor/MachGroupPanel/MyMachGroupVM.vb
-1
View File
@@ -1,6 +1,5 @@
Imports System.Collections.ObjectModel
Imports System.IO
Imports System.Windows.Forms
Imports EgtBEAMWALL.Core
Imports EgtUILib
Imports EgtWPFLib5
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("2.7.11.21")>
<Assembly: AssemblyFileVersion("2.7.11.21")>
<Assembly: AssemblyVersion("2.7.11.23")>
<Assembly: AssemblyFileVersion("2.7.11.23")>
ExtLibs/EgtUILib.dll
BIN
View File
Binary file not shown.