From bd5359f542a3fb1f10f050fb29498b0db3b52173 Mon Sep 17 00:00:00 2001 From: wmayer Date: Mon, 10 Dec 2012 14:02:37 +0100 Subject: [PATCH] Some little fixes --- src/Base/FileInfo.cpp | 1 + .../Resources/icons/PartDesign_Mirrored.svg | 2129 ++++++++++++++--- src/Mod/Sketcher/App/SketchObject.cpp | 2 + 3 files changed, 1809 insertions(+), 323 deletions(-) diff --git a/src/Base/FileInfo.cpp b/src/Base/FileInfo.cpp index 80c6ea43b..0309cda32 100644 --- a/src/Base/FileInfo.cpp +++ b/src/Base/FileInfo.cpp @@ -154,6 +154,7 @@ std::string FileInfo::getTempFileName(const char* FileName, const char* Path) // this already creates the file GetTempFileNameW(path.c_str(),file.c_str(),0,buf); + DeleteFileW(buf); return std::string(ConvertFromWideString(std::wstring(buf))); #else diff --git a/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Mirrored.svg b/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Mirrored.svg index beda7d7e3..a96c5cb67 100644 --- a/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Mirrored.svg +++ b/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Mirrored.svg @@ -12,344 +12,1793 @@ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="64px" height="64px" - id="svg3364" + id="svg5821" sodipodi:version="0.32" inkscape:version="0.48.3.1 r9886" - sodipodi:docname="PartDesign_Mirrored.svg" + sodipodi:docname="PartDesign_Mirrored_normandc.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" - version="1.1"> + version="1.1" + inkscape:export-filename="/media/data/Yorik/FreeCAD/icons/Sketcher.png" + inkscape:export-xdpi="45" + inkscape:export-ydpi="45"> + id="defs5823"> + id="linearGradient4773"> + id="stop4775" /> + id="stop4777" /> - - + id="linearGradient4629"> + id="stop4631" /> + id="stop4633" /> - + + + + + + + + + gradientTransform="matrix(-1,0,0,1,2199.356,0)" /> + id="perspective5829" /> - - + xlink:href="#linearGradient6349" + id="radialGradient6355" + cx="1103.6399" + cy="1424.4465" + fx="1103.6399" + fy="1424.4465" + r="194.40614" + gradientTransform="matrix(-1.4307499,-1.3605156e-7,-1.202713e-8,0.1264801,2674.7488,1244.2826)" + gradientUnits="userSpaceOnUse" /> + y2="100.2725" + x2="672.73157" + y1="100.79263" + x1="635.40765" + gradientTransform="matrix(5.0014507,-3.4620165,0,3.8836567,-2288.049,3040.9534)" + gradientUnits="userSpaceOnUse" + id="linearGradient4018" + xlink:href="#linearGradient3864-0-2" + inkscape:collect="always" /> + + style="stop-color:#0619c0;stop-opacity:1;" /> + + + + + + + + + + + style="stop-color:#379cfb;stop-opacity:1;" /> - - - + gradientTransform="matrix(5.0014507,2.1019385,0,3.8836567,-2396.4918,-633.29609)" + x1="663.32715" + y1="114.56509" + x2="709.04407" + y2="48.117603" /> - - - - - + gradientTransform="matrix(5.0014507,-3.4620165,0,3.8836567,-2288.049,3040.9534)" + x1="635.40765" + y1="100.79263" + x2="672.73157" + y2="100.2725" /> - - - - - - - - - - - - + gradientTransform="matrix(5.0014507,2.1019385,0,3.8836567,-2396.5656,-718.59027)" + x1="634.20868" + y1="91.597527" + x2="679.06909" + y2="102.88628" /> - - - - - + + + + + + + + + + + + + + + - - - - - + gradientTransform="matrix(5.0014507,2.1019385,0,3.8836567,-2396.4918,-633.29609)" + x1="663.32715" + y1="114.56509" + x2="709.04407" + y2="48.117603" /> + id="linearGradient3864-0-24"> + style="stop-color:#0619c0;stop-opacity:1;" /> + style="stop-color:#379cfb;stop-opacity:1;" /> - + + + + + + + + + + + inkscape:collect="always" + xlink:href="#linearGradient3864-0-21" + id="linearGradient4108-1" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(5.0014507,2.1019385,0,3.8836567,-2396.4918,-633.29609)" + x1="663.32715" + y1="114.56509" + x2="709.04407" + y2="48.117603" /> + + style="stop-color:#0619c0;stop-opacity:1;" /> + style="stop-color:#379cfb;stop-opacity:1;" /> - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + inkscape:window-width="1863" + inkscape:window-height="1056" + inkscape:window-x="57" + inkscape:window-y="24" + inkscape:window-maximized="1" + inkscape:snap-nodes="true" + inkscape:object-nodes="true" /> + id="metadata5826"> image/svg+xml - + @@ -391,39 +1837,76 @@ id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer"> + + + + id="g4242"> + inkscape:connector-curvature="0" + id="path4305" + d="m 19.855057,44.511095 21.37055,-5.33271 1.41415,-14.495039 -11.330019,-3.204657 -0.02425,13.738206 z" + style="opacity:0.57749999;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.41415024px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + + + + + + + + + + + - - - + sodipodi:nodetypes="cccc" + inkscape:connector-curvature="0" + id="path4234" + d="m 29.958813,50.816913 c 11.9375,5.107125 20.223759,7.297632 33.205138,3.999909 0,0 0.02872,-4.021021 0.04777,-8.394507 -12.106242,10.271845 -25.440408,7.392093 -33.252908,4.394598 z" + style="opacity:0.57700004;fill:#000000;fill-opacity:1;stroke:none" /> diff --git a/src/Mod/Sketcher/App/SketchObject.cpp b/src/Mod/Sketcher/App/SketchObject.cpp index 78a76007b..1f1278d13 100644 --- a/src/Mod/Sketcher/App/SketchObject.cpp +++ b/src/Mod/Sketcher/App/SketchObject.cpp @@ -165,6 +165,8 @@ int SketchObject::solve() for (std::vector::iterator it = geomlist.begin(); it != geomlist.end(); ++it) if (*it) delete *it; } + + return err; } int SketchObject::setDatum(int ConstrId, double Datum)