X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fline.cpp;h=d37106e5a7846df0f9fe8fabed88aee129ea42c5;hb=9d59b5831000704a1ed39c22a6043ba658993159;hp=d6169d64a0a593649171c83348a1a2a6341b6047;hpb=7ac2021bfe0d3032e161520e3fa790ef621e39b3;p=architektonas diff --git a/src/line.cpp b/src/line.cpp index d6169d6..d37106e 100644 --- a/src/line.cpp +++ b/src/line.cpp @@ -4,7 +4,7 @@ // (C) 2011 Underground Software // See the README and GPLv3 files for licensing and warranty information // -// JLH = James L. Hammons +// JLH = James Hammons // // WHO WHEN WHAT // --- ---------- ------------------------------------------------------------ @@ -20,6 +20,8 @@ #include #include "dimension.h" +#include "painter.h" + Line::Line(Vector p1, Vector p2, Object * p/*= NULL*/): Object(p1, p), endpoint(p2), draggingLine(false), draggingHandle1(false), draggingHandle2(false), //needUpdate(false), @@ -28,8 +30,12 @@ Line::Line(Vector p1, Vector p2, Object * p/*= NULL*/): Object(p1, p), endpoint( { } + Line::~Line() { +// Taking care of connections should be done by the Container, as we don't know +// anything about any other object connected to this one. +#if 0 // If there are any attached Dimensions, we must set the attachment points // to NULL since they will no longer be valid. if (attachedDimension) @@ -40,20 +46,22 @@ Line::~Line() // IT WOULD BE NICE to have any object points attached to this line automagically // connect to this dimension object at this point, instead of just becoming // detached. +#endif } -/*virtual*/ void Line::Draw(QPainter * painter) + +/*virtual*/ void Line::Draw(Painter * painter) { - painter->setPen(QPen(Qt::red, 2.0, Qt::DotLine)); + painter->SetPen(QPen(Qt::red, 2.0, Qt::DotLine)); if ((state == OSSelected) || ((state == OSInactive) && hitPoint1)) - painter->drawEllipse(QPointF(position.x, position.y), 4.0, 4.0); + painter->DrawHandle(position); if ((state == OSSelected) || ((state == OSInactive) && hitPoint2)) - painter->drawEllipse(QPointF(endpoint.x, endpoint.y), 4.0, 4.0); + painter->DrawHandle(endpoint); if ((state == OSInactive) && !hitLine) - painter->setPen(QPen(Qt::black, 1.0, Qt::SolidLine)); + painter->SetPen(QPen(Qt::black, 1.0, Qt::SolidLine)); if (Object::fixedLength && (draggingHandle1 || draggingHandle2)) { @@ -63,16 +71,21 @@ Line::~Line() Vector current(point2 - point1); Vector v = current.Unit() * length; Vector v2 = point1 + v; - painter->drawLine((int)point1.x, (int)point1.y, (int)v2.x, (int)v2.y); +// painter->DrawLine((int)point1.x, (int)point1.y, (int)v2.x, (int)v2.y); + painter->DrawLine(point1, v2); if (current.Magnitude() > length) { - painter->setPen(QPen(QColor(128, 0, 0), 1.0, Qt::DashLine)); - painter->drawLine((int)v2.x, (int)v2.y, (int)point2.x, (int)point2.y); + painter->SetPen(QPen(QColor(128, 0, 0), 1.0, Qt::DashLine)); +// painter->DrawLine((int)v2.x, (int)v2.y, (int)point2.x, (int)point2.y); + painter->DrawLine(v2, point2); } } +// Problem: when drawing at large zoom levels, this throws away precision thus +// causing the line to rendered too short. !!! FIX !!! [DONE] else - painter->drawLine((int)position.x, (int)position.y, (int)endpoint.x, (int)endpoint.y); +// painter->DrawLine((int)position.x, (int)position.y, (int)endpoint.x, (int)endpoint.y); + painter->DrawLine(position, endpoint); } /*virtual*/ Vector Line::Center(void) @@ -84,8 +97,7 @@ Line::~Line() /*virtual*/ bool Line::Collided(Vector point) { -// Can't assume this! -// Actually, we can, since this is a mouse down event here. + // We can assume this, since this is a mouse down event here. objectWasDragged = false; HitTest(point); @@ -117,6 +129,7 @@ TODO: Make Dimension preview with modifier keys for showing on other side // (Priorities are taken care of in HitTest()...) if (hitLine) { +#if 0 if (attachedDimension == NULL) { // How to get this object into the top level container??? @@ -126,7 +139,7 @@ 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... :-/ */ - attachedDimension = new Dimension(&position, &endpoint, this); + attachedDimension = new Dimension(&position, &endpoint, DTLinear, this); if (parent != NULL) parent->Add(attachedDimension); @@ -136,6 +149,26 @@ a dimension only) Draw() function... :-/ // If there's one already there, tell it to flip sides... attachedDimension->FlipSides(); } +#else + // New approach here: We look for connected objects. + Object * attachedDimension = FindAttachedDimension(); + + if (attachedDimension) + { + // If there's an attached Dimension, tell it to switch sides... + ((Dimension *)attachedDimension)->FlipSides(); + } + else + { + // Otherwise, we make a new one and attach it here. + attachedDimension = new Dimension(Connection(this, 0), Connection(this, 1.0), DTLinear, this); + connected.push_back(Connection(attachedDimension, 0)); + connected.push_back(Connection(attachedDimension, 1.0)); + + if (parent != NULL) + parent->Add(attachedDimension); + } +#endif return true; } @@ -207,6 +240,7 @@ Like so: return false; } + /*virtual*/ void Line::PointerMoved(Vector point) { // Hit test tells us what we hit (if anything) through boolean variables. It @@ -273,6 +307,10 @@ software currently out there: the GUI will try to do the right thing, most of th // Here we calculate the component of the current vector along the fixed angle. // A_compB = (A . Bu) * Bu double magnitudeAlongB = Vector::Dot(Vector(point2 - point1), angle); +/* +Actually, this isn't quite right. What we want to do is look for the intersection along either +the horizontal line or vertical line that intersects from the current mouse position. +*/ if (draggingHandle1) position = endpoint + (angle * magnitudeAlongB); @@ -300,6 +338,7 @@ software currently out there: the GUI will try to do the right thing, most of th } } + /*virtual*/ void Line::PointerReleased(void) { if (draggingHandle1 || draggingHandle2) @@ -350,44 +389,115 @@ about keeping track of old states... state = oldState; } -#if 0 -void Line::SetDimensionOnPoint1(Dimension * dimension) + +// Check to see if the point passed in coincides with any we have. If so, return a +// pointer to it; otherwise, return NULL. +/*virtual*/ Vector * Line::GetPointAt(Vector v) { - dimPoint1 = dimension; + if (v == position) + return &position; + else if (v == endpoint) + return &endpoint; + + return 0; +} + - if (dimension) - dimension->SetPoint1(position); +/*virtual*/ void Line::Enumerate(FILE * file) +{ + fprintf(file, "LINE (%lf,%lf) (%lf,%lf)\n", position.x, position.y, endpoint.x, endpoint.y); } -void Line::SetDimensionOnPoint2(Dimension * dimension) + +/*virtual*/ Object * Line::Copy(void) { - dimPoint2 = dimension; +#warning "!!! This doesn't take care of attached Dimensions !!!" +/* +This is a real problem. While having a pointer in the Dimension to this line's points is fast & easy, +it creates a huge problem when trying to replicate an object like this. + +Maybe a way to fix that then, is to have reference numbers instead of pointers. That way, if you copy +them, ... you might still have problems. Because you can't be sure if a copy will be persistant or not, +you then *definitely* do not want them to have the same reference number. +*/ + return new Line(position, endpoint, parent); +} + - if (dimension) - dimension->SetPoint2(endpoint); +/*virtual*/ Vector Line::GetPointAtParameter(double parameter) +{ + if (parameter <= 0) + return position; + else if (parameter >= 1.0) + return endpoint; + + // Our parameter lies between zero and one, so calculate it! + Vector v(endpoint, position); + double length = v.Magnitude(); + // We scale the magnitude of v so that it lies between 0 and 1... + // By multiplying the parameter by the magnitude, we obtain the point we + // want. No scaling necessary as it's inherent in the approach! + double spotOnLength = length * parameter; + + // To get our point, we use the initial point of the line and add in our + // scaled point. + Vector result = position + (v * spotOnLength); + return result; } -#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); +//printf("Line::SetDimensionOnLine(): Creating new dimension...\n"); +// dimension = new Dimension(position, endpoint, DTLinear, this); + dimension = new Dimension(Connection(this, 0), Connection(this, 1.0), DTLinear, this); if (parent) +//{ +//printf("Line::SetDimensionOnLine(): Adding to parent...\n"); parent->Add(dimension); +//} + } + else + { + dimension->Connect(this, 0); + dimension->Connect(this, 1.0); } - attachedDimension = dimension; + // Make sure the Dimension is connected to us... + Connect(dimension, 0); + Connect(dimension, 1.0); +} + - // After we set the points here, we don't have to care about them anymore. - if (dimension) +Object * Line::FindAttachedDimension(void) +{ + // Is there anything connected to this line? If not, return NULL + if (connected.size() < 2) + return NULL; + + // Otherwise, we have to search our objects to see if there's a likely + // candidate. In this case, we're looking for a pointer to the same object + // with a parameter of 0 and 1 respectively. This is O((n^2)/2). + for(uint i=0; iSetPoint1(&position); - dimension->SetPoint2(&endpoint); + for(uint j=i+1; j