X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fline.cpp;h=46a6d85860c8d598b8f76497f9ea4ace005bb20d;hb=771113b26ca27707c96fdcd80d79a08e40884268;hp=e80e988797c28004cd84d45c7ba76411bbad1049;hpb=eb711912d64f17cf9c18c74c4d78d9867bd066ad;p=architektonas diff --git a/src/line.cpp b/src/line.cpp index e80e988..46a6d85 100644 --- a/src/line.cpp +++ b/src/line.cpp @@ -21,6 +21,7 @@ #include #include "container.h" #include "dimension.h" +#include "geometry.h" #include "mathconstants.h" #include "painter.h" @@ -51,6 +52,16 @@ Line::~Line() // connect to this dimension object at this point, instead of just becoming // detached. #endif +//actually not true, we know the object pointer and parameter! +//actuall, the Object base class does this for us...! +#if 0 + std::vector::iterator i; + + for(i=connected.begin(); i!=connected.end(); i++) + { + (*i).object->Disconnect(this, (*i).t); + } +#endif } @@ -93,22 +104,9 @@ Line::~Line() double absAngle = (Vector(endpoint - position).Angle()) * RADIANS_TO_DEGREES; double absLength = Vector(position - endpoint).Magnitude(); - QString text; - - text = QObject::tr("Length: %1 in.\n") + QChar(0x2221) + QObject::tr(": %2"); + QString 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 (in Qt coords) - painter->DrawRoundedRect(textRect, 7.0, 7.0); - - textRect.setLeft(textRect.left() + 14); - painter->SetFont(*Object::font); - pen = QPen(QColor(0x00, 0x5F, 0xDF)); - painter->SetPen(pen); - painter->DrawText(textRect, Qt::AlignVCenter, text); + painter->DrawInformativeText(text); } } @@ -121,13 +119,28 @@ Line::~Line() /*virtual*/ bool Line::Collided(Vector point) { +/* +what we can do here is set ignoreClicks to true to keep other objects that are +selected from deselecting themselves. Will that fuck up something else? Not sure +yet... :-/ +Actually, this is done here to keep tools from selecting stuff inadvertantly... +*/ // We can assume this, since this is a mouse down event here. objectWasDragged = false; -// SaveHitState(); - HitTest(point); -// return HitStateChanged(); + bool hit = HitTest(point); + + // Someone told us to fuck off, so we'll fuck off. :-) + if (ignoreClicks) +// return false; + return hit; + + // Now that we've done our hit testing on the non-snapped point, snap it if + // necessary... + if (snapToGrid) + point = SnapPointToGrid(point); // this is shite. this should be checked for in the Container, not here! +#warning "!!! This should be checked for in Container, not here !!!" // 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)) @@ -157,6 +170,13 @@ key to make it draw/show on the other side... TODO: Make Dimension preview with modifier keys for showing on other side */ +/* + +N.B.: This no longer works, as the DrawDimension object takes precedence over this code. + THIS DOES NOTHING ANYMORE!!! + +*/ +#if 0 // Is the dimension tool active? Let's use it: if (dimensionActive) { @@ -208,29 +228,28 @@ a dimension only) Draw() function... :-/ return true; } } - +#endif if (state == OSInactive) { -//printf("Line: pp = %lf, length = %lf, distance = %lf\n", parameterizedPoint, lineSegment.Magnitude(), distance); -//printf(" v1.Magnitude = %lf, v2.Magnitude = %lf\n", v1.Magnitude(), v2.Magnitude()); -//printf(" point = %lf,%lf,%lf; p1 = %lf,%lf,%lf; p2 = %lf,%lf,%lf\n", point.x, point.y, point.z, position.x, position.y, position.z, endpoint.x, endpoint.y, endpoint.z); -//printf(" \n", ); //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). +//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; state = OSSelected; - oldPoint = position; //maybe "position"? + oldPoint = position; draggingHandle1 = true; return true; } @@ -238,7 +257,7 @@ a dimension only) Draw() function... :-/ { oldState = state; state = OSSelected; - oldPoint = endpoint; //maybe "position"? + oldPoint = endpoint; draggingHandle2 = true; return true; } @@ -253,12 +272,6 @@ a dimension only) Draw() function... :-/ } else if (state == OSSelected) { - // Here we test for collision with handles as well! (SOON!) [I think it works...NOPE] -/* -Like so: - if (v1.Magnitude() < 2.0) // Handle #1 - else if (v2.Magnitude() < 2.0) // Handle #2 -*/ if (hitLine) { oldState = state; @@ -286,30 +299,24 @@ Like so: } -/*virtual*/ void Line::PointerMoved(Vector point) +/*virtual*/ bool 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)) if (selection.contains(position.x, position.y) && selection.contains(endpoint.x, endpoint.y)) -#endif state = OSSelected; else state = OSInactive; - return; + return false; } // Hit test tells us what we hit (if anything) through boolean variables. (It // also tells us whether or not the state changed. --not any more) SaveHitState(); - HitTest(point); + bool hovered = HitTest(point); needUpdate = HitStateChanged(); objectWasDragged = (draggingLine | draggingHandle1 | draggingHandle2); @@ -328,6 +335,20 @@ Like so: needUpdate = true; //doesn't work QMainWindow::statusBar()->setText("You are manipulating a line"); + + // Tell connected objects to move themselves... + if (draggingLine) + { + std::vector::iterator i; + + for(i=connected.begin(); i!=connected.end(); i++) + { + if ((*i).object->type == OTLine) + ((Line *)((*i).object))->MovePointAtParameter((*i).t, delta); + else if ((*i).object->type == OTDimension) + ((Dimension *)((*i).object))->MovePointAtParameter((*i).t, delta); + } + } } /* @@ -395,6 +416,8 @@ the horizontal line or vertical line that intersects from the current mouse posi dimPoint2->SetPoint2(draggingHandle2 ? v2 : endpoint); #endif } + + return hovered; } @@ -442,22 +465,13 @@ the horizontal line or vertical line that intersects from the current mouse posi /*virtual*/ bool Line::HitTest(Point point) { -// SaveHitState(); - hitPoint1 = hitPoint2 = hitLine = false; Vector lineSegment = endpoint - position; Vector v1 = point - position; Vector v2 = point - endpoint; - double t = Vector::Parameter(position, endpoint, point); + double t = Geometry::ParameterOfLineAndPoint(position, endpoint, point); double distance; - // Geometric interpretation: - // The parameter "t" on the vector lineSegment is where the normal of - // lineSegment coincides with point. If t < 0, the normal lies beyond the - // 1st endpoint. If t > 1, then the normal lies beyond the 2nd endpoint. We - // only calculate the length of the normal between the point and the - // lineSegment when the parameter is between 0 and 1. - // Geometric interpretation of "distance = ?Det?(ls, v1) / |ls|": // If the segment endpoints are s and e, and the point is p, then the test // for the perpendicular intercepting the segment is equivalent to insisting @@ -493,7 +507,6 @@ the horizontal line or vertical line that intersects from the current mouse posi hitLine = true; return (hitPoint1 || hitPoint2 || hitLine ? true : false); -// return HitStateChanged(); } @@ -512,7 +525,7 @@ the horizontal line or vertical line that intersects from the current mouse posi /*virtual*/ void Line::Enumerate(FILE * file) { - fprintf(file, "LINE (%lf,%lf) (%lf,%lf)\n", position.x, position.y, endpoint.x, endpoint.y); + fprintf(file, "LINE %i (%lf,%lf) (%lf,%lf)\n", layer, position.x, position.y, endpoint.x, endpoint.y); } @@ -534,23 +547,29 @@ same reference number. /*virtual*/ Vector Line::GetPointAtParameter(double parameter) { +// Is there any real reason to clamp this to the endpoints? +// (hey, whaddya know? this was masking a bug!) +#if 0 if (parameter <= 0) return position; else if (parameter >= 1.0) return endpoint; +#endif + + // The parameter is a percentage of the length of the vector, so all we + // have to do is scale the vector by it to find the point. + return position + (Vector(position, endpoint) * parameter); +} + - // 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*/ void Line::MovePointAtParameter(double parameter, Vector v) +{ + if (parameter == 0) + position += v; + else if (parameter == 1.0) + endpoint += v; + else + {} // Not sure how to handle this case :-P } @@ -568,40 +587,72 @@ same reference number. } -/*virtual*/ void Line::Rotate(Vector point, double angle) +/*virtual*/ void Line::Rotate(Point point, double angle) +{ + Point l1 = Geometry::RotatePointAroundPoint(position, point, angle); + Point l2 = Geometry::RotatePointAroundPoint(endpoint, point, angle); + position = l1; + endpoint = l2; +} + + +/*virtual*/ void Line::Scale(Point point, double amount) +{ +} + + +/*virtual*/ void Line::Mirror(Point p1, Point p2) +{ + Point l1 = Geometry::MirrorPointAroundLine(position, p1, p2); + Point l2 = Geometry::MirrorPointAroundLine(endpoint, p1, p2); + position = l1; + endpoint = l2; +} + + +/*virtual*/ void Line::Save(void) { + Object::Save(); + oldEndpoint = endpoint; } -/*virtual*/ void Line::Scale(Vector point, double amount) +/*virtual*/ void Line::Restore(void) { + Object::Restore(); + endpoint = oldEndpoint; } -void Line::SetDimensionOnLine(Dimension * dimension/*=NULL*/) +void Line::SetDimensionOnLine(Dimension * dimension/*= NULL*/) { // If they don't pass one in, create it for the caller. - if (dimension == NULL) + // But ONLY if this line has a parent container! + // This is really bad to do here, it should be done in the parent container, always! +#warning "!!! Parent container should be creating Dimension object !!!" + if ((dimension == NULL) && (parent != 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); + dimension = new Dimension(position, endpoint, DTLinear, parent); +// dimension = new Dimension(Connection(this, 0), Connection(this, 1.0), DTLinear, this); - if (parent) + // THIS IS SERIOUS!!! WITHOUT A PARENT, THIS OBJECT IS IN LIMBO!!! +// if (parent) //{ //printf("Line::SetDimensionOnLine(): Adding to parent...\n"); - parent->Add(dimension); + parent->Add(dimension); //} } - else - { - dimension->Connect(this, 0); - dimension->Connect(this, 1.0); - } + + dimension->Connect(this, 0); + dimension->Connect(this, 1.0); // Make sure the Dimension is connected to us... Connect(dimension, 0); Connect(dimension, 1.0); + + dimension->position = position; + dimension->endpoint = endpoint; }