Skip to content
This repository was archived by the owner on Apr 3, 2019. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitvalidfiles
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
./openmodelica/fmi/CoSimulationStandAlone/testedFMU/fmusdk1.0.2/bouncingBall.fmu
./openmodelica/fmi/CoSimulationStandAlone/testedFMU/fmusdk1.0.2/vanDerPol.fmu
./openmodelica/java/dummy_test.c
./openmodelica/xml/testVisRef_visual.xml
./simulation/libraries/3rdParty/DrModelica/ReferenceFiles/ABCDsystem_ref.mat
./simulation/libraries/3rdParty/DrModelica/ReferenceFiles/Activate_ref.mat
./simulation/libraries/3rdParty/DrModelica/ReferenceFiles/AddEmpty_ref.mat
Expand Down
4 changes: 3 additions & 1 deletion openmodelica/xml/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
TEST=../../rtest -v

TESTFILES=\
testVis.mos \
XmlDumpComment.mos \
testMSD.mos \
SimpleTriggeredTrapezoid.mos \
Expand All @@ -15,7 +16,8 @@ FAILINGTESTFILES= \
DEPENDENCIES = \
*.mo \
*.mos \
Makefile
Makefile \
testVisRef_visual.xml


CLEAN = `ls | grep -w -v -f deps.tmp`
Expand Down
6 changes: 6 additions & 0 deletions openmodelica/xml/testVis.mo
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
within ;
model testVis
inner Modelica.Mechanics.MultiBody.World world(animateWorld=false)
annotation (Placement(transformation(extent={{-38,18},{-18,38}})));
annotation (uses(Modelica(version="3.2.1")), Diagram(graphics));
end testVis;
33 changes: 33 additions & 0 deletions openmodelica/xml/testVis.mos
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
// name: testVis
// keywords: visualization
// status: correct
// A test to check the proper generation of the visualization xml.
//

loadModel(Modelica,{"3.2.1"}); getErrorString();

loadFile("testVis.mo");getErrorString();
setDebugFlags("visxml"); getErrorString();
setCommandLineOptions("+n=1"); getErrorString();
simulate(testVis);getErrorString();

compareFiles("testVis_visual.xml","testVisRef_visual.xml");getErrorString();

// Result:
// true
// ""
// true
// ""
// true
// ""
// true
// ""
// record SimulationResult
// resultFile = "testVis_res.mat",
// simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 500, tolerance = 1e-006, method = 'dassl', fileNamePrefix = 'testVis', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
// messages = ""
// end SimulationResult;
// ""
// true
// ""
// endResult
69 changes: 69 additions & 0 deletions openmodelica/xml/testVisRef_visual.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<visualization>
<shape>
<ident>world.gravityArrowLine</ident>
<type>cylinder</type>
<T> <exp>1.0</exp>
<exp>0.0</exp>
<exp>0.0</exp>
<exp>0.0</exp>
<exp>1.0</exp>
<exp>0.0</exp>
<exp>0.0</exp>
<exp>0.0</exp>
<exp>1.0</exp></T>
<r> <exp>0.0</exp>
<exp>0.0</exp>
<exp>0.0</exp></r>
<r_shape> <cref>world.gravityArrowLine.r_shape[1]</cref>
<cref>world.gravityArrowLine.r_shape[2]</cref>
<cref>world.gravityArrowLine.r_shape[3]</cref></r_shape>
<lengthDir> <exp>0.0</exp>
<exp>-1.0</exp>
<exp>0.0</exp></lengthDir>
<widthDir> <exp>0.0</exp>
<exp>1.0</exp>
<exp>0.0</exp></widthDir>
<length> <cref>world.gravityArrowLine.length</cref></length>
<width> <cref>world.gravityArrowLine.width</cref></width>
<height> <cref>world.gravityArrowLine.height</cref></height>
<extra> <exp>0.0</exp></extra>
<color> <exp>0.0</exp>
<exp>230.0</exp>
<exp>0.0</exp></color>
<specCoeff> <exp>0.0</exp></specCoeff>
</shape>
<shape>
<ident>world.gravityArrowHead</ident>
<type>cone</type>
<T> <exp>1.0</exp>
<exp>0.0</exp>
<exp>0.0</exp>
<exp>0.0</exp>
<exp>1.0</exp>
<exp>0.0</exp>
<exp>0.0</exp>
<exp>0.0</exp>
<exp>1.0</exp></T>
<r> <exp>0.0</exp>
<exp>0.0</exp>
<exp>0.0</exp></r>
<r_shape> <cref>world.gravityArrowHead.r_shape[1]</cref>
<cref>world.gravityArrowHead.r_shape[2]</cref>
<cref>world.gravityArrowHead.r_shape[3]</cref></r_shape>
<lengthDir> <exp>0.0</exp>
<exp>-1.0</exp>
<exp>0.0</exp></lengthDir>
<widthDir> <exp>0.0</exp>
<exp>1.0</exp>
<exp>0.0</exp></widthDir>
<length> <cref>world.gravityArrowHead.length</cref></length>
<width> <cref>world.gravityArrowHead.width</cref></width>
<height> <cref>world.gravityArrowHead.height</cref></height>
<extra> <exp>0.0</exp></extra>
<color> <exp>0.0</exp>
<exp>230.0</exp>
<exp>0.0</exp></color>
<specCoeff> <exp>0.0</exp></specCoeff>
</shape>
</visualization>