Skip to content

Commit

Permalink
- moved visualizationXML dump to extra files
Browse files Browse the repository at this point in the history
- dump ast for complex expressions in visualization xml

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@25637 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
Volker Waurich committed Apr 20, 2015
1 parent da1dbb5 commit eff2d7e
Show file tree
Hide file tree
Showing 11 changed files with 1,914 additions and 507 deletions.
377 changes: 0 additions & 377 deletions Compiler/BackEnd/HpcOmTaskGraph.mo

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Compiler/SimCode/SimCodeUtil.mo
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ import SymbolicJacobian;
import System;
import Util;
import ValuesUtil;
import HpcOmTaskGraph;
import VisualXML;

// =============================================================================
// section for public function for SimCodeTV
Expand Down Expand Up @@ -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");
Expand Down
61 changes: 0 additions & 61 deletions Compiler/Template/GraphMLDumpTpl.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -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;
19 changes: 0 additions & 19 deletions Compiler/Template/GraphMLDumpTplTV.mo
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
7 changes: 6 additions & 1 deletion Compiler/Template/Makefile.common
Original file line number Diff line number Diff line change
@@ -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)

Expand Down Expand Up @@ -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)

0 comments on commit eff2d7e

Please sign in to comment.