Added ability to edit grid unit in base units, work on Dimension.

[architektonas] / src / applicationwindow.cpp

diff --git a/src/applicationwindow.cpp b/src/applicationwindow.cpp
index 4aac209c35e3764bc7f59e1a8a74fad758469549..96b13ca8b6a66964d8094784d17f062d96342ab2 100644 (file)
--- a/src/applicationwindow.cpp
+++ b/src/applicationwindow.cpp
@@ -29,9 +29,11 @@
 #include "applicationwindow.h"
 
 #include "about.h"
+#include "blockwidget.h"
 #include "drawingview.h"
 #include "fileio.h"
 #include "generaltab.h"
+#include "layerwidget.h"
 #include "painter.h"
 #include "settingsdialog.h"
 
@@ -53,20 +55,26 @@ ApplicationWindow::ApplicationWindow(): settings("Underground Software", "Archit
        CreateMenus();
        CreateToolbars();
 
+       // Create Dock widgets
+       QDockWidget * dock1 = new QDockWidget(tr("Layers"), this);
+       LayerWidget * lw = new LayerWidget;
+       dock1->setWidget(lw);
+       addDockWidget(Qt::RightDockWidgetArea, dock1);
+       QDockWidget * dock2 = new QDockWidget(tr("Blocks"), this);
+       BlockWidget * bw = new BlockWidget;
+       dock2->setWidget(bw);
+       addDockWidget(Qt::RightDockWidgetArea, dock2);
+       // Needed for saveState()
+       dock1->setObjectName("Layers");
+       dock2->setObjectName("Blocks");
+
        //      Create status bar
        zoomIndicator = new QLabel("Grid: 12.0\" Zoom: 12.5%");
        statusBar()->addPermanentWidget(zoomIndicator);
        statusBar()->showMessage(tr("Ready"));
 
        ReadSettings();
-
-//     connect(textEdit->document(), SIGNAL(contentsChanged()),
-//                     this, SLOT(documentWasModified()));
-
-//     setCurrentFile("");
        setUnifiedTitleAndToolBarOnMac(true);
-
-//     ((TTEdit *)qApp)->charWnd->show();//eh?
        Object::SetFont(new QFont("Verdana", 15, QFont::Bold));
 }
 
@@ -282,9 +290,11 @@ when zooming in, new origin will be (xCenter - origin.x) / 2, (yCenter - origin.
 
 //printf("Zoom in... level going from %02f to ", Painter::zoom);
        // This just zooms leaving origin intact... should zoom in at the current center! [DONE]
+       // This should actually be calculated by drawing->gridPixels / grid size.
        Painter::zoom *= zoomFactor;
        drawing->gridSpacing = 12.0 / Painter::zoom;
-       zoomIndicator->setText(QString("Grid: %2\" Zoom: %1%").arg(Painter::zoom * 100.0 * SCREEN_ZOOM).arg(drawing->gridSpacing));
+//     zoomIndicator->setText(QString("Grid: %2\" Zoom: %1%").arg(Painter::zoom * 100.0 * SCREEN_ZOOM).arg(drawing->gridSpacing));
+       zoomIndicator->setText(QString("Grid: %1\", BU: Inch").arg(drawing->gridSpacing));
        drawing->UpdateGridBackground();
        drawing->update();
 }
@@ -320,7 +330,8 @@ x 2 = (-426, -301)
        // This just zooms leaving origin intact... should zoom out at the current center! [DONE]
        Painter::zoom /= zoomFactor;
        drawing->gridSpacing = 12.0 / Painter::zoom;
-       zoomIndicator->setText(QString("Grid: %2\" Zoom: %1%").arg(Painter::zoom * 100.0 * SCREEN_ZOOM).arg(drawing->gridSpacing));
+//     zoomIndicator->setText(QString("Grid: %2\" Zoom: %1%").arg(Painter::zoom * 100.0 * SCREEN_ZOOM).arg(drawing->gridSpacing));
+       zoomIndicator->setText(QString("Grid: %1\", BU: Inch").arg(drawing->gridSpacing));
        drawing->UpdateGridBackground();
        drawing->update();
 }
@@ -451,6 +462,29 @@ else
 }
 
 
+void ApplicationWindow::HandleGridSizeInPixels(int size)
+{
+       drawing->SetGridSize(size);
+       drawing->update();
+}
+
+
+void ApplicationWindow::HandleGridSizeInBaseUnits(QString text)
+{
+       // Parse the text...
+       bool ok;
+       double value = text.toDouble(&ok);
+
+       // Nothing parsable to a double, so quit...
+       if (!ok)
+               return;
+
+       drawing->gridSpacing = value;
+       Painter::zoom = drawing->gridPixels / drawing->gridSpacing;
+       drawing->update();
+}
+
+
 void ApplicationWindow::CreateActions(void)
 {
        exitAct = CreateAction(tr("&Quit"), tr("Quit"), tr("Exits the application."),
@@ -605,13 +639,21 @@ void ApplicationWindow::CreateMenus(void)
 void ApplicationWindow::CreateToolbars(void)
 {
        QToolBar * toolbar = addToolBar(tr("File"));
+       toolbar->setObjectName("File"); // Needed for saveState()
        toolbar->addAction(exitAct);
 
        toolbar = addToolBar(tr("View"));
+       toolbar->setObjectName("View");
        toolbar->addAction(zoomInAct);
        toolbar->addAction(zoomOutAct);
 
+       QSpinBox * spinbox = new QSpinBox;
+       toolbar->addWidget(spinbox);
+       QLineEdit * lineedit = new QLineEdit;
+       toolbar->addWidget(lineedit);
+
        toolbar = addToolBar(tr("Edit"));
+       toolbar->setObjectName("Edit");
        toolbar->addAction(snapToGridAct);
        toolbar->addAction(groupAct);
        toolbar->addAction(fixAngleAct);
@@ -624,6 +666,12 @@ void ApplicationWindow::CreateToolbars(void)
        toolbar->addAction(addArcAct);
        toolbar->addAction(addPolygonAct);
        toolbar->addAction(addDimensionAct);
+
+       spinbox->setRange(4, 256);
+       spinbox->setValue(12);
+       lineedit->setText("12");
+       connect(spinbox, SIGNAL(valueChanged(int)), this, SLOT(HandleGridSizeInPixels(int)));
+       connect(lineedit, SIGNAL(textChanged(QString)), this, SLOT(HandleGridSizeInBaseUnits(QString)));
 }
 
 
@@ -635,10 +683,7 @@ void ApplicationWindow::ReadSettings(void)
        snapToGridAct->setChecked(settings.value("snapToGrid", true).toBool());
        resize(size);
        move(pos);
-//     pos = settings.value("charWndPos", QPoint(0, 0)).toPoint();
-//     size = settings.value("charWndSize", QSize(200, 200)).toSize();
-//     ((TTEdit *)qApp)->charWnd->resize(size);
-//     ((TTEdit *)qApp)->charWnd->move(pos);
+       restoreState(settings.value("windowState").toByteArray());
 }
 
 
@@ -646,9 +691,8 @@ void ApplicationWindow::WriteSettings(void)
 {
        settings.setValue("pos", pos());
        settings.setValue("size", size());
+       settings.setValue("windowState", saveState());
        settings.setValue("useAntialiasing", drawing->useAntialiasing);
        settings.setValue("snapToGrid", snapToGridAct->isChecked());
-//     settings.setValue("charWndPos", ((TTEdit *)qApp)->charWnd->pos());
-//     settings.setValue("charWndSize", ((TTEdit *)qApp)->charWnd->size());
 }