From e72e9dd78e3cb3bb97d3a846d0fe8db4f5a42c4d Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Tue, 7 Aug 2018 12:42:14 +0300 Subject: 1. Top priority: When stopping job (stop button), the system cannot run again (notes it is still printing). Disconnectconnect solves 2. Dispenser manual control (tech bord) a. Add Color and name to the dispenser controller at the tech-bord b. Homing dosnt work on the tech-bord controller c. When moving the courser from the icon while still pushing and then removing the finger, the motor still running d. Limit sw are not activated in manual dispenser jogging 3. Read dispenser pressure manually separately for each dispenser 4. High priority: Dispenser pressure is presented in PSI (that’s what written..) ?? I am not sure that the formula is correct even for PSI.. 5. TI is calculated in the job by factor and not by min uptake (factor for TI is meaningless) 6. Top priority: TI dispensing amounts are constant: Changing TI amounts by factor did not change the total amount of dispensing (tested by flow sensor) 7. I would like to monitor (tech bord) the RPM or pulse rate of all possible motors (priority: thread system, dispensers, others) 8. I would like to monitor (tech bord) the status of the 3Wvalves of the dispensers (open / close) 9. Top priority: Cannot read head temperatures MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/Tango.MachineStudio.Developer/Views/JobView.xaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer') 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 6d10e910e..1b96b27ce 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 @@ -753,7 +753,11 @@ Total: - + % + ( + + nl + ) @@ -1000,7 +1004,7 @@ - + -- cgit v1.3.1 From 3ca51b9d488881112895fbf5a42025a81b9eec6e Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Tue, 7 Aug 2018 13:49:32 +0300 Subject: Machine Studio 2.5 --- Software/DB/Tango.mdf | Bin 75497472 -> 75497472 bytes Software/DB/Tango_log.ldf | Bin 1835008 -> 1835008 bytes .../Messages/Diagnostics/DiagnosticsMonitors.proto | 24 +++ .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Tango.BL/Enumerations/TechMonitors.cs | 48 +++++ .../Tango.BL/Properties/AssemblyInfo.cs | 2 +- .../Tango.Integration/Properties/AssemblyInfo.cs | 2 +- .../Tango.PMR/Diagnostics/DiagnosticsMonitors.cs | 205 ++++++++++++++++++++- .../Tango.PMR/Properties/AssemblyInfo.cs | 2 +- .../Tango.SharedUI/Properties/AssemblyInfo.cs | 2 +- .../Tango.TFS/Properties/AssemblyInfo.cs | 2 +- .../Tango.Transport/Properties/AssemblyInfo.cs | 2 +- .../Tango.UnitTesting/Properties/AssemblyInfo.cs | 2 +- .../Tango.ILMerge.UI/Properties/AssemblyInfo.cs | 2 +- .../Tango.UITests/Properties/AssemblyInfo.cs | 2 +- 19 files changed, 287 insertions(+), 18 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer') diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf index d4902fb8d..9717b66a2 100644 Binary files a/Software/DB/Tango.mdf and b/Software/DB/Tango.mdf differ diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf index 1f424711b..d5ea8672a 100644 Binary files a/Software/DB/Tango_log.ldf and b/Software/DB/Tango_log.ldf differ diff --git a/Software/PMR/Messages/Diagnostics/DiagnosticsMonitors.proto b/Software/PMR/Messages/Diagnostics/DiagnosticsMonitors.proto index 65e5ebea5..9d33c4261 100644 --- a/Software/PMR/Messages/Diagnostics/DiagnosticsMonitors.proto +++ b/Software/PMR/Messages/Diagnostics/DiagnosticsMonitors.proto @@ -138,4 +138,28 @@ message DiagnosticsMonitors //Blower Voltage (Min = 0, Max = 100, PPF = 10) repeated double BlowerVoltage = 40; + //Dispenser 1 Pressure (Min = 0, Max = 100, PPF = 1) + repeated double Dispenser1Pressure = 41; + + //Dispenser 2 Pressure (Min = 0, Max = 100, PPF = 1) + repeated double Dispenser2Pressure = 42; + + //Dispenser 3 Pressure (Min = 0, Max = 100, PPF = 1) + repeated double Dispenser3Pressure = 43; + + //Dispenser 4 Pressure (Min = 0, Max = 100, PPF = 1) + repeated double Dispenser4Pressure = 44; + + //Dispenser 5 Pressure (Min = 0, Max = 100, PPF = 1) + repeated double Dispenser5Pressure = 45; + + //Dispenser 6 Pressure (Min = 0, Max = 100, PPF = 1) + repeated double Dispenser6Pressure = 46; + + //Dispenser 7 Pressure (Min = 0, Max = 100, PPF = 1) + repeated double Dispenser7Pressure = 47; + + //Dispenser 8 Pressure (Min = 0, Max = 100, PPF = 1) + repeated double Dispenser8Pressure = 48; + } diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Properties/AssemblyInfo.cs index 104fe419e..ed6e7f7c5 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Machine Studio Developer Module")] -[assembly: AssemblyVersion("2.0.12.1347")] +[assembly: AssemblyVersion("2.0.13.1242")] [assembly: ComVisible(false)] diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Properties/AssemblyInfo.cs index 0b487828b..88127ec79 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Machine Studio Logging Module")] -[assembly: AssemblyVersion("2.0.13.1537")] +[assembly: AssemblyVersion("2.0.14.1242")] [assembly: ComVisible(false)] diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Properties/AssemblyInfo.cs index 0a28fdd26..0aa7f5e3f 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Machine Studio Technician Module")] -[assembly: AssemblyVersion("2.0.10.1347")] +[assembly: AssemblyVersion("2.0.11.1242")] [assembly: ComVisible(false)] diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Properties/AssemblyInfo.cs index 922153823..4991bfb2c 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Machine Studio Common Components")] -[assembly: AssemblyVersion("2.0.21.1537")] +[assembly: AssemblyVersion("2.0.22.1242")] [assembly: ComVisible(false)] [assembly:ThemeInfo( 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 ea359e8bb..e1815066b 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("2.4.18.18218")] +[assembly: AssemblyVersion("2.5.19.18219")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/TechMonitors.cs b/Software/Visual_Studio/Tango.BL/Enumerations/TechMonitors.cs index fb41986a8..5f9bbb761 100644 --- a/Software/Visual_Studio/Tango.BL/Enumerations/TechMonitors.cs +++ b/Software/Visual_Studio/Tango.BL/Enumerations/TechMonitors.cs @@ -55,48 +55,96 @@ namespace Tango.BL.Enumerations [Description("Dispenser 1 Motor Frequency")] Dispenser1MotorFrequency = 28, + /// + /// (Dispenser 1 Pressure) + /// + [Description("Dispenser 1 Pressure")] + Dispenser1Pressure = 40, + /// /// (Dispenser 2 Motor Frequency) /// [Description("Dispenser 2 Motor Frequency")] Dispenser2MotorFrequency = 29, + /// + /// (Dispenser 2 Pressure) + /// + [Description("Dispenser 2 Pressure")] + Dispenser2Pressure = 41, + /// /// (Dispenser 3 Motor Frequency) /// [Description("Dispenser 3 Motor Frequency")] Dispenser3MotorFrequency = 30, + /// + /// (Dispenser 3 Pressure) + /// + [Description("Dispenser 3 Pressure")] + Dispenser3Pressure = 42, + /// /// (Dispenser 4 Motor Frequency) /// [Description("Dispenser 4 Motor Frequency")] Dispenser4MotorFrequency = 31, + /// + /// (Dispenser 4 Pressure) + /// + [Description("Dispenser 4 Pressure")] + Dispenser4Pressure = 43, + /// /// (Dispenser 5 Motor Frequency) /// [Description("Dispenser 5 Motor Frequency")] Dispenser5MotorFrequency = 32, + /// + /// (Dispenser 5 Pressure) + /// + [Description("Dispenser 5 Pressure")] + Dispenser5Pressure = 44, + /// /// (Dispenser 6 Motor Frequency) /// [Description("Dispenser 6 Motor Frequency")] Dispenser6MotorFrequency = 33, + /// + /// (Dispenser 6 Pressure) + /// + [Description("Dispenser 6 Pressure")] + Dispenser6Pressure = 45, + /// /// (Dispenser 7 Motor Frequency) /// [Description("Dispenser 7 Motor Frequency")] Dispenser7MotorFrequency = 34, + /// + /// (Dispenser 7 Pressure) + /// + [Description("Dispenser 7 Pressure")] + Dispenser7Pressure = 46, + /// /// (Dispenser 8 Motor Frequency) /// [Description("Dispenser 8 Motor Frequency")] Dispenser8MotorFrequency = 35, + /// + /// (Dispenser 8 Pressure) + /// + [Description("Dispenser 8 Pressure")] + Dispenser8Pressure = 47, + /// /// (Dispensers Angular Encoders) /// diff --git a/Software/Visual_Studio/Tango.BL/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.BL/Properties/AssemblyInfo.cs index 37c2815fb..da01d4aef 100644 --- a/Software/Visual_Studio/Tango.BL/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.BL/Properties/AssemblyInfo.cs @@ -4,4 +4,4 @@ using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Business logic components")] [assembly: ComVisible(false)] -[assembly: AssemblyVersion("2.0.26.1537")] \ No newline at end of file +[assembly: AssemblyVersion("2.0.27.1242")] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Integration/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Integration/Properties/AssemblyInfo.cs index 83203f96a..ab2de3d7b 100644 --- a/Software/Visual_Studio/Tango.Integration/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.Integration/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Logging Library")] -[assembly: AssemblyVersion("2.0.23.1537")] +[assembly: AssemblyVersion("2.0.24.1242")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.PMR/Diagnostics/DiagnosticsMonitors.cs b/Software/Visual_Studio/Tango.PMR/Diagnostics/DiagnosticsMonitors.cs index 1a5edab37..81d6c7f62 100644 --- a/Software/Visual_Studio/Tango.PMR/Diagnostics/DiagnosticsMonitors.cs +++ b/Software/Visual_Studio/Tango.PMR/Diagnostics/DiagnosticsMonitors.cs @@ -23,7 +23,7 @@ namespace Tango.PMR.Diagnostics { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "ChlEaWFnbm9zdGljc01vbml0b3JzLnByb3RvEhVUYW5nby5QTVIuRGlhZ25v", - "c3RpY3MaEURvdWJsZUFycmF5LnByb3RvIoUKChNEaWFnbm9zdGljc01vbml0", + "c3RpY3MaEURvdWJsZUFycmF5LnByb3RvIuULChNEaWFnbm9zdGljc01vbml0", "b3JzEhQKDERhbmNlcjFBbmdsZRgBIAMoARIUCgxEYW5jZXIyQW5nbGUYAiAD", "KAESFAoMRGFuY2VyM0FuZ2xlGAMgAygBEhwKFEZlZWRlck1vdG9yRnJlcXVl", "bmN5GAQgAygBEhIKCkRyeWVyTW90b3IYBSADKAESEwoLUG9sbGVyTW90b3IY", @@ -52,12 +52,17 @@ namespace Tango.PMR.Diagnostics { "aXNwZW5zZXI4TW90b3JGcmVxdWVuY3kYJCADKAESHAoUSGVhZFpvbmU0VGVt", "cGVyYXR1cmUYJSADKAESHAoUSGVhZFpvbmU1VGVtcGVyYXR1cmUYJiADKAES", "HAoUSGVhZFpvbmU2VGVtcGVyYXR1cmUYJyADKAESFQoNQmxvd2VyVm9sdGFn", - "ZRgoIAMoAUIhCh9jb20udHdpbmUudGFuZ28ucG1yLmRpYWdub3N0aWNzYgZw", - "cm90bzM=")); + "ZRgoIAMoARIaChJEaXNwZW5zZXIxUHJlc3N1cmUYKSADKAESGgoSRGlzcGVu", + "c2VyMlByZXNzdXJlGCogAygBEhoKEkRpc3BlbnNlcjNQcmVzc3VyZRgrIAMo", + "ARIaChJEaXNwZW5zZXI0UHJlc3N1cmUYLCADKAESGgoSRGlzcGVuc2VyNVBy", + "ZXNzdXJlGC0gAygBEhoKEkRpc3BlbnNlcjZQcmVzc3VyZRguIAMoARIaChJE", + "aXNwZW5zZXI3UHJlc3N1cmUYLyADKAESGgoSRGlzcGVuc2VyOFByZXNzdXJl", + "GDAgAygBQiEKH2NvbS50d2luZS50YW5nby5wbXIuZGlhZ25vc3RpY3NiBnBy", + "b3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { global::Tango.PMR.Diagnostics.DoubleArrayReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Diagnostics.DiagnosticsMonitors), global::Tango.PMR.Diagnostics.DiagnosticsMonitors.Parser, new[]{ "Dancer1Angle", "Dancer2Angle", "Dancer3Angle", "FeederMotorFrequency", "DryerMotor", "PollerMotor", "WinderMotor", "ScrewMotor", "ThreadSpeed", "MixerTemperature", "HeadZone1Temperature", "HeadZone2Temperature", "HeadZone3Temperature", "HeadAirFlow", "FeederTension", "PullerTension", "DryerZone1Temperature", "DryerZone2Temperature", "DryerZone3Temperature", "DryerAirFlow", "WinderTension", "DispensersMotorsFrequency", "DispensersAngularEncoders", "DispensersLinearPositions", "DispensersPressure", "MidTankPressure", "FilterDeltaPressure", "ChillerTemperature", "Dispenser1MotorFrequency", "Dispenser2MotorFrequency", "Dispenser3MotorFrequency", "Dispenser4MotorFrequency", "Dispenser5MotorFrequency", "Dispenser6MotorFrequency", "Dispenser7MotorFrequency", "Dispenser8MotorFrequency", "HeadZone4Temperature", "HeadZone5Temperature", "HeadZone6Temperature", "BlowerVoltage" }, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Diagnostics.DiagnosticsMonitors), global::Tango.PMR.Diagnostics.DiagnosticsMonitors.Parser, new[]{ "Dancer1Angle", "Dancer2Angle", "Dancer3Angle", "FeederMotorFrequency", "DryerMotor", "PollerMotor", "WinderMotor", "ScrewMotor", "ThreadSpeed", "MixerTemperature", "HeadZone1Temperature", "HeadZone2Temperature", "HeadZone3Temperature", "HeadAirFlow", "FeederTension", "PullerTension", "DryerZone1Temperature", "DryerZone2Temperature", "DryerZone3Temperature", "DryerAirFlow", "WinderTension", "DispensersMotorsFrequency", "DispensersAngularEncoders", "DispensersLinearPositions", "DispensersPressure", "MidTankPressure", "FilterDeltaPressure", "ChillerTemperature", "Dispenser1MotorFrequency", "Dispenser2MotorFrequency", "Dispenser3MotorFrequency", "Dispenser4MotorFrequency", "Dispenser5MotorFrequency", "Dispenser6MotorFrequency", "Dispenser7MotorFrequency", "Dispenser8MotorFrequency", "HeadZone4Temperature", "HeadZone5Temperature", "HeadZone6Temperature", "BlowerVoltage", "Dispenser1Pressure", "Dispenser2Pressure", "Dispenser3Pressure", "Dispenser4Pressure", "Dispenser5Pressure", "Dispenser6Pressure", "Dispenser7Pressure", "Dispenser8Pressure" }, null, null, null) })); } #endregion @@ -128,6 +133,14 @@ namespace Tango.PMR.Diagnostics { headZone5Temperature_ = other.headZone5Temperature_.Clone(); headZone6Temperature_ = other.headZone6Temperature_.Clone(); blowerVoltage_ = other.blowerVoltage_.Clone(); + dispenser1Pressure_ = other.dispenser1Pressure_.Clone(); + dispenser2Pressure_ = other.dispenser2Pressure_.Clone(); + dispenser3Pressure_ = other.dispenser3Pressure_.Clone(); + dispenser4Pressure_ = other.dispenser4Pressure_.Clone(); + dispenser5Pressure_ = other.dispenser5Pressure_.Clone(); + dispenser6Pressure_ = other.dispenser6Pressure_.Clone(); + dispenser7Pressure_ = other.dispenser7Pressure_.Clone(); + dispenser8Pressure_ = other.dispenser8Pressure_.Clone(); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -655,6 +668,110 @@ namespace Tango.PMR.Diagnostics { get { return blowerVoltage_; } } + /// Field number for the "Dispenser1Pressure" field. + public const int Dispenser1PressureFieldNumber = 41; + private static readonly pb::FieldCodec _repeated_dispenser1Pressure_codec + = pb::FieldCodec.ForDouble(330); + private readonly pbc::RepeatedField dispenser1Pressure_ = new pbc::RepeatedField(); + /// + ///Dispenser 1 Pressure (Min = 0, Max = 100, PPF = 1) + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public pbc::RepeatedField Dispenser1Pressure { + get { return dispenser1Pressure_; } + } + + /// Field number for the "Dispenser2Pressure" field. + public const int Dispenser2PressureFieldNumber = 42; + private static readonly pb::FieldCodec _repeated_dispenser2Pressure_codec + = pb::FieldCodec.ForDouble(338); + private readonly pbc::RepeatedField dispenser2Pressure_ = new pbc::RepeatedField(); + /// + ///Dispenser 2 Pressure (Min = 0, Max = 100, PPF = 1) + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public pbc::RepeatedField Dispenser2Pressure { + get { return dispenser2Pressure_; } + } + + /// Field number for the "Dispenser3Pressure" field. + public const int Dispenser3PressureFieldNumber = 43; + private static readonly pb::FieldCodec _repeated_dispenser3Pressure_codec + = pb::FieldCodec.ForDouble(346); + private readonly pbc::RepeatedField dispenser3Pressure_ = new pbc::RepeatedField(); + /// + ///Dispenser 3 Pressure (Min = 0, Max = 100, PPF = 1) + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public pbc::RepeatedField Dispenser3Pressure { + get { return dispenser3Pressure_; } + } + + /// Field number for the "Dispenser4Pressure" field. + public const int Dispenser4PressureFieldNumber = 44; + private static readonly pb::FieldCodec _repeated_dispenser4Pressure_codec + = pb::FieldCodec.ForDouble(354); + private readonly pbc::RepeatedField dispenser4Pressure_ = new pbc::RepeatedField(); + /// + ///Dispenser 4 Pressure (Min = 0, Max = 100, PPF = 1) + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public pbc::RepeatedField Dispenser4Pressure { + get { return dispenser4Pressure_; } + } + + /// Field number for the "Dispenser5Pressure" field. + public const int Dispenser5PressureFieldNumber = 45; + private static readonly pb::FieldCodec _repeated_dispenser5Pressure_codec + = pb::FieldCodec.ForDouble(362); + private readonly pbc::RepeatedField dispenser5Pressure_ = new pbc::RepeatedField(); + /// + ///Dispenser 5 Pressure (Min = 0, Max = 100, PPF = 1) + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public pbc::RepeatedField Dispenser5Pressure { + get { return dispenser5Pressure_; } + } + + /// Field number for the "Dispenser6Pressure" field. + public const int Dispenser6PressureFieldNumber = 46; + private static readonly pb::FieldCodec _repeated_dispenser6Pressure_codec + = pb::FieldCodec.ForDouble(370); + private readonly pbc::RepeatedField dispenser6Pressure_ = new pbc::RepeatedField(); + /// + ///Dispenser 6 Pressure (Min = 0, Max = 100, PPF = 1) + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public pbc::RepeatedField Dispenser6Pressure { + get { return dispenser6Pressure_; } + } + + /// Field number for the "Dispenser7Pressure" field. + public const int Dispenser7PressureFieldNumber = 47; + private static readonly pb::FieldCodec _repeated_dispenser7Pressure_codec + = pb::FieldCodec.ForDouble(378); + private readonly pbc::RepeatedField dispenser7Pressure_ = new pbc::RepeatedField(); + /// + ///Dispenser 7 Pressure (Min = 0, Max = 100, PPF = 1) + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public pbc::RepeatedField Dispenser7Pressure { + get { return dispenser7Pressure_; } + } + + /// Field number for the "Dispenser8Pressure" field. + public const int Dispenser8PressureFieldNumber = 48; + private static readonly pb::FieldCodec _repeated_dispenser8Pressure_codec + = pb::FieldCodec.ForDouble(386); + private readonly pbc::RepeatedField dispenser8Pressure_ = new pbc::RepeatedField(); + /// + ///Dispenser 8 Pressure (Min = 0, Max = 100, PPF = 1) + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public pbc::RepeatedField Dispenser8Pressure { + get { return dispenser8Pressure_; } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override bool Equals(object other) { return Equals(other as DiagnosticsMonitors); @@ -708,6 +825,14 @@ namespace Tango.PMR.Diagnostics { if(!headZone5Temperature_.Equals(other.headZone5Temperature_)) return false; if(!headZone6Temperature_.Equals(other.headZone6Temperature_)) return false; if(!blowerVoltage_.Equals(other.blowerVoltage_)) return false; + if(!dispenser1Pressure_.Equals(other.dispenser1Pressure_)) return false; + if(!dispenser2Pressure_.Equals(other.dispenser2Pressure_)) return false; + if(!dispenser3Pressure_.Equals(other.dispenser3Pressure_)) return false; + if(!dispenser4Pressure_.Equals(other.dispenser4Pressure_)) return false; + if(!dispenser5Pressure_.Equals(other.dispenser5Pressure_)) return false; + if(!dispenser6Pressure_.Equals(other.dispenser6Pressure_)) return false; + if(!dispenser7Pressure_.Equals(other.dispenser7Pressure_)) return false; + if(!dispenser8Pressure_.Equals(other.dispenser8Pressure_)) return false; return true; } @@ -754,6 +879,14 @@ namespace Tango.PMR.Diagnostics { hash ^= headZone5Temperature_.GetHashCode(); hash ^= headZone6Temperature_.GetHashCode(); hash ^= blowerVoltage_.GetHashCode(); + hash ^= dispenser1Pressure_.GetHashCode(); + hash ^= dispenser2Pressure_.GetHashCode(); + hash ^= dispenser3Pressure_.GetHashCode(); + hash ^= dispenser4Pressure_.GetHashCode(); + hash ^= dispenser5Pressure_.GetHashCode(); + hash ^= dispenser6Pressure_.GetHashCode(); + hash ^= dispenser7Pressure_.GetHashCode(); + hash ^= dispenser8Pressure_.GetHashCode(); return hash; } @@ -804,6 +937,14 @@ namespace Tango.PMR.Diagnostics { headZone5Temperature_.WriteTo(output, _repeated_headZone5Temperature_codec); headZone6Temperature_.WriteTo(output, _repeated_headZone6Temperature_codec); blowerVoltage_.WriteTo(output, _repeated_blowerVoltage_codec); + dispenser1Pressure_.WriteTo(output, _repeated_dispenser1Pressure_codec); + dispenser2Pressure_.WriteTo(output, _repeated_dispenser2Pressure_codec); + dispenser3Pressure_.WriteTo(output, _repeated_dispenser3Pressure_codec); + dispenser4Pressure_.WriteTo(output, _repeated_dispenser4Pressure_codec); + dispenser5Pressure_.WriteTo(output, _repeated_dispenser5Pressure_codec); + dispenser6Pressure_.WriteTo(output, _repeated_dispenser6Pressure_codec); + dispenser7Pressure_.WriteTo(output, _repeated_dispenser7Pressure_codec); + dispenser8Pressure_.WriteTo(output, _repeated_dispenser8Pressure_codec); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -849,6 +990,14 @@ namespace Tango.PMR.Diagnostics { size += headZone5Temperature_.CalculateSize(_repeated_headZone5Temperature_codec); size += headZone6Temperature_.CalculateSize(_repeated_headZone6Temperature_codec); size += blowerVoltage_.CalculateSize(_repeated_blowerVoltage_codec); + size += dispenser1Pressure_.CalculateSize(_repeated_dispenser1Pressure_codec); + size += dispenser2Pressure_.CalculateSize(_repeated_dispenser2Pressure_codec); + size += dispenser3Pressure_.CalculateSize(_repeated_dispenser3Pressure_codec); + size += dispenser4Pressure_.CalculateSize(_repeated_dispenser4Pressure_codec); + size += dispenser5Pressure_.CalculateSize(_repeated_dispenser5Pressure_codec); + size += dispenser6Pressure_.CalculateSize(_repeated_dispenser6Pressure_codec); + size += dispenser7Pressure_.CalculateSize(_repeated_dispenser7Pressure_codec); + size += dispenser8Pressure_.CalculateSize(_repeated_dispenser8Pressure_codec); return size; } @@ -897,6 +1046,14 @@ namespace Tango.PMR.Diagnostics { headZone5Temperature_.Add(other.headZone5Temperature_); headZone6Temperature_.Add(other.headZone6Temperature_); blowerVoltage_.Add(other.blowerVoltage_); + dispenser1Pressure_.Add(other.dispenser1Pressure_); + dispenser2Pressure_.Add(other.dispenser2Pressure_); + dispenser3Pressure_.Add(other.dispenser3Pressure_); + dispenser4Pressure_.Add(other.dispenser4Pressure_); + dispenser5Pressure_.Add(other.dispenser5Pressure_); + dispenser6Pressure_.Add(other.dispenser6Pressure_); + dispenser7Pressure_.Add(other.dispenser7Pressure_); + dispenser8Pressure_.Add(other.dispenser8Pressure_); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -1103,6 +1260,46 @@ namespace Tango.PMR.Diagnostics { blowerVoltage_.AddEntriesFrom(input, _repeated_blowerVoltage_codec); break; } + case 330: + case 329: { + dispenser1Pressure_.AddEntriesFrom(input, _repeated_dispenser1Pressure_codec); + break; + } + case 338: + case 337: { + dispenser2Pressure_.AddEntriesFrom(input, _repeated_dispenser2Pressure_codec); + break; + } + case 346: + case 345: { + dispenser3Pressure_.AddEntriesFrom(input, _repeated_dispenser3Pressure_codec); + break; + } + case 354: + case 353: { + dispenser4Pressure_.AddEntriesFrom(input, _repeated_dispenser4Pressure_codec); + break; + } + case 362: + case 361: { + dispenser5Pressure_.AddEntriesFrom(input, _repeated_dispenser5Pressure_codec); + break; + } + case 370: + case 369: { + dispenser6Pressure_.AddEntriesFrom(input, _repeated_dispenser6Pressure_codec); + break; + } + case 378: + case 377: { + dispenser7Pressure_.AddEntriesFrom(input, _repeated_dispenser7Pressure_codec); + break; + } + case 386: + case 385: { + dispenser8Pressure_.AddEntriesFrom(input, _repeated_dispenser8Pressure_codec); + break; + } } } } diff --git a/Software/Visual_Studio/Tango.PMR/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.PMR/Properties/AssemblyInfo.cs index 139f3996c..5ca18845e 100644 --- a/Software/Visual_Studio/Tango.PMR/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.PMR/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Protobuf Message Repository")] -[assembly: AssemblyVersion("2.0.29.1537")] +[assembly: AssemblyVersion("2.0.31.1243")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.SharedUI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.SharedUI/Properties/AssemblyInfo.cs index eceecb3ab..73c244e05 100644 --- a/Software/Visual_Studio/Tango.SharedUI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.SharedUI/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Shared UI Components")] -[assembly: AssemblyVersion("2.0.22.1537")] +[assembly: AssemblyVersion("2.0.23.1242")] [assembly: ComVisible(false)] diff --git a/Software/Visual_Studio/Tango.TFS/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.TFS/Properties/AssemblyInfo.cs index 03a3aa326..95b0ecff7 100644 --- a/Software/Visual_Studio/Tango.TFS/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.TFS/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - VSTS API Library")] -[assembly: AssemblyVersion("2.0.15.1537")] +[assembly: AssemblyVersion("2.0.16.1242")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Transport/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Transport/Properties/AssemblyInfo.cs index 118e71139..c7a936be4 100644 --- a/Software/Visual_Studio/Tango.Transport/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.Transport/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Transport Components")] -[assembly: AssemblyVersion("2.0.23.1537")] +[assembly: AssemblyVersion("2.0.24.1242")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.UnitTesting/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.UnitTesting/Properties/AssemblyInfo.cs index 2e78a70d1..22ce2a42b 100644 --- a/Software/Visual_Studio/Tango.UnitTesting/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.UnitTesting/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Unit Testing")] -[assembly: AssemblyVersion("2.0.6.1537")] +[assembly: AssemblyVersion("2.0.8.1243")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Utilities/Tango.ILMerge.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Utilities/Tango.ILMerge.UI/Properties/AssemblyInfo.cs index 97ccd4c17..2b034281c 100644 --- a/Software/Visual_Studio/Utilities/Tango.ILMerge.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Utilities/Tango.ILMerge.UI/Properties/AssemblyInfo.cs @@ -44,4 +44,4 @@ using System.Windows; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.0.10.1347")] +[assembly: AssemblyVersion("2.0.12.1243")] diff --git a/Software/Visual_Studio/Utilities/Tango.UITests/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Utilities/Tango.UITests/Properties/AssemblyInfo.cs index 8e619f621..9bcf471e3 100644 --- a/Software/Visual_Studio/Utilities/Tango.UITests/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Utilities/Tango.UITests/Properties/AssemblyInfo.cs @@ -51,5 +51,5 @@ using System.Windows; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.11.1347")] +[assembly: AssemblyVersion("1.0.13.1243")] [assembly: AssemblyFileVersion("1.0.0.0")] -- cgit v1.3.1 From 8f65c009737752aaf3c504fb281875c2c41e8555 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Tue, 7 Aug 2018 15:00:52 +0300 Subject: Machine Studio v2.6 --- Software/DB/Tango.mdf | Bin 75497472 -> 75497472 bytes Software/DB/Tango_log.ldf | Bin 1835008 -> 1835008 bytes .../Properties/AssemblyInfo.cs | 2 +- .../ViewModels/MainViewVM.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Tango.BL/EntitiesExtensions/BrushStop.cs | 6 ++--- Software/Visual_Studio/Tango.BL/LiquidVolume.cs | 30 ++++++++++++--------- .../Tango.BL/Properties/AssemblyInfo.cs | 2 +- .../Tango.PMR/Properties/AssemblyInfo.cs | 2 +- .../Tango.UnitTesting/Properties/AssemblyInfo.cs | 2 +- .../Tango.ILMerge.UI/Properties/AssemblyInfo.cs | 2 +- .../Tango.UITests/Properties/AssemblyInfo.cs | 2 +- 12 files changed, 29 insertions(+), 23 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer') diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf index 9717b66a2..9da613ec0 100644 Binary files a/Software/DB/Tango.mdf and b/Software/DB/Tango.mdf differ diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf index d5ea8672a..845299e35 100644 Binary files a/Software/DB/Tango_log.ldf and b/Software/DB/Tango_log.ldf differ diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Properties/AssemblyInfo.cs index ed6e7f7c5..4ba6f4234 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Machine Studio Developer Module")] -[assembly: AssemblyVersion("2.0.13.1242")] +[assembly: AssemblyVersion("2.0.14.1423")] [assembly: ComVisible(false)] 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 1edbce641..f54de0814 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 @@ -729,7 +729,7 @@ namespace Tango.MachineStudio.Developer.ViewModels { if (IsVisible && ActiveJob != null && ActiveJob.Segments != null) { - var stops = ActiveJob.Segments.SelectMany(x => x.BrushStops); + var stops = ActiveJob.Segments.SelectMany(x => x.BrushStops).ToList(); foreach (var stop in stops) { 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 e1815066b..ea7e58851 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("2.5.19.18219")] +[assembly: AssemblyVersion("2.6.20.18219")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.BL/EntitiesExtensions/BrushStop.cs b/Software/Visual_Studio/Tango.BL/EntitiesExtensions/BrushStop.cs index c99efb802..6d73337e1 100644 --- a/Software/Visual_Studio/Tango.BL/EntitiesExtensions/BrushStop.cs +++ b/Software/Visual_Studio/Tango.BL/EntitiesExtensions/BrushStop.cs @@ -139,7 +139,7 @@ namespace Tango.BL.Entities { get { - if (Segment.BrushStops.Count > 0) + if (Segment != null && Segment.BrushStops.Count > 0) { return StopIndex == Segment.BrushStops.Min(x => x.StopIndex); } @@ -159,7 +159,7 @@ namespace Tango.BL.Entities { get { - if (Segment.BrushStops.Count > 0) + if (Segment != null && Segment.BrushStops.Count > 0) { return StopIndex == Segment.BrushStops.Max(x => x.StopIndex); } @@ -374,7 +374,7 @@ namespace Tango.BL.Entities if (LiquidVolumes != null && LiquidVolumes.Count > 0) { - cloned.LiquidVolumes = LiquidVolumes.Select(x => x.Clone(this)).ToObservableCollection(); + cloned.LiquidVolumes = LiquidVolumes.Select(x => x.Clone(cloned)).ToObservableCollection(); } return cloned; } diff --git a/Software/Visual_Studio/Tango.BL/LiquidVolume.cs b/Software/Visual_Studio/Tango.BL/LiquidVolume.cs index d039def39..4e93d5998 100644 --- a/Software/Visual_Studio/Tango.BL/LiquidVolume.cs +++ b/Software/Visual_Studio/Tango.BL/LiquidVolume.cs @@ -76,24 +76,30 @@ namespace Tango.BL public void Invalidate() { - InvalidateSolo(); - - foreach (var liquidVolume in BrushStop.LiquidVolumes.Where(x => x != this)) + if (BrushStop.LiquidVolumes != null) { - liquidVolume.InvalidateSolo(); + InvalidateSolo(); + + foreach (var liquidVolume in BrushStop.LiquidVolumes.Where(x => x != this)) + { + liquidVolume.InvalidateSolo(); + } } } private void InvalidateSolo() { - _volume = DispensingCalcService.CoerceVolume(this); - - BrushStop.SetVolume(IdsPack.PackIndex, Volume); - RaisePropertyChanged(nameof(LiquidMaxNanoliterPerCentimeter)); - RaisePropertyChanged(nameof(NanoliterPerSecond)); - RaisePropertyChanged(nameof(PulsePerSecond)); - RaisePropertyChanged(nameof(NanoliterPerCentimeter)); - RaisePropertyChanged(nameof(Volume)); + if (BrushStop.LiquidVolumes != null) + { + _volume = DispensingCalcService.CoerceVolume(this); + + BrushStop.SetVolume(IdsPack.PackIndex, Volume); + RaisePropertyChanged(nameof(LiquidMaxNanoliterPerCentimeter)); + RaisePropertyChanged(nameof(NanoliterPerSecond)); + RaisePropertyChanged(nameof(PulsePerSecond)); + RaisePropertyChanged(nameof(NanoliterPerCentimeter)); + RaisePropertyChanged(nameof(Volume)); + } } public LiquidVolume() //For XML Serialization.. diff --git a/Software/Visual_Studio/Tango.BL/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.BL/Properties/AssemblyInfo.cs index da01d4aef..3634d3d97 100644 --- a/Software/Visual_Studio/Tango.BL/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.BL/Properties/AssemblyInfo.cs @@ -4,4 +4,4 @@ using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Business logic components")] [assembly: ComVisible(false)] -[assembly: AssemblyVersion("2.0.27.1242")] \ No newline at end of file +[assembly: AssemblyVersion("2.0.28.1423")] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.PMR/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.PMR/Properties/AssemblyInfo.cs index 5ca18845e..10d2349d0 100644 --- a/Software/Visual_Studio/Tango.PMR/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.PMR/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Protobuf Message Repository")] -[assembly: AssemblyVersion("2.0.31.1243")] +[assembly: AssemblyVersion("2.0.32.1423")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.UnitTesting/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.UnitTesting/Properties/AssemblyInfo.cs index 22ce2a42b..fd8fa4cdc 100644 --- a/Software/Visual_Studio/Tango.UnitTesting/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.UnitTesting/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Unit Testing")] -[assembly: AssemblyVersion("2.0.8.1243")] +[assembly: AssemblyVersion("2.0.10.1424")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Utilities/Tango.ILMerge.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Utilities/Tango.ILMerge.UI/Properties/AssemblyInfo.cs index 2b034281c..0316a57ed 100644 --- a/Software/Visual_Studio/Utilities/Tango.ILMerge.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Utilities/Tango.ILMerge.UI/Properties/AssemblyInfo.cs @@ -44,4 +44,4 @@ using System.Windows; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.0.12.1243")] +[assembly: AssemblyVersion("2.0.14.1424")] diff --git a/Software/Visual_Studio/Utilities/Tango.UITests/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Utilities/Tango.UITests/Properties/AssemblyInfo.cs index 9bcf471e3..aa3d62a85 100644 --- a/Software/Visual_Studio/Utilities/Tango.UITests/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Utilities/Tango.UITests/Properties/AssemblyInfo.cs @@ -51,5 +51,5 @@ using System.Windows; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.13.1243")] +[assembly: AssemblyVersion("1.0.15.1424")] [assembly: AssemblyFileVersion("1.0.0.0")] -- cgit v1.3.1 From 3bcad30c7eacb41c134631f79bb50957751f11c7 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Tue, 7 Aug 2018 16:59:51 +0300 Subject: Machine Studio v2.7 --- .../DB/SQLExaminer Projects/UpdateMachine.sdeproj | 1249 ++++++++++++++++++++ Software/DB/Tango.mdf | Bin 75497472 -> 75497472 bytes Software/DB/Tango_log.ldf | Bin 1835008 -> 1835008 bytes .../Tango.EmbroideryUI/Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Models/MultiTechRecordingData.cs | 25 +- .../Models/SingleTechRecordingData.cs | 7 +- .../Models/TechRecordingData.cs | 3 + .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../RealTimeGraphEx/Properties/AssemblyInfo.cs | 2 +- .../Tango.AutoComplete/Properties/AssemblyInfo.cs | 2 +- .../Tango.BL/Properties/AssemblyInfo.cs | 2 +- .../Tango.BrushPicker/Properties/AssemblyInfo.cs | 2 +- Software/Visual_Studio/Tango.CSV/CsvFile.cs | 5 +- .../Tango.CircularGauge/Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Tango.ColorPicker/Properties/AssemblyInfo.cs | 2 +- .../Tango.Core/Properties/AssemblyInfo.cs | 2 +- .../Tango.DAL.Local/Properties/AssemblyInfo.cs | 2 +- .../Tango.DAL.Remote/Properties/AssemblyInfo.cs | 2 +- .../Tango.DragAndDrop/Properties/AssemblyInfo.cs | 2 +- .../Tango.Editors/Properties/AssemblyInfo.cs | 2 +- .../Tango.Emulations/Properties/AssemblyInfo.cs | 2 +- .../Tango.Hive/Properties/AssemblyInfo.cs | 2 +- .../Tango.Integration/Properties/AssemblyInfo.cs | 2 +- .../Tango.Logging/Properties/AssemblyInfo.cs | 2 +- .../Tango.PMR/Properties/AssemblyInfo.cs | 2 +- .../Tango.Protobuf/Properties/AssemblyInfo.cs | 2 +- .../Tango.SQLExaminer/ExaminerConfigurationType.cs | 1 + .../SQLExaminer/Configurations/UpdateMachine.xml | Bin 0 -> 26150 bytes .../Tango.SQLExaminer/Tango.SQLExaminer.csproj | 3 + .../Tango.Scripting/Properties/AssemblyInfo.cs | 2 +- .../Tango.Serialization/Properties/AssemblyInfo.cs | 2 +- .../Tango.Settings/Properties/AssemblyInfo.cs | 2 +- .../Tango.SharedUI/Properties/AssemblyInfo.cs | 2 +- .../Tango.Stubs/Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Tango.TFS/Properties/AssemblyInfo.cs | 2 +- .../Tango.Transport/Properties/AssemblyInfo.cs | 2 +- .../Tango.UnitTesting/SQLExaminer_TST.cs | 2 + .../Tango.Video/Properties/AssemblyInfo.cs | 2 +- .../Tango.Visuals/Properties/AssemblyInfo.cs | 2 +- .../Tango.Protobuf.CLI/Properties/AssemblyInfo.cs | 2 +- 55 files changed, 1324 insertions(+), 59 deletions(-) create mode 100644 Software/DB/SQLExaminer Projects/UpdateMachine.sdeproj create mode 100644 Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/UpdateMachine.xml (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer') diff --git a/Software/DB/SQLExaminer Projects/UpdateMachine.sdeproj b/Software/DB/SQLExaminer Projects/UpdateMachine.sdeproj new file mode 100644 index 000000000..28c99d852 --- /dev/null +++ b/Software/DB/SQLExaminer Projects/UpdateMachine.sdeproj @@ -0,0 +1,1249 @@ + + + + MsSqlServer + LiveDb + localhost\sqlexpress + Tango + True + False + + + MsSqlServer + LiveDb + twine.local\sqltwine + Tango + True + False + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + 1 + False + False + 0 + 0 + + + + + + \ No newline at end of file diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf index 9da613ec0..b3a7afdae 100644 Binary files a/Software/DB/Tango.mdf and b/Software/DB/Tango.mdf differ diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf index 845299e35..648b0bd9a 100644 Binary files a/Software/DB/Tango_log.ldf and b/Software/DB/Tango_log.ldf differ diff --git a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Properties/AssemblyInfo.cs index c5ae109fa..352105b64 100644 --- a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Properties/AssemblyInfo.cs @@ -44,5 +44,5 @@ using System.Windows; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.4.1407")] +[assembly: AssemblyVersion("1.0.5.1633")] [assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Properties/AssemblyInfo.cs index 205323af0..bda64c925 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Machine Studio Color Lab Module")] -[assembly: AssemblyVersion("2.0.7.1657")] +[assembly: AssemblyVersion("2.0.8.1633")] [assembly: ComVisible(false)] diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Properties/AssemblyInfo.cs index 404c1519f..3b589e28b 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Machine Studio DB Module")] -[assembly: AssemblyVersion("2.0.6.1407")] +[assembly: AssemblyVersion("2.0.7.1633")] [assembly: ComVisible(false)] diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Properties/AssemblyInfo.cs index 68ae9f9bc..51246a5d1 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Machine Studio Data Capturing Module")] -[assembly: AssemblyVersion("2.0.7.1304")] +[assembly: AssemblyVersion("2.0.8.1633")] [assembly: ComVisible(false)] diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Properties/AssemblyInfo.cs index 4ba6f4234..66e36649b 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Machine Studio Developer Module")] -[assembly: AssemblyVersion("2.0.14.1423")] +[assembly: AssemblyVersion("2.0.15.1633")] [assembly: ComVisible(false)] diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Properties/AssemblyInfo.cs index f6d950a60..54e27ec27 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Machine Studio Hardware Designer Module")] -[assembly: AssemblyVersion("2.0.7.1034")] +[assembly: AssemblyVersion("2.0.8.1633")] [assembly: ComVisible(false)] diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Properties/AssemblyInfo.cs index 88127ec79..8f69fb919 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Machine Studio Logging Module")] -[assembly: AssemblyVersion("2.0.14.1242")] +[assembly: AssemblyVersion("2.0.15.1633")] [assembly: ComVisible(false)] diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Properties/AssemblyInfo.cs index c930f533e..832feca43 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Machine Studio Machine Designer Module")] -[assembly: AssemblyVersion("2.0.7.1034")] +[assembly: AssemblyVersion("2.0.8.1633")] [assembly: ComVisible(false)] diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Properties/AssemblyInfo.cs index 77fb1b687..bf0680366 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Machine Studio Stubs Module")] -[assembly: AssemblyVersion("2.0.6.1407")] +[assembly: AssemblyVersion("2.0.7.1633")] [assembly: ComVisible(false)] diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Properties/AssemblyInfo.cs index 884170a37..44e1dba95 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Machine Studio Synchronization Module")] -[assembly: AssemblyVersion("2.0.8.1034")] +[assembly: AssemblyVersion("2.0.9.1633")] [assembly: ComVisible(false)] diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Models/MultiTechRecordingData.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Models/MultiTechRecordingData.cs index d6acd3873..e9471fa74 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Models/MultiTechRecordingData.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Models/MultiTechRecordingData.cs @@ -30,21 +30,24 @@ namespace Tango.MachineStudio.Technician.Models Task.Factory.StartNew(() => { - var width = data.Count; - var height = data.First().Count; - - for (int row = 0; row < height; row++) + if (_initialized) { - String time = (delta_base.Add(TimeSpan.FromMilliseconds((delta_mili / data.Count) * row))).ToString(@"hh\:mm\:ss\.fff"); - - List row_values = new List(); + var width = data.Count; + var height = data.First().Count; - for (int column = 0; column < width; column++) + for (int row = 0; row < height; row++) { - row_values.Add(data[column][row]); - } + String time = (delta_base.Add(TimeSpan.FromMilliseconds((delta_mili / data.Count) * row))).ToString(@"hh\:mm\:ss\.fff"); - CsvFile.Append(new MultiTechRecordingValue(time, row_values)); + List row_values = new List(); + + for (int column = 0; column < width; column++) + { + row_values.Add(data[column][row]); + } + + CsvFile.Append(new MultiTechRecordingValue(time, row_values)); + } } }); } diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Models/SingleTechRecordingData.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Models/SingleTechRecordingData.cs index 3c5426ed9..7aa9a2b3f 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Models/SingleTechRecordingData.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Models/SingleTechRecordingData.cs @@ -23,9 +23,12 @@ namespace Tango.MachineStudio.Technician.Models Task.Factory.StartNew(() => { - for (int i = 0; i < data.Count; i++) + if (_initialized) { - CsvFile.Append(new SingleTechRecordingValue((delta_base.Add(TimeSpan.FromMilliseconds((delta_mili / data.Count) * i))).ToString(@"hh\:mm\:ss\.fff"), data[i])); + for (int i = 0; i < data.Count; i++) + { + CsvFile.Append(new SingleTechRecordingValue((delta_base.Add(TimeSpan.FromMilliseconds((delta_mili / data.Count) * i))).ToString(@"hh\:mm\:ss\.fff"), data[i])); + } } }); } diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Models/TechRecordingData.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Models/TechRecordingData.cs index cb4b10db1..8024a1375 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Models/TechRecordingData.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Models/TechRecordingData.cs @@ -13,6 +13,8 @@ namespace Tango.MachineStudio.Technician.Models { public abstract class TechRecordingData : ExtendedObject, IDisposable where T : TechItem where TValue : TechRecordingValue { + protected bool _initialized; + protected DateTime _last_time; protected DateTime _start_time; @@ -36,6 +38,7 @@ namespace Tango.MachineStudio.Technician.Models definition.Columns = new List() { "Time" }.Concat(GetColumnNames()); CsvFile = new CsvFile(new CsvDestination(TemporaryFile), definition); + _initialized = true; } public void Save(String fileName) diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Properties/AssemblyInfo.cs index 0aa7f5e3f..18f0bd7c0 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Machine Studio Technician Module")] -[assembly: AssemblyVersion("2.0.11.1242")] +[assembly: AssemblyVersion("2.0.12.1633")] [assembly: ComVisible(false)] diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Properties/AssemblyInfo.cs index 10a43ead9..45b3ef1ce 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Machine Studio Users & Roles Module")] -[assembly: AssemblyVersion("2.0.6.1407")] +[assembly: AssemblyVersion("2.0.7.1633")] [assembly: ComVisible(false)] diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Properties/AssemblyInfo.cs index 4991bfb2c..5aa8baa9b 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Machine Studio Common Components")] -[assembly: AssemblyVersion("2.0.22.1242")] +[assembly: AssemblyVersion("2.0.23.1633")] [assembly: ComVisible(false)] [assembly:ThemeInfo( 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 ea7e58851..02f5a3ea0 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("2.6.20.18219")] +[assembly: AssemblyVersion("2.7.21.18219")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Updater/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Updater/Properties/AssemblyInfo.cs index 4297b7f9c..e9a89a0ee 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Updater/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Updater/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Machine Studio Updater Utility")] -[assembly: AssemblyVersion("2.0.6.1407")] +[assembly: AssemblyVersion("2.0.7.1633")] [assembly: ComVisible(false)] [assembly:ThemeInfo( diff --git a/Software/Visual_Studio/SideChains/RealTimeGraphEx/Properties/AssemblyInfo.cs b/Software/Visual_Studio/SideChains/RealTimeGraphEx/Properties/AssemblyInfo.cs index 15363eae9..a72149d49 100644 --- a/Software/Visual_Studio/SideChains/RealTimeGraphEx/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/SideChains/RealTimeGraphEx/Properties/AssemblyInfo.cs @@ -51,5 +51,5 @@ using System.Windows; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.16.1537")] +[assembly: AssemblyVersion("1.0.17.1633")] [assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Software/Visual_Studio/SideChains/Tango.AutoComplete/Properties/AssemblyInfo.cs b/Software/Visual_Studio/SideChains/Tango.AutoComplete/Properties/AssemblyInfo.cs index 8564cf502..1822a9fe1 100644 --- a/Software/Visual_Studio/SideChains/Tango.AutoComplete/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/SideChains/Tango.AutoComplete/Properties/AssemblyInfo.cs @@ -49,5 +49,5 @@ using System.Windows.Markup; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.16.1537")] +[assembly: AssemblyVersion("1.0.17.1633")] [assembly: AssemblyFileVersion("1.0.0.8")] diff --git a/Software/Visual_Studio/Tango.BL/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.BL/Properties/AssemblyInfo.cs index 3634d3d97..baaf7b39f 100644 --- a/Software/Visual_Studio/Tango.BL/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.BL/Properties/AssemblyInfo.cs @@ -4,4 +4,4 @@ using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Business logic components")] [assembly: ComVisible(false)] -[assembly: AssemblyVersion("2.0.28.1423")] \ No newline at end of file +[assembly: AssemblyVersion("2.0.29.1633")] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.BrushPicker/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.BrushPicker/Properties/AssemblyInfo.cs index feb78d5a1..7f08c02ac 100644 --- a/Software/Visual_Studio/Tango.BrushPicker/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.BrushPicker/Properties/AssemblyInfo.cs @@ -16,7 +16,7 @@ using System.Windows; using System.Windows.Markup; [assembly: AssemblyTitle("Tango - Brush Picker Control")] -[assembly: AssemblyVersion("2.0.6.1407")] +[assembly: AssemblyVersion("2.0.7.1633")] [assembly: ThemeInfo(ResourceDictionaryLocation.SourceAssembly, ResourceDictionaryLocation.SourceAssembly)] // Setting ComVisible to false makes the types in this assembly not visible diff --git a/Software/Visual_Studio/Tango.CSV/CsvFile.cs b/Software/Visual_Studio/Tango.CSV/CsvFile.cs index ab5466da7..8a908b6d8 100644 --- a/Software/Visual_Studio/Tango.CSV/CsvFile.cs +++ b/Software/Visual_Studio/Tango.CSV/CsvFile.cs @@ -278,11 +278,12 @@ namespace Tango.CSV Func func = null; PropertyInfo pi = null; - pi = typeof(T).GetProperty(c, flags); + pi = typeof(T).GetProperty(c); if (pi == null) //Then try get by column index, { - pi = typeof(T).GetProperties(flags)[index]; + pi = typeof(T).GetProperties()[index]; + pi = typeof(T).GetProperties()[index]; } if (CsvFile.UseLambdas) diff --git a/Software/Visual_Studio/Tango.CircularGauge/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.CircularGauge/Properties/AssemblyInfo.cs index a3183ac9e..ad0fae039 100644 --- a/Software/Visual_Studio/Tango.CircularGauge/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.CircularGauge/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Circular Gauge Control")] -[assembly: AssemblyVersion("2.0.7.1347")] +[assembly: AssemblyVersion("2.0.8.1633")] [assembly: ComVisible(false)] diff --git a/Software/Visual_Studio/Tango.CodeGeneration/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.CodeGeneration/Properties/AssemblyInfo.cs index 95bca0736..3aa9e6fbd 100644 --- a/Software/Visual_Studio/Tango.CodeGeneration/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.CodeGeneration/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Code Generation Components")] -[assembly: AssemblyVersion("2.0.13.1537")] +[assembly: AssemblyVersion("2.0.14.1633")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.ColorPicker/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.ColorPicker/Properties/AssemblyInfo.cs index 01bba5794..8645bcd43 100644 --- a/Software/Visual_Studio/Tango.ColorPicker/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.ColorPicker/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Color Picker Control")] -[assembly: AssemblyVersion("2.0.16.1537")] +[assembly: AssemblyVersion("2.0.17.1633")] [assembly: ComVisible(false)] diff --git a/Software/Visual_Studio/Tango.Core/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Core/Properties/AssemblyInfo.cs index 70f8ae295..96c9d7d9b 100644 --- a/Software/Visual_Studio/Tango.Core/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.Core/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Core Components")] -[assembly: AssemblyVersion("2.0.25.1537")] +[assembly: AssemblyVersion("2.0.26.1633")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.DAL.Local/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.DAL.Local/Properties/AssemblyInfo.cs index c8be9e57f..7a144f91f 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.DAL.Local/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Local Data Access Layer")] -[assembly: AssemblyVersion("2.0.13.1537")] +[assembly: AssemblyVersion("2.0.14.1633")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.DAL.Remote/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.DAL.Remote/Properties/AssemblyInfo.cs index 4f9422b48..4c08eb4cd 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Remote Data Access Layer")] -[assembly: AssemblyVersion("2.0.24.1537")] +[assembly: AssemblyVersion("2.0.25.1633")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.DragAndDrop/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.DragAndDrop/Properties/AssemblyInfo.cs index 9d41c75b9..4e8d72ef6 100644 --- a/Software/Visual_Studio/Tango.DragAndDrop/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.DragAndDrop/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Drag & Drop Components")] -[assembly: AssemblyVersion("2.0.22.1537")] +[assembly: AssemblyVersion("2.0.23.1633")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Editors/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Editors/Properties/AssemblyInfo.cs index e492c7c5d..ce7519a90 100644 --- a/Software/Visual_Studio/Tango.Editors/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.Editors/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Visual Diagram Editing Components")] -[assembly: AssemblyVersion("2.0.16.1537")] +[assembly: AssemblyVersion("2.0.17.1633")] [assembly: ComVisible(false)] diff --git a/Software/Visual_Studio/Tango.Emulations/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Emulations/Properties/AssemblyInfo.cs index 19a22963e..b2bd0b458 100644 --- a/Software/Visual_Studio/Tango.Emulations/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.Emulations/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Emulation Components")] -[assembly: AssemblyVersion("2.0.8.1034")] +[assembly: AssemblyVersion("2.0.9.1633")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Hive/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Hive/Properties/AssemblyInfo.cs index b9722a249..3794ca0e3 100644 --- a/Software/Visual_Studio/Tango.Hive/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.Hive/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Hive UI Components")] -[assembly: AssemblyVersion("2.0.11.1657")] +[assembly: AssemblyVersion("2.0.12.1633")] [assembly:ThemeInfo( ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located diff --git a/Software/Visual_Studio/Tango.Integration/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Integration/Properties/AssemblyInfo.cs index ab2de3d7b..e0cf63769 100644 --- a/Software/Visual_Studio/Tango.Integration/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.Integration/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Logging Library")] -[assembly: AssemblyVersion("2.0.24.1242")] +[assembly: AssemblyVersion("2.0.25.1633")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Logging/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Logging/Properties/AssemblyInfo.cs index 3cc652d93..3ff01ac1c 100644 --- a/Software/Visual_Studio/Tango.Logging/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.Logging/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Logging Library")] -[assembly: AssemblyVersion("2.0.29.1537")] +[assembly: AssemblyVersion("2.0.30.1633")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.PMR/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.PMR/Properties/AssemblyInfo.cs index 10d2349d0..9f826e761 100644 --- a/Software/Visual_Studio/Tango.PMR/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.PMR/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Protobuf Message Repository")] -[assembly: AssemblyVersion("2.0.32.1423")] +[assembly: AssemblyVersion("2.0.33.1633")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Protobuf/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Protobuf/Properties/AssemblyInfo.cs index 9d199f73e..f4cf23ed7 100644 --- a/Software/Visual_Studio/Tango.Protobuf/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.Protobuf/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Protobuf Components")] -[assembly: AssemblyVersion("2.0.25.1537")] +[assembly: AssemblyVersion("2.0.26.1633")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.SQLExaminer/ExaminerConfigurationType.cs b/Software/Visual_Studio/Tango.SQLExaminer/ExaminerConfigurationType.cs index d6f76018d..3455d837a 100644 --- a/Software/Visual_Studio/Tango.SQLExaminer/ExaminerConfigurationType.cs +++ b/Software/Visual_Studio/Tango.SQLExaminer/ExaminerConfigurationType.cs @@ -12,5 +12,6 @@ namespace Tango.SQLExaminer OverrideData, ProvisionMachine, UpdateTwineDB, + UpdateMachine } } diff --git a/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/UpdateMachine.xml b/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/UpdateMachine.xml new file mode 100644 index 000000000..0ff26b7ba Binary files /dev/null and b/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/UpdateMachine.xml differ diff --git a/Software/Visual_Studio/Tango.SQLExaminer/Tango.SQLExaminer.csproj b/Software/Visual_Studio/Tango.SQLExaminer/Tango.SQLExaminer.csproj index 7049b87a7..335b8cc3f 100644 --- a/Software/Visual_Studio/Tango.SQLExaminer/Tango.SQLExaminer.csproj +++ b/Software/Visual_Studio/Tango.SQLExaminer/Tango.SQLExaminer.csproj @@ -96,6 +96,9 @@ PreserveNewest + + PreserveNewest + PreserveNewest diff --git a/Software/Visual_Studio/Tango.Scripting/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Scripting/Properties/AssemblyInfo.cs index a30b3b6c0..ced938f9a 100644 --- a/Software/Visual_Studio/Tango.Scripting/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.Scripting/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Roslyn Scripting Components")] -[assembly: AssemblyVersion("2.0.22.1537")] +[assembly: AssemblyVersion("2.0.23.1633")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Serialization/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Serialization/Properties/AssemblyInfo.cs index 84f44c52f..cc2c4627b 100644 --- a/Software/Visual_Studio/Tango.Serialization/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.Serialization/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Serialization Components")] -[assembly: AssemblyVersion("2.0.24.1537")] +[assembly: AssemblyVersion("2.0.25.1633")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Settings/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Settings/Properties/AssemblyInfo.cs index 6a8c15230..f9c239802 100644 --- a/Software/Visual_Studio/Tango.Settings/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.Settings/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Global Settings")] -[assembly: AssemblyVersion("2.0.24.1537")] +[assembly: AssemblyVersion("2.0.25.1633")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.SharedUI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.SharedUI/Properties/AssemblyInfo.cs index 73c244e05..7ea9df3d7 100644 --- a/Software/Visual_Studio/Tango.SharedUI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.SharedUI/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Shared UI Components")] -[assembly: AssemblyVersion("2.0.23.1242")] +[assembly: AssemblyVersion("2.0.24.1633")] [assembly: ComVisible(false)] diff --git a/Software/Visual_Studio/Tango.Stubs/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Stubs/Properties/AssemblyInfo.cs index 7f53fad49..983208128 100644 --- a/Software/Visual_Studio/Tango.Stubs/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.Stubs/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Stubs Collection")] -[assembly: AssemblyVersion("2.0.6.1407")] +[assembly: AssemblyVersion("2.0.7.1633")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Synchronization/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Synchronization/Properties/AssemblyInfo.cs index 120cfae21..f798e9167 100644 --- a/Software/Visual_Studio/Tango.Synchronization/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.Synchronization/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - DataBase Synchronization Components")] -[assembly: AssemblyVersion("2.0.13.1537")] +[assembly: AssemblyVersion("2.0.14.1633")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.TFS/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.TFS/Properties/AssemblyInfo.cs index 95b0ecff7..734806851 100644 --- a/Software/Visual_Studio/Tango.TFS/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.TFS/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - VSTS API Library")] -[assembly: AssemblyVersion("2.0.16.1242")] +[assembly: AssemblyVersion("2.0.17.1633")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Transport/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Transport/Properties/AssemblyInfo.cs index c7a936be4..9ca5a338c 100644 --- a/Software/Visual_Studio/Tango.Transport/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.Transport/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Transport Components")] -[assembly: AssemblyVersion("2.0.24.1242")] +[assembly: AssemblyVersion("2.0.25.1633")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.UnitTesting/SQLExaminer_TST.cs b/Software/Visual_Studio/Tango.UnitTesting/SQLExaminer_TST.cs index 8aa1fe5a3..32aaa4485 100644 --- a/Software/Visual_Studio/Tango.UnitTesting/SQLExaminer_TST.cs +++ b/Software/Visual_Studio/Tango.UnitTesting/SQLExaminer_TST.cs @@ -326,6 +326,8 @@ namespace Tango.UnitTesting { Assert.IsTrue(context.Jobs.Any(x => x.Guid == job_guid)); } + + //Now change configuration in source and push to machine } } } diff --git a/Software/Visual_Studio/Tango.Video/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Video/Properties/AssemblyInfo.cs index 423389e5c..613651f4b 100644 --- a/Software/Visual_Studio/Tango.Video/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.Video/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Video Components")] -[assembly: AssemblyVersion("2.0.16.1537")] +[assembly: AssemblyVersion("2.0.17.1633")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Visuals/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Visuals/Properties/AssemblyInfo.cs index 70fd7b52d..90f2d340d 100644 --- a/Software/Visual_Studio/Tango.Visuals/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.Visuals/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Exotic Visual Elements")] -[assembly: AssemblyVersion("2.0.6.1407")] +[assembly: AssemblyVersion("2.0.7.1633")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Properties/AssemblyInfo.cs index 7eda87424..9fa728e87 100644 --- a/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Protobuf Compilation CLI")] -[assembly: AssemblyVersion("2.0.21.1537")] +[assembly: AssemblyVersion("2.0.22.1633")] [assembly: ComVisible(false)] \ No newline at end of file -- cgit v1.3.1