Merge pull request #8 from dotnetprojects/featureComments

feature support also english comments

Author: guertel

TiaCodeGen.Tests/SampleTests.cs

@@ -54,7 +54,7 @@ public class SampleTests
         public void CreateBlock1()
         {
             var codeblock = new CodeBlock();
-            var nw = new Network("Test1");
+            var nw = new Network("Test1", "Test1en");
 
             nw.Add(
                 new And(
@@ -77,7 +77,7 @@ public void CreateBlock2()
         {
             var codeblock = new CodeBlock();
 
-            var nw = new Network("Test2");
+            var nw = new Network("Test2", "Test2en");
             nw.Add(
             new And(
                 new Signal("#Bool1"),
@@ -117,7 +117,7 @@ public void CreateBlock3()
         {
             var codeblock = new CodeBlock();
 
-            var nw = new Network("Test2");
+            var nw = new Network("Test2", "Test2en");
             nw.Add(
                 new Coil(
                     new Signal("#Bool1"),
@@ -151,7 +151,7 @@ public void DynamicSample1()
             foreach (var s in signals)
                 and.Add(new Signal(s));
 
-            var nw = new Network("Test2");
+            var nw = new Network("Test2", "test2en");
             nw.Add(
                 new Coil(
                     new Signal("#Bool4"),
@@ -171,7 +171,7 @@ public void TestCallWithOr()
         {
             var codeblock = new CodeBlock();
 
-            var nw = new Network("Test2");
+            var nw = new Network("Test2", "Test2en");
 
             var f = new FunctionBlockCall("CheckContour", "CheckContourInstance");
             f.Interface["BoolPar"] = new IOperationOrSignalDirectionWrapper(new Or(new Signal("P1"), new Signal("P2")), Direction.InOut);
@@ -190,7 +190,7 @@ public void TestCallWithInRange()
         {
             var codeblock = new CodeBlock();
 
-            var nw = new Network("Test2");
+            var nw = new Network("Test2", "Test2en");
 
             var f = new InRangeCall(new Signal(1), new Signal(2), new Signal(3), new Coil(new Signal("MW0", SignalType.Int)));
             nw.Add(f);

TiaCodegen/Blocks/Block.cs

@@ -8,6 +8,9 @@ public class Block
         public int Number { get; set; }
         private readonly CodeBlock CodeBlock;
         public string Title { get; set; }
+        public string TitleEnglish { get; set; }
+        public string Comment { get; set; }
+        public string CommentEnglish { get; set; }
         public string Author { get; set; }
 
         public string Interface { get; set; }
@@ -70,6 +73,28 @@ public virtual string GetBlockFooter(ref int id)
               <Text>{Title}</Text>
             </AttributeList>
           </MultilingualTextItem>
+          <MultilingualTextItem ID=""{id++}"" CompositionName=""Items"">
+            <AttributeList>
+              <Culture>en-GB</Culture>
+              <Text>{TitleEnglish}</Text>
+            </AttributeList>
+          </MultilingualTextItem>
+        </ObjectList>
+      </MultilingualText>
+      <MultilingualText ID=""{id++}"" CompositionName=""Comment"">
+        <ObjectList>
+          <MultilingualTextItem ID=""{id++}"" CompositionName=""Items"">
+            <AttributeList>
+              <Culture>de-DE</Culture>
+              <Text>{Comment}</Text>
+            </AttributeList>
+          </MultilingualTextItem>
+          <MultilingualTextItem ID=""{id++}"" CompositionName=""Items"">
+            <AttributeList>
+              <Culture>en-GB</Culture>
+              <Text>{CommentEnglish}</Text>
+            </AttributeList>
+          </MultilingualTextItem>
         </ObjectList>
       </MultilingualText>
     </ObjectList>

TiaCodegen/Blocks/CodeBlock.cs

@@ -8,8 +8,6 @@ public class CodeBlock : BaseOperationOrSignal
 
         public bool Safety { get; set; }
 
-        public string Comment { get; set; }
-
         public CodeBlock() : base()
         {
             Name = "";

TiaCodegen/Blocks/Network.cs

@@ -9,17 +9,20 @@ public class Network : BaseOperationOrSignal
 
         public string Description { get; set; }
 
-        public Network(string networkTitle = null, params IOperationOrSignal[] operationOrSignals)
+        public string NetworkTitleEnglish { get; set; }
+
+        public string DescriptionEnglish { get; set; }
+
+        public Network(params IOperationOrSignal[] operationOrSignals)
             : base(operationOrSignals)
-        {
-            NetworkTitle = networkTitle;
-        }
+        { }
+
 
-        public Network(string networkTitle, string description, params IOperationOrSignal[] operationOrSignals)
+        public Network(string networkTitle, string networkTitleEnglish, params IOperationOrSignal[] operationOrSignals)
             : base(operationOrSignals)
         {
             NetworkTitle = networkTitle;
-            Description = description;
+            NetworkTitleEnglish = networkTitleEnglish;
         }
     }
 }

TiaCodegen/CodeGen/KopCodeHelper.cs

@@ -962,6 +962,13 @@ public string GetXml(ref int id)
                     _sb.AppendLine("<Text>" + network.Description + "</Text>");
                     _sb.AppendLine("</AttributeList>");
                     _sb.AppendLine("</MultilingualTextItem>");
+                    _sb.AppendLine("<MultilingualTextItem ID=\"" + id + "\" CompositionName=\"Items\">");
+                    id++;
+                    _sb.AppendLine("<AttributeList>");
+                    _sb.AppendLine("<Culture>en-GB</Culture>");
+                    _sb.AppendLine("<Text>" + network.DescriptionEnglish + "</Text>");
+                    _sb.AppendLine("</AttributeList>");
+                    _sb.AppendLine("</MultilingualTextItem>");
                     _sb.AppendLine("</ObjectList>");
                     _sb.AppendLine("</MultilingualText>");
 
@@ -975,6 +982,13 @@ public string GetXml(ref int id)
                     _sb.AppendLine("<Text>" + EscapeForXml(network.NetworkTitle) + "</Text>");
                     _sb.AppendLine("</AttributeList>");
                     _sb.AppendLine("</MultilingualTextItem>");
+                    _sb.AppendLine("<MultilingualTextItem ID=\"" + id + "\" CompositionName=\"Items\">");
+                    id++;
+                    _sb.AppendLine("<AttributeList>");
+                    _sb.AppendLine("<Culture>en-GB</Culture>");
+                    _sb.AppendLine("<Text>" + EscapeForXml(network.NetworkTitleEnglish) + "</Text>");
+                    _sb.AppendLine("</AttributeList>");
+                    _sb.AppendLine("</MultilingualTextItem>");
                     _sb.AppendLine("</ObjectList>");
                     _sb.AppendLine("</MultilingualText>");
                     _sb.AppendLine("</ObjectList>");