avpon/StructureHelper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add work with versions

Browse Source
This commit is contained in:
Evgeny Redikultsev
2024-12-01 17:32:17 +05:00
parent 32243f5448
commit 346378222c
22 changed files with 4337 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForcesResultsView.xaml
View File

@@ -10,9 +10,40 @@
Title="Calculation Results" Height="450" Width="850" MinHeight="400" MinWidth="650" WindowStartupLocation="CenterScreen">
<DockPanel>
<ToolBarTray DockPanel.Dock="Top">
<ToolBar Name="Prestressing">
<Button Style="{DynamicResource ToolButton}" Command="{Binding SetPrestrainCommand}">
<Button.ToolTip>
<uc:ButtonToolTipEh HeaderText="Set prestrain"
IconContent="{StaticResource Prestrain}"
DescriptionText="Set strain from selected combination as auto prestrain (not available if selected result is invalid)"/>
</Button.ToolTip>
<Viewbox>
<ContentControl ContentTemplate="{StaticResource Prestrain}"/>
</Viewbox>
</Button>
</ToolBar>
<ToolBar Name="Lapping">
<Button Style="{DynamicResource ToolButton}" Command="{Binding ShowAnchorageCommand}">
<Button.ToolTip>
<uc:ButtonToolTipEh HeaderText="Show lapping length"
IconContent="{StaticResource LappingLength}"
DescriptionText="Calculate and show development and lapping length (not available if selected result is invalid)"/>
</Button.ToolTip>
<Viewbox>
<ContentControl ContentTemplate="{StaticResource LappingLength}"/>
</Viewbox>
</Button>
</ToolBar>
<ToolBar Name="CrackResult">
<Button Style="{StaticResource ToolButton}" Command="{Binding ShowCrackResultCommand}" ToolTip="Show force of cracking">
<Image Source="/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/32px_crack.png"/>
<Button Style="{DynamicResource ToolButton}" Command="{Binding ShowCrackResultCommand}">
<Button.ToolTip>
<uc:ButtonToolTipEh HeaderText="Show result step by step"
IconContent="{StaticResource CrackForces}"
DescriptionText="Show proportional combination of forces where cracks are appeared"/>
</Button.ToolTip>
<Viewbox>
<ContentControl ContentTemplate="{StaticResource CrackForces}"/>
</Viewbox>
</Button>
</ToolBar>
<ToolBar Name="InterpolatedResultToolBar">
@@ -22,7 +53,9 @@
IconContent="{StaticResource StepSolution}"
DescriptionText="Show result step by step for selected load combination"/>
</Button.ToolTip>
<ContentControl ContentTemplate="{DynamicResource StepSolution}"/>
<Viewbox>
<ContentControl ContentTemplate="{DynamicResource StepSolution}"/>
</Viewbox>
</Button>
<Button Style="{DynamicResource ToolButton}" Command="{Binding ShowGraphsCommand}">
<Button.ToolTip>
@@ -30,7 +63,9 @@
IconContent="{StaticResource MomentCurvatureDiagram}"
DescriptionText="Show moment-curvature diagram as result of stepped solution"/>
</Button.ToolTip>
<ContentControl ContentTemplate="{DynamicResource MomentCurvatureDiagram}"/>
<Viewbox>
<ContentControl ContentTemplate="{DynamicResource MomentCurvatureDiagram}"/>
</Viewbox>
</Button>
<Button Style="{DynamicResource ToolButton}" Command="{Binding GraphValuePointsCommand}">
<Button.ToolTip>
@@ -38,7 +73,19 @@
IconContent="{StaticResource ValuePointDiagram}"
DescriptionText="Show results for value point as result of stepped solution"/>
</Button.ToolTip>
<ContentControl ContentTemplate="{DynamicResource ValuePointDiagram}"/>
<Viewbox>
<ContentControl ContentTemplate="{DynamicResource ValuePointDiagram}"/>
</Viewbox>
</Button>
<Button Style="{DynamicResource ToolButton}" Command="{Binding ShowCrackGraphsCommand}">
<Button.ToolTip>
<uc:ButtonToolTipEh HeaderText="Show crack moment-curvature diagram"
IconContent="{StaticResource MomentCurvatureCrackDiagram}"
DescriptionText="Show moment-curvature diagram as result of stepped solution with considering cracks"/>
</Button.ToolTip>
<Viewbox>
<ContentControl ContentTemplate="{StaticResource MomentCurvatureCrackDiagram}" FontSize="8"/>
</Viewbox>
</Button>
</ToolBar>
<ToolBar Name="InteractionDiagramToolBar">
@@ -48,7 +95,9 @@
IconContent="{StaticResource InteractionDiagram}"
DescriptionText="Show interaction diagram, which means line of limit bearing capacity"/>
</Button.ToolTip>
<ContentControl ContentTemplate="{DynamicResource InteractionDiagram}"/>
<Viewbox>
<ContentControl ContentTemplate="{DynamicResource InteractionDiagram}"/>
</Viewbox>
</Button>
</ToolBar>
<ToolBar Name="IsoFieldToolBar">
@@ -101,7 +150,7 @@
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition Width="90"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition/>
@@ -132,11 +181,6 @@
<DataGridTextColumn Header="Description" Width="300" Binding="{Binding Description}"/>
</DataGrid.Columns>
</DataGrid>
<StackPanel Grid.Column="1">
<Button Margin="3" Content="CrcDiagrams" ToolTip="Show diagrams for cracked section" Command="{Binding ShowCrackGraphsCommand}"/>
<Button Margin="3" Content="Set Prestrain" ToolTip="Set strains as auto prestrain" Command="{Binding SetPrestrainCommand}"/>
<Button Margin="3" Content="Anchorage" ToolTip="Set strains as auto prestrain" Command="{Binding ShowAnchorageCommand}"/>
</StackPanel>
<StatusBar Grid.Row="1">
<StatusBarItem>
<StackPanel Orientation="Horizontal">

2
StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForcesResultsViewModel.cs
View File

@@ -315,7 +315,7 @@ namespace StructureHelper.Windows.CalculationWindows.CalculatorsViews.ForceCalcu
(setPrestrainCommand = new RelayCommand(o =>
{
SetPrestrain();
}, o => SelectedResult != null
}, o => SelectedResult != null && SelectedResult.IsValid
));
}
}

69
StructureHelper/Windows/CalculationWindows/ProgressViews/TraceDocumentView.xaml
View File

@@ -4,30 +4,57 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:StructureHelper.Windows.CalculationWindows.ProgressViews"
xmlns:uc="clr-namespace:StructureHelper.Windows.UserControls"
d:DataContext="{d:DesignInstance local:TraceDocumentVM}"
mc:Ignorable="d"
Title="Trace Document Viewer" Height="450" Width="800" MinHeight="400" MinWidth="600" WindowStartupLocation="CenterScreen">
Title="Trace Document Viewer" Height="600" Width="800" MinHeight="400" MinWidth="600" WindowStartupLocation="CenterScreen">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="120"/>
</Grid.ColumnDefinitions>
<FlowDocumentReader Name="DocumentReader" ViewingMode="Scroll"/>
<StackPanel Grid.Column="1">
<GroupBox Header="Tab gap">
<TextBox Text="{Binding TabGap, ValidatesOnExceptions=True}" />
</GroupBox>
<GroupBox Header="Max priority">
<StackPanel>
<TextBox Text="{Binding PriorityLimit, ValidatesOnExceptions=True}" />
<StackPanel Orientation="Horizontal">
<Slider Width="88" Value="{Binding PriorityLimit}" Maximum="{Binding MaxPriority}" Minimum="0"/>
<TextBlock Width="20" FontSize="8" Text="{Binding MaxPriority}"/>
<DockPanel>
<ToolBarTray DockPanel.Dock="Top">
<ToolBar>
<Button Style="{StaticResource ToolButton}"
Command="{Binding PrintDocumentCommand}">
<Button.ToolTip>
<uc:ButtonToolTipEh HeaderText="Print"
IconContent="{StaticResource Print}"
DescriptionText="Print current document to phisical or virtual printer"/>
</Button.ToolTip>
<Viewbox>
<ContentControl ContentTemplate="{DynamicResource Print}"/>
</Viewbox>
</Button>
</ToolBar>
<ToolBar>
<StackPanel Grid.Column="1" Orientation="Horizontal">
<GroupBox Width="100" Header="Tab gap">
<TextBox Height="22" Text="{Binding TabGap, ValidatesOnExceptions=True}" VerticalAlignment="Top" />
</GroupBox>
<GroupBox Header="Max priority">
<StackPanel>
<TextBox Text="{Binding PriorityLimit, ValidatesOnExceptions=True}" />
<StackPanel Orientation="Horizontal">
<Slider Width="88" Value="{Binding PriorityLimit}" Maximum="{Binding MaxPriority}" Minimum="0"/>
<TextBlock Width="20" FontSize="8" Text="{Binding MaxPriority}"/>
</StackPanel>
</StackPanel>
</GroupBox>
</StackPanel>
</StackPanel>
</GroupBox>
<Button Margin="3" Content="Rebuild" ToolTip="Rebuild document" Command="{Binding RebuildCommand}"/>
<Button Margin="3" Content="Print" ToolTip="Print document" Command="{Binding PrintDocumentCommand}"/>
</StackPanel>
<Button Style="{StaticResource ToolButton}"
Command="{Binding RebuildCommand}">
<Button.ToolTip>
<uc:ButtonToolTipEh HeaderText="Rebuild document"
IconContent="{StaticResource Renew}"
DescriptionText="Rebuild current document considering new values of gap and priority"/>
</Button.ToolTip>
<Viewbox>
<ContentControl ContentTemplate="{StaticResource Renew}"/>
</Viewbox>
</Button>
</ToolBar>
</ToolBarTray>
<Grid>
<FlowDocumentReader Name="DocumentReader" ViewingMode="Scroll"/>
</Grid>
</DockPanel>
</Grid>
</Window>