diff --git a/EgtBEAMWALL.ViewerOptimizer/BTLDataWnd/BTLDataWndV.xaml b/EgtBEAMWALL.ViewerOptimizer/BTLDataWnd/BTLDataWndV.xaml index ae65a4d8..d533502d 100644 --- a/EgtBEAMWALL.ViewerOptimizer/BTLDataWnd/BTLDataWndV.xaml +++ b/EgtBEAMWALL.ViewerOptimizer/BTLDataWnd/BTLDataWndV.xaml @@ -14,146 +14,146 @@ Name="BTLDataWndV"> + Columns="6" Rows="7"> + Style="{StaticResource PartParam_TextBlock}"/> + RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}" + Grid.Column="1" + Style="{StaticResource PartParam_TextBox}"/> + Style="{StaticResource PartParam_TextBlock}"/> + RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}" + Grid.Column="1" + Style="{StaticResource PartParam_TextBox}"/> + Style="{StaticResource PartParam_TextBlock}"/> + RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}" + Grid.Column="1" + Style="{StaticResource PartParam_TextBox}"/> + Style="{StaticResource PartParam_TextBlock}"/> + RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}" + Grid.Column="1" + Style="{StaticResource PartParam_TextBox}"/> + Style="{StaticResource PartParam_TextBlock}"/> + RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}" + Grid.Column="1" + Style="{StaticResource PartParam_TextBox}"/> + Style="{StaticResource PartParam_TextBlock}"/> + RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}" + Grid.Column="1" + Style="{StaticResource PartParam_TextBox}"/> + Style="{StaticResource PartParam_TextBlock}"/> + RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}" + Grid.Column="1" + Style="{StaticResource PartParam_TextBox}"/> + Style="{StaticResource PartParam_TextBlock}"/> + RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}" + Grid.Column="1" + Style="{StaticResource PartParam_TextBox}"/> + RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}" + Grid.Column="1" + Style="{StaticResource PartParam_TextBox}"/> + Style="{StaticResource PartParam_TextBlock}"/> + RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}" + Grid.Column="1" + Style="{StaticResource PartParam_TextBox}"/> + Style="{StaticResource PartParam_TextBlock}"/> + RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}" + Grid.Column="1" + Style="{StaticResource PartParam_TextBox}"/> + Style="{StaticResource PartParam_TextBlock}"/> + RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}" + Grid.Column="1" + Style="{StaticResource PartParam_TextBox}"/> + Style="{StaticResource PartParam_TextBlock}"/> + RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}" + Grid.Column="1" + Style="{StaticResource PartParam_TextBox}"/> + Style="{StaticResource PartParam_TextBlock}"/> + Path=Tag.ocRANGE, + Mode=OneWay}" + SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}, + Path=Tag.SelRANGE, + Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" + Grid.Column="1" + Style="{StaticResource BtlData_ComboBox}"/> + Style="{StaticResource PartParam_TextBlock}"/> + Path=Tag.ocPROCESSINGQUALITY, + Mode=OneWay}" + SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}, + Path=Tag.SelPROCESSINGQUALITY, + Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" + Grid.Column="1" + Style="{StaticResource BtlData_ComboBox}"/> + Style="{StaticResource PartParam_TextBlock}"/> + RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}" + Grid.Column="1" + Style="{StaticResource PartParam_TextBox}"/> + Style="{StaticResource PartParam_TextBlock}"/> + RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}" + Grid.Column="1" + Style="{StaticResource PartParam_TextBox}"/> + Style="{StaticResource PartParam_TextBlock}"/> + RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}" + Grid.Column="1" + Style="{StaticResource PartParam_TextBox}"/> + Style="{StaticResource PartParam_TextBlock}"/> + RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}" + Grid.Column="1" + Style="{StaticResource PartParam_TextBox}"/> + Style="{StaticResource PartParam_TextBlock}"/> + Path=Tag.ocRECESS, + Mode=OneWay}" + SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}, + Path=Tag.SelRECESS, + Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" + Grid.Column="1" + Style="{StaticResource BtlData_ComboBox}"/> + Style="{StaticResource PartParam_TextBlock}"/> + RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}" + Grid.Column="1" + Style="{StaticResource PartParam_TextBox}"/> diff --git a/EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLStructureVM.vb b/EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLStructureVM.vb index 0c210f9d..5c3258a9 100644 --- a/EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLStructureVM.vb +++ b/EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLStructureVM.vb @@ -85,6 +85,8 @@ Public Class BTLStructureVM Case SelectionTypes.SELECT_ ' imposto modalita' proj su vista feature Map.refProjectVM.SelProdProj = ProdProj.PROJ + ' rendo enable bottone parameters + Map.refLeftPanelVM.SetParametersIsEnabled(True) ' verifico reset mark su tutti i pezzi For Each BTLPart In m_BTLPartVMList EgtResetMark(BTLPart.nPartId) @@ -94,6 +96,8 @@ Public Class BTLStructureVM Case SelectionTypes.HIGHLIGHT ' imposto modalita' nulla su vista feature Map.refProjectVM.SelProdProj = ProdProj.NULL + ' rendo disable bottone parameters + Map.refLeftPanelVM.SetParametersIsEnabled(False) If m_PrevSelectionType = SelectionTypes.SELECT_ Then EgtBeamShowFacesName(False) EgtBeamShowLoadingSide(False, False) diff --git a/EgtBEAMWALL.ViewerOptimizer/BottomPanel/BottomPanelVM.vb b/EgtBEAMWALL.ViewerOptimizer/BottomPanel/BottomPanelVM.vb index ea86d27b..eb3039ec 100644 --- a/EgtBEAMWALL.ViewerOptimizer/BottomPanel/BottomPanelVM.vb +++ b/EgtBEAMWALL.ViewerOptimizer/BottomPanel/BottomPanelVM.vb @@ -23,8 +23,6 @@ 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 01f191a8..c7fb71f8 100644 --- a/EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj +++ b/EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj @@ -350,6 +350,10 @@ OnlyProdOptimizePanelV.xaml + + PartParametersWndV.xaml + + ProjectTypeWndV.xaml @@ -587,6 +591,10 @@ MSBuild:Compile Designer + + Designer + MSBuild:Compile + MSBuild:Compile Designer diff --git a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/BTLDataV.xaml b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/BTLDataV.xaml index 7d24a08e..f8ead220 100644 --- a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/BTLDataV.xaml +++ b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/BTLDataV.xaml @@ -5,146 +5,146 @@ xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.ViewerOptimizer"> + Columns="6" Rows="7"> + Style="{StaticResource PartParam_TextBlock}"/> + RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataV}}}" + Grid.Column="1" + Style="{StaticResource PartParam_TextBox}"/> + Style="{StaticResource PartParam_TextBlock}"/> + RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataV}}}" + Grid.Column="1" + Style="{StaticResource PartParam_TextBox}"/> + Style="{StaticResource PartParam_TextBlock}"/> + RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataV}}}" + Grid.Column="1" + Style="{StaticResource PartParam_TextBox}"/> + Style="{StaticResource PartParam_TextBlock}"/> + RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataV}}}" + Grid.Column="1" + Style="{StaticResource PartParam_TextBox}"/> + Style="{StaticResource PartParam_TextBlock}"/> + RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataV}}}" + Grid.Column="1" + Style="{StaticResource PartParam_TextBox}"/> + Style="{StaticResource PartParam_TextBlock}"/> + RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataV}}}" + Grid.Column="1" + Style="{StaticResource PartParam_TextBox}"/> + Style="{StaticResource PartParam_TextBlock}"/> + RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataV}}}" + Grid.Column="1" + Style="{StaticResource PartParam_TextBox}"/> + RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataV}}}" + Grid.Column="1" + Style="{StaticResource PartParam_TextBox}"/> + Style="{StaticResource PartParam_TextBlock}"/> + RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataV}}}" + Grid.Column="1" + Style="{StaticResource PartParam_TextBox}"/> + Style="{StaticResource PartParam_TextBlock}"/> + RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataV}}}" + Grid.Column="1" + Style="{StaticResource PartParam_TextBox}"/> + Style="{StaticResource PartParam_TextBlock}"/> + RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataV}}}" + Grid.Column="1" + Style="{StaticResource PartParam_TextBox}"/> + Style="{StaticResource PartParam_TextBlock}"/> + RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataV}}}" + Grid.Column="1" + Style="{StaticResource PartParam_TextBox}"/> + Style="{StaticResource PartParam_TextBlock}"/> + RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataV}}}" + Grid.Column="1" + Style="{StaticResource PartParam_TextBox}"/> + Style="{StaticResource PartParam_TextBlock}"/> + Path=Tag.ocRANGE, + Mode=OneWay}" + SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataV}}, + Path=Tag.SelRANGE, + Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" + Grid.Column="1" + Style="{StaticResource BtlData_ComboBox}"/> + Style="{StaticResource PartParam_TextBlock}"/> + Path=Tag.ocPROCESSINGQUALITY, + Mode=OneWay}" + SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataV}}, + Path=Tag.SelPROCESSINGQUALITY, + Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" + Grid.Column="1" + Style="{StaticResource BtlData_ComboBox}"/> + Style="{StaticResource PartParam_TextBlock}"/> + RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataV}}}" + Grid.Column="1" + Style="{StaticResource PartParam_TextBox}"/> + Style="{StaticResource PartParam_TextBlock}"/> + RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataV}}}" + Grid.Column="1" + Style="{StaticResource PartParam_TextBox}"/> + Style="{StaticResource PartParam_TextBlock}"/> + RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataV}}}" + Grid.Column="1" + Style="{StaticResource PartParam_TextBox}"/> + Style="{StaticResource PartParam_TextBlock}"/> + RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataV}}}" + Grid.Column="1" + Style="{StaticResource PartParam_TextBox}"/> + Style="{StaticResource PartParam_TextBlock}"/> + Path=Tag.ocRECESS, + Mode=OneWay}" + SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataV}}, + Path=Tag.SelRECESS, + Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" + Grid.Column="1" + Style="{StaticResource BtlData_ComboBox}"/> + Style="{StaticResource PartParam_TextBlock}"/> + RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataV}}}" + Grid.Column="1" + Style="{StaticResource PartParam_TextBox}"/> diff --git a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdFeatureListV.xaml b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdFeatureListV.xaml index c8b14e6c..58996db6 100644 --- a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdFeatureListV.xaml +++ b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdFeatureListV.xaml @@ -75,7 +75,7 @@ - +