[BUG]Txion is frozen after to high time blowing (#688)

* Create draft PR for #687 * ***TcoCore*** +new displaying primitives TcoCustomizedDialog(posibility to compose own dialog with required answer/options) +add option to invoke dialog with image * introduced web2Wiew to display images.(possibility to zooming images ....) +Localization to TcoDialog +dialogs examples and documentation *TcoComponentServiceView - default option is expanded (only task are shown , not details) + each component derived from TcoComponent has an option to expand service view.(complex components such as Drives,MultiAxis... can be set to separated tab and preset as expanded in view) ***TcoDrivesBachoff*** *changed layout in Single and Multi Axis Systems (reorganization some buttons, option to hide unnecessary content) *work with table position in Axis System - not need to press restore button anymore during positioning ***TcoElements*** *TcoDo - buttons to set or reset was moved to header. ***TcoInspectors*** * introduced web2Wiew to display images.(possibility to zooming images ....) *fix layout in dialog if content is too big ***TcoTixonFeeding*** +documentation +examples *fix frozen sequence when buffer is full and air blowing still working +added new settings to TcoTixonVibro and TcoTixonStep due posibility to change configuration of feeding +TcoTixonPickVibroBasic component --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Peter Barancek <[email protected]>
TcOpenGroup · Mar 13, 2024 · 22255bb · 22255bb
1 parent a4b4b22
commit 22255bb
Show file tree

Hide file tree

Showing 108 changed files with 3,820 additions and 3,261 deletions.
diff --git a/src/TcoCore/README.md b/src/TcoCore/README.md
@@ -1,3 +1,176 @@
 # TcoCore
 
-[INTRODUCTION](docs/Introduction.md)
+[INTRODUCTION](docs/Introduction.md)
+
+## Components
+
+
+## Dialogs 
+
+### Plc Example usage of Dialog
+
+```csharp
+   15:
+        _dialog1.Show()
+            .WithType(eDialogType.Question)
+            .WithYesNoCancel()
+            .WithCaption('Hey 2')
+            .WithText('Do we go ahead?');
+
+        IF (_dialog1.Answer = TcoCore.eDialogAnswer.Yes) THEN
+            _state := 20;
+        END_IF;
+
+        IF (_dialog1.Answer = TcoCore.eDialogAnswer.No) THEN
+            _state := 1000;
+        END_IF;
+
+        IF (_dialog1.Answer = TcoCore.eDialogAnswer.Cancel) THEN
+            _state := 0;
+            _invokeDiaglog1 := FALSE;
+        END_IF;
+```
+![](assets/dialogWithoutPicture.png)
+
+### Plc Example usage of Dialog with Image
+
+```csharp
+ 10:
+        _dialog1.Show()
+            .WithType(eDialogType.Question)
+            .WithYesNoCancel()
+			.WithImage('D:\MTS\Develop\TcOpenGroup\TcOpen\assets\logo\TcOpenLogo.png',500,500)
+            .WithCaption('Hey 1')
+            .WithText('Do we go ahead to 2?');
+
+        IF (_dialog1.Answer = TcoCore.eDialogAnswer.Yes) THEN
+            _state := 15;
+        END_IF;
+
+        IF (_dialog1.Answer = TcoCore.eDialogAnswer.No) THEN
+            _state := 1000;
+        END_IF;
+
+        IF (_dialog1.Answer = TcoCore.eDialogAnswer.Cancel) THEN
+            _state := 0;
+            _invokeDiaglog1 := FALSE;
+        END_IF;
+```
+![](assets/dialogWithPicture.png)
+
+### Plc Example usage of Dialog Ok only
+
+```csharp
+  20:
+        IF (_dialog2.Show()
+            .WithType(eDialogType.Info)
+            .WithOk()
+            .WithCaption('Hey')
+            .WithText('We go ahead.')
+            .Answer =
+            TcoCore.eDialogAnswer.OK) THEN
+            _state := 30;
+        END_IF
+```
+![](assets/dialogOk.png)
+
+### Plc Example usage of Dialog Timed out (External close)
+
+Here may be used any signal or condition when dialog should be closed with choosen answer.
+
+```csharp
+  30:
+        _state := 40;
+        _tonDisposeDialog(In := FALSE);
+    40:
+        _tonDisposeDialog(IN := TRUE, PT := T#4S);
+		_dialog4.ShowWithExternalClose(inOkAnswerSignal:=FALSE , inYesAnswerSignal:= _tonDisposeDialog.Q, inNoAnswerSignal:= FALSE, inCancelAnswerSignal:= FALSE)
+		    .WithType(eDialogType.Info)
+            .WithYesNoCancel()
+            .WithCaption('Hey')
+            .WithText('Do you wana retry it? Yes answer will be set in 4 sec?');
+
+        IF (_dialog4.Answer = TcoCore.eDialogAnswer.Yes) THEN
+            _state := 0;
+        END_IF;
+
+        IF (_dialog4.Answer = TcoCore.eDialogAnswer.No) THEN
+            _state := 50;
+        END_IF;
+
+        IF (_dialog4.Answer = TcoCore.eDialogAnswer.Cancel) THEN
+            _state := 0;
+            _invokeDiaglog1 := FALSE;
+        END_IF;
+```
+![alt text](assets/dialogTimedOut.png)
+
+### Plc Example usage of Customized Dialog
+
+Here may be used any signal or condition when dialog should be closed with choosen answer.
+
+```csharp
+  50:
+         _dialogCustomized.Show()
+            .WithType(eDialogType.Info)
+            .WithOption1('This is Option1=>retry')
+			  .WithOption2('This is Option2=>first step')
+			    .WithOption3('This is Option3 =>continue')
+				  .WithOption4('This is Option4=>stop sequence')
+            .WithCaption('Hey')
+            .WithText('What we are going to do.');
+
+			 IF (_dialogCustomized.Answer = TcoCore.eCustomizedDialogAnswer.Option1) THEN
+				_state := 50;
+			END_IF;
+
+			IF (_dialogCustomized.Answer = TcoCore.eCustomizedDialogAnswer.Option2) THEN
+				_state := 0;
+			END_IF;
+
+			IF (_dialogCustomized.Answer = TcoCore.eCustomizedDialogAnswer.Option3) THEN
+				_state := 51;
+			END_IF;
+
+			IF (_dialogCustomized.Answer = TcoCore.eCustomizedDialogAnswer.Option4) THEN
+				_state := 0;
+				_invokeCustomizedDiaglog := FALSE;
+				_invokeDiaglog1 := FALSE;
+			END_IF;
+```
+
+![alt text](assets/customizedDialog4Option.png)
+## Plc Example usage of Customized Dialog with image
+
+```csharp
+ 51:
+         _dialogCustomized.Show()
+
+            .WithOption1('This is Option1=>retry')
+			  .WithOption2('This is Option2=>first step')
+			    .WithOption3('This is Option3 =>continue')
+			.WithImage('D:\MTS\Develop\TcOpenGroup\TcOpen\assets\logo\TcOpenWide.png',500,500)
+            .WithCaption('Hey')
+            .WithText('What we are going to do.');
+
+			 IF (_dialogCustomized.Answer = TcoCore.eCustomizedDialogAnswer.Option1) THEN
+				_state := 50;
+			END_IF;
+
+			IF (_dialogCustomized.Answer = TcoCore.eCustomizedDialogAnswer.Option2) THEN
+				_state := 0;
+			END_IF;
+
+			IF (_dialogCustomized.Answer = TcoCore.eCustomizedDialogAnswer.Option3) THEN
+				_state := 60;
+			END_IF;
+
+			IF (_dialogCustomized.Answer = TcoCore.eCustomizedDialogAnswer.Option4) THEN
+				_state := 0;
+				_invokeCustomizedDiaglog := FALSE;
+				_invokeDiaglog1 := FALSE;
+			END_IF;
+```
+
+![alt text](assets/customizedDialog3OptionsWithImage.png)
+![alt text](assets/customizedDialog3OptionsWithZoomedImage.png)
diff --git a/src/TcoCore/assets/customizedDialog3OptionsWithImage.png b/src/TcoCore/assets/customizedDialog3OptionsWithImage.png
diff --git a/src/TcoCore/assets/customizedDialog3OptionsWithZoomedImage.png b/src/TcoCore/assets/customizedDialog3OptionsWithZoomedImage.png
diff --git a/src/TcoCore/assets/customizedDialog4Option.png b/src/TcoCore/assets/customizedDialog4Option.png
diff --git a/src/TcoCore/assets/dialogOk.png b/src/TcoCore/assets/dialogOk.png
diff --git a/src/TcoCore/assets/dialogTimedOut.png b/src/TcoCore/assets/dialogTimedOut.png
diff --git a/src/TcoCore/assets/dialogWithPicture.png b/src/TcoCore/assets/dialogWithPicture.png
diff --git a/src/TcoCore/assets/dialogWithoutPicture.png b/src/TcoCore/assets/dialogWithoutPicture.png
diff --git a/src/TcoCore/src/TcoCore.Wpf/Properties/strings.Designer.cs b/src/TcoCore/src/TcoCore.Wpf/Properties/strings.Designer.cs
diff --git a/src/TcoCore/src/TcoCore.Wpf/Properties/strings.cs-CZ.resx b/src/TcoCore/src/TcoCore.Wpf/Properties/strings.cs-CZ.resx
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Cancel" xml:space="preserve">
+    <value>Zrušit</value>
+  </data>
+  <data name="Components" xml:space="preserve">
+    <value>Komponenty</value>
+  </data>
+  <data name="Config" xml:space="preserve">
+    <value>Nastavení</value>
+  </data>
+  <data name="Control" xml:space="preserve">
+    <value>Ovladaní</value>
+  </data>
+  <data name="Details" xml:space="preserve">
+    <value>Podrobnosti</value>
+  </data>
+  <data name="General" xml:space="preserve">
+    <value>Všeobecne</value>
+  </data>
+  <data name="More" xml:space="preserve">
+    <value>Vice</value>
+  </data>
+  <data name="No" xml:space="preserve">
+    <value>Ne</value>
+  </data>
+  <data name="Ok" xml:space="preserve">
+    <value>Ok</value>
+  </data>
+  <data name="Status" xml:space="preserve">
+    <value>Stav</value>
+  </data>
+  <data name="Yes" xml:space="preserve">
+    <value>Áno</value>
+  </data>
+</root>