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

Interpolate tuple window was corrected

Browse Source
This commit is contained in:
Evgeny Redikultsev
2023-11-01 20:50:07 +05:00
parent 195624f2ed
commit 44c5065d03
2 changed files with 64 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
StructureHelper/Windows/Forces/InterpolateTuplesView.xaml
View File

@@ -8,9 +8,12 @@
xmlns:uc="clr-namespace:StructureHelper.Windows.UserControls" xmlns:uc="clr-namespace:StructureHelper.Windows.UserControls"
d:DataContext="{d:DesignInstance vm:InterpolateTuplesViewModel}" d:DataContext="{d:DesignInstance vm:InterpolateTuplesViewModel}"
mc:Ignorable="d" mc:Ignorable="d"
Title="Interpolate Combinations" Height="200" Width="500" MinHeight="180" MinWidth="500" WindowStartupLocation="CenterScreen"> Title="Interpolate Combinations" Height="200" Width="400" MinHeight="180" MinWidth="400" WindowStartupLocation="CenterScreen">
<Window.Resources> <Window.Resources>
<BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/> <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
<Style TargetType="Button">
<Setter Property="Margin" Value="1"/>
</Style>
</Window.Resources> </Window.Resources>
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
@@ -20,7 +23,7 @@
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition/> <ColumnDefinition/>
<ColumnDefinition Width="90"/> <ColumnDefinition Width="0"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
@@ -28,11 +31,12 @@
<RowDefinition Height="25"/> <RowDefinition Height="25"/>
<RowDefinition Height="25"/> <RowDefinition Height="25"/>
<RowDefinition Height="25"/> <RowDefinition Height="25"/>
<RowDefinition Height="25"/>
<RowDefinition Height="40"/> <RowDefinition Height="40"/>
<RowDefinition/> <RowDefinition/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="120"/> <ColumnDefinition Width="110"/>
<ColumnDefinition/> <ColumnDefinition/>
<ColumnDefinition/> <ColumnDefinition/>
<ColumnDefinition/> <ColumnDefinition/>
@@ -45,20 +49,59 @@
<TextBox Grid.Row="1" Grid.Column="1" Text="{Binding StartMx, Converter={StaticResource MomentConverter}, ValidatesOnExceptions=True}"/> <TextBox Grid.Row="1" Grid.Column="1" Text="{Binding StartMx, Converter={StaticResource MomentConverter}, ValidatesOnExceptions=True}"/>
<TextBox Grid.Row="1" Grid.Column="2" Text="{Binding StartMy, Converter={StaticResource MomentConverter}, ValidatesOnExceptions=True}"/> <TextBox Grid.Row="1" Grid.Column="2" Text="{Binding StartMy, Converter={StaticResource MomentConverter}, ValidatesOnExceptions=True}"/>
<TextBox Grid.Row="1" Grid.Column="3" Text="{Binding StartNz, Converter={StaticResource ForceConverter}, ValidatesOnExceptions=True}"/> <TextBox Grid.Row="1" Grid.Column="3" Text="{Binding StartNz, Converter={StaticResource ForceConverter}, ValidatesOnExceptions=True}"/>
<TextBlock Grid.Row="2" Text="Finish Combination"/> <Button Grid.Row="2" Grid.Column="1" Command="{Binding CopyToStartCommand}">
<TextBox Grid.Row="2" Grid.Column="1" Text="{Binding FinishMx, Converter={StaticResource MomentConverter}, ValidatesOnExceptions=True}"/> <Viewbox>
<TextBox Grid.Row="2" Grid.Column="2" Text="{Binding FinishMy, Converter={StaticResource MomentConverter}, ValidatesOnExceptions=True}"/> <Canvas Width="24" Height="24">
<TextBox Grid.Row="2" Grid.Column="3" Text="{Binding FinishNz, Converter={StaticResource ForceConverter}, ValidatesOnExceptions=True}"/> <Path Data="M12 0L5 12h 14z M12 12h 4v 9h-8v-9h 4z" Fill="Black"/>
<TextBlock Grid.Row="3" Text="Step count" Visibility="{Binding StepCountVisible, Converter={StaticResource BooleanToVisibilityConverter}}"/> </Canvas>
<TextBox Grid.Row="3" Grid.Column="1" Text="{Binding StepCount, ValidatesOnExceptions=True}" Visibility="{Binding StepCountVisible, Converter={StaticResource BooleanToVisibilityConverter}}"/> </Viewbox>
<uc:MultiplyTuple Grid.Column="4" Grid.Row="1" ForceTuple="{Binding StartDesignForce.ForceTuple}" ValueChanged="StartValueChanged"/> </Button>
<uc:MultiplyTuple Grid.Column="4" Grid.Row="2" ForceTuple="{Binding FinishDesignForce.ForceTuple}" ValueChanged="FinishValueChanged"/> <Button Grid.Row="2" Grid.Column="2" Command="{Binding InvertForcesCommand}">
</Grid> <StackPanel Orientation="Horizontal">
<StackPanel Grid.Column="1"> <Viewbox>
<Button Content="Invert comb's" Command="{Binding InvertForcesCommand}" /> <Canvas Width="24" Height="24">
<Button Content="Copy To Finish" Command="{Binding CopyToFinishCommand}" /> <Path Data="M12 0L5 12h 14z M12 12h 4v 9h-8v-9h 4z" Fill="Black"/>
<Button Content="Copy To Start" Command="{Binding CopyToStartCommand}" /> </Canvas>
</Viewbox>
<Viewbox RenderTransformOrigin="0.5,0.5">
<Viewbox.RenderTransform>
<TransformGroup>
<ScaleTransform/>
<SkewTransform/>
<RotateTransform Angle="180"/>
<TranslateTransform/>
</TransformGroup>
</Viewbox.RenderTransform>
<Canvas Width="24" Height="24">
<Path Data="M12 0L5 12h 14z M12 12h 4v 9h-8v-9h 4z" Fill="Black"/>
</Canvas>
</Viewbox>
</StackPanel> </StackPanel>
</Button>
<Button Grid.Row="2" Grid.Column="3" Command="{Binding CopyToFinishCommand}">
<Viewbox RenderTransformOrigin="0.5,0.5">
<Viewbox.RenderTransform>
<TransformGroup>
<ScaleTransform/>
<SkewTransform/>
<RotateTransform Angle="180"/>
<TranslateTransform/>
</TransformGroup>
</Viewbox.RenderTransform>
<Canvas Width="24" Height="24">
<Path Data="M12 0L5 12h 14z M12 12h 4v 9h-8v-9h 4z" Fill="Black"/>
</Canvas>
</Viewbox>
</Button>
<TextBlock Grid.Row="3" Text="Finish Combination"/>
<TextBox Grid.Row="3" Grid.Column="1" Text="{Binding FinishMx, Converter={StaticResource MomentConverter}, ValidatesOnExceptions=True}"/>
<TextBox Grid.Row="3" Grid.Column="2" Text="{Binding FinishMy, Converter={StaticResource MomentConverter}, ValidatesOnExceptions=True}"/>
<TextBox Grid.Row="3" Grid.Column="3" Text="{Binding FinishNz, Converter={StaticResource ForceConverter}, ValidatesOnExceptions=True}"/>
<TextBlock Grid.Row="4" Text="Step count" Visibility="{Binding StepCountVisible, Converter={StaticResource BooleanToVisibilityConverter}}"/>
<TextBox Grid.Row="4" Grid.Column="1" Text="{Binding StepCount, ValidatesOnExceptions=True}" Visibility="{Binding StepCountVisible, Converter={StaticResource BooleanToVisibilityConverter}}"/>
<uc:MultiplyTuple Grid.Column="4" Grid.Row="1" ForceTuple="{Binding StartDesignForce.ForceTuple}" ValueChanged="StartValueChanged"/>
<uc:MultiplyTuple Grid.Column="4" Grid.Row="3" ForceTuple="{Binding FinishDesignForce.ForceTuple}" ValueChanged="FinishValueChanged"/>
</Grid>
</Grid> </Grid>
<StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right"> <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right">

7
StructureHelper/Windows/ViewModels/Forces/InterpolateTuplesViewModel.cs
View File

@@ -16,8 +16,8 @@ namespace StructureHelper.Windows.ViewModels.Forces
private RelayCommand copyToStartCommand; private RelayCommand copyToStartCommand;
private RelayCommand copyToFinishCommand; private RelayCommand copyToFinishCommand;
public IDesignForceTuple StartDesignForce { get; private set; } public IDesignForceTuple StartDesignForce { get; set; }
public IDesignForceTuple FinishDesignForce { get; private set; } public IDesignForceTuple FinishDesignForce { get; set; }
public bool StepCountVisible { get; set; } public bool StepCountVisible { get; set; }
public double StartMx public double StartMx
@@ -115,6 +115,7 @@ namespace StructureHelper.Windows.ViewModels.Forces
public void RefreshFinishTuple() public void RefreshFinishTuple()
{ {
OnPropertyChanged(nameof(FinishDesignForce));
OnPropertyChanged(nameof(FinishMx)); OnPropertyChanged(nameof(FinishMx));
OnPropertyChanged(nameof(FinishMy)); OnPropertyChanged(nameof(FinishMy));
OnPropertyChanged(nameof(FinishNz)); OnPropertyChanged(nameof(FinishNz));
@@ -122,6 +123,7 @@ namespace StructureHelper.Windows.ViewModels.Forces
public void RefreshStartTuple() public void RefreshStartTuple()
{ {
OnPropertyChanged(nameof(StartDesignForce));
OnPropertyChanged(nameof(StartMx)); OnPropertyChanged(nameof(StartMx));
OnPropertyChanged(nameof(StartMy)); OnPropertyChanged(nameof(StartMy));
OnPropertyChanged(nameof(StartNz)); OnPropertyChanged(nameof(StartNz));
@@ -146,6 +148,7 @@ namespace StructureHelper.Windows.ViewModels.Forces
} }
FinishDesignForce = finishDesignForce; FinishDesignForce = finishDesignForce;
StepCount = stepCount; StepCount = stepCount;
StepCountVisible = true;
} }
} }
} }