aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2018-08-06 13:58:35 +0300
committerShlomo Hecht <shlomo@twine-s.com>2018-08-06 13:58:35 +0300
commit89e5ab941a12f5720d03013ed0c0645161857140 (patch)
tree982740e30bc11dbbcb274c81a0cc3447922647ee /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer
parentcc86f5316bbdea5600dbf0b00e1540a012421b97 (diff)
parenta852f4c2c26fc1068436f8f1ef06693d85102baf (diff)
downloadTango-89e5ab941a12f5720d03013ed0c0645161857140.tar.gz
Tango-89e5ab941a12f5720d03013ed0c0645161857140.zip
merge rockers handling
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer')
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
index 569359066..85480a4b8 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
@@ -979,7 +979,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
if (SelectedGroupHistory != null)
{
LogManager.Log(String.Format("Parameters group {0} selected from history.", SelectedGroupHistory.Name));
- RmlProcessParametersTableGroup = SelectedGroupHistory.CloneGroup();
+ RmlProcessParametersTableGroup = SelectedGroupHistory.Clone();
}
}
@@ -1329,7 +1329,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
if (RmlProcessParametersTableGroup != null)
{
- RmlProcessParametersTableGroup = RmlProcessParametersTableGroup.CloneGroup();
+ RmlProcessParametersTableGroup = RmlProcessParametersTableGroup.Clone();
RmlProcessParametersTableGroup.ProcessParametersTables = RmlProcessParametersTableGroup.ProcessParametersTables.OrderBy(x => x.TableIndex).ToObservableCollection();
}
@@ -1385,7 +1385,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
foreach (var table in RmlProcessParametersTableGroup.ProcessParametersTables)
{
- var newTable = table.CloneEntity();
+ var newTable = table.Clone();
newTable.TableIndex = index++;
newTable.ProcessParametersTablesGroup = group;
tables.Add(newTable);