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

-inizio pulizia codice

Browse Source 
-sistemato apri in supervisor
This commit is contained in:
Demetrio Cassarino
2025-04-16 17:04:01 +02:00
parent 4bdbba6599
commit 55260fe380
44 changed files with 1355 additions and 2073 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EgtBEAMWALL.Optimizer/Application.xaml.vb
+2 -13
View File
@@ -1,23 +1,12 @@
Imports EgtBEAMWALL.Core
Imports EgtWPFLib5
Class Application
Class Application
' Application-level events, such as Startup, Exit, and DispatcherUnhandledException
' can be handled in this file.
Protected Overrides Sub OnStartup(e As StartupEventArgs)
MyBase.OnStartup(e)
ShutdownMode = System.Windows.ShutdownMode.OnMainWindowClose
' Recupero directory file INI
GetIniFileDirectory()
' Recupero bOnlyProd per selezione MainWindow
Dim bOnlyProd As Boolean = Read_Value(EgtWPFLib5.ConstIni.S_GENERAL, EgtBEAMWALL.Core.ConstIni.K_ONLYPROD, IniFile.m_sIniFile)
' Creo la View principale
If bOnlyProd Then
Me.MainWindow = New OnlyProdMainWindowV
Else
Me.MainWindow = New MainWindowV
End If
Me.MainWindow = New OnlyProdMainWindowV
' Mostro la View principale
Me.MainWindow.Show()
End Sub
EgtBEAMWALL.Optimizer/BTLPartManager/BTLPartManagerVM.vb
+833 -857
View File
File diff suppressed because it is too large Load Diff
EgtBEAMWALL.Optimizer/BTLViewModel/BTLFeatureVM.vb
+13 -13
View File
@@ -168,12 +168,12 @@ Public Class BTLFeatureVM
sPar = Nothing
vParQ = Nothing
m_BTLFeatureM.CalcParamArray(vPar, sPar, vParQ)
' imposto path disegno da mostrare in BottomPanel
If value > 0 AndAlso File.Exists(Map.refMainWindowVM.MainWindowM.sResourcesRoot & "\Features\" & sDescGRP & "." & sDES & ".png") Then
Map.refBottomPanelVM.SetCurrDraw(Map.refMainWindowVM.MainWindowM.sResourcesRoot & "\Features\" & sDescGRP & "." & sDES & ".png")
Else
Map.refBottomPanelVM.SetCurrDraw(Map.refMainWindowVM.MainWindowM.sResourcesRoot & "\Features\" & sDescGRP & ".png")
End If
'' imposto path disegno da mostrare in BottomPanel
'If value > 0 AndAlso File.Exists(Map.refMainWindowVM.MainWindowM.sResourcesRoot & "\Features\" & sDescGRP & "." & sDES & ".png") Then
' Map.refBottomPanelVM.SetCurrDraw(Map.refMainWindowVM.MainWindowM.sResourcesRoot & "\Features\" & sDescGRP & "." & sDES & ".png")
'Else
' Map.refBottomPanelVM.SetCurrDraw(Map.refMainWindowVM.MainWindowM.sResourcesRoot & "\Features\" & sDescGRP & ".png")
'End If
End Sub
Public Property sPriority As String
@@ -274,9 +274,9 @@ Public Class BTLFeatureVM
m_SelPBTLParam = value
If Not IsNothing(m_SelPBTLParam) Then
' imposto path disegno da mostrare in BottomPanel
If Not IsNothing(Map.refBottomPanelVM) Then
Map.refBottomPanelVM.SetCurrDraw(m_SelPBTLParam.sDrawPath)
End If
'If Not IsNothing(Map.refBottomPanelVM) Then
' Map.refBottomPanelVM.SetCurrDraw(m_SelPBTLParam.sDrawPath)
'End If
End If
NotifyPropertyChanged(NameOf(SelPBTLParam))
End Set
@@ -299,10 +299,10 @@ Public Class BTLFeatureVM
End Get
Set(value As BTLParamVM)
m_SelQParam = value
If Not IsNothing(m_SelQParam) AndAlso Not IsNothing(Map.refBottomPanelVM) Then
' imposto path disegno da mostrare in BottomPanel
Map.refBottomPanelVM.SetCurrDraw(m_SelQParam.sDrawPath)
End If
'If Not IsNothing(m_SelQParam) AndAlso Not IsNothing(Map.refBottomPanelVM) Then
' ' imposto path disegno da mostrare in BottomPanel
' Map.refBottomPanelVM.SetCurrDraw(m_SelQParam.sDrawPath)
'End If
NotifyPropertyChanged(NameOf(SelQBTLParam))
End Set
End Property
EgtBEAMWALL.Optimizer/BTLViewModel/BTLPartVM.vb
+9 -41
View File
@@ -90,9 +90,7 @@ Public Class BTLPartVM
EgtOutLog("Trovato Duplo Ghost")
Else
Dim MachGroupModel = Nothing
If Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso Not IsNothing(Map.refProjManagerVM) Then
MachGroupModel = DbControllers.m_MachGroupController.FindByMachGroupId(ProjectManagerVM.CurrProj.nProdId, nMachgroupId)
ElseIf Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE AndAlso Not IsNothing(Map.refOnlyProdManagerVM) Then
If Not IsNothing(Map.refOnlyProdManagerVM) Then
MachGroupModel = DbControllers.m_MachGroupController.FindByMachGroupId(ProjectManagerVM.CurrProj.nProdId, nMachgroupId)
End If
If Not IsNothing(MachGroupModel) AndAlso MachGroupModel.State > ItemState.ND Then
@@ -110,7 +108,7 @@ Public Class BTLPartVM
' avviso che tutti i pezzi verranno tolti dai grezzi e chiedo di confermare
If MessageBox.Show(String.Format(EgtMsg(61851), nDuploCount), EgtMsg(15003), MessageBoxButton.YesNo, MessageBoxImage.Information) = MessageBoxResult.Yes Then
MyMachGroupPanelM.DuploSetToDelete(m_BTLPartM.nPartId)
If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then DeleteDuplo_OnlyProdPage(DuploList)
DeleteDuplo_OnlyProdPage(DuploList)
Else
' reimposto vecchio valore
Return False
@@ -1537,12 +1535,6 @@ Public Class BTLPartVM
If Map.refMainMenuVM.SelPage = Pages.VIEW OrElse (Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE AndAlso Map.refProjectVM.LastSelGridType = ProjectVM.GridSelTypes.PART) Then
If Not IsNothing(m_SelBTLFeatureVM) Then
DirectCast(m_SelBTLFeatureVM, BTLFeatureVM).SelGeomFeature()
If Map.refMainMenuVM.SelPage = Pages.VIEW Then
' imposto path disegno da mostrare in BottomPanel
Map.refBottomPanelVM.SetCurrDraw(DirectCast(m_SelBTLFeatureVM, BTLFeatureVM).sDrawPath)
' seleziono pagina BottomPanel
Map.refBottomPanelVM.SetSelPartFeatureTab(BottomPanelVM.PartFeatureTab.FEATURE)
End If
' deseleziono i parametri
If Not IsNothing(SelBTLFeatureVM.SelPBTLParam) Then SelBTLFeatureVM.SelPBTLParam = Nothing
' rinfresco bottoni freecontour
@@ -1559,13 +1551,6 @@ Public Class BTLPartVM
If Integer.TryParse(m_SelBTLFeatureVM.sDES, nVariant) Then
m_SelBTLFeatureVM.nSelVARIANT = nVariant
End If
If m_SelBTLFeatureVM.nSelVARIANT > 0 AndAlso
System.IO.File.Exists(Map.refMainWindowVM.MainWindowM.sResourcesRoot & "\Features\" & m_SelBTLFeatureVM.sDescGRP & "." & m_SelBTLFeatureVM.sDES & ".png") Then
' imposto path disegno da mostrare in BottomPanel
Map.refBottomPanelVM.SetCurrDraw(Map.refMainWindowVM.MainWindowM.sResourcesRoot & "\Features\" & m_SelBTLFeatureVM.sDescGRP & "." & m_SelBTLFeatureVM.sDES & ".png")
Else
Map.refBottomPanelVM.SetCurrDraw(Map.refMainWindowVM.MainWindowM.sResourcesRoot & "\Features\" & m_SelBTLFeatureVM.sDescGRP & ".png")
End If
Else
If Map.refMainMenuVM.SelPage <> Pages.ONLYPRODPAGE Then Map.refFeatureManagerVM.SetVariant_Visibility(Visibility.Collapsed)
End If
@@ -1884,9 +1869,7 @@ Public Class BTLPartVM
Dim nNewPartId As Integer = EgtBeamCreatePart()
If nNewPartId = GDB_ID.NULL Then Return Nothing
' scrivo info proj
If Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso Not IsNothing(Map.refProjManagerVM) Then
EgtSetInfo(nNewPartId, BTL_PRT_PROJ, ProjectManagerVM.CurrProj.nProjId)
ElseIf Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE AndAlso Not IsNothing(Map.refOnlyProdManagerVM) Then
If Not IsNothing(Map.refOnlyProdManagerVM) Then
EgtSetInfo(nNewPartId, BTL_PRT_PROJ, ProjectManagerVM.CurrProd.nProjIdList(0))
End If
EgtBeamSetPartProdNbr(m_BTLStructureM.NewPDN())
@@ -2305,32 +2288,18 @@ Public Class BTLPartVM
''' Execute the Open. This method is invoked by the OpenCommand.
''' </summary>
Friend Sub Verify()
If (Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso (IsNothing(ProjectManagerVM.CurrProj) OrElse IsNothing(Map.refProjectVM.BTLStructureVM))) OrElse
(Map.refMainMenuVM.SelPage = Pages.MACHINING AndAlso (IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM))) OrElse
(Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE AndAlso (IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.BTLStructureVM) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM))) Then Return
If ((IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.BTLStructureVM) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM))) Then Return
Dim ProjType As BWType
Dim BarList() As EgtBEAMWALL.Core.Bar = Nothing
If Map.refMainMenuVM.SelPage = Pages.VIEW Then
ProjType = ProjectManagerVM.CurrProj.nType
ProjType = ProjectManagerVM.CurrProd.nType
If Map.refProjectVM.LastSelGridType = ProjectVM.GridSelTypes.PART Then
If Not CreateBarToVerify(Pages.VIEW, ProjType, BarList) Then Return
' lancio calcolo
EgtBEAMWALL.Core.CalcIntegration.Run(BarList, ProjectManagerVM.CurrProj.sProjDirPath, AddressOf ManageCalc)
ElseIf Map.refMainMenuVM.SelPage = Pages.MACHINING Then
ProjType = ProjectManagerVM.CurrProd.nType
EgtBEAMWALL.Core.CalcIntegration.Run(BarList, Map.refOnlyProdManagerVM.CurrProj.sProjDirPath, AddressOf ManageCalc)
ElseIf Map.refProjectVM.LastSelGridType = ProjectVM.GridSelTypes.MACHGROUP Then
If Not CreateBarToVerify(Pages.MACHINING, ProjType, BarList) Then Return
' lancio calcolo
EgtBEAMWALL.Core.CalcIntegration.Run(BarList, ProjectManagerVM.CurrProd.sProdDirPath, AddressOf ManageCalc)
ElseIf Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
ProjType = ProjectManagerVM.CurrProd.nType
If Map.refProjectVM.LastSelGridType = ProjectVM.GridSelTypes.PART Then
If Not CreateBarToVerify(Pages.VIEW, ProjType, BarList) Then Return
' lancio calcolo
EgtBEAMWALL.Core.CalcIntegration.Run(BarList, Map.refOnlyProdManagerVM.CurrProj.sProjDirPath, AddressOf ManageCalc)
ElseIf Map.refProjectVM.LastSelGridType = ProjectVM.GridSelTypes.MACHGROUP Then
If Not CreateBarToVerify(Pages.MACHINING, ProjType, BarList) Then Return
' lancio calcolo
EgtBEAMWALL.Core.CalcIntegration.Run(BarList, Map.refOnlyProdManagerVM.CurrProd.sProdDirPath, AddressOf ManageCalc)
End If
EgtBEAMWALL.Core.CalcIntegration.Run(BarList, Map.refOnlyProdManagerVM.CurrProd.sProdDirPath, AddressOf ManageCalc)
End If
End Sub
@@ -2773,7 +2742,6 @@ Public Class BTLPartVM
CalcGlobalUpdate(True)
' imposto path disegno da mostrare in BottomPanel
Dim SelPBTLParam As BTLParamVM = Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM.SelPBTLParam
If Not IsNothing(Map.refBottomPanelVM) AndAlso Not IsNothing(SelPBTLParam) Then Map.refBottomPanelVM.SetCurrDraw(SelPBTLParam.sDrawPath)
Case NameOf(sender.bDO), NameOf(sender.sPriority)
NotifyPropertyChanged(NameOf(bDOALL))
' setto pezzo da ricalcolare
EgtBEAMWALL.Optimizer/BTLViewModel/BTLStructureVM.vb
+5 -31
View File
@@ -89,19 +89,11 @@ Public Class BTLStructureVM
m_SelectionType = value
Select Case m_SelectionType
Case SelectionTypes.SELECT_
' rendo enable bottone parameters
Map.refLeftPanelVM.SetParametersIsEnabled(True)
Map.refLeftPanelVM.SetData_IsEnabled(False)
' verifico reset mark su tutti i pezzi
For Each BTLPart In m_BTLPartVMList
EgtResetMark(BTLPart.nPartId)
Next
' mostro barra di gestione pezzo
Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProdProjManagerVM.PartManager_Visibility))
Case SelectionTypes.HIGHLIGHT
' rendo disable bottone parameters
Map.refLeftPanelVM.SetParametersIsEnabled(False)
Map.refLeftPanelVM.SetData_IsEnabled(True)
If m_PrevSelectionType = SelectionTypes.SELECT_ Then
EgtBeamShowFacesName(False)
EgtBeamShowLoadingSide(False, False)
@@ -114,14 +106,11 @@ Public Class BTLStructureVM
Map.refProjectVM.BTLStructureVM.ShowAll(False)
' se attivata opzione, li assemblo
Map.refProjectVM.BTLStructureVM.ShowBuilding(If(Map.refMainMenuVM.SelPage = Pages.VIEW OrElse Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE, Map.refShowBeamPanelVM.ShowBuilding_IsChecked, False), False)
' nascondo barra di gestione pezzo
Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProdProjManagerVM.PartManager_Visibility))
End Select
' aggiornamento grafica
Configuration.UpdateGraphics()
If Not IsNothing(Map.refFeatureListManagerVM) Then Map.refFeatureListManagerVM.FeatureSelectionChanged()
Map.refCALCPanelVM.SetIsEnabledForSelPart()
Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProdProjManagerVM.PartManager_Visibility))
End Sub
Private m_SelBTLParts As New PartsObservableCollection(Of BTLPartVM)
@@ -182,10 +171,10 @@ Public Class BTLStructureVM
m_SelBTLPart = BtlPart
If Map.refMainMenuVM.SelPage = Pages.VIEW Then
Configuration.SelectedPieces(BtlPart.nPartId, Me)
' seleziono pagina BottomPanel
If Not IsNothing(Map.refBottomPanelVM) Then
Map.refBottomPanelVM.SetSelPartFeatureTab(BottomPanelVM.PartFeatureTab.PART)
End If
'' seleziono pagina BottomPanel
'If Not IsNothing(Map.refBottomPanelVM) Then
' Map.refBottomPanelVM.SetSelPartFeatureTab(BottomPanelVM.PartFeatureTab.PART)
'End If
' mostro barra di gestione pezzo
If Not IsNothing(BtlPart.BTLFeatureVMList) AndAlso BtlPart.BTLFeatureVMList.Count > 0 Then SelBTLPart.SelBTLFeatureVM = BtlPart.BTLFeatureVMList(0)
' aggiorno stato selezionato tutto
@@ -251,8 +240,6 @@ Public Class BTLStructureVM
' trovo ed evidenzio MachGroup e Duplo di questo pezzo
Configuration.SetSearchPiece(BtlPart.nPartId)
End If
' seleziono pagina BottomPanel
If Not IsNothing(Map.refBottomPanelVM) Then Map.refBottomPanelVM.SetSelPartFeatureTab(BottomPanelVM.PartFeatureTab.NULL)
EgtDraw()
End Sub
Private Sub DeHighlightBTLPart(BtlPart As BTLPartVM, Optional bDraw As Boolean = True)
@@ -314,10 +301,6 @@ Public Class BTLStructureVM
SceneSelPartSelection()
' seleziono pezzo in Db geometrico
EgtBeamSetPart(m_SelBTLPart.nPartId)
' seleziono pagina BottomPanel
Map.refBottomPanelVM.SetSelPartFeatureTab(BottomPanelVM.PartFeatureTab.PART)
' mostro barra di gestione pezzo
Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProdProjManagerVM.PartManager_Visibility))
' deseleziono le feature
If Not IsNothing(m_SelBTLPart.SelBTLFeatureVM) Then SelBTLPart.SelBTLFeatureVM = Nothing
' aggiorno stato selezionato tutto
@@ -579,10 +562,6 @@ Public Class BTLStructureVM
Public ReadOnly Property nPROJTYPE As BWType
Get
Select Case Map.refMainMenuVM.SelPage
Case Pages.VIEW
Return Map.refProjManagerVM.nProjType
Case Pages.MACHINING
Return Map.refProdManagerVM.nProdType
Case Pages.ONLYPRODPAGE
Return Map.refOnlyProdManagerVM.nProdType
Case Else
@@ -1331,12 +1310,7 @@ Public Class BTLStructureVM
If IsNothing(ProjectManagerVM.CurrProj) Then Return
' apro finestra di definizione nuovo part
Dim AddPartWndVM As New AddPartWndVM()
Dim AddPartWnd As Object = Nothing
If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
AddPartWnd = New OnlyProdAddPartWndV(Application.Current.MainWindow, AddPartWndVM)
Else
AddPartWnd = New AddPartWndV(Application.Current.MainWindow, AddPartWndVM)
End If
Dim AddPartWnd As New OnlyProdAddPartWndV(Application.Current.MainWindow, AddPartWndVM)
If AddPartWnd.ShowDialog() Then
' creo nuovo part
Dim nNewPartId As Integer = EgtBeamCreatePart()
EgtBEAMWALL.Optimizer/BlockedWnd/BlockedWndVM.vb
+2 -1
View File
@@ -123,7 +123,8 @@ Public Class BlockedWndVM
''' </summary>
Public Sub Save()
' salvo progetto
Map.refProdManagerVM.Save()
'Map.refProdManagerVM.Save()
Map.refOnlyProdManagerVM.Save()
' mando messaggio di blocco avvenuto
DbControllers.m_StatusMapController.UpdateAction("", ProjectManagerVM.CurrProd.nProdId, ProjectManagerVM.CurrProd.nProdId, StatusMapItemType.Comm, StatusMapOpType.ViewOptimStoped, "")
End Sub
EgtBEAMWALL.Optimizer/CALCPanel/CALCPanelVM.vb
+328 -337
View File
@@ -35,25 +35,25 @@ Public Class CALCPanelVM
End Set
End Property
Private m_CALCPanel_IsEnabled As Boolean = True
Public Property CALCPanel_IsEnabled As Boolean
Get
Return m_CALCPanel_IsEnabled
End Get
Set(value As Boolean)
m_CALCPanel_IsEnabled = value
End Set
End Property
'Private m_CALCPanel_IsEnabled As Boolean = True
'Public Property CALCPanel_IsEnabled As Boolean
' Get
' Return m_CALCPanel_IsEnabled
' End Get
' Set(value As Boolean)
' m_CALCPanel_IsEnabled = value
' End Set
'End Property
Private m_VerifyAll_IsEnabled As Boolean = True
Public Property VerifyAll_IsEnabled As Boolean
Get
Return m_VerifyAll_IsEnabled
End Get
Set(value As Boolean)
m_VerifyAll_IsEnabled = value
End Set
End Property
'Private m_VerifyAll_IsEnabled As Boolean = True
'Public Property VerifyAll_IsEnabled As Boolean
' Get
' Return m_VerifyAll_IsEnabled
' End Get
' Set(value As Boolean)
' m_VerifyAll_IsEnabled = value
' End Set
'End Property
Private m_ChooseMachineBtn_Visibility As Boolean = True
Public Property ChooseMachineBtn_Visibility As Visibility
@@ -110,79 +110,79 @@ Public Class CALCPanelVM
End Set
End Property
Public ReadOnly Property ViewPage_Visibility As Visibility
Get
Return If(Map.refMainMenuVM.SelPage = Pages.VIEW, Visibility.Visible, Visibility.Collapsed)
End Get
End Property
'Public ReadOnly Property ViewPage_Visibility As Visibility
' Get
' Return If(Map.refMainMenuVM.SelPage = Pages.VIEW, Visibility.Visible, Visibility.Collapsed)
' End Get
'End Property
Public ReadOnly Property Edit_Visibility As Visibility
Get
Return If(Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso GetMainPrivateProfileInt(S_GENERAL, K_ENABLEEDIT, 0) = 1, Visibility.Visible, Visibility.Collapsed)
End Get
End Property
'Public ReadOnly Property Edit_Visibility As Visibility
' Get
' Return If(Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso GetMainPrivateProfileInt(S_GENERAL, K_ENABLEEDIT, 0) = 1, Visibility.Visible, Visibility.Collapsed)
' End Get
'End Property
Public ReadOnly Property Verify_IsEnabled As Boolean
Get
Return If(Map.refMainMenuVM.SelPage = Pages.VIEW,
m_CALCPanel_IsEnabled AndAlso Not Map.refShowBeamPanelVM.bShowAll AndAlso
Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Not Map.refProjectVM.BTLStructureVM.SelBTLPartsCnt > 1,
m_CALCPanel_IsEnabled)
End Get
End Property
'Public ReadOnly Property Verify_IsEnabled As Boolean
' Get
' Return If(Map.refMainMenuVM.SelPage = Pages.VIEW,
' m_CALCPanel_IsEnabled AndAlso Not Map.refShowBeamPanelVM.bShowAll AndAlso
' Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Not Map.refProjectVM.BTLStructureVM.SelBTLPartsCnt > 1,
' m_CALCPanel_IsEnabled)
' End Get
'End Property
Public ReadOnly Property Simulate_IsEnabled As Boolean
Get
Return If(Map.refMainMenuVM.SelPage = Pages.VIEW,
m_CALCPanel_IsEnabled And Not Map.refShowBeamPanelVM.bShowAll AndAlso
Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Not Map.refProjectVM.BTLStructureVM.SelBTLPartsCnt > 1,
m_CALCPanel_IsEnabled)
End Get
End Property
'Public ReadOnly Property Simulate_IsEnabled As Boolean
' Get
' Return If(Map.refMainMenuVM.SelPage = Pages.VIEW,
' m_CALCPanel_IsEnabled And Not Map.refShowBeamPanelVM.bShowAll AndAlso
' Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Not Map.refProjectVM.BTLStructureVM.SelBTLPartsCnt > 1,
' m_CALCPanel_IsEnabled)
' End Get
'End Property
Public ReadOnly Property Edit_IsEnabled As Boolean
Get
Return If(Map.refMainMenuVM.SelPage = Pages.VIEW,
m_CALCPanel_IsEnabled And Not Map.refShowBeamPanelVM.bShowAll AndAlso
Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Not Map.refProjectVM.BTLStructureVM.SelBTLPartsCnt > 1,
True)
End Get
End Property
'Public ReadOnly Property Edit_IsEnabled As Boolean
' Get
' Return If(Map.refMainMenuVM.SelPage = Pages.VIEW,
' m_CALCPanel_IsEnabled And Not Map.refShowBeamPanelVM.bShowAll AndAlso
' Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Not Map.refProjectVM.BTLStructureVM.SelBTLPartsCnt > 1,
' True)
' End Get
'End Property
' Definizione comandi
Private m_cmdVerify As ICommand
Private m_cmdVerifyAll As ICommand
Private m_cmdResetCalc As ICommand
Private m_cmdSimulate As ICommand
Private m_cmdEdit As ICommand
'Private m_cmdVerify As ICommand
'Private m_cmdVerifyAll As ICommand
'Private m_cmdResetCalc As ICommand
'Private m_cmdSimulate As ICommand
'Private m_cmdEdit As ICommand
Private m_cmdChooseMachine As ICommand
Private m_cmdOk As ICommand
#Region "Messages"
Public ReadOnly Property Verify_ToolTip As String
Get
Return EgtMsg(61901)
End Get
End Property
'Public ReadOnly Property Verify_ToolTip As String
' Get
' Return EgtMsg(61901)
' End Get
'End Property
Public ReadOnly Property VerifyAll_ToolTip As String
Get
Return EgtMsg(61928)
End Get
End Property
'Public ReadOnly Property VerifyAll_ToolTip As String
' Get
' Return EgtMsg(61928)
' End Get
'End Property
Public ReadOnly Property Simulate_ToolTip As String
Get
Return EgtMsg(61902)
End Get
End Property
'Public ReadOnly Property Simulate_ToolTip As String
' Get
' Return EgtMsg(61902)
' End Get
'End Property
Public ReadOnly Property Edit_ToolTip As String
Get
Return EgtMsg(61939)
End Get
End Property
'Public ReadOnly Property Edit_ToolTip As String
' Get
' Return EgtMsg(61939)
' End Get
'End Property
Public ReadOnly Property ResetCalc_ToolTip As String
Get
@@ -216,25 +216,25 @@ Public Class CALCPanelVM
#Region "METHODS"
Friend Sub SetCalcPanelIsEnabled(bIsEnabled As Boolean)
m_CALCPanel_IsEnabled = bIsEnabled
m_VerifyAll_IsEnabled = bIsEnabled
NotifyPropertyChanged(NameOf(CALCPanel_IsEnabled))
NotifyPropertyChanged(NameOf(VerifyAll_IsEnabled))
NotifyPropertyChanged(NameOf(Verify_IsEnabled))
NotifyPropertyChanged(NameOf(Simulate_IsEnabled))
NotifyPropertyChanged(NameOf(Edit_IsEnabled))
'm_CALCPanel_IsEnabled = bIsEnabled
'm_VerifyAll_IsEnabled = bIsEnabled
'NotifyPropertyChanged(NameOf(CALCPanel_IsEnabled))
'NotifyPropertyChanged(NameOf(VerifyAll_IsEnabled))
'NotifyPropertyChanged(NameOf(Verify_IsEnabled))
'NotifyPropertyChanged(NameOf(Simulate_IsEnabled))
'NotifyPropertyChanged(NameOf(Edit_IsEnabled))
End Sub
Friend Sub SetIsEnabledForSelPart()
NotifyPropertyChanged(NameOf(Verify_IsEnabled))
m_VerifyAll_IsEnabled = False
NotifyPropertyChanged(NameOf(VerifyAll_IsEnabled))
NotifyPropertyChanged(NameOf(Simulate_IsEnabled))
NotifyPropertyChanged(NameOf(Edit_IsEnabled))
'NotifyPropertyChanged(NameOf(Verify_IsEnabled))
'm_VerifyAll_IsEnabled = False
'NotifyPropertyChanged(NameOf(VerifyAll_IsEnabled))
'NotifyPropertyChanged(NameOf(Simulate_IsEnabled))
'NotifyPropertyChanged(NameOf(Edit_IsEnabled))
End Sub
Friend Sub SetVerifyIsEnabled(bIsEnabled As Boolean)
m_CALCPanel_IsEnabled = bIsEnabled
NotifyPropertyChanged(NameOf(CALCPanel_IsEnabled))
NotifyPropertyChanged(NameOf(Verify_IsEnabled))
'm_CALCPanel_IsEnabled = bIsEnabled
'NotifyPropertyChanged(NameOf(CALCPanel_IsEnabled))
'NotifyPropertyChanged(NameOf(Verify_IsEnabled))
End Sub
Private Sub Calc_ProcessResult(sender As Object, e As CalcResultEventArgs)
@@ -251,11 +251,12 @@ Public Class CALCPanelVM
End If
' se verify o verifyall, salvo il progetto per conservarne gli stati calcolati
If e.CmdType = CmdTypes.CHECKGEN Then
If Map.refMainMenuVM.SelPage = Pages.VIEW Then
Map.refProjManagerVM.Save()
ElseIf Map.refMainMenuVM.SelPage = Pages.MACHINING Then
Map.refProdManagerVM.Save()
End If
'If Map.refMainMenuVM.SelPage = Pages.VIEW Then
' Map.refProjManagerVM.Save()
'ElseIf Map.refMainMenuVM.SelPage = Pages.MACHINING Then
' Map.refProdManagerVM.Save()
'End If
Map.refOnlyProdManagerVM.Save()
End If
' se modalita' assemblato attiva
If Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso Map.refShowBeamPanelVM.ShowBuilding_IsChecked AndAlso Map.refShowBeamPanelVM.bShowAll Then
@@ -588,20 +589,10 @@ Public Class CALCPanelVM
Dim nMachType As MachineType = DirectCast(Machine, MyMachine).nType
Dim nProjType As BWType
Dim sMachineName As String = ""
If Map.refMainMenuVM.SelPage = Pages.VIEW Then
nProjType = Map.refProjManagerVM.nProjType
sMachineName = If(Not IsNothing(ProjectManagerVM.CurrProj), ProjectManagerVM.CurrProj.sMachine, "")
ElseIf Map.refMainMenuVM.SelPage = Pages.MACHINING Then
nProjType = Map.refProdManagerVM.nProdType
sMachineName = If(Not IsNothing(ProjectManagerVM.CurrProd), ProjectManagerVM.CurrProd.sMachine, "")
ElseIf Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
nProjType = Map.refOnlyProdManagerVM.nProdType
sMachineName = If(Not IsNothing(ProjectManagerVM.CurrProd), ProjectManagerVM.CurrProd.sMachine, "")
End If
nProjType = Map.refOnlyProdManagerVM.nProdType
sMachineName = If(Not IsNothing(ProjectManagerVM.CurrProd), ProjectManagerVM.CurrProd.sMachine, "")
If nMachType = nProjType OrElse
(nMachType = 3 And Map.refMainMenuVM.SelPage = Pages.VIEW And Not IsNothing(Map.refProjManagerVM) AndAlso Not IsNothing(ProjectManagerVM.CurrProj)) OrElse
(nMachType = 3 And Map.refMainMenuVM.SelPage = Pages.MACHINING And Not IsNothing(Map.refProdManagerVM) AndAlso Not IsNothing(ProjectManagerVM.CurrProd)) OrElse
(nMachType = 3 And Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE And Not IsNothing(Map.refOnlyProdManagerVM) AndAlso Not IsNothing(ProjectManagerVM.CurrProd)) Then
(nMachType = 3 And Not IsNothing(Map.refOnlyProdManagerVM) AndAlso Not IsNothing(ProjectManagerVM.CurrProd)) Then
MachineList.Add(Machine)
' Se il nome Macchina coincide setto la macchina selezionata con la macchina associata al progetto
If Machine.Name = sMachineName Then
@@ -610,7 +601,7 @@ Public Class CALCPanelVM
End If
End If
Next
Map.refCALCPanelVM.SetChooseMachineBtn_Visibility(Map.refMainMenuVM.SelPage = Pages.VIEW OrElse Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE AndAlso MachineList.Count > 1 AndAlso GetMainPrivateProfileInt(S_MACH, K_CHANGEMACH, 0) = 1)
Map.refCALCPanelVM.SetChooseMachineBtn_Visibility(MachineList.Count > 1 AndAlso GetMainPrivateProfileInt(S_MACH, K_CHANGEMACH, 0) = 1)
End Sub
Friend Function IsMachineModified() As Boolean
@@ -638,28 +629,28 @@ Public Class CALCPanelVM
End Sub
Friend Sub PartShowAllChanged()
NotifyPropertyChanged(NameOf(Verify_IsEnabled))
NotifyPropertyChanged(NameOf(Simulate_IsEnabled))
NotifyPropertyChanged(NameOf(Edit_IsEnabled))
'NotifyPropertyChanged(NameOf(Verify_IsEnabled))
'NotifyPropertyChanged(NameOf(Simulate_IsEnabled))
'NotifyPropertyChanged(NameOf(Edit_IsEnabled))
End Sub
#End Region ' METHODS
#Region "COMMANDS"
#Region "Verify"
'#Region "Verify"
''' <summary>
''' Returns a command that do Open.
''' </summary>
Public ReadOnly Property Verify_Command As ICommand
Get
If m_cmdVerify Is Nothing Then
m_cmdVerify = New Command(AddressOf Verify)
End If
Return m_cmdVerify
End Get
End Property
' ''' <summary>
' ''' Returns a command that do Open.
' ''' </summary>
' Public ReadOnly Property Verify_Command As ICommand
' Get
' If m_cmdVerify Is Nothing Then
' m_cmdVerify = New Command(AddressOf Verify)
' End If
' Return m_cmdVerify
' End Get
' End Property
''' <summary>
''' Execute the Open. This method is invoked by the OpenCommand.
@@ -777,21 +768,21 @@ Public Class CALCPanelVM
Map.refMyStatusBarVM.SetOutputMessage(sProgress)
End Sub
#End Region ' Verify
'#End Region ' Verify
#Region "VerifyAll"
'#Region "VerifyAll"
''' <summary>
''' Returns a command that do Open.
''' </summary>
Public ReadOnly Property VerifyAll_Command As ICommand
Get
If m_cmdVerifyAll Is Nothing Then
m_cmdVerifyAll = New Command(AddressOf VerifyAll)
End If
Return m_cmdVerifyAll
End Get
End Property
' ''' <summary>
' ''' Returns a command that do Open.
' ''' </summary>
' Public ReadOnly Property VerifyAll_Command As ICommand
' Get
' If m_cmdVerifyAll Is Nothing Then
' m_cmdVerifyAll = New Command(AddressOf VerifyAll)
' End If
' Return m_cmdVerifyAll
' End Get
' End Property
''' <summary>
''' Execute the Open. This method is invoked by the OpenCommand.
@@ -889,217 +880,217 @@ Public Class CALCPanelVM
Return True
End Function
#End Region ' VerifyAll
'#End Region ' VerifyAll
#Region "ResetCalc"
'#Region "ResetCalc"
''' <summary>
''' Returns a command that do Exec.
''' </summary>
Public ReadOnly Property ResetCalc_Command As ICommand
Get
If m_cmdResetCalc Is Nothing Then
m_cmdResetCalc = New Command(AddressOf ResetCalc)
End If
Return m_cmdResetCalc
End Get
End Property
' ''' <summary>
' ''' Returns a command that do Exec.
' ''' </summary>
' Public ReadOnly Property ResetCalc_Command As ICommand
' Get
' If m_cmdResetCalc Is Nothing Then
' m_cmdResetCalc = New Command(AddressOf ResetCalc)
' End If
' Return m_cmdResetCalc
' End Get
' End Property
''' <summary>
''' Execute the Exec. This method is invoked by the ExecCommand.
''' </summary>
Public Sub ResetCalc()
If (Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso (IsNothing(ProjectManagerVM.CurrProj) OrElse IsNothing(Map.refProjectVM.BTLStructureVM))) OrElse
(Map.refMainMenuVM.SelPage = Pages.MACHINING AndAlso (IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM))) OrElse
(Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE AndAlso (IsNothing(ProjectManagerVM.CurrProj) OrElse IsNothing(Map.refProjectVM.BTLStructureVM)) AndAlso (IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM))) Then Return
If Map.refMainMenuVM.SelPage = Pages.VIEW OrElse (Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE AndAlso (Map.refProjectVM.LastSelGridType = ProjectVM.GridSelTypes.PART OrElse Map.refProjectVM.LastSelGridType = ProjectVM.GridSelTypes.PARTLIST)) Then
If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
For Each Part In Map.refProjectVM.BTLStructureVM.BTLPartVMList
If Part.nGlobalState <> CalcStates.NOTCALCULATED Then
' resetto stato dei calcoli
Part.ResetCalcTotalPart()
End If
Next
ElseIf Map.refProjectVM.BTLStructureVM.SelBTLPartsCnt > 1 Then
Else
Dim SelPart As BTLPartVM = Map.refProjectVM.BTLStructureVM.SelBTLPart
If IsNothing(SelPart) Then Return
If SelPart.nGlobalState <> CalcStates.NOTCALCULATED Then
SelPart.ResetCalcTotalPart()
End If
End If
ElseIf Map.refMainMenuVM.SelPage = Pages.MACHINING OrElse (Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE AndAlso Map.refProjectVM.LastSelGridType = ProjectVM.GridSelTypes.MACHGROUP) Then
If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
For Each MachGroup As MyMachGroupVM In Map.refProjectVM.MachGroupPanelVM.MachGroupVMList
If MachGroup.nProduction_State >= ItemState.Assigned Then Continue For
If MachGroup.nGlobalState <> CalcStates.NOTCALCULATED Then
MachGroup.ResetCalcTotalMachGroup()
End If
Next
Else
Dim SelMachGroup As MyMachGroupVM = Map.refMachGroupPanelVM.SelectedMachGroup
If IsNothing(SelMachGroup) Then Return
' se barra gia' assegnata a supervisore, esco
If SelMachGroup.nProduction_State >= ItemState.Assigned Then Return
If SelMachGroup.nGlobalState <> CalcStates.NOTCALCULATED Then
SelMachGroup.ResetCalcTotalMachGroup()
End If
End If
End If
End Sub
' ''' <summary>
' ''' Execute the Exec. This method is invoked by the ExecCommand.
' ''' </summary>
' Public Sub ResetCalc()
' If (Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso (IsNothing(ProjectManagerVM.CurrProj) OrElse IsNothing(Map.refProjectVM.BTLStructureVM))) OrElse
' (Map.refMainMenuVM.SelPage = Pages.MACHINING AndAlso (IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM))) OrElse
' (Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE AndAlso (IsNothing(ProjectManagerVM.CurrProj) OrElse IsNothing(Map.refProjectVM.BTLStructureVM)) AndAlso (IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM))) Then Return
' If Map.refMainMenuVM.SelPage = Pages.VIEW OrElse (Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE AndAlso (Map.refProjectVM.LastSelGridType = ProjectVM.GridSelTypes.PART OrElse Map.refProjectVM.LastSelGridType = ProjectVM.GridSelTypes.PARTLIST)) Then
' If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
' For Each Part In Map.refProjectVM.BTLStructureVM.BTLPartVMList
' If Part.nGlobalState <> CalcStates.NOTCALCULATED Then
' ' resetto stato dei calcoli
' Part.ResetCalcTotalPart()
' End If
' Next
' ElseIf Map.refProjectVM.BTLStructureVM.SelBTLPartsCnt > 1 Then
' Else
' Dim SelPart As BTLPartVM = Map.refProjectVM.BTLStructureVM.SelBTLPart
' If IsNothing(SelPart) Then Return
' If SelPart.nGlobalState <> CalcStates.NOTCALCULATED Then
' SelPart.ResetCalcTotalPart()
' End If
' End If
' ElseIf Map.refMainMenuVM.SelPage = Pages.MACHINING OrElse (Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE AndAlso Map.refProjectVM.LastSelGridType = ProjectVM.GridSelTypes.MACHGROUP) Then
' If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
' For Each MachGroup As MyMachGroupVM In Map.refProjectVM.MachGroupPanelVM.MachGroupVMList
' If MachGroup.nProduction_State >= ItemState.Assigned Then Continue For
' If MachGroup.nGlobalState <> CalcStates.NOTCALCULATED Then
' MachGroup.ResetCalcTotalMachGroup()
' End If
' Next
' Else
' Dim SelMachGroup As MyMachGroupVM = Map.refMachGroupPanelVM.SelectedMachGroup
' If IsNothing(SelMachGroup) Then Return
' ' se barra gia' assegnata a supervisore, esco
' If SelMachGroup.nProduction_State >= ItemState.Assigned Then Return
' If SelMachGroup.nGlobalState <> CalcStates.NOTCALCULATED Then
' SelMachGroup.ResetCalcTotalMachGroup()
' End If
' End If
' End If
' End Sub
#End Region ' ResetCalc
'#End Region ' ResetCalc
#Region "Simulate"
'#Region "Simulate"
''' <summary>
''' Returns a command that do Open.
''' </summary>
Public ReadOnly Property Simulate_Command As ICommand
Get
If m_cmdSimulate Is Nothing Then
m_cmdSimulate = New Command(AddressOf Simulate)
End If
Return m_cmdSimulate
End Get
End Property
' ''' <summary>
' ''' Returns a command that do Open.
' ''' </summary>
' Public ReadOnly Property Simulate_Command As ICommand
' Get
' If m_cmdSimulate Is Nothing Then
' m_cmdSimulate = New Command(AddressOf Simulate)
' End If
' Return m_cmdSimulate
' End Get
' End Property
''' <summary>
''' Execute the Open. This method is invoked by the OpenCommand.
''' </summary>
Friend Sub Simulate()
If (Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso (IsNothing(ProjectManagerVM.CurrProj) OrElse IsNothing(Map.refProjectVM.BTLStructureVM))) OrElse
(Map.refMainMenuVM.SelPage = Pages.MACHINING AndAlso (IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM))) OrElse
(Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE AndAlso (IsNothing(ProjectManagerVM.CurrProj) OrElse IsNothing(Map.refProjectVM.BTLStructureVM)) AndAlso (IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM))) Then Return
Dim ProjType As BWType
Dim BarList() As EgtBEAMWALL.Core.Bar = Nothing
If Map.refMainMenuVM.SelPage = Pages.VIEW Then
ProjType = ProjectManagerVM.CurrProj.nType
If Not CreateBarToSimulate(Pages.VIEW, ProjType, BarList) Then Return
' lancio simulazione
EgtBEAMWALL.Core.CalcIntegration.Run(BarList, ProjectManagerVM.CurrProj.sProjDirPath, AddressOf ManageCalc)
ElseIf Map.refMainMenuVM.SelPage = Pages.MACHINING Then
ProjType = ProjectManagerVM.CurrProd.nType
If Not CreateBarToSimulate(Pages.MACHINING, ProjType, BarList) Then Return
' lancio simulazione
EgtBEAMWALL.Core.CalcIntegration.Run(BarList, ProjectManagerVM.CurrProd.sProdDirPath, AddressOf ManageCalc)
ElseIf Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
ProjType = Map.refOnlyProdManagerVM.CurrProd.nType
If Map.refProjectVM.LastSelGridType = ProjectVM.GridSelTypes.PART Then
If Not CreateBarToSimulate(Pages.VIEW, ProjType, BarList) Then Return
' lancio simulazione
EgtBEAMWALL.Core.CalcIntegration.Run(BarList, ProjectManagerVM.CurrProj.sProjDirPath, AddressOf ManageCalc)
ElseIf Map.refProjectVM.LastSelGridType = ProjectVM.GridSelTypes.MACHGROUP Then
If Not CreateBarToSimulate(Pages.MACHINING, ProjType, BarList) Then Return
' lancio simulazione
EgtBEAMWALL.Core.CalcIntegration.Run(BarList, ProjectManagerVM.CurrProd.sProdDirPath, AddressOf ManageCalc)
End If
End If
End Sub
' ''' <summary>
' ''' Execute the Open. This method is invoked by the OpenCommand.
' ''' </summary>
' Friend Sub Simulate()
' If (Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso (IsNothing(ProjectManagerVM.CurrProj) OrElse IsNothing(Map.refProjectVM.BTLStructureVM))) OrElse
' (Map.refMainMenuVM.SelPage = Pages.MACHINING AndAlso (IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM))) OrElse
' (Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE AndAlso (IsNothing(ProjectManagerVM.CurrProj) OrElse IsNothing(Map.refProjectVM.BTLStructureVM)) AndAlso (IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM))) Then Return
' Dim ProjType As BWType
' Dim BarList() As EgtBEAMWALL.Core.Bar = Nothing
' If Map.refMainMenuVM.SelPage = Pages.VIEW Then
' ProjType = ProjectManagerVM.CurrProj.nType
' If Not CreateBarToSimulate(Pages.VIEW, ProjType, BarList) Then Return
' ' lancio simulazione
' EgtBEAMWALL.Core.CalcIntegration.Run(BarList, ProjectManagerVM.CurrProj.sProjDirPath, AddressOf ManageCalc)
' ElseIf Map.refMainMenuVM.SelPage = Pages.MACHINING Then
' ProjType = ProjectManagerVM.CurrProd.nType
' If Not CreateBarToSimulate(Pages.MACHINING, ProjType, BarList) Then Return
' ' lancio simulazione
' EgtBEAMWALL.Core.CalcIntegration.Run(BarList, ProjectManagerVM.CurrProd.sProdDirPath, AddressOf ManageCalc)
' ElseIf Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
' ProjType = Map.refOnlyProdManagerVM.CurrProd.nType
' If Map.refProjectVM.LastSelGridType = ProjectVM.GridSelTypes.PART Then
' If Not CreateBarToSimulate(Pages.VIEW, ProjType, BarList) Then Return
' ' lancio simulazione
' EgtBEAMWALL.Core.CalcIntegration.Run(BarList, ProjectManagerVM.CurrProj.sProjDirPath, AddressOf ManageCalc)
' ElseIf Map.refProjectVM.LastSelGridType = ProjectVM.GridSelTypes.MACHGROUP Then
' If Not CreateBarToSimulate(Pages.MACHINING, ProjType, BarList) Then Return
' ' lancio simulazione
' EgtBEAMWALL.Core.CalcIntegration.Run(BarList, ProjectManagerVM.CurrProd.sProdDirPath, AddressOf ManageCalc)
' End If
' End If
' End Sub
Private Function CreateBarToSimulate(SelPage As Pages, ProjType As BWType, ByRef BarList As Bar()) As Boolean
If SelPage = Pages.VIEW Then
If Not IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart) Then
Dim TempBarList(0) As EgtBEAMWALL.Core.Bar
Dim Bar As New EgtBEAMWALL.Core.Bar With {.nBarId = Map.refProjectVM.BTLStructureVM.SelBTLPart.nPartId,
.nProgramPage = ProjectType.PROJ,
.nProjType = ProjType,
.bBarOk = True,
.nMachineName = Map.refMachinePanelVM.SelectedMachine.Name,
.nCmdType = CalcIntegration.CmdTypes.SIMULATE,
.nGlobState = Map.refProjectVM.BTLStructureVM.SelBTLPart.nGlobalState}
If Map.refProjectVM.BTLStructureVM.SelBTLPart.nGlobalState = CalcStates.NOTCALCULATED Then
Dim sBTLPartFilePath As String = ProjectManagerVM.CurrProj.sProjDirPath & "\" & Map.refProjectVM.BTLStructureVM.SelBTLPart.nPDN.ToString() & ".ori.bwe"
If File.Exists(sBTLPartFilePath) Then File.Delete(sBTLPartFilePath)
End If
TempBarList(0) = Bar
BarList = TempBarList
Else
Return False
End If
' disabilito interfaccia
Map.refProjectVM.SetCalcRunning(True)
ElseIf SelPage = Pages.MACHINING Then
If Not IsNothing(Map.refMachGroupPanelVM.SelectedMachGroup) Then
Dim SelMachGroup As MyMachGroupVM = Map.refMachGroupPanelVM.SelectedMachGroup
Dim TempBarList(0) As EgtBEAMWALL.Core.Bar
Dim MachineName As String = ""
EgtGetMachGroupMachineName(SelMachGroup.Id, MachineName)
Dim Bar As New EgtBEAMWALL.Core.Bar With {.nBarId = SelMachGroup.Id,
.nProgramPage = ProjectType.PROD,
.nProjType = ProjType,
.bBarOk = True,
.nMachineName = MachineName,
.nCmdType = CalcIntegration.CmdTypes.SIMULATE,
.nGlobState = SelMachGroup.nGlobalState}
If SelMachGroup.nGlobalState = CalcStates.NOTCALCULATED Then
Dim sMachGroupFilePath As String = ProjectManagerVM.CurrProd.sProdDirPath & "\" & SelMachGroup.Name.ToString() & ".ori.bwe"
If File.Exists(sMachGroupFilePath) Then File.Delete(sMachGroupFilePath)
End If
TempBarList(0) = Bar
BarList = TempBarList
Else
Return False
End If
' disabilito interfaccia
Map.refProjectVM.SetCalcRunning(True)
End If
Return True
End Function
' Private Function CreateBarToSimulate(SelPage As Pages, ProjType As BWType, ByRef BarList As Bar()) As Boolean
' If SelPage = Pages.VIEW Then
' If Not IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart) Then
' Dim TempBarList(0) As EgtBEAMWALL.Core.Bar
' Dim Bar As New EgtBEAMWALL.Core.Bar With {.nBarId = Map.refProjectVM.BTLStructureVM.SelBTLPart.nPartId,
' .nProgramPage = ProjectType.PROJ,
' .nProjType = ProjType,
' .bBarOk = True,
' .nMachineName = Map.refMachinePanelVM.SelectedMachine.Name,
' .nCmdType = CalcIntegration.CmdTypes.SIMULATE,
' .nGlobState = Map.refProjectVM.BTLStructureVM.SelBTLPart.nGlobalState}
' If Map.refProjectVM.BTLStructureVM.SelBTLPart.nGlobalState = CalcStates.NOTCALCULATED Then
' Dim sBTLPartFilePath As String = ProjectManagerVM.CurrProj.sProjDirPath & "\" & Map.refProjectVM.BTLStructureVM.SelBTLPart.nPDN.ToString() & ".ori.bwe"
' If File.Exists(sBTLPartFilePath) Then File.Delete(sBTLPartFilePath)
' End If
' TempBarList(0) = Bar
' BarList = TempBarList
' Else
' Return False
' End If
' ' disabilito interfaccia
' Map.refProjectVM.SetCalcRunning(True)
' ElseIf SelPage = Pages.MACHINING Then
' If Not IsNothing(Map.refMachGroupPanelVM.SelectedMachGroup) Then
' Dim SelMachGroup As MyMachGroupVM = Map.refMachGroupPanelVM.SelectedMachGroup
' Dim TempBarList(0) As EgtBEAMWALL.Core.Bar
' Dim MachineName As String = ""
' EgtGetMachGroupMachineName(SelMachGroup.Id, MachineName)
' Dim Bar As New EgtBEAMWALL.Core.Bar With {.nBarId = SelMachGroup.Id,
' .nProgramPage = ProjectType.PROD,
' .nProjType = ProjType,
' .bBarOk = True,
' .nMachineName = MachineName,
' .nCmdType = CalcIntegration.CmdTypes.SIMULATE,
' .nGlobState = SelMachGroup.nGlobalState}
' If SelMachGroup.nGlobalState = CalcStates.NOTCALCULATED Then
' Dim sMachGroupFilePath As String = ProjectManagerVM.CurrProd.sProdDirPath & "\" & SelMachGroup.Name.ToString() & ".ori.bwe"
' If File.Exists(sMachGroupFilePath) Then File.Delete(sMachGroupFilePath)
' End If
' TempBarList(0) = Bar
' BarList = TempBarList
' Else
' Return False
' End If
' ' disabilito interfaccia
' Map.refProjectVM.SetCalcRunning(True)
' End If
' Return True
' End Function
#End Region ' Simulate
'#End Region ' Simulate
#Region "Edit"
'#Region "Edit"
''' <summary>
''' Returns a command that do Open.
''' </summary>
Public ReadOnly Property Edit_Command As ICommand
Get
If m_cmdEdit Is Nothing Then
m_cmdEdit = New Command(AddressOf Edit)
End If
Return m_cmdEdit
End Get
End Property
' ''' <summary>
' ''' Returns a command that do Open.
' ''' </summary>
' Public ReadOnly Property Edit_Command As ICommand
' Get
' If m_cmdEdit Is Nothing Then
' m_cmdEdit = New Command(AddressOf Edit)
' End If
' Return m_cmdEdit
' End Get
' End Property
''' <summary>
''' Execute the Open. This method is invoked by the OpenCommand.
''' </summary>
Friend Sub Edit()
If Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso (IsNothing(ProjectManagerVM.CurrProj) OrElse IsNothing(Map.refProjectVM.BTLStructureVM)) Then Return
Dim ProjType As BWType
If Map.refMainMenuVM.SelPage = Pages.VIEW Then
ProjType = ProjectManagerVM.CurrProj.nType
Else
ProjType = ProjectManagerVM.CurrProd.nType
End If
Dim BarList() As EgtBEAMWALL.Core.Bar
If Map.refMainMenuVM.SelPage = Pages.VIEW Then
If Not IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart) Then
' salvo il progetto prima di editarlo
Map.refProjManagerVM.Save()
Dim TempBarList(0) As EgtBEAMWALL.Core.Bar
Dim Bar As New EgtBEAMWALL.Core.Bar With {.nBarId = Map.refProjectVM.BTLStructureVM.SelBTLPart.nPartId,
.nProgramPage = ProjectType.PROJ,
.nProjType = ProjType,
.bBarOk = True,
.nMachineName = Map.refMachinePanelVM.SelectedMachine.Name,
.nCmdType = CalcIntegration.CmdTypes.EDIT,
.nGlobState = Map.refProjectVM.BTLStructureVM.SelBTLPart.nGlobalState}
TempBarList(0) = Bar
BarList = TempBarList
Else
Return
End If
' disabilito interfaccia
Map.refProjectVM.SetCalcRunning(True)
' lancio edit
EgtBEAMWALL.Core.CalcIntegration.Run(BarList, ProjectManagerVM.CurrProj.sProjDirPath, AddressOf ManageCalc)
End If
End Sub
' ''' <summary>
' ''' Execute the Open. This method is invoked by the OpenCommand.
' ''' </summary>
' Friend Sub Edit()
' If Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso (IsNothing(ProjectManagerVM.CurrProj) OrElse IsNothing(Map.refProjectVM.BTLStructureVM)) Then Return
' Dim ProjType As BWType
' If Map.refMainMenuVM.SelPage = Pages.VIEW Then
' ProjType = ProjectManagerVM.CurrProj.nType
' Else
' ProjType = ProjectManagerVM.CurrProd.nType
' End If
' Dim BarList() As EgtBEAMWALL.Core.Bar
' If Map.refMainMenuVM.SelPage = Pages.VIEW Then
' If Not IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart) Then
' ' salvo il progetto prima di editarlo
' Map.refProjManagerVM.Save()
' Dim TempBarList(0) As EgtBEAMWALL.Core.Bar
' Dim Bar As New EgtBEAMWALL.Core.Bar With {.nBarId = Map.refProjectVM.BTLStructureVM.SelBTLPart.nPartId,
' .nProgramPage = ProjectType.PROJ,
' .nProjType = ProjType,
' .bBarOk = True,
' .nMachineName = Map.refMachinePanelVM.SelectedMachine.Name,
' .nCmdType = CalcIntegration.CmdTypes.EDIT,
' .nGlobState = Map.refProjectVM.BTLStructureVM.SelBTLPart.nGlobalState}
' TempBarList(0) = Bar
' BarList = TempBarList
' Else
' Return
' End If
' ' disabilito interfaccia
' Map.refProjectVM.SetCalcRunning(True)
' ' lancio edit
' EgtBEAMWALL.Core.CalcIntegration.Run(BarList, ProjectManagerVM.CurrProj.sProjDirPath, AddressOf ManageCalc)
' End If
' End Sub
#End Region ' Edit
'#End Region ' Edit
#Region "ChooseMachine"
EgtBEAMWALL.Optimizer/ConfigurationPage/ConfigurationPageVM.vb
+1 -7
View File
@@ -5,7 +5,6 @@ Imports EgtWPFLib5
Imports EgtBEAMWALL.Core
Imports MS.Internal
Imports Ionic.Zip
Imports System.Globalization
Public Class ConfigurationPageVM
Inherits VMBase
@@ -1214,14 +1213,9 @@ Public Class ConfigurationPageVM
' funzione che verifica l'inserimento della password quando si edita un parametro Macchina
Friend Function VerifyConfigPagePassword() As Boolean
Dim InputPwdWnd As Object
' Display message, title, and default value.
Dim InputPwdWndVM As New InputPwdWndVM()
If bOnlyProd Then
InputPwdWnd = New OnlyProdInputPwdWndV(Application.Current.MainWindow, InputPwdWndVM)
Else
InputPwdWnd = New InputPwdWndV(Application.Current.MainWindow, InputPwdWndVM)
End If
Dim InputPwdWnd As New OnlyProdInputPwdWndV(Application.Current.MainWindow, InputPwdWndVM)
If InputPwdWnd.ShowDialog() Then
' Lettura PWD dall'INI e confronto
Dim sPwdIni As String = String.Empty
EgtBEAMWALL.Optimizer/ConfigurationPage/OnlyProdConfigurationPageV.xaml
-1
View File
@@ -3,7 +3,6 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"
xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.Optimizer"
xmlns:WebView="clr-namespace:Microsoft.Web.WebView2.Wpf;assembly=Microsoft.Web.WebView2.Wpf"
DataContext="{StaticResource ConfigurationPageVM}">
<Grid>
EgtBEAMWALL.Optimizer/EgtBEAMWALL.Optimizer.vbproj
+4 -329
View File
@@ -102,21 +102,14 @@
<Compile Include="AboutBoxWindow\AboutBoxV.xaml.vb">
<DependentUpon>AboutBoxV.xaml</DependentUpon>
</Compile>
<Compile Include="AddFeatureWnd\AddFeatureWndV.vb" />
<Compile Include="AddFeatureWnd\AddFeatureWndVM.vb" />
<Compile Include="AddFeatureWnd\NewAddFeatureWndV.xaml.vb">
<DependentUpon>NewAddFeatureWndV.xaml</DependentUpon>
</Compile>
<Compile Include="AddPartWnd\AddPartWndV.xaml.vb">
<DependentUpon>AddPartWndV.xaml</DependentUpon>
</Compile>
<Compile Include="AddPartWnd\AddPartWndVM.vb" />
<Compile Include="AddPartWnd\OnlyProdAddPartWndV.xaml.vb">
<DependentUpon>OnlyProdAddPartWndV.xaml</DependentUpon>
</Compile>
<Compile Include="AddRawPartWnd\AddRawPartWndV.xaml.vb">
<DependentUpon>AddRawPartWndV.xaml</DependentUpon>
</Compile>
<Compile Include="AddRawPartWnd\AddRawPartWndVM.vb" />
<Compile Include="AddRawPartWnd\OnlyProdAddRawPartWndV.xaml.vb">
<DependentUpon>OnlyProdAddRawPartWndV.xaml</DependentUpon>
@@ -129,9 +122,6 @@
<DependentUpon>Application.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Compile Include="NestingRunningWnd\NestingRunningWndV.xaml.vb">
<DependentUpon>NestingRunningWndV.xaml</DependentUpon>
</Compile>
<Compile Include="NestingRunningWnd\NestingRunningWndVM.vb" />
<Compile Include="NestingRunningWnd\OnlyProdNestingRunningWndV.xaml.vb">
<DependentUpon>OnlyProdNestingRunningWndV.xaml</DependentUpon>
@@ -146,26 +136,10 @@
<Compile Include="OptimizePanel\OnlyProdOptimizePanelV.xaml.vb">
<DependentUpon>OnlyProdOptimizePanelV.xaml</DependentUpon>
</Compile>
<Compile Include="OptimizePanel\OptimizePanelV.xaml.vb">
<DependentUpon>OptimizePanelV.xaml</DependentUpon>
</Compile>
<Compile Include="OptimizePanel\OptimizePanelVM.vb" />
<Compile Include="PartInRawPartManager\OnlyProdPartInRawPartManagerV.xaml.vb">
<DependentUpon>OnlyProdPartInRawPartManagerV.xaml</DependentUpon>
</Compile>
<Compile Include="PartInRawPartManager\PartInRawPartManagerV.xaml.vb">
<DependentUpon>PartInRawPartManagerV.xaml</DependentUpon>
</Compile>
<Compile Include="PartInRawPartManager\PartInRawPartManagerVM.vb" />
<Compile Include="PartInRawPartManager\PartInRawPartManagerWndV.xaml.vb">
<DependentUpon>PartInRawPartManagerWndV.xaml</DependentUpon>
</Compile>
<Compile Include="PartManager\OnlyProdPartManagerV.xaml.vb">
<DependentUpon>OnlyProdPartManagerV.xaml</DependentUpon>
</Compile>
<Compile Include="PartManager\PartManagerV.xaml.vb">
<DependentUpon>PartManagerV.xaml</DependentUpon>
</Compile>
<Compile Include="PartManager\PartManagerVM.vb" />
<Compile Include="PartParametersWnd\PartParametersWndV.xaml.vb">
<DependentUpon>PartParametersWndV.xaml</DependentUpon>
@@ -179,10 +153,6 @@
<DependentUpon>ProdManagerV.xaml</DependentUpon>
</Compile>
<Compile Include="ProdManager\ProdManagerVM.vb" />
<Compile Include="ProdProjManager\ProdProjManagerV.xaml.vb">
<DependentUpon>ProdProjManagerV.xaml</DependentUpon>
</Compile>
<Compile Include="ProdProjManager\ProdProjManagerVM.vb" />
<Compile Include="ProjectFileVM\ProdFileVM.vb" />
<Compile Include="ProjectFileVM\ProjFileVM.vb" />
<Compile Include="ProjectManager\ProjectManagerVM.vb" />
@@ -193,9 +163,6 @@
<DependentUpon>ProjectTypeWndV.xaml</DependentUpon>
</Compile>
<Compile Include="ProjectTypeWnd\ProjectTypeWndVM.vb" />
<Compile Include="Project\ProjectV.xaml.vb">
<DependentUpon>ProjectV.xaml</DependentUpon>
</Compile>
<Compile Include="Project\ProjectVM.vb" />
<Compile Include="ProjManager\ProjManagerV.xaml.vb">
<DependentUpon>ProjManagerV.xaml</DependentUpon>
@@ -204,9 +171,6 @@
<Compile Include="RawPartManager\OnlyProdRawPartManagerV.xaml.vb">
<DependentUpon>OnlyProdRawPartManagerV.xaml</DependentUpon>
</Compile>
<Compile Include="RawPartManager\RawPartManagerV.xaml.vb">
<DependentUpon>RawPartManagerV.xaml</DependentUpon>
</Compile>
<Compile Include="RawPartManager\RawPartManagerVM.vb" />
<Compile Include="RawPartManager\RawPartManagerWndV.xaml.vb">
<DependentUpon>RawPartManagerWndV.xaml</DependentUpon>
@@ -223,36 +187,21 @@
<Compile Include="ShowBeamPanel\OnlyProdShowBeamPanelV.xaml.vb">
<DependentUpon>OnlyProdShowBeamPanelV.xaml</DependentUpon>
</Compile>
<Compile Include="ShowBeamPanel\ShowBeamPanelV.xaml.vb">
<DependentUpon>ShowBeamPanelV.xaml</DependentUpon>
</Compile>
<Compile Include="ShowBeamPanel\ShowBeamPanelVM.vb" />
<Compile Include="ShowPanel\OnlyProdShowPanelV.xaml.vb">
<DependentUpon>OnlyProdShowPanelV.xaml</DependentUpon>
</Compile>
<Compile Include="ShowPanel\ShowPanelV.xaml.vb">
<DependentUpon>ShowPanelV.xaml</DependentUpon>
</Compile>
<Compile Include="SpecialPanel\OnlyProdSpecialPanelV.xaml.vb">
<DependentUpon>OnlyProdSpecialPanelV.xaml</DependentUpon>
</Compile>
<Compile Include="SpecialPanel\SpecialPanelV.xaml.vb">
<DependentUpon>SpecialPanelV.xaml</DependentUpon>
</Compile>
<Compile Include="SpecialPanel\SpecialPanelVM.vb" />
<Compile Include="StatisticsTimePanel\OnlyProdStatisticsTimePanelV.xaml.vb">
<DependentUpon>OnlyProdStatisticsTimePanelV.xaml</DependentUpon>
</Compile>
<Compile Include="StatisticsTimePanel\StatisticsTimePanelV.xaml.vb">
<DependentUpon>StatisticsTimePanelV.xaml</DependentUpon>
</Compile>
<Compile Include="StatisticsTimePanel\StatisticsTimePanelVM.vb" />
<Compile Include="StatisticsWnd\OptimizerStatisticsWndV.xaml.vb">
<DependentUpon>OptimizerStatisticsWndV.xaml</DependentUpon>
</Compile>
<Compile Include="StatisticsWnd\StatisticsWndV.xaml.vb">
<DependentUpon>StatisticsWndV.xaml</DependentUpon>
</Compile>
<Compile Include="Statistics\OnlyProdOptimizerStatisticsV.xaml.vb">
<DependentUpon>OnlyProdOptimizerStatisticsV.xaml</DependentUpon>
</Compile>
@@ -262,18 +211,9 @@
<Compile Include="Statistics\OnlyProdStatisticsV.xaml.vb">
<DependentUpon>OnlyProdStatisticsV.xaml</DependentUpon>
</Compile>
<Compile Include="Statistics\OptimizerStatisticsV.xaml.vb">
<DependentUpon>OptimizerStatisticsV.xaml</DependentUpon>
</Compile>
<Compile Include="Statistics\PDFEditorV.xaml.vb">
<DependentUpon>PDFEditorV.xaml</DependentUpon>
</Compile>
<Compile Include="Statistics\PDFEditorVM.vb" />
<Compile Include="Statistics\PDFHelper.vb" />
<Compile Include="Statistics\StatisticsUtility.vb" />
<Compile Include="Statistics\StatisticsV.xaml.vb">
<DependentUpon>StatisticsV.xaml</DependentUpon>
</Compile>
<Compile Include="Statistics\StatisticsVM.vb" />
<Compile Include="StatusBar\MyStatusBarVM.vb" />
<Compile Include="StatusBar\StatusBarV.xaml.vb">
@@ -281,19 +221,8 @@
</Compile>
<Compile Include="SupervisorCommThread\SupervisorComm.vb" />
<Compile Include="SupervisorCommThread\SupervisorCommThread.vb" />
<Compile Include="TabWnd\ProdWndV.xaml.vb">
<DependentUpon>ProdWndV.xaml</DependentUpon>
</Compile>
<Compile Include="TabWnd\ProjWndV.xaml.vb">
<DependentUpon>ProjWndV.xaml</DependentUpon>
</Compile>
<Compile Include="TabWnd\ProjWndVM.vb" />
<Compile Include="ToolsDbWindow\MyToolDbWindowVM.vb" />
<Compile Include="ToolsDbWindow\ToolsUpdate.vb" />
<Compile Include="TopPanel\TopPanelV.xaml.vb">
<DependentUpon>TopPanelV.xaml</DependentUpon>
</Compile>
<Compile Include="TopPanel\TopPanelVM.vb" />
<Compile Include="UpdateBTLWnd\OnlyProdUpdateBTLWndV.xaml.vb">
<DependentUpon>OnlyProdUpdateBTLWndV.xaml</DependentUpon>
</Compile>
@@ -326,16 +255,10 @@
<Compile Include="ViewPanel\OnlyProdViewPanelV.xaml.vb">
<DependentUpon>OnlyProdViewPanelV.xaml</DependentUpon>
</Compile>
<Compile Include="ViewPanel\ViewPanelV.xaml.vb">
<DependentUpon>ViewPanelV.xaml</DependentUpon>
</Compile>
<Compile Include="WarehouseWnd\OnlyProdWarehouseWndV.xaml.vb">
<DependentUpon>OnlyProdWarehouseWndV.xaml</DependentUpon>
</Compile>
<Compile Include="WarehouseWnd\WarehouseHelper.vb" />
<Compile Include="WarehouseWnd\WarehouseWndV.xaml.vb">
<DependentUpon>WarehouseWndV.xaml</DependentUpon>
</Compile>
<Compile Include="WarehouseWnd\WarehouseWndVM.vb" />
</ItemGroup>
<ItemGroup>
@@ -362,17 +285,10 @@
<DependentUpon>BlockedWndV.xaml</DependentUpon>
</Compile>
<Compile Include="BlockedWnd\BlockedWndVM.vb" />
<Compile Include="BottomPanel\BottomPanelV.xaml.vb">
<DependentUpon>BottomPanelV.xaml</DependentUpon>
</Compile>
<Compile Include="BottomPanel\BottomPanelVM.vb" />
<Compile Include="BTLDataWnd\BTLDataWndV.xaml.vb">
<DependentUpon>BTLDataWndV.xaml</DependentUpon>
</Compile>
<Compile Include="BTLDataWnd\BTLDataWndVM.vb" />
<Compile Include="BTLPartManager\BTLPartManagerV.xaml.vb">
<DependentUpon>BTLPartManagerV.xaml</DependentUpon>
</Compile>
<Compile Include="BTLPartManager\BTLPartManagerVM.vb" />
<Compile Include="BTLPartManager\OnlyProdBTLPartManagerV.xaml.vb">
<DependentUpon>OnlyProdBTLPartManagerV.xaml</DependentUpon>
@@ -381,9 +297,6 @@
<Compile Include="BTLViewModel\BTLParamVM.vb" />
<Compile Include="BTLViewModel\BTLPartVM.vb" />
<Compile Include="BTLViewModel\BTLStructureVM.vb" />
<Compile Include="CALCPanel\CalcPanelV.xaml.vb">
<DependentUpon>CalcPanelV.xaml</DependentUpon>
</Compile>
<Compile Include="CALCPanel\CALCPanelVM.vb" />
<Compile Include="CALCPanel\OnlyProdCalcPanelV.xaml.vb">
<DependentUpon>OnlyProdCalcPanelV.xaml</DependentUpon>
@@ -396,9 +309,6 @@
<DependentUpon>ChangeParameterWndV.xaml</DependentUpon>
</Compile>
<Compile Include="ChangeParameterWnd\ChangeParameterWndVM.vb" />
<Compile Include="ConfigurationPage\ConfigurationPageV.xaml.vb">
<DependentUpon>ConfigurationPageV.xaml</DependentUpon>
</Compile>
<Compile Include="ConfigurationPage\ConfigurationPageVM.vb" />
<Compile Include="ConfigurationPage\OnlyProdCheckVersionV.xaml.vb">
<DependentUpon>OnlyProdCheckVersionV.xaml</DependentUpon>
@@ -410,44 +320,26 @@
<Compile Include="DataGridMultiselectManaging\IListItemConverter.vb" />
<Compile Include="DataGridMultiselectManaging\MultiSelectorBehaviours.vb" />
<Compile Include="DataGridMultiselectManaging\TwoListSynchronizer.vb" />
<Compile Include="FeatureListManager\FeatureListManagerV.xaml.vb">
<DependentUpon>FeatureListManagerV.xaml</DependentUpon>
</Compile>
<Compile Include="FeatureListManager\FeatureListManagerVM.vb" />
<Compile Include="FeatureListManager\OnlyProdFeatureListManagerV.xaml.vb">
<DependentUpon>OnlyProdFeatureListManagerV.xaml</DependentUpon>
</Compile>
<Compile Include="FeatureManager\FeatureManagerV.xaml.vb">
<DependentUpon>FeatureManagerV.xaml</DependentUpon>
</Compile>
<Compile Include="FeatureManager\FeatureManagerVM.vb" />
<Compile Include="FeatureManager\OnlyProdFeatureManagerV.xaml.vb">
<DependentUpon>OnlyProdFeatureManagerV.xaml</DependentUpon>
</Compile>
<Compile Include="FreeContourInput\FreeContourInputV.xaml.vb">
<DependentUpon>FreeContourInputV.xaml</DependentUpon>
</Compile>
<Compile Include="FreeContourInput\FreeContourInputVM.vb" />
<Compile Include="FreeContourInput\OnlyProdFreeContourInputV.xaml.vb">
<DependentUpon>OnlyProdFreeContourInputV.xaml</DependentUpon>
</Compile>
<Compile Include="FreeContourManager\FreeContourManagerV.xaml.vb">
<DependentUpon>FreeContourManagerV.xaml</DependentUpon>
</Compile>
<Compile Include="FreeContourManager\FreeContourManagerVM.vb" />
<Compile Include="FreeContourManager\OnlyProdFreeContourManagerV.xaml.vb">
<DependentUpon>OnlyProdFreeContourManagerV.xaml</DependentUpon>
</Compile>
<Compile Include="InputPwdWnd\InputPwdWndV.xaml.vb">
<DependentUpon>InputPwdWndV.xaml</DependentUpon>
</Compile>
<Compile Include="InputPwdWnd\InputPwdWndVM.vb" />
<Compile Include="InputPwdWnd\OnlyProdInputPwdWndV.xaml.vb">
<DependentUpon>OnlyProdInputPwdWndV.xaml</DependentUpon>
</Compile>
<Compile Include="InstrumentPanel\InstrumentPanelV.xaml.vb">
<DependentUpon>InstrumentPanelV.xaml</DependentUpon>
</Compile>
<Compile Include="InstrumentPanel\MyInstrumentPanelVM.vb" />
<Compile Include="InstrumentPanel\OnlyProdInstrumentPanelV.xaml.vb">
<DependentUpon>OnlyProdInstrumentPanelV.xaml</DependentUpon>
@@ -455,18 +347,9 @@
<Compile Include="ItemParamList\BTLDataV.xaml.vb">
<DependentUpon>BTLDataV.xaml</DependentUpon>
</Compile>
<Compile Include="ItemParamList\BTLPartListV.xaml.vb">
<DependentUpon>BTLPartListV.xaml</DependentUpon>
</Compile>
<Compile Include="ItemParamList\BTLPartListVM.vb" />
<Compile Include="ItemParamList\DuploQParameterListVM.vb" />
<Compile Include="ItemParamList\FeatureInPartInRawPartListV.xaml.vb">
<DependentUpon>FeatureInPartInRawPartListV.xaml</DependentUpon>
</Compile>
<Compile Include="ItemParamList\FeatureInPartInRawPartListVM.vb" />
<Compile Include="ItemParamList\FeatureListV.xaml.vb">
<DependentUpon>FeatureListV.xaml</DependentUpon>
</Compile>
<Compile Include="ItemParamList\FeatureListVM.vb" />
<Compile Include="ItemParamList\OnlyProdBTLPartListV.xaml.vb">
<DependentUpon>OnlyProdBTLPartListV.xaml</DependentUpon>
@@ -492,29 +375,17 @@
<Compile Include="ItemParamList\OnlyProdRawPartListV.xaml.vb">
<DependentUpon>OnlyProdRawPartListV.xaml</DependentUpon>
</Compile>
<Compile Include="ItemParamList\PartInRawPartListV.xaml.vb">
<DependentUpon>PartInRawPartListV.xaml</DependentUpon>
</Compile>
<Compile Include="ItemParamList\PartInRawPartListVM.vb" />
<Compile Include="ItemParamList\PartParametersV.xaml.vb">
<DependentUpon>PartParametersV.xaml</DependentUpon>
</Compile>
<Compile Include="ItemParamList\PartParametersVM.vb" />
<Compile Include="ItemParamList\PParameterListV.xaml.vb">
<DependentUpon>PParameterListV.xaml</DependentUpon>
</Compile>
<Compile Include="ItemParamList\PParameterListVM.vb" />
<Compile Include="ItemParamList\QBTLParamVM.vb" />
<Compile Include="ItemParamList\QParameterListV.xaml.vb">
<DependentUpon>QParameterListV.xaml</DependentUpon>
</Compile>
<Compile Include="ItemParamList\QParameterListVM.vb" />
<Compile Include="ItemParamList\QParamListV.xaml.vb">
<DependentUpon>QParamListV.xaml</DependentUpon>
</Compile>
<Compile Include="ItemParamList\RawPartListV.xaml.vb">
<DependentUpon>RawPartListV.xaml</DependentUpon>
</Compile>
<Compile Include="ItemParamList\RawPartListVM.vb" />
<Compile Include="LeftPanel\LeftPanelVM.vb" />
<Compile Include="LeftPanel\OnlyProdLeftPanelV.xaml.vb">
@@ -524,31 +395,19 @@
<Compile Include="MachGroupPanel\MyMachGroupVM.vb" />
<Compile Include="MachGroupPanel\PartVM.vb" />
<Compile Include="MachinePanel\MachinePanelVM.vb" />
<Compile Include="MacroFeatureWnd\MacroFeatureWndV.xaml.vb">
<DependentUpon>MacroFeatureWndV.xaml</DependentUpon>
</Compile>
<Compile Include="MacroFeatureWnd\MacroFeatureWndVM.vb" />
<Compile Include="MacroFeatureWnd\NewMacroFeatureWnd.xaml.vb">
<DependentUpon>NewMacroFeatureWnd.xaml</DependentUpon>
</Compile>
<Compile Include="MainMenu\MainMenuV.xaml.vb">
<DependentUpon>MainMenuV.xaml</DependentUpon>
</Compile>
<Compile Include="MainMenu\MainMenuVM.vb" />
<Compile Include="MainMenu\OnlyProdMainMenuV.xaml.vb">
<DependentUpon>OnlyProdMainMenuV.xaml</DependentUpon>
</Compile>
<Compile Include="MainWindow\MainWindowM.vb" />
<Compile Include="MainWindow\MainWindowV.xaml.vb">
<DependentUpon>MainWindowV.xaml</DependentUpon>
</Compile>
<Compile Include="MainWindow\MainWindowVM.vb" />
<Compile Include="MainWindow\OnlyProdMainWindowV.xaml.vb">
<DependentUpon>OnlyProdMainWindowV.xaml</DependentUpon>
</Compile>
<Compile Include="MovePartInRawPartWnd\MovePartInRawPartWndV.xaml.vb">
<DependentUpon>MovePartInRawPartWndV.xaml</DependentUpon>
</Compile>
<Compile Include="MovePartInRawPartWnd\MovePartInRawPartWndVM.vb" />
<Compile Include="MovePartInRawPartWnd\OnlyProdMovePartInRawPartWndV.xaml.vb">
<DependentUpon>OnlyProdMovePartInRawPartWndV.xaml</DependentUpon>
@@ -592,26 +451,14 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="AddFeatureWnd\AddFeatureWndV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="AddFeatureWnd\NewAddFeatureWndV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="AddPartWnd\AddPartWndV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="AddPartWnd\OnlyProdAddPartWndV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="AddRawPartWnd\AddRawPartWndV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="AddRawPartWnd\OnlyProdAddRawPartWndV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
@@ -624,26 +471,14 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="BottomPanel\BottomPanelV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="BTLDataWnd\BTLDataWndV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="BTLPartManager\BTLPartManagerV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="BTLPartManager\OnlyProdBTLPartManagerV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="CALCPanel\CalcPanelV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="CALCPanel\OnlyProdCalcPanelV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
@@ -656,10 +491,6 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="ConfigurationPage\ConfigurationPageV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="ConfigurationPage\OnlyProdCheckVersionV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
@@ -668,50 +499,26 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="FeatureListManager\FeatureListManagerV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="FeatureListManager\OnlyProdFeatureListManagerV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="FeatureManager\FeatureManagerV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="FeatureManager\OnlyProdFeatureManagerV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="FreeContourInput\FreeContourInputV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="FreeContourInput\OnlyProdFreeContourInputV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="FreeContourManager\FreeContourManagerV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="FreeContourManager\OnlyProdFreeContourManagerV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="InputPwdWnd\InputPwdWndV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="InputPwdWnd\OnlyProdInputPwdWndV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="InstrumentPanel\InstrumentPanelV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="InstrumentPanel\OnlyProdInstrumentPanelV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
@@ -720,18 +527,6 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="ItemParamList\BTLPartListV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="ItemParamList\FeatureInPartInRawPartListV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="ItemParamList\FeatureListV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="ItemParamList\OnlyProdBTLPartListV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
@@ -764,62 +559,30 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="ItemParamList\PartInRawPartListV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="ItemParamList\PartParametersV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="ItemParamList\PParameterListV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="ItemParamList\QParameterListV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="ItemParamList\QParamListV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="ItemParamList\RawPartListV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="LeftPanel\OnlyProdLeftPanelV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="MacroFeatureWnd\MacroFeatureWndV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="MacroFeatureWnd\NewMacroFeatureWnd.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="MainMenu\MainMenuV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="MainMenu\OnlyProdMainMenuV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="MainWindow\MainWindowV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="MainWindow\OnlyProdMainWindowV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="MovePartInRawPartWnd\MovePartInRawPartWndV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="MovePartInRawPartWnd\OnlyProdMovePartInRawPartWndV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
@@ -828,10 +591,6 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="NestingRunningWnd\NestingRunningWndV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="NestingRunningWnd\OnlyProdNestingRunningWndV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
@@ -848,30 +607,10 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="OptimizePanel\OptimizePanelV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="PartInRawPartManager\OnlyProdPartInRawPartManagerV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="PartInRawPartManager\PartInRawPartManagerV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="PartInRawPartManager\PartInRawPartManagerWndV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="PartManager\OnlyProdPartManagerV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="PartManager\PartManagerV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="PartParametersWnd\PartParametersWndV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
@@ -881,24 +620,16 @@
<SubType>Designer</SubType>
</Page>
<Page Include="ProdManager\ProdManagerV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="ProdProjManager\ProdProjManagerV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
<Generator>XamlIntelliSenseFileGenerator</Generator>
</Page>
<Page Include="ProjectTypeWnd\OnlyProdProjectTypeWndV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="ProjectTypeWnd\ProjectTypeWndV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Project\ProjectV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
<Generator>XamlIntelliSenseFileGenerator</Generator>
</Page>
<Page Include="ProjManager\ProjManagerV.xaml">
<Generator>MSBuild:Compile</Generator>
@@ -908,10 +639,6 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="RawPartManager\RawPartManagerV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="RawPartManager\RawPartManagerWndV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
@@ -928,42 +655,22 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="ShowBeamPanel\ShowBeamPanelV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="ShowPanel\OnlyProdShowPanelV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="ShowPanel\ShowPanelV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="SpecialPanel\OnlyProdSpecialPanelV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="SpecialPanel\SpecialPanelV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="StatisticsTimePanel\OnlyProdStatisticsTimePanelV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="StatisticsTimePanel\StatisticsTimePanelV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="StatisticsWnd\OptimizerStatisticsWndV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="StatisticsWnd\StatisticsWndV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Statistics\OnlyProdOptimizerStatisticsV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
@@ -976,34 +683,10 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Statistics\OptimizerStatisticsV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Statistics\PDFEditorV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Statistics\StatisticsV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="StatusBar\StatusBarV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="TabWnd\ProdWndV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="TabWnd\ProjWndV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="TopPanel\TopPanelV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="UpdateBTLWnd\OnlyProdUpdateBTLWndV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
@@ -1013,12 +696,12 @@
<SubType>Designer</SubType>
</Page>
<Page Include="UpdateBTLWnd\UpdateBTLWndV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
<Generator>XamlIntelliSenseFileGenerator</Generator>
</Page>
<Page Include="UpdateBTLWnd\UpdateOrAppendWndV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
<Generator>XamlIntelliSenseFileGenerator</Generator>
</Page>
<Page Include="Utility\Dictionary.xaml">
<Generator>MSBuild:Compile</Generator>
@@ -1028,18 +711,10 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="ViewPanel\ViewPanelV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="WarehouseWnd\OnlyProdWarehouseWndV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="WarehouseWnd\WarehouseWndV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\AboutBoxImage.png" />
EgtBEAMWALL.Optimizer/FeatureListManager/FeatureListManagerVM.vb
+8 -22
View File
@@ -259,14 +259,8 @@ Public Class FeatureListManagerVM
If IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart) Then Return
' apro finestra di creazione macro
Dim MacroFeatureWndVM As New MacroFeatureWndVM()
If bOnlyProd Then
Dim NewMacroFeatureWnd As New NewMacroFeatureWnd(Application.Current.MainWindow, MacroFeatureWndVM)
If NewMacroFeatureWnd.ShowDialog() Then
End If
Else
Dim MacroFeatureWnd As New MacroFeatureWndV(Application.Current.MainWindow, MacroFeatureWndVM)
If MacroFeatureWnd.ShowDialog() Then
End If
Dim NewMacroFeatureWnd As New NewMacroFeatureWnd(Application.Current.MainWindow, MacroFeatureWndVM)
If NewMacroFeatureWnd.ShowDialog() Then
End If
End Sub
@@ -297,20 +291,12 @@ Public Class FeatureListManagerVM
Dim NewFeat As BTLFeatureM = Nothing
Dim nNewFeatureId As Integer = 0
Dim bMacroFlag As Boolean = False
If bOnlyProd Then
Dim AddNewFeatureWnd As New NewAddFeatureWndV(Application.Current.MainWindow, AddFeatureWndVM)
If AddNewFeatureWnd.ShowDialog() Then
' verifico se una Macro è selezionata
If AddFeatureWndVM.nSelMacroDefault >= 0 Then
CreateNewFeature(AddFeatureWndVM.MacroDefaultList.Count, AddFeatureWndVM.nSelMacroDefault, AddFeatureWndVM, nNewFeatureId, bMacroFlag, NewFeat)
Else
CreateNewFeature(AddFeatureWndVM.MacroCustomList.Count, AddFeatureWndVM.nSelMacroCustom, AddFeatureWndVM, nNewFeatureId, bMacroFlag, NewFeat)
End If
End If
Else
Dim AddFeatureWnd As New AddFeatureWndV(Application.Current.MainWindow, AddFeatureWndVM)
If AddFeatureWnd.ShowDialog() Then
' verifico se una Macro è selezionata
Dim AddNewFeatureWnd As New NewAddFeatureWndV(Application.Current.MainWindow, AddFeatureWndVM)
If AddNewFeatureWnd.ShowDialog() Then
' verifico se una Macro è selezionata
If AddFeatureWndVM.nSelMacroDefault >= 0 Then
CreateNewFeature(AddFeatureWndVM.MacroDefaultList.Count, AddFeatureWndVM.nSelMacroDefault, AddFeatureWndVM, nNewFeatureId, bMacroFlag, NewFeat)
Else
CreateNewFeature(AddFeatureWndVM.MacroCustomList.Count, AddFeatureWndVM.nSelMacroCustom, AddFeatureWndVM, nNewFeatureId, bMacroFlag, NewFeat)
End If
End If
EgtBEAMWALL.Optimizer/FreeContourManager/FreeContourManagerVM.vb
-8
View File
@@ -320,8 +320,6 @@ Public Class FreeContourManagerVM
m_nNewSecondPathId = GDB_ID.NULL
nSideAngTextLayer = GDB_ID.NULL
SideAngValues.Clear()
' nascondo PartManager
Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProdProjManagerVM.PartManager_Visibility))
' verifico se solido attivo
m_bPrevShowSolid = Map.refShowBeamPanelVM.ShowSolid_IsChecked
If m_bPrevShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(GDB_ID.NULL, False, False)
@@ -436,8 +434,6 @@ Public Class FreeContourManagerVM
Map.refSceneHostVM.MainScene.SetStatusNull()
' attivo bottoni save e cancel
SelFeature.RefreshFCMBtnVisibility()
' nascondo Part Manager
Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProdProjManagerVM.PartManager_Visibility))
' attivo pannello
Map.refProjectVM.SetFreeContourManager_Visibility(True)
EgtDraw()
@@ -534,8 +530,6 @@ Public Class FreeContourManagerVM
nSelPartId = GDB_ID.NULL
nSelFeatureId = GDB_ID.NULL
nProcessingLayerId = GDB_ID.NULL
' riattivo Part Manager
Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProdProjManagerVM.PartManager_Visibility))
' disattivo modifiche su scena
Map.refSceneHostVM.MainScene.SetStatusNull()
If m_bPrevShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(GDB_ID.NULL, True, False)
@@ -554,8 +548,6 @@ Public Class FreeContourManagerVM
' reimposto vista normale per pezzo
Core.ViewPanelVM.BWSetView(If(Core.ViewPanelVM.Type = BWType.BEAM, VT.ISO_SW, VT.TOP), False)
EgtZoom(ZM.ALL)
' rimetto PartManager
Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProdProjManagerVM.PartManager_Visibility))
End Sub
' funzione lanciata su fine creazione percorso
EgtBEAMWALL.Optimizer/InstrumentPanel/MyInstrumentPanelVM.vb
+8 -13
View File
@@ -68,7 +68,7 @@ Public Class MyInstrumentPanelVM
End Set
End Property
Dim m_PrevBottomPanelPage As BottomPanelVM.PartFeatureTab = BottomPanelVM.PartFeatureTab.STRUCTURE_
'Dim m_PrevBottomPanelPage As BottomPanelVM.PartFeatureTab = BottomPanelVM.PartFeatureTab.STRUCTURE_
Private m_Statistics_IsChecked As Boolean = False
Public Property Statistics_IsChecked As Boolean
Get
@@ -78,15 +78,15 @@ Public Class MyInstrumentPanelVM
m_Statistics_IsChecked = value
If Map.refMainMenuVM.SelPage = Pages.VIEW Then
If value Then
' salvo pagina precedente
m_PrevBottomPanelPage = Map.refBottomPanelVM.SelPartFeatureTab
'' salvo pagina precedente
'm_PrevBottomPanelPage = Map.refBottomPanelVM.SelPartFeatureTab
' aggiorno valori totali
Map.refProjectVM.BTLStructureVM.CalcGlobalUpdate()
' seleziono pagina Statistics
Map.refBottomPanelVM.SetSelPartFeatureTab(BottomPanelVM.PartFeatureTab.STATISTICS)
'' seleziono pagina Statistics
'Map.refBottomPanelVM.SetSelPartFeatureTab(BottomPanelVM.PartFeatureTab.STATISTICS)
Else
' seleziono pagina precedente
Map.refBottomPanelVM.SetSelPartFeatureTab(m_PrevBottomPanelPage)
'' seleziono pagina precedente
'Map.refBottomPanelVM.SetSelPartFeatureTab(m_PrevBottomPanelPage)
End If
ElseIf Map.refMainMenuVM.SelPage = Pages.MACHINING Then
If value Then
@@ -94,11 +94,6 @@ Public Class MyInstrumentPanelVM
If Not IsNothing(Map.refProjectVM.MachGroupPanelVM) Then Map.refProjectVM.MachGroupPanelVM.CalcGlobalUpdate()
' aggiorno conto materiali usati
If Not IsNothing(ProjectManagerVM.CurrProd) Then Map.refStatisticsVM.LoadRawPart()
' seleziono pagina Statistics
Map.refTopPanelVM.SetSelTab(TopPanelVM.Tabs.STATISTICS)
Else
' seleziono pagina precedente
Map.refTopPanelVM.SetSelTab(TopPanelVM.Tabs.OPTIMIZATION)
End If
End If
End Set
@@ -320,7 +315,7 @@ Public Class MyInstrumentPanelVM
''' </summary>
Friend Sub Visualization()
m_bVisOtt_Selected = False
Dim StatisticsWndV As New StatisticsWndV(Application.Current.MainWindow, New StatisticsVM())
Dim StatisticsWndV As New OptimizerStatisticsWndV(Application.Current.MainWindow, New StatisticsVM())
StatisticsWndV.ShowDialog()
End Sub
EgtBEAMWALL.Optimizer/InstrumentPanel/OnlyProdInstrumentPanelV.xaml
+2 -2
View File
@@ -10,7 +10,7 @@
<Image Source="/Resources/InstrumentPanel/GetDist.png" Stretch="Uniform"/>
</ToggleButton>
<!--<Button ToolTip="{Binding ChangeParam_ToolTip}"
<Button ToolTip="{Binding ChangeParam_ToolTip}"
Command="{Binding ChangeParameter_Command}"
Visibility="{Binding ChangeParam_Visibility}"
IsEnabled="{Binding InstrumentPanel_IsEnabled}"
@@ -26,7 +26,7 @@
FontSize="12"
Style="{StaticResource ToolBarViewPanel_Button}"/>
<ToggleButton ToolTip="{Binding Statistics_Msg}"
<!--<ToggleButton ToolTip="{Binding Statistics_Msg}"
Visibility="{Binding Statistic_Visibility}"
IsChecked="{Binding Statistics_IsChecked}"
IsEnabled="{Binding Statistics_IsEnabled}"
EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdBTLPartListV.xaml
+3 -1
View File
@@ -360,7 +360,9 @@
<ListBox ItemsSource="{Binding BTLFeatureVMList}"
SelectedItem="{Binding SelBTLFeatureVM, UpdateSourceTrigger=PropertyChanged}"
PreviewMouseWheel="ListBox_PreviewMouseWheel"
PreviewMouseDown="ListBox_PreviewMouseDown">
PreviewMouseDown="ListBox_PreviewMouseDown"
SelectionMode="Single"
IsSynchronizedWithCurrentItem="True">
<ListBox.ItemTemplate>
<DataTemplate>
<Grid>
EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdBTLPartListV.xaml.vb
+13 -13
View File
@@ -112,19 +112,19 @@ Public Class OnlyProdBTLPartListV
End Sub
Private Sub PartList_PreviewMouseDown(sender As Object, e As MouseButtonEventArgs)
If e.ChangedButton = MouseButton.Left Then
If TypeOf sender Is DataGridRow Then
Dim Row As DataGridRow = DirectCast(sender, DataGridRow)
If TypeOf Row.DataContext IsNot BTLPartVM Then Return
Dim VM As BTLPartVM = DirectCast(Row.DataContext, BTLPartVM)
VM.SetOpenFeatureList(Not VM.bOpenFeatureList)
If Row.IsSelected Then
VM.bOpenFeatureList = Not VM.bOpenFeatureList
Else
VM.bOpenFeatureList = False
End If
End If
End If
'If e.ChangedButton = MouseButton.Left Then
' If TypeOf sender Is DataGridRow Then
' Dim Row As DataGridRow = DirectCast(sender, DataGridRow)
' If TypeOf Row.DataContext IsNot BTLPartVM Then Return
' Dim VM As BTLPartVM = DirectCast(Row.DataContext, BTLPartVM)
' VM.SetOpenFeatureList(Not VM.bOpenFeatureList)
' If Row.IsSelected Then
' VM.bOpenFeatureList = Not VM.bOpenFeatureList
' Else
' VM.bOpenFeatureList = False
' End If
' End If
'End If
'If TypeOf sender Is DataGridRow Then
' Dim Row As DataGridRow = DirectCast(sender, DataGridRow)
' If Not Row.IsSelected Then Return
EgtBEAMWALL.Optimizer/ItemParamList/RawPartListVM.vb
-2
View File
@@ -1,8 +1,6 @@
Imports System.Collections.ObjectModel
Imports EgtBEAMWALL.Core
Imports EgtUILib
Imports EgtWPFLib5
Imports System.IO
Public Class RawPartListVM
EgtBEAMWALL.Optimizer/LeftPanel/LeftPanelVM.vb
-22
View File
@@ -33,28 +33,6 @@ Public Class LeftPanelVM
End Get
End Property
Private m_Parameters_IsEnabled As Boolean = False
Public ReadOnly Property Parameters_IsEnabled As Boolean
Get
Return m_Parameters_IsEnabled
End Get
End Property
Friend Sub SetParametersIsEnabled(bIsEnabled As Boolean)
m_Parameters_IsEnabled = bIsEnabled
NotifyPropertyChanged(NameOf(Parameters_IsEnabled))
End Sub
Private m_Data_IsEnabled As Boolean = False
Public ReadOnly Property Data_IsEnabled As Boolean
Get
Return m_Data_IsEnabled
End Get
End Property
Friend Sub SetData_IsEnabled(bIsEnabled As Boolean)
m_Data_IsEnabled = bIsEnabled
NotifyPropertyChanged(NameOf(Data_IsEnabled))
End Sub
Private m_OnlyProdPartManagerVisibility As Visibility = Visibility.Collapsed
Public ReadOnly Property OnlyProdPartManagerVisibility As Visibility
Get
EgtBEAMWALL.Optimizer/LeftPanel/OnlyProdLeftPanelV.xaml
-2
View File
@@ -35,14 +35,12 @@
</Grid.ColumnDefinitions>
<Button Command="{Binding Data_Command}"
ToolTip="{Binding Data_ToolTip}"
IsEnabled="{Binding Data_IsEnabled}"
Style="{StaticResource OnlyProdLeftPanel_Button}">
<Image Source="/Resources/InstrumentPanel/Analyze.png" Stretch="Uniform"/>
</Button>
<Button Grid.Column="1"
Command="{Binding Parameter_Command}"
ToolTip="{Binding Parameters_ToolTip}"
IsEnabled="{Binding Parameters_IsEnabled}"
Style="{StaticResource OnlyProdLeftPanel_Button}">
<Image Source="/Resources/InstrumentPanel/Analyze.png" Stretch="Uniform"/>
</Button>
EgtBEAMWALL.Optimizer/MachGroupPanel/MyMachGroupPanelVM.vb
+1 -6
View File
@@ -37,7 +37,6 @@ Public Class MyMachGroupPanelVM
Next
' e lo evidenzio
If Map.refShowBeamPanelVM.ShowBuilding_IsChecked Then
Map.refProdProjManagerVM.SelProdProj = ProdProj.NULL
Map.refShowBeamPanelVM.SetShowSolid(False)
Else
Map.refProjectVM.BTLStructureVM.SetSelectionType(BTLStructureVM.SelectionTypes.HIGHLIGHT)
@@ -200,11 +199,7 @@ Public Class MyMachGroupPanelVM
End While
' se cancellato almeno un pezzo
If bDuploToDeleteFound Then
If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
Map.refOnlyProdManagerVM.Save()
Else
Map.refProdManagerVM.Save()
End If
Map.refOnlyProdManagerVM.Save()
End If
EgtResetCurrMachGroup()
End Sub
EgtBEAMWALL.Optimizer/MachGroupPanel/MyMachGroupVM.vb
+15 -49
View File
@@ -438,11 +438,7 @@ Public Class MyMachGroupVM
Dim sCurrMachGroupName As String = ""
EgtGetMachGroupName(nCurrMachGroup, sCurrMachGroupName)
' scrivo dati per variabili P di comunicazione con la macchina in gruppo di lavorazione
If Not IsNothing(Map.refProdManagerVM) Then
EgtSetInfo(nCurrMachGroup, MGR_RPT_PRODID, ProjectManagerVM.CurrProd.nProdId)
ElseIf Not IsNothing(Map.refOnlyProdManagerVM) Then
EgtSetInfo(nCurrMachGroup, MGR_RPT_PRODID, ProjectManagerVM.CurrProd.nProdId)
End If
EgtSetInfo(nCurrMachGroup, MGR_RPT_PRODID, ProjectManagerVM.CurrProd.nProdId)
EgtSetInfo(nCurrMachGroup, MGR_RPT_MATERIAL, sMATERIAL)
EgtSetInfo(nCurrMachGroup, MGR_RPT_PATTID, nCurrMachGroup)
' scrivo dati costruzione grezzo in gruppo di lavorazione
@@ -656,7 +652,7 @@ Public Class MyMachGroupVM
End Function
Private Sub ReadProductionState()
If IsNothing(Map.refProdManagerVM) OrElse IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(ProjectManagerVM.CurrProd.nProdId) Then Return
If IsNothing(Map.refOnlyProdManagerVM) OrElse IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(ProjectManagerVM.CurrProd.nProdId) Then Return
Dim MachGroupModel As MachGroupModel = DbControllers.m_MachGroupController.FindByMachGroupId(ProjectManagerVM.CurrProd.nProdId, Id)
If Not IsNothing(MachGroupModel) Then
If Not String.IsNullOrEmpty(MachGroupModel.SupervisorId) Then
@@ -984,32 +980,18 @@ Public Class MyMachGroupVM
''' Execute the Open. This method is invoked by the OpenCommand.
''' </summary>
Friend Sub Verify()
If (Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso (IsNothing(ProjectManagerVM.CurrProj) OrElse IsNothing(Map.refProjectVM.BTLStructureVM))) OrElse
(Map.refMainMenuVM.SelPage = Pages.MACHINING AndAlso (IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM))) OrElse
(Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE AndAlso (IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.BTLStructureVM) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM))) Then Return
If ((IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.BTLStructureVM) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM))) Then Return
Dim ProjType As BWType
Dim BarList() As EgtBEAMWALL.Core.Bar = Nothing
If Map.refMainMenuVM.SelPage = Pages.VIEW Then
ProjType = ProjectManagerVM.CurrProj.nType
ProjType = ProjectManagerVM.CurrProd.nType
If Map.refProjectVM.LastSelGridType = ProjectVM.GridSelTypes.PART Then
If Not CreateBarToVerify(Pages.VIEW, ProjType, BarList) Then Return
' lancio calcolo
EgtBEAMWALL.Core.CalcIntegration.Run(BarList, ProjectManagerVM.CurrProj.sProjDirPath, AddressOf ManageCalc)
ElseIf Map.refMainMenuVM.SelPage = Pages.MACHINING Then
ProjType = ProjectManagerVM.CurrProd.nType
EgtBEAMWALL.Core.CalcIntegration.Run(BarList, Map.refOnlyProdManagerVM.CurrProj.sProjDirPath, AddressOf ManageCalc)
ElseIf Map.refProjectVM.LastSelGridType = ProjectVM.GridSelTypes.MACHGROUP Then
If Not CreateBarToVerify(Pages.MACHINING, ProjType, BarList) Then Return
' lancio calcolo
EgtBEAMWALL.Core.CalcIntegration.Run(BarList, ProjectManagerVM.CurrProd.sProdDirPath, AddressOf ManageCalc)
ElseIf Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
ProjType = ProjectManagerVM.CurrProd.nType
If Map.refProjectVM.LastSelGridType = ProjectVM.GridSelTypes.PART Then
If Not CreateBarToVerify(Pages.VIEW, ProjType, BarList) Then Return
' lancio calcolo
EgtBEAMWALL.Core.CalcIntegration.Run(BarList, Map.refOnlyProdManagerVM.CurrProj.sProjDirPath, AddressOf ManageCalc)
ElseIf Map.refProjectVM.LastSelGridType = ProjectVM.GridSelTypes.MACHGROUP Then
If Not CreateBarToVerify(Pages.MACHINING, ProjType, BarList) Then Return
' lancio calcolo
EgtBEAMWALL.Core.CalcIntegration.Run(BarList, Map.refOnlyProdManagerVM.CurrProd.sProdDirPath, AddressOf ManageCalc)
End If
EgtBEAMWALL.Core.CalcIntegration.Run(BarList, Map.refOnlyProdManagerVM.CurrProd.sProdDirPath, AddressOf ManageCalc)
End If
End Sub
@@ -1116,32 +1098,18 @@ Public Class MyMachGroupVM
''' Execute the Open. This method is invoked by the OpenCommand.
''' </summary>
Friend Sub Simulate()
If (Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso (IsNothing(ProjectManagerVM.CurrProj) OrElse IsNothing(Map.refProjectVM.BTLStructureVM))) OrElse
(Map.refMainMenuVM.SelPage = Pages.MACHINING AndAlso (IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM))) OrElse
(Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE AndAlso (IsNothing(ProjectManagerVM.CurrProj) OrElse IsNothing(Map.refProjectVM.BTLStructureVM)) AndAlso (IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM))) Then Return
If ((IsNothing(ProjectManagerVM.CurrProj) OrElse IsNothing(Map.refProjectVM.BTLStructureVM)) AndAlso (IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM))) Then Return
Dim ProjType As BWType
Dim BarList() As EgtBEAMWALL.Core.Bar = Nothing
If Map.refMainMenuVM.SelPage = Pages.VIEW Then
ProjType = ProjectManagerVM.CurrProj.nType
ProjType = Map.refOnlyProdManagerVM.CurrProd.nType
If Map.refProjectVM.LastSelGridType = ProjectVM.GridSelTypes.PART Then
If Not CreateBarToSimulate(Pages.VIEW, ProjType, BarList) Then Return
' lancio simulazione
EgtBEAMWALL.Core.CalcIntegration.Run(BarList, ProjectManagerVM.CurrProj.sProjDirPath, AddressOf ManageCalc)
ElseIf Map.refMainMenuVM.SelPage = Pages.MACHINING Then
ProjType = ProjectManagerVM.CurrProd.nType
ElseIf Map.refProjectVM.LastSelGridType = ProjectVM.GridSelTypes.MACHGROUP Then
If Not CreateBarToSimulate(Pages.MACHINING, ProjType, BarList) Then Return
' lancio simulazione
EgtBEAMWALL.Core.CalcIntegration.Run(BarList, ProjectManagerVM.CurrProd.sProdDirPath, AddressOf ManageCalc)
ElseIf Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
ProjType = Map.refOnlyProdManagerVM.CurrProd.nType
If Map.refProjectVM.LastSelGridType = ProjectVM.GridSelTypes.PART Then
If Not CreateBarToSimulate(Pages.VIEW, ProjType, BarList) Then Return
' lancio simulazione
EgtBEAMWALL.Core.CalcIntegration.Run(BarList, ProjectManagerVM.CurrProj.sProjDirPath, AddressOf ManageCalc)
ElseIf Map.refProjectVM.LastSelGridType = ProjectVM.GridSelTypes.MACHGROUP Then
If Not CreateBarToSimulate(Pages.MACHINING, ProjType, BarList) Then Return
' lancio simulazione
EgtBEAMWALL.Core.CalcIntegration.Run(BarList, ProjectManagerVM.CurrProd.sProdDirPath, AddressOf ManageCalc)
End If
End If
End Sub
@@ -1241,8 +1209,8 @@ Public Class MyMachGroupVM
sSaveExt = "." & sSaveExt
End If
Try
Dim sMachGroupFilePath As String = Map.refProdManagerVM.CurrProd.sProdDirPath & "\" & Map.refMachGroupPanelVM.SelectedMachGroup.Name.ToString() & ".cnc"
Dim sNewPath As String = sSaveCncPath & "\" & Map.refProdManagerVM.CurrProd.sProdId & "-" & Map.refMachGroupPanelVM.SelectedMachGroup.Name.ToString() & sSaveExt
Dim sMachGroupFilePath As String = Map.refOnlyProdManagerVM.CurrProd.sProdDirPath & "\" & Map.refMachGroupPanelVM.SelectedMachGroup.Name.ToString() & ".cnc"
Dim sNewPath As String = sSaveCncPath & "\" & Map.refOnlyProdManagerVM.CurrProd.sProdId & "-" & Map.refMachGroupPanelVM.SelectedMachGroup.Name.ToString() & sSaveExt
File.Copy(sMachGroupFilePath, sNewPath, True)
MessageBox.Show(String.Format("File copied! You can find it at {0}", {sNewPath}), "Info", MessageBoxButton.OK, MessageBoxImage.Information)
Catch ex As Exception
@@ -1258,9 +1226,7 @@ Public Class MyMachGroupVM
If MachGroup.nProduction_State >= ItemState.Assigned Then Return False
If MachGroup.nGlobalState = CalcStates.OK Or MachGroup.nGlobalState = CalcStates.INFO Then
' se ci sono modifiche, salvo il pogetto
If EgtGetModified() AndAlso Map.refMainMenuVM.SelPage = Pages.MACHINING Then
Map.refProdManagerVM.Save()
ElseIf EgtGetModified() AndAlso Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
If EgtGetModified() Then
Map.refOnlyProdManagerVM.Save()
End If
' mando al supervisore
EgtBEAMWALL.Optimizer/MachGroupPanel/PartVM.vb
+2 -4
View File
@@ -355,9 +355,7 @@ Public Class PartVM
End If
ParentMachGroupVM.PartVMList.Remove(Me)
' aggiorno Db
If Map.refMainMenuVM.SelPage = Pages.MACHINING AndAlso Not IsNothing(Map.refProdManagerVM) Then
DbControllers.m_PartController.Delete(ProjectManagerVM.CurrProd.nProdId, ParentMachGroupVM.Id, nPartId)
ElseIf Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE AndAlso Not IsNothing(Map.refOnlyProdManagerVM) Then
If Not IsNothing(Map.refOnlyProdManagerVM) Then
DbControllers.m_PartController.Delete(ProjectManagerVM.CurrProd.nProdId, ParentMachGroupVM.Id, nPartId)
End If
If nType = MachineType.BEAM Then
@@ -505,7 +503,7 @@ Public Class PartVM
End Sub
Private Sub ReadProductionData()
If IsNothing(Map.refProdManagerVM) OrElse IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(ProjectManagerVM.CurrProd.nProdId) Then Return
If IsNothing(Map.refOnlyProdManagerVM) OrElse IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(ProjectManagerVM.CurrProd.nProdId) Then Return
Dim PartModel As PartModel = DbControllers.m_PartController.FindByPartId(ProjectManagerVM.CurrProd.nProdId, nPartId)
If Not IsNothing(PartModel) Then
PartM.SetProductionState(PartModel.State)
EgtBEAMWALL.Optimizer/MainMenu/MainMenuVM.vb
-10
View File
@@ -315,11 +315,9 @@ Public Class MainMenuVM
If Not IsNothing(Map.refProjectVM.BTLStructureVM) Then
Map.refRawPartListVM.UpdateColumns(Map.refProjectVM.BTLStructureVM.nPROJTYPE)
Map.refFeatureInPartInRawPartListVM.UpdateColumns(CurrentMachine.nType)
Map.refTopPanelVM.ManageQParamsRowVisibility(Map.refProjectVM.BTLStructureVM.nPROJTYPE <> BWType.BEAM)
Else
Map.refRawPartListVM.UpdateColumns(BWType.BEAM)
Map.refFeatureInPartInRawPartListVM.UpdateColumns(CurrentMachine.nType)
Map.refTopPanelVM.ManageQParamsRowVisibility(BWType.BEAM)
End If
' resetto modifica parametri Q default
Map.refConfigurationPageVM.ResetQParametersModified()
@@ -408,7 +406,6 @@ Public Class MainMenuVM
' aggiorno le colonne in base al tipo progetto
Map.refRawPartListVM.UpdateColumns(Map.refProjectVM.BTLStructureVM.nPROJTYPE)
Map.refFeatureInPartInRawPartListVM.UpdateColumns(CurrentMachine.nType)
Map.refTopPanelVM.ManageQParamsRowVisibility(Map.refProjectVM.BTLStructureVM.nPROJTYPE <> BWType.BEAM)
' resetto modifica parametri Q default
Map.refConfigurationPageVM.ResetQParametersModified()
DbControllers.m_ProdController.LockByProdId(ProjectManagerVM.CurrProd.nProdId, True, Map.refMainWindowVM.MainWindowM.GetKeyNumber())
@@ -485,7 +482,6 @@ Public Class MainMenuVM
Map.refInstrumentPanelVM.NotifyPropertyChanged(NameOf(Map.refInstrumentPanelVM.Statistic_Visibility))
Map.refInstrumentPanelVM.NotifyPropertyChanged(NameOf(Map.refInstrumentPanelVM.VisStatistic_Visibility))
Map.refInstrumentPanelVM.NotifyPropertyChanged(NameOf(Map.refInstrumentPanelVM.OtStatistic_Visibility))
Map.refTopPanelVM.NotifyPropertyChanged(NameOf(Map.refPartInRawPartManagerVM.MovePart_Visibility))
Map.refProjectVM.SetBottomPanel_Visibility(False)
Map.refProjectVM.SetLeftPanel_Visibility(True)
If Not IsNothing(Map.refFeatureListManagerVM) Then Map.refFeatureListManagerVM.UpdateView()
@@ -500,7 +496,6 @@ Public Class MainMenuVM
Map.refProjectVM.SetOnlyProdOptimizePanel_Visibility(False)
Map.refProjectVM.NotifyAllPanelVisibility()
Map.refCALCPanelVM.SetChooseMachineBtn_Visibility(False)
Map.refTopPanelVM.UpdateQParameterVisibility()
Map.refRawPartManagerVM.UpdateMovePartInRawPartVisibility()
Map.refStatisticsTimePanelVM.SetStatisticsTimePanel_Visibility()
' aggiorno la visibilità delle colonne
@@ -564,11 +559,9 @@ Public Class MainMenuVM
If Not IsNothing(Map.refProjectVM.BTLStructureVM) Then
Map.refRawPartListVM.UpdateColumns(Map.refProjectVM.BTLStructureVM.nPROJTYPE)
Map.refFeatureInPartInRawPartListVM.UpdateColumns(CurrentMachine.nType)
If Not IsNothing(Map.refTopPanelVM) Then Map.refTopPanelVM.ManageQParamsRowVisibility(Map.refProjectVM.BTLStructureVM.nPROJTYPE <> BWType.BEAM)
Else
Map.refRawPartListVM.UpdateColumns(BWType.BEAM)
Map.refFeatureInPartInRawPartListVM.UpdateColumns(CurrentMachine.nType)
Map.refTopPanelVM.ManageQParamsRowVisibility(BWType.BEAM)
End If
Return True
End Function
@@ -613,9 +606,6 @@ Public Class MainMenuVM
' aggiorno le colonne in base al tipo progetto
Map.refRawPartListVM.UpdateColumns(Map.refProjectVM.BTLStructureVM.nPROJTYPE)
Map.refFeatureInPartInRawPartListVM.UpdateColumns(CurrentMachine.nType)
If Not IsNothing(Map.refTopPanelVM) Then
Map.refTopPanelVM.ManageQParamsRowVisibility(Map.refProjectVM.BTLStructureVM.BTLStructureM.nPROJTYPE <> BWType.BEAM)
End If
Map.refRawPartListVM.UpdateColumns(Map.refProjectVM.BTLStructureVM.nPROJTYPE)
' resetto modifica parametri Q default
Map.refConfigurationPageVM.ResetQParametersModified()
EgtBEAMWALL.Optimizer/MainWindow/MainWindowV.xaml
+2 -2
View File
@@ -11,9 +11,9 @@
AllowDrop="True" Drop="MainWindowV_Drop"
ShowInTaskbar="True"
CloseCommand="{Binding CloseApplicationCommand,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}">
<EgtWPFLib5:EgtCustomWindow.TitlePanel>
<!--<EgtWPFLib5:EgtCustomWindow.TitlePanel>
<EgtBEAMWALL:MainMenuV DataContext="{StaticResource MainMenuVM}"/>
</EgtWPFLib5:EgtCustomWindow.TitlePanel>
</EgtWPFLib5:EgtCustomWindow.TitlePanel>-->
<!--Pannello principale -->
<DockPanel>
EgtBEAMWALL.Optimizer/MainWindow/MainWindowVM.vb
+6 -34
View File
@@ -55,18 +55,6 @@ Public Class MainWindowVM
End Get
End Property
Public ReadOnly Property ProjectContent As Object
Get
Return If(Map.refMainWindowVM.MainWindowM.bOnlyProd, New OnlyProdProjectV(), New ProjectV())
End Get
End Property
Public ReadOnly Property ConfigurationPageContent As Object
Get
Return If(Map.refMainWindowVM.MainWindowM.bOnlyProd, New OnlyProdConfigurationPageV(), New ConfigurationPageV())
End Get
End Property
'Friend m_SupervisorStop As Boolean = False
Private BlockedWnd As BlockedWndV
@@ -171,12 +159,8 @@ Public Class MainWindowVM
If ProcessCommandLine(nCommandType, nPage, nProdId) Then
Select Case nCommandType
Case 1
If Map.refMainWindowVM.MainWindowM.bOnlyProd Then
Map.refOnlyProdManagerVM.SetCurrProd(nProdId)
Map.refOnlyProdManagerVM.SetCurrProj(Map.refOnlyProdManagerVM.CurrProd.nProjId)
Else
Map.refProdManagerVM.SetCurrProd(nProdId)
End If
Map.refOnlyProdManagerVM.SetCurrProd(nProdId)
Map.refOnlyProdManagerVM.SetCurrProj(Map.refOnlyProdManagerVM.CurrProd.nProjId)
Case 2
' pagina gia' impostata nella variabile
End Select
@@ -184,21 +168,15 @@ Public Class MainWindowVM
' setto il primo file dalla lista degli MRU come progetto corrente da aprire
Dim sLastProjectPath As String = String.Empty
Dim sMruSection As String = S_MRUPROJFILES
If Map.refMainWindowVM.MainWindowM.bOnlyProd Then
sMruSection = S_MRUPRODFILES
End If
sMruSection = S_MRUPRODFILES
GetMainPrivateProfileString(sMruSection, K_FILE & "1", String.Empty, sLastProjectPath)
If Not String.IsNullOrWhiteSpace(sLastProjectPath) AndAlso File.Exists(sLastProjectPath) Then
' ricavo l'Id e il progetto associato per l'apertura di quest'ultimo
Dim PjId As Integer = 0
Dim sPjId As String = Path.GetFileNameWithoutExtension(sLastProjectPath)
Integer.TryParse(sPjId, PjId)
If Map.refMainWindowVM.MainWindowM.bOnlyProd Then
Map.refOnlyProdManagerVM.SetCurrProd(PjId)
If Not IsNothing(Map.refOnlyProdManagerVM.CurrProj) Then Map.refOnlyProdManagerVM.SetCurrProj(Map.refOnlyProdManagerVM.CurrProd.nProjIdList(0))
Else
Map.refProjManagerVM.SetCurrProj(PjId)
End If
Map.refOnlyProdManagerVM.SetCurrProd(PjId)
If Not IsNothing(Map.refOnlyProdManagerVM.CurrProj) Then Map.refOnlyProdManagerVM.SetCurrProj(Map.refOnlyProdManagerVM.CurrProd.nProjIdList(0))
End If
End If
' seleziono pagina da aprire
@@ -413,13 +391,7 @@ Public Class MainWindowVM
Dim sFilePath As String = String.Empty
If EgtGetCurrFilePath(sFilePath) Then WriteMainPrivateProfileString(S_GENERAL, K_LASTPROJ, sFilePath)
' tolgo lock da file aperto
If Map.refMainMenuVM.SelPage = Pages.VIEW And Not IsNothing(Map.refProjManagerVM) AndAlso Not IsNothing(ProjectManagerVM.CurrProj) Then
DbControllers.m_ProjController.LockByProjId(ProjectManagerVM.CurrProj.nProjId, False, Map.refMainWindowVM.MainWindowM.GetKeyNumber())
ElseIf Map.refMainMenuVM.SelPage = Pages.MACHINING And Not IsNothing(Map.refProdManagerVM) AndAlso Not IsNothing(ProjectManagerVM.CurrProd) Then
DbControllers.m_ProdController.LockByProdId(ProjectManagerVM.CurrProd.nProdId, False, Map.refMainWindowVM.MainWindowM.GetKeyNumber())
ElseIf Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE And Not IsNothing(Map.refOnlyProdManagerVM) AndAlso Not IsNothing(ProjectManagerVM.CurrProd) Then
DbControllers.m_ProdController.LockByProdId(ProjectManagerVM.CurrProd.nProdId, False, Map.refMainWindowVM.MainWindowM.GetKeyNumber())
End If
DbControllers.m_ProdController.LockByProdId(ProjectManagerVM.CurrProd.nProdId, False, Map.refMainWindowVM.MainWindowM.GetKeyNumber())
' Termino il Model
m_MainWindowM.Close()
' Termino il programma
EgtBEAMWALL.Optimizer/MainWindow/OnlyProdMainWindowV.xaml
+2 -2
View File
@@ -31,10 +31,10 @@
</Style>
</TabControl.ItemContainerStyle>
<TabItem>
<ContentControl Content="{Binding ProjectContent}"/>
<EgtBEAMWALL:OnlyProdProjectV DataContext="{StaticResource ProjectVM}"/>
</TabItem>
<TabItem>
<ContentControl Content="{Binding ConfigurationPageContent}"/>
<EgtBEAMWALL:OnlyProdConfigurationPageV DataContext="{StaticResource ConfigurationPageVM}"/>
</TabItem>
</TabControl>
EgtBEAMWALL.Optimizer/OnlyProdManager/OnlyProdManagerVM.vb
+1 -2
View File
@@ -600,7 +600,7 @@ Public Class OnlyProdManagerVM
Dim DialogResult As Boolean? = OpenFile.EgtShowDialog(ProjectType.PROD)
If IsNothing(DialogResult) OrElse Not DialogResult Then Return
sFilePath = OpenProjectFileDialogVM.SelProject.sProdPath
TempCurrProd = OpenProjectFileDialogVM.SelProject
m_TempCurrProd = OpenProjectFileDialogVM.SelProject
End If
Else
sFilePath = If(Not IsNothing(TempCurrProd.sProdPath), TempCurrProd.sProdPath, "")
@@ -617,7 +617,6 @@ Public Class OnlyProdManagerVM
Else
If Map.refSceneHostVM.MainController.OpenProject(sFilePath, False) Then
Map.refProjectVM.SetOptimizePanel_Visibility(True)
If Not IsNothing(Map.refTopPanelVM) Then Map.refTopPanelVM.UpdateQParameterVisibility()
End If
End If
' imposto flag secondo tipo di progetto (travi o pareti)
EgtBEAMWALL.Optimizer/OnlyProdProject/OnlyProdProjectV.xaml
-24
View File
@@ -113,30 +113,6 @@
DataContext="{StaticResource PParameterListVM}"
Tag="{Binding DataContext.BTLStructureVM.SelBTLPart.SelBTLFeatureVM, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"
Margin="5"/>
<!--<TabControl Grid.Row="1"
Style="{StaticResource OnlyProd_TabControl}">
<TabItem Header="Parametri Geometrici">
<TabItem.Content>
<Border Style="{StaticResource OnlyProdPage_Border}">
<EgtBEAMWALL:OnlyProdPParameterListV DataContext="{StaticResource PParameterListVM}"
Tag="{Binding DataContext.BTLStructureVM.SelBTLPart.SelBTLFeatureVM, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"
Margin="5"/>
</Border>
</TabItem.Content>
</TabItem>
<TabItem Header="Parametri di Lavorazione">
<TabItem.Content>
<Border Style="{StaticResource OnlyProdPage_Border}">
<EgtBEAMWALL:OnlyProdQParameterListV DataContext="{StaticResource QParameterListVM}"
Tag="{Binding DataContext.BTLStructureVM.SelBTLPart.SelBTLFeatureVM, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"
Margin="5"/>
</Border>
</TabItem.Content>
</TabItem>
</TabControl>-->
</Grid>
</TabItem.Content>
EgtBEAMWALL.Optimizer/OpenProjectFileDialog/OpenProjectFileDialogVM.vb
-1
View File
@@ -3,7 +3,6 @@ Imports System.IO
Imports EgtBEAMWALL.Core
Imports EgtBEAMWALL.Core.ConstBeam
Imports EgtUILib
Imports EgtWPFLib5
Public Class OpenProjectFileDialogVM
Inherits Core.OpenProjectFileDialogVM
EgtBEAMWALL.Optimizer/OptimizePanel/OptimizePanelVM.vb
+3 -12
View File
@@ -249,7 +249,7 @@ Public Class OptimizePanelVM
Dim bShowBuilding As Boolean = False
Configuration.ShowAllPieces(bShowBuilding)
Dim NestingRunningWndVM As New NestingRunningWndVM(m_SelPartType.Id, BTLPart)
Dim NestingRunningWnd As New NestingRunningWndV(Application.Current.MainWindow, NestingRunningWndVM)
Dim NestingRunningWnd As New OnlyProdNestingRunningWndV(Application.Current.MainWindow, NestingRunningWndVM)
NestingRunningWnd.ShowDialog()
' se assemblato lo ripristino
If bShowBuilding Then Map.refProjectVM.BTLStructureVM.ShowBuilding(True, False)
@@ -411,11 +411,7 @@ Public Class OptimizePanelVM
Else
NestingRunningWndVM = New NestingRunningWndVM(m_SelPartType.Id, m_bLDIntersOther, m_nMinScore)
End If
If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
NestingRunningWnd = New OnlyProdNestingRunningWndV(Application.Current.MainWindow, NestingRunningWndVM)
Else
NestingRunningWnd = New NestingRunningWndV(Application.Current.MainWindow, NestingRunningWndVM)
End If
NestingRunningWnd = New OnlyProdNestingRunningWndV(Application.Current.MainWindow, NestingRunningWndVM)
NestingRunningWnd.ShowDialog()
m_bNestingRunning = False
' se nessun grezzo, rimetto tutti i pezzi invisibili
@@ -485,12 +481,7 @@ Public Class OptimizePanelVM
''' </summary>
Friend Sub Warehouse()
If Not IsNothing(Map.refProjectVM.BTLStructureVM) Then 'If Not IsNothing(ProjectManagerVM.CurrProd) Then
Dim WarehouseWnd As Object
If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
WarehouseWnd = New OnlyProdWarehouseWndV(Application.Current.MainWindow, New WarehouseWndVM())
Else
WarehouseWnd = New WarehouseWndV(Application.Current.MainWindow, New WarehouseWndVM())
End If
Dim WarehouseWnd As New OnlyProdWarehouseWndV(Application.Current.MainWindow, New WarehouseWndVM())
WarehouseWnd.ShowDialog()
End If
End Sub
EgtBEAMWALL.Optimizer/ProdManager/ProdManagerVM.vb
-1
View File
@@ -311,7 +311,6 @@ Public Class ProdManagerVM
Else
If Map.refSceneHostVM.MainController.OpenProject(sFilePath, False) Then
Map.refProjectVM.SetOptimizePanel_Visibility(True)
Map.refTopPanelVM.UpdateQParameterVisibility()
End If
End If
' imposto flag secondo tipo di progetto (travi o pareti)
EgtBEAMWALL.Optimizer/Project/ProjectV.xaml
+16 -16
View File
@@ -10,10 +10,10 @@
Visibility="{Binding DataContext.ProjManager_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProjectV}}}"/>
<EgtBEAMWALL:ProdManagerV DataContext="{StaticResource ProdManagerVM}"
Visibility="{Binding DataContext.ProdManager_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProjectV}}}"/>
<EgtBEAMWALL:OptimizePanelV DataContext="{StaticResource OptimizePanelVM}"
Visibility="{Binding DataContext.OptimizePanel_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProjectV}}}"/>
<EgtBEAMWALL:StatisticsTimePanelV DataContext="{StaticResource StatisticsTimePanelVM}"
Tag="{Binding DataContext, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProjectV}}}"/>
<!--<EgtBEAMWALL:OptimizePanelV DataContext="{StaticResource OptimizePanelVM}"
Visibility="{Binding DataContext.OptimizePanel_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProjectV}}}"/>-->
<!--<EgtBEAMWALL:StatisticsTimePanelV DataContext="{StaticResource StatisticsTimePanelVM}"
Tag="{Binding DataContext, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProjectV}}}"/>-->
</EgtFloating:EgtFloatingTray>
@@ -47,12 +47,12 @@
<EgtBEAMWALL:ShowBeamPanelV DataContext="{StaticResource ShowBeamPanelVM}"
Visibility="{Binding DataContext.ShowBeamPanel_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProjectV}}}"/>
<EgtBEAMWALL:ViewPanelV DataContext="{StaticResource ViewPanelVM}"/>
<EgtBEAMWALL:InstrumentPanelV DataContext="{StaticResource InstrumentPanelVM}"/>
<EgtBEAMWALL:CalcPanelV DataContext="{StaticResource CALCPanelVM}"/>
<!--<EgtBEAMWALL:InstrumentPanelV DataContext="{StaticResource InstrumentPanelVM}"/>-->
<!--<EgtBEAMWALL:CalcPanelV DataContext="{StaticResource CALCPanelVM}"/>-->
<EgtBEAMWALL:SpecialPanelV DataContext="{StaticResource SpecialPanelVM}"
Visibility="{Binding DataContext.SpecialPanel_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProjectV}}}"/>
<EgtBEAMWALL:FreeContourManagerV DataContext="{StaticResource FreeContourManagerVM}"
Visibility="{Binding DataContext.FreeContourManager_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProjectV}}}"/>
<!--<EgtBEAMWALL:FreeContourManagerV DataContext="{StaticResource FreeContourManagerVM}"
Visibility="{Binding DataContext.FreeContourManager_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProjectV}}}"/>-->
</WrapPanel>
</EgtFloating:EgtFloatingTray>
<EgtBEAMWALL:SceneHostV Grid.Column="2" Grid.Row="1"/>
@@ -66,22 +66,22 @@
<RowDefinition Height="Auto"/>
<RowDefinition MinHeight="5"/>
</Grid.RowDefinitions>
<EgtBEAMWALL:FreeContourInputV Grid.Row="0"
<!--<EgtBEAMWALL:FreeContourInputV Grid.Row="0"
DataContext="{StaticResource FreeContourInputVM}"
Visibility="{Binding DataContext.FreeContourManager_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProjectV}}}"/>
<EgtBEAMWALL:PartManagerV Grid.Row="0"
Visibility="{Binding DataContext.FreeContourManager_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProjectV}}}"/>-->
<!--<EgtBEAMWALL:PartManagerV Grid.Row="0"
DataContext="{StaticResource PartManagerVM}"
Tag="{Binding DataContext.BTLStructureVM.SelBTLPart, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProjectV}}}"
Visibility="{Binding DataContext.PartManager_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProjectV}}}"/>
Visibility="{Binding DataContext.PartManager_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProjectV}}}"/>-->
<Grid Grid.Column="2" Grid.Row="1">
<EgtBEAMWALL:TopPanelV DataContext="{StaticResource TopPanelVM}"
<!--<EgtBEAMWALL:TopPanelV DataContext="{StaticResource TopPanelVM}"
Tag="{Binding DataContext, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProjectV}}}"
Visibility="{Binding DataContext.TopPanel_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProjectV}}}"
Height="Auto"/>
<EgtBEAMWALL:BottomPanelV DataContext="{StaticResource BottomPanelVM}"
Height="Auto"/>-->
<!--<EgtBEAMWALL:BottomPanelV DataContext="{StaticResource BottomPanelVM}"
Tag="{Binding DataContext.BTLStructureVM, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProjectV}}}"
Visibility="{Binding DataContext.BottomPanel_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProjectV}}}"
Height="Auto"/>
Height="Auto"/>-->
</Grid>
</Grid>
EgtBEAMWALL.Optimizer/Project/ProjectVM.vb
+7 -8
View File
@@ -179,8 +179,8 @@ Public Class ProjectVM
End Sub
Friend Sub NotifyCalcPanel_Visibility()
Map.refCALCPanelVM.NotifyPropertyChanged(NameOf(Map.refCALCPanelVM.ViewPage_Visibility))
Map.refCALCPanelVM.NotifyPropertyChanged(NameOf(Map.refCALCPanelVM.Edit_Visibility))
'Map.refCALCPanelVM.NotifyPropertyChanged(NameOf(Map.refCALCPanelVM.ViewPage_Visibility))
'Map.refCALCPanelVM.NotifyPropertyChanged(NameOf(Map.refCALCPanelVM.Edit_Visibility))
End Sub
Private m_FreeContourManager_Visibility As Boolean = False
@@ -356,7 +356,6 @@ Public Class ProjectVM
Map.refBTLPartManagerVM.SetBTLPartManagerIsEnabled(bIsEnabled)
If Not IsNothing(Map.refProjManagerVM) Then Map.refProjManagerVM.SetProjManagerIsEnabled(bIsEnabled)
If Not IsNothing(Map.refProdManagerVM) Then Map.refProdManagerVM.SetProdManagerIsEnabled(bIsEnabled)
If Not IsNothing(Map.refTopPanelVM) Then Map.refTopPanelVM.SetTopPanelIsEnabled(bIsEnabled)
Map.refRawPartManagerVM.SetRawPartManagerIsEnabled(bIsEnabled)
Map.refOptimizePanelVM.SetOptimizePanelIsEnabled(bIsEnabled)
Map.refFeatureManagerVM.SetFeatureManagerIsEnabled(bIsEnabled)
@@ -377,10 +376,10 @@ Public Class ProjectVM
If Not IsNothing(Map.refPParameterListVM.colPParam_Value) Then
Map.refPParameterListVM.colPParam_Value.IsReadOnly = True
End If
If Not IsNothing(Map.refQParameterListVM.colQParam_Value) Then
If Not IsNothing(Map.refQParameterListVM) AndAlso Not IsNothing(Map.refQParameterListVM.colQParam_Value) Then
Map.refQParameterListVM.colQParam_Value.IsReadOnly = True
End If
If Not IsNothing(Map.refQParameterListVM.colQParam_Custom) Then
If Not IsNothing(Map.refQParameterListVM) AndAlso Not IsNothing(Map.refQParameterListVM.colQParam_Custom) Then
Map.refQParameterListVM.colQParam_Custom.IsReadOnly = True
End If
If Not IsNothing(Map.refRawPartListVM.colRawPart_StartCut) Then
@@ -427,10 +426,10 @@ Public Class ProjectVM
If Not IsNothing(Map.refPParameterListVM.colPParam_Value) Then
Map.refPParameterListVM.colPParam_Value.ResetToOrigIsReadOnly()
End If
If Not IsNothing(Map.refQParameterListVM.colQParam_Value) Then
If Not IsNothing(Map.refQParameterListVM) AndAlso Not IsNothing(Map.refQParameterListVM.colQParam_Value) Then
Map.refQParameterListVM.colQParam_Value.ResetToOrigIsReadOnly()
End If
If Not IsNothing(Map.refQParameterListVM.colQParam_Custom) Then
If Not IsNothing(Map.refQParameterListVM) AndAlso Not IsNothing(Map.refQParameterListVM.colQParam_Custom) Then
Map.refQParameterListVM.colQParam_Custom.ResetToOrigIsReadOnly()
End If
If Not IsNothing(Map.refRawPartListVM.colRawPart_StartCut) Then
@@ -523,7 +522,7 @@ Public Class ProjectVM
''' </summary>
Friend Sub Visualization()
m_bVisOtt_Selected = False
Dim StatisticsWndV As New StatisticsWndV(Application.Current.MainWindow, New StatisticsVM())
Dim StatisticsWndV As New OptimizerStatisticsWndV(Application.Current.MainWindow, New StatisticsVM())
StatisticsWndV.ShowDialog()
End Sub
EgtBEAMWALL.Optimizer/RawPartManager/RawPartManagerVM.vb
+4 -23
View File
@@ -213,11 +213,7 @@ Public Class RawPartManagerVM
If MachGroup.nProduction_State >= ItemState.Assigned Then Return False
If MachGroup.nGlobalState = CalcStates.OK Or MachGroup.nGlobalState = CalcStates.INFO Then
' se ci sono modifiche, salvo il pogetto
If EgtGetModified() AndAlso Map.refMainMenuVM.SelPage = Pages.MACHINING Then
Map.refProdManagerVM.Save()
ElseIf EgtGetModified() AndAlso Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
Map.refOnlyProdManagerVM.Save()
End If
Map.refOnlyProdManagerVM.Save()
' mando al supervisore
DbControllers.m_MachGroupController.UpdateOrder(ProjectManagerVM.CurrProd.nProdId, MachGroup.Id, DbControllers.m_MachGroupController.GetMinIndex(ProjectManagerVM.CurrProd.nProdId) + 1)
DbControllers.m_MachGroupController.UpdateSupervisor(ProjectManagerVM.CurrProd.nProdId, MachGroup.Id, DbControllers.m_SupervisorId)
@@ -450,12 +446,7 @@ Public Class RawPartManagerVM
Public Sub MovePartInRawPart()
If IsNothing(ProjectManagerVM.CurrProd) Then Return
Dim MovePartInRawPartWndVM As New MovePartInRawPartWndVM()
Dim MovePartInRawPartWnd As Object
If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
MovePartInRawPartWnd = New OnlyProdMovePartInRawPartWndV(Application.Current.MainWindow, MovePartInRawPartWndVM)
Else
MovePartInRawPartWnd = New MovePartInRawPartWndV(Application.Current.MainWindow, MovePartInRawPartWndVM)
End If
Dim MovePartInRawPartWnd As New OnlyProdMovePartInRawPartWndV(Application.Current.MainWindow, MovePartInRawPartWndVM)
If Not MovePartInRawPartWnd.ShowDialog() Then Return
End Sub
@@ -530,12 +521,7 @@ Public Class RawPartManagerVM
dRawW += 2 * dKerf
End If
Dim AddRawPartWndVM As New AddRawPartWndVM(Map.refProjectVM.BTLStructureVM.nPROJTYPE, dRawL, dRawW, dStartOffset)
Dim AddRawPartWnd As Object = Nothing
If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
AddRawPartWnd = New OnlyProdAddRawPartWndV(Application.Current.MainWindow, AddRawPartWndVM)
Else
AddRawPartWnd = New AddRawPartWndV(Application.Current.MainWindow, AddRawPartWndVM)
End If
Dim AddRawPartWnd As Object = New OnlyProdAddRawPartWndV(Application.Current.MainWindow, AddRawPartWndVM)
If Not AddRawPartWnd.ShowDialog() Then Return
dRawL = AddRawPartWndVM.VariableList(0).dValue
dRawW = AddRawPartWndVM.VariableList(1).dValue
@@ -740,12 +726,7 @@ Public Class RawPartManagerVM
ByRef dStartOffset As Double, ByRef dOffset As Double, ByRef dKerf As Double) As Boolean
' apro finestra con solo edit
Dim AddRawPartWndVM As New AddRawPartWndVM(EditType, Map.refProjectVM.BTLStructureVM.nPROJTYPE, SParamlist, dRawL, dRawW, dStartOffset, dOffset, dKerf)
Dim AddRawPartWndV As Object = Nothing
If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
AddRawPartWndV = New OnlyProdAddRawPartWndV(Application.Current.MainWindow, AddRawPartWndVM)
Else
AddRawPartWndV = New AddRawPartWndV(Application.Current.MainWindow, AddRawPartWndVM)
End If
Dim AddRawPartWndV As New OnlyProdAddRawPartWndV(Application.Current.MainWindow, AddRawPartWndVM)
If Not AddRawPartWndV.ShowDialog() Then Return False
Select Case Map.refProjectVM.BTLStructureVM.nPROJTYPE
Case BWType.BEAM
EgtBEAMWALL.Optimizer/SceneHost/MySceneHostVM.vb
+5 -20
View File
@@ -553,41 +553,26 @@ Public Class MySceneHostVM
' aggiorno le colonne in base al tipo progetto
Map.refRawPartListVM.UpdateColumns(Map.refProjectVM.BTLStructureVM.BTLStructureM.nPROJTYPE)
Map.refFeatureInPartInRawPartListVM.UpdateColumns(CurrentMachine.nType)
Map.refTopPanelVM.ManageQParamsRowVisibility(Map.refProjectVM.BTLStructureVM.BTLStructureM.nPROJTYPE <> BWType.BEAM)
ProjectManagerVM.CurrProj = Map.refProjManagerVM.TempCurrProj
DbControllers.m_ProjController.LockByProjId(ProjectManagerVM.CurrProj.nProjId, True, Map.refMainWindowVM.MainWindowM.GetKeyNumber())
' carico lista macchine e macchina del progetto per il pulsante Reset Macchina del CALCPanel
Map.refCALCPanelVM.LoadMachineList()
ElseIf ProjectType = ProjectType.PROD Then
' se salvato, carico progetto in lista mru
If Not IsNothing(Map.refProdManagerVM) AndAlso Not IsNothing(Map.refProdManagerVM.TempCurrProd) AndAlso Not Map.refProdManagerVM.TempCurrProd.bIsNew Then
Map.refProdManagerVM.m_MruFiles.Add(sFile)
ElseIf Not IsNothing(Map.refOnlyProdManagerVM) AndAlso Not IsNothing(Map.refOnlyProdManagerVM.TempCurrProd) AndAlso Not Map.refOnlyProdManagerVM.TempCurrProd.bIsNew Then
If Not IsNothing(Map.refOnlyProdManagerVM) AndAlso Not IsNothing(Map.refOnlyProdManagerVM.TempCurrProd) AndAlso Not Map.refOnlyProdManagerVM.TempCurrProd.bIsNew Then
Map.refOnlyProdManagerVM.m_MruFiles.Add(sFile)
End If
' imposto macchina del progetto
If Map.refMainMenuVM.SelPage = Pages.MACHINING Then
Map.refMachinePanelVM.SelectedMachine = If(Not IsNothing(Map.refProdManagerVM.TempCurrProd),
Map.refMachinePanelVM.MachineList.FirstOrDefault(Function(x) x.Name = Map.refProdManagerVM.TempCurrProd.sMachine),
Map.refMachinePanelVM.MachineList.FirstOrDefault(Function(x) x.Name = ProjectManagerVM.CurrProj.sMachine))
ElseIf Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
Map.refMachinePanelVM.SelectedMachine = If(Not IsNothing(Map.refOnlyProdManagerVM.TempCurrProd),
Map.refMachinePanelVM.MachineList.FirstOrDefault(Function(x) x.Name = Map.refOnlyProdManagerVM.TempCurrProd.sMachine),
Map.refMachinePanelVM.MachineList.FirstOrDefault(Function(x) x.Name = ProjectManagerVM.CurrProd.sMachine))
End If
Map.refMachinePanelVM.SelectedMachine = If(Not IsNothing(Map.refOnlyProdManagerVM.TempCurrProd),
Map.refMachinePanelVM.MachineList.FirstOrDefault(Function(x) x.Name = Map.refOnlyProdManagerVM.TempCurrProd.sMachine),
Map.refMachinePanelVM.MachineList.FirstOrDefault(Function(x) x.Name = ProjectManagerVM.CurrProd.sMachine))
SectionXMaterial.SetType(Map.refProjectVM.BTLStructureVM.BTLStructureM.nPROJTYPE)
Core.ViewPanelVM.UpdateBWType(Map.refProjectVM.BTLStructureVM.BTLStructureM.nPROJTYPE)
' aggiorno le colonne in base al tipo progetto
Map.refRawPartListVM.UpdateColumns(Map.refProjectVM.BTLStructureVM.BTLStructureM.nPROJTYPE)
Map.refFeatureInPartInRawPartListVM.UpdateColumns(CurrentMachine.nType)
If Not IsNothing(Map.refTopPanelVM) Then
Map.refTopPanelVM.ManageQParamsRowVisibility(Map.refProjectVM.BTLStructureVM.BTLStructureM.nPROJTYPE <> BWType.BEAM)
End If
Map.refRawPartListVM.UpdateColumns(Map.refProjectVM.BTLStructureVM.BTLStructureM.nPROJTYPE)
If Not IsNothing(Map.refProdManagerVM) AndAlso Not IsNothing(Map.refProdManagerVM.TempCurrProd) Then
CurrProd = Map.refProdManagerVM.TempCurrProd
ProjectManagerVM.CurrProd = CurrProd
ElseIf Not IsNothing(Map.refOnlyProdManagerVM) AndAlso Not IsNothing(Map.refOnlyProdManagerVM.TempCurrProd) Then
If Not IsNothing(Map.refOnlyProdManagerVM) AndAlso Not IsNothing(Map.refOnlyProdManagerVM.TempCurrProd) Then
CurrProd = Map.refOnlyProdManagerVM.TempCurrProd
ProjectManagerVM.CurrProd = CurrProd
End If
EgtBEAMWALL.Optimizer/ShowBeamPanel/ShowBeamPanelVM.vb
-3
View File
@@ -174,9 +174,6 @@ Public Class ShowBeamPanelVM
End If
' nascondo barra del pezzo
Map.refProjectVM.BTLStructureVM.SetSelectionType(BTLStructureVM.SelectionTypes.NULL)
Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProdProjManagerVM.PartManager_Visibility))
' mostro in parte bassa dati BTL
If Not IsNothing(Map.refBottomPanelVM) Then Map.refBottomPanelVM.SetSelPartFeatureTab(BottomPanelVM.PartFeatureTab.STRUCTURE_)
' mostro tutti i pezzi
Map.refProjectVM.BTLStructureVM.ShowAll(False)
' deseleziono tutto
EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml
-25
View File
@@ -27,9 +27,7 @@
<EgtBEAMWALL:MachinePanelVM x:Key="MachinePanelVM"/>
<EgtBEAMWALL:PartParametersVM x:Key="PartParametersVM"/>
<EgtBEAMWALL:LeftPanelVM x:Key="LeftPanelVM"/>
<EgtBEAMWALL:BottomPanelVM x:Key="BottomPanelVM"/>
<EgtBEAMWALL:ConfigurationPageVM x:Key="ConfigurationPageVM"/>
<EgtBEAMWALL:TopPanelVM x:Key="TopPanelVM"/>
<EgtBEAMWALL:RawPartListVM x:Key="RawPartListVM"/>
<EgtBEAMWALL:BTLPartListVM x:Key="PartListVM"/>
<EgtBEAMWALL:FeatureListVM x:Key="FeatureListVM"/>
@@ -46,21 +44,12 @@
<EgtBEAMWALL:StatisticsVM x:Key="StatisticsVM"/>
<EgtBEAMWALL:PartManagerVM x:Key="PartManagerVM"/>
<EgtBEAMWALL:StatisticsTimePanelVM x:Key="StatisticsTimePanelVM"/>
<!--<OmagOFFICE:VeinMatchPanelVM x:Key="VeinMatchPanelVM"/>
<OmagOFFICE:OptionPanelVM x:Key="OptionPanelVM"/>
<OmagOFFICE:RawPartTabVM x:Key="RawPartTabVM"/>
<OmagOFFICE:NestingTabVM x:Key="NestingTabVM"/>
<OmagOFFICE:MachiningTabVM x:Key="MachiningTabVM"/>
<OmagOFFICE:SimulTabVM x:Key="SimulTabVM"/>-->
<EgtBEAMWALL:MyMachGroupPanelVM x:Key="MachGroupPanelVM"/>
<EgtBEAMWALL:OnlyProdManagerVM x:Key="OnlyProdManagerVM"/>
<EgtBEAMWALL:PartParametersVM x:Key="PartParametersWndVM"/>
<EgtBEAMWALL:BTLPartManagerVM x:Key="BTLPartManagerVM"/>
<EgtBEAMWALL:FeatureListManagerVM x:Key="FeatureListManagerVM"/>
<EgtBEAMWALL:RawPartManagerVM x:Key="RawPartManagerVM"/>
<EgtBEAMWALL:PartInRawPartManagerVM x:Key="PartInRawPartManagerVM"/>
<EgtBEAMWALL:ProdProjManagerVM x:Key="ProdProjManagerVM"/>
<EgtBEAMWALL:ProjWndVM x:Key="ProjWndVM"/>
<EgtBEAMWALL:SpecialPanelVM x:Key="SpecialPanelVM"/>
<!--#endregion Panel ViewModel-->
@@ -2887,20 +2876,6 @@
<!--#endregion EgtCustomWindow-->
<!--#region EgtFloatingPanel-->
<Style x:Key="ToolBar_EgtFloatingPanel_OnlyProd" TargetType="{x:Type EgtFloating:EgtFloatingPanel}" BasedOn="{StaticResource {x:Type EgtFloating:EgtFloatingPanel}}">
<Setter Property="Background" Value="Transparent"/>
<Setter Property="BorderBrush" Value="Transparent"/>
</Style>
<Style x:Key="ToolBar_EgtFloatingPanel_OnlyProdManager" TargetType="{x:Type EgtFloating:EgtFloatingPanel}" BasedOn="{StaticResource {x:Type EgtFloating:EgtFloatingPanel}}">
<Setter Property="Background" Value="{StaticResource BeamWall_White}"/>
<Setter Property="BorderBrush" Value="{StaticResource BeamWall_White}"/>
</Style>
<!--#endregion EgtFloatingPanel-->
<!--#region ComboBox-->
<Style x:Key="OnlyProdCalcPanel_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource OnlyProd_ComboBox}">
EgtBEAMWALL.Optimizer/Utility/Map.vb
+12 -72
View File
@@ -9,7 +9,6 @@ Module Map
Private m_refProjectVM As ProjectVM
Private m_refMainMenuVM As MainMenuVM
Private m_refLeftPanelVM As LeftPanelVM
Private m_refBottomPanelVM As BottomPanelVM
Private m_refShowBeamPanelVM As ShowBeamPanelVM
Private m_refConfigurationPageVM As ConfigurationPageVM
Private m_refRawPartListVM As RawPartListVM
@@ -20,7 +19,6 @@ Module Map
Private m_refFreeContourInputVM As FreeContourInputVM
Private m_refPartManagerVM As PartManagerVM
Private m_refInstrumentPanelVM As InstrumentPanelVM
Private m_refTopPanelVM As TopPanelVM
Private m_refOptimizePanelVM As OptimizePanelVM
Private m_refCALCPanelVM As CALCPanelVM
Private m_refPartListVM As BTLPartListVM
@@ -35,10 +33,7 @@ Module Map
Private m_refOnlyProdManagerVM As OnlyProdManagerVM
Private m_refBTLPartManagerVM As BTLPartManagerVM
Private m_refRawPartManagerVM As RawPartManagerVM
Private m_refPartInRawPartManagerVM As PartInRawPartManagerVM
Private m_refFeatureListManagerVM As FeatureListManagerVM
Private m_refProdProjManagerVM As ProdProjManagerVM
Private m_refProjWndVM As ProjWndVM
Private m_refSpecialPanelVM As SpecialPanelVM
#Region "Get"
@@ -60,6 +55,7 @@ Module Map
Return m_refProjManagerVM
End Get
End Property
Public ReadOnly Property refProdManagerVM As ProdManagerVM
Get
Return m_refProdManagerVM
@@ -108,12 +104,6 @@ Module Map
End Get
End Property
Public ReadOnly Property refBottomPanelVM As BottomPanelVM
Get
Return m_refBottomPanelVM
End Get
End Property
Public ReadOnly Property refShowBeamPanelVM As ShowBeamPanelVM
Get
Return m_refShowBeamPanelVM
@@ -174,12 +164,6 @@ Module Map
End Get
End Property
Public ReadOnly Property refTopPanelVM As TopPanelVM
Get
Return m_refTopPanelVM
End Get
End Property
Public ReadOnly Property refOptimizePanelVM As OptimizePanelVM
Get
Return m_refOptimizePanelVM
@@ -264,30 +248,12 @@ Module Map
End Get
End Property
Public ReadOnly Property refPartInRawPartManagerVM As PartInRawPartManagerVM
Get
Return m_refPartInRawPartManagerVM
End Get
End Property
Public ReadOnly Property refFeatureListManagerVM As FeatureListManagerVM
Get
Return m_refFeatureListManagerVM
End Get
End Property
Public ReadOnly Property refProdProjManagerVM As ProdProjManagerVM
Get
Return m_refProdProjManagerVM
End Get
End Property
Public ReadOnly Property refProjWndVM As ProjWndVM
Get
Return m_refProjWndVM
End Get
End Property
Public ReadOnly Property refSpecialPanelVM As SpecialPanelVM
Get
Return m_refSpecialPanelVM
@@ -348,11 +314,6 @@ Module Map
Return Not IsNothing(CoreMap.refMachGroupPanelVM)
End Function
Friend Function SetRefBottomPanelVM(BottomPanelVM As BottomPanelVM) As Boolean
m_refBottomPanelVM = BottomPanelVM
Return Not IsNothing(m_refBottomPanelVM)
End Function
Friend Function SetRefShowBeamPanelVM(ShowBeamPanelVM As ShowBeamPanelVM) As Boolean
m_refShowBeamPanelVM = ShowBeamPanelVM
Return Not IsNothing(m_refShowBeamPanelVM)
@@ -403,11 +364,6 @@ Module Map
Return Not IsNothing(m_refInstrumentPanelVM)
End Function
Friend Function SetRefTopPanelVM(TopPanelVM As TopPanelVM) As Boolean
m_refTopPanelVM = TopPanelVM
Return Not IsNothing(m_refTopPanelVM)
End Function
Friend Function SetRefOptimizePanelVM(OptimizePanelVM As OptimizePanelVM) As Boolean
m_refOptimizePanelVM = OptimizePanelVM
Return Not IsNothing(m_refOptimizePanelVM)
@@ -478,26 +434,11 @@ Module Map
Return Not IsNothing(m_refRawPartManagerVM)
End Function
Friend Function SetRefPartInRawPartManagerVM(PartInRawPartManagerVM As PartInRawPartManagerVM) As Boolean
m_refPartInRawPartManagerVM = PartInRawPartManagerVM
Return Not IsNothing(m_refPartInRawPartManagerVM)
End Function
Friend Function SetRefFeatureListManagerVM(FeatureListManagerVM As FeatureListManagerVM) As Boolean
m_refFeatureListManagerVM = FeatureListManagerVM
Return Not IsNothing(m_refFeatureListManagerVM)
End Function
Friend Function SetRefProdProjManagerVM(ProdProjManagerVM As ProdProjManagerVM) As Boolean
m_refProdProjManagerVM = ProdProjManagerVM
Return Not IsNothing(m_refProdProjManagerVM)
End Function
Friend Function SetRefProjWndVM(ProjWndVM As ProjWndVM) As Boolean
m_refProjWndVM = ProjWndVM
Return Not IsNothing(m_refProjWndVM)
End Function
Friend Function SetRefSpecialPanelVM(SpecialPanelVM As SpecialPanelVM) As Boolean
m_refSpecialPanelVM = SpecialPanelVM
Return Not IsNothing(m_refSpecialPanelVM)
@@ -520,18 +461,17 @@ Module Map
Not IsNothing(m_refRawPartListVM) AndAlso Not IsNothing(m_refWarehouseWndVM) AndAlso
Not IsNothing(m_refFeatureListVM) AndAlso Not IsNothing(m_refPartInRawPartListVM) AndAlso
Not IsNothing(m_refFreeContourManagerVM) AndAlso Not IsNothing(m_refFreeContourInputVM) AndAlso
Not IsNothing(m_refInstrumentPanelVM) AndAlso Not IsNothing(m_refTopPanelVM) AndAlso
Not IsNothing(m_refPartManagerVM) AndAlso Not IsNothing(m_refOptimizePanelVM) AndAlso
Not IsNothing(m_refShowBeamPanelVM) AndAlso Not IsNothing(m_refCALCPanelVM) AndAlso
Not IsNothing(m_refPartListVM) AndAlso Not IsNothing(m_refFeatureInPartInRawPartListVM) AndAlso
Not IsNothing(m_refStatisticsVM) AndAlso Not IsNothing(m_refPParameterListVM) AndAlso
Not IsNothing(m_refQParameterListVM) AndAlso Not IsNothing(m_refFeatureManagerVM) AndAlso
Not IsNothing(m_refAddSectionXMaterialWndVM) AndAlso Not IsNothing(m_refStatisticsTimePanelVM) AndAlso
Not IsNothing(m_refPDFEditorVM) AndAlso Not IsNothing(m_refSpecialPanelVM) AndAlso
Not IsNothing(m_refOnlyProdManagerVM) AndAlso Not IsNothing(m_refBTLPartManagerVM) AndAlso
Not IsNothing(m_refRawPartManagerVM) AndAlso Not IsNothing(m_refPartInRawPartManagerVM) AndAlso
Not IsNothing(m_refFeatureListManagerVM) AndAlso Not IsNothing(m_refProdProjManagerVM) AndAlso
Not IsNothing(m_refProjWndVM) AndAlso Not IsNothing(m_refSpecialPanelVM) AndAlso LibMap.EndInit()
Not IsNothing(m_refInstrumentPanelVM) AndAlso Not IsNothing(m_refPartManagerVM) AndAlso
Not IsNothing(m_refOptimizePanelVM) AndAlso Not IsNothing(m_refShowBeamPanelVM) AndAlso
Not IsNothing(m_refCALCPanelVM) AndAlso Not IsNothing(m_refPartListVM) AndAlso
Not IsNothing(m_refFeatureInPartInRawPartListVM) AndAlso Not IsNothing(m_refStatisticsVM) AndAlso
Not IsNothing(m_refPParameterListVM) AndAlso Not IsNothing(m_refQParameterListVM) AndAlso
Not IsNothing(m_refFeatureManagerVM) AndAlso Not IsNothing(m_refAddSectionXMaterialWndVM) AndAlso
Not IsNothing(m_refStatisticsTimePanelVM) AndAlso Not IsNothing(m_refPDFEditorVM) AndAlso
Not IsNothing(m_refSpecialPanelVM) AndAlso Not IsNothing(m_refOnlyProdManagerVM) AndAlso
Not IsNothing(m_refBTLPartManagerVM) AndAlso Not IsNothing(m_refRawPartManagerVM) AndAlso
Not IsNothing(m_refFeatureListManagerVM) AndAlso Not IsNothing(m_refSpecialPanelVM) AndAlso
LibMap.EndInit()
End Function
#End Region ' Init
EgtBEAMWALL.Supervisor/CALCPanel/OnlyProdCalcPanelV.xaml
+6 -7
View File
@@ -1,9 +1,8 @@
<EgtFloating:EgtFloatingPanel x:Class="OnlyProdCalcPanelV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
IsTopDockable="True" IsBottomDockable="False" IsLeftDockable="False"
IsRightDockable="False" Style="{StaticResource ToolBar_EgtFloatingPanel_OnlyProdManager}">
<StackPanel x:Class="OnlyProdCalcPanelV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
Style="{StaticResource OnlyProdPartManager_StackPanel}">
<Button ToolTip="{Binding Simulate_ToolTip}"
Command="{Binding Simulate_Command}"
@@ -17,4 +16,4 @@
Style="{StaticResource OnlyProdToolBar_ToggleButton}"
Foreground="{StaticResource BeamWall_White}"/>
</EgtFloating:EgtFloatingPanel>
</StackPanel>
EgtBEAMWALL.Supervisor/ShowPanel/OnlyProdShowPanelV.xaml
+6 -7
View File
@@ -1,9 +1,8 @@
<EgtFloating:EgtFloatingPanel x:Class="OnlyProdShowPanelV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
IsTopDockable="True" IsBottomDockable="False" IsLeftDockable="False"
IsRightDockable="False" Style="{StaticResource ToolBar_EgtFloatingPanel_OnlyProdManager}">
<StackPanel x:Class="OnlyProdShowPanelV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
Style="{StaticResource OnlyProdPartManager_StackPanel}">
<RadioButton ToolTip="{Binding RenderingWFToolTip}"
IsChecked="{Binding WireframeIsChecked}"
@@ -21,4 +20,4 @@
<Image Source="/Resources/ShowPanel/RenderingSH.png" Stretch="Uniform"/>
</RadioButton>
</EgtFloating:EgtFloatingPanel>
</StackPanel>
EgtBEAMWALL.Supervisor/SupervisorManager/OnlyProdSupervisorManagerV.xaml
+7 -9
View File
@@ -1,11 +1,9 @@
<EgtFloating:EgtFloatingPanel x:Class="OnlyProdSupervisorManagerV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
IsTopDockable="True" IsBottomDockable="False" IsLeftDockable="False"
IsRightDockable="False"
IsEnabled="{Binding SupervisorManager_IsEnabled}"
Style="{StaticResource ToolBar_EgtFloatingPanel_OnlyProdManager}">
<StackPanel x:Class="OnlyProdSupervisorManagerV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
IsEnabled="{Binding SupervisorManager_IsEnabled}"
Style="{StaticResource OnlyProdPartManager_StackPanel}">
<!--Barra superiore dei comandi-->
<Button Command="{Binding OpenCommand}"
@@ -32,4 +30,4 @@
<Image Source="/Resources/ProjectManager/GoToProd.png" Stretch="Uniform"/>
</Button>
</EgtFloating:EgtFloatingPanel>
</StackPanel>
EgtBEAMWALL.Supervisor/Utility/Dictionary.xaml
+21
View File
@@ -1756,6 +1756,15 @@
<!-- ______________________________________________________________________________________________________________________________________________ -->
<!--#region GRAFICA NUOVA PAGINA-->
<!--#region TextBox Style-->
<Style x:Key="NewSearchText_TextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
<Setter Property="Margin" Value="5"/>
<Setter Property="TextWrapping" Value="Wrap"/>
</Style>
<!--#endregion TextBox Style-->
<!--#region DataGrid-->
@@ -2412,6 +2421,18 @@
<!--#endregion DatePicker-->
<!--#region StackPanel-->
<Style x:Key="OnlyProdBTLPartManager_StackPanel" TargetType="{x:Type StackPanel}">
<Setter Property="Orientation" Value="Vertical"/>
</Style>
<Style x:Key="OnlyProdPartManager_StackPanel" TargetType="{x:Type StackPanel}">
<Setter Property="Orientation" Value="Horizontal"/>
</Style>
<!--#endregion StackPanel-->
<!--#endregion GRAFICA NUOVA PAGINA-->
<!--#region Finestre Egt-->
EgtBEAMWALL.Supervisor/ViewPanel/OnlyProdViewPanelV.xaml
+6 -7
View File
@@ -1,9 +1,8 @@
<EgtFloating:EgtFloatingPanel x:Class="OnlyProdViewPanelV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
IsTopDockable="True" IsBottomDockable="False" IsLeftDockable="False"
IsRightDockable="False" Style="{StaticResource ToolBar_EgtFloatingPanel_OnlyProdManager}">
<StackPanel x:Class="OnlyProdViewPanelV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
Style="{StaticResource OnlyProdPartManager_StackPanel}">
<Button ToolTip="{Binding ZoomAllToolTip}"
Command="{Binding ZoomAllCommand}"
@@ -41,4 +40,4 @@
<Image Source="/Resources/ViewPanel/LookFromISO_SW.png" Stretch="Uniform"/>
</Button>
</EgtFloating:EgtFloatingPanel>
</StackPanel>
EgtBEAMWALL.ViewerOptimizer/Application.xaml.vb
+2 -14
View File
@@ -1,23 +1,11 @@
Imports EgtBEAMWALL.Core
Imports EgtWPFLib5
Class Application
Class Application
' Application-level events, such as Startup, Exit, and DispatcherUnhandledException
' can be handled in this file.
Protected Overrides Sub OnStartup(e As StartupEventArgs)
MyBase.OnStartup(e)
ShutdownMode = System.Windows.ShutdownMode.OnMainWindowClose
' Recupero directory file INI
GetIniFileDirectory()
' Recupero bOnlyProd per selezione MainWindow
Dim bOnlyProd As Boolean = Read_Value(EgtWPFLib5.ConstIni.S_GENERAL, EgtBEAMWALL.Core.ConstIni.K_ONLYPROD, IniFile.m_sIniFile)
' Creo la View principale
If bOnlyProd Then
Me.MainWindow = New OnlyProdMainWindowV
Else
Me.MainWindow = New MainWindowV
End If
Me.MainWindow = New MainWindowV
' Mostro la View principale
Me.MainWindow.Show()
End Sub