Replace ellipses by circles: Rename classes

tony-gm · Jun 23, 2018 · 2674350 · 2674350
1 parent 769dd8f
commit 2674350
Show file tree

Hide file tree

Showing 68 changed files with 632 additions and 631 deletions.
diff --git a/dev/diagrams/classdiagram_library.dia b/dev/diagrams/classdiagram_library.dia
@@ -4768,7 +4768,7 @@
         <dia:real val="2.2000000000000002"/>
       </dia:attribute>
       <dia:attribute name="name">
-        <dia:string>#SymbolEllipse#</dia:string>
+        <dia:string>#SymbolCircle#</dia:string>
       </dia:attribute>
       <dia:attribute name="stereotype">
         <dia:string>#IF_XmlSerializableObject#</dia:string>
@@ -5309,7 +5309,7 @@
         <dia:real val="2.2000000000000002"/>
       </dia:attribute>
       <dia:attribute name="name">
-        <dia:string>#FootprintEllipse#</dia:string>
+        <dia:string>#FootprintCircle#</dia:string>
       </dia:attribute>
       <dia:attribute name="stereotype">
         <dia:string>#IF_XmlSerializableObject#</dia:string>

diff --git a/dev/diagrams/schematic_editor_fsm_statechart.dia b/dev/diagrams/schematic_editor_fsm_statechart.dia
@@ -332,7 +332,7 @@
         <dia:string>##</dia:string>
       </dia:attribute>
       <dia:attribute name="name">
-        <dia:string>#draw_ellipse#</dia:string>
+        <dia:string>#draw_circle#</dia:string>
       </dia:attribute>
     </dia:object>
     <dia:object type="UML - LargePackage" version="0" id="O7">

diff --git a/dev/diagrams/svg/classdiagram_library.svg b/dev/diagrams/svg/classdiagram_library.svg
diff --git a/dev/diagrams/svg/schematic_editor_fsm_statechart.svg b/dev/diagrams/svg/schematic_editor_fsm_statechart.svg
diff --git a/img/actions/draw_ellipse.png b/img/actions/draw_ellipse.png
diff --git a/img/images.qrc b/img/images.qrc
@@ -96,7 +96,6 @@
         <file>places/file.png</file>
         <file>empty.png</file>
         <file>actions/draw_circle.png</file>
-        <file>actions/draw_ellipse.png</file>
         <file>actions/draw_polygon.png</file>
         <file>actions/draw_rectangle.png</file>
         <file>actions/draw_netlabel.png</file>

diff --git a/libs/librepcb/common/cam/gerbergenerator.cpp b/libs/librepcb/common/cam/gerbergenerator.cpp
@@ -72,26 +72,26 @@ void GerberGenerator::drawLine(const Point& start, const Point& end, const Lengt
     linearInterpolateToPosition(end);
 }
 
-void GerberGenerator::drawEllipseOutline(const Ellipse& ellipse) noexcept
+void GerberGenerator::drawCircleOutline(const Circle& circle) noexcept
 {
-    if (ellipse.getRadiusX() == ellipse.getRadiusY()) {
-        Length outerDia = (ellipse.getRadiusX() * 2) + ellipse.getLineWidth();
-        Length innerDia = (ellipse.getRadiusX() * 2) - ellipse.getLineWidth();
+    if (circle.getRadiusX() == circle.getRadiusY()) {
+        Length outerDia = (circle.getRadiusX() * 2) + circle.getLineWidth();
+        Length innerDia = (circle.getRadiusX() * 2) - circle.getLineWidth();
         if (innerDia < 0) innerDia = 0;
-        flashCircle(ellipse.getCenter(), outerDia, innerDia);
+        flashCircle(circle.getCenter(), outerDia, innerDia);
     } else {
         // TODO!
-        qWarning() << "Ellipse was ignored in gerber output!";
+        qWarning() << "Circle was ignored in gerber output!";
     }
 }
 
-void GerberGenerator::drawEllipseArea(const Ellipse& ellipse) noexcept
+void GerberGenerator::drawCircleArea(const Circle& circle) noexcept
 {
-    if (ellipse.getRadiusX() == ellipse.getRadiusY()) {
-        flashCircle(ellipse.getCenter(), ellipse.getRadiusX() * 2, Length(0));
+    if (circle.getRadiusX() == circle.getRadiusY()) {
+        flashCircle(circle.getCenter(), circle.getRadiusX() * 2, Length(0));
     } else {
         // TODO!
-        qWarning() << "Ellipse was ignored in gerber output!";
+        qWarning() << "Circle was ignored in gerber output!";
     }
 }
 

diff --git a/libs/librepcb/common/cam/gerbergenerator.h b/libs/librepcb/common/cam/gerbergenerator.h
@@ -34,7 +34,7 @@
  ****************************************************************************************/
 namespace librepcb {
 
-class Ellipse;
+class Circle;
 class Path;
 class GerberApertureList;
 
@@ -75,8 +75,8 @@ class GerberGenerator final
         // Plot Methods
         void setLayerPolarity(LayerPolarity p) noexcept;
         void drawLine(const Point& start, const Point& end, const Length& width) noexcept;
-        void drawEllipseOutline(const Ellipse& ellipse) noexcept;
-        void drawEllipseArea(const Ellipse& ellipse) noexcept;
+        void drawCircleOutline(const Circle& circle) noexcept;
+        void drawCircleArea(const Circle& circle) noexcept;
         void drawPathOutline(const Path& path, const Length& lineWidth) noexcept;
         void drawPathArea(const Path& path) noexcept;
         void flashCircle(const Point& pos, const Length& dia, const Length& hole) noexcept;

diff --git a/libs/librepcb/common/dialogs/circlepropertiesdialog.cpp b/libs/librepcb/common/dialogs/circlepropertiesdialog.cpp
@@ -34,10 +34,10 @@
  ****************************************************************************************/
 namespace librepcb {
 
-EllipsePropertiesDialog::EllipsePropertiesDialog(Ellipse& ellipse, UndoStack& undoStack,
+CirclePropertiesDialog::CirclePropertiesDialog(Circle& circle, UndoStack& undoStack,
         QList<GraphicsLayer*> layers, QWidget* parent) noexcept :
-    QDialog(parent), mEllipse(ellipse), mUndoStack(undoStack),
-    mUi(new Ui::EllipsePropertiesDialog)
+    QDialog(parent), mCircle(circle), mUndoStack(undoStack),
+    mUi(new Ui::CirclePropertiesDialog)
 {
     mUi->setupUi(this);
 
@@ -48,30 +48,30 @@ EllipsePropertiesDialog::EllipsePropertiesDialog(Ellipse& ellipse, UndoStack& un
     connect(mUi->cbxEnableHeightField, &QCheckBox::toggled,
             mUi->spbHeight, &QDoubleSpinBox::setEnabled);
     connect(mUi->buttonBox, &QDialogButtonBox::clicked,
-            this, &EllipsePropertiesDialog::buttonBoxClicked);
+            this, &CirclePropertiesDialog::buttonBoxClicked);
 
-    // load ellipse attributes
-    selectLayerNameInCombobox(mEllipse.getLayerName());
-    mUi->spbLineWidth->setValue(mEllipse.getLineWidth().toMm());
-    mUi->cbxFillArea->setChecked(mEllipse.isFilled());
-    mUi->cbxIsGrabArea->setChecked(mEllipse.isGrabArea());
-    mUi->spbWidth->setValue(mEllipse.getRadiusX().toMm() * 2);
-    mUi->spbHeight->setValue(mEllipse.getRadiusY().toMm() * 2);
-    mUi->cbxEnableHeightField->setChecked(!mEllipse.isRound());
-    mUi->spbPosX->setValue(mEllipse.getCenter().getX().toMm());
-    mUi->spbPosY->setValue(mEllipse.getCenter().getY().toMm());
-    mUi->spbRotation->setValue(mEllipse.getRotation().toDeg());
+    // load circle attributes
+    selectLayerNameInCombobox(mCircle.getLayerName());
+    mUi->spbLineWidth->setValue(mCircle.getLineWidth().toMm());
+    mUi->cbxFillArea->setChecked(mCircle.isFilled());
+    mUi->cbxIsGrabArea->setChecked(mCircle.isGrabArea());
+    mUi->spbWidth->setValue(mCircle.getRadiusX().toMm() * 2);
+    mUi->spbHeight->setValue(mCircle.getRadiusY().toMm() * 2);
+    mUi->cbxEnableHeightField->setChecked(!mCircle.isRound());
+    mUi->spbPosX->setValue(mCircle.getCenter().getX().toMm());
+    mUi->spbPosY->setValue(mCircle.getCenter().getY().toMm());
+    mUi->spbRotation->setValue(mCircle.getRotation().toDeg());
 }
 
-EllipsePropertiesDialog::~EllipsePropertiesDialog() noexcept
+CirclePropertiesDialog::~CirclePropertiesDialog() noexcept
 {
 }
 
 /*****************************************************************************************
  *  Private Methods
  ****************************************************************************************/
 
-void EllipsePropertiesDialog::buttonBoxClicked(QAbstractButton* button) noexcept
+void CirclePropertiesDialog::buttonBoxClicked(QAbstractButton* button) noexcept
 {
     switch (mUi->buttonBox->buttonRole(button)) {
         case QDialogButtonBox::ApplyRole:
@@ -89,14 +89,14 @@ void EllipsePropertiesDialog::buttonBoxClicked(QAbstractButton* button) noexcept
     }
 }
 
-bool EllipsePropertiesDialog::applyChanges() noexcept
+bool CirclePropertiesDialog::applyChanges() noexcept
 {
     try {
         Length radiusX = Length::fromMm(mUi->spbWidth->value() / 2);
         Length radiusY = mUi->spbHeight->isEnabled() ?
                          Length::fromMm(mUi->spbHeight->value() / 2) : radiusX;
 
-        QScopedPointer<CmdEllipseEdit> cmd(new CmdEllipseEdit(mEllipse));
+        QScopedPointer<CmdCircleEdit> cmd(new CmdCircleEdit(mCircle));
         if (mUi->cbxLayer->currentIndex() >= 0 && mUi->cbxLayer->currentData().isValid()) {
             cmd->setLayerName(mUi->cbxLayer->currentData().toString(), false);
         }
@@ -115,7 +115,7 @@ bool EllipsePropertiesDialog::applyChanges() noexcept
     }
 }
 
-void EllipsePropertiesDialog::selectLayerNameInCombobox(const QString& name) noexcept
+void CirclePropertiesDialog::selectLayerNameInCombobox(const QString& name) noexcept
 {
     mUi->cbxLayer->setCurrentIndex(mUi->cbxLayer->findData(name));
 }

diff --git a/libs/librepcb/common/dialogs/circlepropertiesdialog.h b/libs/librepcb/common/dialogs/circlepropertiesdialog.h
@@ -32,35 +32,35 @@
 namespace librepcb {
 
 class UndoStack;
-class Ellipse;
+class Circle;
 class GraphicsLayer;
 
 namespace Ui {
-class EllipsePropertiesDialog;
+class CirclePropertiesDialog;
 }
 
 /*****************************************************************************************
- *  Class EllipsePropertiesDialog
+ *  Class CirclePropertiesDialog
  ****************************************************************************************/
 
 /**
- * @brief The EllipsePropertiesDialog class
+ * @brief The CirclePropertiesDialog class
  */
-class EllipsePropertiesDialog final : public QDialog
+class CirclePropertiesDialog final : public QDialog
 {
         Q_OBJECT
 
     public:
 
         // Constructors / Destructor
-        EllipsePropertiesDialog() = delete;
-        EllipsePropertiesDialog(const EllipsePropertiesDialog& other) = delete;
-        EllipsePropertiesDialog(Ellipse& ellipse, UndoStack& undoStack,
+        CirclePropertiesDialog() = delete;
+        CirclePropertiesDialog(const CirclePropertiesDialog& other) = delete;
+        CirclePropertiesDialog(Circle& circle, UndoStack& undoStack,
                                 QList<GraphicsLayer*> layers, QWidget* parent = nullptr) noexcept;
-        ~EllipsePropertiesDialog() noexcept;
+        ~CirclePropertiesDialog() noexcept;
 
         // Operator Overloadings
-        EllipsePropertiesDialog& operator=(const EllipsePropertiesDialog& rhs) = delete;
+        CirclePropertiesDialog& operator=(const CirclePropertiesDialog& rhs) = delete;
 
 
     private: // GUI Events
@@ -72,9 +72,9 @@ class EllipsePropertiesDialog final : public QDialog
 
 
     private: // Data
-        Ellipse& mEllipse;
+        Circle& mCircle;
         UndoStack& mUndoStack;
-        QScopedPointer<Ui::EllipsePropertiesDialog> mUi;
+        QScopedPointer<Ui::CirclePropertiesDialog> mUi;
 };
 
 /*****************************************************************************************

diff --git a/libs/librepcb/common/dialogs/circlepropertiesdialog.ui b/libs/librepcb/common/dialogs/circlepropertiesdialog.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>librepcb::EllipsePropertiesDialog</class>
- <widget class="QDialog" name="librepcb::EllipsePropertiesDialog">
+ <class>librepcb::CirclePropertiesDialog</class>
+ <widget class="QDialog" name="librepcb::CirclePropertiesDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Ellipse Properties</string>
+   <string>Circle Properties</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>