From 297ec486e7fea093acbde7726329371e15f28fde Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Thu, 6 Dec 2018 10:28:43 +0200 Subject: Machine Studio v3.5.78 Added thread motion speed control. --- .../Build/Shortcuts/Machine Emulator.lnk | Bin 1445 -> 1471 bytes .../Build/Shortcuts/Machine Studio.lnk | Bin 1516 -> 1532 bytes .../Build/Shortcuts/Proto Compiler GUI.lnk | Bin 1444 -> 1464 bytes .../Build/Shortcuts/Stubs Execution GUI.lnk | Bin 1322 -> 1462 bytes .../Build/Shortcuts/Transport Router.lnk | Bin 1353 -> 1493 bytes .../Editors/DispenserElementEditor.xaml | 2 +- .../Editors/MotorElementEditor.xaml | 2 +- .../Editors/ThreadMotionElementEditor.xaml | 76 +++++++++------------ .../Images/thread-motion.gif | Bin 0 -> 392831 bytes .../Tango.MachineStudio.Technician.csproj | 5 +- .../ViewModels/MachineTechViewVM.cs | 9 +-- .../Properties/AssemblyInfo.cs | 2 +- .../Tango.PMR/Diagnostics/ThreadJoggingRequest.cs | 38 ++--------- Software/Visual_Studio/Versioning/ChangeLog.txt | 9 ++- 14 files changed, 53 insertions(+), 90 deletions(-) create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Images/thread-motion.gif (limited to 'Software/Visual_Studio') diff --git a/Software/Visual_Studio/Build/Shortcuts/Machine Emulator.lnk b/Software/Visual_Studio/Build/Shortcuts/Machine Emulator.lnk index 5a116e8cc..e1c5dad34 100644 Binary files a/Software/Visual_Studio/Build/Shortcuts/Machine Emulator.lnk and b/Software/Visual_Studio/Build/Shortcuts/Machine Emulator.lnk differ diff --git a/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk b/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk index b8895c8ca..c7966c7a9 100644 Binary files a/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk and b/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk differ diff --git a/Software/Visual_Studio/Build/Shortcuts/Proto Compiler GUI.lnk b/Software/Visual_Studio/Build/Shortcuts/Proto Compiler GUI.lnk index 35e3748c5..3fb2d2136 100644 Binary files a/Software/Visual_Studio/Build/Shortcuts/Proto Compiler GUI.lnk and b/Software/Visual_Studio/Build/Shortcuts/Proto Compiler GUI.lnk differ diff --git a/Software/Visual_Studio/Build/Shortcuts/Stubs Execution GUI.lnk b/Software/Visual_Studio/Build/Shortcuts/Stubs Execution GUI.lnk index fd20869c1..8da1d6aa3 100644 Binary files a/Software/Visual_Studio/Build/Shortcuts/Stubs Execution GUI.lnk and b/Software/Visual_Studio/Build/Shortcuts/Stubs Execution GUI.lnk differ diff --git a/Software/Visual_Studio/Build/Shortcuts/Transport Router.lnk b/Software/Visual_Studio/Build/Shortcuts/Transport Router.lnk index fd8e11d3f..51ce1a265 100644 Binary files a/Software/Visual_Studio/Build/Shortcuts/Transport Router.lnk and b/Software/Visual_Studio/Build/Shortcuts/Transport Router.lnk differ diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DispenserElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DispenserElementEditor.xaml index 50b4a358a..96f966d20 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DispenserElementEditor.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DispenserElementEditor.xaml @@ -171,7 +171,7 @@ - + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MotorElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MotorElementEditor.xaml index 16253937f..ecfea2f28 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MotorElementEditor.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MotorElementEditor.xaml @@ -155,7 +155,7 @@ - + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ThreadMotionElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ThreadMotionElementEditor.xaml index 51de5dc95..3a7c7d53d 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ThreadMotionElementEditor.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ThreadMotionElementEditor.xaml @@ -4,6 +4,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" + xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls" xmlns:items="clr-namespace:Tango.MachineStudio.Technician.TechItems" xmlns:sharedConverters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI" xmlns:converters="clr-namespace:Tango.Editors.Converters;assembly=Tango.Editors" @@ -21,17 +22,6 @@ - - - - - - - - - @@ -47,40 +37,42 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + - - - - - - - - - + + + + + + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Images/thread-motion.gif b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Images/thread-motion.gif new file mode 100644 index 000000000..7a94536a2 Binary files /dev/null and b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Images/thread-motion.gif differ diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Tango.MachineStudio.Technician.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Tango.MachineStudio.Technician.csproj index 4cb8c5cee..9de8dd5d8 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Tango.MachineStudio.Technician.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Tango.MachineStudio.Technician.csproj @@ -722,10 +722,13 @@ + + + - + \ No newline at end of file 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 605ab8105..adf85516e 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 @@ -1553,14 +1553,7 @@ namespace Tango.MachineStudio.Technician.ViewModels { await MachineOperator.StartThreadJogging(new ThreadJoggingRequest() { - Direction = MotorDirection.Forward, - }); - } - else if (action == MotorActionType.BackwardPressed) - { - await MachineOperator.StartThreadJogging(new ThreadJoggingRequest() - { - Direction = MotorDirection.Backward, + Speed = item.Speed, }); } else if (action == MotorActionType.ForwardReleased || action == MotorActionType.BackwardReleased) 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 8f111100e..701fd50b9 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("3.5.77.18305")] +[assembly: AssemblyVersion("3.5.78.18305")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.PMR/Diagnostics/ThreadJoggingRequest.cs b/Software/Visual_Studio/Tango.PMR/Diagnostics/ThreadJoggingRequest.cs index 34d9e4bec..a320c6885 100644 --- a/Software/Visual_Studio/Tango.PMR/Diagnostics/ThreadJoggingRequest.cs +++ b/Software/Visual_Studio/Tango.PMR/Diagnostics/ThreadJoggingRequest.cs @@ -23,14 +23,12 @@ namespace Tango.PMR.Diagnostics { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "ChpUaHJlYWRKb2dnaW5nUmVxdWVzdC5wcm90bxIVVGFuZ28uUE1SLkRpYWdu", - "b3N0aWNzGhRNb3RvckRpcmVjdGlvbi5wcm90byJfChRUaHJlYWRKb2dnaW5n", - "UmVxdWVzdBI4CglEaXJlY3Rpb24YASABKA4yJS5UYW5nby5QTVIuRGlhZ25v", - "c3RpY3MuTW90b3JEaXJlY3Rpb24SDQoFU3BlZWQYAyABKAFCIQofY29tLnR3", - "aW5lLnRhbmdvLnBtci5kaWFnbm9zdGljc2IGcHJvdG8z")); + "b3N0aWNzIiUKFFRocmVhZEpvZ2dpbmdSZXF1ZXN0Eg0KBVNwZWVkGAMgASgB", + "QiEKH2NvbS50d2luZS50YW5nby5wbXIuZGlhZ25vc3RpY3NiBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::Tango.PMR.Diagnostics.MotorDirectionReflection.Descriptor, }, + new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Diagnostics.ThreadJoggingRequest), global::Tango.PMR.Diagnostics.ThreadJoggingRequest.Parser, new[]{ "Direction", "Speed" }, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Diagnostics.ThreadJoggingRequest), global::Tango.PMR.Diagnostics.ThreadJoggingRequest.Parser, new[]{ "Speed" }, null, null, null) })); } #endregion @@ -61,7 +59,6 @@ namespace Tango.PMR.Diagnostics { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public ThreadJoggingRequest(ThreadJoggingRequest other) : this() { - direction_ = other.direction_; speed_ = other.speed_; } @@ -70,17 +67,6 @@ namespace Tango.PMR.Diagnostics { return new ThreadJoggingRequest(this); } - /// Field number for the "Direction" field. - public const int DirectionFieldNumber = 1; - private global::Tango.PMR.Diagnostics.MotorDirection direction_ = 0; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public global::Tango.PMR.Diagnostics.MotorDirection Direction { - get { return direction_; } - set { - direction_ = value; - } - } - /// Field number for the "Speed" field. public const int SpeedFieldNumber = 3; private double speed_; @@ -105,7 +91,6 @@ namespace Tango.PMR.Diagnostics { if (ReferenceEquals(other, this)) { return true; } - if (Direction != other.Direction) return false; if (Speed != other.Speed) return false; return true; } @@ -113,7 +98,6 @@ namespace Tango.PMR.Diagnostics { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override int GetHashCode() { int hash = 1; - if (Direction != 0) hash ^= Direction.GetHashCode(); if (Speed != 0D) hash ^= Speed.GetHashCode(); return hash; } @@ -125,10 +109,6 @@ namespace Tango.PMR.Diagnostics { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public void WriteTo(pb::CodedOutputStream output) { - if (Direction != 0) { - output.WriteRawTag(8); - output.WriteEnum((int) Direction); - } if (Speed != 0D) { output.WriteRawTag(25); output.WriteDouble(Speed); @@ -138,9 +118,6 @@ namespace Tango.PMR.Diagnostics { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public int CalculateSize() { int size = 0; - if (Direction != 0) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Direction); - } if (Speed != 0D) { size += 1 + 8; } @@ -152,9 +129,6 @@ namespace Tango.PMR.Diagnostics { if (other == null) { return; } - if (other.Direction != 0) { - Direction = other.Direction; - } if (other.Speed != 0D) { Speed = other.Speed; } @@ -168,10 +142,6 @@ namespace Tango.PMR.Diagnostics { default: input.SkipLastField(); break; - case 8: { - direction_ = (global::Tango.PMR.Diagnostics.MotorDirection) input.ReadEnum(); - break; - } case 25: { Speed = input.ReadDouble(); break; diff --git a/Software/Visual_Studio/Versioning/ChangeLog.txt b/Software/Visual_Studio/Versioning/ChangeLog.txt index 7a01989a7..b253be8b8 100644 --- a/Software/Visual_Studio/Versioning/ChangeLog.txt +++ b/Software/Visual_Studio/Versioning/ChangeLog.txt @@ -1,9 +1,14 @@ # Change log All notable changes to the core libraries will be documented in this file. -## [3.5.77] - 12-95-2018 +## [3.5.77] - 12-05-2018 ### Changed - Statistics module 'Job Failed Reasons' pie chart displays failed message only when hovering. ### Added -- Option to allow BETA updates on 'About View'. \ No newline at end of file +- Option to allow BETA updates on 'About View'. + + +## [3.5.78] - 12-06-2018 +### Changed +- Improved thread motion widget on tech board. \ No newline at end of file -- cgit v1.3.1