// 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 <jlhamm@acm.org>
//
#include "qg_dialogfactory.h"
-#include "qg_layerwidget.h"
+#include "graphicview.h"
+#include "layerwidget.h"
#include "qg_mainwindowinterface.h"
-#include "rs_actiondimlinear.h"
-#include "rs_actioninterface.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"
#include "linerelangleoptions.h"
#include "mousewidget.h"
#include "moverotateoptions.h"
+#include "polylineoptions.h"
#include "printpreviewoptions.h"
#include "roundoptions.h"
#include "selectionwidget.h"
#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;
*/
//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);
cadToolBar = NULL;
commandWidget = NULL;
mainWindow = NULL;
- RS_DEBUG->print("QG_DialogFactory::QG_DialogFactory: OK");
+ DEBUG->print("QG_DialogFactory::QG_DialogFactory: OK");
}
/**
*/
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");
}
/**
///*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");
}
/**
/**
* Requests a new document from the main window.
*/
-RS_GraphicView * QG_DialogFactory::requestNewDocument(const QString & fileName, RS_Document * doc)
+GraphicView * QG_DialogFactory::requestNewDocument(const QString & fileName, Document * doc)
{
if (mainWindow != NULL)
{
* @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;
}
// Layer for parameter livery
- layer = new RS_Layer(layer_name);
+ layer = new Layer(layer_name);
// QG_LayerDialog dlg(parent, "Layer Dialog");
LayerDialog dlg(parent);
*
* @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;
/*
if (layerList==NULL) {
if (container!=NULL && container->rtti()==RS2::EntityGraphic) {
- layerList = (RS_LayerList*)container;
+ layerList = (LayerList*)container;
} else {
return NULL;
}
* @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);
* @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);
*
* @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;
}
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*/)
{
}
*
* @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;
}
// 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();
// 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();
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;
}
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:
case RS2::ActionDimLinear:
requestDimensionOptions(action, on, update);
- if (((RS_ActionDimLinear *)action)->hasFixedAngle() == false)
+ if (((ActionDimLinear *)action)->hasFixedAngle() == false)
requestDimLinearOptions(action, on, update);
break;
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;
/**
* 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
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)
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;
/**
* 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;
/**
* 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;
/**
* 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;
/**
* 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;
/**
* 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;
/**
* 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;
/**
* 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;
/**
* 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;
/**
* 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;
/**
* 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;
/**
* 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;
/**
* 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;
/**
* 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;
/**
* 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;
/**
* 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;
/**
* 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;
/**
* 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;
/**
* 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;
/**
* 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;
*/
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)
* 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;
}
/**
* 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);
/**
* 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);
/**
* 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);
/**
* 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);
/**
* 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);
/**
* 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);
/**
* 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);
/**
* 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;
case RS2::EntityPoint:
{
DlgPoint dlg(parent);
- dlg.setPoint(*((RS_Point *)entity));
+ dlg.setPoint(*((Point *)entity));
if (dlg.exec())
{
case RS2::EntityLine:
{
DlgLine dlg(parent);
- dlg.setLine(*((RS_Line *)entity));
+ dlg.setLine(*((Line *)entity));
if (dlg.exec())
{
case RS2::EntityArc:
{
DlgArc dlg(parent);
- dlg.setArc(*((RS_Arc *)entity));
+ dlg.setArc(*((Arc *)entity));
if (dlg.exec())
{
case RS2::EntityCircle:
{
DlgCircle dlg(parent);
- dlg.setCircle(*((RS_Circle *)entity));
+ dlg.setCircle(*((Circle *)entity));
if (dlg.exec())
{
case RS2::EntityEllipse:
{
DlgEllipse dlg(parent);
- dlg.setEllipse(*((RS_Ellipse *)entity));
+ dlg.setEllipse(*((Ellipse *)entity));
if (dlg.exec())
{
case RS2::EntitySpline:
{
DlgSpline dlg(parent);
- dlg.setSpline(*((RS_Spline *)entity));
+ dlg.setSpline(*((Spline *)entity));
if (dlg.exec())
{
case RS2::EntityInsert:
{
DlgInsert dlg(parent);
- dlg.setInsert(*((RS_Insert *)entity));
+ dlg.setInsert(*((Insert *)entity));
if (dlg.exec())
{
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;
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;
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;
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;
}
/*
-bool QG_DialogFactory::requestDimAlignedDialog(RS_DimAligned* dim) {
+bool QG_DialogFactory::requestDimAlignedDialog(DimAligned* dim) {
return false;
}
*/
/**
* 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;
/**
* 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);
*/
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
*/
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);
}
*/
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()
projects / architektonas / blobdiff