From 628819a1787290f84c22ecc7cb747f649fd54468 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Mon, 5 Mar 2018 12:34:58 +0200
Subject: Added dynamic factoring for embroidery import thread length.

---
 .../Views/EmbroideryImportView.xaml                | 29 +++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/EmbroideryImportView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/EmbroideryImportView.xaml
index 17a5a5b8c..42d0bb106 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/EmbroideryImportView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/EmbroideryImportView.xaml
@@ -45,10 +45,33 @@
             <Grid Grid.Column="1" Grid.Row="1">
                 <StackPanel>
                     <TextBlock Margin="5">Region Brush</TextBlock>
-                    <brushPicker:BrushPicker Margin="0 10 0 0" Background="White" BorderThickness="0" Brush="{Binding ElementName=editor,Path=SelectedPath.Brush,Mode=TwoWay}" />
+                    <Border Margin="5" BorderThickness="1" BorderBrush="Silver">
+                        <brushPicker:BrushPicker Background="White" BorderThickness="0" Brush="{Binding ElementName=editor,Path=SelectedPath.Brush,Mode=TwoWay}" />
+                    </Border>
 
-                    <TextBlock Text="Stitch Length" Margin="5"></TextBlock>
-                    <mahApps:NumericUpDown Margin="5" Minimum="1" Maximum="20" StringFormat="# mm" Value="{Binding StitchLength}" HasDecimals="False" HorizontalContentAlignment="Center" />
+                    <Border BorderThickness="1" BorderBrush="Silver" Padding="5 0 5 5" Margin="5">
+                        <Border.Resources>
+                            <Style TargetType="TextBlock">
+                                <Setter Property="Margin" Value="0 10 0 5"></Setter>
+                            </Style>
+                        </Border.Resources>
+                        <StackPanel>
+                            <TextBlock Text="Material"></TextBlock>
+                            <ComboBox ItemsSource="{Binding EmbroideryMaterials}" SelectedItem="{Binding SelectedEmbroideryMaterial}" DisplayMemberPath="Name" Margin="5 0"></ComboBox>
+
+                            <TextBlock Text="Material Thickness"></TextBlock>
+                            <mahApps:NumericUpDown Minimum="0" Maximum="100" StringFormat="# mm" Value="{Binding EmbroideryMaterialThickness}" HasDecimals="False" HorizontalContentAlignment="Center" />
+
+                            <Grid Margin="0 20 0 5">
+                                <TextBlock Text="Stabilizer" Margin="0" HorizontalAlignment="Left"></TextBlock>
+                                <ToggleButton HorizontalAlignment="Right" IsChecked="{Binding HasStabilizer}"></ToggleButton>
+                            </Grid>
+                            <ComboBox IsEnabled="{Binding HasStabilizer}" ItemsSource="{Binding EmbroideryMaterials}" SelectedItem="{Binding SelectedStabilizer}" DisplayMemberPath="Name" Margin="5 0"></ComboBox>
+
+                            <TextBlock Text="Stabilizer Thickness"></TextBlock>
+                            <mahApps:NumericUpDown IsEnabled="{Binding HasStabilizer}" Minimum="1" Maximum="100" StringFormat="# mm" Value="{Binding StabilizerThickness}" HasDecimals="False" HorizontalContentAlignment="Center" />
+                        </StackPanel>
+                    </Border>
                 </StackPanel>
 
                 <Rectangle HorizontalAlignment="Left" Stroke="Silver" />
-- 
cgit v1.3.1