X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fwidgets%2Fqg_dialogfactory.cpp;h=b0a9248535322c4d68ee2b421b380acb50768d84;hb=e1d1cacbb43055988d0d9db632fdf05c0bea9543;hp=9c857a0cac00177a1f0ff38749df33def91ee963;hpb=27d4a138d23453e93a833e9347444b828a971cb4;p=architektonas diff --git a/src/widgets/qg_dialogfactory.cpp b/src/widgets/qg_dialogfactory.cpp index 9c857a0..b0a9248 100644 --- a/src/widgets/qg_dialogfactory.cpp +++ b/src/widgets/qg_dialogfactory.cpp @@ -3,7 +3,9 @@ // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun // Extensively rewritten and refactored by James L. Hammons -// (C) 2010 Underground Software +// Portions copyright (C) 2001-2003 RibbonSoft +// Copyright (C) 2010 Underground Software +// See the README and GPLv2 files for licensing and warranty information // // JLH = James L. Hammons // @@ -15,17 +17,18 @@ #include "qg_dialogfactory.h" #include "graphicview.h" -#include "qg_layerwidget.h" +#include "layerwidget.h" #include "qg_mainwindowinterface.h" -#include "rs_actiondimlinear.h" -#include "rs_actioninterface.h" -#include "rs_blocklist.h" -#include "rs_document.h" -#include "rs_hatch.h" -#include "rs_patternlist.h" +#include "actiondimlinear.h" +#include "actioninterface.h" +#include "blocklist.h" +#include "document.h" +#include "hatch.h" +#include "layerlist.h" +#include "patternlist.h" #include "settings.h" -#include "rs_system.h" -#include "rs_text.h" +#include "system.h" +#include "text.h" #include "arcoptions.h" #include "arctangentialoptions.h" @@ -71,6 +74,7 @@ #include "linerelangleoptions.h" #include "mousewidget.h" #include "moverotateoptions.h" +#include "polylineoptions.h" #include "printpreviewoptions.h" #include "roundoptions.h" #include "selectionwidget.h" @@ -79,12 +83,8 @@ #include "textoptions.h" #include "trimamountoptions.h" -#ifdef RS_PROF -#include "qg_polylineoptions.h" -#endif - #ifdef RS_CAM -#include "rs_camdialog.h" +#include "camdialog.h" #endif //QG_DialogFactory* QG_DialogFactory::uniqueInstance = NULL; @@ -97,9 +97,9 @@ */ //QG_DialogFactory::QG_DialogFactory(QWidget * parent, QWidget * ow): QG_DialogFactory::QG_DialogFactory(QWidget * parent, QToolBar * ow): - RS_DialogFactoryInterface() + DialogFactoryInterface() { - RS_DEBUG->print("QG_DialogFactory::QG_DialogFactory"); + DEBUG->print("QG_DialogFactory::QG_DialogFactory"); this->parent = parent; setOptionWidget(ow); @@ -110,7 +110,7 @@ QG_DialogFactory::QG_DialogFactory(QWidget * parent, QToolBar * ow): cadToolBar = NULL; commandWidget = NULL; mainWindow = NULL; - RS_DEBUG->print("QG_DialogFactory::QG_DialogFactory: OK"); + DEBUG->print("QG_DialogFactory::QG_DialogFactory: OK"); } /** @@ -118,8 +118,8 @@ QG_DialogFactory::QG_DialogFactory(QWidget * parent, QToolBar * ow): */ QG_DialogFactory::~QG_DialogFactory() { - RS_DEBUG->print("QG_DialogFactory::~QG_DialogFactory"); - RS_DEBUG->print("QG_DialogFactory::~QG_DialogFactory: OK"); + DEBUG->print("QG_DialogFactory::~QG_DialogFactory"); + DEBUG->print("QG_DialogFactory::~QG_DialogFactory: OK"); } /** @@ -128,9 +128,9 @@ QG_DialogFactory::~QG_DialogFactory() ///*virtual*/ void QG_DialogFactory::setOptionWidget(QWidget * ow) /*virtual*/ void QG_DialogFactory::setOptionWidget(QToolBar * ow) { - RS_DEBUG->print("QG_DialogFactory::setOptionWidget"); + DEBUG->print("QG_DialogFactory::setOptionWidget"); optionWidget = ow; - RS_DEBUG->print("QG_DialogFactory::setOptionWidget: OK"); + DEBUG->print("QG_DialogFactory::setOptionWidget: OK"); } /** @@ -209,7 +209,7 @@ void QG_DialogFactory::requestWarningDialog(const QString & warning) /** * Requests a new document from the main window. */ -GraphicView * QG_DialogFactory::requestNewDocument(const QString & fileName, RS_Document * doc) +GraphicView * QG_DialogFactory::requestNewDocument(const QString & fileName, Document * doc) { if (mainWindow != NULL) { @@ -238,9 +238,9 @@ void QG_DialogFactory::requestSimulationControls() * @return a pointer to the newly created layer that * should be added. */ -RS_Layer * QG_DialogFactory::requestNewLayerDialog(RS_LayerList * layerList) +Layer * QG_DialogFactory::requestNewLayerDialog(LayerList * layerList) { - RS_Layer * layer = NULL; + Layer * layer = NULL; QString layer_name = "noname"; int i = 2; @@ -251,7 +251,7 @@ RS_Layer * QG_DialogFactory::requestNewLayerDialog(RS_LayerList * layerList) } // Layer for parameter livery - layer = new RS_Layer(layer_name); + layer = new Layer(layer_name); // QG_LayerDialog dlg(parent, "Layer Dialog"); LayerDialog dlg(parent); @@ -275,13 +275,13 @@ RS_Layer * QG_DialogFactory::requestNewLayerDialog(RS_LayerList * layerList) * * @return a pointer to the layer that should be removed. */ -RS_Layer * QG_DialogFactory::requestLayerRemovalDialog(RS_LayerList * layerList) +Layer * QG_DialogFactory::requestLayerRemovalDialog(LayerList * layerList) { - RS_Layer * layer = NULL; + Layer * layer = NULL; if (layerList == NULL) { - RS_DEBUG->print(RS_Debug::D_WARNING, + DEBUG->print(Debug::D_WARNING, "QG_DialogFactory::requestLayerRemovalDialog(): layerList is NULL"); return NULL; @@ -289,7 +289,7 @@ RS_Layer * QG_DialogFactory::requestLayerRemovalDialog(RS_LayerList * layerList) /* if (layerList==NULL) { if (container!=NULL && container->rtti()==RS2::EntityGraphic) { - layerList = (RS_LayerList*)container; + layerList = (LayerList*)container; } else { return NULL; } @@ -332,31 +332,22 @@ RS_Layer * QG_DialogFactory::requestLayerRemovalDialog(RS_LayerList * layerList) * @return A pointer to a new layer with the changed attributes * or NULL if the dialog was cancelled. */ -RS_Layer * QG_DialogFactory::requestEditLayerDialog(RS_LayerList * layerList) +Layer * QG_DialogFactory::requestEditLayerDialog(LayerList * layerList) { - RS_DEBUG->print("QG_DialogFactory::requestEditLayerDialog"); - RS_Layer * layer = NULL; - /* - if (layerList==NULL) { - if (container!=NULL && container->rtti()==RS2::EntityGraphic) { - layerList = (RS_LayerList*)container; - } else { - return NULL; - } - } - */ + DEBUG->print("QG_DialogFactory::requestEditLayerDialog"); + Layer * layer = NULL; - if (layerList == NULL) + if (!layerList) { - RS_DEBUG->print(RS_Debug::D_WARNING, "QG_DialogFactory::requestEditLayerDialog(): " + DEBUG->print(Debug::D_WARNING, "QG_DialogFactory::requestEditLayerDialog(): " "layerList is NULL"); return NULL; } // Layer for parameter livery - if (layerList->getActive() != NULL) + if (layerList->getActive()) { - layer = new RS_Layer(*layerList->getActive()); + layer = new Layer(*layerList->getActive()); // QG_LayerDialog dlg(parent, QMessageBox::tr("Layer Dialog")); LayerDialog dlg(parent); @@ -383,21 +374,21 @@ RS_Layer * QG_DialogFactory::requestEditLayerDialog(RS_LayerList * layerList) * @return a pointer to the newly created block that * should be added. */ -RS_BlockData QG_DialogFactory::requestNewBlockDialog(RS_BlockList * blockList) +BlockData QG_DialogFactory::requestNewBlockDialog(BlockList * blockList) { - //RS_Block* block = NULL; - RS_BlockData ret; - ret = RS_BlockData("", Vector(false), false); + //Block* block = NULL; + BlockData ret; + ret = BlockData("", Vector(false), false); if (blockList == NULL) { - RS_DEBUG->print(RS_Debug::D_WARNING, "QG_DialogFactory::requestNewBlockDialog(): " + DEBUG->print(Debug::D_WARNING, "QG_DialogFactory::requestNewBlockDialog(): " "blockList is NULL"); return ret; } // Block for parameter livery - //block = new RS_Block(container, "noname", Vector(0.0,0.0)); + //block = new Block(container, "noname", Vector(0.0,0.0)); BlockDialog dlg(parent); dlg.setBlockList(blockList); @@ -413,22 +404,22 @@ RS_BlockData QG_DialogFactory::requestNewBlockDialog(RS_BlockList * blockList) * * @return a pointer to the modified block or NULL on cancellation. */ -RS_BlockData QG_DialogFactory::requestBlockAttributesDialog(RS_BlockList * blockList) +BlockData QG_DialogFactory::requestBlockAttributesDialog(BlockList * blockList) { - //RS_Block* block = NULL; - RS_BlockData ret; - ret = RS_BlockData("", Vector(false), false); + //Block* block = NULL; + BlockData ret; + ret = BlockData("", Vector(false), false); if (blockList == NULL) { - RS_DEBUG->print(RS_Debug::D_WARNING, "QG_DialogFactory::requestBlockAttributesDialog(): " + DEBUG->print(Debug::D_WARNING, "QG_DialogFactory::requestBlockAttributesDialog(): " "blockList is NULL"); return ret; } /* if (blockList==NULL) { if (container!=NULL && container->rtti()==RS2::EntityGraphic) { - blockList = (RS_BlockList*)container; + blockList = (BlockList*)container; } else { return NULL; } @@ -449,17 +440,17 @@ RS_BlockData QG_DialogFactory::requestBlockAttributesDialog(RS_BlockList * block ret = dlg.getBlockData(); } //else { - // ret = RS_BlockData("", Vector(false)); + // ret = BlockData("", Vector(false)); //} return ret; } -/*virtual*/ void QG_DialogFactory::requestEditBlockWindow(RS_BlockList * /*blockList*/) +/*virtual*/ void QG_DialogFactory::requestEditBlockWindow(BlockList * /*blockList*/) { } -/*virtual*/ void QG_DialogFactory::closeEditBlockWindow(RS_Block * /*blockList*/) +/*virtual*/ void QG_DialogFactory::closeEditBlockWindow(Block * /*blockList*/) { } @@ -469,13 +460,13 @@ RS_BlockData QG_DialogFactory::requestBlockAttributesDialog(RS_BlockList * block * * @return a pointer to the block that should be removed. */ -RS_Block * QG_DialogFactory::requestBlockRemovalDialog(RS_BlockList * blockList) +Block * QG_DialogFactory::requestBlockRemovalDialog(BlockList * blockList) { - RS_Block * block = NULL; + Block * block = NULL; if (blockList == NULL) { - RS_DEBUG->print(RS_Debug::D_WARNING, "QG_DialogFactory::requestBlockRemovalDialog(): " + DEBUG->print(Debug::D_WARNING, "QG_DialogFactory::requestBlockRemovalDialog(): " "blockList is NULL"); return NULL; } @@ -513,7 +504,7 @@ QString QG_DialogFactory::requestFileSaveAsDialog() { // read default settings: RS_SETTINGS->beginGroup("/Paths"); QString defDir = RS_SETTINGS->readEntry("/Save", - RS_SYSTEM->getHomeDir()); + SYSTEM->getHomeDir()); QString defFilter = RS_SETTINGS->readEntry("/SaveFilter", "Drawing Exchange (*.dxf)"); RS_SETTINGS->endGroup(); @@ -605,7 +596,7 @@ QString QG_DialogFactory::requestImageOpenDialog() // read default settings: settings.beginGroup("Paths"); - QString defDir = settings.value("OpenImage", RS_SYSTEM->getHomeDir()).toString(); + QString defDir = settings.value("OpenImage", SYSTEM->getHomeDir()).toString(); QString defFilter = settings.value("ImageFilter", "Portable Network Graphic (*.png)").toString(); settings.endGroup(); @@ -707,13 +698,13 @@ 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"); + DEBUG->print("QG_DialogFactory::requestOptions"); if (action == NULL) { - RS_DEBUG->print(RS_Debug::D_WARNING, "QG_DialogFactory::requestOptions: action is NULL"); + DEBUG->print(Debug::D_WARNING, "QG_DialogFactory::requestOptions: action is NULL"); return; } @@ -724,9 +715,9 @@ void QG_DialogFactory::requestOptions(RS_ActionInterface * action, bool on, bool break; case RS2::ActionDrawLine: - RS_DEBUG->print("QG_DialogFactory::requestOptions: line"); + DEBUG->print("QG_DialogFactory::requestOptions: line"); requestLineOptions(action, on); - RS_DEBUG->print("QG_DialogFactory::requestOptions: line: OK"); + DEBUG->print("QG_DialogFactory::requestOptions: line: OK"); break; case RS2::ActionDrawPolyline: @@ -796,7 +787,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; @@ -837,13 +828,13 @@ void QG_DialogFactory::requestOptions(RS_ActionInterface * action, bool on, bool break; } - RS_DEBUG->print("QG_DialogFactory::requestOptions: OK"); + DEBUG->print("QG_DialogFactory::requestOptions: OK"); } /** * 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 +857,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 @@ -893,15 +884,14 @@ them over and over. May need to do some more refactoring based on this idea... toolWidget->setAction(action); } - RS_DEBUG->print("QG_DialogFactory::requestLineOptions: OK"); + DEBUG->print("QG_DialogFactory::requestLineOptions: OK"); } /** * 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; if (!optionWidget) @@ -918,13 +908,12 @@ void QG_DialogFactory::requestPolylineOptions(RS_ActionInterface * action, bool toolWidget = new PolylineOptions(optionWidget); toolWidget->setAction(action, update); } -#endif } /** * 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 +935,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 +954,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 +977,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 +1000,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 +1019,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 +1038,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 +1057,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 +1081,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 +1105,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 +1128,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 +1174,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 +1193,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 +1212,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 +1231,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 +1277,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 +1300,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 +1323,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 +1346,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 +1369,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; @@ -1401,14 +1394,14 @@ void QG_DialogFactory::requestLibraryInsertOptions(RS_ActionInterface * action, */ void QG_DialogFactory::requestToolBar(RS2::ToolBarId id) { - if (cadToolBar != NULL) + if (cadToolBar) cadToolBar->showToolBar(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) @@ -1419,7 +1412,7 @@ void QG_DialogFactory::requestToolBarSelect(RS_ActionInterface * selectAction, * Shows a dialog to edit the attributes of the given dimension entity. */ /* -bool QG_DialogFactory::requestDimAlignedDialog(RS_DimAligned* dim) { +bool QG_DialogFactory::requestDimAlignedDialog(DimAligned* dim) { if (dim==NULL) { return false; } @@ -1438,7 +1431,7 @@ bool QG_DialogFactory::requestDimAlignedDialog(RS_DimAligned* dim) { /** * Shows attributes options dialog presenting the given data. */ -bool QG_DialogFactory::requestAttributesDialog(RS_AttributesData & data, RS_LayerList & layerList) +bool QG_DialogFactory::requestAttributesDialog(AttributesData & data, LayerList & layerList) { DlgAttributes dlg(parent); dlg.setData(&data, layerList); @@ -1455,7 +1448,7 @@ bool QG_DialogFactory::requestAttributesDialog(RS_AttributesData & data, RS_Laye /** * Shows move options dialog presenting the given data. */ -bool QG_DialogFactory::requestMoveDialog(RS_MoveData & data) +bool QG_DialogFactory::requestMoveDialog(MoveData & data) { DlgMove dlg(parent); dlg.setData(&data); @@ -1472,7 +1465,7 @@ bool QG_DialogFactory::requestMoveDialog(RS_MoveData & data) /** * Shows rotate options dialog presenting the given data. */ -bool QG_DialogFactory::requestRotateDialog(RS_RotateData & data) +bool QG_DialogFactory::requestRotateDialog(RotateData & data) { DlgRotate dlg(parent); dlg.setData(&data); @@ -1489,7 +1482,7 @@ bool QG_DialogFactory::requestRotateDialog(RS_RotateData & data) /** * Shows scale options dialog presenting the given data. */ -bool QG_DialogFactory::requestScaleDialog(RS_ScaleData & data) +bool QG_DialogFactory::requestScaleDialog(ScaleData & data) { DlgScale dlg(parent); dlg.setData(&data); @@ -1506,7 +1499,7 @@ bool QG_DialogFactory::requestScaleDialog(RS_ScaleData & data) /** * Shows mirror options dialog presenting the given data. */ -bool QG_DialogFactory::requestMirrorDialog(RS_MirrorData & data) +bool QG_DialogFactory::requestMirrorDialog(MirrorData & data) { DlgMirror dlg(parent); dlg.setData(&data); @@ -1523,7 +1516,7 @@ bool QG_DialogFactory::requestMirrorDialog(RS_MirrorData & data) /** * Shows move/rotate options dialog presenting the given data. */ -bool QG_DialogFactory::requestMoveRotateDialog(RS_MoveRotateData & data) +bool QG_DialogFactory::requestMoveRotateDialog(MoveRotateData & data) { DlgMoveRotate dlg(parent); dlg.setData(&data); @@ -1540,7 +1533,7 @@ bool QG_DialogFactory::requestMoveRotateDialog(RS_MoveRotateData & data) /** * Shows rotate around two centers options dialog presenting the given data. */ -bool QG_DialogFactory::requestRotate2Dialog(RS_Rotate2Data & data) +bool QG_DialogFactory::requestRotate2Dialog(Rotate2Data & data) { DlgRotate2 dlg(parent); dlg.setData(&data); @@ -1557,7 +1550,7 @@ bool QG_DialogFactory::requestRotate2Dialog(RS_Rotate2Data & data) /** * Shows a dialog to edit the given entity. */ -bool QG_DialogFactory::requestModifyEntityDialog(RS_Entity * entity) +bool QG_DialogFactory::requestModifyEntityDialog(Entity * entity) { if (entity == NULL) return false; @@ -1569,7 +1562,7 @@ bool QG_DialogFactory::requestModifyEntityDialog(RS_Entity * entity) case RS2::EntityPoint: { DlgPoint dlg(parent); - dlg.setPoint(*((RS_Point *)entity)); + dlg.setPoint(*((Point *)entity)); if (dlg.exec()) { @@ -1582,7 +1575,7 @@ bool QG_DialogFactory::requestModifyEntityDialog(RS_Entity * entity) case RS2::EntityLine: { DlgLine dlg(parent); - dlg.setLine(*((RS_Line *)entity)); + dlg.setLine(*((Line *)entity)); if (dlg.exec()) { @@ -1595,7 +1588,7 @@ bool QG_DialogFactory::requestModifyEntityDialog(RS_Entity * entity) case RS2::EntityArc: { DlgArc dlg(parent); - dlg.setArc(*((RS_Arc *)entity)); + dlg.setArc(*((Arc *)entity)); if (dlg.exec()) { @@ -1608,7 +1601,7 @@ bool QG_DialogFactory::requestModifyEntityDialog(RS_Entity * entity) case RS2::EntityCircle: { DlgCircle dlg(parent); - dlg.setCircle(*((RS_Circle *)entity)); + dlg.setCircle(*((Circle *)entity)); if (dlg.exec()) { @@ -1621,7 +1614,7 @@ bool QG_DialogFactory::requestModifyEntityDialog(RS_Entity * entity) case RS2::EntityEllipse: { DlgEllipse dlg(parent); - dlg.setEllipse(*((RS_Ellipse *)entity)); + dlg.setEllipse(*((Ellipse *)entity)); if (dlg.exec()) { @@ -1634,7 +1627,7 @@ bool QG_DialogFactory::requestModifyEntityDialog(RS_Entity * entity) case RS2::EntitySpline: { DlgSpline dlg(parent); - dlg.setSpline(*((RS_Spline *)entity)); + dlg.setSpline(*((Spline *)entity)); if (dlg.exec()) { @@ -1647,7 +1640,7 @@ bool QG_DialogFactory::requestModifyEntityDialog(RS_Entity * entity) case RS2::EntityInsert: { DlgInsert dlg(parent); - dlg.setInsert(*((RS_Insert *)entity)); + dlg.setInsert(*((Insert *)entity)); if (dlg.exec()) { @@ -1664,13 +1657,13 @@ bool QG_DialogFactory::requestModifyEntityDialog(RS_Entity * entity) case RS2::EntityDimRadial: { DlgDimension dlg(parent); - dlg.setDim(*((RS_Dimension *)entity)); + dlg.setDim(*((Dimension *)entity)); if (dlg.exec()) { dlg.updateDim(); ret = true; - ((RS_Dimension *)entity)->update(true); + ((Dimension *)entity)->update(true); } } break; @@ -1678,13 +1671,13 @@ bool QG_DialogFactory::requestModifyEntityDialog(RS_Entity * entity) case RS2::EntityDimLinear: { DlgDimLinear dlg(parent); - dlg.setDim(*((RS_DimLinear *)entity)); + dlg.setDim(*((DimLinear *)entity)); if (dlg.exec()) { dlg.updateDim(); ret = true; - ((RS_DimLinear *)entity)->update(true); + ((DimLinear *)entity)->update(true); } } break; @@ -1692,13 +1685,13 @@ bool QG_DialogFactory::requestModifyEntityDialog(RS_Entity * entity) case RS2::EntityText: { DlgText dlg(parent); - dlg.setText(*((RS_Text *)entity), false); + dlg.setText(*((Text *)entity), false); if (dlg.exec()) { dlg.updateText(); ret = true; - ((RS_Text *)entity)->update(); + ((Text *)entity)->update(); } } break; @@ -1706,13 +1699,13 @@ bool QG_DialogFactory::requestModifyEntityDialog(RS_Entity * entity) case RS2::EntityHatch: { DlgHatch dlg(parent); - dlg.setHatch(*((RS_Hatch *)entity), false); + dlg.setHatch(*((Hatch *)entity), false); if (dlg.exec()) { dlg.updateHatch(); ret = true; - ((RS_Hatch *)entity)->update(); + ((Hatch *)entity)->update(); } } break; @@ -1725,7 +1718,7 @@ bool QG_DialogFactory::requestModifyEntityDialog(RS_Entity * entity) } /* -bool QG_DialogFactory::requestDimAlignedDialog(RS_DimAligned* dim) { +bool QG_DialogFactory::requestDimAlignedDialog(DimAligned* dim) { return false; } */ @@ -1733,7 +1726,7 @@ bool QG_DialogFactory::requestDimAlignedDialog(RS_DimAligned* dim) { /** * Shows a dialog to edit the attributes of the given text entity. */ -bool QG_DialogFactory::requestTextDialog(RS_Text * text) +bool QG_DialogFactory::requestTextDialog(Text * text) { if (text == NULL) return false; @@ -1753,12 +1746,12 @@ bool QG_DialogFactory::requestTextDialog(RS_Text * text) /** * Shows a dialog to edit pattern / hatch attributes of the given entity. */ -bool QG_DialogFactory::requestHatchDialog(RS_Hatch * hatch) +bool QG_DialogFactory::requestHatchDialog(Hatch * hatch) { if (hatch == NULL) return false; - RS_PATTERNLIST->init(); + PATTERNLIST->init(); DlgHatch dlg(parent); dlg.setHatch(*hatch, true); @@ -1778,17 +1771,17 @@ bool QG_DialogFactory::requestHatchDialog(RS_Hatch * hatch) */ bool QG_DialogFactory::requestCamOptionsDialog(Drawing& graphic) { - RS_DEBUG->print("QG_DialogFactory::requestCamOptionsDialog"); + DEBUG->print("QG_DialogFactory::requestCamOptionsDialog"); RS_CamDialog dlg(graphic, parent); - RS_DEBUG->print("QG_DialogFactory::requestCamOptionsDialog: exec"); + DEBUG->print("QG_DialogFactory::requestCamOptionsDialog: exec"); if (dlg.exec()) { - RS_DEBUG->print("QG_DialogFactory::requestCamOptionsDialog: OK"); + DEBUG->print("QG_DialogFactory::requestCamOptionsDialog: OK"); return true; } - RS_DEBUG->print("QG_DialogFactory::requestCamOptionsDialog: Cancel"); + DEBUG->print("QG_DialogFactory::requestCamOptionsDialog: Cancel"); return false; } #endif @@ -1836,10 +1829,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); } @@ -1857,12 +1850,12 @@ void QG_DialogFactory::updateSelectionWidget(int num) */ void QG_DialogFactory::commandMessage(const QString& message) { - RS_DEBUG->print("QG_DialogFactory::commandMessage"); + DEBUG->print("QG_DialogFactory::commandMessage"); if (commandWidget != NULL) commandWidget->appendHistory(message); - RS_DEBUG->print("QG_DialogFactory::commandMessage: OK"); + DEBUG->print("QG_DialogFactory::commandMessage: OK"); } /*virtual*/ bool QG_DialogFactory::isAdapter()