Merge branch 'eureka' of https://twinetfs.visualstudio.com/Tango/_git/Tango into eureka

6 files changed, 33 insertions, 21 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml
index eb6f50bbe..8730355cc 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml
@@ -106,8 +106,8 @@
                                     <ComboBox ItemsSource="{Binding Conditions}" SelectedItem="{Binding ActiveRML.MediaCondition,Mode=TwoWay}" DisplayMemberPath="Name"></ComboBox>-->
 
                                     
-                                    <TextBlock Text="Linear Density:" Margin="0 40 0 0" ></TextBlock>
-                                    <mahapps:NumericUpDown  Margin="0 40 0 0" Minimum="0" Maximum="9999" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Left" Value="{Binding ActiveRML.FiberSize,Mode=TwoWay}" FontSize="16"></mahapps:NumericUpDown>
+                                    <TextBlock Text="Linear Density:" ></TextBlock>
+                                    <mahapps:NumericUpDown   Minimum="0" Maximum="9999" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Left" Value="{Binding ActiveRML.FiberSize,Mode=TwoWay}" FontSize="16"></mahapps:NumericUpDown>
 
                                     <TextBlock Text="Linear Density Unit:" ></TextBlock>
                                     <ComboBox ItemsSource="{Binding LinearMassDensityUnits}" SelectedItem="{Binding ActiveRML.LinearMassDensityUnit,Mode=TwoWay}" DisplayMemberPath="Name"></ComboBox>
@@ -121,15 +121,10 @@
                                         </ComboBox.ItemTemplate>
                                     </ComboBox>
 
-                                    <TextBlock Text="Filament count per plies:" ></TextBlock>
-                                    <mahapps:NumericUpDown Minimum="0" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Left" Value="{Binding ActiveRML.PliesPerFiber,Mode=TwoWay}"></mahapps:NumericUpDown>
-
                                     <TextBlock Text="Count (den):" ></TextBlock>
                                     <TextBlock Text="{Binding ActiveRML.DencityCount}" Foreground="Blue" ></TextBlock>
 
-                                    <TextBlock Text="Fiber count:" ></TextBlock>
-                                    <TextBlock Text="{Binding ActiveRML.FiberCount}" Foreground="Blue" ></TextBlock>
-
+                                   
                                     <!--<TextBlock Text="Fiber Shape:" ></TextBlock>
                                     <ComboBox ItemsSource="{Binding FiberShapes}" SelectedItem="{Binding ActiveRML.FiberShape,Mode=TwoWay}" DisplayMemberPath="Name"></ComboBox>-->
 
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Converters/LengthToWeightConverter.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Converters/LengthToWeightConverter.cs
index e523ad73e..e36dd3c63 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Converters/LengthToWeightConverter.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Converters/LengthToWeightConverter.cs
@@ -17,8 +17,8 @@ namespace Tango.PPC.Jobs.Converters
             {
                 double length = System.Convert.ToDouble(values[0]);
                 double coef = System.Convert.ToDouble(values[1]);
-                int spools = System.Convert.ToInt32(values[2]);
-                var weight = ((double)length * spools * coef) / (1000);//(g)
+                //int spools = System.Convert.ToInt32(values[2]);
+                var weight = ((double)length * coef) / (1000);//(g)
                 return weight;
             }
             catch (Exception ex)
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobViewVM.cs
index a02005776..14a09fe57 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobViewVM.cs
@@ -271,7 +271,17 @@ namespace Tango.PPC.Jobs.ViewModels
                 }
             }
         }
-        
+
+        private bool _showAdvanced;
+
+        public bool ShowAdvanced
+        {
+            get { return _showAdvanced; }
+            set { _showAdvanced = value;
+            RaisePropertyChangedAuto();}
+        }
+
+
         #endregion
 
         #region Commands
@@ -530,6 +540,7 @@ namespace Tango.PPC.Jobs.ViewModels
 
                 IsFullMode = true;
                 DyeCommand.RaiseCanExecuteChanged();
+                ShowAdvanced = Settings.ShowAdvancedOptions;
             }
             catch (Exception ex)
             {
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobEurekaView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobEurekaView.xaml
index e52433cfb..369544e9f 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobEurekaView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobEurekaView.xaml
@@ -959,7 +959,7 @@
                                 </Grid.RowDefinitions>
                                 <Grid Grid.Row="0">
                                     <DockPanel x:Name="ColorPropertiesPanel" VerticalAlignment="Top" >
-                                        <StackPanel x:Name="AdvansedOptions" DockPanel.Dock="Right" Orientation="Horizontal" VerticalAlignment="Top" Margin="0 5 18 0" Height="55" HorizontalAlignment="Right" Width="Auto">
+                                        <StackPanel x:Name="AdvansedOptions" DockPanel.Dock="Right" Orientation="Horizontal" VerticalAlignment="Top" Margin="0 5 18 0" Height="55" HorizontalAlignment="Right" Width="Auto" Visibility="{Binding ShowAdvanced, Converter={StaticResource BooleanToVisibilityConverter}}">
                                             <TextBlock FontSize="20" VerticalAlignment="Center" >Advanced Options</TextBlock>
                                             <touch:TouchToggleSlider Style="{StaticResource TangoToggleButtonGreenAccent}" Height="28" CornerRadius="14"  HorizontalAlignment="Right" VerticalAlignment="Center" Margin="10 0 0 0" Width="54" IsChecked="{Binding IsBasicMode, Converter={StaticResource BooleanInverseConverter}, Mode=TwoWay}"></touch:TouchToggleSlider>
                                         </StackPanel>
@@ -1204,8 +1204,7 @@
                                                     <MultiBinding Converter="{StaticResource LengthToWeightConverter}" StringFormat="0.##" >
                                                         <Binding Path="JobModel.Length" Mode="OneWay"/>
                                                          <Binding Path="JobModel.GramPerLength" Mode="OneWay"/>
-                                                            <Binding Path="JobModel.NumberSpools" Mode="OneWay"/>
-                                                        </MultiBinding>
+                                                    </MultiBinding>
                                                 </Run.Text>
                                                 </Run>
                                             <Run Text="g" FontWeight="DemiBold"></Run>
@@ -1222,8 +1221,7 @@
                                                         <MultiBinding Converter="{StaticResource LengthToWeightConverter}" StringFormat="0.##" >
                                                             <Binding Path="JobModel.LengthIncludingNumberOfUnitsAndSpools" Mode="OneWay"/>
                                                              <Binding Path="JobModel.GramPerLength" Mode="OneWay"/>
-                                                                <Binding Path="JobModel.NumberSpools" Mode="OneWay"/>
-                                                            </MultiBinding>
+                                                        </MultiBinding>
                                                     </Run.Text>
                                                     </Run>
                                              <Run Text="g" FontWeight="DemiBold"></Run> 
@@ -1267,8 +1265,7 @@
                                                 <MultiBinding Converter="{StaticResource LengthToWeightConverter}" StringFormat="0.##" >
                                                     <Binding Path="JobModel.Length" Mode="OneWay"/>
                                                      <Binding Path="JobModel.GramPerLength" Mode="OneWay"/>
-                                                        <Binding Path="JobModel.NumberSpools" Mode="OneWay"/>
-                                                    </MultiBinding>
+                                                </MultiBinding>
                                             </Run.Text>
                                             </Run>
                                         <Run Text="g" FontWeight="DemiBold"></Run>
@@ -1289,8 +1286,7 @@
                                                 <MultiBinding Converter="{StaticResource LengthToWeightConverter}" StringFormat="0.##" >
                                                     <Binding Path="JobModel.LengthIncludingNumberOfUnitsAndSpools" Mode="OneWay"/>
                                                      <Binding Path="JobModel.GramPerLength" Mode="OneWay"/>
-                                                        <Binding Path="JobModel.NumberSpools" Mode="OneWay"/>
-                                                    </MultiBinding>
+                                                </MultiBinding>
                                             </Run.Text>
                                             </Run>
                                         <Run Text="g" FontWeight="DemiBold"></Run>
@@ -1318,7 +1314,6 @@
                                                 <MultiBinding Converter="{StaticResource LengthToWeightConverter}" StringFormat="0.##" >
                                                     <Binding Path="JobModel.LengthIncludingNumberOfUnits" Mode="OneWay"/>
                                                      <Binding Path="JobModel.GramPerLength" Mode="OneWay"/>
-                                                        <Binding Path="JobModel.NumberSpools" Mode="OneWay"/>
                                                     </MultiBinding>
                                             </Run.Text>
                                             </Run>
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Views/MainView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Views/MainView.xaml
index 2a7d968aa..6475869dd 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Views/MainView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Views/MainView.xaml
@@ -460,6 +460,11 @@
                                             <touch:TouchNumericTextBox Minimum="0" Maximum="10" KeyboardContainer="{Binding ElementName=Container}" Value="{Binding Settings.FineTuningMinLimitdL}" Margin="0 0 100 0" DockPanel.Dock="Right" HorizontalAlignment="Right" Width="90" HasDecimalPoint="True"></touch:TouchNumericTextBox>
                                         </DockPanel>
 
+                                        <DockPanel Margin="0 20 0 0" TextElement.FontSize="{StaticResource TangoDefaultFontSize}">
+                                            <TextBlock VerticalAlignment="Center">Show advanced options (Multi-segments &amp; Gradients) in the Job Editor</TextBlock>
+                                            <touch:TouchToggleSlider IsChecked="{Binding Settings.ShowAdvancedOptions}" Margin="0 0 100 0" DockPanel.Dock="Right" Style="{StaticResource TangoToggleButtonGrayAccent}" HorizontalAlignment="Right" Width="90"></touch:TouchToggleSlider>
+                                        </DockPanel>
+
                                         <DockPanel Margin="0 20 0 0">
                                             <touch:TouchIcon VerticalAlignment="Top" Icon="InformationOutline" Foreground="{StaticResource TangoGrayTextBrush}"></touch:TouchIcon>
                                             <TextBlock Margin="10 0 0 0" VerticalAlignment="Top" TextWrapping="Wrap" FontSize="{StaticResource TangoSmallFontSize}" Foreground="{StaticResource TangoGrayTextBrush}">
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs
index 8a5c04588..41e103ca0 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs
@@ -355,6 +355,11 @@ namespace Tango.PPC.Common
         public double FineTuningMinLimitdL { get; set; }
 
         /// <summary>
+        /// Gets or sets a value indicating whether [show advanced options].
+        /// </summary>
+        public bool ShowAdvancedOptions { get; set; }
+
+        /// <summary>
         /// Gets or sets a value indicating whether to force full screen mode on TwineX4.
         /// </summary>
         public bool ForceTouchMode { get; set; }
@@ -433,6 +438,7 @@ namespace Tango.PPC.Common
             ScreenSaverStartDuration = 5;
             EnableScreenSaver = true;
             EnableRemoteJobUpload = true;
+            ShowAdvancedOptions = false;
         }
     }
 }