- moved visualizationXML dump to extra files

- dump ast for complex expressions in visualization xml git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@25637 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Apr 20, 2015 · eff2d7e · eff2d7e
1 parent da1dbb5
commit eff2d7e
Show file tree

Hide file tree

Showing 11 changed files with 1,914 additions and 507 deletions.
diff --git a/Compiler/BackEnd/HpcOmTaskGraph.mo b/Compiler/BackEnd/HpcOmTaskGraph.mo
diff --git a/Compiler/SimCode/SimCodeUtil.mo b/Compiler/SimCode/SimCodeUtil.mo
@@ -102,7 +102,7 @@ import SymbolicJacobian;
 import System;
 import Util;
 import ValuesUtil;
-import HpcOmTaskGraph;
+import VisualXML;
 
 // =============================================================================
 // section for public function for SimCodeTV
@@ -1559,7 +1559,7 @@ algorithm
 
       backendMapping = setUpBackendMapping(inBackendDAE);
       if Flags.isSet(Flags.VISUAL_XML) then
-        HpcOmTaskGraph.visualizationInfoXML(inBackendDAE, filenamePrefix);
+        VisualXML.visualizationInfoXML(inBackendDAE, filenamePrefix);
       end if;
 
       // fcall(Flags.FAILTRACE, print, "is that Cpp? : " + Dump.printBoolStr(ifcpp) + "\n");

diff --git a/Compiler/Template/GraphMLDumpTpl.tpl b/Compiler/Template/GraphMLDumpTpl.tpl
@@ -358,66 +358,5 @@ template dumpShapeType(GraphML.ShapeType shape)
     end match
 end dumpShapeType;
 
-//------------------------------------
-// Section for Visualization XML Dump
-//------------------------------------
-
-template dumpVisualization(array<GraphML.VisualizationTPL> vis, String fileName)
-::=
-  let()= textFile(dumpVisualization1(vis), fileName)
-  ""
-end dumpVisualization;
-
-template dumpVisualization1(array<GraphML.VisualizationTPL> visArr)
-::=
-  let visDump = arrayList(visArr) |> vis => dumpVis(vis) ; separator="\n"
-  <<
-  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-  <visualization>
-  <%visDump%>
-  </visualization>
-  >>
-end dumpVisualization1;
-
-template dumpVis(GraphML.VisualizationTPL vis)
-::=
-    match vis
-        case vis as SHAPE_TPL(__) then
-          let colorDump = arrayList(color) |> col => <<
-          <%(col)%>
-          >> ; separator=";"
-          let rDump = dumpVec(arrayList(r))
-          let r_shapeDump = dumpVec(arrayList(r_shape))
-          let lDDump = dumpVec(arrayList(lengthDir))
-          let wDDump = dumpVec(arrayList(widthDir))
-          let TDump = arrayList(T) |> T0 => <<
-          <%dumpVec(T0)%>
-          >> ; separator=";"
-            <<
-              <shape>
-                  <ident><%ident%></ident>
-                  <type><%shapeType%></type>
-                  <T>{<%TDump%>}</T>
-                  <r><%rDump%></r>
-                  <r_shape><%r_shapeDump%></r_shape>
-                  <lengthDir><%lDDump%></lengthDir>
-                  <widthDir><%wDDump%></widthDir>
-                  <length><%length%></length>
-                  <width><%width%></width>
-                  <height><%height%></height>
-                  <extra><%extra%></extra>
-                  <color>{<%colorDump%>}</color>
-                  <specularCoeff><%specularCoeff%></specularCoeff>
-              </shape>
-            >>
-    end match
-end dumpVis;
-
-template dumpVec (list<String> vector)
-::=
-let vecDump = vector |> vec => <<<%vec%>>> ; separator=";"
-<<{<%vecDump%>}>>
-end dumpVec;
-
 annotation(__OpenModelica_Interface="susan");
 end GraphMLDumpTpl;
diff --git a/Compiler/Template/GraphMLDumpTplTV.mo b/Compiler/Template/GraphMLDumpTplTV.mo
@@ -138,25 +138,6 @@ interface package GraphMLDumpTplTV
   end Util;
 
   package GraphML
-
-  uniontype VisualizationTPL
-    record SHAPE_TPL
-      String ident;
-      String shapeType;
-      array<list<String>> T;
-      array<String> r;
-      array<String> r_shape;
-      array<String> lengthDir;
-      array<String> widthDir;
-      String length;
-      String width;
-      String height;
-      String extra;
-      array<String> color;
-      String specularCoeff;
-    end SHAPE_TPL;
-  end VisualizationTPL;
-
     uniontype GraphInfo
       record GRAPHINFOARR
         array<Graph> graphs;

diff --git a/Compiler/Template/Makefile.common b/Compiler/Template/Makefile.common
@@ -1,6 +1,6 @@
 .PHONY : all
 
-GENERATED_FILES=AbsynDumpTpl.mo CodegenUtil.mo CodegenC.mo CodegenFMU.mo CodegenCSharp.mo CodegenQSS.mo CodegenCpp.mo CodegenCppHpcom.mo CodegenFMUCpp.mo CodegenModelica.mo DAEDumpTpl.mo ExpressionDumpTpl.mo GraphvizDump.mo GraphMLDumpTpl.mo NFInstDumpTpl.mo SimCodeDump.mo Unparsing.mo SCodeDumpTpl.mo CodegenAdevs.mo CodegenSparseFMI.mo CodegenXML.mo CodegenJava.mo CodegenJS.mo TplCodegen.mo TaskSystemDump.mo GenerateAPIFunctionsTpl.mo
+GENERATED_FILES=AbsynDumpTpl.mo CodegenUtil.mo CodegenC.mo CodegenFMU.mo CodegenCSharp.mo CodegenQSS.mo CodegenCpp.mo CodegenCppHpcom.mo CodegenFMUCpp.mo CodegenModelica.mo DAEDumpTpl.mo ExpressionDumpTpl.mo GraphvizDump.mo GraphMLDumpTpl.mo NFInstDumpTpl.mo SimCodeDump.mo Unparsing.mo SCodeDumpTpl.mo CodegenAdevs.mo CodegenSparseFMI.mo CodegenXML.mo CodegenJava.mo CodegenJS.mo TplCodegen.mo TaskSystemDump.mo GenerateAPIFunctionsTpl.mo VisualXMLTpl.mo
 
 all : $(GENERATED_FILES)
 
@@ -133,6 +133,11 @@ GenerateAPIFunctionsTpl.mo : GenerateAPIFunctionsTpl.tpl SimCodeTV.mo
 	@echo " ** GenerateAPIFunctionsTpl template compilation ** "
 	$(OMC) $< > $@.log || (cat $@.log && false)
 	@echo " "
+
+VisualXMLTpl.mo : VisualXMLTpl.tpl VisualXMLTplTV.mo
+	@echo " ** VisualXMLTpl template compilation ** "
+	$(OMC) $< > $@.log || (cat $@.log && false)
+	@echo " "
 
 clean:
 	rm -f $(GENERATED_FILES)