Rendering for Line, Circle, and Arc work.

[architektonas] / src / applicationwindow.cpp

diff --git a/src/applicationwindow.cpp b/src/applicationwindow.cpp
index ad3bc8d9ec0b4c209087f7d58d39e8c79c427fc2..2049a097ca354b54e69297fcbc48d91753b7d528 100644 (file)
--- a/src/applicationwindow.cpp
+++ b/src/applicationwindow.cpp
@@ -30,24 +30,25 @@
 
 #include "about.h"
 #include "blockwidget.h"
-#include "dimension.h"
+//#include "dimension.h"
 #include "drawingview.h"
-#include "drawarcaction.h"
-#include "drawcircleaction.h"
-#include "drawdimensionaction.h"
-#include "drawlineaction.h"
-#include "drawsplineaction.h"
+//#include "drawarcaction.h"
+//#include "drawcircleaction.h"
+//#include "drawdimensionaction.h"
+//#include "drawlineaction.h"
+//#include "drawsplineaction.h"
 #include "fileio.h"
 #include "generaltab.h"
-#include "geometry.h"
+//#include "geometry.h"
+#include "global.h"
 #include "layerwidget.h"
-#include "line.h"
-#include "mirroraction.h"
+//#include "line.h"
+//#include "mirroraction.h"
 #include "painter.h"
-#include "rotateaction.h"
+//#include "rotateaction.h"
 #include "settingsdialog.h"
-#include "triangulateaction.h"
-#include "trimaction.h"
+//#include "triangulateaction.h"
+//#include "trimaction.h"
 
 
 // Class variables
@@ -95,7 +96,7 @@ ApplicationWindow::ApplicationWindow():
 
        ReadSettings();
        setUnifiedTitleAndToolBarOnMac(true);
-       Object::SetFont(new QFont("Verdana", 15, QFont::Bold));
+       Global::font =  new QFont("Verdana", 15, QFont::Bold);
 
        connect(lw, SIGNAL(LayerSelected(int)), drawing, SLOT(SetCurrentLayer(int)));
 }
@@ -112,7 +113,8 @@ void ApplicationWindow::closeEvent(QCloseEvent * event)
 void ApplicationWindow::FileNew(void)
 {
        // Should warn the user if drawing hasn't been saved...
-       drawing->document.Clear();
+//     drawing->document.Clear();
+       drawing->document.objects.empty();
        drawing->update();
        documentName.clear();
        setWindowTitle("Architektonas - Untitled");
@@ -129,7 +131,7 @@ void ApplicationWindow::FileOpen(void)
        if (filename.isEmpty())
                return;
 
-       FILE * file = fopen(filename.toAscii().data(), "r");
+       FILE * file = fopen(filename.toUtf8().data(), "r");
 
        if (file == 0)
        {
@@ -140,7 +142,7 @@ void ApplicationWindow::FileOpen(void)
                return;
        }
 
-       Container container(Vector(0, 0));
+       Container container;//(Vector(0, 0));
        bool successful = FileIO::LoadAtnsFile(file, &container);
        fclose(file);
 
@@ -168,7 +170,7 @@ void ApplicationWindow::FileSave(void)
                documentName = QFileDialog::getSaveFileName(this, tr("Save Drawing"),
                        "", tr("Architektonas drawings (*.drawing)"));
 
-       FILE * file = fopen(documentName.toAscii().data(), "w");
+       FILE * file = fopen(documentName.toUtf8().data(), "w");
 
        if (file == 0)
        {
@@ -189,7 +191,7 @@ void ApplicationWindow::FileSave(void)
                msg.setIcon(QMessageBox::Critical);
                msg.exec();
                // In this case, we should unlink the created file, since it's not right...
-//             unlink(documentName.toAscii().data());
+//             unlink(documentName.toUtf8().data());
                QFile::remove(documentName);
                return;
        }
@@ -214,19 +216,19 @@ void ApplicationWindow::FileSaveAs(void)
 
 void ApplicationWindow::SnapToGridTool(void)
 {
-       Object::SetSnapMode(snapToGridAct->isChecked());
+       Global::snapToGrid = snapToGridAct->isChecked();
 }
 
 
 void ApplicationWindow::FixAngle(void)
 {
-       Object::SetFixedAngle(fixAngleAct->isChecked());
+       Global::fixedAngle = fixAngleAct->isChecked();
 }
 
 
 void ApplicationWindow::FixLength(void)
 {
-       Object::SetFixedLength(fixLengthAct->isChecked());
+       Global::fixedLength = fixLengthAct->isChecked();
 }
 
 
@@ -235,6 +237,7 @@ void ApplicationWindow::DeleteTool(void)
 {
        // For this tool, we check first to see if anything is selected. If so, we
        // delete those and *don't* select the delete tool.
+#if 0
        if (drawing->document.ItemsSelected() > 0)
        {
                drawing->document.DeleteSelectedItems();
@@ -242,6 +245,7 @@ void ApplicationWindow::DeleteTool(void)
                deleteAct->setChecked(false);
                return;
        }
+#endif
 
        // Otherwise, toggle the state of the tool
        ClearUIToolStatesExcept(deleteAct);
@@ -340,20 +344,20 @@ when zooming in, new origin will be (xCenter - origin.x) / 2, (yCenter - origin.
 //printf("Zoom in... Center=%.2f,%.2f; ", center.x, center.y);
        center = Painter::QtToCartesianCoords(center);
 //printf("(%.2f,%.2f); origin=%.2f,%.2f; ", center.x, center.y, Painter::origin.x, Painter::origin.y);
-       Vector newOrigin = center - ((center - Painter::origin) / zoomFactor);
+       Vector newOrigin = center - ((center - Global::origin) / zoomFactor);
 //printf("newOrigin=%.2f,%.2f;\n", newOrigin.x, newOrigin.y);
-       Painter::origin = newOrigin;
+       Global::origin = newOrigin;
 
 //printf("Zoom in... level going from %02f to ", Painter::zoom);
        // This just zooms leaving origin intact... should zoom in at the current
        // center! [DONE]
-       Painter::zoom *= zoomFactor;
-       Object::gridSpacing = drawing->gridPixels / Painter::zoom;
+       Global::zoom *= zoomFactor;
+       Global::gridSpacing = drawing->gridPixels / Global::zoom;
        drawing->UpdateGridBackground();
        drawing->update();
 
-       zoomIndicator->setText(QString("Grid: %1\", BU: Inch").arg(Object::gridSpacing));
-       baseUnitInput->setText(QString("%1").arg(Object::gridSpacing));
+       zoomIndicator->setText(QString("Grid: %1\", BU: Inch").arg(Global::gridSpacing));
+       baseUnitInput->setText(QString("%1").arg(Global::gridSpacing));
 }
 
 
@@ -380,19 +384,19 @@ x 2 = (-426, -301)
 //printf("(%.2f,%.2f); origin=%.2f,%.2f; ", center.x, center.y, Painter::origin.x, Painter::origin.y);
 //     Vector newOrigin = (center - Painter::origin) * zoomFactor;
 //     Vector newOrigin = center - (Painter::origin * zoomFactor);
-       Vector newOrigin = center + ((Painter::origin - center) * zoomFactor);
+       Vector newOrigin = center + ((Global::origin - center) * zoomFactor);
 //printf("newOrigin=%.2f,%.2f;\n", newOrigin.x, newOrigin.y);
-       Painter::origin = newOrigin;
+       Global::origin = newOrigin;
 //printf("Zoom out...\n");
        // This just zooms leaving origin intact... should zoom out at the current
        // center! [DONE]
-       Painter::zoom /= zoomFactor;
-       Object::gridSpacing = drawing->gridPixels / Painter::zoom;
+       Global::zoom /= zoomFactor;
+       Global::gridSpacing = drawing->gridPixels / Global::zoom;
        drawing->UpdateGridBackground();
        drawing->update();
 
-       zoomIndicator->setText(QString("Grid: %1\", BU: Inch").arg(Object::gridSpacing));
-       baseUnitInput->setText(QString("%1").arg(Object::gridSpacing));
+       zoomIndicator->setText(QString("Grid: %1\", BU: Inch").arg(Global::gridSpacing));
+       baseUnitInput->setText(QString("%1").arg(Global::gridSpacing));
 }
 
 
@@ -435,17 +439,18 @@ void ApplicationWindow::ClearUIToolStatesExcept(QAction * exception)
 
 void ApplicationWindow::SetInternalToolStates(void)
 {
-       Object::SetDeleteActive(deleteAct->isChecked());
-       Object::SetDimensionActive(addDimensionAct->isChecked());
+       Global::deleteActive = deleteAct->isChecked();
+       Global::dimensionActive = addDimensionAct->isChecked();
 
        // We can be sure that if we've come here, then either an active tool is
        // being deactivated, or a new tool is being created. In either case, the
        // old tool needs to be deleted.
+#if 0
        if (drawing->toolAction)
        {
                delete drawing->toolAction;
                drawing->toolAction = NULL;
-               Object::ignoreClicks = false;
+               Global::ignoreClicks = false;
        }
 
        drawing->SetToolActive(addLineAct->isChecked() ? new DrawLineAction() : NULL);
@@ -459,7 +464,8 @@ void ApplicationWindow::SetInternalToolStates(void)
        drawing->SetToolActive(triangulateAct->isChecked() ? new TriangulateAction() : NULL);
 
        if (drawing->toolAction)
-               Object::ignoreClicks = true;
+               Global::ignoreClicks = true;
+#endif
 
        drawing->update();
 }
@@ -491,6 +497,7 @@ void ApplicationWindow::Settings(void)
 //
 void ApplicationWindow::HandleGrouping(void)
 {
+#if 0
        int itemsSelected = drawing->document.ItemsSelected();
 
        // If nothing selected, do nothing
@@ -539,6 +546,7 @@ else
                container->state = OSSelected;
                statusBar()->showMessage(QString(tr("Grouped %1 objects.")).arg(itemsSelected));
        }
+#endif
 
        drawing->update();
 }
@@ -546,6 +554,7 @@ else
 
 void ApplicationWindow::HandleConnection(void)
 {
+#if 0
 //double tt = Geometry::ParameterOfLineAndPoint(Vector(0, 0), Vector(10, 0), Vector(8, 2));
 //printf("Parameter of point @ (8,2) of line (0,0), (10,0): %lf\n", tt);
        int itemsSelected = drawing->document.ItemsSelected();
@@ -608,6 +617,7 @@ printf("   -> intersects = %i, t=%lf, u=%lf\n", intersects, t, u);
                        }
                }
        }
+#endif
 }
 
 
@@ -635,8 +645,8 @@ void ApplicationWindow::HandleGridSizeInBaseUnits(QString text)
 
 //     drawing->gridSpacing = value;
 //     Painter::zoom = drawing->gridPixels / drawing->gridSpacing;
-       Object::gridSpacing = value;
-       Painter::zoom = drawing->gridPixels / Object::gridSpacing;
+       Global::gridSpacing = value;
+       Global::zoom = drawing->gridPixels / Global::gridSpacing;
        drawing->UpdateGridBackground();
        drawing->update();
 }
@@ -652,10 +662,7 @@ void ApplicationWindow::HandleDimensionSize(QString text)
        if (!ok || value == 0)
                return;
 
-       drawing->document.ResizeAllDimensions(value);
-//     drawing->gridSpacing = value;
-//     Painter::zoom = drawing->gridPixels / drawing->gridSpacing;
-//     drawing->UpdateGridBackground();
+//     drawing->document.ResizeAllDimensions(value);
        drawing->update();
 }