X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fline.cpp;h=aa5054bab3da9ea9bb79ca65b8cf695093ccb687;hb=d549bfdc8c872b966b9d787c00e5e8027366093c;hp=739842bbe9bd811d510cc0d071e81cead1c5dd58;hpb=eb0057e8a8145032152e4c417fcd102ef5a21484;p=architektonas diff --git a/src/line.cpp b/src/line.cpp index 739842b..aa5054b 100644 --- a/src/line.cpp +++ b/src/line.cpp @@ -19,19 +19,27 @@ #include "line.h" #include +#include "container.h" #include "dimension.h" +#include "mathconstants.h" #include "painter.h" -Line::Line(Vector p1, Vector p2, Object * p/*= NULL*/): Object(p1, p), endpoint(p2), +Line::Line(Vector p1, Vector p2, Object * p/*= NULL*/): Object(p1, p), + /*type(OTLine),*/ endpoint(p2), draggingLine(false), draggingHandle1(false), draggingHandle2(false), //needUpdate(false), length(Vector::Magnitude(p2, p1)), angle(Vector(endpoint - position).Unit()), hitPoint1(false), hitPoint2(false), hitLine(false) { + type = OTLine; } + 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) @@ -42,8 +50,10 @@ 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(Painter * painter) { painter->SetPen(QPen(Qt::red, 2.0, Qt::DotLine)); @@ -80,6 +90,35 @@ Line::~Line() else // painter->DrawLine((int)position.x, (int)position.y, (int)endpoint.x, (int)endpoint.y); painter->DrawLine(position, endpoint); + + // If we're rotating or setting the span, draw an information panel + // showing both absolute and relative angles being set. + if (draggingHandle1 || draggingHandle2) + { + double absAngle = (Vector(endpoint - position).Angle()) * RADIANS_TO_DEGREES; +// double relAngle = (startAngle >= oldAngle ? startAngle - oldAngle : +// startAngle - oldAngle + (2.0 * PI)) * RADIANS_TO_DEGREES; + double absLength = Vector(position - endpoint).Magnitude(); + + QString text; + + text = QObject::tr("Length: %1 in.\n") + QChar(0x2221) + QObject::tr(": %2"); + text = text.arg(absLength).arg(absAngle); + + QPen pen = QPen(QColor(0x00, 0xFF, 0x00), 1.0, Qt::SolidLine); + painter->SetPen(pen); + painter->SetBrush(QBrush(QColor(0x40, 0xFF, 0x40, 0x9F))); + QRectF textRect(10.0, 10.0, 270.0, 70.0); // x, y, w, h + painter->DrawRoundedRect(textRect, 7.0, 7.0); + + textRect.setLeft(textRect.left() + 14); + painter->SetFont(*Object::font); +// pen = QPen(QColor(0xDF, 0x5F, 0x00), 1.0, Qt::SolidLine); + pen = QPen(QColor(0x00, 0x5F, 0xDF)); + painter->SetPen(pen); + painter->DrawText(textRect, Qt::AlignVCenter, text); +// painter->SetPen(QPen(QColor(0xDF, 0x5F, 0x00))); + } } /*virtual*/ Vector Line::Center(void) @@ -95,6 +134,14 @@ Line::~Line() objectWasDragged = false; HitTest(point); + // If we're part of a non-top-level container, send this signal to it + if (parent->type == OTContainer && !((Container *)parent)->isTopLevelContainer + && (hitLine || hitPoint1 || hitPoint2)) + { + parent->state = OSSelected; + return true; + } + /* There's a small problem here with the implementation: You can have a dimension tied to only one point while at the same time you can have a dimension sitting on this line. @@ -123,6 +170,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??? @@ -142,6 +190,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; } @@ -203,18 +271,45 @@ Like so: // state = OSInactive; oldPoint = point; draggingLine = true; + + // Toggle selected state if CTRL held + if (qApp->keyboardModifiers() == Qt::ControlModifier) + state = OSInactive; + return true; } } + // If CTRL is held, then we bypass the "turn off" code. Still didn't hit + // *this* object though. :-) + if (qApp->keyboardModifiers() == Qt::ControlModifier) + return false; + // 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) { + if (selectionInProgress) + { + // Check for whether or not the rect contains this line +#if 0 + if (selection.normalized().contains(Extents())) +#else + if (selection.normalized().contains(position.x, position.y) + && selection.normalized().contains(endpoint.x, endpoint.y)) +#endif + state = OSSelected; + else + state = OSInactive; + + return; + } + // 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); @@ -233,6 +328,8 @@ Like so: oldPoint = point; needUpdate = true; + +//doesn't work QMainWindow::statusBar()->setText("You are manipulating a line"); } /* @@ -245,18 +342,20 @@ Ugly ways to do it: 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/ + - 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. :-) +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) { @@ -310,6 +409,7 @@ the horizontal line or vertical line that intersects from the current mouse posi } } + /*virtual*/ void Line::PointerReleased(void) { if (draggingHandle1 || draggingHandle2) @@ -360,58 +460,8 @@ about keeping track of old states... state = oldState; } -// 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) -{ - if (v == position) - return &position; - else if (v == endpoint) - return &endpoint; - return 0; -} - -#if 0 -void Line::SetDimensionOnPoint1(Dimension * dimension) -{ - dimPoint1 = dimension; - - if (dimension) - dimension->SetPoint1(position); -} - -void Line::SetDimensionOnPoint2(Dimension * dimension) -{ - dimPoint2 = 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, DTLinear, 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) +/*virtual*/ bool Line::HitTest(Point point) { SaveState(); @@ -465,6 +515,123 @@ bool Line::HitTest(Point point) return StateChanged(); } + +// 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) +{ + if (v == position) + return &position; + else if (v == endpoint) + return &endpoint; + + return 0; +} + + +/*virtual*/ void Line::Enumerate(FILE * file) +{ + fprintf(file, "LINE (%lf,%lf) (%lf,%lf)\n", position.x, position.y, endpoint.x, endpoint.y); +} + + +/*virtual*/ Object * Line::Copy(void) +{ +#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); +} + + +/*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; +} + + +/*virtual*/ QRectF Line::Extents(void) +{ + QRectF rect(QPointF(position.x, position.y), QPointF(endpoint.x, endpoint.y)); + return rect.normalized(); +} + + +void Line::SetDimensionOnLine(Dimension * dimension/*=NULL*/) +{ + // If they don't pass one in, create it for the caller. + if (dimension == NULL) + { +//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); + } + + // Make sure the Dimension is connected to us... + Connect(dimension, 0); + Connect(dimension, 1.0); +} + + +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; i