Icons for tools and analises were added
This commit is contained in:
Evgeny Redikultsev
@@ -267,6 +267,7 @@ namespace StructureHelper.Infrastructure.UI.DataContexts
|
|||||||
OnPropertyChanged(nameof(Color));
|
OnPropertyChanged(nameof(Color));
|
||||||
OnPropertyChanged(nameof(CenterX));
|
OnPropertyChanged(nameof(CenterX));
|
||||||
OnPropertyChanged(nameof(CenterY));
|
OnPropertyChanged(nameof(CenterY));
|
||||||
|
OnPropertyChanged(nameof(InvertedCenterY));
|
||||||
OnPropertyChanged(nameof(SetMaterialColor));
|
OnPropertyChanged(nameof(SetMaterialColor));
|
||||||
OnPropertyChanged(nameof(Triangulate));
|
OnPropertyChanged(nameof(Triangulate));
|
||||||
OnPropertyChanged(nameof(PrimitiveWidth));
|
OnPropertyChanged(nameof(PrimitiveWidth));
|
||||||
|
|||||||
Binary file not shown.
|
After Width: | Height: | Size: 2.4 KiB |
|
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 3.0 KiB |
|
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 3.4 KiB |
|
Before Width: | Height: | Size: 3.8 KiB After Width: | Height: | Size: 3.8 KiB |
|
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 3.3 KiB |
|
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 2.7 KiB |
|
Before Width: | Height: | Size: 4.0 KiB After Width: | Height: | Size: 4.0 KiB |
BIN
StructureHelper/Infrastructure/UI/Icons/32х32_Border/Run.png
Normal file
BIN
StructureHelper/Infrastructure/UI/Icons/32х32_Border/Run.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.4 KiB |
@@ -25,6 +25,8 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Remove="Windows\MainWindow\Add_Circle.png" />
|
<None Remove="Windows\MainWindow\Add_Circle.png" />
|
||||||
<None Remove="Windows\MainWindow\Add_Rebar.png" />
|
<None Remove="Windows\MainWindow\Add_Rebar.png" />
|
||||||
|
<None Remove="Windows\MainWindow\Calculator.png" />
|
||||||
|
<None Remove="Windows\MainWindow\Circle.png" />
|
||||||
<None Remove="Windows\MainWindow\Copy.png" />
|
<None Remove="Windows\MainWindow\Copy.png" />
|
||||||
<None Remove="Windows\MainWindow\Delete.png" />
|
<None Remove="Windows\MainWindow\Delete.png" />
|
||||||
<None Remove="Windows\MainWindow\Edit.png" />
|
<None Remove="Windows\MainWindow\Edit.png" />
|
||||||
@@ -33,10 +35,13 @@
|
|||||||
<None Remove="Windows\MainWindow\Edit_Concrete column.png" />
|
<None Remove="Windows\MainWindow\Edit_Concrete column.png" />
|
||||||
<None Remove="Windows\MainWindow\Edit_Concrete slab.png" />
|
<None Remove="Windows\MainWindow\Edit_Concrete slab.png" />
|
||||||
<None Remove="Windows\MainWindow\Materials.png" />
|
<None Remove="Windows\MainWindow\Materials.png" />
|
||||||
|
<None Remove="Windows\MainWindow\MovePrimitivesToCenter.png" />
|
||||||
<None Remove="Windows\MainWindow\Point_Primitive.png" />
|
<None Remove="Windows\MainWindow\Point_Primitive.png" />
|
||||||
<None Remove="Windows\MainWindow\Rectangle_Primitive.png" />
|
<None Remove="Windows\MainWindow\Rectangle_Primitive.png" />
|
||||||
|
<None Remove="Windows\MainWindow\Run.png" />
|
||||||
<None Remove="Windows\MainWindow\ToBackground.png" />
|
<None Remove="Windows\MainWindow\ToBackground.png" />
|
||||||
<None Remove="Windows\MainWindow\ToForeground.png" />
|
<None Remove="Windows\MainWindow\ToForeground.png" />
|
||||||
|
<None Remove="Windows\MainWindow\Tools_Settings.png" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
@@ -75,9 +80,12 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Resource Include="Windows\MainWindow\Add_Circle.png" />
|
<Resource Include="Windows\MainWindow\Add_Circle.png" />
|
||||||
<Resource Include="Windows\MainWindow\Add_Rebar.png" />
|
<Resource Include="Windows\MainWindow\Add_Rebar.png" />
|
||||||
|
<Resource Include="Windows\MainWindow\Calculator.png" />
|
||||||
|
<Resource Include="Windows\MainWindow\Circle.png" />
|
||||||
<Resource Include="Windows\MainWindow\Copy.png" />
|
<Resource Include="Windows\MainWindow\Copy.png" />
|
||||||
<Resource Include="Windows\MainWindow\Delete.png" />
|
<Resource Include="Windows\MainWindow\Delete.png" />
|
||||||
<Resource Include="Windows\MainWindow\Edit.png" />
|
<Resource Include="Windows\MainWindow\Edit.png" />
|
||||||
|
<Resource Include="Windows\MainWindow\MovePrimitivesToCenter.png" />
|
||||||
<Resource Include="Windows\MainWindow\Point_Primitive.png">
|
<Resource Include="Windows\MainWindow\Point_Primitive.png">
|
||||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||||
</Resource>
|
</Resource>
|
||||||
@@ -89,8 +97,10 @@
|
|||||||
<Resource Include="Windows\MainWindow\Edit_Concrete column.png" />
|
<Resource Include="Windows\MainWindow\Edit_Concrete column.png" />
|
||||||
<Resource Include="Windows\MainWindow\Edit_Concrete slab.png" />
|
<Resource Include="Windows\MainWindow\Edit_Concrete slab.png" />
|
||||||
<Resource Include="Windows\MainWindow\Materials.png" />
|
<Resource Include="Windows\MainWindow\Materials.png" />
|
||||||
|
<Resource Include="Windows\MainWindow\Run.png" />
|
||||||
<Resource Include="Windows\MainWindow\ToBackground.png" />
|
<Resource Include="Windows\MainWindow\ToBackground.png" />
|
||||||
<Resource Include="Windows\MainWindow\ToForeground.png" />
|
<Resource Include="Windows\MainWindow\ToForeground.png" />
|
||||||
|
<Resource Include="Windows\MainWindow\Tools_Settings.png" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
BIN
StructureHelper/Windows/MainWindow/Calculator.png
Normal file
BIN
StructureHelper/Windows/MainWindow/Calculator.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.4 KiB |
BIN
StructureHelper/Windows/MainWindow/Circle.png
Normal file
BIN
StructureHelper/Windows/MainWindow/Circle.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.0 KiB |
@@ -11,6 +11,7 @@
|
|||||||
xmlns:local="clr-namespace:StructureHelper.Windows.MainWindow"
|
xmlns:local="clr-namespace:StructureHelper.Windows.MainWindow"
|
||||||
xmlns:enums="clr-namespace:StructureHelper.Infrastructure.Enums"
|
xmlns:enums="clr-namespace:StructureHelper.Infrastructure.Enums"
|
||||||
xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
|
xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
|
||||||
|
xmlns:sys="clr-namespace:System;assembly=mscorlib"
|
||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
d:DataContext="{d:DesignInstance local:MainViewModel}"
|
d:DataContext="{d:DesignInstance local:MainViewModel}"
|
||||||
Title="StructureHelper" Height="700" Width="1000" MinHeight="400" MinWidth="600">
|
Title="StructureHelper" Height="700" Width="1000" MinHeight="400" MinWidth="600">
|
||||||
@@ -21,7 +22,6 @@
|
|||||||
<Setter Property="Margin" Value="2,0,2,0"/>
|
<Setter Property="Margin" Value="2,0,2,0"/>
|
||||||
<Setter Property="Background" Value="#FFA19BC3"/>
|
<Setter Property="Background" Value="#FFA19BC3"/>
|
||||||
<Setter Property="BorderBrush" Value="#FF857AB9"/>
|
<Setter Property="BorderBrush" Value="#FF857AB9"/>
|
||||||
|
|
||||||
</Style>
|
</Style>
|
||||||
<DataTemplate DataType="{x:Type dataContexts:RectangleViewPrimitive}">
|
<DataTemplate DataType="{x:Type dataContexts:RectangleViewPrimitive}">
|
||||||
<dataTemplates:RectangleTemplate/>
|
<dataTemplates:RectangleTemplate/>
|
||||||
@@ -33,50 +33,72 @@
|
|||||||
<dataTemplates:EllipseTemplate/>
|
<dataTemplates:EllipseTemplate/>
|
||||||
</DataTemplate>
|
</DataTemplate>
|
||||||
<BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
|
<BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
|
||||||
<ContextMenu x:Key="PrimitivesMenu">
|
<ContextMenu x:Key="EditCopyDelete">
|
||||||
<MenuItem Header="Add" DataContext="{Binding PrimitiveLogic}">
|
<MenuItem Header="Edit" Command="{Binding Edit}">
|
||||||
<MenuItem Header="Rectangle" Command="{Binding Add}" CommandParameter="{x:Static enums:PrimitiveType.Rectangle}">
|
<MenuItem.Icon>
|
||||||
<MenuItem.Icon>
|
<Image Width="16" Height="16" Source="/Windows/MainWindow/Edit.png" />
|
||||||
<Image Width="16" Height="16" Source="/Windows/MainWindow/Rectangle_Primitive.png" />
|
</MenuItem.Icon>
|
||||||
</MenuItem.Icon>
|
</MenuItem>
|
||||||
</MenuItem>
|
<MenuItem Header="Copy" Command="{Binding Copy}">
|
||||||
<MenuItem Header="Circle" Command="{Binding Add}" CommandParameter="{x:Static enums:PrimitiveType.Circle}">
|
<MenuItem.Icon>
|
||||||
<MenuItem.Icon>
|
<Image Width="16" Height="16" Source="/Windows/MainWindow/Copy.png" />
|
||||||
<Image Width="16" Height="16" Source="/Windows/MainWindow/Add_Circle.png" />
|
</MenuItem.Icon>
|
||||||
</MenuItem.Icon>
|
</MenuItem>
|
||||||
</MenuItem>
|
<MenuItem Header="Delete" Command="{Binding Delete}">
|
||||||
<MenuItem Header="Rebar" Command="{Binding Add}" CommandParameter="{x:Static enums:PrimitiveType.Reinforcement}">
|
<MenuItem.Icon>
|
||||||
<MenuItem.Icon>
|
<Image Width="16" Height="16" Source="/Windows/MainWindow/Delete.png" />
|
||||||
<Image Width="16" Height="16" Source="/Windows/MainWindow/Add_Rebar.png" />
|
</MenuItem.Icon>
|
||||||
</MenuItem.Icon>
|
</MenuItem>
|
||||||
</MenuItem>
|
</ContextMenu>
|
||||||
<MenuItem Header="Point" Command="{Binding Add}" CommandParameter="{x:Static enums:PrimitiveType.Point}">
|
<ContextMenu x:Key="PrimitiveCRUD">
|
||||||
<MenuItem.Icon>
|
<MenuItem Header="Edit" Command="{Binding Edit}">
|
||||||
<Image Width="16" Height="16" Source="/Windows/MainWindow/Point_primitive.png" />
|
<MenuItem.Icon>
|
||||||
</MenuItem.Icon>
|
<Image Width="16" Height="16" Source="/Windows/MainWindow/Edit.png" />
|
||||||
</MenuItem>
|
</MenuItem.Icon>
|
||||||
</MenuItem>
|
</MenuItem>
|
||||||
<MenuItem Header="Templates">
|
<MenuItem Header="Copy" Command="{Binding Copy}">
|
||||||
<MenuItem Header="Add Rectangle RC Column" Command="{Binding AddColumnCase}">
|
<MenuItem.Icon>
|
||||||
<MenuItem.Icon>
|
<Image Width="16" Height="16" Source="/Windows/MainWindow/Copy.png" />
|
||||||
<Image Width="16" Height="16" Source="/Windows/MainWindow/Edit_Concrete column.png" />
|
</MenuItem.Icon>
|
||||||
</MenuItem.Icon>
|
</MenuItem>
|
||||||
</MenuItem>
|
<MenuItem Header="Delete" Command="{Binding Delete}">
|
||||||
<MenuItem Header="Add Circle RC Column" Command="{Binding AddRCCircleCase}">
|
<MenuItem.Icon>
|
||||||
<MenuItem.Icon>
|
<Image Width="16" Height="16" Source="/Windows/MainWindow/Delete.png" />
|
||||||
<Image Width="16" Height="16" Source="/Windows/MainWindow/Edit_Circle_RC.png" />
|
</MenuItem.Icon>
|
||||||
</MenuItem.Icon>
|
</MenuItem>
|
||||||
</MenuItem>
|
<Separator/>
|
||||||
<MenuItem Header="Add RC Beam" Command="{Binding AddBeamCase}">
|
<MenuItem Header="To Foreground" Command="{Binding SetToFront}">
|
||||||
<MenuItem.Icon>
|
<MenuItem.Icon>
|
||||||
<Image Width="16" Height="16" Source="/Windows/MainWindow/Edit_Concrete beam.png" />
|
<Image Width="16" Height="16" Source="/Windows/MainWindow/ToForeground.png" />
|
||||||
</MenuItem.Icon>
|
</MenuItem.Icon>
|
||||||
</MenuItem>
|
</MenuItem>
|
||||||
<MenuItem Header="Add RC slab" Command="{Binding AddSlabCase}">
|
<MenuItem Header="To Background" Command="{Binding SetToBack}">
|
||||||
<MenuItem.Icon>
|
<MenuItem.Icon>
|
||||||
<Image Width="16" Height="16" Source="/Windows/MainWindow/Edit_Concrete slab.png" />
|
<Image Width="16" Height="16" Source="/Windows/MainWindow/ToBackground.png" />
|
||||||
</MenuItem.Icon>
|
</MenuItem.Icon>
|
||||||
</MenuItem>
|
</MenuItem>
|
||||||
|
</ContextMenu>
|
||||||
|
<ContextMenu x:Key="AnalisesCRUD">
|
||||||
|
<MenuItem Header="Run" Command="{Binding Run}">
|
||||||
|
<MenuItem.Icon>
|
||||||
|
<Image Width="16" Height="16" Source="/Windows/MainWindow/Run.png" />
|
||||||
|
</MenuItem.Icon>
|
||||||
|
</MenuItem>
|
||||||
|
<Separator/>
|
||||||
|
<MenuItem Header="Edit" Command="{Binding Edit}">
|
||||||
|
<MenuItem.Icon>
|
||||||
|
<Image Width="16" Height="16" Source="/Windows/MainWindow/Edit.png" />
|
||||||
|
</MenuItem.Icon>
|
||||||
|
</MenuItem>
|
||||||
|
<MenuItem Header="Copy" Command="{Binding Copy}">
|
||||||
|
<MenuItem.Icon>
|
||||||
|
<Image Width="16" Height="16" Source="/Windows/MainWindow/Copy.png" />
|
||||||
|
</MenuItem.Icon>
|
||||||
|
</MenuItem>
|
||||||
|
<MenuItem Header="Delete" Command="{Binding Delete}">
|
||||||
|
<MenuItem.Icon>
|
||||||
|
<Image Width="16" Height="16" Source="/Windows/MainWindow/Delete.png" />
|
||||||
|
</MenuItem.Icon>
|
||||||
</MenuItem>
|
</MenuItem>
|
||||||
</ContextMenu>
|
</ContextMenu>
|
||||||
</Window.Resources>
|
</Window.Resources>
|
||||||
@@ -96,7 +118,7 @@
|
|||||||
<Button Content="Delete primitive" Command="{Binding PrimitiveLogic.Delete}"/>
|
<Button Content="Delete primitive" Command="{Binding PrimitiveLogic.Delete}"/>
|
||||||
</MenuItem>
|
</MenuItem>
|
||||||
<Button Content="Materials" Command="{Binding EditHeadMaterialsCommand}"/>
|
<Button Content="Materials" Command="{Binding EditHeadMaterialsCommand}"/>
|
||||||
<Button Content="Move primitives to center" Command="{Binding Path=MovePrimitiveToGravityCenterCommand}"/>
|
<Button Content="Move primitives to center" Command="{Binding MovePrimitiveToGravityCenterCommand}"/>
|
||||||
<MenuItem Header="Templates">
|
<MenuItem Header="Templates">
|
||||||
<Button Content="Concrete beam" Command="{Binding AddBeamCase}"/>
|
<Button Content="Concrete beam" Command="{Binding AddBeamCase}"/>
|
||||||
<Button Content="Concrete column" Command="{Binding AddColumnCase}"/>
|
<Button Content="Concrete column" Command="{Binding AddColumnCase}"/>
|
||||||
@@ -154,7 +176,7 @@
|
|||||||
<Image Width="32" Height="32" Source="/Windows/MainWindow/Edit_Concrete column.png"/>
|
<Image Width="32" Height="32" Source="/Windows/MainWindow/Edit_Concrete column.png"/>
|
||||||
</Button>
|
</Button>
|
||||||
<Button Command="{Binding AddRCCircleCase}" ToolTip="Add Circle RC Column">
|
<Button Command="{Binding AddRCCircleCase}" ToolTip="Add Circle RC Column">
|
||||||
<Image Width="32" Height="32" Source="/Windows/MainWindow/Edit_Circle_RC.png"/>
|
<Image Width="32" Height="32" Source="/Windows/MainWindow/Circle.png"/>
|
||||||
</Button>
|
</Button>
|
||||||
<Button Command="{Binding AddBeamCase}" ToolTip="Add RC Beam">
|
<Button Command="{Binding AddBeamCase}" ToolTip="Add RC Beam">
|
||||||
<Image Width="32" Height="32" Source="/Windows/MainWindow/Edit_Concrete beam.png"/>
|
<Image Width="32" Height="32" Source="/Windows/MainWindow/Edit_Concrete beam.png"/>
|
||||||
@@ -163,6 +185,22 @@
|
|||||||
<Image Width="32" Height="32" Source="/Windows/MainWindow/Edit_Concrete slab.png"/>
|
<Image Width="32" Height="32" Source="/Windows/MainWindow/Edit_Concrete slab.png"/>
|
||||||
</Button>
|
</Button>
|
||||||
</ToolBar>
|
</ToolBar>
|
||||||
|
<ToolBar ToolTip="Analises" DataContext="{Binding CalculatorsLogic}">
|
||||||
|
<Button Command="{Binding Add}" ToolTip="Add Force Calculator">
|
||||||
|
<Image Width="32" Height="32" Source="/Windows/MainWindow/Calculator.png"/>
|
||||||
|
</Button>
|
||||||
|
<Button Command="{Binding Run}" ToolTip="Run Calculations">
|
||||||
|
<Image Width="32" Height="32" Source="/Windows/MainWindow/Run.png"/>
|
||||||
|
</Button>
|
||||||
|
</ToolBar>
|
||||||
|
<ToolBar ToolTip="Tools">
|
||||||
|
<Button Command="{Binding MovePrimitiveToGravityCenterCommand}" ToolTip="Move All Primitives to Gravity Center">
|
||||||
|
<Image Width="32" Height="32" Source="/Windows/MainWindow/MovePrimitivesToCenter.png"/>
|
||||||
|
</Button>
|
||||||
|
<Button Command="{Binding ShowVisualProperty}" ToolTip="Visual Settings">
|
||||||
|
<Image Width="32" Height="32" Source="/Windows/MainWindow/Tools_Settings.png"/>
|
||||||
|
</Button>
|
||||||
|
</ToolBar>
|
||||||
</ToolBarTray>
|
</ToolBarTray>
|
||||||
<Grid>
|
<Grid>
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
@@ -188,14 +226,7 @@
|
|||||||
</MenuItem>
|
</MenuItem>
|
||||||
</ContextMenu>
|
</ContextMenu>
|
||||||
</Expander.ContextMenu>
|
</Expander.ContextMenu>
|
||||||
<ListBox ItemsSource="{Binding Items}" SelectedItem="{Binding SelectedItem}">
|
<ListBox ItemsSource="{Binding Items}" SelectedItem="{Binding SelectedItem}" ContextMenu="{StaticResource EditCopyDelete}">
|
||||||
<ListBox.ContextMenu>
|
|
||||||
<ContextMenu>
|
|
||||||
<Button Content="Edit" Command="{Binding Edit}"/>
|
|
||||||
<Button Content="Copy" Command="{Binding Copy}"/>
|
|
||||||
<Button Content="Delete" Command="{Binding Delete}"/>
|
|
||||||
</ContextMenu>
|
|
||||||
</ListBox.ContextMenu>
|
|
||||||
<ListBox.ItemTemplate>
|
<ListBox.ItemTemplate>
|
||||||
<DataTemplate>
|
<DataTemplate>
|
||||||
<Grid>
|
<Grid>
|
||||||
@@ -218,44 +249,54 @@
|
|||||||
</MenuItem>
|
</MenuItem>
|
||||||
</ContextMenu>
|
</ContextMenu>
|
||||||
</Expander.ContextMenu>
|
</Expander.ContextMenu>
|
||||||
<ListBox ItemsSource="{Binding Items}" SelectedItem="{Binding SelectedItem}" ItemTemplate="{StaticResource ColoredItemTemplate}">
|
<ListBox ItemsSource="{Binding Items}"
|
||||||
<ListBox.ContextMenu>
|
SelectedItem="{Binding SelectedItem}"
|
||||||
<ContextMenu>
|
ItemTemplate="{StaticResource ColoredItemTemplate}"
|
||||||
<Button Content="Edit" Command="{Binding Edit}"/>
|
ContextMenu="{StaticResource EditCopyDelete}"/>
|
||||||
<Button Content="Copy" Command="{Binding Copy}"/>
|
|
||||||
<Button Content="Delete" Command="{Binding Delete}"/>
|
|
||||||
</ContextMenu>
|
|
||||||
</ListBox.ContextMenu>
|
|
||||||
</ListBox>
|
|
||||||
</Expander>
|
</Expander>
|
||||||
<Expander Header="Geometry" MinWidth="20" ContextMenu="{StaticResource PrimitivesMenu}">
|
<Expander Header="Geometry" MinWidth="20">
|
||||||
<ListBox DataContext="{Binding PrimitiveLogic}" ItemsSource="{Binding Items}" SelectedItem="{Binding SelectedItem}" ItemTemplate="{StaticResource ColoredItemTemplate}">
|
<Expander.ContextMenu>
|
||||||
<ListBox.ContextMenu>
|
<ContextMenu>
|
||||||
<ContextMenu>
|
<MenuItem Header="Add" DataContext="{Binding PrimitiveLogic}">
|
||||||
<Button Content="Edit" Command="{Binding Edit}"/>
|
<MenuItem Header="Rectangle" Command="{Binding Add}" CommandParameter="{x:Static enums:PrimitiveType.Rectangle}">
|
||||||
<Button Content="Copy" Command="{Binding Copy}"/>
|
<MenuItem.Icon>
|
||||||
<Button Content="Delete" Command="{Binding Delete}"/>
|
<Image Width="16" Height="16" Source="/Windows/MainWindow/Rectangle_Primitive.png" />
|
||||||
<Button Content="To Foreground" Command="{Binding SetToFront}"/>
|
</MenuItem.Icon>
|
||||||
<Button Content="To Background" Command="{Binding SetToBack}"/>
|
</MenuItem>
|
||||||
</ContextMenu>
|
<MenuItem Header="Circle" Command="{Binding Add}" CommandParameter="{x:Static enums:PrimitiveType.Circle}">
|
||||||
</ListBox.ContextMenu>
|
<MenuItem.Icon>
|
||||||
|
<Image Width="16" Height="16" Source="/Windows/MainWindow/Add_Circle.png" />
|
||||||
|
</MenuItem.Icon>
|
||||||
|
</MenuItem>
|
||||||
|
<MenuItem Header="Rebar" Command="{Binding Add}" CommandParameter="{x:Static enums:PrimitiveType.Reinforcement}">
|
||||||
|
<MenuItem.Icon>
|
||||||
|
<Image Width="16" Height="16" Source="/Windows/MainWindow/Add_Rebar.png" />
|
||||||
|
</MenuItem.Icon>
|
||||||
|
</MenuItem>
|
||||||
|
<MenuItem Header="Point" Command="{Binding Add}" CommandParameter="{x:Static enums:PrimitiveType.Point}">
|
||||||
|
<MenuItem.Icon>
|
||||||
|
<Image Width="16" Height="16" Source="/Windows/MainWindow/Point_primitive.png" />
|
||||||
|
</MenuItem.Icon>
|
||||||
|
</MenuItem>
|
||||||
|
</MenuItem>
|
||||||
|
</ContextMenu>
|
||||||
|
</Expander.ContextMenu>
|
||||||
|
<ListBox DataContext="{Binding PrimitiveLogic}"
|
||||||
|
ItemsSource="{Binding Items}" SelectedItem="{Binding SelectedItem}"
|
||||||
|
ItemTemplate="{StaticResource ColoredItemTemplate}" ContextMenu="{StaticResource PrimitiveCRUD}">
|
||||||
</ListBox>
|
</ListBox>
|
||||||
</Expander>
|
</Expander>
|
||||||
<Expander Header="Analyses" MinWidth="20" DataContext="{Binding CalculatorsLogic}">
|
<Expander Header="Analyses" MinWidth="20" DataContext="{Binding CalculatorsLogic}">
|
||||||
<Expander.ContextMenu>
|
<Expander.ContextMenu>
|
||||||
<ContextMenu>
|
<ContextMenu>
|
||||||
<Button Content="Add Calculator" Command="{Binding Add}"/>
|
<MenuItem Header="Add" Command="{Binding Add}">
|
||||||
|
<MenuItem.Icon>
|
||||||
|
<Image Width="16" Height="16" Source="/Windows/MainWindow/Calculator.png" />
|
||||||
|
</MenuItem.Icon>
|
||||||
|
</MenuItem>
|
||||||
</ContextMenu>
|
</ContextMenu>
|
||||||
</Expander.ContextMenu>
|
</Expander.ContextMenu>
|
||||||
<ListBox ItemsSource="{Binding Items}" SelectedItem="{Binding SelectedItem}">
|
<ListBox ItemsSource="{Binding Items}" SelectedItem="{Binding SelectedItem}" ContextMenu="{StaticResource AnalisesCRUD}">
|
||||||
<ListBox.ContextMenu>
|
|
||||||
<ContextMenu>
|
|
||||||
<Button Content="Run" Command="{Binding Run}"/>
|
|
||||||
<Button Content="Edit" Command="{Binding Edit}"/>
|
|
||||||
<Button Content="Copy" Command="{Binding Copy}"/>
|
|
||||||
<Button Content="Delete" Command="{Binding Delete}"/>
|
|
||||||
</ContextMenu>
|
|
||||||
</ListBox.ContextMenu>
|
|
||||||
<ListBox.ItemTemplate>
|
<ListBox.ItemTemplate>
|
||||||
<DataTemplate>
|
<DataTemplate>
|
||||||
<Grid>
|
<Grid>
|
||||||
@@ -274,7 +315,55 @@
|
|||||||
</i:EventTrigger>
|
</i:EventTrigger>
|
||||||
</i:Interaction.Triggers>
|
</i:Interaction.Triggers>
|
||||||
<ScrollViewer VerticalScrollBarVisibility="Visible" HorizontalScrollBarVisibility="Visible">
|
<ScrollViewer VerticalScrollBarVisibility="Visible" HorizontalScrollBarVisibility="Visible">
|
||||||
<Canvas Name="WorkPlane" ClipToBounds="True" Width="{Binding CanvasWidth}" Height="{Binding CanvasHeight}" ContextMenu="{StaticResource PrimitivesMenu}">
|
<Canvas Name="WorkPlane" ClipToBounds="True" Width="{Binding CanvasWidth}" Height="{Binding CanvasHeight}">
|
||||||
|
<Canvas.ContextMenu>
|
||||||
|
<ContextMenu>
|
||||||
|
<MenuItem Header="Add" DataContext="{Binding PrimitiveLogic}">
|
||||||
|
<MenuItem Header="Rectangle" Command="{Binding Add}" CommandParameter="{x:Static enums:PrimitiveType.Rectangle}">
|
||||||
|
<MenuItem.Icon>
|
||||||
|
<Image Width="16" Height="16" Source="/Windows/MainWindow/Rectangle_Primitive.png" />
|
||||||
|
</MenuItem.Icon>
|
||||||
|
</MenuItem>
|
||||||
|
<MenuItem Header="Circle" Command="{Binding Add}" CommandParameter="{x:Static enums:PrimitiveType.Circle}">
|
||||||
|
<MenuItem.Icon>
|
||||||
|
<Image Width="16" Height="16" Source="/Windows/MainWindow/Add_Circle.png" />
|
||||||
|
</MenuItem.Icon>
|
||||||
|
</MenuItem>
|
||||||
|
<MenuItem Header="Rebar" Command="{Binding Add}" CommandParameter="{x:Static enums:PrimitiveType.Reinforcement}">
|
||||||
|
<MenuItem.Icon>
|
||||||
|
<Image Width="16" Height="16" Source="/Windows/MainWindow/Add_Rebar.png" />
|
||||||
|
</MenuItem.Icon>
|
||||||
|
</MenuItem>
|
||||||
|
<MenuItem Header="Point" Command="{Binding Add}" CommandParameter="{x:Static enums:PrimitiveType.Point}">
|
||||||
|
<MenuItem.Icon>
|
||||||
|
<Image Width="16" Height="16" Source="/Windows/MainWindow/Point_primitive.png" />
|
||||||
|
</MenuItem.Icon>
|
||||||
|
</MenuItem>
|
||||||
|
</MenuItem>
|
||||||
|
<MenuItem Header="Templates" DataContext="{Binding}">
|
||||||
|
<MenuItem Header="Add Rectangle RC Column" Command="{Binding AddColumnCase}">
|
||||||
|
<MenuItem.Icon>
|
||||||
|
<Image Width="16" Height="16" Source="/Windows/MainWindow/Edit_Concrete column.png" />
|
||||||
|
</MenuItem.Icon>
|
||||||
|
</MenuItem>
|
||||||
|
<MenuItem Header="Add Circle RC Column" Command="{Binding AddRCCircleCase}">
|
||||||
|
<MenuItem.Icon>
|
||||||
|
<Image Width="16" Height="16" Source="/Windows/MainWindow/Edit_Circle_RC.png" />
|
||||||
|
</MenuItem.Icon>
|
||||||
|
</MenuItem>
|
||||||
|
<MenuItem Header="Add RC Beam" Command="{Binding AddBeamCase}">
|
||||||
|
<MenuItem.Icon>
|
||||||
|
<Image Width="16" Height="16" Source="/Windows/MainWindow/Edit_Concrete beam.png" />
|
||||||
|
</MenuItem.Icon>
|
||||||
|
</MenuItem>
|
||||||
|
<MenuItem Header="Add RC slab" Command="{Binding AddSlabCase}">
|
||||||
|
<MenuItem.Icon>
|
||||||
|
<Image Width="16" Height="16" Source="/Windows/MainWindow/Edit_Concrete slab.png" />
|
||||||
|
</MenuItem.Icon>
|
||||||
|
</MenuItem>
|
||||||
|
</MenuItem>
|
||||||
|
</ContextMenu>
|
||||||
|
</Canvas.ContextMenu>
|
||||||
<i:Interaction.Behaviors>
|
<i:Interaction.Behaviors>
|
||||||
<infrastructure:MouseBehaviour MouseX="{Binding PanelX, Mode=OneWayToSource}" MouseY="{Binding PanelY, Mode=OneWayToSource}"/>
|
<infrastructure:MouseBehaviour MouseX="{Binding PanelX, Mode=OneWayToSource}" MouseY="{Binding PanelY, Mode=OneWayToSource}"/>
|
||||||
</i:Interaction.Behaviors>
|
</i:Interaction.Behaviors>
|
||||||
@@ -303,7 +392,7 @@
|
|||||||
</Canvas.Background>
|
</Canvas.Background>
|
||||||
<Line X1="0" X2="{Binding XX2}" Y1="{Binding XY1}" Y2="{Binding XY1}" Stroke="Red" StrokeThickness="{Binding AxisLineThickness}"/>
|
<Line X1="0" X2="{Binding XX2}" Y1="{Binding XY1}" Y2="{Binding XY1}" Stroke="Red" StrokeThickness="{Binding AxisLineThickness}"/>
|
||||||
<Line X1="{Binding YX1}" X2="{Binding YX1}" Y1="0" Y2="{Binding YY2}" Stroke="ForestGreen" StrokeThickness="{Binding AxisLineThickness}"/>
|
<Line X1="{Binding YX1}" X2="{Binding YX1}" Y1="0" Y2="{Binding YY2}" Stroke="ForestGreen" StrokeThickness="{Binding AxisLineThickness}"/>
|
||||||
<ItemsControl ItemsSource="{Binding PrimitiveLogic.Items}" d:DataContext="{d:DesignInstance vm:MainViewModel}">
|
<ItemsControl DataContext="{Binding PrimitiveLogic}" ItemsSource="{Binding Items}" ContextMenu="{StaticResource PrimitiveCRUD}">
|
||||||
<ItemsControl.ItemsPanel>
|
<ItemsControl.ItemsPanel>
|
||||||
<ItemsPanelTemplate>
|
<ItemsPanelTemplate>
|
||||||
<Canvas/>
|
<Canvas/>
|
||||||
@@ -318,35 +407,6 @@
|
|||||||
<EventSetter Event="MouseDown" Handler="ContentPresenter_MouseLeftButtonDown"/>
|
<EventSetter Event="MouseDown" Handler="ContentPresenter_MouseLeftButtonDown"/>
|
||||||
</Style>
|
</Style>
|
||||||
</ItemsControl.ItemContainerStyle>
|
</ItemsControl.ItemContainerStyle>
|
||||||
<ItemsControl.ContextMenu>
|
|
||||||
<ContextMenu>
|
|
||||||
<MenuItem Header="Edit" Command="{Binding PrimitiveLogic.Edit}">
|
|
||||||
<MenuItem.Icon>
|
|
||||||
<Image Width="16" Height="16" Source="/Windows/MainWindow/Edit.png" />
|
|
||||||
</MenuItem.Icon>
|
|
||||||
</MenuItem>
|
|
||||||
<MenuItem Header="Copy" Command="{Binding PrimitiveLogic.Copy}">
|
|
||||||
<MenuItem.Icon>
|
|
||||||
<Image Width="16" Height="16" Source="/Windows/MainWindow/Copy.png" />
|
|
||||||
</MenuItem.Icon>
|
|
||||||
</MenuItem>
|
|
||||||
<MenuItem Header="Delete" Command="{Binding PrimitiveLogic.Delete}">
|
|
||||||
<MenuItem.Icon>
|
|
||||||
<Image Width="16" Height="16" Source="/Windows/MainWindow/Delete.png" />
|
|
||||||
</MenuItem.Icon>
|
|
||||||
</MenuItem>
|
|
||||||
<MenuItem Header="To Foreground" Command="{Binding PrimitiveLogic.SetToFront}">
|
|
||||||
<MenuItem.Icon>
|
|
||||||
<Image Width="16" Height="16" Source="/Windows/MainWindow/ToForeground.png" />
|
|
||||||
</MenuItem.Icon>
|
|
||||||
</MenuItem>
|
|
||||||
<MenuItem Header="To Background" Command="{Binding PrimitiveLogic.SetToBack}">
|
|
||||||
<MenuItem.Icon>
|
|
||||||
<Image Width="16" Height="16" Source="/Windows/MainWindow/ToBackground.png" />
|
|
||||||
</MenuItem.Icon>
|
|
||||||
</MenuItem>
|
|
||||||
</ContextMenu>
|
|
||||||
</ItemsControl.ContextMenu>
|
|
||||||
</ItemsControl>
|
</ItemsControl>
|
||||||
</Canvas>
|
</Canvas>
|
||||||
</ScrollViewer>
|
</ScrollViewer>
|
||||||
@@ -373,7 +433,5 @@
|
|||||||
</StatusBarItem>
|
</StatusBarItem>
|
||||||
</StatusBar>
|
</StatusBar>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|
||||||
|
|
||||||
</DockPanel>
|
</DockPanel>
|
||||||
</Window>
|
</Window>
|
||||||
|
|||||||
BIN
StructureHelper/Windows/MainWindow/MovePrimitivesToCenter.png
Normal file
BIN
StructureHelper/Windows/MainWindow/MovePrimitivesToCenter.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.4 KiB |
BIN
StructureHelper/Windows/MainWindow/Run.png
Normal file
BIN
StructureHelper/Windows/MainWindow/Run.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.4 KiB |
BIN
StructureHelper/Windows/MainWindow/Tools_Settings.png
Normal file
BIN
StructureHelper/Windows/MainWindow/Tools_Settings.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.9 KiB |
Reference in New Issue
Block a user