Added gratuitous About screen.

diff --git a/architektonas.pro b/architektonas.pro
index 630bbd7bc1b8f211306245a423c05e97ea4904bc..8b15d07c0603a4aa90fa969e48da2136f3b6e39d 100644 (file)
--- a/architektonas.pro
+++ b/architektonas.pro
@@ -41,6 +41,7 @@ DEPENDPATH = \
 #      fparser/fparser.hh
 
 HEADERS = \
+       src/about.h \
        src/applicationwindow.h \
        src/arc.h \
        src/circle.h \
@@ -54,6 +55,7 @@ HEADERS = \
        src/vector.h
 
 SOURCES = \
+       src/about.cpp \
        src/applicationwindow.cpp \
        src/arc.cpp \
        src/circle.cpp \

diff --git a/res/architektonas.qrc b/res/architektonas.qrc
index b0b136053723e9b6413a5452fe8b09618f5d3491..4481d1b37f73727dd04a37123dceb3ee05c94a50 100644 (file)
--- a/res/architektonas.qrc
+++ b/res/architektonas.qrc
@@ -1,6 +1,7 @@
 <!DOCTYPE RCC><RCC version="1.0">
        <qresource prefix="/res">
                <file>atns-icon.png</file>
+               <file>dimension-tool.png</file>
                <file>fix-angle.png</file>
                <file>fix-length.png</file>
                <file>generic-tool.png</file>

diff --git a/src/applicationwindow.cpp b/src/applicationwindow.cpp
index 49a88affa160f915012da1cb1142080ad37b0ffb..38f0d7038a13b7d759c08aff28276ed3200ac329 100644 (file)
--- a/src/applicationwindow.cpp
+++ b/src/applicationwindow.cpp
@@ -26,6 +26,7 @@
 
 #include "applicationwindow.h"
 
+#include "about.h"
 #include "drawingview.h"
 
 
@@ -35,6 +36,8 @@ ApplicationWindow::ApplicationWindow(): settings("Underground Software", "Archit
        drawing->setMouseTracking(true);                // We want *all* mouse events...!
        setCentralWidget(drawing);
 
+       aboutWin = new AboutWindow(this);
+
 //     ((TTEdit *)qApp)->charWnd = new CharWindow(this);
 
        setWindowIcon(QIcon(":/res/atns-icon.png"));
@@ -90,6 +93,11 @@ void ApplicationWindow::DimensionTool(void)
        Object::SetDimensionActive(addDimensionAct->isChecked());
 }
 
+void ApplicationWindow::HelpAbout(void)
+{
+       aboutWin->show();
+}
+
 void ApplicationWindow::CreateActions(void)
 {
        exitAct = CreateAction(tr("&Quit"), tr("Quit"), tr("Exits the application."),
@@ -107,7 +115,7 @@ void ApplicationWindow::CreateActions(void)
        deleteAct = CreateAction(tr("&Delete"), tr("Delete Object"), tr("Deletes selected objects."), QIcon(":/res/generic-tool.png"), QKeySequence(), true);
        connect(deleteAct, SIGNAL(triggered()), this, SLOT(DeleteTool()));
 
-       addDimensionAct = CreateAction(tr("Add &Dimension"), tr("Add Dimension"), tr("Adds a dimension to the drawing."), QIcon(":/res/generic-tool.png"), QKeySequence(), true);
+       addDimensionAct = CreateAction(tr("Add &Dimension"), tr("Add Dimension"), tr("Adds a dimension to the drawing."), QIcon(":/res/dimension-tool.png"), QKeySequence("D, I"), true);
        connect(addDimensionAct, SIGNAL(triggered()), this, SLOT(DimensionTool()));
 
        addLineAct = CreateAction(tr("Add &Line"), tr("Add Line"), tr("Adds a line to the drawing."), QIcon(":/res/generic-tool.png"), QKeySequence(), true);
@@ -116,6 +124,9 @@ void ApplicationWindow::CreateActions(void)
 
        addArcAct = CreateAction(tr("Add &Arc"), tr("Add Arc"), tr("Adds an arc to the drawing."), QIcon(":/res/generic-tool.png"), QKeySequence(), true);
 
+       aboutAct = CreateAction(tr("About &Architektonas"), tr("About Architektonas"), tr("Gives information about this program."), QIcon(":/res/generic-tool.png"), QKeySequence());
+       connect(aboutAct, SIGNAL(triggered()), this, SLOT(HelpAbout()));
+
        //Hm.
 /*     QActionGroup * group = new QActionGroup(this);
        group->addAction(deleteAct);
@@ -187,8 +198,8 @@ void ApplicationWindow::CreateMenus(void)
 
 //     menuBar()->addSeparator();
 
-//     helpMenu = menuBar()->addMenu(tr("&Help"));
-//     helpMenu->addAction(aboutAct);
+       menu = menuBar()->addMenu(tr("&Help"));
+       menu->addAction(aboutAct);
 //     helpMenu->addAction(aboutQtAct);
 }
 

diff --git a/src/applicationwindow.h b/src/applicationwindow.h
index 34d8574b02ad6a39e31f06673642fd6cfd6f42d0..5f220a8a11a2d96fa5ee3b6ba7989b81c25d2f8e 100644 (file)
--- a/src/applicationwindow.h
+++ b/src/applicationwindow.h
@@ -7,6 +7,7 @@
 
 //class EditWindow;
 //class CharWindow;
+class AboutWindow;
 class DrawingView;
 
 class ApplicationWindow: public QMainWindow
@@ -26,6 +27,7 @@ class ApplicationWindow: public QMainWindow
                void FixLength(void);
                void DeleteTool(void);
                void DimensionTool(void);
+               void HelpAbout(void);
 
        private:
                void CreateActions(void);
@@ -41,6 +43,7 @@ class ApplicationWindow: public QMainWindow
 //             EditWindow * editWnd;
 //             CharWindow * charWnd;
                DrawingView * drawing;
+               AboutWindow * aboutWin;
 
                QSettings settings;
 
@@ -52,6 +55,7 @@ class ApplicationWindow: public QMainWindow
                QAction * addLineAct;
                QAction * addCircleAct;
                QAction * addArcAct;
+               QAction * aboutAct;
 };
 
 #endif // __APPLICATIONWINDOW_H__

diff --git a/src/dimension.cpp b/src/dimension.cpp
index 185b7e9645b360f6fef97d0cb2978eada8a45dce..b9fc97620d8708afa2cbdd08b1fc1fd38d98dc81 100644 (file)
--- a/src/dimension.cpp
+++ b/src/dimension.cpp
@@ -19,7 +19,14 @@
 
 Dimension::Dimension(Vector p1, Vector p2, Object * p/*= NULL*/): Object(p1, p), endpoint(p2),
        dragging(false), draggingHandle1(false), draggingHandle2(false),
-       length(p2.Magnitude())
+       length(p2.Magnitude()), point1(NULL), point2(NULL)
+{
+}
+
+// This is bad, p1 & p2 could be NULL, causing much consternation...
+Dimension::Dimension(Vector * p1, Vector * p2, Object * p/*= NULL*/): Object(*p1, p), endpoint(*p2),
+       dragging(false), draggingHandle1(false), draggingHandle2(false),
+       length(p2->Magnitude()), point1(p1), point2(p2)
 {
 }
 
@@ -29,6 +36,14 @@ Dimension::~Dimension()
 
 /*virtual*/ void Dimension::Draw(QPainter * painter)
 {
+       // If there are valid Vector pointers in here, use them to update the internal
+       // positions. Otherwise, we just use the internal positions by default.
+       if (point1)
+               position = *point1;
+
+       if (point2)
+               endpoint = *point2;
+
        if (state == OSSelected)
                painter->setPen(QPen(Qt::red, 2.0, Qt::DotLine));
        else
@@ -88,6 +103,14 @@ painter->scale(1.0, -1.0);
 //painter->drawLine(20, 0, -20, 0);
 //painter->drawLine(0, 20, 0, -20);
 painter->restore();
+
+/*
+All of the preceeding makes me think that rather than try to compensate for Qt's unbelieveably
+AWFUL decision to go with a wrong-handed graphics subsystem, it may be better to just stuff
+all of that crap into some kind of subclass that handles all the nastiness behind the scenes.
+I mean, really, all this crap just to get some proplerly rendered text on the screen? How
+retarded is that? :-/
+*/
 }
 
 /*virtual*/ Vector Dimension::Center(void)
@@ -279,22 +302,28 @@ about keeping track of old states...
                state = oldState;
 }
 
-void Dimension::SetPoint1(Vector v)
+void Dimension::SetPoint1(Vector * v)
 {
-       position = v;
+       point1 = v;
        needUpdate = true;
 }
 
-void Dimension::SetPoint2(Vector v)
+void Dimension::SetPoint2(Vector * v)
 {
-       endpoint = v;
+       point2 = v;
        needUpdate = true;
 }
 
 void Dimension::FlipSides(void)
 {
+#if 0
        Vector tmp = position;
        position = endpoint;
        endpoint = tmp;
+#else
+       Vector * tmp = point1;
+       point1 = point2;
+       point2 = tmp;
+#endif
        needUpdate = true;
 }

diff --git a/src/dimension.h b/src/dimension.h
index cea0de1b7b3645c3c5ba09f88f696179b2fda9a3..301bcffdb782df3205e00921acd1d5cdba0fe849 100644 (file)
--- a/src/dimension.h
+++ b/src/dimension.h
@@ -7,6 +7,7 @@ class Dimension: public Object
 {
        public:
                Dimension(Vector, Vector, Object * p = 0);
+               Dimension(Vector *, Vector *, Object * p = 0);
                ~Dimension();
 
                virtual void Draw(QPainter *);
@@ -14,8 +15,8 @@ class Dimension: public Object
                virtual bool Collided(Vector);
                virtual void PointerMoved(Vector);
                virtual void PointerReleased(void);
-               void SetPoint1(Vector);
-               void SetPoint2(Vector);
+               void SetPoint1(Vector *);
+               void SetPoint2(Vector *);
                void FlipSides(void);
 
        protected:
@@ -28,6 +29,9 @@ class Dimension: public Object
                bool draggingHandle2;
                bool objectWasDragged;
                double length;
+
+               Vector * point1;                                        // These couple to external points; if there
+               Vector * point2;                                        // are none then fall back to endpoint/position
 };
 
 #endif // __DIMENSION_H__

diff --git a/src/drawingview.cpp b/src/drawingview.cpp
index 920760ef6b592485cea97976c62feadb610d8a39..bd4bb4638612a895ecb99185e28abbca7a05ecb5 100644 (file)
--- a/src/drawingview.cpp
+++ b/src/drawingview.cpp
@@ -58,10 +58,15 @@ DrawingView::DrawingView(QWidget * parent/*= NULL*/): QWidget(parent),
        document.Add(new Circle(Vector(50, 150), 49, &document));
        document.Add(new Arc(Vector(300, 300), 32, PI / 4.0, PI * 1.3, &document)),
        document.Add(new Arc(Vector(200, 200), 60, PI / 2.0, PI * 1.5, &document));
+#if 1
        Dimension * dimension = new Dimension(Vector(0, 0), Vector(0, 0), &document);
-       line->SetDimensionOnPoint1(dimension);
-       line->SetDimensionOnPoint2(dimension);
+       line->SetDimensionOnLine(dimension);
+//     line->SetDimensionOnPoint2(dimension);
        document.Add(dimension);
+#else
+       // Alternate way to do the above...
+       line->SetDimensionOnLine();
+#endif
 }
 
 QPoint DrawingView::GetAdjustedMousePosition(QMouseEvent * event)

diff --git a/src/line.cpp b/src/line.cpp
index c40277da748b75b36ccec9c10b70dc2e740aa695..385e086e9cdfc8036928e2116b481aac723e72ae 100644 (file)
--- a/src/line.cpp
+++ b/src/line.cpp
@@ -22,7 +22,7 @@
 #include "dimension.h"
 
 Line::Line(Vector p1, Vector p2, Object * p/*= NULL*/): Object(p1, p), endpoint(p2),
-       dragging(false), draggingHandle1(false), draggingHandle2(false), //needUpdate(false),
+       draggingLine(false), draggingHandle1(false), draggingHandle2(false), //needUpdate(false),
        length(Vector::Magnitude(p2, p1)), hitPoint1(false), hitPoint2(false), hitLine(false)
 {
 }
@@ -85,6 +85,8 @@ Since there's only *one* dimPoint for each point, this can be problematic...
 
 Also: It would be nice to have a preview of the dimension being drawn, with a modifier
 key to make it draw/show on the other side...
+
+TODO: Make Dimension preview with modifier keys for showing on other side
 */
        // Is the dimension tool active? Let's use it:
        if (dimensionActive)
@@ -93,27 +95,7 @@ key to make it draw/show on the other side...
                // (Priorities are taken care of in HitTest()...)
                if (hitLine)
                {
-                       // If there's one already there, tell it to flip sides...
-                       if (dimPoint1 && (dimPoint1 == dimPoint2))
-                       {
-// Here's an interesting problem... When swapping points we can either do it
-// on the dimension or directly here... I think swapping endpoint & position is
-// probably the wrong way to do things here...
-#if 1
-                               // Hm, why do we have to do both here???
-                               dimPoint1->FlipSides();
-                               //dis don't do shit
-/*                             Vector temp = dimPoint1;
-                               dimPoint1 = dimPoint2;
-                               dimPoint2 = temp;//*/
-#else
-// It doesn't work correctly anyhow, not until you move an endpoint.
-                               Vector temp = position;
-                               position = endpoint;
-                               endpoint = temp;
-#endif
-                       }
-                       else if ((dimPoint1 == NULL) && (dimPoint2 == NULL))
+                       if (attachedDimension == NULL)
                        {
                                // How to get this object into the top level container???
 /*
@@ -122,11 +104,15 @@ level container, it won't get drawn...
 But we can fix that by making this object call any attached object's (like
 a dimension only) Draw() function... :-/
 */
-                               dimPoint1 = new Dimension(position, endpoint, this);
-                               dimPoint2 = dimPoint1;
+                               attachedDimension = new Dimension(&position, &endpoint, this);
 
                                if (parent != NULL)
-                                       parent->Add(dimPoint1);
+                                       parent->Add(attachedDimension);
+                       }
+                       else
+                       {
+                               // If there's one already there, tell it to flip sides...
+                               attachedDimension->FlipSides();
                        }
 
                        return true;
@@ -143,6 +129,13 @@ a dimension only) Draw() function... :-/
 //How to translate this into pixels from Document space???
 //Maybe we need to pass a scaling factor in here from the caller? That would make sense, as
 //the caller knows about the zoom factor and all that good kinda crap
+//I think what's needed is an Object class variable/method that can be changed by the TLC and
+//called in derived classes to properly scale the location to the current zoom level. That *should* work.
+
+// ALSO: Need to code a global (read: Object class) variable that tells use whether a modifier
+//       key was pressed in addition to the mouse click, so we can do stuff like, say, hold
+//       down CTRL and be able to do multiple selecting of objects (in that case, we would
+//       keep the Object state from changing).
                if (hitPoint1)
                {
                        oldState = state;
@@ -164,7 +157,7 @@ a dimension only) Draw() function... :-/
                        oldState = state;
                        state = OSSelected;
                        oldPoint = point;
-                       dragging = true;
+                       draggingLine = true;
                        return true;
                }
        }
@@ -181,29 +174,33 @@ Like so:
                        oldState = state;
 //                     state = OSInactive;
                        oldPoint = point;
-                       dragging = true;
+                       draggingLine = true;
                        return true;
                }
        }
 
+       // If we got here, we clicked on nothing, so set the object to inactive.
+       // (Once we can read key modifiers, we can override this to allow multiple selection.)
        state = OSInactive;
        return false;
 }
 
 /*virtual*/ void Line::PointerMoved(Vector point)
 {
+       // Hit test tells us what we hit (if anything) through boolean variables. It
+       // also tells us whether or not the state changed.
        needUpdate = HitTest(point);
 
-       objectWasDragged = (dragging | draggingHandle1 | draggingHandle2);
+       objectWasDragged = (draggingLine | draggingHandle1 | draggingHandle2);
 
        if (objectWasDragged)
        {
                Vector delta = point - oldPoint;
 
-               if (draggingHandle1 || dragging)
+               if (draggingHandle1 || draggingLine)
                        position += delta;
 
-               if (draggingHandle2 || dragging)
+               if (draggingHandle2 || draggingLine)
                        endpoint += delta;
 
                oldPoint = point;
@@ -211,7 +208,27 @@ Like so:
        }
 
 /*
-We can't count on any coupling between the dimension object, so how do we do this???
+We can't count on any coupling between the dimension object and us, so how do we do this???
+Also, there may be more than one Dimension object connected to a single endpoint!
+
+Ugly ways to do it:
+ - Keep track of the state of the connected dimension
+ - Pass the Dimension the point that's being changed and the delta
+
+More elegant ways:
+ - Pass the point in a notification function (how?)
+ - Pass the point as a reference to the class instance object (&endpoint). This way, the line
+   doesn't have to care about keeping track of Dimensions connected to it. But still have to
+   care about other connected entities (other Lines, Circles, Arcs, Splines, Texts, etc). I
+   think I'd be OK with this.
+   Since the Dimension has a pointer to our object, all we have to do is update our coordinates
+   and the Dimension object will adjust itself on the next repaint. Problem solved, and we don't
+   have to know anything about how many Dimensions are connected to us, or where! \o/
+   The question then becomes, how do we do this kind of coupling???
+
+We need to know about connected entities so that we can have them either move in expected ways
+or constrain the movement of this Line object. This is how we will be a cut above all other CAD
+software currently out there: the GUI will try to do the right thing, most of the time. :-)
 */
        if (needUpdate)
        {
@@ -231,11 +248,16 @@ We can't count on any coupling between the dimension object, so how do we do thi
 //assumption. !!! FIX !!!
 //Ideally, we should just send the point that's changing to the Dimension object
 //and have it figure out which point needs to move... Or is it???
+// Ideally, we shouldn't have to fuck around with this shit. We need to fix the rendering code
+// so that we don't have to wait until the dragging is done to correct the position of the
+// point in question, but we'd need another variable tho.
+#if 0
                if (dimPoint1)
                        dimPoint1->SetPoint1(draggingHandle1 ? v2 : position);
                
                if (dimPoint2)
                        dimPoint2->SetPoint2(draggingHandle2 ? v2 : endpoint);
+#endif
        }
 }
 
@@ -266,7 +288,7 @@ We can't count on any coupling between the dimension object, so how do we do thi
                }
        }
 
-       dragging = false;
+       draggingLine = false;
        draggingHandle1 = false;
        draggingHandle2 = false;
 
@@ -282,6 +304,7 @@ about keeping track of old states...
                state = oldState;
 }
 
+#if 0
 void Line::SetDimensionOnPoint1(Dimension * dimension)
 {
        dimPoint1 = dimension;
@@ -297,6 +320,28 @@ void Line::SetDimensionOnPoint2(Dimension * dimension)
        if (dimension)
                dimension->SetPoint2(endpoint);
 }
+#else
+void Line::SetDimensionOnLine(Dimension * dimension/*=NULL*/)
+{
+       // If they don't pass one in, create it for the caller.
+       if (dimension == NULL)
+       {
+               dimension = new Dimension(&position, &endpoint, this);
+
+               if (parent)
+                       parent->Add(dimension);
+       }
+
+       attachedDimension = dimension;
+
+       // After we set the points here, we don't have to care about them anymore.
+       if (dimension)
+       {
+               dimension->SetPoint1(&position);
+               dimension->SetPoint2(&endpoint);
+       }
+}
+#endif
 
 bool Line::HitTest(Point point)
 {

diff --git a/src/line.h b/src/line.h
index 87c3c7f5d143d7d9af60a783b0dafbeae9b8181b..8fd1ed9229f5895d21c50956dda2bba865aa5eb1 100644 (file)
--- a/src/line.h
+++ b/src/line.h
@@ -16,8 +16,9 @@ class Line: public Object
                virtual bool Collided(Vector);
                virtual void PointerMoved(Vector);
                virtual void PointerReleased(void);
-               void SetDimensionOnPoint1(Dimension *);
-               void SetDimensionOnPoint2(Dimension *);
+//             void SetDimensionOnPoint1(Dimension *);
+//             void SetDimensionOnPoint2(Dimension *);
+               void SetDimensionOnLine(Dimension * d = 0);
 
        protected:
                bool HitTest(Point);
@@ -29,7 +30,7 @@ class Line: public Object
                Vector oldPoint;                                        // Used for dragging
 
        private:
-               bool dragging;
+               bool draggingLine;
                bool draggingHandle1;
                bool draggingHandle2;
                bool objectWasDragged;

diff --git a/src/object.cpp b/src/object.cpp
index 5d0970fb0f5e542ca232ed92ea89123e72da4b39..3820d7ee374bafe8c860395fd046302615222d1f 100644 (file)
--- a/src/object.cpp
+++ b/src/object.cpp
@@ -26,12 +26,12 @@ bool Object::dimensionActive = false;
 
 
 Object::Object(): position(Vector(0, 0)), parent(0), state(OSInactive), oldState(OSInactive),
-       needUpdate(false), dimPoint1(0), dimPoint2(0)
+       needUpdate(false), attachedDimension(0)
 {
 }
 
 Object::Object(Vector v,  Object * passedInParent/*= 0*/): position(v), parent(passedInParent),
-       state(OSInactive), oldState(OSInactive), needUpdate(false), dimPoint1(0), dimPoint2(0)
+       state(OSInactive), oldState(OSInactive), needUpdate(false), attachedDimension(0)
 {
 }
 

diff --git a/src/object.h b/src/object.h
index 330f5ad46b32833cd900655156ca888362258a73..1e6342290d629b6ff3bc29a42096632e1e457c09 100644 (file)
--- a/src/object.h
+++ b/src/object.h
@@ -43,8 +43,7 @@ class Object
                ObjectState state;
                ObjectState oldState;
                bool needUpdate;
-               Dimension * dimPoint1;
-               Dimension * dimPoint2;
+               Dimension * attachedDimension;
 
                // Class variables
                static QFont * font;