Compare commits
10 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Demetrio Cassarino
|
cbf44a8b23 | ||
|
Demetrio Cassarino
|
17e647e65d | ||
|
Demetrio Cassarino
|
9fd0d7d9d5 | ||
|
Demetrio Cassarino
|
7cc4374ad4 | ||
|
Demetrio Cassarino
|
ca6874c2b5 | ||
|
Demetrio Cassarino
|
4826feb281 | ||
|
Demetrio Cassarino
|
adf3ba4d97 | ||
|
Demetrio Cassarino
|
8cc6324d64 | ||
|
Demetrio Cassarino
|
6fc4e0d669 | ||
|
Demetrio Cassarino
|
5fd269f6bb |
+336
-170
@@ -9,90 +9,157 @@
|
||||
|
||||
<StackPanel Background="Transparent" MaxHeight="{Binding MaxHeight,RelativeSource={RelativeSource AncestorType={x:Type EgtFloating:EgtFloatingPanel}}}">
|
||||
<Expander Name="Draw2D" Style="{StaticResource ExpanderStyle}" Grid.Row="0"
|
||||
IsExpanded="{Binding Draw2DIsExpanded}">
|
||||
IsExpanded="{Binding Draw2DIsExpanded}">
|
||||
<Expander.Header>
|
||||
<TextBlock Text="{Binding Draw2DMsg}"/>
|
||||
</Expander.Header>
|
||||
<UniformGrid Columns="3">
|
||||
<Button ToolTip="{Binding PointToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding PointCommand}" IsEnabled="{Binding bLayerOk}">
|
||||
<Image Source="/Resources/DrawPanel/Point.png" Stretch="Uniform"/>
|
||||
<Button x:Name="PuntoBtn" ToolTip="Punto" Style="{StaticResource DrawPanelButton}"
|
||||
Command="{Binding PointBaseCommand}" IsEnabled="{Binding bLayerOk}">
|
||||
<Image Source="/Resources/DrawPanel/Point+.png" Stretch="Uniform"/>
|
||||
<Button.ContextMenu>
|
||||
<ContextMenu Style="{StaticResource ContextMenu_Button}">
|
||||
<Button ToolTip="Vettore" Style="{StaticResource DrawPanelButton}"
|
||||
Command="{Binding PointVectorCommand}">
|
||||
<Image Source="/Resources/DrawPanel/Point.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
<Button ToolTip="Riferimento" Style="{StaticResource DrawPanelButton}"
|
||||
Command="{Binding PointReferenceCommand}">
|
||||
<Image Source="/Resources/DrawPanel/Point.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
</ContextMenu>
|
||||
</Button.ContextMenu>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding Line2PToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding Line2PCommand}" IsEnabled="{Binding bLayerOk}">
|
||||
<Image Source="/Resources/DrawPanel/Line2P.png" Stretch="Uniform"/>
|
||||
<Button ToolTip="Linea 2 Punti" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding Line2PBaseCommand}" IsEnabled="{Binding bLayerOk}">
|
||||
<Image Source="/Resources/DrawPanel/Line2P+.png" Stretch="Uniform"/>
|
||||
<Button.ContextMenu>
|
||||
<ContextMenu Style="{StaticResource ContextMenu_Button}">
|
||||
<Button ToolTip="Linea 2 Punti con Continuazione" Style="{StaticResource DrawPanelButton}"
|
||||
Command="{Binding Line2PContinuationCommand}">
|
||||
<Image Source="/Resources/DrawPanel/Line2P.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
</ContextMenu>
|
||||
</Button.ContextMenu>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding LinePDLToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding LinePDLCommand}" IsEnabled="{Binding bLayerOk}">
|
||||
<Image Source="/Resources/DrawPanel/LinePDL.png" Stretch="Uniform"/>
|
||||
<Button ToolTip="Linea Punto Direzione Lunghezza" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding LinePDLBaseCommand}" IsEnabled="{Binding bLayerOk}">
|
||||
<Image Source="/Resources/DrawPanel/LinePDL+.png" Stretch="Uniform"/>
|
||||
<Button.ContextMenu>
|
||||
<ContextMenu Style="{StaticResource ContextMenu_Button}">
|
||||
<Button ToolTip="Linea Punto Vettore Direzione Lunghezza" Style="{StaticResource DrawPanelButton}"
|
||||
Command="{Binding LinePDLVectorCommand}">
|
||||
<Image Source="/Resources/DrawPanel/Line2P.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
</ContextMenu>
|
||||
</Button.ContextMenu>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding ArcCSEToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding ArcCSECommand}" IsEnabled="{Binding bLayerOk}">
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding ArcCSECommand}" IsEnabled="{Binding bLayerOk}">
|
||||
<Image Source="/Resources/DrawPanel/ArcCSE.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding Arc3PToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding Arc3PCommand}" IsEnabled="{Binding bLayerOk}">
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding Arc3PCommand}" IsEnabled="{Binding bLayerOk}">
|
||||
<Image Source="/Resources/DrawPanel/Arc3P.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding ArcPDPToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding ArcPDPCommand}" IsEnabled="{Binding bLayerOk}">
|
||||
<Image Source="/Resources/DrawPanel/ArcPDP.png" Stretch="Uniform"/>
|
||||
<Button ToolTip="Arco " Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding ArcPDPCommand}" IsEnabled="{Binding bLayerOk}">
|
||||
<Image Source="/Resources/DrawPanel/ArcPDP+.png" Stretch="Uniform"/>
|
||||
<Button.ContextMenu>
|
||||
<ContextMenu Style="{StaticResource ContextMenu_Button}">
|
||||
<Button ToolTip="Linea Punto Vettore Direzione Lunghezza" Style="{StaticResource DrawPanelButton}"
|
||||
Command="{Binding LinePDLVectorCommand}">
|
||||
<Image Source="/Resources/DrawPanel/ArcPDP.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
</ContextMenu>
|
||||
</Button.ContextMenu>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding CirclePDToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding CircleCPCommand}" IsEnabled="{Binding bLayerOk}">
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding CircleCPCommand}" IsEnabled="{Binding bLayerOk}">
|
||||
<Image Source="/Resources/DrawPanel/CircleCP.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding Circle3PToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding Circle3PCommand}" IsEnabled="{Binding bLayerOk}">
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding Circle3PCommand}" IsEnabled="{Binding bLayerOk}">
|
||||
<Image Source="/Resources/DrawPanel/Circle3P.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding CircleCDToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding CircleCDCommand}" IsEnabled="{Binding bLayerOk}">
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding CircleCDCommand}" IsEnabled="{Binding bLayerOk}">
|
||||
<Image Source="/Resources/DrawPanel/CircleCD.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding Rectangle2PToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding Rectangle2PCommand}" IsEnabled="{Binding bLayerOk}">
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding Rectangle2PCommand}" IsEnabled="{Binding bLayerOk}">
|
||||
<Image Source="/Resources/DrawPanel/Rectangle2P.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding PolygonToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding PolygonCommand}" IsEnabled="{Binding bLayerOk}">
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding PolygonCommand}" IsEnabled="{Binding bLayerOk}">
|
||||
<Image Source="/Resources/DrawPanel/Polygon.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding PolygonSideToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding PolygonSideCommand}" IsEnabled="{Binding bLayerOk}">
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding PolygonSideCommand}" IsEnabled="{Binding bLayerOk}">
|
||||
<Image Source="/Resources/DrawPanel/PolygonSide.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding LinearDimensionToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding LinearDimensionCommand}" IsEnabled="{Binding bLayerOk}">
|
||||
<Image Source="/Resources/DrawPanel/LinearDimension.png" Stretch="Uniform"/>
|
||||
<Button ToolTip="Quota Lineare" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding LinearDimensionBaseCommand}" IsEnabled="{Binding bLayerOk}">
|
||||
<Image Source="/Resources/DrawPanel/LinearDimension+.png" Stretch="Uniform"/>
|
||||
<Button.ContextMenu>
|
||||
<ContextMenu Style="{StaticResource ContextMenu_Button}">
|
||||
<Button ToolTip="Quota Allineata" Style="{StaticResource DrawPanelButton}"
|
||||
Command="{Binding AlignedDimensionCommand}">
|
||||
<Image Source="/Resources/DrawPanel/LinearDimension.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
</ContextMenu>
|
||||
</Button.ContextMenu>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding AngularDimensionToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding AngularDimensionCommand}" IsEnabled="{Binding bLayerOk}">
|
||||
<Image Source="/Resources/DrawPanel/AngularDimension.png" Stretch="Uniform"/>
|
||||
<Button ToolTip="Quota Angolare" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding AngularDimensionBaseCommand}" IsEnabled="{Binding bLayerOk}">
|
||||
<Image Source="/Resources/DrawPanel/AngularDimension +.png" Stretch="Uniform"/>
|
||||
<Button.ContextMenu>
|
||||
<ContextMenu Style="{StaticResource ContextMenu_Button}">
|
||||
<Button ToolTip="Quota Angolare Avanzata" Style="{StaticResource DrawPanelButton}"
|
||||
Command="{Binding AlignedDimensionPlusCommand}">
|
||||
<Image Source="/Resources/DrawPanel/AngularDimension.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
</ContextMenu>
|
||||
</Button.ContextMenu>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding DiamRadDimensionToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding DiamRadDimensionCommand}" IsEnabled="{Binding bLayerOk}">
|
||||
<Image Source="/Resources/DrawPanel/DiametralDimension.png" Stretch="Uniform"/>
|
||||
<Button ToolTip="Quota Diametrale" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding DiamDimensionCommand}" IsEnabled="{Binding bLayerOk}">
|
||||
<Image Source="/Resources/DrawPanel/DiametralDimension+.png" Stretch="Uniform"/>
|
||||
<Button.ContextMenu>
|
||||
<ContextMenu Style="{StaticResource ContextMenu_Button}">
|
||||
<Button ToolTip="Quota Radiale" Style="{StaticResource DrawPanelButton}"
|
||||
Command="{Binding RadDimensionCommand}">
|
||||
<Image Source="/Resources/DrawPanel/DiametralDimension.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
</ContextMenu>
|
||||
</Button.ContextMenu>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding TextToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding TextCommand}" IsEnabled="{Binding bLayerOk}">
|
||||
<Image Source="/Resources/DrawPanel/Text.png" Stretch="Uniform"/>
|
||||
<Button ToolTip="Testo" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding TextBaseCommand}" IsEnabled="{Binding bLayerOk}">
|
||||
<Image Source="/Resources/DrawPanel/Text+.png" Stretch="Uniform"/>
|
||||
<Button.ContextMenu>
|
||||
<ContextMenu Style="{StaticResource ContextMenu_Button}">
|
||||
<Button ToolTip="Testo Avanzato" Style="{StaticResource DrawPanelButton}"
|
||||
Command="{Binding TextPlusCommand}">
|
||||
<Image Source="/Resources/DrawPanel/TextA.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
</ContextMenu>
|
||||
</Button.ContextMenu>
|
||||
</Button>
|
||||
</UniformGrid>
|
||||
</Expander>
|
||||
@@ -102,95 +169,135 @@
|
||||
<TextBlock Text="{Binding Draw3DMsg}"/>
|
||||
</Expander.Header>
|
||||
<UniformGrid Columns="3">
|
||||
<Button ToolTip="{Binding PlaneToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding PlaneCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/Plane.png" Stretch="Uniform"/>
|
||||
<Button ToolTip="Piano Contornato" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding FloorCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/Plane+.png" Stretch="Uniform"/>
|
||||
<Button.ContextMenu>
|
||||
<ContextMenu Style="{StaticResource ContextMenu_Button}">
|
||||
<Button ToolTip="Regione Piana" Style="{StaticResource DrawPanelButton}"
|
||||
Command="{Binding RegionCommand}">
|
||||
<Image Source="/Resources/DrawPanel/Plane.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
</ContextMenu>
|
||||
</Button.ContextMenu>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding ExtrudeToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding ExtrudeCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding ExtrudeCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/Extrude.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding RevolveToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding RevolveCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding RevolveCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/Revolve.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding ScrewToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding ScrewCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding ScrewCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/Screw.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding SweptToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding SweptCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding SweptCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/Swept.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding RuledToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding RuledCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding RuledCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/Ruled.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding SolidAddSurfToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding SolidAddSurfCommand}" IsEnabled="{Binding bSelOk}">
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding SolidAddSurfCommand}" IsEnabled="{Binding bSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/SolidAddSurf.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding SolidSubtractSurfToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding SolidSubtractSurfCommand}" IsEnabled="{Binding bSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/SolidSubtractSurf.png" Stretch="Uniform"/>
|
||||
<Button ToolTip="Sottrai Superfici e Regioni Piane" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding SubtractSurfacesCommand}" IsEnabled="{Binding bSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/SolidSubtractSurf+.png" Stretch="Uniform"/>
|
||||
<Button.ContextMenu>
|
||||
<ContextMenu Style="{StaticResource ContextMenu_Button}">
|
||||
<Button ToolTip="Taglia Superficie con Superficie Inversa" Style="{StaticResource DrawPanelButton}"
|
||||
Command="{Binding CutSurfacesCommand}">
|
||||
<Image Source="/Resources/DrawPanel/SolidSubtractSurf.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
</ContextMenu>
|
||||
</Button.ContextMenu>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding SolidIntersectSurfToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding SolidIntersectSurfCommand}" IsEnabled="{Binding bSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/SolidIntersectSurf.png" Stretch="Uniform"/>
|
||||
<Button ToolTip="Interseca Superfici e Regioni Piane" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding IntersectSurfCommand}" IsEnabled="{Binding bSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/SolidIntersectSurf+.png" Stretch="Uniform"/>
|
||||
<Button.ContextMenu>
|
||||
<ContextMenu Style="{StaticResource ContextMenu_Button}">
|
||||
<Button ToolTip="Taglia Superficie con Superficie" Style="{StaticResource DrawPanelButton}"
|
||||
Command="{Binding CutSurfCommand}">
|
||||
<Image Source="/Resources/DrawPanel/SolidIntersectSurf.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
</ContextMenu>
|
||||
</Button.ContextMenu>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding IntersectSurfSurfToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding IntersectSurfSurfCommand}" IsEnabled="{Binding bSelOk}">
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding IntersectSurfSurfCommand}" IsEnabled="{Binding bSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/IntersectSurfSurf.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding ExtractLoopsToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding ExtractLoopsCommand}" IsEnabled="{Binding bSelOk}">
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding ExtractLoopsCommand}" IsEnabled="{Binding bSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/ExtractLoops.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding ExtractFacetLoopsToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding ExtractFacetLoopsCommand}" IsEnabled="{Binding bSelOk}">
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding ExtractFacetLoopsCommand}" IsEnabled="{Binding bSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/ExtractFacetLoops.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding ExplodeSurfToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding ExplodeSurfCommand}" IsEnabled="{Binding bSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/ExplodeSurf.png" Stretch="Uniform"/>
|
||||
<Button ToolTip="Esplodi Superfici e Regioni Piane" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding ExplodeSurfaceCommand}" IsEnabled="{Binding bSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/ExplodeSurf+.png" Stretch="Uniform"/>
|
||||
<Button.ContextMenu>
|
||||
<ContextMenu Style="{StaticResource ContextMenu_Button}">
|
||||
<Button ToolTip="Esplodi Superfici Mesh in Triangoli" Style="{StaticResource DrawPanelButton}"
|
||||
Command="{Binding ExplodeSurfaceMeshCommand}">
|
||||
<Image Source="/Resources/DrawPanel/ExplodeSurf.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
</ContextMenu>
|
||||
</Button.ContextMenu>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding ExtractSurfFacetToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding ExtractSurfFacetCommand}" IsEnabled="{Binding bSelOk}">
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding ExtractSurfFacetCommand}" IsEnabled="{Binding bSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/ExtractSurfFacet.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding MergeSurfToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding MergeSurfCommand}" IsEnabled="{Binding bSelOk}">
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding MergeSurfCommand}" IsEnabled="{Binding bSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/MergeSurf.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding InvertSurfToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding InvertSurfCommand}" IsEnabled="{Binding bSelOk}">
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding InvertSurfCommand}" IsEnabled="{Binding bSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/InvertSurf.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding ApproxSurfToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding ApproxSurfCommand}" IsEnabled="{Binding bSelOk}">
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding ApproxSurfCommand}" IsEnabled="{Binding bSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/ApproxSurf.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding StmMoveVertexFacetToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding MoveStmVertexFacetCommand}" IsEnabled="{Binding bSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/StmMoveVertex.png" Stretch="Uniform"/>
|
||||
<Button ToolTip="Muovi Vertice di Superficie" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding MoveStmVertexCommand}" IsEnabled="{Binding bSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/StmMoveVertex+.png" Stretch="Uniform"/>
|
||||
<Button.ContextMenu>
|
||||
<ContextMenu Style="{StaticResource ContextMenu_Button}">
|
||||
<Button ToolTip="Muovi Faccia di Superficie" Style="{StaticResource DrawPanelButton}"
|
||||
Command="{Binding MoveStmFacetCommand}">
|
||||
<Image Source="/Resources/DrawPanel/StmMoveVertex.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
</ContextMenu>
|
||||
</Button.ContextMenu>
|
||||
</Button>
|
||||
</UniformGrid>
|
||||
</Expander>
|
||||
@@ -200,14 +307,22 @@
|
||||
</Expander.Header>
|
||||
<UniformGrid Columns="3">
|
||||
<Button ToolTip="{Binding DeleteToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding DeleteCommand}" IsEnabled="{Binding bSelOk}">
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding DeleteCommand}" IsEnabled="{Binding bSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/Delete.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding ChangeLayerToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding ChangeLayerCommand}" IsEnabled="{Binding bSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/ChangeLayer.png" Stretch="Uniform"/>
|
||||
<Button ToolTip="Cambia Layer" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding ChangeLayerBaseCommand}" IsEnabled="{Binding bSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/ChangeLayer+.png" Stretch="Uniform"/>
|
||||
<Button.ContextMenu>
|
||||
<ContextMenu Style="{StaticResource ContextMenu_Button}">
|
||||
<Button ToolTip="Cambia Layer con Trasformazioni" Style="{StaticResource DrawPanelButton}"
|
||||
Command="{Binding ChangeLayerTrasfCommand}">
|
||||
<Image Source="/Resources/DrawPanel/ChangeLayer.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
</ContextMenu>
|
||||
</Button.ContextMenu>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding ChangeStatusToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
@@ -215,108 +330,159 @@
|
||||
<Image Source="/Resources/DrawPanel/ChangeStatus.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding ChangeColorToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding ChangeColorCommand}" IsEnabled="{Binding bSelOk}">
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding ChangeColorCommand}" IsEnabled="{Binding bSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/ChangeColor.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding ChangeAlphaToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding ChangeAlphaCommand}" IsEnabled="{Binding bSelOk}">
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding ChangeAlphaCommand}" IsEnabled="{Binding bSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/ChangeColorAlpha.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding ResetColorToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding ResetColorCommand}" IsEnabled="{Binding bSelOk}">
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding ResetColorCommand}" IsEnabled="{Binding bSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/RemoveColor.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding InvertCurveToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding InvertCurveCommand}" IsEnabled="{Binding bSelOk}">
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding InvertCurveCommand}" IsEnabled="{Binding bSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/InvertCurve.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding ChangeStartToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding ChangeStartCurveCommand}" IsEnabled="{Binding bSelOk}">
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding ChangeStartCurveCommand}" IsEnabled="{Binding bSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/ChangeStart.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding ThickCurveToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding SetCurveThCommand}" IsEnabled="{Binding bSelOk}">
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding SetCurveThCommand}" IsEnabled="{Binding bSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/ThickCurve.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding ExtendCurveToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding ExtendCurveCommand}" IsEnabled="{Binding bSelOk}">
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding ExtendCurveCommand}" IsEnabled="{Binding bSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/ExtendCurve.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding BreakCurveToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding BreakCurveCommand}" IsEnabled="{Binding bSelOk}">
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding BreakCurveCommand}" IsEnabled="{Binding bSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/BreakCurve.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding SplitCurveToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding SplitCurveCommand}" IsEnabled="{Binding bSelOk}">
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding SplitCurveCommand}" IsEnabled="{Binding bSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/SplitCurve.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding ExplodeCurveToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding ExplodeCurveCommand}" IsEnabled="{Binding bSelOk}">
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding ExplodeCurveCommand}" IsEnabled="{Binding bSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/ExplodeCurve.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding JoinCurveToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding JoinCurveCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/JoinCurve.png" Stretch="Uniform"/>
|
||||
<Button ToolTip="Unisci Curve" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding JoinCurveBasCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/JoinCurve+.png" Stretch="Uniform"/>
|
||||
<Button.ContextMenu>
|
||||
<ContextMenu Style="{StaticResource ContextMenu_Button}">
|
||||
<Button ToolTip="Unisci Curve creando una Copia" Style="{StaticResource DrawPanelButton}"
|
||||
Command="{Binding JoinCurveCopyCommand}">
|
||||
<Image Source="/Resources/DrawPanel/JoinCurve.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
<Button ToolTip="Fondi Curve nella Composita" Style="{StaticResource DrawPanelButton}"
|
||||
Command="{Binding JoinCurveCompositeCommand}">
|
||||
<Image Source="/Resources/DrawPanel/JoinCurve.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
</ContextMenu>
|
||||
</Button.ContextMenu>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding OffsetToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding OffsetCommand}" IsEnabled="{Binding bSelOk}">
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding OffsetCommand}" IsEnabled="{Binding bSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/Offset.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding FilletToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding FilletCommand}" IsEnabled="{Binding bSelOk}">
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding FilletCommand}" IsEnabled="{Binding bSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/Fillet.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding ChamferToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding ChamferCommand}" IsEnabled="{Binding bSelOk}">
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding ChamferCommand}" IsEnabled="{Binding bSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/Chamfer.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding ArcFlipToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding ArcFlipCommand}" IsEnabled="{Binding bSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/ArcFlip.png" Stretch="Uniform"/>
|
||||
<Button ToolTip="Arco Capovolto" Style="{StaticResource DrawPanelButton}"
|
||||
Command="{Binding UpsideDownArchCommand}" ToolTipService.ShowOnDisabled="True" IsEnabled="{Binding bSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/ArcFlip+.png" Stretch="Uniform"/>
|
||||
<Button.ContextMenu >
|
||||
<ContextMenu Style="{StaticResource ContextMenu_Button}">
|
||||
<Button ToolTip="Arco Esplementare" Style="{StaticResource DrawPanelButton}"
|
||||
Command="{Binding ComplementaryArchCommand}">
|
||||
<Image Source="/Resources/DrawPanel/ArcFlip.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
</ContextMenu>
|
||||
</Button.ContextMenu>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding ModifyCurveToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding ModifyCurveCommand}" IsEnabled="{Binding bSelOk}">
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding ModifyCurveCommand}" IsEnabled="{Binding bSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/ModifyCurve.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding AddPointCurveToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding AddPointCurveCommand}" IsEnabled="{Binding bSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/AddPointCurve.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding RemovePointCurveToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding RemovePointCurveCommand}" IsEnabled="{Binding bSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/RemovePointCurve.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding ApproxCurveToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding ApproxCurveCommand}" IsEnabled="{Binding bSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/ApproxCurve.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
<Button ToolTip="Aggiungi Punto" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding AddPointCommand}" IsEnabled="{Binding bSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/AddPointCurve+.png" Stretch="Uniform"/>
|
||||
<Button.ContextMenu>
|
||||
<ContextMenu Style="{StaticResource ContextMenu_Button}">
|
||||
<Button ToolTip="Trasforma in Arco" Style="{StaticResource DrawPanelButton}"
|
||||
Command="{Binding TrasformArcCommand}">
|
||||
<Image Source="/Resources/DrawPanel/AddPointCurve.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
<Button ToolTip="Chiudi Curva Composita" Style="{StaticResource DrawPanelButton}"
|
||||
Command="{Binding CloseCurveCommand}">
|
||||
<Image Source="/Resources/DrawPanel/AddPointCurve.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
</ContextMenu>
|
||||
</Button.ContextMenu>
|
||||
</Button>
|
||||
<Button ToolTip="Rimuovi Punto" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding RemoveCurveCommand}" IsEnabled="{Binding bSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/RemovePointCurve+.png" Stretch="Uniform"/>
|
||||
<Button.ContextMenu>
|
||||
<ContextMenu Style="{StaticResource ContextMenu_Button}">
|
||||
<Button ToolTip="Trasforma in Retta" Style="{StaticResource DrawPanelButton}"
|
||||
Command="{Binding TrasformRectCommand}">
|
||||
<Image Source="/Resources/DrawPanel/RemovePointCurve.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
<Button ToolTip="Apri Curva Composita" Style="{StaticResource DrawPanelButton}"
|
||||
Command="{Binding OpenCurveCommand}">
|
||||
<Image Source="/Resources/DrawPanel/RemovePointCurve.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
</ContextMenu>
|
||||
</Button.ContextMenu>
|
||||
</Button>
|
||||
<Button ToolTip="Approssima Curva" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding ApproxCurveBaseCommand}" IsEnabled="{Binding bSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/ApproxCurve+.png" Stretch="Uniform"/>
|
||||
<Button.ContextMenu>
|
||||
<ContextMenu Style="{StaticResource ContextMenu_Button}">
|
||||
<Button ToolTip="Approssima Curva con Linee" Style="{StaticResource DrawPanelButton}"
|
||||
Command="{Binding ApproxCurveLineCommand}">
|
||||
<Image Source="/Resources/DrawPanel/ApproxCurve.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
</ContextMenu>
|
||||
</Button.ContextMenu>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding ModifyArcRadiusToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding ModifyArcRadiusCommand}" IsEnabled="{Binding bSelOk}">
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding ModifyArcRadiusCommand}" IsEnabled="{Binding bSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/ModifyArcRadius.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding ModifyTextToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding ModifyTextCommand}" IsEnabled="{Binding bSelOk}">
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding ModifyTextCommand}" IsEnabled="{Binding bSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/ModifyText.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
</UniformGrid>
|
||||
@@ -327,8 +493,8 @@
|
||||
</Expander.Header>
|
||||
<UniformGrid Columns="3">
|
||||
<Button ToolTip="{Binding MoveToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding MoveCommand}" IsEnabled="{Binding bSelOk}">
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding MoveCommand}" IsEnabled="{Binding bSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/Move.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
<Button Style="{StaticResource DrawPanelButton}"
|
||||
@@ -336,33 +502,33 @@
|
||||
<Button Style="{StaticResource DrawPanelButton}"
|
||||
Visibility="Hidden"/>
|
||||
<Button ToolTip="{Binding RotateToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding RotateCommand}" IsEnabled="{Binding bSelOk}">
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding RotateCommand}" IsEnabled="{Binding bSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/Rotate.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding MirrorToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding MirrorCommand}" IsEnabled="{Binding bSelOk}">
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding MirrorCommand}" IsEnabled="{Binding bSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/Mirror.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding ScaleToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding ScaleCommand}" IsEnabled="{Binding bSelOk}">
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding ScaleCommand}" IsEnabled="{Binding bSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/Scale.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding Rotate3DToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding Rotate3DCommand}" IsEnabled="{Binding bSelOk}">
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding Rotate3DCommand}" IsEnabled="{Binding bSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/Rotate3D.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding Mirror3DToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding Mirror3DCommand}" IsEnabled="{Binding bSelOk}">
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding Mirror3DCommand}" IsEnabled="{Binding bSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/Mirror3D.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
<Button ToolTip="{Binding Scale3DToolTip}" Style="{StaticResource DrawPanelButton}"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding Scale3DCommand}" IsEnabled="{Binding bSelOk}">
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Command="{Binding Scale3DCommand}" IsEnabled="{Binding bSelOk}">
|
||||
<Image Source="/Resources/DrawPanel/Scale3D.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
</UniformGrid>
|
||||
|
||||
+1033
-25
File diff suppressed because it is too large
Load Diff
@@ -1035,6 +1035,66 @@
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\DrawPanel\StmMoveVertex.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\DrawPanel\Point+.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\DrawPanel\Line2P+.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\DrawPanel\LinePDL+.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\DrawPanel\ArcPDP+.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\DrawPanel\Text+.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\DrawPanel\TextA.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\DrawPanel\ArcFlip+.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\DrawPanel\LinearDimension+.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\DrawPanel\AngularDimension +.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\DrawPanel\DiametralDimension+.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\DrawPanel\Plane+.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\DrawPanel\SolidSubtractSurf+.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\DrawPanel\SolidIntersectSurf+.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\DrawPanel\ExplodeSurf+.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\DrawPanel\StmMoveVertex+.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\DrawPanel\ChangeLayer+.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\DrawPanel\JoinCurve+.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\DrawPanel\AddPointCurve+.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\DrawPanel\RemovePointCurve+.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\DrawPanel\ApproxCurve+.png" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
|
||||
<PropertyGroup>
|
||||
<PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\EgtCAM5\EgtCAM5R32.exe
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:local="clr-namespace:EgtCAM5"
|
||||
DockPanel.Dock="Left">
|
||||
|
||||
|
||||
<local:DrawPanelV DataContext="{StaticResource DrawPanelViewModel}"/>
|
||||
|
||||
</Grid>
|
||||
|
||||
+12
-11
@@ -1,15 +1,16 @@
|
||||
<EgtWPFLib5:EgtCustomWindow x:Class="MainWindowV"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
|
||||
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
|
||||
xmlns:local="clr-namespace:EgtCAM5"
|
||||
Title="{Binding Title}" Icon="{Binding IconSource}"
|
||||
TitleBarBrush="{StaticResource EgaltechBlue1}" TitleBarHeight="32"
|
||||
BorderBrush="{StaticResource EgaltechBlue1}" BorderThickness="2"
|
||||
MinHeight="600" MinWidth="800" WindowStyle="None" ResizeMode="NoResize"
|
||||
AboutBoxCommand="{Binding AboutBoxCommand}"
|
||||
AllowDrop="True" Drop="MainWindow_Drop"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
|
||||
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
|
||||
xmlns:local="clr-namespace:EgtCAM5"
|
||||
Title="{Binding Title}" Icon="{Binding IconSource}"
|
||||
TitleBarBrush="{StaticResource EgaltechBlue1}" TitleBarHeight="32"
|
||||
BorderBrush="{StaticResource EgaltechBlue1}" BorderThickness="2"
|
||||
MinHeight="600" MinWidth="800" WindowStyle="None" ResizeMode="NoResize"
|
||||
AboutBoxCommand="{Binding AboutBoxCommand}"
|
||||
AllowDrop="True" Drop="MainWindow_Drop"
|
||||
SnapsToDevicePixels="True"
|
||||
CloseCommand="{Binding CloseApplicationCommand,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}">
|
||||
<EgtWPFLib5:EgtCustomWindow.TitlePanel>
|
||||
<local:TopCommandBarV DataContext="{StaticResource TopCommandBarViewModel}"/>
|
||||
|
||||
@@ -16,6 +16,7 @@ Public Class MainWindowVM
|
||||
Private m_sDataRoot As String = String.Empty
|
||||
Private m_sConfigDir As String = String.Empty
|
||||
Private m_OnTerminateProcessCallback As New OnTerminateProcessCallback(AddressOf OnTerminateProcess)
|
||||
Private m_IndexTab As Integer = 0
|
||||
|
||||
' EGALTECH ENVIRONMENT FIELDS WITH PROPERTY
|
||||
|
||||
@@ -600,7 +601,7 @@ Public Class MainWindowVM
|
||||
ElseIf e.Key = Key.Left OrElse e.Key = Key.Right OrElse e.Key = Key.Up OrElse e.Key = Key.Down AndAlso
|
||||
Map.refTopCommandBarVM.MachiningIsChecked AndAlso Map.refOperationParametersExpanderVM.OperationParameters.IsEnabled Then
|
||||
Map.refMachiningParameterExpanderVM.FocusSlider()
|
||||
Dim nStep As Integer = If( e.Key = Key.Right OrElse e.Key = Key.Up, 1, -1)
|
||||
Dim nStep As Integer = If(e.Key = Key.Right OrElse e.Key = Key.Up, 1, -1)
|
||||
Map.refMachiningParameterExpanderVM.SetSliderValue(nStep)
|
||||
e.Handled = True
|
||||
End If
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
<TextBlock Text="{Binding PropertiesMsg}"/>
|
||||
</Expander.Header>
|
||||
<UniformGrid>
|
||||
<TextBox Text="{Binding InfoBox, Mode=OneWay}" MaxHeight="100" IsReadOnly="True"
|
||||
<TextBox Text="{Binding InfoBox, Mode=OneWay}" MaxHeight="250" IsReadOnly="True"
|
||||
HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"/>
|
||||
</UniformGrid>
|
||||
</Expander>
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
<UserControl x:Class="ManageLayerExpanderV"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
|
||||
xmlns:expression="clr-namespace:Microsoft.Expression.Interactivity.Core;assembly=Microsoft.Expression.Interactions"
|
||||
xmlns:local="clr-namespace:EgtCAM5">
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
|
||||
xmlns:expression="clr-namespace:Microsoft.Expression.Interactivity.Core;assembly=Microsoft.Expression.Interactions"
|
||||
xmlns:local="clr-namespace:EgtCAM5">
|
||||
|
||||
<Expander IsExpanded="True" Style="{StaticResource ExpanderStyle}">
|
||||
<Expander.Header>
|
||||
@@ -21,10 +21,10 @@
|
||||
<Button Content="{Binding ColorMsg}" Command="{Binding LayerColorCommand}" Height="30"/>
|
||||
</UniformGrid>
|
||||
|
||||
<TreeView Name="LayerTreeView" MinHeight="150" MaxHeight="250"
|
||||
ItemsSource="{Binding Path=LayerList}"
|
||||
VirtualizingStackPanel.IsVirtualizing = "True"
|
||||
VirtualizingStackPanel.VirtualizationMode = "Recycling">
|
||||
<TreeView Name="LayerTreeView" MinHeight="250" MaxHeight="400"
|
||||
ItemsSource="{Binding Path=LayerList}"
|
||||
VirtualizingStackPanel.IsVirtualizing = "True"
|
||||
VirtualizingStackPanel.VirtualizationMode = "Recycling">
|
||||
<interactivity:Interaction.Triggers>
|
||||
<interactivity:EventTrigger EventName="MouseDoubleClick">
|
||||
<interactivity:InvokeCommandAction Command="{Binding TreeViewDoubleClickCommand}"/>
|
||||
|
||||
@@ -1,15 +1,30 @@
|
||||
<UserControl x:Class="DrawOptionPanelV"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Width="250"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5">
|
||||
|
||||
<StackPanel Name="ciao" Background="Transparent" Margin="0,0,3.5001,0" MaxHeight="{Binding MaxHeight,RelativeSource={RelativeSource AncestorType={x:Type EgtFloating:EgtFloatingPanel}}}">
|
||||
<!--<StackPanel Name="ciao" Background="Transparent" MaxHeight="{Binding MaxHeight,RelativeSource={RelativeSource AncestorType={x:Type EgtFloating:EgtFloatingPanel}}}">
|
||||
--><!--ContentPresenter that contains the ManageLayerExpander--><!--
|
||||
<ContentPresenter Content="{Binding ManageLayerExpander,Mode=OneWay}"/>
|
||||
--><!--ContentPresenter that contains the InfoExpander--><!--
|
||||
<ContentPresenter Content="{Binding InfoExpander}"/>
|
||||
--><!--ContentPresenter that contains the InputExpander--><!--
|
||||
<ContentPresenter Content="{Binding InputExpander}"/>
|
||||
</StackPanel>-->
|
||||
<Grid Name="ciao" Background="Transparent" MaxHeight="{Binding MaxHeight,RelativeSource={RelativeSource AncestorType={x:Type EgtFloating:EgtFloatingPanel}}}">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
</Grid.RowDefinitions>
|
||||
<!--ContentPresenter that contains the ManageLayerExpander-->
|
||||
<ContentPresenter Content="{Binding ManageLayerExpander,Mode=OneWay}"/>
|
||||
<GridSplitter Grid.Row="0" Height="5" Background="Transparent" HorizontalAlignment="Stretch" VerticalAlignment="Bottom"/>
|
||||
<!--ContentPresenter that contains the InfoExpander-->
|
||||
<ContentPresenter Content="{Binding InfoExpander}"/>
|
||||
<ContentPresenter Grid.Row="1" Content="{Binding InfoExpander}"/>
|
||||
<GridSplitter Grid.Row="1" Height="5" Background="Transparent" HorizontalAlignment="Stretch" VerticalAlignment="Bottom"/>
|
||||
<!--ContentPresenter that contains the InputExpander-->
|
||||
<ContentPresenter Content="{Binding InputExpander}"/>
|
||||
</StackPanel>
|
||||
<ContentPresenter Grid.Row="2" Content="{Binding InputExpander}"/>
|
||||
</Grid>
|
||||
|
||||
</UserControl>
|
||||
|
||||
+151
-2
@@ -109,6 +109,34 @@
|
||||
Visibility="{Binding SysNotes_Visibility}"
|
||||
IsReadOnly="True"/>
|
||||
</UniformGrid>
|
||||
<EgtWPFLib5:CheckParamV ParamTxBl="{Binding InvertTxBl}"
|
||||
ParamChBx="{Binding Path=Invert,
|
||||
UpdateSourceTrigger=PropertyChanged,
|
||||
ValidatesOnDataErrors=True}"
|
||||
Style="{DynamicResource CheckParamV_Margin}"/>
|
||||
<EgtWPFLib5:ComboParamV ParamTxBl="{Binding WorkSideTxBl}"
|
||||
ParamCmBxList="{Binding Path=WorkSideList,
|
||||
UpdateSourceTrigger=PropertyChanged,
|
||||
ValidatesOnDataErrors=True}"
|
||||
ParamCmBxSelIndex="{Binding Path=SelectedWorkSide}"
|
||||
Style="{DynamicResource ComboParamV_Margin}"/>
|
||||
<UniformGrid Columns="2">
|
||||
<TextBlock Text="{Binding UserNotesTxBl}"
|
||||
Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"/>
|
||||
<EgtWPFLib5:EgtTextBox Text="{Binding UserNotes, UpdateSourceTrigger=PropertyChanged}"
|
||||
Style="{DynamicResource MPExpander_UserNotesTxBxMargin}">
|
||||
<EgtWPFLib5:EgtTextBox.ToolTip>
|
||||
<TextBlock Text="{Binding UserNotesTooltip}"/>
|
||||
</EgtWPFLib5:EgtTextBox.ToolTip>
|
||||
</EgtWPFLib5:EgtTextBox>
|
||||
<TextBlock Text="{Binding SystemNotesTxBl}"
|
||||
Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"
|
||||
Visibility="{Binding SysNotes_Visibility}"/>
|
||||
<EgtWPFLib5:EgtTextBox Text="{Binding SystemNotes, UpdateSourceTrigger=PropertyChanged}"
|
||||
Style="{DynamicResource MPExpander_UserNotesTxBxMargin}"
|
||||
Visibility="{Binding SysNotes_Visibility}"
|
||||
IsReadOnly="True"/>
|
||||
</UniformGrid>
|
||||
</StackPanel>
|
||||
<StackPanel Name="AutomaticCloseExpanderStackPanel">
|
||||
<Expander Header="{Binding GenericExpanderHeader}" Name="GenericExpander"
|
||||
@@ -236,7 +264,7 @@
|
||||
IsReadOnly="False"/>
|
||||
</TabItem>
|
||||
<TabItem Header="CHECKBOX">
|
||||
<CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
|
||||
<CheckBox IsChecked="{Binding Value}"/>
|
||||
</TabItem>
|
||||
</TabControl>
|
||||
<Button Command="{Binding RemoveItemNoteCommand}"
|
||||
@@ -266,6 +294,43 @@
|
||||
</Grid>
|
||||
</Expander>
|
||||
|
||||
<Expander Style="{StaticResource ExpanderStyle}">
|
||||
<Expander.Header>
|
||||
<EgtWPFLib5:ComboParamV ParamTxBl="{Binding LeadInTypeTxBl}"
|
||||
ParamCmBxList="{Binding Path=LeadInTypeList,
|
||||
UpdateSourceTrigger=PropertyChanged,
|
||||
ValidatesOnDataErrors=True}"
|
||||
ParamCmBxSelIndex="{Binding Path=SelectedLeadInType}"
|
||||
Style="{DynamicResource ComboParamV_Margin}"/>
|
||||
</Expander.Header>
|
||||
<StackPanel>
|
||||
<EgtWPFLib5:StringParamV ParamTxBl="{Binding StartAddLenTxBl}"
|
||||
ParamTxBx="{Binding Path=StartAddLen,
|
||||
UpdateSourceTrigger=PropertyChanged,
|
||||
ValidatesOnDataErrors=True}"
|
||||
Style="{DynamicResource StringParamV_Margin}"/>
|
||||
<EgtWPFLib5:StringParamV ParamTxBl="{Binding LiTangTxBl}"
|
||||
ParamTxBx="{Binding Path=LiTang,
|
||||
UpdateSourceTrigger=PropertyChanged,
|
||||
ValidatesOnDataErrors=True}"
|
||||
Style="{DynamicResource StringParamV_Margin}"/>
|
||||
<EgtWPFLib5:StringParamV ParamTxBl="{Binding LiPerpTxBl}"
|
||||
ParamTxBx="{Binding Path=LiPerp,
|
||||
UpdateSourceTrigger=PropertyChanged,
|
||||
ValidatesOnDataErrors=True}"
|
||||
Style="{DynamicResource StringParamV_Margin}"/>
|
||||
<EgtWPFLib5:StringParamV ParamTxBl="{Binding LiElevTxBl}"
|
||||
ParamTxBx="{Binding Path=LiElev,
|
||||
UpdateSourceTrigger=PropertyChanged,
|
||||
ValidatesOnDataErrors=True}"
|
||||
Style="{DynamicResource StringParamV_Margin}"/>
|
||||
<EgtWPFLib5:StringParamV ParamTxBl="{Binding LiCompLenTxBl}"
|
||||
ParamTxBx="{Binding Path=LiCompLen,
|
||||
UpdateSourceTrigger=PropertyChanged,
|
||||
ValidatesOnDataErrors=True}"
|
||||
Style="{DynamicResource StringParamV_Margin}"/>
|
||||
</StackPanel>
|
||||
</Expander>
|
||||
<Expander Style="{StaticResource ExpanderStyle}">
|
||||
<Expander.Header>
|
||||
<EgtWPFLib5:ComboParamV ParamTxBl="{Binding LeadInTypeTxBl}"
|
||||
@@ -304,6 +369,43 @@
|
||||
</StackPanel>
|
||||
</Expander>
|
||||
|
||||
<Expander Style="{StaticResource ExpanderStyle}">
|
||||
<Expander.Header>
|
||||
<EgtWPFLib5:ComboParamV ParamTxBl="{Binding LeadOutTypeTxBl}"
|
||||
ParamCmBxList="{Binding Path=LeadOutTypeList,
|
||||
UpdateSourceTrigger=PropertyChanged,
|
||||
ValidatesOnDataErrors=True}"
|
||||
ParamCmBxSelIndex="{Binding Path=SelectedLeadOutType}"
|
||||
Style="{DynamicResource ComboParamV_Margin}"/>
|
||||
</Expander.Header>
|
||||
<StackPanel>
|
||||
<EgtWPFLib5:StringParamV ParamTxBl="{Binding EndAddLenTxBl}"
|
||||
ParamTxBx="{Binding Path=EndAddLen,
|
||||
UpdateSourceTrigger=PropertyChanged,
|
||||
ValidatesOnDataErrors=True}"
|
||||
Style="{DynamicResource StringParamV_Margin}"/>
|
||||
<EgtWPFLib5:StringParamV ParamTxBl="{Binding LoTangTxBl}"
|
||||
ParamTxBx="{Binding Path=LoTang,
|
||||
UpdateSourceTrigger=PropertyChanged,
|
||||
ValidatesOnDataErrors=True}"
|
||||
Style="{DynamicResource StringParamV_Margin}"/>
|
||||
<EgtWPFLib5:StringParamV ParamTxBl="{Binding LoPerpTxBl}"
|
||||
ParamTxBx="{Binding Path=LoPerp,
|
||||
UpdateSourceTrigger=PropertyChanged,
|
||||
ValidatesOnDataErrors=True}"
|
||||
Style="{DynamicResource StringParamV_Margin}"/>
|
||||
<EgtWPFLib5:StringParamV ParamTxBl="{Binding LoElevTxBl}"
|
||||
ParamTxBx="{Binding Path=LoElev,
|
||||
UpdateSourceTrigger=PropertyChanged,
|
||||
ValidatesOnDataErrors=True}"
|
||||
Style="{DynamicResource StringParamV_Margin}"/>
|
||||
<EgtWPFLib5:StringParamV ParamTxBl="{Binding LoCompLenTxBl}"
|
||||
ParamTxBx="{Binding Path=LoCompLen,
|
||||
UpdateSourceTrigger=PropertyChanged,
|
||||
ValidatesOnDataErrors=True}"
|
||||
Style="{DynamicResource StringParamV_Margin}"/>
|
||||
</StackPanel>
|
||||
</Expander>
|
||||
<Expander Style="{StaticResource ExpanderStyle}">
|
||||
<Expander.Header>
|
||||
<EgtWPFLib5:ComboParamV ParamTxBl="{Binding LeadOutTypeTxBl}"
|
||||
@@ -342,6 +444,53 @@
|
||||
</StackPanel>
|
||||
</Expander>
|
||||
|
||||
<Expander Style="{StaticResource ExpanderStyle}">
|
||||
<Expander.Header>
|
||||
<EgtWPFLib5:CheckParamV ParamTxBl="{Binding LeaveTabTxBl}"
|
||||
ParamChBx="{Binding Path=LeaveTab,
|
||||
UpdateSourceTrigger=PropertyChanged,
|
||||
ValidatesOnDataErrors=True}"
|
||||
Style="{DynamicResource CheckParamV_Margin}"/>
|
||||
</Expander.Header>
|
||||
<StackPanel Margin="2">
|
||||
<EgtWPFLib5:StringParamV ParamTxBl="{Binding TabLenTxBl}"
|
||||
ParamTxBx="{Binding Path=TabLen,
|
||||
UpdateSourceTrigger=PropertyChanged,
|
||||
ValidatesOnDataErrors=True}"
|
||||
ParamErrorMsg="{Binding Path=TabLenErrorMsg}"
|
||||
Style="{DynamicResource StringParamV_Margin}"/>
|
||||
<EgtWPFLib5:StringParamV ParamTxBl="{Binding TabHeightTxBl}"
|
||||
ParamTxBx="{Binding Path=TabHeight,
|
||||
UpdateSourceTrigger=PropertyChanged,
|
||||
ValidatesOnDataErrors=True}"
|
||||
ParamErrorMsg="{Binding Path=TabHeightErrorMsg}"
|
||||
Style="{DynamicResource StringParamV_Margin}"/>
|
||||
<EgtWPFLib5:StringParamV ParamTxBl="{Binding TabAngleTxBl}"
|
||||
ParamTxBx="{Binding Path=TabAngle,
|
||||
UpdateSourceTrigger=PropertyChanged,
|
||||
ValidatesOnDataErrors=True}"
|
||||
ParamErrorMsg="{Binding Path=TabAngleErrorMsg}"
|
||||
Style="{DynamicResource StringParamV_Margin}"/>
|
||||
<EgtWPFLib5:StringParamV ParamTxBl="{Binding TabDistTxBl}"
|
||||
ParamTxBx="{Binding Path=TabDist,
|
||||
UpdateSourceTrigger=PropertyChanged,
|
||||
ValidatesOnDataErrors=True}"
|
||||
ParamErrorMsg="{Binding Path=TabDistErrorMsg}"
|
||||
Style="{DynamicResource StringParamV_Margin}"/>
|
||||
<EgtWPFLib5:StringParamV ParamTxBl="{Binding TabMinTxBl}"
|
||||
ParamTxBx="{Binding Path=TabMin,
|
||||
UpdateSourceTrigger=PropertyChanged,
|
||||
ValidatesOnDataErrors=True}"
|
||||
ParamErrorMsg="{Binding Path=TabMinErrorMsg}"
|
||||
Style="{DynamicResource StringParamV_Margin}"/>
|
||||
<EgtWPFLib5:StringParamV ParamTxBl="{Binding TabMaxTxBl}"
|
||||
ParamTxBx="{Binding Path=TabMax,
|
||||
UpdateSourceTrigger=PropertyChanged,
|
||||
ValidatesOnDataErrors=True}"
|
||||
ParamErrorMsg="{Binding Path=TabMaxErrorMsg}"
|
||||
Style="{DynamicResource StringParamV_Margin}"/>
|
||||
</StackPanel>
|
||||
</Expander>
|
||||
<Expander Style="{StaticResource ExpanderStyle}">
|
||||
<Expander.Header>
|
||||
<EgtWPFLib5:CheckParamV ParamTxBl="{Binding LeaveTabTxBl}"
|
||||
@@ -422,7 +571,7 @@
|
||||
Style="{DynamicResource StringParamV_Margin}"/>
|
||||
</StackPanel>
|
||||
</Expander>
|
||||
|
||||
|
||||
<Interactivity:Interaction.Behaviors>
|
||||
<EgtCAM5:AutomaticCloseExpander/>
|
||||
</Interactivity:Interaction.Behaviors>
|
||||
|
||||
+1
-1
@@ -224,7 +224,7 @@
|
||||
IsReadOnly="False"/>
|
||||
</TabItem>
|
||||
<TabItem Header="CHECKBOX">
|
||||
<CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
|
||||
<CheckBox IsChecked="{Binding Value}"/>
|
||||
</TabItem>
|
||||
</TabControl>
|
||||
<Button Command="{Binding RemoveItemNoteCommand}"
|
||||
|
||||
+12
@@ -80,4 +80,16 @@ Public Class FiveAxisMachinigParameterExpanderV
|
||||
Return TryCast(target, T)
|
||||
End Function
|
||||
|
||||
Private Sub StackPanel_PreviewKeyDown(sender As Object, e As KeyEventArgs)
|
||||
If e.Key = Key.Tab Then
|
||||
Dim s As EgtWPFLib5.StringParamV = TryCast(e.OriginalSource, EgtWPFLib5.StringParamV)
|
||||
|
||||
If Not IsNothing(s) Then
|
||||
s.MoveFocus(New TraversalRequest(FocusNavigationDirection.Next))
|
||||
End If
|
||||
|
||||
e.Handled = True
|
||||
End If
|
||||
|
||||
End Sub
|
||||
End Class
|
||||
|
||||
+1
-1
@@ -214,7 +214,7 @@
|
||||
IsReadOnly="False"/>
|
||||
</TabItem>
|
||||
<TabItem Header="CHECKBOX">
|
||||
<CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
|
||||
<CheckBox IsChecked="{Binding Value}"/>
|
||||
</TabItem>
|
||||
</TabControl>
|
||||
<Button Command="{Binding RemoveItemNoteCommand}"
|
||||
|
||||
+1
-1
@@ -232,7 +232,7 @@
|
||||
IsReadOnly="False"/>
|
||||
</TabItem>
|
||||
<TabItem Header="CHECKBOX">
|
||||
<CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
|
||||
<CheckBox IsChecked="{Binding Value}"/>
|
||||
</TabItem>
|
||||
</TabControl>
|
||||
<Button Command="{Binding RemoveItemNoteCommand}"
|
||||
|
||||
+5
-5
@@ -129,13 +129,13 @@
|
||||
UpdateSourceTrigger=PropertyChanged,
|
||||
ValidatesOnDataErrors=True}"
|
||||
Style="{DynamicResource StringParamV_Margin}"/>
|
||||
<EgtWPFLib5:StringParamV ParamTxBl="{Binding OffsetSrTxBl}"
|
||||
ParamTxBx="{Binding Path=OffSr,
|
||||
<EgtWPFLib5:StringParamV ParamTxBl="{Binding OffsetSlTxBl}"
|
||||
ParamTxBx="{Binding Path=OffSl,
|
||||
UpdateSourceTrigger=PropertyChanged,
|
||||
ValidatesOnDataErrors=True}"
|
||||
Style="{DynamicResource StringParamV_Margin}"/>
|
||||
<EgtWPFLib5:StringParamV ParamTxBl="{Binding OffsetSlTxBl}"
|
||||
ParamTxBx="{Binding Path=OffSl,
|
||||
<EgtWPFLib5:StringParamV ParamTxBl="{Binding OffsetSrTxBl}"
|
||||
ParamTxBx="{Binding Path=OffSr,
|
||||
UpdateSourceTrigger=PropertyChanged,
|
||||
ValidatesOnDataErrors=True}"
|
||||
Style="{DynamicResource StringParamV_Margin}"/>
|
||||
@@ -241,7 +241,7 @@
|
||||
IsReadOnly="False"/>
|
||||
</TabItem>
|
||||
<TabItem Header="CHECKBOX">
|
||||
<CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
|
||||
<CheckBox IsChecked="{Binding Value}"/>
|
||||
</TabItem>
|
||||
</TabControl>
|
||||
<Button Command="{Binding RemoveItemNoteCommand}"
|
||||
|
||||
+1
-1
@@ -213,7 +213,7 @@
|
||||
IsReadOnly="False"/>
|
||||
</TabItem>
|
||||
<TabItem Header="CHECKBOX">
|
||||
<CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
|
||||
<CheckBox IsChecked="{Binding Value}"/>
|
||||
</TabItem>
|
||||
</TabControl>
|
||||
<Button Command="{Binding RemoveItemNoteCommand}"
|
||||
|
||||
+1
-1
@@ -217,7 +217,7 @@
|
||||
IsReadOnly="False"/>
|
||||
</TabItem>
|
||||
<TabItem Header="CHECKBOX">
|
||||
<CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
|
||||
<CheckBox IsChecked="{Binding Value}"/>
|
||||
</TabItem>
|
||||
</TabControl>
|
||||
<Button Command="{Binding RemoveItemNoteCommand}"
|
||||
|
||||
+1
-1
@@ -211,7 +211,7 @@
|
||||
IsReadOnly="False"/>
|
||||
</TabItem>
|
||||
<TabItem Header="CHECKBOX">
|
||||
<CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
|
||||
<CheckBox IsChecked="{Binding Value}"/>
|
||||
</TabItem>
|
||||
</TabControl>
|
||||
<Button Command="{Binding RemoveItemNoteCommand}"
|
||||
|
||||
+1
-1
@@ -209,7 +209,7 @@
|
||||
IsReadOnly="False"/>
|
||||
</TabItem>
|
||||
<TabItem Header="CHECKBOX">
|
||||
<CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
|
||||
<CheckBox IsChecked="{Binding Value}"/>
|
||||
</TabItem>
|
||||
</TabControl>
|
||||
<Button Command="{Binding RemoveItemNoteCommand}"
|
||||
|
||||
+1
-1
@@ -217,7 +217,7 @@
|
||||
IsReadOnly="False"/>
|
||||
</TabItem>
|
||||
<TabItem Header="CHECKBOX">
|
||||
<CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
|
||||
<CheckBox IsChecked="{Binding Value}"/>
|
||||
</TabItem>
|
||||
</TabControl>
|
||||
<Button Command="{Binding RemoveItemNoteCommand}"
|
||||
|
||||
+7
-1
@@ -124,6 +124,12 @@
|
||||
UpdateSourceTrigger=PropertyChanged,
|
||||
ValidatesOnDataErrors=True}"
|
||||
Style="{DynamicResource StringParamV_Margin}"/>
|
||||
<EgtWPFLib5:ComboParamV ParamTxBl="{Binding LeadLinkTypeTxBl}"
|
||||
ParamCmBxList="{Binding Path=LeadLinkTypeList,
|
||||
UpdateSourceTrigger=PropertyChanged,
|
||||
ValidatesOnDataErrors=True}"
|
||||
ParamCmBxSelIndex="{Binding Path=SelectedLeadLinkType}"
|
||||
Style="{DynamicResource ComboParamV_Margin}"/>
|
||||
<EgtWPFLib5:StringParamV ParamTxBl="{Binding SideAngleTxBl}"
|
||||
ParamTxBx="{Binding Path=SideAngle,
|
||||
UpdateSourceTrigger=PropertyChanged,
|
||||
@@ -224,7 +230,7 @@
|
||||
IsReadOnly="False"/>
|
||||
</TabItem>
|
||||
<TabItem Header="CHECKBOX">
|
||||
<CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
|
||||
<CheckBox IsChecked="{Binding Value}"/>
|
||||
</TabItem>
|
||||
</TabControl>
|
||||
<Button Command="{Binding RemoveItemNoteCommand}"
|
||||
|
||||
+1
-1
@@ -199,7 +199,7 @@
|
||||
IsReadOnly="False"/>
|
||||
</TabItem>
|
||||
<TabItem Header="CHECKBOX">
|
||||
<CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
|
||||
<CheckBox IsChecked="{Binding Value}"/>
|
||||
</TabItem>
|
||||
</TabControl>
|
||||
<Button Command="{Binding RemoveItemNoteCommand}"
|
||||
|
||||
+1
-1
@@ -218,7 +218,7 @@
|
||||
IsReadOnly="False"/>
|
||||
</TabItem>
|
||||
<TabItem Header="CHECKBOX">
|
||||
<CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
|
||||
<CheckBox IsChecked="{Binding Value}"/>
|
||||
</TabItem>
|
||||
</TabControl>
|
||||
<Button Command="{Binding RemoveItemNoteCommand}"
|
||||
|
||||
+1
-1
@@ -236,7 +236,7 @@
|
||||
IsReadOnly="False"/>
|
||||
</TabItem>
|
||||
<TabItem Header="CHECKBOX">
|
||||
<CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
|
||||
<CheckBox IsChecked="{Binding Value}"/>
|
||||
</TabItem>
|
||||
</TabControl>
|
||||
<Button Command="{Binding RemoveItemNoteCommand}"
|
||||
|
||||
+1
-1
@@ -226,7 +226,7 @@
|
||||
IsReadOnly="False"/>
|
||||
</TabItem>
|
||||
<TabItem Header="CHECKBOX">
|
||||
<CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
|
||||
<CheckBox IsChecked="{Binding Value}"/>
|
||||
</TabItem>
|
||||
</TabControl>
|
||||
<Button Command="{Binding RemoveItemNoteCommand}"
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
<UserControl x:Class="MachiningOptionPanelV"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Width="250"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5">
|
||||
|
||||
<StackPanel Name="ciao" Background="Transparent" Margin="0,0,3.5001,0" MaxHeight="{Binding MaxHeight,RelativeSource={RelativeSource AncestorType={x:Type EgtFloating:EgtFloatingPanel}}}">
|
||||
<StackPanel Name="ciao" Background="Transparent" MaxHeight="{Binding MaxHeight,RelativeSource={RelativeSource AncestorType={x:Type EgtFloating:EgtFloatingPanel}}}">
|
||||
<!--ContentPresenter that contains the OperationsListExpander-->
|
||||
<ContentPresenter Content="{Binding OperationsListExpander,Mode=OneWay}"/>
|
||||
<!--ContentPresenter that contains the OperationParametersExpander-->
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<EgtFloating:EgtFloatingPanel x:Class="OptionPanelV"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Width="250"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
|
||||
TitleBarOrientation="Vertical"
|
||||
Visibility="{Binding Panel_Visibility}">
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
<Setter Property="DockPanel.Dock" Value="{Binding}" />
|
||||
</Style>
|
||||
</ItemsControl.ItemContainerStyle>
|
||||
|
||||
|
||||
<interactivity:Interaction.Triggers>
|
||||
<interactivity:EventTrigger EventName="Loaded">
|
||||
<interactivity:InvokeCommandAction Command="{Binding LoadedCommand}"/>
|
||||
|
||||
+192
-21
@@ -58,11 +58,25 @@ Public Class ProjectVM
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Private m_DynamicGrid As New Grid()
|
||||
Public ReadOnly Property DynamicGrid As Grid
|
||||
Get
|
||||
Return m_DynamicGrid
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Private m_DynamicGridList As New List(Of Object)
|
||||
Public ReadOnly Property DynamicGridList As List(Of Object)
|
||||
Get
|
||||
Return m_DynamicGridList
|
||||
End Get
|
||||
End Property
|
||||
|
||||
#End Region
|
||||
|
||||
#Region "EGTUILIB FIELDS"
|
||||
|
||||
Private m_bCPlaneTypePos As Boolean
|
||||
Private m_bCPlaneTypePos As Boolean
|
||||
|
||||
' Variabile per implementazione eventi
|
||||
Private m_InputText As String
|
||||
@@ -79,6 +93,17 @@ Public Class ProjectVM
|
||||
TMDbParamVisibility.bFirst = True
|
||||
' Inizializza i parametri della scena
|
||||
'InitializeEgtProject()
|
||||
|
||||
Dim m_TopTrayV As New TopTrayV
|
||||
Dim m_LeftTrayV As New LeftTrayV
|
||||
Dim m_RightTrayV As New RightTrayV
|
||||
Dim m_BottomTrayV As New BottomTrayV
|
||||
Dim m_SceneContentControlV As New SceneContentControlV
|
||||
|
||||
CreateDynamicGrid()
|
||||
|
||||
Dim gridSplitter As GridSplitter = CreateGridSplitter()
|
||||
|
||||
' aggiungo componenti interfaccia
|
||||
Dim bPlugin As Boolean = False
|
||||
Dim PluginDirNameList() As String = {}
|
||||
@@ -105,30 +130,57 @@ Public Class ProjectVM
|
||||
Dim ConfigurationData As IPluginConfigData = Map.refMainWindowVM.GetConfigData(Of IPluginConfigData)(PluginName & ".ConfigurationData")
|
||||
If Not IsNothing(ConfigurationData) And ConfigurationData.ControlList.Count > 0 Then
|
||||
For Each Element In ConfigurationData.ControlList
|
||||
PopolateGridWithPlugIn(m_TopTrayV, m_RightTrayV, m_BottomTrayV, m_SceneContentControlV, gridSplitter)
|
||||
Select Case Element.Name
|
||||
Case PLUGIN_RIGHT_TRAY
|
||||
m_PanelList.Add(New RightTrayV)
|
||||
'm_PanelList.Add(New RightTrayV)
|
||||
'aggiungo RightTrayV alla griglia
|
||||
m_DynamicGrid.Children.Add(m_RightTrayV)
|
||||
Map.refOptionPanelVM.SetPanelViewState(Element.ViewPanelState)
|
||||
Case PLUGIN_LEFT_TRAY
|
||||
m_PanelList.Add(New LeftTrayV)
|
||||
'm_PanelList.Add(New LeftTrayV)
|
||||
' aggiungo LeftTrayV alla griglia
|
||||
m_DynamicGrid.Children.Add(m_LeftTrayV)
|
||||
Case Else
|
||||
m_PanelList.Add(Map.refMainWindowVM.GetControlByName(Of IPluginControl)(Element))
|
||||
' aggiungo LeftTrayV alla griglia
|
||||
'm_DynamicGrid.Children.Add(Map.refMainWindowVM.GetControlByName(Of IPluginControl)(Element))
|
||||
End Select
|
||||
Next
|
||||
End If
|
||||
End If
|
||||
Next
|
||||
m_PanelList.Add(New BottomTrayV)
|
||||
m_PanelList.Add(New TopTrayV)
|
||||
' aggiungo gridSplitter alla griglia
|
||||
m_DynamicGrid.Children.Add(gridSplitter)
|
||||
'm_PanelList.Add(New BottomTrayV)
|
||||
' aggiungo BottomTrayV alla griglia
|
||||
m_DynamicGrid.Children.Add(m_BottomTrayV)
|
||||
'm_PanelList.Add(New TopTrayV)
|
||||
' aggiungo TopTrayV alla griglia
|
||||
m_DynamicGrid.Children.Add(m_TopTrayV)
|
||||
' nascondo tasti gestione progetto se attivo plugin
|
||||
Map.refTopCommandBarVM.SetProjectManagerVisibility(False)
|
||||
Else
|
||||
m_PanelList.Add(New TopTrayV)
|
||||
m_PanelList.Add(New LeftTrayV)
|
||||
m_PanelList.Add(New RightTrayV)
|
||||
m_PanelList.Add(New BottomTrayV)
|
||||
PololateGrid(m_TopTrayV, m_LeftTrayV, m_RightTrayV, m_BottomTrayV, m_SceneContentControlV, gridSplitter)
|
||||
'm_PanelList.Add(New TopTrayV)
|
||||
'm_PanelList.Add(New LeftTrayV)
|
||||
'm_PanelList.Add(New RightTrayV)
|
||||
'm_PanelList.Add(New BottomTrayV)
|
||||
' aggiungo TopTrayV alla griglia
|
||||
m_DynamicGrid.Children.Add(m_TopTrayV)
|
||||
' aggiungo LeftTrayV alla griglia
|
||||
m_DynamicGrid.Children.Add(m_LeftTrayV)
|
||||
' aggiungo gridSplitter alla griglia
|
||||
m_DynamicGrid.Children.Add(gridSplitter)
|
||||
' aggiungo RightTrayV alla griglia
|
||||
m_DynamicGrid.Children.Add(m_RightTrayV)
|
||||
' aggiungo BottomTrayV alla griglia
|
||||
m_DynamicGrid.Children.Add(m_BottomTrayV)
|
||||
End If
|
||||
m_PanelList.Add(New SceneContentControlV)
|
||||
'm_PanelList.Add(New SceneContentControlV)
|
||||
' aggiungo SceneContentControlV alla griglia
|
||||
m_DynamicGrid.Children.Add(m_SceneContentControlV)
|
||||
m_PanelList.Add(m_DynamicGrid)
|
||||
End Sub
|
||||
|
||||
#End Region
|
||||
@@ -244,14 +296,14 @@ Public Class ProjectVM
|
||||
Dim sTitle As String = EgtMsg(10101)
|
||||
MessageBox.Show(sText, sTitle, MessageBoxButton.OK, MessageBoxImage.Error)
|
||||
End If
|
||||
' Se altrimenti manca il collegamento con la chiave di rete
|
||||
' Se altrimenti manca il collegamento con la chiave di rete
|
||||
ElseIf IniFile.m_nKeyLevel = -9 Then
|
||||
EgtOutLog("Missing Link with Net Dongle")
|
||||
' Box di avviso chiave mancante : "Collegamento con la Chiave di rete non riuscito. \n Verificare la connessione." "Errore"
|
||||
Dim sText As String = EgtMsg(10108) & vbCrLf & EgtMsg(10109)
|
||||
Dim sTitle As String = EgtMsg(10101)
|
||||
MessageBox.Show(sText, sTitle, MessageBoxButton.OK, MessageBoxImage.Error)
|
||||
' Altrimenti manca la licenza
|
||||
' Altrimenti manca la licenza
|
||||
Else
|
||||
EgtOutLog("Problems with Licence")
|
||||
' Box di avviso licenza con problemi : sKeyInfo \n "Programma senza licenza. \n Caricala e riavvia il programma." "Errore"
|
||||
@@ -292,6 +344,125 @@ Public Class ProjectVM
|
||||
|
||||
#Region "METHODS"
|
||||
|
||||
''' <summary>
|
||||
''' Funzione per popolare la griglia
|
||||
''' </summary>
|
||||
''' <param name="m_TopTrayV"></param>
|
||||
''' <param name="m_LeftTrayV"></param>
|
||||
''' <param name="m_RightTrayV"></param>
|
||||
''' <param name="m_BottomTrayV"></param>
|
||||
''' <param name="m_SceneContentControlV"></param>
|
||||
''' <param name="gridSplitter"></param>
|
||||
Private Shared Sub PololateGrid(m_TopTrayV As TopTrayV, m_LeftTrayV As LeftTrayV, m_RightTrayV As RightTrayV, m_BottomTrayV As BottomTrayV, m_SceneContentControlV As SceneContentControlV, gridSplitter As GridSplitter)
|
||||
' aggiungo TopTrayV
|
||||
Grid.SetRow(m_TopTrayV, 0)
|
||||
Grid.SetColumnSpan(m_TopTrayV, 3)
|
||||
|
||||
' aggiungo LeftTrayV
|
||||
Grid.SetRow(m_LeftTrayV, 1)
|
||||
Grid.SetColumn(m_LeftTrayV, 0)
|
||||
Grid.SetRowSpan(m_LeftTrayV, 2)
|
||||
|
||||
' aggiungo RightTrayV
|
||||
Grid.SetRow(m_RightTrayV, 1)
|
||||
Grid.SetColumn(m_RightTrayV, 2)
|
||||
Grid.SetRowSpan(m_RightTrayV, 2)
|
||||
|
||||
'aggiungo gridSplitter
|
||||
Grid.SetRow(gridSplitter, 1)
|
||||
Grid.SetColumn(gridSplitter, 2)
|
||||
|
||||
' aggiungo BottomTrayV
|
||||
Grid.SetRow(m_BottomTrayV, 2)
|
||||
Grid.SetColumn(m_BottomTrayV, 1)
|
||||
|
||||
' aggiungo Scena
|
||||
Grid.SetRow(m_SceneContentControlV, 1)
|
||||
Grid.SetColumn(m_SceneContentControlV, 1)
|
||||
End Sub
|
||||
|
||||
''' <summary>
|
||||
''' Funzione per popolare la griglia con PlugIn
|
||||
''' </summary>
|
||||
''' <param name="m_TopTrayV"></param>
|
||||
''' <param name="m_RightTrayV"></param>
|
||||
''' <param name="m_BottomTrayV"></param>
|
||||
''' <param name="m_SceneContentControlV"></param>
|
||||
''' <param name="gridSplitter"></param>
|
||||
Private Shared Sub PopolateGridWithPlugIn(m_TopTrayV As TopTrayV, m_RightTrayV As RightTrayV, m_BottomTrayV As BottomTrayV, m_SceneContentControlV As SceneContentControlV, gridSplitter As GridSplitter)
|
||||
' aggiungo TopTrayV
|
||||
Grid.SetRow(m_TopTrayV, 0)
|
||||
Grid.SetColumn(m_TopTrayV, 1)
|
||||
|
||||
' aggiungo RightTrayV
|
||||
Grid.SetRow(m_RightTrayV, 0)
|
||||
Grid.SetColumn(m_RightTrayV, 2)
|
||||
Grid.SetRowSpan(m_RightTrayV, 2)
|
||||
|
||||
'aggiungo gridSplitter
|
||||
Grid.SetRow(gridSplitter, 0)
|
||||
Grid.SetColumn(gridSplitter, 2)
|
||||
Grid.SetRowSpan(gridSplitter, 2)
|
||||
|
||||
' aggiungo BottomTrayV
|
||||
Grid.SetRow(m_BottomTrayV, 2)
|
||||
Grid.SetColumn(m_BottomTrayV, 1)
|
||||
|
||||
' aggiungo Scena
|
||||
Grid.SetRow(m_SceneContentControlV, 1)
|
||||
Grid.SetColumn(m_SceneContentControlV, 1)
|
||||
End Sub
|
||||
|
||||
''' <summary>
|
||||
''' Creazione GridSplitter
|
||||
''' </summary>
|
||||
''' <returns></returns>
|
||||
Private Shared Function CreateGridSplitter() As GridSplitter
|
||||
' creo gridsplitter
|
||||
Return New GridSplitter With {
|
||||
.Width = 30,
|
||||
.HorizontalAlignment = HorizontalAlignment.Left,
|
||||
.VerticalAlignment = VerticalAlignment.Stretch,
|
||||
.Background = Brushes.Transparent
|
||||
}
|
||||
End Function
|
||||
|
||||
''' <summary>
|
||||
''' Creazione Griglia Dinamica
|
||||
''' </summary>
|
||||
Private Sub CreateDynamicGrid()
|
||||
' creo colonne griglia dinamica
|
||||
Dim gridCol1 As New ColumnDefinition With {
|
||||
.Width = New GridLength(1, GridUnitType.Auto)
|
||||
}
|
||||
'.Width = New GridLength(1, GridUnitType.Auto)
|
||||
Dim gridCol2 As New ColumnDefinition With {
|
||||
.Width = New GridLength(1, GridUnitType.Star)
|
||||
}
|
||||
Dim gridCol3 As New ColumnDefinition With {
|
||||
.Width = New GridLength(250)
|
||||
}
|
||||
' aggiungo le colonne alla griglia
|
||||
m_DynamicGrid.ColumnDefinitions.Add(gridCol1)
|
||||
m_DynamicGrid.ColumnDefinitions.Add(gridCol2)
|
||||
m_DynamicGrid.ColumnDefinitions.Add(gridCol3)
|
||||
|
||||
' creo righe griglia dinamica
|
||||
Dim gridRow1 As New RowDefinition With {
|
||||
.Height = New GridLength(1, GridUnitType.Auto)
|
||||
}
|
||||
Dim gridRow2 As New RowDefinition With {
|
||||
.Height = New GridLength(1, GridUnitType.Star)
|
||||
}
|
||||
Dim gridRow3 As New RowDefinition With {
|
||||
.Height = New GridLength(1, GridUnitType.Auto)
|
||||
}
|
||||
' aggiungo righe alla griglia
|
||||
m_DynamicGrid.RowDefinitions.Add(gridRow1)
|
||||
m_DynamicGrid.RowDefinitions.Add(gridRow2)
|
||||
m_DynamicGrid.RowDefinitions.Add(gridRow3)
|
||||
End Sub
|
||||
|
||||
Private Sub PreInitializeScene()
|
||||
' imposto colore di default
|
||||
Dim DefColor As New Color3d(0, 0, 0)
|
||||
@@ -486,7 +657,7 @@ Public Class ProjectVM
|
||||
End If
|
||||
' Esecuzione
|
||||
bOk = ExecBeam(sFile, sMachine, nFlag, True)
|
||||
' altrimenti pareti
|
||||
' altrimenti pareti
|
||||
Else
|
||||
' Verifica abilitazione elaborazione pareti
|
||||
If Not VerifyWall(sFile, sMachine, nFlag) Then
|
||||
@@ -500,12 +671,12 @@ Public Class ProjectVM
|
||||
If nFlag = 0 Or nFlag = 3 Or nFlag = 4 Then
|
||||
Map.refMachinePanelVM.SaveCurrentMachine()
|
||||
Map.refMainWindowVM.CloseApplicationCmd()
|
||||
' Altrimenti se richiesta visualizzazione DB utensili
|
||||
' Altrimenti se richiesta visualizzazione DB utensili
|
||||
ElseIf nFlag = 11 And bOk Then
|
||||
MyMachinePanelVM.ToolDb()
|
||||
Map.refMachinePanelVM.SaveCurrentMachine()
|
||||
Map.refMainWindowVM.CloseApplicationCmd()
|
||||
' Altrimenti se richiesta visualizzazione DB lavorazioni
|
||||
' Altrimenti se richiesta visualizzazione DB lavorazioni
|
||||
ElseIf nFlag = 12 And bOk Then
|
||||
MyMachinePanelVM.MachDb()
|
||||
If bBeam Then
|
||||
@@ -515,7 +686,7 @@ Public Class ProjectVM
|
||||
End If
|
||||
Map.refMachinePanelVM.SaveCurrentMachine()
|
||||
Map.refMainWindowVM.CloseApplicationCmd()
|
||||
' Altrimenti se errore
|
||||
' Altrimenti se errore
|
||||
ElseIf Not bOk Then
|
||||
EgtZoom(ZM.ALL)
|
||||
End If
|
||||
@@ -1121,7 +1292,7 @@ Public Class ProjectVM
|
||||
EgtGetPlaneSnapPoint(e.Location, Vector3d.Z_AX, TableRef.z, ptCurr)
|
||||
DispositionUtility.VtHookFinder(nFixtureId, ptCurr)
|
||||
Exit While
|
||||
ElseIf DispositionUtility.VerifyTableAxis( nFixtureId) Then
|
||||
ElseIf DispositionUtility.VerifyTableAxis(nFixtureId) Then
|
||||
m_SelType = DispositionUtility.SelType.BARS
|
||||
m_nIdToSel = nFixtureId
|
||||
' Drag possibile
|
||||
@@ -1219,7 +1390,7 @@ Public Class ProjectVM
|
||||
m_nIdToDesel = GDB_ID.NULL
|
||||
EgtDraw()
|
||||
Return
|
||||
' altrimenti verifico il tipo del primo oggetto selezionato
|
||||
' altrimenti verifico il tipo del primo oggetto selezionato
|
||||
Else
|
||||
Dim nFirstSelId As Integer = EgtGetFirstSelectedObj()
|
||||
' se è un riferimento resetto lo stato di selezione ed esco
|
||||
@@ -1384,7 +1555,7 @@ Public Class ProjectVM
|
||||
' Visualizzo numerazione
|
||||
Analyze.CreateAnalyzeGroup()
|
||||
Analyze.CreateCurveCompoPntNbrs(nId)
|
||||
' Se superficie trimesh, visualizzo dati faccetta toccata
|
||||
' Se superficie trimesh, visualizzo dati faccetta toccata
|
||||
ElseIf EgtGetType(nId) = GDB_TY.SRF_MESH Then
|
||||
Dim nFac As Integer = EgtSurfTmFacetFromTria(nId, nSub)
|
||||
If nFac <> -1 Then
|
||||
@@ -1405,10 +1576,10 @@ Public Class ProjectVM
|
||||
" / φ=" + DoubleToString(dPhi, 2) + " θ=" + DoubleToString(dTheta, 2)
|
||||
Map.refStatusBarVM.NotifyStatusOutput(sOut)
|
||||
End If
|
||||
' Se Regione, visualizzo dati parte toccata
|
||||
' Se Regione, visualizzo dati parte toccata
|
||||
ElseIf EgtGetType(nId) = GDB_TY.SRF_FRGN Then
|
||||
Dim nChk As Integer = nSub
|
||||
If nChk >= 0 AndAlso nChk < EgtSurfFrChunkCount( nId) Then
|
||||
If nChk >= 0 AndAlso nChk < EgtSurfFrChunkCount(nId) Then
|
||||
' Visualizzo la normale e il contorno della parte
|
||||
Analyze.CreateAnalyzeGroup()
|
||||
Analyze.CreateChunkNormal(nId, nChk)
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 951 B |
Binary file not shown.
|
After Width: | Height: | Size: 688 B |
Binary file not shown.
|
After Width: | Height: | Size: 1.4 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.5 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 875 B |
Binary file not shown.
|
After Width: | Height: | Size: 1.4 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 640 B |
Binary file not shown.
|
After Width: | Height: | Size: 1.0 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.3 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 614 B |
Binary file not shown.
|
After Width: | Height: | Size: 842 B |
Binary file not shown.
|
After Width: | Height: | Size: 837 B |
Binary file not shown.
|
After Width: | Height: | Size: 821 B |
Binary file not shown.
|
After Width: | Height: | Size: 397 B |
Binary file not shown.
|
After Width: | Height: | Size: 1.2 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.3 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.5 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 498 B |
Binary file not shown.
|
After Width: | Height: | Size: 885 B |
Binary file not shown.
|
After Width: | Height: | Size: 996 B |
@@ -2,6 +2,8 @@
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:local="clr-namespace:EgtCAM5"
|
||||
DockPanel.Dock="Right">
|
||||
DockPanel.Dock="Right"
|
||||
Margin="0.5,0,0,0">
|
||||
|
||||
<local:OptionPanelV DataContext="{StaticResource OptionPanelViewModel}"/>
|
||||
</Grid>
|
||||
|
||||
+44
-3
@@ -38,6 +38,7 @@
|
||||
<EgtCAM5:DoorPanelVM x:Key="DoorsPanelViewModel"/>
|
||||
<EgtCAM5:GunStockPanelVM x:Key="GunStockPanelViewModel"/>
|
||||
<EgtCAM5:MyMachGroupPanelVM x:Key="MachGroupPanelViewModel"/>
|
||||
<EgtCAM5:WinFormPluginControlVM x:Key="WinFormPluginControlViewModel"/>
|
||||
<!--<EgtCAM5:MachGroupPanelVM x:Key="MachGroupPanelViewModel"/>-->
|
||||
<!--<EgtCAM5:OperationExpanderVM x:Key="OperationExpanderViewModel"/>-->
|
||||
|
||||
@@ -458,6 +459,10 @@
|
||||
<Style x:Key="DrawPanelButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
|
||||
<Setter Property="Height" Value="30"/>
|
||||
<Setter Property="Width" Value="30"/>
|
||||
<Setter Property="ToolTipService.ShowOnDisabled" Value="True"/>
|
||||
<Setter Property="ContextMenuService.Placement" Value="Right"/>
|
||||
<Setter Property="ContextMenuService.HorizontalOffset" Value="-1.5"/>
|
||||
<Setter Property="ContextMenuService.VerticalOffset" Value="-3.5"/>
|
||||
</Style>
|
||||
|
||||
<Style x:Key="MachiningsTextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
|
||||
@@ -1223,9 +1228,9 @@
|
||||
<Setter Property="Margin" Value="1,0,0,0"/>
|
||||
</Style>
|
||||
|
||||
<Style x:Key="MPExpander_UserNotesTxBxMargin" TargetType="{x:Type EgtWPFLib5:EgtTextBox}">
|
||||
<Setter Property="Margin" Value="-1,0,0,0"/>
|
||||
</Style>
|
||||
<Style x:Key="MPExpander_UserNotesTxBxMargin" TargetType="{x:Type EgtWPFLib5:EgtTextBox}">
|
||||
<Setter Property="Margin" Value="-1,0,0,0"/>
|
||||
</Style>
|
||||
|
||||
<!-- ______________________________________________________________________________________________________________________________________________ -->
|
||||
|
||||
@@ -1258,6 +1263,26 @@
|
||||
</Style.Triggers>
|
||||
</Style>
|
||||
|
||||
<Style x:Key="ListBoxItemStyle" TargetType="ListBoxItem">
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="ListBoxItem">
|
||||
<Border Name="_Border"
|
||||
SnapsToDevicePixels="True"
|
||||
BorderBrush="{StaticResource EgaltechWhite}"
|
||||
BorderThickness="1">
|
||||
<ContentPresenter />
|
||||
</Border>
|
||||
<ControlTemplate.Triggers>
|
||||
<Trigger Property="IsSelected" Value="True">
|
||||
<Setter TargetName="_Border" Property="Background" Value="{StaticResource Button.Pressed.Background}"/>
|
||||
</Trigger>
|
||||
</ControlTemplate.Triggers>
|
||||
</ControlTemplate>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>
|
||||
|
||||
<!-- ______________________________________________________________________________________________________________________________________________ -->
|
||||
|
||||
<!-- Style CheckBox -->
|
||||
@@ -1272,4 +1297,20 @@
|
||||
</Style.Triggers>-->
|
||||
</Style>
|
||||
|
||||
|
||||
<!-- ______________________________________________________________________________________________________________________________________________ -->
|
||||
|
||||
|
||||
<ItemsPanelTemplate x:Key="MenuItemPanelTemplate">
|
||||
<StackPanel Margin="-38,0,0,0" Background="Transparent" />
|
||||
</ItemsPanelTemplate>
|
||||
|
||||
<Style x:Key="ContextMenu_Button" TargetType="{x:Type ContextMenu}">
|
||||
<Setter Property="ItemsPanel" Value="{StaticResource MenuItemPanelTemplate}"/>
|
||||
<Setter Property="Background" Value="Transparent"/>
|
||||
<Setter Property="BorderBrush" Value="Transparent"/>
|
||||
<Setter Property="BorderThickness" Value="0"/>
|
||||
<Setter Property="Width" Value="37"/>
|
||||
</Style>
|
||||
|
||||
</ResourceDictionary>
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
<Grid x:Class="WinFormPluginControlV"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:EgtCAM5="clr-namespace:EgtCAM5"
|
||||
xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
|
||||
DockPanel.Dock="{Binding DockSide}"
|
||||
Height="{Binding Height}"
|
||||
Width="{Binding Width}"
|
||||
|
||||
+34
-34
@@ -1,10 +1,10 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
|
||||
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
|
||||
<security>
|
||||
<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
|
||||
<!-- UAC Manifest Options
|
||||
<assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
|
||||
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
|
||||
<security>
|
||||
<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
|
||||
<!-- UAC Manifest Options
|
||||
If you want to change the Windows User Account Control level replace the
|
||||
requestedExecutionLevel node with one of the following.
|
||||
|
||||
@@ -16,49 +16,49 @@
|
||||
Remove this element if your application requires this virtualization for backwards
|
||||
compatibility.
|
||||
-->
|
||||
<requestedExecutionLevel level="asInvoker" uiAccess="false" />
|
||||
</requestedPrivileges>
|
||||
</security>
|
||||
</trustInfo>
|
||||
<requestedExecutionLevel level="asInvoker" uiAccess="false" />
|
||||
</requestedPrivileges>
|
||||
</security>
|
||||
</trustInfo>
|
||||
|
||||
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
|
||||
<application>
|
||||
<!-- A list of the Windows versions that this application has been tested on
|
||||
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
|
||||
<application>
|
||||
<!-- A list of the Windows versions that this application has been tested on
|
||||
and is designed to work with. Uncomment the appropriate elements
|
||||
and Windows will automatically select the most compatible environment. -->
|
||||
|
||||
<!-- Windows Vista -->
|
||||
<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />
|
||||
<!-- Windows Vista -->
|
||||
<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />
|
||||
|
||||
<!-- Windows 7 -->
|
||||
<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />
|
||||
<!-- Windows 7 -->
|
||||
<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />
|
||||
|
||||
<!-- Windows 8 -->
|
||||
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />
|
||||
<!-- Windows 8 -->
|
||||
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />
|
||||
|
||||
<!-- Windows 8.1 -->
|
||||
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />
|
||||
<!-- Windows 8.1 -->
|
||||
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />
|
||||
|
||||
<!-- Windows 10 -->
|
||||
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
|
||||
<!-- Windows 10 -->
|
||||
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
|
||||
|
||||
</application>
|
||||
</compatibility>
|
||||
</application>
|
||||
</compatibility>
|
||||
|
||||
<!-- Indicates that the application is DPI-aware and will not be automatically scaled by Windows at higher
|
||||
<!-- Indicates that the application is DPI-aware and will not be automatically scaled by Windows at higher
|
||||
DPIs. Windows Presentation Foundation (WPF) applications are automatically DPI-aware and do not need
|
||||
to opt in. Windows Forms applications targeting .NET Framework 4.6 that opt into this setting, should
|
||||
also set the 'EnableWindowsFormsHighDpiAutoResizing' setting to 'true' in their app.config. -->
|
||||
<!--
|
||||
<application xmlns="urn:schemas-microsoft-com:asm.v3">
|
||||
<windowsSettings>
|
||||
<dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
|
||||
</windowsSettings>
|
||||
</application>
|
||||
-->
|
||||
|
||||
<!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
|
||||
<!--
|
||||
<application xmlns="urn:schemas-microsoft-com:asm.v3">
|
||||
<windowsSettings>
|
||||
<dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/PM</dpiAware>
|
||||
</windowsSettings>
|
||||
</application>
|
||||
|
||||
|
||||
<!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
|
||||
<!--
|
||||
<dependency>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity
|
||||
|
||||
Reference in New Issue
Block a user