diff --git a/src/Gui/DockWindowManager.cpp b/src/Gui/DockWindowManager.cpp index b25845f19..919abf84f 100644 --- a/src/Gui/DockWindowManager.cpp +++ b/src/Gui/DockWindowManager.cpp @@ -168,8 +168,8 @@ QDockWidget* DockWindowManager::addDockWindow(const char* name, QWidget* widget, QWidget* DockWindowManager::getDockWindow(const char* name) const { for (QList::ConstIterator it = d->_dockedWindows.begin(); it != d->_dockedWindows.end(); ++it) { - if ((*it)->objectName() == QLatin1String(name)) - return (*it)->widget(); + if ((*it)->objectName() == QLatin1String(name)) + return (*it)->widget(); } return 0; diff --git a/src/Mod/Drawing/App/DrawingExport.cpp b/src/Mod/Drawing/App/DrawingExport.cpp index 266dd719a..6b63e5780 100644 --- a/src/Mod/Drawing/App/DrawingExport.cpp +++ b/src/Mod/Drawing/App/DrawingExport.cpp @@ -170,23 +170,16 @@ void SVGOutput::printEllipse(const BRepAdaptor_Curve& c, int id, std::ostream& o // See also https://developer.mozilla.org/en/SVG/Tutorial/Paths gp_Dir xaxis = ellp.XAxis().Direction(); - Standard_Real angle = xaxis.Angle(gp_Dir(1,0,0)); - Standard_Real angle2 = xaxis.Angle(gp_Dir(0,1,0)); - + Standard_Real angle = xaxis.AngleWithRef(gp_Dir(1,0,0),gp_Dir(0,0,-1)); angle = Base::toDegrees(angle); - angle2 = Base::toDegrees(angle2); - + char las = (l-f > D_PI) ? '1' : '0'; // large-arc-flag char swp = (a < 0) ? '1' : '0'; // sweep-flag, i.e. clockwise (0) or counter-clockwise (1) - if (angle2 > 90) { - angle = 180 - angle; - } - out << "" << endl; + << e.X() << " " << e.Y() << "\" />" << std::endl; } }