diff --git a/EgtBEAMWALL.Core/Constants/ConstDims.vb b/EgtBEAMWALL.Core/Constants/ConstDims.vb
index 1d56999a..d50342f1 100644
--- a/EgtBEAMWALL.Core/Constants/ConstDims.vb
+++ b/EgtBEAMWALL.Core/Constants/ConstDims.vb
@@ -9,5 +9,6 @@
Public Const TOPPANEL_OPTIMIZER As String = "TopPanel_Optimizer"
Public Const LEFTPANEL_SUPERVISOR As String = "LeftPanel_Supervisor"
Public Const PROJECT_SUPERVISOR As String = "Project_Supervisor"
+ Public Const PROJECT_ONLYPROD As String = "Project_OnlyProd"
End Class
diff --git a/EgtBEAMWALL.Core/Constants/ConstGen.vb b/EgtBEAMWALL.Core/Constants/ConstGen.vb
index ced9eb40..73a94d78 100644
--- a/EgtBEAMWALL.Core/Constants/ConstGen.vb
+++ b/EgtBEAMWALL.Core/Constants/ConstGen.vb
@@ -33,6 +33,7 @@ Public Module ConstGen
CONFIG = 3
INPUTS = 4
OUTPUTS = 5
+ ONLYPRODPAGE = 6
End Enum
' Abilitazioni licenza
diff --git a/EgtBEAMWALL.Core/Constants/ConstIni.vb b/EgtBEAMWALL.Core/Constants/ConstIni.vb
index 1b0bd759..ddb25cc7 100644
--- a/EgtBEAMWALL.Core/Constants/ConstIni.vb
+++ b/EgtBEAMWALL.Core/Constants/ConstIni.vb
@@ -168,4 +168,6 @@ Public Module ConstIni
Public Const K_EXTERNALFILEPATH As String = "ExternalFilePath"
Public Const K_REMINDERFREQUENCY As String = "ReminderFrequency"
+ Public Const K_ONLYPROD As String = "OnlyProd"
+
End Module
diff --git a/EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLFeatureVM.vb b/EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLFeatureVM.vb
index 7ab66f7d..09a28cae 100644
--- a/EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLFeatureVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLFeatureVM.vb
@@ -209,7 +209,7 @@ Public Class BTLFeatureVM
m_SelPBTLParam = value
If Not IsNothing(m_SelPBTLParam) Then
' imposto path disegno da mostrare in BottomPanel
- Map.refBottomPanelVM.SetCurrDraw(m_SelPBTLParam.sDrawPath)
+ If Not IsNothing(Map.refBottomPanelVM) Then Map.refBottomPanelVM.SetCurrDraw(m_SelPBTLParam.sDrawPath)
End If
NotifyPropertyChanged(NameOf(SelPBTLParam))
End Set
@@ -232,7 +232,7 @@ Public Class BTLFeatureVM
End Get
Set(value As BTLParamVM)
m_SelQParam = value
- If Not IsNothing(m_SelQParam) Then
+ 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
diff --git a/EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLStructureVM.vb b/EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLStructureVM.vb
index e2dd39b6..83fe3388 100644
--- a/EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLStructureVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLStructureVM.vb
@@ -150,7 +150,7 @@ Public Class BTLStructureVM
Select Case e.Action
Case NotifyCollectionChangedAction.Add
If e.NewItems.Count > 0 AndAlso Not IsNothing(e.NewItems(0)) Then
- If (Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso m_SelectionType = SelectionTypes.SELECT_) OrElse Map.refMainMenuVM.SelPage = Pages.MACHINING Then
+ If (Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso m_SelectionType = SelectionTypes.SELECT_) OrElse Map.refMainMenuVM.SelPage = Pages.MACHINING OrElse (Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE AndAlso m_SelectionType = SelectionTypes.SELECT_) OrElse Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
SelectBTLPart(e.NewItems(0))
Else ' SelectionTypes.HIGHLIGHT
HighlightBTLPart(e.NewItems(0))
@@ -182,8 +182,8 @@ Public Class BTLStructureVM
End Sub
Private Sub SelectBTLPart(BtlPart As BTLPartVM)
- EgtBeamShowFacesName( False)
- EgtBeamShowLoadingSide( False, False)
+ EgtBeamShowFacesName(False)
+ EgtBeamShowLoadingSide(False, False)
m_SelBTLPart = BtlPart
If Map.refMainMenuVM.SelPage = Pages.VIEW Then
' se modalità building, la tolgo
@@ -194,10 +194,10 @@ Public Class BTLStructureVM
SceneSelPartSelection()
' seleziono pezzo in Db geometrico
EgtBeamSetPart(BtlPart.nPartId)
- EgtBeamShowFacesName( True)
+ EgtBeamShowFacesName(True)
Dim bLoadingSideShow As Boolean = (nPROJTYPE = BWType.BEAM)
- Dim bLeftToRight As Boolean = Not ( CurrentMachine.ViewDir = VT.ISO_NW OrElse CurrentMachine.ViewDir = VT.ISO_NE)
- EgtBeamShowLoadingSide( bLoadingSideShow, bLeftToRight)
+ Dim bLeftToRight As Boolean = Not (CurrentMachine.ViewDir = VT.ISO_NW OrElse CurrentMachine.ViewDir = VT.ISO_NE)
+ EgtBeamShowLoadingSide(bLoadingSideShow, bLeftToRight)
' seleziono pagina BottomPanel
Map.refBottomPanelVM.SetSelPartFeatureTab(BottomPanelVM.PartFeatureTab.PART)
'' mostro barra di gestione pezzo
@@ -208,7 +208,7 @@ Public Class BTLStructureVM
Map.refShowBeamPanelVM.bShowAll = False
Core.ViewPanelVM.BWSetView(If(Core.ViewPanelVM.Type = BWType.BEAM, VT.ISO_SW, VT.TOP), False)
EgtZoom(ZM.ALL)
- ElseIf Map.refMainMenuVM.SelPage = Pages.MACHINING Then
+ ElseIf Map.refMainMenuVM.SelPage = Pages.MACHINING OrElse Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
' resetto gruppo di lavorazione corrente
EgtResetCurrMachGroup()
' trovo ed evidenzio MachGroup e Duplo di questo pezzo
@@ -246,8 +246,8 @@ Public Class BTLStructureVM
Map.refProjectVM.BTLStructureVM.ShowSolid(BtlPart.nPartId, False, False)
End If
If m_SelBTLPart Is BtlPart Then
- EgtBeamShowFacesName( False)
- EgtBeamShowLoadingSide( False, False)
+ EgtBeamShowFacesName(False)
+ EgtBeamShowLoadingSide(False, False)
m_SelBTLPart = Nothing
NotifyPropertyChanged(NameOf(SelBTLPart))
End If
@@ -617,6 +617,8 @@ Public Class BTLStructureVM
Return Map.refProjManagerVM.nProjType
Case Pages.MACHINING
Return Map.refProdManagerVM.nProdType
+ Case Pages.ONLYPRODPAGE
+ Return Map.refProdManagerVM.nProdType
Case Else
Return BWType.NULL
End Select
diff --git a/EgtBEAMWALL.ViewerOptimizer/BottomPanel/BottomPanelV.xaml b/EgtBEAMWALL.ViewerOptimizer/BottomPanel/BottomPanelV.xaml
index 89d9455a..c8466cfa 100644
--- a/EgtBEAMWALL.ViewerOptimizer/BottomPanel/BottomPanelV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/BottomPanel/BottomPanelV.xaml
@@ -33,8 +33,8 @@
+ Tag="{Binding Tag.SelBTLPart, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BottomPanelV}}}"
+ Margin="5"/>
+ Margin="5"/>
diff --git a/EgtBEAMWALL.ViewerOptimizer/BottomPanel/BottomPanelVM.vb b/EgtBEAMWALL.ViewerOptimizer/BottomPanel/BottomPanelVM.vb
index eb3039ec..ea86d27b 100644
--- a/EgtBEAMWALL.ViewerOptimizer/BottomPanel/BottomPanelVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/BottomPanel/BottomPanelVM.vb
@@ -23,6 +23,8 @@ Public Class BottomPanelVM
Friend Sub SetSelPartFeatureTab(SelPartFeatureTab As PartFeatureTab)
If m_SelPartFeatureTab = PartFeatureTab.STATISTICS Then
Map.refInstrumentPanelVM.SetStatisticsIsChecked(False)
+ 'Map.refInstrumentPanelVM.SetVisStatistic_IsChecked(False)
+ 'Map.refInstrumentPanelVM.SetOtStatistic_IsChecked(False)
End If
m_SelPartFeatureTab = SelPartFeatureTab
NotifyPropertyChanged(NameOf(SelPartFeatureTab))
diff --git a/EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj b/EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj
index 4138ed9f..0370788c 100644
--- a/EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj
+++ b/EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj
@@ -263,6 +263,13 @@
+
+ OnlyProdLeftPanelV.xaml
+
+
+ OnlyProdManagerV.xaml
+
+
MovePartInRawPartWndV.xaml
@@ -328,6 +335,9 @@
+
+ OnlyProdProjectV.xaml
+
ProjectTypeWndV.xaml
@@ -472,6 +482,14 @@
MSBuild:Compile
Designer
+
+ MSBuild:Compile
+ Designer
+
+
+ Designer
+ MSBuild:Compile
+
MSBuild:Compile
Designer
@@ -536,6 +554,10 @@
Designer
MSBuild:Compile
+
+ MSBuild:Compile
+ Designer
+
MSBuild:Compile
Designer
diff --git a/EgtBEAMWALL.ViewerOptimizer/InstrumentPanel/InstrumentPanelV.xaml b/EgtBEAMWALL.ViewerOptimizer/InstrumentPanel/InstrumentPanelV.xaml
index 2d9d56e2..b71cb984 100644
--- a/EgtBEAMWALL.ViewerOptimizer/InstrumentPanel/InstrumentPanelV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/InstrumentPanel/InstrumentPanelV.xaml
@@ -39,9 +39,24 @@
-
+
+
+
+
+
diff --git a/EgtBEAMWALL.ViewerOptimizer/InstrumentPanel/MyInstrumentPanelVM.vb b/EgtBEAMWALL.ViewerOptimizer/InstrumentPanel/MyInstrumentPanelVM.vb
index 94982a46..b0482988 100644
--- a/EgtBEAMWALL.ViewerOptimizer/InstrumentPanel/MyInstrumentPanelVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/InstrumentPanel/MyInstrumentPanelVM.vb
@@ -19,6 +19,24 @@ Public Class MyInstrumentPanelVM
End Get
End Property
+ Public ReadOnly Property Statistic_Visibility As Visibility
+ Get
+ Return If(Map.refMainMenuVM.SelPage = Pages.VIEW OrElse Map.refMainMenuVM.SelPage = Pages.MACHINING, Visibility.Visible, Visibility.Collapsed)
+ End Get
+ End Property
+
+ Public ReadOnly Property VisStatistic_Visibility As Visibility
+ Get
+ Return If(Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE, Visibility.Visible, Visibility.Collapsed)
+ End Get
+ End Property
+
+ Public ReadOnly Property OtStatistic_Visibility As Visibility
+ Get
+ Return If(Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE, Visibility.Visible, Visibility.Collapsed)
+ End Get
+ End Property
+
Private m_InstrumentPanel_IsEnabled As Boolean = True
Public Property InstrumentPanel_IsEnabled As Boolean
Get
@@ -79,6 +97,82 @@ Public Class MyInstrumentPanelVM
NotifyPropertyChanged(NameOf(Statistics_IsChecked))
End Sub
+ Private m_VisStatistic_IsEnabled As Boolean = True
+ Public Property VisStatistic_IsEnabled As Boolean
+ Get
+ Return m_VisStatistic_IsEnabled
+ End Get
+ Set(value As Boolean)
+ m_VisStatistic_IsEnabled = value
+ End Set
+ End Property
+
+ Private m_VisStatistic_IsChecked As Boolean = False
+ Public Property VisStatistic_IsChecked As Boolean
+ Get
+ Return m_VisStatistic_IsChecked
+ End Get
+ Set(value As Boolean)
+ m_VisStatistic_IsChecked = value
+ m_OtStatistic_IsChecked = False
+ If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
+ If value Then
+ ' salvo pagina precedente
+ m_PrevBottomPanelPage = Map.refBottomPanelVM.SelPartFeatureTab
+ ' aggiorno valori totali
+ Map.refProjectVM.BTLStructureVM.CalcGlobalUpdate()
+ ' seleziono pagina Statistics
+ Map.refBottomPanelVM.SetSelPartFeatureTab(BottomPanelVM.PartFeatureTab.STATISTICS)
+ Else
+ ' seleziono pagina precedente
+ Map.refBottomPanelVM.SetSelPartFeatureTab(m_PrevBottomPanelPage)
+ End If
+ End If
+ End Set
+ End Property
+ Friend Sub SetVisStatistic_IsChecked(value As Boolean)
+ m_VisStatistic_IsChecked = value
+ NotifyPropertyChanged(NameOf(VisStatistic_IsChecked))
+ End Sub
+
+ Private m_OtStatistic_IsEnabled As Boolean = True
+ Public Property OtStatistic_IsEnabled As Boolean
+ Get
+ Return m_OtStatistic_IsEnabled
+ End Get
+ Set(value As Boolean)
+ m_OtStatistic_IsEnabled = value
+ End Set
+ End Property
+
+ Private m_OtStatistic_IsChecked As Boolean = False
+ Public Property OtStatistic_IsChecked As Boolean
+ Get
+ Return m_OtStatistic_IsChecked
+ End Get
+ Set(value As Boolean)
+ m_OtStatistic_IsChecked = value
+ m_VisStatistic_IsChecked = False
+ If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
+ If value Then
+ ' aggiorno valori totali
+ If Not IsNothing(Map.refProjectVM.MachGroupPanelVM) Then Map.refProjectVM.MachGroupPanelVM.CalcGlobalUpdate()
+ ' aggiorno conto materiali usati
+ If Not IsNothing(Map.refProdManagerVM.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
+ End Property
+ Friend Sub SetOtStatistic_IsChecked(value As Boolean)
+ m_OtStatistic_IsChecked = value
+ NotifyPropertyChanged(NameOf(OtStatistic_IsChecked))
+ End Sub
+
' Definizione comandi
Private m_cmdData As ICommand
Private m_cmdChangeParameter As ICommand
@@ -139,10 +233,16 @@ Public Class MyInstrumentPanelVM
NotifyPropertyChanged(NameOf(InstrumentPanel_IsEnabled))
If Map.refFreeContourManagerVM.bIsActive Then
m_Statistics_IsEnabled = bIsEnabled
+ m_VisStatistic_IsEnabled = bIsEnabled
+ m_OtStatistic_IsEnabled = bIsEnabled
Else
m_Statistics_IsEnabled = True
+ m_VisStatistic_IsEnabled = True
+ m_OtStatistic_IsEnabled = True
End If
NotifyPropertyChanged(NameOf(Statistics_IsEnabled))
+ NotifyPropertyChanged(NameOf(VisStatistic_IsEnabled))
+ NotifyPropertyChanged(NameOf(OtStatistic_IsEnabled))
End Sub
#End Region ' METHODS
diff --git a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/PartParametersV.xaml b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/PartParametersV.xaml
index 5d157037..dde4a1b5 100644
--- a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/PartParametersV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/PartParametersV.xaml
@@ -18,191 +18,191 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+ Grid.Column="1"
+ Width="100"
+ Style="{StaticResource ToolBar_SmallButton}"/>
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
+ Grid.Column="1"
+ Style="{StaticResource PartParam_TextBox}"/>
@@ -216,50 +216,50 @@
+ Style="{StaticResource PartParam_TextBlock}"/>
+ Path=Tag.ocREFSIDE,
+ Mode=OneWay}"
+ SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}},
+ Path=Tag.SelREFSIDE,
+ Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+ Grid.Column="1"
+ Style="{StaticResource PartParam_ComboBox}"/>
+ Style="{StaticResource PartParam_TextBlock}"/>
+ Grid.Column="1"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -271,21 +271,21 @@
+ Style="{StaticResource PartParam_TextBlock}"/>
+ RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
+ Grid.Column="1"
+ Style="{StaticResource PartParam_TextBox}"/>
+ Grid.Row="1"
+ Style="{StaticResource PartParam_TextBlock}"/>
@@ -300,53 +300,53 @@
+ Style="{StaticResource PartParam_TextBlock}"/>
+ Path=Tag.ocCAMBERSIDE,
+ Mode=OneWay}"
+ SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}},
+ Path=Tag.SelCAMBERSIDE,
+ Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+ Grid.Column="1"
+ Style="{StaticResource PartParam_ComboBox}"/>
+ Style="{StaticResource PartParam_TextBlock}"/>
+ Grid.Column="1"
+ Style="{StaticResource PartParam_TextBox}"/>
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -360,23 +360,23 @@
-
-
-
+ Style="{StaticResource PartParam_TextBlock}"/>
+
+
+
@@ -390,28 +390,28 @@
-
-
-
+ Style="{StaticResource PartParam_TextBlock}"/>
+
+
+
@@ -427,43 +427,43 @@
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
diff --git a/EgtBEAMWALL.ViewerOptimizer/LeftPanel/LeftPanelV.xaml b/EgtBEAMWALL.ViewerOptimizer/LeftPanel/LeftPanelV.xaml
index b7eaa639..3ca68570 100644
--- a/EgtBEAMWALL.ViewerOptimizer/LeftPanel/LeftPanelV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/LeftPanel/LeftPanelV.xaml
@@ -155,8 +155,8 @@
+ Tag="{Binding Tag, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:LeftPanelV}}}"
+ Grid.Row="1"/>
@@ -195,7 +195,7 @@
-
diff --git a/EgtBEAMWALL.ViewerOptimizer/LeftPanel/LeftPanelVM.vb b/EgtBEAMWALL.ViewerOptimizer/LeftPanel/LeftPanelVM.vb
index c7980a36..117b7c9b 100644
--- a/EgtBEAMWALL.ViewerOptimizer/LeftPanel/LeftPanelVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/LeftPanel/LeftPanelVM.vb
@@ -22,12 +22,12 @@ Public Class LeftPanelVM
Public ReadOnly Property ViewPage_Visibility As Visibility
Get
- Return If(Map.refMainMenuVM.SelPage = Pages.VIEW, Visibility.Visible, Visibility.Collapsed)
+ Return If(Map.refMainMenuVM.SelPage = Pages.VIEW Or Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE, Visibility.Visible, Visibility.Collapsed)
End Get
End Property
Public ReadOnly Property MachiningPage_Visibility As Visibility
Get
- Return If(Map.refMainMenuVM.SelPage = Pages.MACHINING, Visibility.Visible, Visibility.Collapsed)
+ Return If(Map.refMainMenuVM.SelPage = Pages.MACHINING Or Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE, Visibility.Visible, Visibility.Collapsed)
End Get
End Property
diff --git a/EgtBEAMWALL.ViewerOptimizer/LeftPanel/OnlyProdLeftPanelV.xaml b/EgtBEAMWALL.ViewerOptimizer/LeftPanel/OnlyProdLeftPanelV.xaml
new file mode 100644
index 00000000..d3613d2b
--- /dev/null
+++ b/EgtBEAMWALL.ViewerOptimizer/LeftPanel/OnlyProdLeftPanelV.xaml
@@ -0,0 +1,159 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/EgtBEAMWALL.ViewerOptimizer/LeftPanel/OnlyProdLeftPanelV.xaml.vb b/EgtBEAMWALL.ViewerOptimizer/LeftPanel/OnlyProdLeftPanelV.xaml.vb
new file mode 100644
index 00000000..c991aa65
--- /dev/null
+++ b/EgtBEAMWALL.ViewerOptimizer/LeftPanel/OnlyProdLeftPanelV.xaml.vb
@@ -0,0 +1,3 @@
+Public Class OnlyProdLeftPanelV
+
+End Class
diff --git a/EgtBEAMWALL.ViewerOptimizer/MainMenu/MainMenuV.xaml b/EgtBEAMWALL.ViewerOptimizer/MainMenu/MainMenuV.xaml
index 2a17c782..1e9c1ea1 100644
--- a/EgtBEAMWALL.ViewerOptimizer/MainMenu/MainMenuV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/MainMenu/MainMenuV.xaml
@@ -6,11 +6,17 @@
+
diff --git a/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerVM.vb b/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerVM.vb
index 6d66aba7..92a786f1 100644
--- a/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerVM.vb
@@ -104,6 +104,12 @@ Public Class ProjManagerVM
End Set
End Property
+ Public ReadOnly Property GoToProd_Visibility As Visibility
+ Get
+ Return If(Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE, Visibility.Collapsed, Visibility.Visible)
+ End Get
+ End Property
+
' Definizione comandi
Private m_cmdNew As ICommand
Private m_cmdOpen As ICommand
diff --git a/EgtBEAMWALL.ViewerOptimizer/Project/ProjectV.xaml b/EgtBEAMWALL.ViewerOptimizer/Project/ProjectV.xaml
index 28ae79e8..68f3c305 100644
--- a/EgtBEAMWALL.ViewerOptimizer/Project/ProjectV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/Project/ProjectV.xaml
@@ -3,7 +3,8 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
- xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.ViewerOptimizer">
+ xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.ViewerOptimizer"
+ DataContext="{StaticResource ProjectVM}">
@@ -79,8 +80,8 @@
+ DataContext="{StaticResource FreeContourInputVM}"
+ Visibility="{Binding DataContext.FreeContourManager_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProjectV}}}"/>
BWType.BEAM)
+ If Not IsNothing(Map.refTopPanelVM) Then
+ Map.refTopPanelVM.ManageQParamsRowVisibility(Map.refProjectVM.BTLStructureVM.BTLStructureM.nPROJTYPE <> BWType.BEAM)
+ Else
+ Map.refProjectVM.ManageQParamsRowVisibility(Map.refProjectVM.BTLStructureVM.BTLStructureM.nPROJTYPE <> BWType.BEAM)
+ End If
Map.refPartInRawPartListVM.UpdateColumns(Map.refProjectVM.BTLStructureVM.BTLStructureM.nPROJTYPE)
- If Not IsNothing(Map.refProdManagerVM.TempCurrProd) Then Map.refProdManagerVM.CurrProd = Map.refProdManagerVM.TempCurrProd
- DbControllers.m_ProdController.LockByProdId(Map.refProdManagerVM.CurrProd.nProdId, True, Map.refMainWindowVM.MainWindowM.GetKeyNumber())
- ' carico lista macchine e macchina del progetto per il pulsante Reset Macchina del CALCPanel
- Map.refCALCPanelVM.LoadMachineList()
- End If
- If Map.refMainMenuVM.SelPage = Pages.VIEW Then
+ If Not IsNothing(Map.refProdManagerVM.TempCurrProd) Then
+ 'Map.refProdManagerVM.CurrProd = Map.refProdManagerVM.TempCurrProd
+ CurrProd = Map.refProdManagerVM.TempCurrProd
+ ElseIf Not IsNothing(Map.refOnlyProdManagerVM.TempCurrProd) Then
+ 'Map.refFullCompleteManagerVM.CurrProd = Map.refFullCompleteManagerVM.TempCurrProd
+ CurrProd = Map.refOnlyProdManagerVM.TempCurrProd
+ End If
+ 'DbControllers.m_ProdController.LockByProdId(Map.refProdManagerVM.CurrProd.nProdId, True, Map.refMainWindowVM.MainWindowM.GetKeyNumber())
+ DbControllers.m_ProdController.LockByProdId(CurrProd.nProdId, True, Map.refMainWindowVM.MainWindowM.GetKeyNumber())
+ ' carico lista macchine e macchina del progetto per il pulsante Reset Macchina del CALCPanel
+ Map.refCALCPanelVM.LoadMachineList()
+ End If
+ If Map.refMainMenuVM.SelPage = Pages.VIEW Then
LoadingWndHelper.UpdateLoadingWnd(ActiveIds.OPENPROJ, 3, EgtMsg(63006), 70, 100) ' Loading graphics
' mostro tutti i pezzi
Map.refShowBeamPanelVM.ShowAll(True)
- ElseIf Map.refMainMenuVM.SelPage = Pages.MACHINING Then
+ ElseIf Map.refMainMenuVM.SelPage = Pages.MACHINING OrElse Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
' recupero indice di modifica progetto quando caricato
Dim CommIndex As Integer = -1
Dim ActiveSessionList As List(Of StatusMapModel) = DbControllers.m_StatusMapController.GetProd(m_SupervisorId)
For Each ActiveSession In ActiveSessionList
- If Not IsNothing(Map.refProdManagerVM.CurrProd) AndAlso ActiveSession.ItemId = Map.refProdManagerVM.CurrProd.nProdId Then
+ 'If Not IsNothing(Map.refProdManagerVM.CurrProd) AndAlso ActiveSession.ItemId = Map.refProdManagerVM.CurrProd.nProdId Then
+ If Not IsNothing(CurrProd) AndAlso ActiveSession.ItemId = CurrProd.nProdId Then
CommIndex = ActiveSession.Index
End If
Next
@@ -593,9 +617,17 @@ Public Class MySceneHostVM
' carico gruppi di lavorazione
Map.refProjectVM.MachGroupPanelVM = New MyMachGroupPanelVM(MyMachGroupPanelM.CreateMyMachGroupPanel(Map.refMachinePanelVM.MachineList.ToList()))
' fisso indice sessione di comunicazione
+ 'If CommIndex > -1 Then
+ ' Map.refProdManagerVM.CurrProd.SetModificationIndex(CommIndex)
+ 'End If
If CommIndex > -1 Then
- Map.refProdManagerVM.CurrProd.SetModificationIndex(CommIndex)
+ If Not IsNothing(Map.refProdManagerVM.CurrProd) Then
+ Map.refProdManagerVM.CurrProd.SetModificationIndex(CommIndex)
+ ElseIf Not IsNothing(Map.refOnlyProdManagerVM.CurrProd) Then
+ Map.refOnlyProdManagerVM.CurrProd.SetModificationIndex(CommIndex)
+ End If
End If
+
' seleziono primo gruppo
If Map.refProjectVM.MachGroupPanelVM.MachGroupVMList.Count > 0 Then
Map.refProjectVM.MachGroupPanelVM.SelFirstMachGroup()
@@ -616,7 +648,7 @@ Public Class MySceneHostVM
If ProjectType = ProjectType.PROD Then Map.refProdManagerVM.m_MruFiles.Remove(sFile)
MessageBox.Show(EgtMsg(10003) & " '" & sFile & "'", EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error) 'Error opening file
Map.refProjManagerVM.NewProject()
- If Map.refMainMenuVM.SelPage = Pages.MACHINING Then
+ If Map.refMainMenuVM.SelPage = Pages.MACHINING OrElse Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
Map.refProjectVM.MachGroupPanelVM = New MyMachGroupPanelVM(MyMachGroupPanelM.CreateMyMachGroupPanel(Map.refMachinePanelVM.MachineList.ToList()))
End If
End If
diff --git a/EgtBEAMWALL.ViewerOptimizer/StatisticsTimePanel/StatisticsTimePanelVM.vb b/EgtBEAMWALL.ViewerOptimizer/StatisticsTimePanel/StatisticsTimePanelVM.vb
index f8215cb7..caa75b3e 100644
--- a/EgtBEAMWALL.ViewerOptimizer/StatisticsTimePanel/StatisticsTimePanelVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/StatisticsTimePanel/StatisticsTimePanelVM.vb
@@ -17,7 +17,7 @@ Public Class StatisticsTimePanelVM
End Property
Public ReadOnly Property MachiningPage_Visibility As Visibility
Get
- Return If(Map.refMainMenuVM.SelPage = Pages.MACHINING, Visibility.Visible, Visibility.Collapsed)
+ Return If(Map.refMainMenuVM.SelPage = Pages.MACHINING OrElse Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE, Visibility.Visible, Visibility.Collapsed)
End Get
End Property
diff --git a/EgtBEAMWALL.ViewerOptimizer/TopPanel/TopPanelV.xaml b/EgtBEAMWALL.ViewerOptimizer/TopPanel/TopPanelV.xaml
index 38c7e88a..2b617bd5 100644
--- a/EgtBEAMWALL.ViewerOptimizer/TopPanel/TopPanelV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/TopPanel/TopPanelV.xaml
@@ -31,7 +31,7 @@
+ HorizontalAlignment="Right">
-->
+
diff --git a/EgtBEAMWALL.ViewerOptimizer/Utility/Map.vb b/EgtBEAMWALL.ViewerOptimizer/Utility/Map.vb
index 017287ca..1698fd0e 100644
--- a/EgtBEAMWALL.ViewerOptimizer/Utility/Map.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/Utility/Map.vb
@@ -34,6 +34,7 @@ Module Map
Private m_refFeatureManagerVM As FeatureManagerVM
Private m_refAddSectionXMaterialWndVM As AddSectionXMaterialWndVM
Private m_refStatisticsTimePanelVM As StatisticsTimePanelVM
+ Private m_refOnlyProdManagerVM As OnlyProdManagerVM
'Private m_refOpenProjectFileDialogVM As OpenProjectFileDialogVM
'Private m_refRawPartTabVM As RawPartTabVM
'Private m_refNestingTabVM As NestingTabVM
@@ -241,6 +242,12 @@ Module Map
End Get
End Property
+ Public ReadOnly Property refOnlyProdManagerVM As OnlyProdManagerVM
+ Get
+ Return m_refOnlyProdManagerVM
+ End Get
+ End Property
+
'Public ReadOnly Property refOpenProjectFileDialogVM As OpenProjectFileDialogVM
' Get
' Return m_refOpenProjectFileDialogVM
@@ -453,6 +460,11 @@ Module Map
Return Not IsNothing(m_refStatisticsTimePanelVM)
End Function
+ Friend Function SetRefOnlyProdManagerVM(OnlyProdManagerVM As OnlyProdManagerVM) As Boolean
+ m_refOnlyProdManagerVM = OnlyProdManagerVM
+ Return Not IsNothing(m_refOnlyProdManagerVM)
+ End Function
+
'Friend Function SetRefOpenProjectFileDialogVM(OpenProjectFileDialogVM As OpenProjectFileDialogVM) As Boolean
' m_refOpenProjectFileDialogVM = OpenProjectFileDialogVM
' Return Not IsNothing(m_refOpenProjectFileDialogVM)
@@ -526,6 +538,7 @@ Module Map
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_refOnlyProdManagerVM) AndAlso
LibMap.EndInit()
End Function