Commit fd06a5b8 authored by Jan Möbius's avatar Jan Möbius

Merge branch 'master' into AngleBasedEdgeSelection

parents b9215ce6 dee888ec
......@@ -60,9 +60,7 @@
#include <OpenFlipper/common/GlobalOptions.hh>
//#include <QGLWidget>
#include <../ObjectTypes/TriangleMesh/TriangleMesh.hh>
#include <../ObjectTypes/PolyMesh/PolyMesh.hh>
#include "PluginFunctions.hh"
#include "PluginFunctionsCore.hh"
namespace PluginFunctions {
......
......@@ -124,7 +124,7 @@ struct DLLEXPORT PostProcessorOutput
// in/out format descriptor
struct PostProcessorFormatDesc
{
PostProcessorFormatDesc(bool _multisampled = false) : supportMultisampling_(_multisampled),outputFormat_(PostProcessorFormat_DONTCARE)
explicit PostProcessorFormatDesc(bool _multisampled = false) : supportMultisampling_(_multisampled),outputFormat_(PostProcessorFormat_DONTCARE)
{}
......
......@@ -78,7 +78,7 @@ class DLLEXPORT WhatsThisGenerator: public QObject {
const QString plugin_name_;
public:
WhatsThisGenerator(const QString &_plugin_name);
explicit WhatsThisGenerator(const QString &_plugin_name);
QString generateLink(const QString &_ref = "", const QString &_site = "index.html") const;
......
rmdir libs_required\OpenMesh /s /q
rmdir libs_required /s /q
git submodule init
......@@ -45,6 +45,8 @@ set BUILD_PLATFORM=VS2013
del *.exe
"C:\Program Files (x86)\CMake\bin\cmake.exe" -DGTEST_PREFIX="%LIBPATH_BASE%\%ARCHITECTURE%\%GTESTVERSION%" -G "%GENERATOR%" -DCMAKE_BUILD_TYPE=Release -DOPENFLIPPER_BUILD_UNIT_TESTS=TRUE %CMAKE_CONFIGURATION% ..
%VS_PATH% /Build "Release" OpenFlipper.sln /Project "PACKAGE"
IF %errorlevel% NEQ 0 exit /b %errorlevel%
......@@ -58,6 +60,11 @@ run_tests.bat
IF %errorlevel% NEQ 0 exit /b %errorlevel%
cd ..
cd Build
dir
......
rmdir libs_required\OpenMesh /s /q
rmdir libs_required /s /q
git submodule init
......@@ -45,6 +45,8 @@ set BUILD_PLATFORM=VS2015
del *.exe
"C:\Program Files (x86)\CMake\bin\cmake.exe" -DGTEST_PREFIX="%LIBPATH_BASE%\%ARCHITECTURE%\%GTESTVERSION%" -G "%GENERATOR%" -DCMAKE_BUILD_TYPE=Release -DOPENFLIPPER_BUILD_UNIT_TESTS=TRUE %CMAKE_CONFIGURATION% ..
%VS_PATH% /Build "Release" OpenFlipper.sln /Project "PACKAGE"
IF %errorlevel% NEQ 0 exit /b %errorlevel%
......@@ -58,6 +60,11 @@ run_tests.bat
IF %errorlevel% NEQ 0 exit /b %errorlevel%
cd ..
cd Build
dir
......
rmdir libs_required\OpenMesh /s /q
rmdir libs_required /s /q
git submodule init
......@@ -45,6 +45,8 @@ set BUILD_PLATFORM=VS2015
del *.exe
"C:\Program Files (x86)\CMake\bin\cmake.exe" -DGTEST_PREFIX="%LIBPATH_BASE%\%ARCHITECTURE%\%GTESTVERSION%" -G "%GENERATOR%" -DCMAKE_BUILD_TYPE=Release -DOPENFLIPPER_BUILD_UNIT_TESTS=TRUE %CMAKE_CONFIGURATION% ..
%VS_PATH% /Build "Release" OpenFlipper.sln /Project "PACKAGE"
IF %errorlevel% NEQ 0 exit /b %errorlevel%
......@@ -58,6 +60,11 @@ run_tests.bat
IF %errorlevel% NEQ 0 exit /b %errorlevel%
cd ..
cd Build
dir
......
......@@ -22,7 +22,7 @@ echo "Please Wait ..."
cppcheck --enable=all \
-j4 \
--quiet \
-i libs_required \
-i OpenFlipper/libs_required/OpenMesh \
-i build-release \
-i build-debug \
-i .svn \
......@@ -59,9 +59,11 @@ echo "CPPCHECK Summary"
echo "=============================================================================="
echo -e "${NC}"
if [ $COUNT -gt 25 ]; then
MAX_ERROR=136
if [ $COUNT -gt $MAX_ERROR ]; then
echo -e ${WARNING}
echo "Total CPPCHECK error Count is $COUNT, which is too High! CPPCHECK Run failed";
echo "Total CPPCHECK error Count is $COUNT, which is too High (Max is $MAX_ERROR)! CPPCHECK Run failed";
echo -e "${NC}"
exit 1;
else
......
#!/bin/bash
if [ ! -d build-release ]; then
mkdir build-release
fi
cd build-release
cmake -DCMAKE_BUILD_TYPE=Release -DOPENFLIPPER_BUILD_UNIT_TESTS=FALSE ../
make doc >> Doxygen-warning.log 2> Doxygen-error.log
# Copy to webserver
scp -r -P 2222 Build/share/OpenFlipper/Doc/DeveloperHTML/* hudson@web4-info8:OpenFlipper-Free-Daily/Doc/Free/Developer
scp -r -P 2222 Build/share/OpenFlipper/Doc/UserHTML/* hudson@web4-info8:OpenFlipper-Free-Daily/Doc/Free/User
......@@ -24,7 +24,7 @@ if [ "$COMPILER" == "gcc" ]; then
elif [ "$COMPILER" == "clang" ]; then
OPTIONS="$OPTIONS -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang -DGTEST_PREFIX=~/sw/gtest-1.7.0-clang/ "
OPTIONS="$OPTIONS -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang -DGTEST_PREFIX=~/sw/gtest-1.8.0-clang/ "
# Build options with icecc /not working due to strange symbol errors
# OPTIONS="$OPTIONS -DCMAKE_CXX_COMPILER=/usr/lib/icecc/bin/g++ -DCMAKE_C_COMPILER=/usr/lib/icecc/bin/gcc -DGTEST_PREFIX=~/sw/gtest-1.7.0-clang/ "
......@@ -61,7 +61,7 @@ echo "Full cmake options: $OPTIONS "
########################################
# Build daemon cleanup code
########################################
rm -rf libs_required/OpenMesh
rm -rf libs_required
########################################
# Fetch submodules
......
########################################
# Build daemon cleanup code
########################################
rm -rf libs_required/OpenMesh
rm -rf libs_required
########################################
......
......@@ -175,7 +175,7 @@ class PreloadThread : public QThread
*
* @param aggregator aggregator managing the different threads
*/
PreloadThread(PreloadAggregator *aggregator) : aggregator_(aggregator) {
explicit PreloadThread(PreloadAggregator *aggregator) : aggregator_(aggregator) {
}
public:
......
......@@ -65,7 +65,7 @@ class SpinBoxEventFilter : public QObject {
Q_OBJECT
public:
SpinBoxEventFilter(QObject *parent = 0);
explicit SpinBoxEventFilter(QObject *parent = 0);
virtual ~SpinBoxEventFilter();
bool eventFilter(QObject *object, QEvent *event);
......
......@@ -61,8 +61,6 @@
#include "OpenFlipper/widgets/loadWidget/loadWidget.hh"
#include "OpenFlipper/widgets/addEmptyWidget/addEmptyWidget.hh"
#include <ObjectTypes/PolyMesh/PolyMesh.hh>
#include "OpenFunctionThread.hh"
void Core::resetScenegraph( bool _resetTrackBall ) {
......@@ -178,7 +176,7 @@ void Core::slotExecuteAfterStartup() {
// If the file was given with the polymesh option, open them as polymeshes.
if (commandLineFileNames_[i].second)
loadObject(DATA_POLY_MESH, QString::fromStdString(commandLineFileNames_[i].first));
loadObject(typeId("PolyMesh"), QString::fromStdString(commandLineFileNames_[i].first));
else {
loadObject(QString::fromStdString(commandLineFileNames_[i].first));
}
......
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
version="1.1"
id="svg2985"
height="48px"
width="48px">
<defs
id="defs2987">
<marker
style="overflow:visible;"
id="Arrow2Mend"
refX="0.0"
refY="0.0"
orient="auto">
<path
transform="scale(0.6) rotate(180) translate(0,0)"
d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
style="fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
id="path3812" />
</marker>
<marker
style="overflow:visible;"
id="Arrow2Lend"
refX="0.0"
refY="0.0"
orient="auto">
<path
transform="scale(1.1) rotate(180) translate(1,0)"
d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
style="fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
id="path3806" />
</marker>
<marker
style="overflow:visible;"
id="Arrow1Lend"
refX="0.0"
refY="0.0"
orient="auto">
<path
transform="scale(0.8) rotate(180) translate(12.5,0)"
style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;"
d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
id="path3788" />
</marker>
<marker
style="overflow:visible;"
id="Arrow2Mend2"
refX="0.0"
refY="0.0"
orient="auto">
<path
transform="scale(0.6) rotate(180) translate(0,0)"
d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
style="stroke-linejoin:round;stroke:#ffd5d5;stroke-width:0.62500000;fill:#ffd5d5;fill-rule:evenodd"
id="path5532" />
</marker>
<marker
style="overflow:visible"
id="Arrow2Mend2-3"
refX="0"
refY="0"
orient="auto">
<path
transform="scale(-0.6,-0.6)"
d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
style="fill:#ffd5d5;fill-rule:evenodd;stroke:#ffd5d5;stroke-width:0.625;stroke-linejoin:round"
id="path5532-6" />
</marker>
<marker
style="overflow:visible;"
id="Arrow2Mend2I"
refX="0.0"
refY="0.0"
orient="auto">
<path
transform="scale(0.6) rotate(180) translate(0,0)"
d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
style="stroke-linejoin:round;fill-rule:evenodd;stroke:#e5ffd5;stroke-width:0.62500000;fill:#e5ffd5"
id="path5592" />
</marker>
<marker
style="overflow:visible;"
id="Arrow2Mend2m"
refX="0.0"
refY="0.0"
orient="auto">
<path
transform="scale(0.6) rotate(180) translate(0,0)"
d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
style="stroke-linejoin:round;fill-rule:evenodd;stroke:#000000;stroke-width:0.62500000;fill:#000000"
id="path5695" />
</marker>
<marker
style="overflow:visible;"
id="Arrow2Mend2Ix"
refX="0.0"
refY="0.0"
orient="auto">
<path
transform="scale(0.6) rotate(180) translate(0,0)"
d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
style="stroke-linejoin:round;stroke:#000000;stroke-width:0.62500000;fill:#000000;fill-rule:evenodd"
id="path5742" />
</marker>
</defs>
<metadata
id="metadata2990">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
id="layer1">
<path
transform="matrix(0.94531827,-0.02406342,0.02406342,0.94531827,-11.481917,-8.31524)"
d="M 26.314475,10.472835 39.136835,34.081523 12.279931,33.381669 z"
id="path3003"
style="fill:#ffd5d5;stroke:#000000;stroke-width:1;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
transform="matrix(0.67118725,-8.6811777e-4,8.6811777e-4,0.67118725,32.29245,-10.176746)"
d="M 5.101271,16.07918 22.695438,28.935484 15.905264,49.641347 -5.8854624,49.581971 -12.562697,28.839411 z"
id="path3005"
style="fill:#ccffaa;stroke:#000000;stroke-width:1;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
id="path3779"
d="M 2.8789347,31.231467 40.65864,31.281977"
style="stroke-linejoin:miter;marker-end:url(#Arrow2Mend2m);stroke-opacity:1;stroke:#000000;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-width:2;fill:none" />
</g>
</svg>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
version="1.1"
id="svg2985"
height="48px"
width="48px">
<defs
id="defs2987">
<marker
style="overflow:visible;"
id="Arrow2Mend"
refX="0.0"
refY="0.0"
orient="auto">
<path
transform="scale(0.6) rotate(180) translate(0,0)"
d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
style="fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
id="path3812" />
</marker>
<marker
style="overflow:visible;"
id="Arrow2Lend"
refX="0.0"
refY="0.0"
orient="auto">
<path
transform="scale(1.1) rotate(180) translate(1,0)"
d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
style="fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
id="path3806" />
</marker>
<marker
style="overflow:visible;"
id="Arrow1Lend"
refX="0.0"
refY="0.0"
orient="auto">
<path
transform="scale(0.8) rotate(180) translate(12.5,0)"
style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;"
d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
id="path3788" />
</marker>
<marker
style="overflow:visible;"
id="Arrow2Mend2"
refX="0.0"
refY="0.0"
orient="auto">
<path
transform="scale(0.6) rotate(180) translate(0,0)"
d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
style="stroke-linejoin:round;stroke:#ffd5d5;stroke-width:0.62500000;fill:#ffd5d5;fill-rule:evenodd"
id="path5532" />
</marker>
<marker
style="overflow:visible"
id="Arrow2Mend2-3"
refX="0"
refY="0"
orient="auto">
<path
transform="scale(-0.6,-0.6)"
d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
style="fill:#ffd5d5;fill-rule:evenodd;stroke:#ffd5d5;stroke-width:0.625;stroke-linejoin:round"
id="path5532-6" />
</marker>
<marker
style="overflow:visible;"
id="Arrow2Mend2I"
refX="0.0"
refY="0.0"
orient="auto">
<path
transform="scale(0.6) rotate(180) translate(0,0)"
d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
style="stroke-linejoin:round;fill-rule:evenodd;stroke:#e5ffd5;stroke-width:0.62500000;fill:#e5ffd5"
id="path5592" />
</marker>
<marker
style="overflow:visible;"
id="Arrow2Mend2m"
refX="0.0"
refY="0.0"
orient="auto">
<path
transform="scale(0.6) rotate(180) translate(0,0)"
d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
style="stroke-linejoin:round;fill-rule:evenodd;stroke:#000000;stroke-width:0.62500000;fill:#000000"
id="path5695" />
</marker>
<marker
style="overflow:visible;"
id="Arrow2Mend2Ix"
refX="0.0"
refY="0.0"
orient="auto">
<path
transform="scale(0.6) rotate(180) translate(0,0)"
d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
style="stroke-linejoin:round;stroke:#000000;stroke-width:0.62500000;fill:#000000;fill-rule:evenodd"
id="path5742" />
</marker>
</defs>
<metadata
id="metadata2990">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
id="layer1">
<path
transform="matrix(0.94531827,-0.02406342,0.02406342,0.94531827,-11.481917,-8.31524)"
d="M 26.314475,10.472835 39.136835,34.081523 12.279931,33.381669 z"
id="path3003"
style="fill:#ffd5d5;stroke:#000000;stroke-width:1;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
transform="matrix(0.67118725,-8.6811777e-4,8.6811777e-4,0.67118725,32.29245,-10.176746)"
d="M 5.101271,16.07918 22.695438,28.935484 15.905264,49.641347 -5.8854624,49.581971 -12.562697,28.839411 z"
id="path3005"
style="fill:#ccffaa;stroke:#000000;stroke-width:1;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
id="path3779"
d="M 43.681003,31.231467 5.9012973,31.281977"
style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Mend2m)" />
</g>
</svg>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="48px"
height="48px"
id="svg2985"
version="1.1"
inkscape:version="0.48.5 r10040"
sodipodi:docname="Mesh-Convert.svg"
inkscape:export-filename="/home/schultz/Arbeit/2016/OpenFlipper-Free/OpenFlipper/Icons/Mesh-Convert.png"
inkscape:export-xdpi="240"
inkscape:export-ydpi="240">
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="19.79899"
inkscape:cx="37.322709"
inkscape:cy="24.88072"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:grid-bbox="true"
inkscape:document-units="px"
inkscape:window-width="2560"
inkscape:window-height="1338"
inkscape:window-x="0"
inkscape:window-y="31"
inkscape:window-maximized="1" />
<defs
id="defs2987">
<marker
inkscape:stockid="Arrow2Mend"
orient="auto"
refY="0.0"
refX="0.0"
id="Arrow2Mend"
style="overflow:visible;">
<path
id="path3812"
style="fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
transform="scale(0.6) rotate(180) translate(0,0)" />
</marker>
<marker
inkscape:stockid="Arrow2Lend"
orient="auto"
refY="0.0"
refX="0.0"
id="Arrow2Lend"
style="overflow:visible;">
<path
id="path3806"
style="fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
transform="scale(1.1) rotate(180) translate(1,0)" />
</marker>
<marker
inkscape:stockid="Arrow1Lend"
orient="auto"
refY="0.0"
refX="0.0"
id="Arrow1Lend"
style="overflow:visible;">
<path
id="path3788"
d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;"
transform="scale(0.8) rotate(180) translate(12.5,0)" />
</marker>
<marker
inkscape:stockid="Arrow2Mend2"
orient="auto"
refY="0.0"
refX="0.0"
id="Arrow2Mend2"
style="overflow:visible;">
<path
id="path5532"
style="stroke-linejoin:round;stroke:#ffd5d5;stroke-width:0.62500000;fill:#ffd5d5;fill-rule:evenodd"
d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
transform="scale(0.6) rotate(180) translate(0,0)" />
</marker>
<marker
inkscape:stockid="Arrow2Mend2"
orient="auto"
refY="0"
refX="0"
id="Arrow2Mend2-3"
style="overflow:visible">
<path
id="path5532-6"
style="fill:#ffd5d5;fill-rule:evenodd;stroke:#ffd5d5;stroke-width:0.625;stroke-linejoin:round"
d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
transform="scale(-0.6,-0.6)"
inkscape:connector-curvature="0" />
</marker>
<marker
inkscape:stockid="Arrow2Mend2I"
orient="auto"
refY="0.0"
refX="0.0"
id="Arrow2Mend2I"
style="overflow:visible;">
<path
id="path5592"
style="stroke-linejoin:round;fill-rule:evenodd;stroke:#e5ffd5;stroke-width:0.62500000;fill:#e5ffd5"
d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "