merge

1 files changed, 8 insertions, 33 deletions

diff --git a/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Program.cs b/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Program.cs
index a86454e26..78a9d0380 100644
--- a/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Program.cs
+++ b/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Program.cs
@@ -56,7 +56,6 @@ namespace Tango.PMRGenerator.CLI
                 GenerateColorLabLiquidTypes(db, pmrFolder);
                 GenerateDiagnosticsValueComponents(db, pmrFolder);
                 GenerateDiagnosticsMonitors(db, pmrFolder);
-                GenerateInsightsMonitors(db, pmrFolder);
                 GenerateEventTypes(db, pmrFolder);
                 GenerateInterfaceIOs(db, pmrFolder);
             }
@@ -642,7 +641,7 @@ namespace Tango.PMRGenerator.CLI
 
         private static void GenerateDiagnosticsMonitors(ObservablesContext db, String pmrFolder)
         {
-            Console.WriteLine("Generating Diagnostics Monitors...");
+            Console.WriteLine("Generating Monitors...");
 
             ProtoMessageFile messageFile = new ProtoMessageFile();
             messageFile.Name = "DiagnosticsMonitors";
@@ -675,34 +674,6 @@ namespace Tango.PMRGenerator.CLI
             File.WriteAllText(Path.Combine(pmrFolder, "Diagnostics", messageFile.Name + ".proto"), messageString);
         }
 
-        private static void GenerateInsightsMonitors(ObservablesContext db, string pmrFolder)
-        {
-            Console.WriteLine("Generating Insights Monitors...");
-
-            ProtoMessageFile messageFile = new ProtoMessageFile();
-            messageFile.Name = "InsightsMonitors";
-            messageFile.Package = "Tango.PMR.Insights";
-
-            foreach (var monitor in db.TechMonitors.ToList().OrderBy(x => x.Code))
-            {
-                var prop = new ProtoProperty();
-                prop.Name = monitor.Name.Replace(" ", "");
-                prop.Description = monitor.Description;
-                prop.Type = "double";
-
-                if (monitor.MultiChannel)
-                {
-                    prop.Repeated = true;
-                }
-
-                messageFile.Properties.Add(prop);
-            }
-
-            String messageString = messageFile.GenerateCode();
-
-            File.WriteAllText(Path.Combine(pmrFolder, "Insights", messageFile.Name + ".proto"), messageString);
-        }
-
         private static void GenerateInterfaceIOs(ObservablesContext db, String pmrFolder)
         {
             Console.WriteLine("Generating Interface IOs...");
@@ -777,15 +748,19 @@ namespace Tango.PMRGenerator.CLI
 
             if (db_des != null)
             {
-                DbPropertyExtensionModel rangeDescription = null;
+                RangeDescriptionModel rangeDescription = null;
 
                 try
                 {
-                    rangeDescription = JsonConvert.DeserializeObject<DbPropertyExtensionModel>(db_des.ColumnDescription);
+                    rangeDescription = JsonConvert.DeserializeObject<RangeDescriptionModel>(db_des.ColumnDescription);
                 }
                 catch { }
 
-                if (rangeDescription == null)
+                if (rangeDescription != null && rangeDescription.Description != null)
+                {
+                    return rangeDescription.Description.ToLines().Take(1).Concat(rangeDescription.Description.ToLines().Skip(1).Select(x => "//" + x)).Join(Environment.NewLine);
+                }
+                else
                 {
                     return db_des.ColumnDescription.ToLines().Take(1).Concat(db_des.ColumnDescription.ToLines().Skip(1).Select(x => "//" + x)).Join(Environment.NewLine);
                 }