// Q3MainWindow(0, "", Qt::WDestructiveClose), QG_MainWindowInterface()
QMainWindow((QWidget *)NULL/*,this is not a Qt::WindowFlags --> Qt::WA_DeleteOnClose*/), QG_MainWindowInterface()
{
- RS_DEBUG->print("ApplicationWindow::ApplicationWindow");
+ DEBUG->print("ApplicationWindow::ApplicationWindow");
appWindow = this;
//no assistant = NULL;
workspace = NULL;
- RS_DEBUG->print("ApplicationWindow::ApplicationWindow: setting icon");
+ DEBUG->print("ApplicationWindow::ApplicationWindow: setting icon");
// setIcon(qPixmapFromMimeSource(QC_APP_ICON));
// setWindowIcon(qPixmapFromMimeSource(QC_APP_ICON));
setWindowIcon(QIcon(":/res/" QC_APP_ICON));
CreateQtActions(this);
- RS_DEBUG->print("ApplicationWindow::ApplicationWindow: creating action handler");
+ DEBUG->print("ApplicationWindow::ApplicationWindow: creating action handler");
actionHandler = new ActionHandler(this);
- RS_DEBUG->print("ApplicationWindow::ApplicationWindow: creating action handler: OK");
+ DEBUG->print("ApplicationWindow::ApplicationWindow: creating action handler: OK");
-#ifdef RS_SCRIPTING
- RS_DEBUG->print("ApplicationWindow::ApplicationWindow: creating scripter");
+#ifdef SCRIPTING
+ DEBUG->print("ApplicationWindow::ApplicationWindow: creating scripter");
scripter = new QS_Scripter(this, this);
- RS_DEBUG->print("ApplicationWindow::ApplicationWindow: creating scripter: OK");
+ DEBUG->print("ApplicationWindow::ApplicationWindow: creating scripter: OK");
#endif
- RS_DEBUG->print("ApplicationWindow::ApplicationWindow: init view");
+ DEBUG->print("ApplicationWindow::ApplicationWindow: init view");
initView();
- RS_DEBUG->print("ApplicationWindow::ApplicationWindow: init toolbar");
+ DEBUG->print("ApplicationWindow::ApplicationWindow: init toolbar");
initToolBar();
- RS_DEBUG->print("ApplicationWindow::ApplicationWindow: init actions");
+ DEBUG->print("ApplicationWindow::ApplicationWindow: init actions");
initActions();
- RS_DEBUG->print("ApplicationWindow::ApplicationWindow: init menu bar");
+ DEBUG->print("ApplicationWindow::ApplicationWindow: init menu bar");
initMenuBar();
- RS_DEBUG->print("ApplicationWindow::ApplicationWindow: init status bar");
+ DEBUG->print("ApplicationWindow::ApplicationWindow: init status bar");
initStatusBar();
- RS_DEBUG->print("ApplicationWindow::ApplicationWindow: creating dialogFactory");
+ DEBUG->print("ApplicationWindow::ApplicationWindow: creating dialogFactory");
dialogFactory = new QC_DialogFactory(this, optionWidget);
- RS_DEBUG->print("ApplicationWindow::ApplicationWindow: creating dialogFactory: OK");
- RS_DEBUG->print("setting dialog factory object");
+ DEBUG->print("ApplicationWindow::ApplicationWindow: creating dialogFactory: OK");
+ DEBUG->print("setting dialog factory object");
- if (RS_DialogFactory::instance() == NULL)
- RS_DEBUG->print("no RS_DialogFactory instance");
+ if (DialogFactory::instance() == NULL)
+ DEBUG->print("no DialogFactory instance");
else
- RS_DEBUG->print("got RS_DialogFactory instance");
+ DEBUG->print("got DialogFactory instance");
- RS_DialogFactory::instance()->setFactoryObject(dialogFactory);
- RS_DEBUG->print("setting dialog factory object: OK");
+ DialogFactory::instance()->setFactoryObject(dialogFactory);
+ DEBUG->print("setting dialog factory object: OK");
- RS_DEBUG->print("ApplicationWindow::ApplicationWindow: init settings");
+ DEBUG->print("ApplicationWindow::ApplicationWindow: init settings");
initSettings();
- RS_DEBUG->print("ApplicationWindow::ApplicationWindow: init MDI");
+ DEBUG->print("ApplicationWindow::ApplicationWindow: init MDI");
initMDI();
// Disable menu and toolbar items
*/
ApplicationWindow::~ApplicationWindow()
{
- RS_DEBUG->print("ApplicationWindow::~ApplicationWindow");
-#ifdef RS_SCRIPTING
- RS_DEBUG->print("ApplicationWindow::~ApplicationWindow: deleting scripter");
+ DEBUG->print("ApplicationWindow::~ApplicationWindow");
+#ifdef SCRIPTING
+ DEBUG->print("ApplicationWindow::~ApplicationWindow: deleting scripter");
delete scripter;
- RS_DEBUG->print("ApplicationWindow::~ApplicationWindow: deleting scripter: OK");
+ DEBUG->print("ApplicationWindow::~ApplicationWindow: deleting scripter: OK");
#endif
- RS_DEBUG->print("ApplicationWindow::~ApplicationWindow: deleting action handler");
+ DEBUG->print("ApplicationWindow::~ApplicationWindow: deleting action handler");
delete actionHandler;
- RS_DEBUG->print("ApplicationWindow::~ApplicationWindow: deleting action handler: OK");
+ DEBUG->print("ApplicationWindow::~ApplicationWindow: deleting action handler: OK");
- RS_DEBUG->print("ApplicationWindow::~ApplicationWindow: deleting dialog factory");
+ DEBUG->print("ApplicationWindow::~ApplicationWindow: deleting dialog factory");
delete dialogFactory;
- RS_DEBUG->print("ApplicationWindow::~ApplicationWindow: deleting dialog factory: OK");
+ DEBUG->print("ApplicationWindow::~ApplicationWindow: deleting dialog factory: OK");
-//no RS_DEBUG->print("ApplicationWindow::~ApplicationWindow: "
+//no DEBUG->print("ApplicationWindow::~ApplicationWindow: "
// "deleting assistant..");
// if (assistant!=NULL) {
// delete assistant;
// }
-// RS_DEBUG->print("ApplicationWindow::~ApplicationWindow: "
+// DEBUG->print("ApplicationWindow::~ApplicationWindow: "
// "deleting assistant: OK");
- RS_DEBUG->print("ApplicationWindow::~ApplicationWindow: OK");
+ DEBUG->print("ApplicationWindow::~ApplicationWindow: OK");
}
/**
*/
void ApplicationWindow::slotRunScript()
{
- RS_DEBUG->print("ApplicationWindow::slotRunScript");
+ DEBUG->print("ApplicationWindow::slotRunScript");
const QObject * s = sender();
if (s != NULL)
{
QString script = ((QAction *)s)->text();
- RS_DEBUG->print("ApplicationWindow::slotRunScript: %s", script.toLatin1().data());
+ DEBUG->print("ApplicationWindow::slotRunScript: %s", script.toLatin1().data());
slotRunScript(script);
}
}
*/
void ApplicationWindow::slotRunScript(const QString & name)
{
-#ifdef RS_SCRIPTING
- RS_DEBUG->print("ApplicationWindow::slotRunScript");
+#ifdef SCRIPTING
+ DEBUG->print("ApplicationWindow::slotRunScript");
if (scripter == NULL)
{
- RS_DEBUG->print(RS_Debug::D_WARNING, "ApplicationWindow::slotRunScript: scripter not initialized");
+ DEBUG->print(Debug::D_WARNING, "ApplicationWindow::slotRunScript: scripter not initialized");
return;
}
statusBar()->showMessage(tr("Running script '%1'").arg(name), 2000);
- QStringList scriptList = RS_SYSTEM->getScriptList();
- scriptList.append(RS_SYSTEM->getHomeDir() + "/.architektonas/" + name);
+ QStringList scriptList = SYSTEM->getScriptList();
+ scriptList.append(SYSTEM->getHomeDir() + "/.architektonas/" + name);
for (QStringList::Iterator it = scriptList.begin(); it!=scriptList.end(); ++it)
{
- RS_DEBUG->print("ApplicationWindow::slotRunScript: checking script '%s'", (*it).toLatin1().data();
+ DEBUG->print("ApplicationWindow::slotRunScript: checking script '%s'", (*it).toLatin1().data();
QFileInfo fi(*it);
if (fi.exists() && fi.fileName() == name)
{
- RS_DEBUG->print("ApplicationWindow::slotRunScript: running '%s'", (*it).toLatin1().data());
+ DEBUG->print("ApplicationWindow::slotRunScript: running '%s'", (*it).toLatin1().data());
scripter->runScript(*it, "main");
}
}
if (s != NULL)
{
QString block = ((QAction *)s)->text();
- RS_DEBUG->print("ApplicationWindow::slotInsertBlock: %s", block.toLatin1().data());
+ DEBUG->print("ApplicationWindow::slotInsertBlock: %s", block.toLatin1().data());
slotInsertBlock(block);
}
}
*/
void ApplicationWindow::slotInsertBlock(const QString & name)
{
- RS_DEBUG->print("ApplicationWindow::slotInsertBlock: '%s'", name.toLatin1().data());
+ DEBUG->print("ApplicationWindow::slotInsertBlock: '%s'", name.toLatin1().data());
statusBar()->showMessage(tr("Inserting block '%1'").arg(name), 2000);
GraphicView * graphicView = getGraphicView();
- RS_Document * document = getDocument();
+ Document * document = getDocument();
if (graphicView && document)
{
*/
void ApplicationWindow::closeEvent(QCloseEvent * /*ce*/)
{
- RS_DEBUG->print("ApplicationWindow::closeEvent()");
+ DEBUG->print("ApplicationWindow::closeEvent()");
slotFileQuit();
- RS_DEBUG->print("ApplicationWindow::closeEvent(): OK");
+ DEBUG->print("ApplicationWindow::closeEvent(): OK");
}
/**
*/
void ApplicationWindow::initMDI()
{
- RS_DEBUG->print("ApplicationWindow::initMDI() begin");
+ DEBUG->print("ApplicationWindow::initMDI() begin");
/* Could use QVBoxLayout instead of Q3VBox, but do we even need to? */
// Q3VBox * vb = new Q3VBox(this);
// workspace->setScrollBarsEnabled(true);
// setCentralWidget(vb);
setCentralWidget(workspace);//JLH:hmm. (Yes, it works! \o/)
- RS_DEBUG->print("ApplicationWindow::initMDI(): workspace=%08X", workspace);
+ DEBUG->print("ApplicationWindow::initMDI(): workspace=%08X", workspace);
//#warning "Object::connect: No such signal QMdiArea::windowActivated(QWidget *)"
// connect(workspace, SIGNAL(windowActivated(QWidget *)), this, SLOT(slotWindowActivated(QWidget *)));
connect(workspace, SIGNAL(subWindowActivated(QMdiSubWindow *)), this,
SLOT(slotWindowActivated(QMdiSubWindow *)));
- RS_DEBUG->print("ApplicationWindow::initMDI() end");
+ DEBUG->print("ApplicationWindow::initMDI() end");
}
/**
*/
void ApplicationWindow::initActions()
{
- RS_DEBUG->print("ApplicationWindow::initActions()");
+ DEBUG->print("ApplicationWindow::initActions()");
//
// File actions:
addToolBar(Qt::TopToolBarArea, (QToolBar *)penToolBar); // hmm.
addToolBar(Qt::TopToolBarArea, optionWidget);
-#ifdef RS_SCRIPTING
+#ifdef SCRIPTING
// Scripts menu:
//
scriptMenu = new QMenu(this);
*/
void ApplicationWindow::initMenuBar()
{
- RS_DEBUG->print("ApplicationWindow::initMenuBar()");
+ DEBUG->print("ApplicationWindow::initMenuBar()");
// menuBar entry windowsMenu
windowsMenu = new QMenu(tr("&Window"), this);
testMenu->addAction(testResize1024);//testResize1024->addTo(testMenu);
// menuBar configuration
-#ifdef RS_SCRIPTING
+#ifdef SCRIPTING
// menuBar()->insertItem(tr("&Scripts"), scriptMenu);
menuBar()->addMenu(scriptMenu);
#endif
*/
void ApplicationWindow::initToolBar()
{
- RS_DEBUG->print("ApplicationWindow::initToolBar()");
+ DEBUG->print("ApplicationWindow::initToolBar()");
// fileToolBar = new Q3ToolBar(this, "File Operations");
fileToolBar = addToolBar(tr("File Operations"));
penToolBar = new PenToolBar(this, "Pen Selection");
penToolBar->setObjectName("pen");
- connect(penToolBar, SIGNAL(penChanged(RS_Pen)), this, SLOT(slotPenChanged(RS_Pen)));
+ connect(penToolBar, SIGNAL(penChanged(Pen)), this, SLOT(slotPenChanged(Pen)));
// optionWidget = new Q3ToolBar(this, "Tool Options");
//addToolBarBreak() does nothing...
*/
void ApplicationWindow::initStatusBar()
{
- RS_DEBUG->print("ApplicationWindow::initStatusBar()");
+ DEBUG->print("ApplicationWindow::initStatusBar()");
statusBar()->setMinimumHeight(32);
coordinateWidget = new CoordinateWidget(statusBar());//, "coordinates");
*/
void ApplicationWindow::initSettings()
{
- RS_DEBUG->print("ApplicationWindow::initSettings()");
+ DEBUG->print("ApplicationWindow::initSettings()");
settings.beginGroup("RecentFiles");
for(int i=0; i<recentFiles->Maximum(); ++i)
*/
void ApplicationWindow::storeSettings()
{
- RS_DEBUG->print("ApplicationWindow::storeSettings()");
+ DEBUG->print("ApplicationWindow::storeSettings()");
settings.beginGroup("RecentFiles");
settings.setValue("DockWindows", saveState());
settings.endGroup();
- RS_DEBUG->print("ApplicationWindow::storeSettings(): OK");
+ DEBUG->print("ApplicationWindow::storeSettings(): OK");
}
/**
*/
void ApplicationWindow::initView()
{
- RS_DEBUG->print("ApplicationWindow::initView()");
+ DEBUG->print("ApplicationWindow::initView()");
- RS_DEBUG->print("init view..");
+ DEBUG->print("init view..");
QDockWidget * dw;
layerWidget = NULL;
blockWidget = NULL;
#endif
#ifdef RS_CAM
- RS_DEBUG->print(" simulation widget..");
+ DEBUG->print(" simulation widget..");
dw = new QDockWidget(QDockWidget::InDock, this, "Simulation");
simulationControls = new RS_SimulationControls(dw, "Simulation");
simulationControls->setFocusPolicy(Qt::NoFocus);
//simulationDockWindow->hide();
#endif
- RS_DEBUG->print(" layer widget..");
+ DEBUG->print(" layer widget..");
// dw = new QDockWidget(QDockWidget::InDock, this, "Layer");
dw = new QDockWidget(tr("Layer List"), this);
dw->setObjectName("layer");
addDockWidget(Qt::RightDockWidgetArea, dw);
layerDockWindow = dw;
- RS_DEBUG->print(" block widget..");
+ DEBUG->print(" block widget..");
// dw = new QDockWidget(QDockWidget::InDock, this, "Block");
dw = new QDockWidget(tr("Block List"), this);
dw->setObjectName("block");
addDockWidget(Qt::RightDockWidgetArea, dw);
blockDockWindow = dw;
- RS_DEBUG->print(" library widget..");
+ DEBUG->print(" library widget..");
// dw = new QDockWidget(QDockWidget::OutsideDock, this, "Library");
dw = new QDockWidget(tr("Library Browser"), this);
dw->setObjectName("library");
libraryDockWindow = dw;
// libraryDockWindow->hide();
- RS_DEBUG->print(" command widget..");
+ DEBUG->print(" command widget..");
// dw = new QDockWidget(QDockWidget::InDock, this, "Command");
dw = new QDockWidget(tr("Command line"), this);
dw->setObjectName("command");
commandDockWindow = dw;
addDockWidget(Qt::BottomDockWidgetArea, dw);
- RS_DEBUG->print(" done");
+ DEBUG->print(" done");
}
/**
*/
void ApplicationWindow::slotWindowActivated(QMdiSubWindow * /*w*/)
{
- RS_DEBUG->print("ApplicationWindow::slotWindowActivated begin");
+ DEBUG->print("ApplicationWindow::slotWindowActivated begin");
//the following does: return (MDIWindow *)workspace->activeSubWindow();
//which means the subwindow is NOT being activated!!!
MDIWindow * m = getMDIWindow();
- RS_DEBUG->print(/*RS_Debug::D_CRITICAL,*/ "ApplicationWindow::slotWindowActivated m=%08X", m);
+ DEBUG->print(/*Debug::D_CRITICAL,*/ "ApplicationWindow::slotWindowActivated m=%08X", m);
if (m)
- RS_DEBUG->print(/*RS_Debug::D_CRITICAL,*/ "ApplicationWindow::slotWindowActivated m->getDoc=%08X", m->getDocument());
+ DEBUG->print(/*Debug::D_CRITICAL,*/ "ApplicationWindow::slotWindowActivated m->getDoc=%08X", m->getDocument());
if (m && m->getDocument())
{
//m->setWindowState(WindowMaximized);
- RS_DEBUG->print("ApplicationWindow::slotWindowActivated: document: %d", m->getDocument()->getId());
+ DEBUG->print("ApplicationWindow::slotWindowActivated: document: %d", m->getDocument()->getId());
bool showByBlock = m->getDocument()->rtti() == RS2::EntityBlock;
layerWidget->setLayerList(m->getDocument()->getLayerList(), showByBlock);
// Disable/Enable menu and toolbar items
emit windowsChanged(m != NULL && m->getDocument() != NULL);
- RS_DEBUG->print("ApplicationWindow::slotWindowActivated end");
+ DEBUG->print("ApplicationWindow::slotWindowActivated end");
}
/**
*/
void ApplicationWindow::slotWindowsMenuAboutToShow()
{
- RS_DEBUG->print("ApplicationWindow::slotWindowsMenuAboutToShow");
+ DEBUG->print("ApplicationWindow::slotWindowsMenuAboutToShow");
windowsMenu->clear();
#if 0
*/
void ApplicationWindow::slotWindowsMenuActivated(QAction * id)
{
- RS_DEBUG->print("ApplicationWindow::slotWindowsMenuActivated");
+ DEBUG->print("ApplicationWindow::slotWindowsMenuActivated");
// QMdiSubWindow * w = workspace->subWindowList().at(id);
QMdiSubWindow * w = workspace->subWindowList().at(id->data().toInt());
*/
void ApplicationWindow::slotTileHorizontal()
{
- RS_DEBUG->print("ApplicationWindow::slotTileHorizontal");
+ DEBUG->print("ApplicationWindow::slotTileHorizontal");
#if 0
// primitive horizontal tiling
void ApplicationWindow::slotCamExportAuto() {
printf("CAM export..\n");
- RS_Document* d = getDocument();
+ Document* d = getDocument();
if (d!=NULL) {
Drawing* graphic = (Drawing*)d;
* Called when something changed in the pen tool bar
* (e.g. color, width, style).
*/
-void ApplicationWindow::slotPenChanged(RS_Pen pen)
+void ApplicationWindow::slotPenChanged(Pen pen)
{
- RS_DEBUG->print("ApplicationWindow::slotPenChanged() begin");
- RS_DEBUG->print("Setting active pen...");
+ DEBUG->print("ApplicationWindow::slotPenChanged() begin");
+ DEBUG->print("Setting active pen...");
MDIWindow * m = getMDIWindow();
if (m != NULL)
m->slotPenChanged(pen);
- RS_DEBUG->print("ApplicationWindow::slotPenChanged() end");
+ DEBUG->print("ApplicationWindow::slotPenChanged() end");
}
/**
* Creates a new MDI window with the given document or a new
* document if 'doc' is NULL.
*/
-MDIWindow * ApplicationWindow::slotFileNew(RS_Document * doc)
+MDIWindow * ApplicationWindow::slotFileNew(Document * doc)
{
- RS_DEBUG->print("ApplicationWindow::slotFileNew() begin");
+ DEBUG->print("ApplicationWindow::slotFileNew() begin");
static int id = 0;
id++;
statusBar()->showMessage(tr("Creating new file..."));
#warning "QWidget::setMinimumSize: (/QMdi::ControlLabel) Negative sizes (-1,-1) are not possible"
- RS_DEBUG->print(" creating MDI window");
+ DEBUG->print(" creating MDI window");
// MDIWindow * w = new MDIWindow(doc, workspace, 0, Qt::WA_DeleteOnClose);
MDIWindow * w = new MDIWindow(doc, workspace, 0, Qt::SubWindow);
w->setAttribute(Qt::WA_DeleteOnClose);
connect(w, SIGNAL(signalClosing()), this, SLOT(slotFileClosing()));
if (w->getDocument()->rtti() == RS2::EntityBlock)
-// w->setCaption(tr("Block '%1'").arg(((RS_Block *)(w->getDocument()))->getName()));
- w->setWindowTitle(tr("Block '%1'").arg(((RS_Block *)(w->getDocument()))->getName()));
+// w->setCaption(tr("Block '%1'").arg(((Block *)(w->getDocument()))->getName()));
+ w->setWindowTitle(tr("Block '%1'").arg(((Block *)(w->getDocument()))->getName()));
else
// w->setCaption(tr("unnamed document %1").arg(id));
w->setWindowTitle(tr("unnamed document %1").arg(id));
w->setWindowIcon(QIcon(":/res/document.png"));
// only graphics offer block lists, blocks don't
- RS_DEBUG->print(" adding listeners");
+ DEBUG->print(" adding listeners");
Drawing * graphic = w->getDocument()->getGraphic();
#if 0
QG_DIALOGFACTORY->setMainWindow(this);
#if 1 //bugfix for Qt3->4 conversion
- RS_DEBUG->print(/*RS_Debug::D_CRITICAL,*/ "ApplicationWindow::slotFileNew: adding window to workspace...");
+ DEBUG->print(/*Debug::D_CRITICAL,*/ "ApplicationWindow::slotFileNew: adding window to workspace...");
// workspace->addWindow(w);
workspace->addSubWindow(w);
#endif
- RS_DEBUG->print(" showing MDI window");
+ DEBUG->print(" showing MDI window");
#if 0
#warning "w->showMaximized() doesn't seem to do anything here..."
slotWindowActivated(w);
statusBar()->showMessage(tr("New Drawing created."), 2000);
- RS_DEBUG->print("ApplicationWindow::slotFileNew() OK");
+ DEBUG->print("ApplicationWindow::slotFileNew() OK");
setFocus();
return w;
*/
void ApplicationWindow::slotFileOpen()
{
- RS_DEBUG->print("ApplicationWindow::slotFileOpen()");
+ DEBUG->print("ApplicationWindow::slotFileOpen()");
- RS_DEBUG->print("ApplicationWindow::slotFileOpen() 001");
+ DEBUG->print("ApplicationWindow::slotFileOpen() 001");
RS2::FormatType type = RS2::FormatUnknown;
- RS_DEBUG->print("ApplicationWindow::slotFileOpen() 002");
+ DEBUG->print("ApplicationWindow::slotFileOpen() 002");
QString fileName = FileDialog::getOpenFileName(this, &type);
- RS_DEBUG->print("ApplicationWindow::slotFileOpen() 003");
+ DEBUG->print("ApplicationWindow::slotFileOpen() 003");
slotFileOpen(fileName, type);
- RS_DEBUG->print("ApplicationWindow::slotFileOpen(): OK");
+ DEBUG->print("ApplicationWindow::slotFileOpen(): OK");
}
/**
void ApplicationWindow::slotFileOpenRecent(void)
{
#if 0
- RS_DEBUG->print("ApplicationWindow::slotFileOpenRecent()");
+ DEBUG->print("ApplicationWindow::slotFileOpenRecent()");
statusBar()->showMessage(tr("Opening recent file..."));
QString fileName = recentFiles->get(id);
*/
void ApplicationWindow::slotFileOpen(const QString & fileName, RS2::FormatType type)
{
- RS_DEBUG->print("ApplicationWindow::slotFileOpen(..)");
+ DEBUG->print("ApplicationWindow::slotFileOpen(..)");
QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
if (!fileName.isEmpty())
{
- RS_DEBUG->print("ApplicationWindow::slotFileOpen: creating new doc window");
+ DEBUG->print("ApplicationWindow::slotFileOpen: creating new doc window");
// Create new document window:
MDIWindow * w = slotFileNew();
- RS_DEBUG->print("ApplicationWindow::slotFileOpen: linking layer list");
+ DEBUG->print("ApplicationWindow::slotFileOpen: linking layer list");
// link the layer widget to the new document:
layerWidget->setLayerList(w->getDocument()->getLayerList(), false);
// link the block widget to the new document:
// link the layer widget to the new document:
simulationControls->setGraphicView(w->getGraphicView());
#endif
- RS_DEBUG->print("ApplicationWindow::slotFileOpen: open file");
+ DEBUG->print("ApplicationWindow::slotFileOpen: open file");
// Open the file in the new view:
if (!w->slotFileOpen(fileName, type))
return;
}
- RS_DEBUG->print("ApplicationWindow::slotFileOpen: open file: OK");
- RS_DEBUG->print("ApplicationWindow::slotFileOpen: update recent file menu: 1");
+ DEBUG->print("ApplicationWindow::slotFileOpen: open file: OK");
+ DEBUG->print("ApplicationWindow::slotFileOpen: update recent file menu: 1");
// update recent files menu:
if (type == RS2::FormatDXF1)
else
recentFiles->add(fileName);
- RS_DEBUG->print("ApplicationWindow::slotFileOpen: update recent file menu: 2");
+ DEBUG->print("ApplicationWindow::slotFileOpen: update recent file menu: 2");
recentFiles->UpdateGUI();
- RS_DEBUG->print("ApplicationWindow::slotFileOpen: update recent file menu: OK");
- RS_DEBUG->print("ApplicationWindow::slotFileOpen: set caption");
+ DEBUG->print("ApplicationWindow::slotFileOpen: update recent file menu: OK");
+ DEBUG->print("ApplicationWindow::slotFileOpen: set caption");
// update caption:
w->setWindowTitle(fileName);
- RS_DEBUG->print("ApplicationWindow::slotFileOpen: set caption: OK");
- RS_DEBUG->print("ApplicationWindow::slotFileOpen: update coordinate widget");
+ DEBUG->print("ApplicationWindow::slotFileOpen: set caption: OK");
+ DEBUG->print("ApplicationWindow::slotFileOpen: update coordinate widget");
// update coordinate widget format:
- RS_DIALOGFACTORY->updateCoordinateWidget(Vector(0.0, 0.0), Vector(0.0, 0.0), true);
- RS_DEBUG->print("ApplicationWindow::slotFileOpen: update coordinate widget: OK");
+ DIALOGFACTORY->updateCoordinateWidget(Vector(0.0, 0.0), Vector(0.0, 0.0), true);
+ DEBUG->print("ApplicationWindow::slotFileOpen: update coordinate widget: OK");
// Update the layer and block widgets (document just loaded may have some)
layerWidget->update();
blockWidget->update();
}
QApplication::restoreOverrideCursor();
- RS_DEBUG->print("ApplicationWindow::slotFileOpen(..) OK");
+ DEBUG->print("ApplicationWindow::slotFileOpen(..) OK");
}
/**
*/
void ApplicationWindow::slotFileSave()
{
- RS_DEBUG->print("ApplicationWindow::slotFileSave()");
+ DEBUG->print("ApplicationWindow::slotFileSave()");
statusBar()->showMessage(tr("Saving drawing..."));
*/
void ApplicationWindow::slotFileSaveAs()
{
- RS_DEBUG->print("ApplicationWindow::slotFileSaveAs()");
+ DEBUG->print("ApplicationWindow::slotFileSaveAs()");
statusBar()->showMessage(tr("Saving drawing under new filename..."));
*/
void ApplicationWindow::slotFileExport()
{
- RS_DEBUG->print("ApplicationWindow::slotFileExport()");
+ DEBUG->print("ApplicationWindow::slotFileExport()");
statusBar()->showMessage(tr("Exporting drawing..."));
MDIWindow * w = getMDIWindow();
QString fn;
// read default settings:
settings.beginGroup("Paths");
- QString defDir = settings.value("ExportImage", RS_SYSTEM->getHomeDir()).toString();
+ QString defDir = settings.value("ExportImage", SYSTEM->getHomeDir()).toString();
QString defFilter = settings.value("ExportImageFilter", "Portable Network Graphic (*.png)").toString();
settings.endGroup();
if (!w)
{
- RS_DEBUG->print(RS_Debug::D_WARNING, "ApplicationWindow::slotFileExport: no window opened");
+ DEBUG->print(Debug::D_WARNING, "ApplicationWindow::slotFileExport: no window opened");
return false;
}
if (!graphic)
{
- RS_DEBUG->print(RS_Debug::D_WARNING, "ApplicationWindow::slotFileExport: no graphic");
+ DEBUG->print(Debug::D_WARNING, "ApplicationWindow::slotFileExport: no graphic");
return false;
}
// black background:
if (black)
-// painter->setBackgroundColor(RS_Color(0, 0, 0));
-// qpntr.setBackgroundColor(RS_Color(0, 0, 0));
+// painter->setBackgroundColor(Color(0, 0, 0));
+// qpntr.setBackgroundColor(Color(0, 0, 0));
qpntr.setBackground(QBrush(QColor(0, 0, 0)));
// white background:
else
-// painter->setBackgroundColor(RS_Color(255, 255, 255));
-// qpntr.setBackgroundColor(RS_Color(255, 255, 255));
+// painter->setBackgroundColor(Color(255, 255, 255));
+// qpntr.setBackgroundColor(Color(255, 255, 255));
qpntr.setBackground(QBrush(QColor(255, 255, 255)));
// black/white:
// painter->eraseRect(0, 0, size.width(), size.height());
qpntr.eraseRect(0, 0, size.width(), size.height());
- RS_StaticGraphicView gv(size.width(), size.height(), painter);
+ StaticGraphicView gv(size.width(), size.height(), painter);
if (black)
- gv.setBackground(RS_Color(0, 0, 0));
+ gv.setBackground(Color(0, 0, 0));
else
- gv.setBackground(RS_Color(255, 255, 255));
+ gv.setBackground(Color(255, 255, 255));
gv.setContainer(graphic);
gv.zoomAuto(false);
*/
void ApplicationWindow::slotFileClose()
{
- RS_DEBUG->print("ApplicationWindow::slotFileClose()");
+ DEBUG->print("ApplicationWindow::slotFileClose()");
MDIWindow * m = getMDIWindow();
*/
void ApplicationWindow::slotFileClosing()
{
- RS_DEBUG->print("ApplicationWindow::slotFileClosing()");
+ DEBUG->print("ApplicationWindow::slotFileClosing()");
- RS_DEBUG->print("detaching lists");
+ DEBUG->print("detaching lists");
layerWidget->setLayerList(NULL, false);
blockWidget->setBlockList(NULL);
coordinateWidget->setGraphic(NULL);
*/
void ApplicationWindow::slotFilePrint()
{
- RS_DEBUG->print("ApplicationWindow::slotFilePrint()");
+ DEBUG->print("ApplicationWindow::slotFilePrint()");
MDIWindow * w = getMDIWindow();
if (w == NULL)
{
- RS_DEBUG->print(RS_Debug::D_WARNING, "ApplicationWindow::slotFilePrint: no window opened");
+ DEBUG->print(Debug::D_WARNING, "ApplicationWindow::slotFilePrint: no window opened");
return;
}
if (graphic == NULL)
{
- RS_DEBUG->print(RS_Debug::D_WARNING, "ApplicationWindow::slotFilePrint: no graphic");
+ DEBUG->print(Debug::D_WARNING, "ApplicationWindow::slotFilePrint: no graphic");
return;
}
PaintInterface * painter = new PaintInterface(&qpntr);
painter->setDrawingMode(w->getGraphicView()->getDrawingMode());
-// RS_StaticGraphicView gv(metr.width(), metr.height(), painter);
- RS_StaticGraphicView gv(printer->width(), printer->height(), painter);
+// StaticGraphicView gv(metr.width(), metr.height(), painter);
+ StaticGraphicView gv(printer->width(), printer->height(), painter);
gv.setPrinting(true);
gv.setBorders(0, 0, 0, 0);
-// double fx = (double)metr.width() / metr.widthMM() * RS_Units::getFactorToMM(graphic->getUnit());
-// double fy = (double)metr.height() / metr.heightMM() * RS_Units::getFactorToMM(graphic->getUnit());
- double fx = (double)printer->width() / printer->widthMM() * RS_Units::getFactorToMM(graphic->getUnit());
- double fy = (double)printer->height() / printer->heightMM() * RS_Units::getFactorToMM(graphic->getUnit());
+// double fx = (double)metr.width() / metr.widthMM() * Units::getFactorToMM(graphic->getUnit());
+// double fy = (double)metr.height() / metr.heightMM() * Units::getFactorToMM(graphic->getUnit());
+ double fx = (double)printer->width() / printer->widthMM() * Units::getFactorToMM(graphic->getUnit());
+ double fy = (double)printer->height() / printer->heightMM() * Units::getFactorToMM(graphic->getUnit());
double f = (fx + fy) / 2;
double scale = graphic->getPaperScale();
*/
void ApplicationWindow::slotFilePrintPreview(bool on)
{
- RS_DEBUG->print("ApplicationWindow::slotFilePrintPreview()");
+ DEBUG->print("ApplicationWindow::slotFilePrintPreview()");
- RS_DEBUG->print(" creating MDI window");
+ DEBUG->print(" creating MDI window");
MDIWindow * parent = getMDIWindow();
if (!parent)
{
- RS_DEBUG->print(RS_Debug::D_WARNING, "ApplicationWindow::slotFilePrintPreview: no window opened");
+ DEBUG->print(Debug::D_WARNING, "ApplicationWindow::slotFilePrintPreview: no window opened");
return;
}
// close print preview:
if (!on)
{
- RS_DEBUG->print("ApplicationWindow::slotFilePrintPreview(): off");
+ DEBUG->print("ApplicationWindow::slotFilePrintPreview(): off");
if (parent->getGraphicView()->isPrintPreview())
{
- RS_DEBUG->print("ApplicationWindow::slotFilePrintPreview(): close");
+ DEBUG->print("ApplicationWindow::slotFilePrintPreview(): close");
slotFileClose();
}
}
if (ppv != NULL)
{
- RS_DEBUG->print("ApplicationWindow::slotFilePrintPreview(): show existing");
+ DEBUG->print("ApplicationWindow::slotFilePrintPreview(): show existing");
slotWindowActivated(ppv);
ppv->showNormal();
}
{
if (!parent->getGraphicView()->isPrintPreview())
{
- RS_DEBUG->print("ApplicationWindow::slotFilePrintPreview(): create");
+ DEBUG->print("ApplicationWindow::slotFilePrintPreview(): create");
MDIWindow * w = new MDIWindow(parent->getDocument(), workspace, 0, Qt::SubWindow);
w->setAttribute(Qt::WA_DeleteOnClose);
// w->setWindowIcon(qPixmapFromMimeSource("document.png"));
w->setWindowIcon(QIcon(":/res/document.png"));
w->getGraphicView()->setPrintPreview(true);
- w->getGraphicView()->setBackground(RS_Color(255, 255, 255));
+ w->getGraphicView()->setBackground(Color(255, 255, 255));
w->getGraphicView()->setDefaultAction(new ActionPrintPreview(*w->getDocument(), *w->getGraphicView()));
// only graphics offer block lists, blocks don't
- RS_DEBUG->print(" adding listeners");
+ DEBUG->print(" adding listeners");
Drawing * graphic = w->getDocument()->getGraphic();
if (graphic)
// Link the graphic view to the command widget:
QG_DIALOGFACTORY->setCommandWidget(commandWidget);
- RS_DEBUG->print(" showing MDI window");
+ DEBUG->print(" showing MDI window");
if (workspace->subWindowList().isEmpty())
w->showMaximized();
*/
void ApplicationWindow::slotFileQuit()
{
- RS_DEBUG->print("ApplicationWindow::slotFileQuit()");
+ DEBUG->print("ApplicationWindow::slotFileQuit()");
statusBar()->showMessage(tr("Exiting application..."));
*/
void ApplicationWindow::slotViewGrid(bool toggle)
{
- RS_DEBUG->print("ApplicationWindow::slotViewGrid()");
+ DEBUG->print("ApplicationWindow::slotViewGrid()");
MDIWindow * m = getMDIWindow();
updateGrids();
redrawAll();
- RS_DEBUG->print("ApplicationWindow::slotViewGrid() OK");
+ DEBUG->print("ApplicationWindow::slotViewGrid() OK");
}
/**
*/
void ApplicationWindow::slotViewDraft(bool toggle)
{
- RS_DEBUG->print("ApplicationWindow::slotViewDraft()");
+ DEBUG->print("ApplicationWindow::slotViewDraft()");
/*MDIWindow* m = getMDIWindow();
if (m!=NULL) {
*/
void ApplicationWindow::slotViewStatusBar(bool showSB)
{
- RS_DEBUG->print("ApplicationWindow::slotViewStatusBar()");
+ DEBUG->print("ApplicationWindow::slotViewStatusBar()");
if (showSB)
statusBar()->show();
* @param toggle true: show, false: hide.
*/
/*void ApplicationWindow::slotViewLayerList(bool toggle) {
- RS_DEBUG->print("ApplicationWindow::slotViewLayerList()");
+ DEBUG->print("ApplicationWindow::slotViewLayerList()");
if (toggle==false) {
layerDockWindow->hide();
*/
/*
void ApplicationWindow::slotViewBlockList(bool toggle) {
- RS_DEBUG->print("ApplicationWindow::slotViewBlockList()");
+ DEBUG->print("ApplicationWindow::slotViewBlockList()");
if (toggle==false) {
blockDockWindow->hide();
*/
/*
void ApplicationWindow::slotViewCommandLine(bool toggle) {
- RS_DEBUG->print("ApplicationWindow::slotViewCommandLine()");
+ DEBUG->print("ApplicationWindow::slotViewCommandLine()");
if (toggle==false) {
commandDockWindow->hide();
*/
/*
void ApplicationWindow::slotViewOptionToolbar(bool toggle) {
- RS_DEBUG->print("ApplicationWindow::slotViewOptionToolbar()");
+ DEBUG->print("ApplicationWindow::slotViewOptionToolbar()");
if (toggle==false) {
optionWidget->hide();
*/
/*
void ApplicationWindow::slotBlocksEdit() {
- RS_DEBUG->print("ApplicationWindow::slotBlocksEdit()");
+ DEBUG->print("ApplicationWindow::slotBlocksEdit()");
MDIWindow* parent = getMDIWindow();
if (parent!=NULL) {
- RS_BlockList* blist = blockWidget->getBlockList();
+ BlockList* blist = blockWidget->getBlockList();
if (blist!=NULL) {
- RS_Block* blk = blist->getActiveBlock();
+ Block* blk = blist->getActiveBlock();
if (blk!=NULL) {
MDIWindow* w = slotFileNew(blk);
// the parent needs a pointer to the block window and
*/
void ApplicationWindow::slotOptionsGeneral()
{
- RS_DIALOGFACTORY->requestOptionsGeneralDialog();
+ DIALOGFACTORY->requestOptionsGeneralDialog();
// update background color of all open drawings:
settings.beginGroup("Appearance");
*/
void ApplicationWindow::slotScriptOpenIDE()
{
-#ifdef RS_SCRIPTING
+#ifdef SCRIPTING
scripter->openIDE();
#endif
}
*/
void ApplicationWindow::slotScriptRun()
{
-#ifdef RS_SCRIPTING
+#ifdef SCRIPTING
scripter->runScript();
#endif
}
*/
void ApplicationWindow::slotHelpAbout()
{
- RS_DEBUG->print("ApplicationWindow::slotHelpAbout()");
+ DEBUG->print("ApplicationWindow::slotHelpAbout()");
QStringList modules;
#ifdef RS_CAM
modules += "CAM";
#endif
-#ifdef RS_SCRIPTING
+#ifdef SCRIPTING
modules += "Scripting";
#endif
{
#warning "No help system ported to Qt4... !!! FIX !!!"
#if 0
- RS_DEBUG->print("ApplicationWindow::slotHelpManual()");
+ DEBUG->print("ApplicationWindow::slotHelpManual()");
if (assistant == NULL)
{
- RS_DEBUG->print("ApplicationWindow::slotHelpManual(): appdir: %s", RS_SYSTEM->getAppDir().toLatin1().data());
- RS_DEBUG->print("ApplicationWindow::slotHelpManual(): appdir: %s", RS_SYSTEM->getAppDir().toLatin1().data());
- assistant = new QAssistantClient(RS_SYSTEM->getAppDir()+"/bin", this);
+ DEBUG->print("ApplicationWindow::slotHelpManual(): appdir: %s", SYSTEM->getAppDir().toLatin1().data());
+ DEBUG->print("ApplicationWindow::slotHelpManual(): appdir: %s", SYSTEM->getAppDir().toLatin1().data());
+ assistant = new QAssistantClient(SYSTEM->getAppDir()+"/bin", this);
connect(assistant, SIGNAL(error(const QString&)), this, SLOT(slotError(const QString&)));
QStringList args;
args << "-profile";
- args << QDir::convertSeparators(RS_SYSTEM->getDocPath() + "/qcaddoc.adp");
+ args << QDir::convertSeparators(SYSTEM->getDocPath() + "/qcaddoc.adp");
// args << QString("doc") + QDir::separator() + QString("qcaddoc.adp");
#if QT_VERSION>=0x030200
/**
* Testing function.
*/
-void ApplicationWindow::slotTestDumpEntities(RS_EntityContainer * d)
+void ApplicationWindow::slotTestDumpEntities(EntityContainer * d)
{
- RS_DEBUG->print("ApplicationWindow::slotTestDumpEntities()");
+ DEBUG->print("ApplicationWindow::slotTestDumpEntities()");
static int level = 0;
std::ofstream dumpFile;
dumpFile << "<body>\n";
}
- for (RS_Entity* e=d->firstEntity();
+ for (Entity* e=d->firstEntity();
e!=NULL;
e=d->nextEntity())
{
{
case RS2::EntityPoint:
{
- RS_Point* p = (RS_Point*)e;
+ Point* p = (Point*)e;
dumpFile
<< "<table><tr><td>"
<< "<b>Point:</b>"
case RS2::EntityLine:
{
- RS_Line* l = (RS_Line*)e;
+ Line* l = (Line*)e;
dumpFile
<< "<table><tr><td>"
<< "<b>Line:</b>"
break;
case RS2::EntityArc: {
- RS_Arc* a = (RS_Arc*)e;
+ Arc* a = (Arc*)e;
dumpFile
<< "<table><tr><td>"
<< "<b>Arc:</b>"
break;
case RS2::EntityCircle: {
- RS_Circle* c = (RS_Circle*)e;
+ Circle* c = (Circle*)e;
dumpFile
<< "<table><tr><td>"
<< "<b>Circle:</b>"
break;
case RS2::EntityDimAligned: {
- RS_DimAligned* d = (RS_DimAligned*)e;
+ DimAligned* d = (DimAligned*)e;
dumpFile
<< "<table><tr><td>"
<< "<b>Dimension / Aligned:</b>"
case RS2::EntityDimLinear:
{
- RS_DimLinear* d = (RS_DimLinear*)e;
+ DimLinear* d = (DimLinear*)e;
dumpFile
<< "<table><tr><td>"
<< "<b>Dimension / Linear:</b>"
break;
case RS2::EntityInsert: {
- RS_Insert* i = (RS_Insert*)e;
+ Insert* i = (Insert*)e;
dumpFile
<< "<table><tr><td>"
<< "<b>Insert:</b>"
break;
case RS2::EntityText: {
- RS_Text* t = (RS_Text*)e;
+ Text* t = (Text*)e;
dumpFile
<< "<table><tr><td>"
<< "<b>Text:</b>"
break;
case RS2::EntityHatch: {
- RS_Hatch* h = (RS_Hatch*)e;
+ Hatch* h = (Hatch*)e;
dumpFile
<< "<table><tr><td>"
<< "<b>Hatch:</b>"
}
if (e->isContainer() || e->rtti()==RS2::EntityHatch) {
- RS_EntityContainer* ec = (RS_EntityContainer*)e;
+ EntityContainer* ec = (EntityContainer*)e;
dumpFile << "<table><tr><td valign=\"top\"> Contents:</td><td>\n";
dumpFile.close();
slotTestDumpEntities(ec);
*/
void ApplicationWindow::slotTestDumpUndo()
{
- RS_DEBUG->print("ApplicationWindow::slotTestDumpUndo()");
+ DEBUG->print("ApplicationWindow::slotTestDumpUndo()");
- RS_Document * d = getDocument();
+ Document * d = getDocument();
if (d != NULL)
{
- std::cout << *(RS_Undo*)d;
+ std::cout << *(Undo*)d;
std::cout << std::endl;
}
}
*/
void ApplicationWindow::slotTestUpdateInserts()
{
- RS_DEBUG->print("ApplicationWindow::slotTestUpdateInserts()");
+ DEBUG->print("ApplicationWindow::slotTestUpdateInserts()");
- RS_Document * d = getDocument();
+ Document * d = getDocument();
if (d != NULL)
d->updateInserts();
*/
void ApplicationWindow::slotTestDrawFreehand()
{
- RS_DEBUG->print("ApplicationWindow::slotTestDrawFreehand()");
+ DEBUG->print("ApplicationWindow::slotTestDrawFreehand()");
//Drawing* g = document->getMarking();
/*
*/
void ApplicationWindow::slotTestInsertBlock()
{
- RS_DEBUG->print("ApplicationWindow::slotTestInsertBlock()");
+ DEBUG->print("ApplicationWindow::slotTestInsertBlock()");
- RS_Document * d = getDocument();
+ Document * d = getDocument();
if (d != NULL && d->rtti() == RS2::EntityGraphic)
{
if (graphic == NULL)
return;
- graphic->addLayer(new RS_Layer("default"));
- RS_Block * block = new RS_Block(graphic, RS_BlockData("debugblock", Vector(0.0, 0.0), true));
+ graphic->addLayer(new Layer("default"));
+ Block * block = new Block(graphic, BlockData("debugblock", Vector(0.0, 0.0), true));
- RS_Line * line;
- RS_Arc * arc;
- RS_Circle * circle;
+ Line * line;
+ Arc * arc;
+ Circle * circle;
// Add one red line:
- line = new RS_Line(block, RS_LineData(Vector(0.0, 0.0), Vector(50.0, 0.0)));
+ line = new Line(block, LineData(Vector(0.0, 0.0), Vector(50.0, 0.0)));
line->setLayerToActive();
- line->setPen(RS_Pen(RS_Color(255, 0, 0), RS2::Width01, RS2::SolidLine));
+ line->setPen(Pen(Color(255, 0, 0), RS2::Width01, RS2::SolidLine));
block->addEntity(line);
// Add one line with attributes from block:
- line = new RS_Line(block, RS_LineData(Vector(50.0, 0.0), Vector(50.0, 50.0)));
- line->setPen(RS_Pen(RS_Color(RS2::FlagByBlock), RS2::WidthByBlock, RS2::LineByBlock));
+ line = new Line(block, LineData(Vector(50.0, 0.0), Vector(50.0, 50.0)));
+ line->setPen(Pen(Color(RS2::FlagByBlock), RS2::WidthByBlock, RS2::LineByBlock));
block->addEntity(line);
// Add one arc with attributes from block:
- RS_ArcData d(Vector(50.0, 0.0), 50.0, M_PI / 2.0, M_PI, false);
- arc = new RS_Arc(block, d);
- arc->setPen(RS_Pen(RS_Color(RS2::FlagByBlock), RS2::WidthByBlock, RS2::LineByBlock));
+ ArcData d(Vector(50.0, 0.0), 50.0, M_PI / 2.0, M_PI, false);
+ arc = new Arc(block, d);
+ arc->setPen(Pen(Color(RS2::FlagByBlock), RS2::WidthByBlock, RS2::LineByBlock));
block->addEntity(arc);
// Add one blue circle:
- RS_CircleData circleData(Vector(20.0, 15.0), 12.5);
- circle = new RS_Circle(block, circleData);
+ CircleData circleData(Vector(20.0, 15.0), 12.5);
+ circle = new Circle(block, circleData);
circle->setLayerToActive();
- circle->setPen(RS_Pen(RS_Color(0, 0, 255), RS2::Width01, RS2::SolidLine));
+ circle->setPen(Pen(Color(0, 0, 255), RS2::Width01, RS2::SolidLine));
block->addEntity(circle);
graphic->addBlock(block);
- RS_Insert * ins;
- RS_InsertData insData("debugblock", Vector(0.0, 0.0), Vector(1.0, 1.0), 0.0, 1, 1, Vector(0.0, 0.0), NULL, RS2::NoUpdate);
+ Insert * ins;
+ InsertData insData("debugblock", Vector(0.0, 0.0), Vector(1.0, 1.0), 0.0, 1, 1, Vector(0.0, 0.0), NULL, RS2::NoUpdate);
// insert one magenta instance of the block (original):
- ins = new RS_Insert(graphic, insData);
+ ins = new Insert(graphic, insData);
ins->setLayerToActive();
- ins->setPen(RS_Pen(RS_Color(255, 0, 255), RS2::Width02, RS2::SolidLine));
+ ins->setPen(Pen(Color(255, 0, 255), RS2::Width02, RS2::SolidLine));
ins->update();
graphic->addEntity(ins);
// insert one green instance of the block (rotate):
- insData = RS_InsertData("debugblock", Vector(-50.0, 20.0), Vector(1.0, 1.0), 30.0 / ARAD, 1, 1, Vector(0.0, 0.0), NULL, RS2::NoUpdate);
- ins = new RS_Insert(graphic, insData);
+ insData = InsertData("debugblock", Vector(-50.0, 20.0), Vector(1.0, 1.0), 30.0 / ARAD, 1, 1, Vector(0.0, 0.0), NULL, RS2::NoUpdate);
+ ins = new Insert(graphic, insData);
ins->setLayerToActive();
- ins->setPen(RS_Pen(RS_Color(0, 255, 0), RS2::Width02, RS2::SolidLine));
+ ins->setPen(Pen(Color(0, 255, 0), RS2::Width02, RS2::SolidLine));
ins->update();
graphic->addEntity(ins);
// insert one cyan instance of the block (move):
- insData = RS_InsertData("debugblock", Vector(10.0, 20.0), Vector(1.0, 1.0), 0.0, 1, 1, Vector(0.0, 0.0), NULL, RS2::NoUpdate);
- ins = new RS_Insert(graphic, insData);
+ insData = InsertData("debugblock", Vector(10.0, 20.0), Vector(1.0, 1.0), 0.0, 1, 1, Vector(0.0, 0.0), NULL, RS2::NoUpdate);
+ ins = new Insert(graphic, insData);
ins->setLayerToActive();
- ins->setPen(RS_Pen(RS_Color(0, 255, 255), RS2::Width02, RS2::SolidLine));
+ ins->setPen(Pen(Color(0, 255, 255), RS2::Width02, RS2::SolidLine));
ins->update();
graphic->addEntity(ins);
// insert one blue instance of the block:
for(double a=0.0; a<360.0; a+=45.0)
{
- insData = RS_InsertData("debugblock", Vector(60.0, 0.0), Vector(2.0 / 5, 2.0 / 5), a/ARAD, 1, 1, Vector(0.0, 0.0), NULL, RS2::NoUpdate);
- ins = new RS_Insert(graphic, insData);
+ insData = InsertData("debugblock", Vector(60.0, 0.0), Vector(2.0 / 5, 2.0 / 5), a/ARAD, 1, 1, Vector(0.0, 0.0), NULL, RS2::NoUpdate);
+ ins = new Insert(graphic, insData);
ins->setLayerToActive();
- ins->setPen(RS_Pen(RS_Color(0, 0, 255), RS2::Width05, RS2::SolidLine));
+ ins->setPen(Pen(Color(0, 0, 255), RS2::Width05, RS2::SolidLine));
ins->update();
graphic->addEntity(ins);
}
// insert an array of yellow instances of the block:
- insData = RS_InsertData("debugblock", Vector(-100.0, -100.0), Vector(0.2, 0.2), M_PI / 6.0, 6, 4, Vector(100.0, 100.0), NULL, RS2::NoUpdate);
- ins = new RS_Insert(graphic, insData);
+ insData = InsertData("debugblock", Vector(-100.0, -100.0), Vector(0.2, 0.2), M_PI / 6.0, 6, 4, Vector(100.0, 100.0), NULL, RS2::NoUpdate);
+ ins = new Insert(graphic, insData);
ins->setLayerToActive();
- ins->setPen(RS_Pen(RS_Color(255, 255, 0), RS2::Width01, RS2::SolidLine));
+ ins->setPen(Pen(Color(255, 255, 0), RS2::Width01, RS2::SolidLine));
ins->update();
graphic->addEntity(ins);
*/
void ApplicationWindow::slotTestInsertEllipse()
{
- RS_DEBUG->print("ApplicationWindow::slotTestInsertEllipse()");
+ DEBUG->print("ApplicationWindow::slotTestInsertEllipse()");
- RS_Document * d = getDocument();
+ Document * d = getDocument();
if (d != NULL)
{
if (graphic == NULL)
return;
- RS_Ellipse * ellipse;
- RS_Line * line;
+ Ellipse * ellipse;
+ Line * line;
for (double a=0.0; a<2*M_PI; a+=0.1)
{
v.setPolar(50.0, a);
double xp = 1000.0*a;
- RS_EllipseData ellipseData(Vector(xp, 0.0), v, 0.5, 0.0, 2 * M_PI, false);
- ellipse = new RS_Ellipse(graphic, ellipseData);
+ EllipseData ellipseData(Vector(xp, 0.0), v, 0.5, 0.0, 2 * M_PI, false);
+ ellipse = new Ellipse(graphic, ellipseData);
- ellipse->setPen(RS_Pen(RS_Color(255, 0, 255), RS2::Width01, RS2::SolidLine));
+ ellipse->setPen(Pen(Color(255, 0, 255), RS2::Width01, RS2::SolidLine));
graphic->addEntity(ellipse);
- //graphic->addEntity(new RS_Point(graphic, ellipse->getMax()));
- //graphic->addEntity(new RS_Point(graphic, ellipse->getMin()));
+ //graphic->addEntity(new Point(graphic, ellipse->getMax()));
+ //graphic->addEntity(new Point(graphic, ellipse->getMin()));
- line = new RS_Line(graphic, RS_LineData(Vector(xp, 0.0), Vector(xp, 0.0) + v));
- line->setPen(RS_Pen(RS_Color(128, 128, 128), RS2::Width01, RS2::SolidLine));
+ line = new Line(graphic, LineData(Vector(xp, 0.0), Vector(xp, 0.0) + v));
+ line->setPen(Pen(Color(128, 128, 128), RS2::Width01, RS2::SolidLine));
graphic->addEntity(line);
/*
for (double mx=-60.0; mx<60.0; mx+=1.0) {
//for (double mx=0.0; mx<1.0; mx+=2.5) {
VectorSolutions sol = ellipse->mapX(xp + mx);
- //graphic->addEntity(new RS_Point(graphic,
+ //graphic->addEntity(new Point(graphic,
// sol.vector2 + Vector(a*500.0, 0.0)));
- //graphic->addEntity(new RS_Point(graphic,
+ //graphic->addEntity(new Point(graphic,
// sol.vector3 + Vector(a*500.0, 0.0)));
- //graphic->addEntity(new RS_Point(graphic,
+ //graphic->addEntity(new Point(graphic,
// sol.vector4 + Vector(a*500.0, 0.0)));
- line = new RS_Line(graphic,
- RS_LineData(Vector(xp+mx,-50.0),
+ line = new Line(graphic,
+ LineData(Vector(xp+mx,-50.0),
Vector(xp+mx,50.0)));
- line->setPen(RS_Pen(RS_Color(60, 60, 60),
+ line->setPen(Pen(Color(60, 60, 60),
RS2::Width01,
RS2::SolidLine));
graphic->addEntity(line);
- graphic->addEntity(new RS_Point(graphic,
+ graphic->addEntity(new Point(graphic,
sol.get(0)));
}
*/
for (x=-250.0; x<=250.0; x+=50.0) {
Vector v(x, y);
- ellipse = new RS_Ellipse(graphic,
+ ellipse = new Ellipse(graphic,
v,
Vector((x/5+50.0)/2.0, 0.0),
fabs(x/y),
0.0, 2*M_PI,
false);
- ellipse->setPen(RS_Pen(RS_Color(255, 255, 0),
+ ellipse->setPen(Pen(Color(255, 255, 0),
RS2::Width01,
RS2::DashDotLine));
graphic->addEntity(ellipse);
- graphic->addEntity(new RS_Point(graphic, ellipse->getMax()));
- graphic->addEntity(new RS_Point(graphic, ellipse->getMin()));
+ graphic->addEntity(new Point(graphic, ellipse->getMax()));
+ graphic->addEntity(new Point(graphic, ellipse->getMin()));
- ellipse = new RS_Ellipse(graphic,
+ ellipse = new Ellipse(graphic,
v + Vector(750.0, 0.0),
Vector((x/5+50.0)/2.0, 0.0),
fabs(x/y),
true);
graphic->addEntity(ellipse);
- graphic->addEntity(new RS_Point(graphic, ellipse->getMax()));
- graphic->addEntity(new RS_Point(graphic, ellipse->getMin()));
+ graphic->addEntity(new Point(graphic, ellipse->getMax()));
+ graphic->addEntity(new Point(graphic, ellipse->getMin()));
}
}
*/
// different rotation angles:
double rot;
for (rot=0.0; rot<=2*M_PI+0.1; rot+=(M_PI/8)) {
- ellipse = new RS_Ellipse(graphic,
+ ellipse = new Ellipse(graphic,
Vector(rot*200, 500.0),
Vector(50.0, 0.0).rotate(rot),
0.3,
0.0, 2*M_PI,
false);
graphic->addEntity(ellipse);
- graphic->addEntity(new RS_Point(graphic, ellipse->getMax()));
- graphic->addEntity(new RS_Point(graphic, ellipse->getMin()));
+ graphic->addEntity(new Point(graphic, ellipse->getMax()));
+ graphic->addEntity(new Point(graphic, ellipse->getMin()));
}
for (rot=0.0; rot<=2*M_PI+0.1; rot+=(M_PI/8)) {
for (a1=0.0; a1<=2*M_PI+0.1; a1+=(M_PI/8)) {
for (a2=a1+M_PI/8; a2<=2*M_PI+a1+0.1; a2+=(M_PI/8)) {
- ellipse = new RS_Ellipse(graphic,
+ ellipse = new Ellipse(graphic,
Vector(-500.0-a1*200.0-5000.0*rot,
500.0-a2*200.0),
Vector(50.0, 0.0).rotate(rot),
a1, a2,
false);
graphic->addEntity(ellipse);
- graphic->addEntity(new RS_Point(graphic, ellipse->getMax()));
- graphic->addEntity(new RS_Point(graphic, ellipse->getMin()));
+ graphic->addEntity(new Point(graphic, ellipse->getMax()));
+ graphic->addEntity(new Point(graphic, ellipse->getMin()));
}
}
}
*/
void ApplicationWindow::slotTestInsertText()
{
- RS_DEBUG->print("ApplicationWindow::slotTestInsertText()");
+ DEBUG->print("ApplicationWindow::slotTestInsertText()");
- RS_Document * d = getDocument();
+ Document * d = getDocument();
if (d != NULL)
{
if (graphic == NULL)
return;
- RS_Text * text;
- RS_TextData textData;
+ Text * text;
+ TextData textData;
- textData = RS_TextData(Vector(10.0, 10.0), 10.0, 100.0, RS2::VAlignTop, RS2::HAlignLeft, RS2::LeftToRight, RS2::Exact, 1.0, "Andrew", "normal", 0.0);
- text = new RS_Text(graphic, textData);
+ textData = TextData(Vector(10.0, 10.0), 10.0, 100.0, RS2::VAlignTop, RS2::HAlignLeft, RS2::LeftToRight, RS2::Exact, 1.0, "Andrew", "normal", 0.0);
+ text = new Text(graphic, textData);
text->setLayerToActive();
- text->setPen(RS_Pen(RS_Color(255, 0, 0), RS2::Width01, RS2::SolidLine));
+ text->setPen(Pen(Color(255, 0, 0), RS2::Width01, RS2::SolidLine));
graphic->addEntity(text);
/*
for (x=-250.0; x<=250.0; x+=50.0) {
Vector v(x, y);
- textData = RS_TextData(v,
+ textData = TextData(v,
10.0, 100.0,
RS2::VAlignTop,
RS2::HAlignLeft,
"normal",
0.0);
- text = new RS_Text(graphic, textData);
+ text = new Text(graphic, textData);
text->setLayerToActive();
- text->setPen(RS_Pen(RS_Color(255, 0, 0),
+ text->setPen(Pen(Color(255, 0, 0),
RS2::Width01,
RS2::SolidLine));
graphic->addEntity(text);
}
}
- RS_Line* line;
+ Line* line;
for (x=0.0; x<M_PI*2.0; x+=0.2) {
Vector v(600.0+cos(x)*50.0, 0.0+sin(x)*50.0);
- line = new RS_Line(graphic,
- RS_LineData(Vector(600.0,0.0),
+ line = new Line(graphic,
+ LineData(Vector(600.0,0.0),
v));
line->setLayerToActive();
line->setPenToActive();
graphic->addEntity(line);
- textData = RS_TextData(v,
+ textData = TextData(v,
5.0, 50.0,
RS2::VAlignTop,
RS2::HAlignLeft,
"normal",
x);
- text = new RS_Text(graphic, textData);
+ text = new Text(graphic, textData);
text->setLayerToActive();
- text->setPen(RS_Pen(RS_Color(255, 0, 0),
+ text->setPen(Pen(Color(255, 0, 0),
RS2::Width01,
RS2::SolidLine));
graphic->addEntity(text);
}
- RS_SolidData solidData = RS_SolidData(Vector(5.0, 10.0),
+ SolidData solidData = SolidData(Vector(5.0, 10.0),
Vector(25.0, 15.0),
Vector(15.0, 30.0));
- RS_Solid* s = new RS_Solid(graphic, solidData);
+ Solid* s = new Solid(graphic, solidData);
s->setLayerToActive();
- s->setPen(RS_Pen(RS_Color(255, 255, 0),
+ s->setPen(Pen(Color(255, 255, 0),
RS2::Width01,
RS2::SolidLine));
graphic->addEntity(s);
*/
void ApplicationWindow::slotTestInsertImage()
{
- RS_DEBUG->print("ApplicationWindow::slotTestInsertImage()");
+ DEBUG->print("ApplicationWindow::slotTestInsertImage()");
- RS_Document * d = getDocument();
+ Document * d = getDocument();
if (d != NULL)
{
if (graphic == NULL)
return;
- RS_Image * image;
- RS_ImageData imageData;
+ Image * image;
+ ImageData imageData;
- imageData = RS_ImageData(0, Vector(50.0, 30.0), Vector(0.5, 0.5), Vector(-0.5, 0.5), Vector(640, 480), "/home/andrew/data/image.png", 50, 50, 0);
- image = new RS_Image(graphic, imageData);
+ imageData = ImageData(0, Vector(50.0, 30.0), Vector(0.5, 0.5), Vector(-0.5, 0.5), Vector(640, 480), "/home/andrew/data/image.png", 50, 50, 0);
+ image = new Image(graphic, imageData);
image->setLayerToActive();
- image->setPen(RS_Pen(RS_Color(255, 0, 0), RS2::Width01, RS2::SolidLine));
+ image->setPen(Pen(Color(255, 0, 0), RS2::Width01, RS2::SolidLine));
graphic->addEntity(image);
}
}
*/
void ApplicationWindow::slotTestUnicode()
{
- RS_DEBUG->print("ApplicationWindow::slotTestUnicode()");
+ DEBUG->print("ApplicationWindow::slotTestUnicode()");
slotFileOpen("./fonts/unicode.cxf", RS2::FormatCXF);
- RS_Document* d = getDocument();
+ Document* d = getDocument();
if (d!=NULL) {
Drawing* graphic = (Drawing*)d;
if (graphic==NULL) {
return;
}
- RS_Insert* ins;
+ Insert* ins;
int col;
int row;
strCode = "[" + strCode + "] " + uCode;
if (graphic->findBlock(strCode)!=NULL) {
- RS_InsertData d(strCode,
+ InsertData d(strCode,
Vector(col/0x10*20.0,row*20.0),
Vector(1.0,1.0), 0.0,
1, 1, Vector(0.0, 0.0),
NULL, RS2::NoUpdate);
- ins = new RS_Insert(graphic, d);
+ ins = new Insert(graphic, d);
ins->setLayerToActive();
- ins->setPen(RS_Pen(RS_Color(255, 255, 255),
+ ins->setPen(Pen(Color(255, 255, 255),
RS2::Width01,
RS2::SolidLine));
ins->update();
*/
void ApplicationWindow::slotTestMath01()
{
- RS_DEBUG->print("ApplicationWindow::slotTestMath01()");
+ DEBUG->print("ApplicationWindow::slotTestMath01()");
- RS_Document* d = getDocument();
+ Document* d = getDocument();
if (d!=NULL) {
Drawing* graphic = (Drawing*)d;
if (graphic==NULL) {
}
// axis
- graphic->addEntity(new RS_Line(graphic,
- RS_LineData(Vector(0.0,0.0),
+ graphic->addEntity(new Line(graphic,
+ LineData(Vector(0.0,0.0),
Vector(2*M_PI,0.0))));
- graphic->addEntity(new RS_Line(graphic,
- RS_LineData(Vector(0.0,-1.0),
+ graphic->addEntity(new Line(graphic,
+ LineData(Vector(0.0,-1.0),
Vector(0.0,1.0))));
// cos
double x_0 = 60.0/ARAD;
for (a=0.01; a<2*M_PI; a+=0.01) {
// cos curve:
- RS_Line* line = new RS_Line(graphic,
- RS_LineData(Vector(a-0.01, cos(a-0.01)),
+ Line* line = new Line(graphic,
+ LineData(Vector(a-0.01, cos(a-0.01)),
Vector(a, cos(a))));
graphic->addEntity(line);
// tangent:
- graphic->addEntity(new RS_Line(graphic,
- RS_LineData(Vector(a-0.01,cos(x_0)-sin(x_0)*(a-0.01-x_0)),
+ graphic->addEntity(new Line(graphic,
+ LineData(Vector(a-0.01,cos(x_0)-sin(x_0)*(a-0.01-x_0)),
Vector(a,cos(x_0)-sin(x_0)*(a-x_0)))));
}
// 59.0 deg
- graphic->addEntity(new RS_Line(graphic,
- RS_LineData(Vector(x,0.0),
+ graphic->addEntity(new Line(graphic,
+ LineData(Vector(x,0.0),
Vector(x,1.0))));
// 60.0 deg
- graphic->addEntity(new RS_Line(graphic,
- RS_LineData(Vector(x_0,0.0),
+ graphic->addEntity(new Line(graphic,
+ LineData(Vector(x_0,0.0),
Vector(x_0,1.0))));
// tangent
- //graphic->addEntity(new RS_Line(graphic,
+ //graphic->addEntity(new Line(graphic,
// Vector(0.0,cos(x_0)-sin(x_0)*(0.0-x_0)),
// Vector(6.0,cos(x_0)-sin(x_0)*(6.0-x_0))));
*/
void ApplicationWindow::slotTestResize640()
{
- RS_DEBUG->print("ApplicationWindow::slotTestResize640()");
+ DEBUG->print("ApplicationWindow::slotTestResize640()");
resize(640, 480);
}
*/
void ApplicationWindow::slotTestResize800()
{
- RS_DEBUG->print("ApplicationWindow::slotTestResize800()");
+ DEBUG->print("ApplicationWindow::slotTestResize800()");
resize(800, 600);
}
*/
void ApplicationWindow::slotTestResize1024()
{
- RS_DEBUG->print("ApplicationWindow::slotTestResize1024()");
+ DEBUG->print("ApplicationWindow::slotTestResize1024()");
resize(1024, 768);
}
*/
bool ApplicationWindow::queryExit(bool force)
{
- RS_DEBUG->print("ApplicationWindow::queryExit()");
+ DEBUG->print("ApplicationWindow::queryExit()");
bool succ = true;
if (succ)
storeSettings();
- RS_DEBUG->print("ApplicationWindow::queryExit(): OK");
+ DEBUG->print("ApplicationWindow::queryExit(): OK");
return succ;
}
*/
MDIWindow * ApplicationWindow::getMDIWindow()
{
- RS_DEBUG->print(/*RS_Debug::D_CRITICAL,*/ "ApplicationWindow::getMDIWindow: workspace=%08X", workspace);
+ DEBUG->print(/*Debug::D_CRITICAL,*/ "ApplicationWindow::getMDIWindow: workspace=%08X", workspace);
if (workspace)
{
- RS_DEBUG->print("ApplicationWindow::getMDIWindow: activeSubWindow=%08X", workspace->activeSubWindow());
+ DEBUG->print("ApplicationWindow::getMDIWindow: activeSubWindow=%08X", workspace->activeSubWindow());
return (MDIWindow *)workspace->activeSubWindow();
}
- RS_DEBUG->print("ApplicationWindow::getMDIWindow: activeSubWindow=??? (workspace == NULL)");
+ DEBUG->print("ApplicationWindow::getMDIWindow: activeSubWindow=??? (workspace == NULL)");
return NULL;
}
/**
- * Implementation from RS_MainWindowInterface (and QS_ScripterHostInterface).
+ * Implementation from MainWindowInterface (and QS_ScripterHostInterface).
*
* @return Pointer to the graphic view of the currently active document
* window or NULL if no window is available.
}
/**
- * Implementation from RS_MainWindowInterface (and QS_ScripterHostInterface).
+ * Implementation from MainWindowInterface (and QS_ScripterHostInterface).
*
* @return Pointer to the graphic document of the currently active document
* window or NULL if no window is available.
*/
-/*virtual*/ RS_Document * ApplicationWindow::getDocument()
+/*virtual*/ Document * ApplicationWindow::getDocument()
{
MDIWindow * m = getMDIWindow();
}
/**
- * Creates a new document. Implementation from RS_MainWindowInterface.
+ * Creates a new document. Implementation from MainWindowInterface.
*/
/*virtual*/ void ApplicationWindow::createNewDocument(const QString & fileName/*= QString::null*/,
- RS_Document * doc/*= NULL*/)
+ Document * doc/*= NULL*/)
{
slotFileNew(doc);
#endif
}
-#ifdef RS_SCRIPTING
+#ifdef SCRIPTING
/**
* @return Pointer to the qsa object.
*/
projects / architektonas / blobdiff