In the middle of major refactoring...

[architektonas] / src / widgets / qg_dialogfactory.cpp

diff --git a/src/widgets/qg_dialogfactory.cpp b/src/widgets/qg_dialogfactory.cpp
index 9c857a0cac00177a1f0ff38749df33def91ee963..16ad8be4fe00f3dbefc3b8a03107720f0f2d9e0d 100644 (file)
--- a/src/widgets/qg_dialogfactory.cpp
+++ b/src/widgets/qg_dialogfactory.cpp
@@ -17,8 +17,8 @@
 #include "graphicview.h"
 #include "qg_layerwidget.h"
 #include "qg_mainwindowinterface.h"
-#include "rs_actiondimlinear.h"
-#include "rs_actioninterface.h"
+#include "actiondimlinear.h"
+#include "actioninterface.h"
 #include "rs_blocklist.h"
 #include "rs_document.h"
 #include "rs_hatch.h"
@@ -707,7 +707,7 @@ QString QG_DialogFactory::requestImageOpenDialog()
        return fn;
 }
 
-void QG_DialogFactory::requestOptions(RS_ActionInterface * action, bool on, bool update)
+void QG_DialogFactory::requestOptions(ActionInterface * action, bool on, bool update)
 {
        RS_DEBUG->print("QG_DialogFactory::requestOptions");
 
@@ -796,7 +796,7 @@ void QG_DialogFactory::requestOptions(RS_ActionInterface * action, bool on, bool
     case RS2::ActionDimLinear:
         requestDimensionOptions(action, on, update);
 
-               if (((RS_ActionDimLinear *)action)->hasFixedAngle() == false)
+               if (((ActionDimLinear *)action)->hasFixedAngle() == false)
             requestDimLinearOptions(action, on, update);
 
                break;
@@ -843,7 +843,7 @@ void QG_DialogFactory::requestOptions(RS_ActionInterface * action, bool on, bool
 /**
  * Shows a widget for options for the action: "print preview"
  */
-void QG_DialogFactory::requestPrintPreviewOptions(RS_ActionInterface * action, bool on, bool update)
+void QG_DialogFactory::requestPrintPreviewOptions(ActionInterface * action, bool on, bool update)
 {
        static PrintPreviewOptions * toolWidget = NULL;
 
@@ -866,7 +866,7 @@ void QG_DialogFactory::requestPrintPreviewOptions(RS_ActionInterface * action, b
 /**
  * Shows a widget for options for the action: "draw line"
  */
-void QG_DialogFactory::requestLineOptions(RS_ActionInterface * action, bool on)
+void QG_DialogFactory::requestLineOptions(ActionInterface * action, bool on)
 {
 /*
 The way I see it, this is failure. We're constantly creating & deleting
@@ -899,7 +899,7 @@ them over and over. May need to do some more refactoring based on this idea...
 /**
  * Shows a widget for options for the action: "draw polyline"
  */
-void QG_DialogFactory::requestPolylineOptions(RS_ActionInterface * action, bool on, bool update)
+void QG_DialogFactory::requestPolylineOptions(ActionInterface * action, bool on, bool update)
 {
 #ifdef RS_PROF
        static PolylineOptions * toolWidget = NULL;
@@ -924,7 +924,7 @@ void QG_DialogFactory::requestPolylineOptions(RS_ActionInterface * action, bool
 /**
  * Shows a widget for options for the action: "draw line parallel"
  */
-void QG_DialogFactory::requestLineParallelOptions(RS_ActionInterface * action, bool on, bool update)
+void QG_DialogFactory::requestLineParallelOptions(ActionInterface * action, bool on, bool update)
 {
     static LineParallelOptions * toolWidget = NULL;
 
@@ -946,7 +946,7 @@ void QG_DialogFactory::requestLineParallelOptions(RS_ActionInterface * action, b
 /**
  * Shows a widget for options for the action: "draw line parallel through"
  */
-void QG_DialogFactory::requestLineParallelThroughOptions(RS_ActionInterface * action, bool on, bool update)
+void QG_DialogFactory::requestLineParallelThroughOptions(ActionInterface * action, bool on, bool update)
 {
     static LineParallelThroughOptions * toolWidget = NULL;
 
@@ -965,7 +965,7 @@ void QG_DialogFactory::requestLineParallelThroughOptions(RS_ActionInterface * ac
 /**
  * Shows a widget for options for the action: "line angle"
  */
-void QG_DialogFactory::requestLineAngleOptions(RS_ActionInterface * action, bool on, bool update)
+void QG_DialogFactory::requestLineAngleOptions(ActionInterface * action, bool on, bool update)
 {
        static LineAngleOptions * toolWidget = NULL;
 
@@ -988,7 +988,7 @@ void QG_DialogFactory::requestLineAngleOptions(RS_ActionInterface * action, bool
 /**
  * Shows a widget for options for the action: "line relative angle"
  */
-void QG_DialogFactory::requestLineRelAngleOptions(RS_ActionInterface * action, bool on, bool update)
+void QG_DialogFactory::requestLineRelAngleOptions(ActionInterface * action, bool on, bool update)
 {
        static LineRelAngleOptions * toolWidget = NULL;
 
@@ -1011,7 +1011,7 @@ void QG_DialogFactory::requestLineRelAngleOptions(RS_ActionInterface * action, b
 /**
  * Shows a widget for options for the action: "line angle"
  */
-void QG_DialogFactory::requestLineBisectorOptions(RS_ActionInterface * action, bool on, bool update)
+void QG_DialogFactory::requestLineBisectorOptions(ActionInterface * action, bool on, bool update)
 {
     static LineBisectorOptions * toolWidget = NULL;
 
@@ -1030,7 +1030,7 @@ void QG_DialogFactory::requestLineBisectorOptions(RS_ActionInterface * action, b
 /**
  * Shows a widget for options for the action: "draw polygon"
  */
-void QG_DialogFactory::requestLinePolygonOptions(RS_ActionInterface * action, bool on, bool update)
+void QG_DialogFactory::requestLinePolygonOptions(ActionInterface * action, bool on, bool update)
 {
     static LinePolygonOptions * toolWidget = NULL;
 
@@ -1049,7 +1049,7 @@ void QG_DialogFactory::requestLinePolygonOptions(RS_ActionInterface * action, bo
 /**
  * Shows a widget for options for the action: "draw polygon2"
  */
-void QG_DialogFactory::requestLinePolygon2Options(RS_ActionInterface * action, bool on, bool update)
+void QG_DialogFactory::requestLinePolygon2Options(ActionInterface * action, bool on, bool update)
 {
     static LinePolygon2Options * toolWidget = NULL;
 
@@ -1068,7 +1068,7 @@ void QG_DialogFactory::requestLinePolygon2Options(RS_ActionInterface * action, b
 /**
  * Shows a widget for arc options.
  */
-void QG_DialogFactory::requestArcOptions(RS_ActionInterface * action, bool on, bool update)
+void QG_DialogFactory::requestArcOptions(ActionInterface * action, bool on, bool update)
 {
        static ArcOptions * toolWidget = NULL;
 
@@ -1092,7 +1092,7 @@ void QG_DialogFactory::requestArcOptions(RS_ActionInterface * action, bool on, b
 /**
  * Shows a widget for tangential arc options.
  */
-void QG_DialogFactory::requestArcTangentialOptions(RS_ActionInterface * action, bool on, bool update)
+void QG_DialogFactory::requestArcTangentialOptions(ActionInterface * action, bool on, bool update)
 {
        static ArcTangentialOptions * toolWidget = NULL;
 
@@ -1116,7 +1116,7 @@ void QG_DialogFactory::requestArcTangentialOptions(RS_ActionInterface * action,
 /**
  * Shows a widget for circle options.
  */
-void QG_DialogFactory::requestCircleOptions(RS_ActionInterface * action, bool on, bool update)
+void QG_DialogFactory::requestCircleOptions(ActionInterface * action, bool on, bool update)
 {
     static CircleOptions * toolWidget = NULL;
 
@@ -1139,26 +1139,30 @@ void QG_DialogFactory::requestCircleOptions(RS_ActionInterface * action, bool on
 /**
  * Shows a widget for spline options.
  */
-void QG_DialogFactory::requestSplineOptions(RS_ActionInterface * action, bool on, bool update)
+void QG_DialogFactory::requestSplineOptions(ActionInterface * action, bool on, bool update)
 {
        static SplineOptions * toolWidget = NULL;
 
-       if (optionWidget!=NULL) {
-               if (toolWidget!=NULL) {
-                       delete toolWidget;
-                       toolWidget = NULL;
-               }
-               if (on==true && toolWidget==NULL) {
-                       toolWidget = new SplineOptions(optionWidget);
-                       toolWidget->setAction(action, update);
-               }
+       if (!optionWidget)
+               return;
+
+       if (toolWidget)
+       {
+               delete toolWidget;
+               toolWidget = NULL;
+       }
+
+       if (on)
+       {
+               toolWidget = new SplineOptions(optionWidget);
+               toolWidget->setAction(action, update);
        }
 }
 
 /**
  * Shows a widget for text options.
  */
-void QG_DialogFactory::requestTextOptions(RS_ActionInterface * action, bool on, bool update)
+void QG_DialogFactory::requestTextOptions(ActionInterface * action, bool on, bool update)
 {
        static TextOptions * toolWidget = NULL;
 
@@ -1181,7 +1185,7 @@ void QG_DialogFactory::requestTextOptions(RS_ActionInterface * action, bool on,
 /**
  * Shows a widget for insert options.
  */
-void QG_DialogFactory::requestInsertOptions(RS_ActionInterface * action, bool on, bool update)
+void QG_DialogFactory::requestInsertOptions(ActionInterface * action, bool on, bool update)
 {
     static InsertOptions * toolWidget = NULL;
 
@@ -1200,7 +1204,7 @@ void QG_DialogFactory::requestInsertOptions(RS_ActionInterface * action, bool on
 /**
  * Shows a widget for image options.
  */
-void QG_DialogFactory::requestImageOptions(RS_ActionInterface * action, bool on, bool update)
+void QG_DialogFactory::requestImageOptions(ActionInterface * action, bool on, bool update)
 {
     static ImageOptions * toolWidget = NULL;
 
@@ -1219,7 +1223,7 @@ void QG_DialogFactory::requestImageOptions(RS_ActionInterface * action, bool on,
 /**
  * Shows a widget for dimension options.
  */
-void QG_DialogFactory::requestDimensionOptions(RS_ActionInterface * action, bool on, bool update)
+void QG_DialogFactory::requestDimensionOptions(ActionInterface * action, bool on, bool update)
 {
     static DimOptions * toolWidget = NULL;
 
@@ -1238,7 +1242,7 @@ void QG_DialogFactory::requestDimensionOptions(RS_ActionInterface * action, bool
 /**
  * Shows a widget for linear dimension options.
  */
-void QG_DialogFactory::requestDimLinearOptions(RS_ActionInterface * action, bool on, bool update)
+void QG_DialogFactory::requestDimLinearOptions(ActionInterface * action, bool on, bool update)
 {
        static DimLinearOptions * toolWidget = NULL;
 
@@ -1284,7 +1288,7 @@ void QG_DialogFactory::requestSnapDistOptions(double & dist, bool on)
 /**
  * Shows a widget for 'snap to a point with a given distance' options.
  */
-void QG_DialogFactory::requestMoveRotateOptions(RS_ActionInterface * action, bool on, bool update)
+void QG_DialogFactory::requestMoveRotateOptions(ActionInterface * action, bool on, bool update)
 {
        static MoveRotateOptions * toolWidget = NULL;
 
@@ -1307,7 +1311,7 @@ void QG_DialogFactory::requestMoveRotateOptions(RS_ActionInterface * action, boo
 /**
  * Shows a widget for 'trim amount' options.
  */
-void QG_DialogFactory::requestTrimAmountOptions(RS_ActionInterface * action, bool on, bool update)
+void QG_DialogFactory::requestTrimAmountOptions(ActionInterface * action, bool on, bool update)
 {
        static TrimAmountOptions * toolWidget = NULL;
 
@@ -1330,7 +1334,7 @@ void QG_DialogFactory::requestTrimAmountOptions(RS_ActionInterface * action, boo
 /**
  * Shows a widget for beveling options.
  */
-void QG_DialogFactory::requestBevelOptions(RS_ActionInterface * action, bool on, bool update)
+void QG_DialogFactory::requestBevelOptions(ActionInterface * action, bool on, bool update)
 {
     static BevelOptions * toolWidget = NULL;
 
@@ -1353,7 +1357,7 @@ void QG_DialogFactory::requestBevelOptions(RS_ActionInterface * action, bool on,
 /**
  * Shows a widget for rounding options.
  */
-void QG_DialogFactory::requestRoundOptions(RS_ActionInterface * action, bool on, bool update)
+void QG_DialogFactory::requestRoundOptions(ActionInterface * action, bool on, bool update)
 {
        static RoundOptions * toolWidget = NULL;
 
@@ -1376,7 +1380,7 @@ void QG_DialogFactory::requestRoundOptions(RS_ActionInterface * action, bool on,
 /**
  * Shows a widget for library insert options.
  */
-void QG_DialogFactory::requestLibraryInsertOptions(RS_ActionInterface * action, bool on, bool update)
+void QG_DialogFactory::requestLibraryInsertOptions(ActionInterface * action, bool on, bool update)
 {
        static LibraryInsertOptions * toolWidget = NULL;
 
@@ -1408,7 +1412,7 @@ void QG_DialogFactory::requestToolBar(RS2::ToolBarId id)
 /**
  * Shows the select toolbar with the given action to launch.
  */
-void QG_DialogFactory::requestToolBarSelect(RS_ActionInterface * selectAction,
+void QG_DialogFactory::requestToolBarSelect(ActionInterface * selectAction,
         RS2::ActionType nextAction)
 {
        if (cadToolBar != NULL)
@@ -1836,10 +1840,10 @@ void QG_DialogFactory::updateCoordinateWidget(const Vector & abs,
  */
 void QG_DialogFactory::updateMouseWidget(const QString & left, const QString & right)
 {
-       if (mouseWidget != NULL)
+       if (mouseWidget)
                mouseWidget->setHelp(left, right);
 
-       if (commandWidget != NULL)
+       if (commandWidget)
                commandWidget->setCommand(left);
 }