From bc2d3eb5ec8c7176627dcb8f5c02cc085b2db584 Mon Sep 17 00:00:00 2001
From: Roy <roy.mail.net@gmail.com>
Date: Sat, 20 Jan 2018 21:30:53 +0200
Subject: Implemented new CATS. Implemented Process Parameters View on DB
 Module. Implemented RML Process Parameters View on DB Module. Modified DB
 Module table initials letter casing. Moved observables generator to CLI.

---
 .../ViewModels/MachineVersionDialogVM.cs                    | 10 ++--------
 .../Views/MachineVersionDialog.xaml                         | 13 ++-----------
 2 files changed, 4 insertions(+), 19 deletions(-)

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

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MachineVersionDialogVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MachineVersionDialogVM.cs
index 6854472f1..3776a5e91 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MachineVersionDialogVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MachineVersionDialogVM.cs
@@ -12,7 +12,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
 {
     public class MachineVersionDialogVM : DialogViewVM
     {
-        public MachineVersionsProvider VersionsProvider { get; set; }
+        public ObservablesEntitiesAdapter Adapter { get; set; }
 
         public double Version { get; set; }
 
@@ -44,16 +44,10 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
 
         public MachineVersionDialogVM()
         {
-            VersionsProvider = new MachineVersionsProvider();
+            Adapter = ObservablesEntitiesAdapter.Instance;
             AcceptCommand = new RelayCommand(() => 
             {
-                if (SelectedVersion == null)
-                {
-                    Version = double.Parse(VersionsProvider.Text);
-                }
-
                 Accept();
-
             });
             CancelCommand = new RelayCommand(Cancel);
         }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineVersionDialog.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineVersionDialog.xaml
index 60aebef7f..f6c39a6cd 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineVersionDialog.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineVersionDialog.xaml
@@ -36,18 +36,9 @@
                 </Grid.RowDefinitions>
 
                 <Grid>
-                    <StackPanel HorizontalAlignment="Left" Margin="10">
+                    <StackPanel Margin="10">
                         <TextBlock>Version</TextBlock>
-                        <autoComplete:AutoCompleteTextBox Margin="0 5 0 0" Width="200" materialDesign:HintAssist.Hint="Selected version" DisplayMember="Version" Provider="{Binding VersionsProvider}" SelectedItem="{Binding SelectedVersion,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
-                                <autoComplete:AutoCompleteTextBox.ItemTemplate>
-                                    <DataTemplate>
-                                        <TextBlock><Run Text="{Binding Name}"></Run><Run>,</Run><Run Text="{Binding Version}"></Run></TextBlock>
-                                    </DataTemplate>
-                                </autoComplete:AutoCompleteTextBox.ItemTemplate>
-                                <autoComplete:AutoCompleteTextBox.LoadingContent>
-                                    <TextBlock Text="Loading..." Margin="5" FontSize="14" />
-                                </autoComplete:AutoCompleteTextBox.LoadingContent>
-                            </autoComplete:AutoCompleteTextBox>
+                        <ComboBox ItemsSource="{Binding Adapter.MachineVersions}" Text="{Binding Version}" DisplayMemberPath="Version" SelectedItem="{Binding SelectedVersion}" IsEditable="True" materialDesign:HintAssist.Hint="Select or enter a new version name"></ComboBox>
                         <TextBlock Margin="0 10 0 0">Name</TextBlock>
                         <TextBox materialDesign:HintAssist.Hint="Version name" Text="{Binding VersionName}">
                             <TextBox.Style>
-- 
cgit v1.3.1