From 485f8da4b55ae19f0a21792314ae2b096d48dab4 Mon Sep 17 00:00:00 2001
From: Roy <roy.mail.net@gmail.com>
Date: Sun, 4 Mar 2018 02:26:30 +0200
Subject: Implemented Embroidery Editor. Implemented Create job from embroidery
 file.

---
 .../Views/EmbroideryImportView.xaml                | 59 ++++++++++++++++++++++
 .../Views/EmbroideryImportView.xaml.cs             | 28 ++++++++++
 .../Views/JobView.xaml                             |  8 +--
 .../Views/JobView.xaml.cs                          |  2 +
 .../Views/MachineJobSelectionView.xaml             | 12 ++++-
 5 files changed, 103 insertions(+), 6 deletions(-)
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/EmbroideryImportView.xaml
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/EmbroideryImportView.xaml.cs

(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
new file mode 100644
index 000000000..220e7d3ab
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/EmbroideryImportView.xaml
@@ -0,0 +1,59 @@
+<UserControl x:Class="Tango.MachineStudio.Developer.Views.EmbroideryImportView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:emb="clr-namespace:Tango.EmbroideryUI;assembly=Tango.EmbroideryUI"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:vm="clr-namespace:Tango.MachineStudio.Developer.ViewModels"
+             xmlns:brushPicker="clr-namespace:Tango.BrushPicker;assembly=Tango.BrushPicker"
+             xmlns:local="clr-namespace:Tango.MachineStudio.Developer.Views"
+             mc:Ignorable="d" 
+             Height="720" Width="1280" Background="White" d:DataContext="{d:DesignInstance Type=vm:EmbroideryImportViewVM, IsDesignTimeCreatable=False}">
+    <Grid>
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="250"/>
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="60"/>
+                <RowDefinition Height="593*"/>
+                <RowDefinition Height="60"/>
+            </Grid.RowDefinitions>
+
+            <Grid>
+                <StackPanel Orientation="Horizontal">
+                    <Image Source="../Images/sewing-machine.png" Width="48"></Image>
+                    <TextBlock VerticalAlignment="Center" Margin="10 0 0 0" FontSize="20">Import Embroidery File</TextBlock>
+                </StackPanel>
+            </Grid>
+
+            <Grid Grid.ColumnSpan="2">
+                <Rectangle VerticalAlignment="Bottom" Stroke="Silver"></Rectangle>
+            </Grid>
+
+            <Grid Grid.Row="1">
+                <emb:EmbroideryFileEditor x:Name="editor" Background="White" FileName="{Binding FileName}" EmbroideryFile="{Binding EmbroideryFile,Mode=OneWayToSource}" Paths="{Binding Paths,Mode=OneWayToSource}" />
+            </Grid>
+
+            <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}" />
+                </StackPanel>
+
+                <Rectangle HorizontalAlignment="Left" Stroke="Silver" />
+            </Grid>
+
+            <Grid Grid.Row="2" Grid.Column="1">
+                <Button Height="50" Command="{Binding ImportCommand}">
+                    <StackPanel Orientation="Horizontal">
+                        <materialDesign:PackIcon Kind="Import" Width="24" Height="24" />
+                        <TextBlock Margin="5 0 0 0" FontSize="16">IMPORT</TextBlock>
+                    </StackPanel>
+                </Button>
+            </Grid>
+        </Grid>
+    </Grid>
+</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/EmbroideryImportView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/EmbroideryImportView.xaml.cs
new file mode 100644
index 000000000..c34b6fef7
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/EmbroideryImportView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Tango.MachineStudio.Developer.Views
+{
+    /// <summary>
+    /// Interaction logic for EmbroideryImportDialog.xaml
+    /// </summary>
+    public partial class EmbroideryImportView : UserControl
+    {
+        public EmbroideryImportView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
index 49444750f..9ba41f688 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
@@ -377,7 +377,7 @@
                                                 <ComboBox.ToolTip>
                                                     <TextBlock>
                                                             <Run Text="{Binding ActiveJob.SpoolType.Name}"></Run>
-                                                            <Run FontSize="9" Foreground="#D9D9D9" Text="{Binding ActiveJob.SpoolType.Length}"></Run>
+                                                            <Run FontSize="9" Foreground="#D9D9D9" Text="{Binding ActiveJob.SpoolType.Length,Mode=OneWay}"></Run>
                                                             <Run FontSize="9" Foreground="#DEDEDE" Text="m"></Run>
                                                     </TextBlock>
                                                 </ComboBox.ToolTip>
@@ -385,7 +385,7 @@
                                                     <DataTemplate>
                                                         <TextBlock TextTrimming="CharacterEllipsis">
                                                             <Run Text="{Binding Name}"></Run>
-                                                            <Run FontSize="9" Foreground="Gray" Text="{Binding Length}"></Run>
+                                                            <Run FontSize="9" Foreground="Gray" Text="{Binding Length,Mode=OneWay}"></Run>
                                                             <Run FontSize="9" Foreground="Gray" Text="m"></Run>
                                                         </TextBlock>
                                                     </DataTemplate>
@@ -1102,7 +1102,7 @@
 
                                                                 <StackPanel Margin="0 0 0 0" HorizontalAlignment="Center">
                                                                     <TextBlock FontSize="12" HorizontalAlignment="Right" Foreground="Black">
-                                                                                <Run Text="{Binding Length,Mode=OneWay}"></Run>
+                                                                                <Run Text="{Binding Length,Mode=OneWay,StringFormat=N2}"></Run>
                                                                                 <Run Foreground="Gray" FontSize="10" Text="m"></Run>
                                                                     </TextBlock>
                                                                     <materialDesign:PackIcon HorizontalAlignment="Center" RenderTransformOrigin="0.5,0.5" Kind="Triangle" Width="8" Height="8" Foreground="DimGray">
@@ -1128,7 +1128,7 @@
 
                                                 <StackPanel Margin="0 -5 -20 0" HorizontalAlignment="Right">
                                                     <TextBlock FontSize="12" Foreground="Black">
-                                                                                <Run Text="{Binding ActiveJob.Length,Mode=OneWay}"></Run>
+                                                                                <Run Text="{Binding ActiveJob.Length,Mode=OneWay,StringFormat=N2}"></Run>
                                                                                 <Run Foreground="Gray" FontSize="10" Text="m"></Run>
                                                     </TextBlock>
                                                     <materialDesign:PackIcon HorizontalAlignment="Right" RenderTransformOrigin="0.5,0.5" Kind="FlagCheckered" Width="16" Height="16" Foreground="DimGray">
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs
index b2ca55217..905caa96d 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs
@@ -18,6 +18,7 @@ using Tango.DragAndDrop;
 using Tango.BL.Entities;
 using Tango.MachineStudio.Developer.Converters;
 using Tango.MachineStudio.Developer.ViewModels;
+using Tango.BL;
 
 namespace Tango.MachineStudio.Developer.Views
 {
@@ -72,6 +73,7 @@ namespace Tango.MachineStudio.Developer.Views
                             {
                                 new BrushStop()
                                 {
+                                     ColorSpace = new ColorSpace(),
                                      Color = Colors.White,
                                 }
                             },
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml
index 49735d345..2115f2503 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml
@@ -88,6 +88,7 @@
                         </Grid>
 
                         <Grid DockPanel.Dock="Bottom" Margin="0 20 0 0">
+
                             <StackPanel VerticalAlignment="Center" Orientation="Horizontal" HorizontalAlignment="Left" Margin="20 0 0 0">
                                 <Button Margin="0 0 10 0" MinWidth="160" Height="50" Background="#FF7575" BorderBrush="#FF7575" Command="{Binding RemoveJobCommand}">
                                     <StackPanel Orientation="Horizontal">
@@ -174,7 +175,7 @@
                                         <DataGridTemplateColumn.CellTemplate>
                                             <DataTemplate>
                                                 <TextBlock VerticalAlignment="Center" FontSize="14">
-                                                    <Run Text="{Binding Length,Mode=OneWay}"></Run>
+                                                    <Run Text="{Binding Length,Mode=OneWay,StringFormat=N2}"></Run>
                                                     <Run Text="m" Foreground="Gray"></Run>
                                                 </TextBlock>
                                             </DataTemplate>
@@ -197,7 +198,7 @@
                                                         <ItemsControl.ItemsPanel>
                                                             <ItemsPanelTemplate>
                                                                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" MaxWidth="110">
-                                                                    
+
                                                                 </StackPanel>
                                                             </ItemsPanelTemplate>
                                                         </ItemsControl.ItemsPanel>
@@ -235,6 +236,13 @@
                             </controls:MultiSelectDataGrid>
                         </Grid>
                     </DockPanel>
+
+                    <Button Command="{Binding ImportEmbroideryFileCommand}" Margin="20 0 0 -100" Foreground="Black" FontSize="16" VerticalAlignment="Bottom" HorizontalAlignment="Left" Style="{StaticResource emptyButton}" Cursor="Hand">
+                        <StackPanel Orientation="Horizontal">
+                            <Image Source="../Images/sewing-machine.png" Width="32"></Image>
+                            <TextBlock VerticalAlignment="Center" Margin="10 0 0 0" TextDecorations="Underline">Import Embroidery File</TextBlock>
+                        </StackPanel>
+                    </Button>
                 </Grid>
             </Grid>
         </Grid>
-- 
cgit v1.3.1