Sketcher: Ellipse implementation: Art by Jim

FreeCAD · Dec 20, 2014 · c8d7f70 · c8d7f70
1 parent fc7f179
commit c8d7f70
Show file tree

Hide file tree

Showing 4 changed files with 354 additions and 18 deletions.
diff --git a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp
@@ -2569,7 +2569,7 @@ CmdSketcherCreateEllipseBy3Points::CmdSketcherCreateEllipseBy3Points()
     sToolTipText    = QT_TR_NOOP("Create an ellipse by 3 points in the sketch");
     sWhatsThis      = sToolTipText;
     sStatusTip      = sToolTipText;
-    sPixmap         = "Sketcher_Conics_Ellipse_3points";
+    sPixmap         = "Sketcher_CreateEllipse_3points";
     eType           = ForEdit;
 }
 
@@ -3009,19 +3009,19 @@ Gui::Action * CmdSketcherCompCreateConic::createAction(void)
     applyCommandData(this->className(), pcAction);
 
     QAction* ellipseByCenter = pcAction->addAction(QString());
-    ellipseByCenter->setIcon(Gui::BitmapFactory().pixmapFromSvg("Sketcher_CreateEllipse", QSize(32,32)));
+    ellipseByCenter->setIcon(Gui::BitmapFactory().pixmapFromSvg("Sketcher_CreateEllipse", QSize(24,24)));
      /// @todo replace with correct icon
     QAction* ellipseBy3Points = pcAction->addAction(QString());
-    ellipseBy3Points->setIcon(Gui::BitmapFactory().pixmapFromSvg("Sketcher_Conics_Ellipse_3points", QSize(32,32)));
+    ellipseBy3Points->setIcon(Gui::BitmapFactory().pixmapFromSvg("Sketcher_CreateEllipse_3points", QSize(24,24)));
 
     QAction* arcofellipse = pcAction->addAction(QString());
-    arcofellipse->setIcon(Gui::BitmapFactory().pixmapFromSvg("Sketcher_Elliptical_Arc", QSize(32,32)));
+    arcofellipse->setIcon(Gui::BitmapFactory().pixmapFromSvg("Sketcher_Elliptical_Arc", QSize(24,24)));
 
     _pcAction = pcAction;
     languageChange();
 
     // set ellipse by center, a, b as default method
-    pcAction->setIcon(Gui::BitmapFactory().pixmapFromSvg("Sketcher_Conics", QSize(32,32)));
+    pcAction->setIcon(Gui::BitmapFactory().pixmapFromSvg("Sketcher_Conics", QSize(24,24)));
     int defaultId = 0;
     pcAction->setProperty("defaultAction", QVariant(defaultId));
 

diff --git a/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc b/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc
@@ -49,6 +49,7 @@
         <file>icons/Sketcher_CreateArc.svg</file>
         <file>icons/Sketcher_CreateCircle.svg</file>
         <file>icons/Sketcher_CreateEllipse.svg</file>
+        <file>icons/Sketcher_CreateEllipse_3points.svg</file>
         <file>icons/Sketcher_CreateFillet.svg</file>
         <file>icons/Sketcher_CreateHeptagon.svg</file>
         <file>icons/Sketcher_CreateHexagon.svg</file>

diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateEllipse.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateEllipse.svg