From c3cacd847c2b2577ef5d815963d1d8f2b557c8ac Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Mon, 19 Aug 2019 19:02:58 +0300 Subject: PPC Graphic changes --- .../Modules/Tango.MachineStudio.Developer/Views/JobView.xaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio') 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 54a3b72a9..6b1156ece 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 @@ -621,7 +621,7 @@ Winding Method - + @@ -631,7 +631,7 @@ Spool - + @@ -753,7 +753,7 @@ MEDIA - + -- cgit v1.3.1 From e3964d5fa3e86408e00556c020d6d2f5b261e6f8 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Tue, 20 Aug 2019 12:06:56 +0300 Subject: Fixed issue with ValveTechItem loading. --- .../Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Software/Visual_Studio/MachineStudio') diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs index 1a1832120..8eb792f0d 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs @@ -869,7 +869,8 @@ namespace Tango.MachineStudio.Technician.ViewModels else if (item is ValveItem) { (item as ValveItem).TechValve = Adapter.TechValves.FirstOrDefault(x => x.Guid == item.ItemGuid); - CreateElement(item); + var editor = CreateElement(item); + InitTechValveItem(editor.ValveItem); } else if (item is MeterItem) { -- cgit v1.3.1 From 06e3100b305ba934b75b3da2ee54ccba8fb087a2 Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Thu, 22 Aug 2019 11:55:35 +0300 Subject: MachineStudio. Changed Foreground of "Start job" to white --- .../Modules/Tango.MachineStudio.Developer/Views/JobView.xaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio') 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 6b1156ece..861a639d3 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 @@ -1260,7 +1260,7 @@ -- cgit v1.3.1 From e3d237fb089078315149ab02fa8450522d9cc6d1 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Tue, 27 Aug 2019 12:01:18 +0300 Subject: Machine Studio 4.0.24 PPC 1.0.42 --- .../Machine Studio Installer.aip | 287 +-------------------- .../Advanced Installer Projects/PPC Installer.aip | 6 +- .../Tango.MachineStudio.UI/MainWindow.xaml.cs | 5 +- .../Properties/AssemblyInfo.cs | 2 +- .../PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs | 2 +- .../Visual_Studio/PPC/Tango.PPC.UI/app.manifest | 2 +- .../Tango.Integration/Operation/MachineOperator.cs | 2 + 7 files changed, 19 insertions(+), 287 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio') diff --git a/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip index 8ef61ebef..1f483b1d9 100644 --- a/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip +++ b/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip @@ -15,10 +15,10 @@ - + - + @@ -41,22 +41,9 @@ - - - - - - - - - - - - - @@ -101,149 +88,19 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -478,7 +335,7 @@ - + @@ -531,7 +388,7 @@ - + @@ -555,49 +412,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -606,111 +424,20 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -913,7 +640,7 @@ - + @@ -992,7 +719,7 @@ - + @@ -1077,7 +804,7 @@ - + diff --git a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip index 78ed8ac3e..ae6d6aac2 100644 --- a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip +++ b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip @@ -18,10 +18,10 @@ - + - + @@ -427,7 +427,7 @@ - + diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml.cs index e9e1ca979..4c5e2b9a6 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml.cs @@ -97,7 +97,7 @@ namespace Tango.MachineStudio.UI double ratio = scr_width / scr_height; - List ratios = new List() { 16d / 9d, 16d / 10d, 4d / 3d }; + List ratios = new List() { 16d / 9d, 16d / 10d, 4d / 3d, 1366 / 768 }; ratio = ratios.Closest(ratio); switch (ratio) @@ -111,6 +111,9 @@ namespace Tango.MachineStudio.UI case 4d / 3d: grid.Height = 1280; break; + case 1366d / 768d: + grid.Height = 1100; + break; default: grid.Height = 1145; break; diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs index fc465cbe4..958ce2ce2 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs @@ -4,5 +4,5 @@ using System.Runtime.InteropServices; [assembly: System.Windows.ThemeInfo(System.Windows.ResourceDictionaryLocation.None, System.Windows.ResourceDictionaryLocation.SourceAssembly)] [assembly: AssemblyTitle("Tango - Machine Studio")] -[assembly: AssemblyVersion("4.0.23.0")] +[assembly: AssemblyVersion("4.0.25.0")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs index 8d7de3537..f0fc43864 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs @@ -8,4 +8,4 @@ using System.Windows; // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("Tango PPC Application")] -[assembly: AssemblyVersion("1.0.40.0")] +[assembly: AssemblyVersion("1.0.42.0")] diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest index efc5f8179..d72e75011 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest @@ -16,7 +16,7 @@ Remove this element if your application requires this virtualization for backwards compatibility. --> - + diff --git a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs index 74053ab63..79e62e097 100644 --- a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs +++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs @@ -645,6 +645,8 @@ namespace Tango.Integration.Operation /// if set to true [value]. protected virtual async void OnEnableMachineStatusUpdatesChanged(bool value) { + return; //TODO: Remove this when Shlomo Solves the bug. + if (value && State == TransportComponentState.Connected && !_machineStatusSent) { var request = new StartMachineStatusUpdateRequest(); -- cgit v1.3.1