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

-aggiunto controllo su tipo strategje non presente

Browse Source
This commit is contained in:
Demetrio Cassarino
2025-09-24 16:44:03 +02:00
parent 0ca180f6f2
commit 47e3a32714
26 changed files with 180 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EgtBEAMWALL.Optimizer/AddSectionXMaterialWnd/AddSectionXMaterialWndVM.vb
+1 -1
View File
@@ -232,7 +232,7 @@ Public Class AddSectionXMaterialWndVM
#End Region ' Cancel
#End Region ' CONSTRUCTOR
#End Region ' COMMANDS
#Region "METHODS"
EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndVM.vb
+4
View File
@@ -545,6 +545,8 @@ Public Class BTLDataWndVM
#End Region ' CONSTRUCTOR
#Region "METHODS"
Private Sub ReadBtlParams()
EgtGetInfo(m_nBTLInfoLayerId, BTL_GEN_PROJNUM, m_sPROJNUM)
EgtGetInfo(m_nBTLInfoLayerId, BTL_GEN_PROJNAME, m_sPROJNAME)
@@ -574,6 +576,8 @@ Public Class BTLDataWndVM
EgtGetInfo(m_nBTLInfoLayerId, BTL_GEN_USERATTRIBUTE, m_sUSERATTRIBUTE)
End Sub
#End Region ' METHODS
#Region "COMMANDS"
#Region "Ok"
EgtBEAMWALL.Optimizer/BTLViewModel/BTLFeatureVM.vb
+4
View File
@@ -8,6 +8,8 @@ Imports EgtWPFLib5
Public Class BTLFeatureVM
Inherits Core.BTLFeatureVM
#Region "FIELDS & PROPERTIES"
Public Property GRPList As ObservableCollection(Of Integer)
Get
Return m_BTLFeatureM.GRPList
@@ -332,6 +334,8 @@ Public Class BTLFeatureVM
Private m_cmdEditFeature As ICommand
Private m_cmdStategyCmd As ICommand
#End Region ' FIELDS & PROPERTIES
#Region "CONSTRUCTOR"
Sub New(BTLFeatureM As BTLFeatureM, BTLPartM As BTLPartM)
EgtBEAMWALL.Optimizer/BTLViewModel/BTLParamVM.vb
+8
View File
@@ -5,6 +5,8 @@ Imports EgtWPFLib5
Public Class BTLParamVM
Inherits VMBase
#Region "FIELDS & PROPERTIES"
Protected m_BTLParamM As BTLParamM
Public ReadOnly Property BTLParamM As BTLParamM
Get
@@ -252,6 +254,8 @@ Public Class BTLParamVM
End Get
End Property
#End Region ' FIELDS & PROPERTIES
#Region "CONSTRUCTOR"
Sub New(BTLParamM As BTLParamM, BTLFeatureM As BTLFeatureM)
@@ -266,6 +270,8 @@ Public Class BTLParamVM
#End Region ' CONSTRUCTOR
#Region "METHODS"
Friend Sub UpdateParamValue(dNewValue As Double, sNewValue As String, Optional bDraw As Boolean = True)
' verifico se solido attivo
Dim bShowSolid As Boolean = Map.refShowBeamPanelVM.ShowSolid_IsChecked
@@ -331,4 +337,6 @@ Public Class BTLParamVM
If bDraw Then EgtDraw()
End Sub
#End Region ' METHODS
End Class
EgtBEAMWALL.Optimizer/BTLViewModel/BTLPartVM.vb
+1 -1
View File
@@ -2711,6 +2711,6 @@ Public Class BTLPartVM
End Select
End Sub
#End Region
#End Region ' EVENTS
End Class
EgtBEAMWALL.Optimizer/BTLViewModel/BTLStructureVM.vb
+1 -1
View File
@@ -823,7 +823,7 @@ Public Class BTLStructureVM
#End Region ' Messages
#End Region
#End Region ' FIELDS & PROPERTIES
#Region "CONSTRUCTOR"
EgtBEAMWALL.Optimizer/BlockedWnd/BlockedWndVM.vb
+8
View File
@@ -52,6 +52,8 @@ Public Class BlockedWndVM
#End Region ' FIELDS & PROPERTIES
#Region "CONSTRUCTOR"
Sub New()
If DbControllers.bNetwork Then
m_Buttons_Visibility = Visibility.Visible
@@ -69,6 +71,10 @@ Public Class BlockedWndVM
m_Waiting_Timer.Start()
End Sub
#End Region ' CONSTRUCTOR
#Region "METHODS"
Private Sub WaitingTimer_Tick()
' se notifica di chiusura da supervisor, esco
If Not SupervisorCommThread.bViewerOptimizerBlocked And Map.refMainWindowVM.m_ManagingSupervisorStop Then
@@ -102,6 +108,8 @@ Public Class BlockedWndVM
End If
End Sub
#End Region ' METHODS
#Region "COMMANDS"
#Region "Save"
EgtBEAMWALL.Optimizer/CALCPanel/CALCPanelVM.vb
+4
View File
@@ -11,6 +11,8 @@ Imports EgwMultiEngineManager.Data.Constants
Public Class CALCPanelVM
Inherits VMBase
#Region "FIELDS & PROPERTIES"
Public Enum ProduceType As Integer
NULL = 0
PRODUCE = 1
@@ -133,6 +135,8 @@ Public Class CALCPanelVM
#End Region ' Messages
#End Region ' FIELDS & PROPERTIES
#Region "CONSTRUCTORS"
Sub New()
EgtBEAMWALL.Optimizer/InstrumentPanel/MyInstrumentPanelVM.vb
+5 -13
View File
@@ -6,6 +6,8 @@ Imports EgtBEAMWALL.Core
Public Class MyInstrumentPanelVM
Inherits InstrumentPanelVM
#Region "FIELDS & PROPERTIES"
Public ReadOnly Property ChangeParam_Visibility As Visibility
Get
Return If(Map.refMainMenuVM.SelPage = Pages.VIEW, Visibility.Visible, Visibility.Collapsed)
@@ -48,6 +50,8 @@ Public Class MyInstrumentPanelVM
#End Region ' Messages
#End Region ' FIELDS & PROPERTIES
#Region "CONSTRUCTORS"
Sub New()
@@ -79,9 +83,6 @@ Public Class MyInstrumentPanelVM
#Region "ChangeParameter"
''' <summary>
''' Returns a command that do Open.
''' </summary>
Public ReadOnly Property ChangeParameter_Command As ICommand
Get
If m_cmdChangeParameter Is Nothing Then
@@ -91,9 +92,6 @@ Public Class MyInstrumentPanelVM
End Get
End Property
''' <summary>
''' Execute the Open. This method is invoked by the OpenCommand.
''' </summary>
Friend Sub ChangeParameter()
If Map.refMainMenuVM.SelPage = Pages.MACHINING AndAlso (IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM)) Then Return
Dim ChangeParameterWndVM As New ChangeParameterWndVM
@@ -116,7 +114,7 @@ Public Class MyInstrumentPanelVM
For Each Param In ParamList.Where(Function(x) x.sName = ChangeParameterWndVM.SelParam.sName)
Select Case Param.nType
Case BTLParamType.DOUBLE_, BTLParamType.LENGTH
If Math.Abs( Param.dValue - ChangeParameterWndVM.SelParam.dActualValue) < EPS_SMALL Then
If Math.Abs(Param.dValue - ChangeParameterWndVM.SelParam.dActualValue) < EPS_SMALL Then
Param.UpdateParamValue(ChangeParameterWndVM.SelParam.dNewValue, "")
End If
Case BTLParamType.STRING_
@@ -137,9 +135,6 @@ Public Class MyInstrumentPanelVM
#Region "ChangeMaterial"
''' <summary>
''' Returns a command that do Open.
''' </summary>
Public ReadOnly Property ChangeMaterial_Command As ICommand
Get
If m_cmdChangeMaterial Is Nothing Then
@@ -149,9 +144,6 @@ Public Class MyInstrumentPanelVM
End Get
End Property
''' <summary>
''' Execute the Open. This method is invoked by the OpenCommand.
''' </summary>
Friend Sub ChangeMaterial()
If Map.refMainMenuVM.SelPage = Pages.MACHINING AndAlso (IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM)) Then Return
Dim ChangeMaterialWndVM As New ChangeMaterialWndVM
EgtBEAMWALL.Optimizer/ItemParamList/FeatureInPartInRawPartListVM.vb
+12
View File
@@ -6,6 +6,8 @@ Imports EgtWPFLib5
Public Class FeatureInPartInRawPartListVM
Inherits VMBase
#Region "FIELDS & PROPERTIES"
Private m_colFeatureInPartInRawPart_Do As EgtDataGridColumn
Public ReadOnly Property colFeatureInPartInRawPart_Do As EgtDataGridColumn
Get
@@ -52,6 +54,10 @@ Public Class FeatureInPartInRawPartListVM
#End Region ' Messages
#End Region ' Fields & Properties
#Region "CONSTRUCTOR"
Sub New()
' creo riferimento in Map
Map.SetRefFeatureInPartInRawPartListVM(Me)
@@ -62,10 +68,16 @@ Public Class FeatureInPartInRawPartListVM
m_colFeatureInPartInRawPart_Priority = FeatureInPartInRawPartColumns.FirstOrDefault(Function(x) x.Name = COL_PRIORITY)
End Sub
#End Region ' Constructor
#Region "METHODS"
Friend Sub UpdateColumns(nProjectType As BWType)
If Not IsNothing(m_colFeatureInPartInRawPart_Priority) Then
m_colFeatureInPartInRawPart_Priority.Visible = (nProjectType = BWType.WALL AndAlso CurrentMachine.bIsEnabledPriority)
End If
End Sub
#End Region ' Methods
End Class
EgtBEAMWALL.Optimizer/ItemParamList/PartInRawPartListVM.vb
+8
View File
@@ -4,6 +4,8 @@ Imports EgtUILib
Public Class PartInRawPartListVM
#Region "FIELDS & PROPERTIES"
Private m_colPartInRawPart_Offset As EgtDataGridColumn
Public ReadOnly Property colPartInRawPart_Offset As EgtDataGridColumn
Get
@@ -128,6 +130,8 @@ Public Class PartInRawPartListVM
#End Region ' Messages
#End Region ' FIELDS & PROPERTIES
#Region "CONSTRUCTOR"
Sub New()
@@ -137,6 +141,8 @@ Public Class PartInRawPartListVM
#End Region ' CONSTRUCTOR
#Region "METHODS"
Friend Sub UpdateColumns(nMachType As MachineType)
If nMachType = MachineType.BEAM Then
PartInRawPartColumns.Clear()
@@ -162,4 +168,6 @@ Public Class PartInRawPartListVM
Next
End Sub
#End Region ' METHODS
End Class
EgtBEAMWALL.Optimizer/ItemParamList/QBTLParamVM.vb
+4
View File
@@ -3,6 +3,8 @@
Public Class QBTLParamVM
Inherits BTLParamVM
#Region "FIELDS & PROPERTIES"
Private m_Process As Integer
Public Property Process As Integer
Get
@@ -35,6 +37,8 @@ Public Class QBTLParamVM
End Get
End Property
#End Region ' FIELDS & PROPERTIES
#Region "CONSTRUCTOR"
Sub New(BTLParamM As BTLParamM, GroupType As GRPType, Process As Integer)
EgtBEAMWALL.Optimizer/ItemParamList/QParameterListVM.vb
+4
View File
@@ -97,9 +97,13 @@ Public Class QParameterListVM
#End Region ' CONSTRUCTOR
#Region "METHODS"
Friend Sub SetQParameterListIsEnabled(bIsEnabled As Boolean)
m_QParameterList_IsEnabled = bIsEnabled
NotifyPropertyChanged(NameOf(QParameterList_IsEnabled))
End Sub
#End Region ' METHODS
End Class
EgtBEAMWALL.Optimizer/MainWindow/MainWindowVM.vb
+4
View File
@@ -11,6 +11,8 @@ Imports EgtWPFLib5
Public Class MainWindowVM
Inherits VMBase
#Region "FIELDS & PROPERTIES"
Private m_SupervisorCommThread As Thread
Private m_Supervisor_Timer As New DispatcherTimer
@@ -64,6 +66,8 @@ Public Class MainWindowVM
Private m_cmdAboutBox As ICommand
Private m_cmdCloseApplication As ICommand
#End Region ' FIELDS & PROPERTIES
#Region "CONSTRUCTOR"
Sub New()
EgtBEAMWALL.Optimizer/NestingRunningWnd/NestingRunningWndVM.vb
+51 -43
View File
@@ -114,6 +114,8 @@ Public Class NestingRunningWndVM
#End Region ' FIELDS & PROPERTIES
#Region "CONSTRUCTOR"
Sub New(SelPartType As Integer, Optional bLDIntersOther As Boolean = False, Optional nMinScore As Integer = 0)
m_OperationType = OperationTypes.NESTING
m_SelPartType = SelPartType
@@ -185,6 +187,10 @@ Public Class NestingRunningWndVM
AddHandler m_Waiting_Timer.Tick, AddressOf WaitingTimer_Tick
End Sub
#End Region ' CONSTRUCTOR
#Region "METHODS"
Private Sub WaitingTimer_Tick()
Select Case m_OperationType
Case OperationTypes.ROTFLIP
@@ -650,49 +656,6 @@ Public Class NestingRunningWndVM
Return nMaxMachGroup + 1
End Function
Private Class NestPartWithFrame
Private m_nSourcePartId As Integer
Public ReadOnly Property nSourcePartId As Integer
Get
Return m_nSourcePartId
End Get
End Property
Private m_nPartId As Integer
Public ReadOnly Property nPartId As Integer
Get
Return m_nPartId
End Get
End Property
Private m_nPartDuploId As Integer
Public ReadOnly Property nPartDuploId As Integer
Get
Return m_nPartDuploId
End Get
End Property
Private m_p3Orig As Point3d
Public ReadOnly Property p3Orig As Point3d
Get
Return m_p3Orig
End Get
End Property
Private m_frFrame As Frame3d
Public ReadOnly Property frFrame As Frame3d
Get
Return m_frFrame
End Get
End Property
Sub New(nPartId As Integer, p3Orig As Point3d, frFrame As Frame3d, nPartDuploId As Integer, nSourcePartId As Integer)
m_nPartId = nPartId
m_p3Orig = p3Orig
m_frFrame = frFrame
m_nPartDuploId = nPartDuploId
m_nSourcePartId = nSourcePartId
End Sub
End Class
Friend Sub DoRotFlip()
Dim sLogPath As String = Map.refMainWindowVM.MainWindowM.sTempDir & "\RawPartLog.txt"
' avvio timer avanzamento nesting
@@ -737,6 +700,51 @@ Public Class NestingRunningWndVM
RaiseEvent m_CloseWindow(True)
End Sub
#End Region ' METHODS
Private Class NestPartWithFrame
Private m_nSourcePartId As Integer
Public ReadOnly Property nSourcePartId As Integer
Get
Return m_nSourcePartId
End Get
End Property
Private m_nPartId As Integer
Public ReadOnly Property nPartId As Integer
Get
Return m_nPartId
End Get
End Property
Private m_nPartDuploId As Integer
Public ReadOnly Property nPartDuploId As Integer
Get
Return m_nPartDuploId
End Get
End Property
Private m_p3Orig As Point3d
Public ReadOnly Property p3Orig As Point3d
Get
Return m_p3Orig
End Get
End Property
Private m_frFrame As Frame3d
Public ReadOnly Property frFrame As Frame3d
Get
Return m_frFrame
End Get
End Property
Sub New(nPartId As Integer, p3Orig As Point3d, frFrame As Frame3d, nPartDuploId As Integer, nSourcePartId As Integer)
m_nPartId = nPartId
m_p3Orig = p3Orig
m_frFrame = frFrame
m_nPartDuploId = nPartDuploId
m_nSourcePartId = nSourcePartId
End Sub
End Class
#Region "COMMANDS"
#Region "Cancel"
EgtBEAMWALL.Optimizer/PartManager/PartManagerVM.vb
+12 -1
View File
@@ -4,6 +4,8 @@ Imports EgtWPFLib5
Public Class PartManagerVM
Inherits VMBase
#Region "FIELDS & PROPERTIES"
Private m_PartManager_IsEnabled As Boolean = True
Public ReadOnly Property PartManager_IsEnabled As Boolean
Get
@@ -11,7 +13,6 @@ Public Class PartManagerVM
End Get
End Property
Private m_Lock_Visibility As Visibility
Public ReadOnly Property Lock_Visibility As Visibility
Get
Return If(Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso
@@ -20,11 +21,19 @@ Public Class PartManagerVM
End Get
End Property
#End Region ' Fields & Properties
#Region "CONSTRUCTOR"
Sub New()
' salvo riferimento in Map
Map.SetRefPartManagerVM(Me)
End Sub
#End Region ' Constructor
#Region "METHODS"
Friend Sub SetPartManagerIsEnabled(bIsEnabled As Boolean)
m_PartManager_IsEnabled = bIsEnabled
NotifyPropertyChanged(NameOf(PartManager_IsEnabled))
@@ -34,4 +43,6 @@ Public Class PartManagerVM
NotifyPropertyChanged(NameOf(Lock_Visibility))
End Sub
#End Region ' Methods
End Class
EgtBEAMWALL.Optimizer/PdfViewer/PDFViewerVM.vb
+4
View File
@@ -34,9 +34,13 @@ Public Class PDFViewerVM
#End Region ' Field & Properties
#Region "CONSTRUCTOR"
Sub New()
End Sub
#End Region ' Constructor
#Region "METHODS"
''' <summary>
EgtBEAMWALL.Optimizer/ProjectFileVM/ProdFileVM.vb
+4
View File
@@ -30,6 +30,8 @@ Public Class ProdFileVM
#End Region ' CONSTRUCTORS
#Region "METHODS"
Friend Function GetProjPath(nProjId As Integer)
Dim sPath As String = String.Empty
If nProjId = 0 Then Return String.Empty
@@ -83,4 +85,6 @@ Public Class ProdFileVM
Return VerifyResult
End Function
#End Region ' METHODS
End Class
EgtBEAMWALL.Optimizer/ProjectFileVM/ProjFileVM.vb
+4
View File
@@ -5,12 +5,16 @@ Imports EgtUILib
Public Class ProjFileVM
Inherits Core.ProjFileVM
#Region "FIELDS & PROPERTIES"
Public ReadOnly Property bIsEnabled As Boolean
Get
Return Not DbControllers.bNetwork OrElse Not bIsLocked
End Get
End Property
#End Region ' FIELDS & PROPERTIES
#Region "CONSTRUCTORS"
Sub New(ProjectFileM As ProjFileM)
EgtBEAMWALL.Optimizer/ProjectManager/ProjectManagerVM.vb
+8
View File
@@ -2,6 +2,8 @@
Module ProjectManagerVM
#Region "FIELDS & PROPERTIES"
Private m_CurrProj As ProjFileVM
Friend Property CurrProj As ProjFileVM
Get
@@ -33,6 +35,10 @@ Module ProjectManagerVM
End Set
End Property
#End Region ' Fields & Properties
#Region "METHODS"
Public Function SetCurrProj(nProjId As Integer) As Boolean
Dim CurrProjM As ProjFileM = DbControllers.m_ProjController.FindByProjIdConv(nProjId)
If IsNothing(CurrProjM) Then Return False
@@ -53,4 +59,6 @@ Module ProjectManagerVM
Return True
End Function
#End Region ' Methods
End Module
EgtBEAMWALL.Optimizer/ProjectTypeWnd/ProjectTypeWndVM.vb
+4
View File
@@ -94,6 +94,8 @@ Public Class ProjectTypeWndVM
#End Region ' MESSAGES
#Region "CONSTRUCTOR"
Sub New()
' recupero la lista delle Macchine da MachinePanel
m_MachineList = Map.refMachinePanelVM.MachineList
@@ -114,6 +116,8 @@ Public Class ProjectTypeWndVM
End If
End Sub
#End Region ' CONSTRUCTOR
#Region "COMMANDS"
#Region "Ok"
EgtBEAMWALL.Optimizer/SceneHost/MySceneHostVM.vb
+4 -1
View File
@@ -8,6 +8,8 @@ Imports System.Windows.Forms
Public Class MySceneHostVM
Inherits EgtWPFLib5.SceneHostVM
#Region "FIELDS & PROPERTIES"
' Identificativi per pezzo da selezionare/deselezionare
Private m_nIdToSel As Integer = GDB_ID.NULL
Private m_nIdToDesel As Integer = GDB_ID.NULL
@@ -25,10 +27,11 @@ Public Class MySceneHostVM
Private m_vtTotMove As Vector3d
Private m_dSnapDist As Double = 0
Private bReducedCut As Boolean = False
Private m_bMagnetic As Boolean
#End Region ' FIELDS & PROPERTIES
#Region "CONSTRUCTOR"
Sub New()
EgtBEAMWALL.Optimizer/SetUp/SetUpVM.vb
-1
View File
@@ -2,7 +2,6 @@
Imports System.IO
Imports EgtUILib
Imports EgtWPFLib5
Imports EgtBEAMWALL.Core
Public Class SetUpVM
Inherits VMBase
EgtBEAMWALL.Optimizer/SpecialPanel/SpecialPanelVM.vb
+8
View File
@@ -4,6 +4,8 @@ Imports EgtBEAMWALL.Core
Public Class SpecialPanelVM
#Region "FIELDS & PROPERTIES"
Private m_ButtonList As New List(Of ButtonItem)
Public ReadOnly Property ButtonList As List(Of ButtonItem)
Get
@@ -11,6 +13,10 @@ Public Class SpecialPanelVM
End Get
End Property
#End Region ' Fields & Properties
#Region "CONSTRUCTOR"
Sub New()
' Creo riferimento a questa classe in Map
Map.SetRefSpecialPanelVM(Me)
@@ -25,6 +31,8 @@ Public Class SpecialPanelVM
End If
End Sub
#End Region ' Constructor
#Region "METHODS"
Public Function SetSpecialPanelButtonsVisibility(IsMachMode As Boolean) As Boolean
EgtBEAMWALL.Optimizer/StatusBar/MyStatusBarVM.vb
+12
View File
@@ -6,6 +6,8 @@ Imports EgtWPFLib5
Public Class MyStatusBarVM
Inherits EgtWPFLib5.StatusBarVM
#Region "FIELDS & PROPERTIES"
' Funzioni di callback per output in interfaccia da LUA
Private m_ProcEventsCallback As New ProcessEventsCallback(AddressOf ProcessEvents)
Private m_OutTextCallback As New OutTextCallback(AddressOf OutText)
@@ -26,6 +28,10 @@ Public Class MyStatusBarVM
' Definizione comandi
Private m_cmdStopProgress As ICommand
#End Region ' Fields & Properties
#Region "CONSTRUCTOR"
Sub New()
' Creo riferimento a questa classe in Map
Map.SetRefMyStatusBarVM(Me)
@@ -35,6 +41,10 @@ Public Class MyStatusBarVM
EgtSetOutText(m_OutTextCallback)
End Sub
#End Region ' Constructor
#Region "METHODS"
Friend Sub ResetStopProgress()
m_bStopProgress = False
End Sub
@@ -86,6 +96,8 @@ Public Class MyStatusBarVM
NotifyPropertyChanged(NameOf(CurrMachine))
End Sub
#End Region ' Methods
#Region "COMMANDS"
#Region "StopProgress"
EgtBEAMWALL.Optimizer/StrategyManager/JsonAvailableStrategyHelper.vb
+1 -1
View File
@@ -442,7 +442,7 @@ Public Class JsonDefaultStrategyParameter
StrategyParameter = New StringStrategyParameter()
DirectCast(StrategyParameter, StringStrategyParameter).SetValue(m_sValue)
Case Else
EgtOutLog("Tipo: " & m_sType & " non presente")
EgtOutLog("Tipo: " & m_sType & " non presente")
Return Nothing
End Select
StrategyParameter.sName = m_sName