X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdrawingview.cpp;h=fc30ac8e259ce61a092b35210f2ab6280ce2b457;hb=7f3a6b11585376eecd80979ec3da2346c5314d88;hp=a3a6eb13a67503dd56042600eea073349cedfdaf;hpb=f19a3a172c425b7fcc5a648a94870f0247c6be89;p=architektonas diff --git a/src/drawingview.cpp b/src/drawingview.cpp index a3a6eb1..fc30ac8 100644 --- a/src/drawingview.cpp +++ b/src/drawingview.cpp @@ -4,20 +4,22 @@ // (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 // --- ---------- ------------------------------------------------------------- // JLH 03/22/2011 Created this file +// JLH 09/29/2011 Added middle mouse button panning // // FIXED: // +// - Redo rendering code to *not* use Qt's transform functions, as they are tied +// to a left-handed system and we need a right-handed one. [DONE] // // STILL TO BE DONE: // -// - Redo rendering code to *not* use Qt's transform functions, as they are tied -// to a left-handed system and we need a right-handed one. +// - Lots of stuff // // Uncomment this for debugging... @@ -33,25 +35,29 @@ #include "arc.h" #include "circle.h" #include "dimension.h" +#include "geometry.h" #include "line.h" #include "painter.h" +#define BACKGROUND_MAX_SIZE 512 + +// Class variable +//Container DrawingView::document(Vector(0, 0)); + + DrawingView::DrawingView(QWidget * parent/*= NULL*/): QWidget(parent), // The value in the settings file will override this. useAntialiasing(true), - scale(1.0), offsetX(-10), offsetY(-10), - document(Vector(0, 0)), - gridSpacing(32.0), collided(false), rotateTool(false), rx(150.0), ry(150.0), - scrollDrag(false) + gridBackground(BACKGROUND_MAX_SIZE, BACKGROUND_MAX_SIZE), + scale(1.0), offsetX(-10), offsetY(-10), document(Vector(0, 0)), + gridPixels(0), collided(false), toolAction(NULL) { + document.isTopLevelContainer = true; setBackgroundRole(QPalette::Base); setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); -// toolPalette = new ToolWindow(); -// CreateCursors(); -// setCursor(cur[TOOLSelect]); -// setMouseTracking(true); + Object::gridSpacing = 12.0; // In base units (inch is default) Line * line = new Line(Vector(5, 5), Vector(50, 40), &document); document.Add(line); @@ -62,31 +68,206 @@ DrawingView::DrawingView(QWidget * parent/*= NULL*/): QWidget(parent), 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); + Dimension * dimension = new Dimension(Vector(0, 0), Vector(0, 0), DTLinear, &document); line->SetDimensionOnLine(dimension); document.Add(dimension); #else // Alternate way to do the above... line->SetDimensionOnLine(); #endif + +/* +Here we set the grid size in pixels--12 in this case. Initially, we have our +zoom set to make this represent 12 inches at a zoom factor of 25%. (This is +arbitrary.) So, to be able to decouple the grid size from the zoom, we need +to be able to set the size of the background grid (which we do here at an +arbitrary 12 pixels) to anything we want (within reason, of course :-). + +The drawing enforces the grid spacing through the drawing->gridSpacing variable. + + drawing->gridSpacing = 12.0 / Painter::zoom; + +Painter::zoom is the zoom factor for the drawing, and all mouse clicks are +translated to Cartesian coordinates through this. (Initially, Painter::zoom is +set to 1.0. SCREEN_ZOOM is set to 1.0/4.0.) + +Really, the 100% zoom level can be set at *any* zoom level, it's more of a +convenience function than any measure of absolutes. Doing things that way we +could rid ourselves of the whole SCREEN_ZOOM parameter and all the attendant +shittyness that comes with it. + +However, it seems that SCREEN_ZOOM is used to make text and arrow sizes show up +a certain way, which means we should probably create something else in those +objects to take its place--like some kind of scale factor. This would seem to +imply that certain point sizes actually *do* tie things like fonts to absolute +sizes on the screen, but not necessarily because you could have an inch scale +with text that is quite small relative to other objects on the screen, which +currently you have to zoom in to see (and which blows up the text). Point sizes +in an application like this are a bit meaningless; even though an inch is an +inch regardless of the zoom level a piece of text can be larger or smaller than +this. Maybe this is the case for having a base unit and basing point sizes off +of that. + +Here's what's been figured out. Painter::zoom is simply the ratio of pixels to +base units. What that means is that if you have a 12px grid with a 6" grid size +(& base unit of "inches"), Painter::zoom becomes 12px / 6" = 2.0 px/in. + +Dimensions now have a "size" parameter to set their absolute size in relation +to the base unit. ATM, the arrows are drawn in pixels, but also scaled by +Painter::zoom *and* size. Same with the dimension text; it's drawn at 10pt and +scaled the same way as the arrowheads. + +Need a way to scale line widths as well. :-/ Shouldn't be too difficult, just +need a thickness parameter similar to the "size" param for dimensions. (And now +we do! :-) + +*/ + SetGridSize(12); // This is in pixels } -void DrawingView::SetRotateToolActive(bool state/*= true*/) + +void DrawingView::SetToolActive(Action * action) { - rotateTool = state; - update(); + if (action != NULL) + { + toolAction = action; + connect(toolAction, SIGNAL(ObjectReady(Object *)), this, + SLOT(AddNewObjectToDocument(Object *))); + connect(toolAction, SIGNAL(NeedRefresh()), this, SLOT(HandleActionUpdate())); + } } -//These are not needed... :-P -#if 0 -void DrawingView::ZoomIn(void) + +void DrawingView::SetGridSize(uint32_t size) +{ + // Sanity check + if (size == gridPixels) + return; + + // Recreate the background bitmap + gridPixels = size; + QPainter pmp(&gridBackground); + pmp.fillRect(0, 0, BACKGROUND_MAX_SIZE, BACKGROUND_MAX_SIZE, QColor(240, 240, 240)); + pmp.setPen(QPen(QColor(210, 210, 255), 2.0, Qt::SolidLine)); + + for(int i=0; i<(BACKGROUND_MAX_SIZE-1); i+=gridPixels) + { + pmp.drawLine(i, 0, i, BACKGROUND_MAX_SIZE - 1); + pmp.drawLine(0, i, BACKGROUND_MAX_SIZE - 1, i); + } + + pmp.end(); + + // Set up new BG brush & zoom level (pixels per base unit) +// Painter::zoom = gridPixels / gridSpacing; + Painter::zoom = gridPixels / Object::gridSpacing; + UpdateGridBackground(); +} + + +void DrawingView::UpdateGridBackground(void) { + // Transform the origin to Qt coordinates + Vector pixmapOrigin = Painter::CartesianToQtCoords(Vector()); + int x = (int)pixmapOrigin.x; + int y = (int)pixmapOrigin.y; + // Use mod arithmetic to grab the correct swatch of background +/* +Negative numbers still screw it up... Need to think about what we're +trying to do here. The fact that it worked with 72 seems to have been pure luck. +It seems the problem is negative numbers: We can't let that happen. +When taking away the zero, it pops over 1 px at zero, then goes about 1/2 a +grid at x<0. + +The bitmap looks like this: + ++---+---+---+---+--- +| | | | | +| | | | | ++---+---+---+---+--- +| | | | | +| | | | | +| | | | | + +@ x = 1, we want it to look like: + +-+---+---+---+---+--- + | | | | | + | | | | | +-+---+---+---+---+--- + | | | | | + | | | | | + | | | | | + +Which means we need to grab the sample from x = 3. @ x = -1: + +---+---+---+---+--- + | | | | + | | | | +---+---+---+---+--- + | | | | + | | | | + | | | | + +Which means we need to grab the sample from x = 1. Which means we have to take +the mirror of the modulus of gridPixels. + +Doing a mod of a negative number is problematic: 1st, the compiler converts the +negative number to an unsigned int, then it does the mod. Gets you wrong answers +most of the time, unless you use a power of 2. :-P So what we do here is just +take the modulus of the negation, which means we don't have to worry about +mirroring it later. + +The positive case looks gruesome (and it is) but it boils down to this: We take +the modulus of the X coordinate, then mirror it by subtraction from the +maximum (in this case, gridPixels). This gives us a number in the range of 1 to +gridPixels. But we need the case where the result equalling gridPixels to be +zero; so we do another modulus operation on the result to achieve this. +*/ + if (x < 0) + x = -x % gridPixels; + else + x = (gridPixels - (x % gridPixels)) % gridPixels; + + if (y < 0) + y = -y % gridPixels; + else + y = (gridPixels - (y % gridPixels)) % gridPixels; + + // Here we grab a section of the bigger pixmap, so that the background + // *looks* like it's scrolling... + QPixmap pm = gridBackground.copy(x, y, gridPixels, gridPixels); + QPalette pal = palette(); + pal.setBrush(backgroundRole(), QBrush(pm)); + setAutoFillBackground(true); + setPalette(pal); } -void DrawingView::ZoomOut(void); + +void DrawingView::AddNewObjectToDocument(Object * object) { + if (object) + { + object->Reparent(&document); + document.Add(object); + update(); + } +//printf("DrawingView::AddNewObjectToDocument(). object=%08X\n", object); } -#endif + + +void DrawingView::HandleActionUpdate(void) +{ + update(); +} + + +void DrawingView::SetCurrentLayer(int layer) +{ + Object::currentLayer = layer; +//printf("DrawingView::CurrentLayer = %i\n", layer); +} + QPoint DrawingView::GetAdjustedMousePosition(QMouseEvent * event) { @@ -96,6 +277,7 @@ QPoint DrawingView::GetAdjustedMousePosition(QMouseEvent * event) return QPoint(offsetX + event->x(), offsetY + (size().height() - event->y())); } + QPoint DrawingView::GetAdjustedClientPosition(int x, int y) { // VOODOO ALERT (ON Y COMPONENT!!!!) (eh?) @@ -104,6 +286,7 @@ QPoint DrawingView::GetAdjustedClientPosition(int x, int y) return QPoint(-offsetX + x, (size().height() - (-offsetY + y)) * +1.0); } + void DrawingView::paintEvent(QPaintEvent * /*event*/) { QPainter qtPainter(this); @@ -112,66 +295,39 @@ void DrawingView::paintEvent(QPaintEvent * /*event*/) if (useAntialiasing) qtPainter.setRenderHint(QPainter::Antialiasing); - Painter::screenSize = Vector(size().width(), size().height()); -// Painter::zoom = 2.0; // 200% zoom -#if 0 -#if 0 - painter.translate(QPoint(-offsetX, size.height() - (-offsetY))); - painter.scale(1.0, -1.0); -#else - QTransform transform; -//order of operations is important! N.B.: Can't use scaling other than 1.0, it -//causes lines to look strange (i.e., it scales the pen strokes too) -// transform.translate(-offsetX, size().height() - (-offsetY)); - transform.scale(1.0, -1.0); - transform.translate(-offsetX, -size().height() - offsetY); -// transform.scale(0.25, 0.25); - painter.setTransform(transform); -#endif -#endif Object::SetViewportHeight(size().height()); // Draw coordinate axes - painter.SetPen(QPen(Qt::blue, 1.0, Qt::DotLine)); painter.DrawLine(0, -16384, 0, 16384); painter.DrawLine(-16384, 0, 16384, 0); - // Draw supplemental (tool related) points + // The top level document takes care of rendering for us... + document.Draw(&painter); - if (rotateTool) + if (toolAction) { - painter.SetPen(QPen(QColor(0, 200, 0), 2.0, Qt::SolidLine)); - painter.DrawLine(rx - 10, ry, rx + 10, ry); - painter.DrawLine(rx, ry - 10, rx, ry + 10); + painter.SetPen(QPen(QColor(200, 100, 0, 255), 1.0, Qt::DashLine)); + painter.DrawCrosshair(oldPoint); + toolAction->Draw(&painter); } -// Maybe we can make the grid into a background brush instead, and let Qt deal -// with it??? - // Draw grid - -#if 0 - painter.setPen(QPen(QColor(90, 90, 90), 1.0, Qt::DotLine)); - - //these two loops kill performance! - // Also, these overwrite our coordinate axes - for(double x=0; xbutton() == Qt::LeftButton) @@ -179,8 +335,30 @@ void DrawingView::mousePressEvent(QMouseEvent * event) Vector point = Painter::QtToCartesianCoords(Vector(event->x(), event->y())); collided = document.Collided(point); + // Do an update if collided with at least *one* object in the document if (collided) - update(); // Do an update if collided with at least *one* object in the document + update(); + + if (toolAction) + { + if (Object::snapToGrid) + point = Object::SnapPointToGrid(point); + + // We always snap to object points, and they take precendence over + // grid points... + if (Object::snapPointIsValid) + point = Object::snapPoint; + + toolAction->MouseDown(point); + } + + // Didn't hit any object and not using a tool, so do a selection rectangle + if (!(collided || toolAction)) + { + Object::selectionInProgress = true; + Object::selection.setTopLeft(QPointF(point.x, point.y)); + Object::selection.setBottomRight(QPointF(point.x, point.y)); + } } else if (event->button() == Qt::MiddleButton) { @@ -191,557 +369,193 @@ void DrawingView::mousePressEvent(QMouseEvent * event) } } + void DrawingView::mouseMoveEvent(QMouseEvent * event) { Vector point = Painter::QtToCartesianCoords(Vector(event->x(), event->y())); + Object::selection.setBottomRight(QPointF(point.x, point.y)); + // Only needs to be done here, as mouse down is always preceded by movement + Object::snapPointIsValid = false; + // Scrolling... if (event->buttons() & Qt::MiddleButton) { point = Vector(event->x(), event->y()); // Since we're using Qt coords for scrolling, we have to adjust them here to - // conform to Cartesian coords, since the origin is using them. :-) - Vector delta(point, oldPoint); + // conform to Cartesian coords, since the origin is using Cartesian. :-) + Vector delta(oldPoint, point); delta /= Painter::zoom; delta.y = -delta.y; Painter::origin -= delta; + + UpdateGridBackground(); update(); oldPoint = point; return; } - // Grid processing... -#if 1 - // This looks strange, but it's really quite simple: We want a point that's - // more than half-way to the next grid point to snap there while conversely - // we want a point that's less than half-way to to the next grid point then - // snap to the one before it. So we add half of the grid spacing to the - // point, then divide by it so that we can remove the fractional part, then - // multiply it back to get back to the correct answer. - if (event->buttons() & Qt::LeftButton) +#if 0 + // Grid processing... (only snap here is left button is down) + if ((event->buttons() & Qt::LeftButton) && Object::snapToGrid) { - point += gridSpacing / 2.0; // *This* adds to Z!!! - point /= gridSpacing; - point.x = floor(point.x);//need to fix this for negative numbers... - point.y = floor(point.y); - point.z = 0; // Make *sure* Z doesn't go anywhere!!! - point *= gridSpacing; + point = Object::SnapPointToGrid(point); } -#endif -//we should keep track of the last point here and only pass this down *if* the point -//changed... - document.PointerMoved(point); - - if (document.NeedsUpdate()) - update(); -} - -void DrawingView::mouseReleaseEvent(QMouseEvent * event) -{ - if (event->button() == Qt::LeftButton) - { - document.PointerReleased(); -//We need to update especially if nothing collided and the state needs to change. !!! FIX !!! -//could set it up to use the document's update function (assumes that all object updates -//are being reported correctly: -// if (document.NeedsUpdate()) -// if (collided) - update(); // Do an update if collided with at least *one* object in the document - } - else if (event->button() == Qt::MiddleButton) + // Snap points on objects always take precedence over the grid, whether + // dragging an object or not... +//thisnowok + if (Object::snapPointIsValid) { - scrollDrag = false; - setCursor(Qt::ArrowCursor); +// Uncommenting this causes the cursor to become unresponsive after the first +// object is added. +// point = Object::snapPoint; } -} - - -#if 0 -QSize DrawingView::minimumSizeHint() const -{ - return QSize(50, 50); -} - -QSize DrawingView::sizeHint() const -{ - return QSize(400, 400); -} - -void DrawingView::CreateCursors(void) -{ - int hotx[8] = { 1, 1, 11, 15, 1, 1, 1, 1 }; - int hoty[8] = { 1, 1, 11, 13, 1, 1, 1, 1 }; +#endif - for(int i=0; i<8; i++) - { - QString s; - s.sprintf(":/res/cursor%u.png", i+1); - QPixmap pmTmp(s); - cur[i] = QCursor(pmTmp, hotx[i], hoty[i]); - } -} +// oldPoint = point; +//we should keep track of the last point here and only pass this down *if* the point +//changed... -/* -TODO: - o Different colors for polys on selected points - o Different colors for handles on non-selected polys - o Line of sight (dashed, dotted) for off-curve points - o Repaints for press/release of CTRL/SHIFT during point creation -*/ -void DrawingView::paintEvent(QPaintEvent * /*event*/) -{ - QPainter p(this); -//hm, causes lockup -// p.setRenderHint(QPainter::Antialiasing); -//Doesn't do crap! -//dc.SetBackground(*wxWHITE_BRUSH); - -// Due to the screwiness of wxWidgets coord system, the origin is ALWAYS -// the upper left corner--regardless of axis orientation, etc... -// int width, height; -// dc.GetSize(&width, &height); - QSize winSize = size(); - -// dc.SetDeviceOrigin(-offsetX, height - (-offsetY)); -// dc.SetAxisOrientation(true, true); - p.translate(QPoint(-offsetX, winSize.height() - (-offsetY))); - p.scale(1.0, -1.0); - -// Scrolling can be done by using OffsetViewportOrgEx -// Scaling can be done by adjusting SetWindowExtEx (it's denominator of txform) -// you'd use: % = ViewportExt / WindowExt -// But it makes the window look like crap: fuggetuboutit. -// Instead, we have to scale EVERYTHING by hand. Crap! -// It's not *that* bad, but not as convenient either... - -// dc.SetPen(*(wxThePenList->FindOrCreatePen(wxColour(0x00, 0x00, 0xFF), 1, wxDOT))); -//// dc.DrawLine(0, 0, 10, 10); - p.setPen(QPen(Qt::blue, 1.0, Qt::DotLine)); - - // Draw coordinate axes - -// dc.CrossHair(0, 0); - p.drawLine(0, -16384, 0, 16384); - p.drawLine(-16384, 0, 16384, 0); - - // Draw points - - for(int i=0; iFindOrCreatePen(wxColour(0xFF, 0x00, 0x00), 1, wxSOLID))); -//// SelectObject(hdc, hRedPen1); - p.setPen(QPen(Qt::red, 1.0, Qt::SolidLine)); - - if (pts.GetOnCurve(i)) - { - DrawSquareDotN(p, pts.GetX(i), pts.GetY(i), 7); - DrawSquareDotN(p, pts.GetX(i), pts.GetY(i), 9); - } - else + // Two objects are hovered, see if we have an intersection point + if ((document.lastObjectHovered->type == OTLine) && (document.penultimateObjectHovered->type == OTLine)) { - DrawRoundDotN(p, pts.GetX(i), pts.GetY(i), 7); - DrawRoundDotN(p, pts.GetX(i), pts.GetY(i), 9); - } - } - else if ((i == ptHighlight || i == ptNextHighlight) && tool == TOOLAddPt) - { -// dc.SetPen(*(wxThePenList->FindOrCreatePen(wxColour(0x00, 0xAF, 0x00), 1, wxSOLID))); -//// SelectObject(hdc, hGreenPen1); - p.setPen(QPen(Qt::green, 1.0, Qt::SolidLine)); + double t; + int n = Geometry::Intersects((Line *)document.lastObjectHovered, (Line *)document.penultimateObjectHovered, &t); - if (pts.GetOnCurve(i)) - { - DrawSquareDotN(p, pts.GetX(i), pts.GetY(i), 7); - DrawSquareDotN(p, pts.GetX(i), pts.GetY(i), 9); + if (n == 1) + { + Object::snapPoint = document.lastObjectHovered->GetPointAtParameter(t); + Object::snapPointIsValid = true; + } } - else + else if ((document.lastObjectHovered->type == OTCircle) && (document.penultimateObjectHovered->type == OTCircle)) { - DrawRoundDotN(p, pts.GetX(i), pts.GetY(i), 7); - DrawRoundDotN(p, pts.GetX(i), pts.GetY(i), 9); - } - } - else - { -// dc.SetPen(*(wxThePenList->FindOrCreatePen(wxColour(0x00, 0x00, 0x00), 1, wxSOLID))); -//// SelectObject(hdc, hBlackPen1); - p.setPen(QPen(Qt::black, 1.0, Qt::SolidLine)); - - if (pts.GetOnCurve(i)) - DrawSquareDot(p, pts.GetX(i), pts.GetY(i)); - else - DrawRoundDot(p, pts.GetX(i), pts.GetY(i)); - } - - if (tool == TOOLDelPt && i == ptHighlight) - { -#if 0 - dc.SetPen(*(wxThePenList->FindOrCreatePen(wxColour(0xFF, 0x00, 0x00), 1, wxSOLID))); -// SelectObject(hdc, hRedPen1); -// MoveToEx(hdc, pts.GetX(i) - 5, pts.GetY(i) - 5, NULL); -// LineTo(hdc, pts.GetX(i) + 5, pts.GetY(i) + 5); -// LineTo(hdc, pts.GetX(i) - 5, pts.GetY(i) - 5);//Lameness! -// MoveToEx(hdc, pts.GetX(i) - 5, pts.GetY(i) + 5, NULL); -// LineTo(hdc, pts.GetX(i) + 5, pts.GetY(i) - 5); -// LineTo(hdc, pts.GetX(i) - 5, pts.GetY(i) + 5);//More lameness!! -#endif - p.setPen(QPen(Qt::red, 1.0, Qt::SolidLine)); - p.drawLine(pts.GetX(i) - 5, pts.GetY(i) - 5, pts.GetX(i) + 5, pts.GetY(i) + 5); - p.drawLine(pts.GetX(i) + 5, pts.GetY(i) - 5, pts.GetX(i) - 5, pts.GetY(i) + 5); - } - } - -//// SelectObject(hdc, hBlackPen1); -// dc.SetPen(*(wxThePenList->FindOrCreatePen(wxColour(0x00, 0x00, 0x00), 1, wxSOLID))); - p.setPen(QPen(Qt::black, 1.0, Qt::SolidLine)); - - // Draw curve formed by points - - for(int poly=0; poly 2) - { - // Initial move... - // If it's not on curve, then move to it, otherwise move to last point... - - int x, y; + Point p1, p2; + int n = Geometry::Intersects((Circle *)document.lastObjectHovered, (Circle *)document.penultimateObjectHovered, 0, 0, 0, 0, &p1, &p2); - if (pts.GetOnCurve(poly, pts.GetNumPoints(poly) - 1)) - x = (int)pts.GetX(poly, pts.GetNumPoints(poly) - 1), y = (int)pts.GetY(poly, pts.GetNumPoints(poly) - 1); - else - x = (int)pts.GetX(poly, 0), y = (int)pts.GetY(poly, 0); - - for(int i=0; ibutton() == Qt::RightButton) - { - toolPalette->move(event->globalPos()); - toolPalette->setVisible(true); - setCursor(cur[TOOLSelect]); - toolPalette->prevTool = TOOLSelect; - } - else if (event->button() == Qt::MidButton) + if (toolAction) { - setCursor(cur[2]); // Scrolling cursor - } - else if (event->button() == Qt::LeftButton) - { - if (tool == TOOLScroll || tool == TOOLZoom) -;//meh CaptureMouse(); // Make sure we capture the mouse when in scroll/zoom mode - else if (tool == TOOLAddPt) // "Add Point" tool - { - if (pts.GetNumPoints() > 0) - { - QPoint pt = GetAdjustedMousePosition(event); - pts.InsertPoint(pts.GetNext(ptHighlight), pt.x(), pt.y(), ((event->modifiers() == Qt::ShiftModifier || event->modifiers() == Qt::ControlModifier) ? false : true)); - ptHighlight = ptNextHighlight; - update(); - } - } - else if (tool == TOOLAddPoly) // "Add Poly" tool - { -#ifdef DEBUGFOO -WriteLogMsg("Adding point... # polys: %u, # points: %u", pts.GetNumPolys(), pts.GetNumPoints()); -#endif - if (polyFirstPoint) - { - polyFirstPoint = false; - pts.AddNewPolyAtEnd(); - } + if (Object::snapToGrid) + point = Object::SnapPointToGrid(point); - QPoint pt = GetAdjustedMousePosition(event); -//printf("GetAdjustedMousePosition = %i, %i\n", pt.x(), pt.y()); - // Append a point to the end of the structure - pts += IPoint(pt.x(), pt.y(), ((event->modifiers() == Qt::ShiftModifier || event->modifiers() == Qt::ControlModifier) ? false : true)); - ptHighlight = pts.GetNumPoints() - 1; - update(); -#ifdef DEBUGFOO -WriteLogMsg(" --> [# polys: %u, # points: %u]\n", pts.GetNumPolys(), pts.GetNumPoints()); -#endif - } - else if (tool == TOOLSelect || tool == TOOLPolySelect) - { - if (pts.GetNumPoints() > 0) - { - pt = GetAdjustedClientPosition(pts.GetX(ptHighlight), pts.GetY(ptHighlight)); -//printf("GetAdjustedClientPosition = %i, %i\n", pt.x(), pt.y()); -// WarpPointer(pt.x, pt.y); - QCursor::setPos(mapToGlobal(pt)); + // We always snap to object points, and they take precendence over + // grid points... + if (Object::snapPointIsValid) + point = Object::snapPoint; - if (event->modifiers() == Qt::ShiftModifier || event->modifiers() == Qt::ControlModifier) - { - pts.SetOnCurve(ptHighlight, !pts.GetOnCurve(ptHighlight)); - update(); - } - } - } - else if (tool == TOOLDelPt) - { - if (pts.GetNumPoints() > 0) -//Or could use: -// if (ptHighlight != -1) - { -//This assumes that WM_MOUSEMOVE happens before this! -//The above commented out line should take care of this contingency... !!! FIX !!! - pts.DeletePoint(ptHighlight); - update(); - } - } + toolAction->MouseMoved(point); } - event->accept(); + // This is used to draw the tool crosshair... + oldPoint = point; + + if (document.NeedsUpdate() || Object::selectionInProgress || toolAction) + update(); } -void DrawingView::mouseMoveEvent(QMouseEvent * event) + +void DrawingView::mouseReleaseEvent(QMouseEvent * event) { - if (event->buttons() == Qt::RightButton) + if (event->button() == Qt::LeftButton) { - ToolType newTool = toolPalette->FindSelectedTool(); + document.PointerReleased(); + +//We need to update especially if nothing collided and the state needs to change. !!! FIX !!! +//could set it up to use the document's update function (assumes that all object updates +//are being reported correctly: +// if (document.NeedsUpdate()) +// if (collided) + update(); // Do an update if collided with at least *one* object in the document - if (newTool != toolPalette->prevTool) + if (toolAction) + toolAction->MouseReleased(); + + if (Object::selectionInProgress) { - toolPalette->prevTool = newTool; - toolPalette->repaint(); + // Select all the stuff inside of selection + Object::selectionInProgress = false; } } - else if (event->buttons() == Qt::MidButton) - { - // Calc offset from previous point - pt = event->pos(); - ptOffset = QPoint(pt.x() - ptPrevious.x(), pt.y() - ptPrevious.y()); - -// Then multiply it by the scaling factor. Whee! - // This looks wacky because we're using screen coords for the offset... - // Otherwise, we would subtract both offsets! - offsetX -= ptOffset.x(), offsetY += ptOffset.y(); - update(); - ptPrevious = pt; - } - else if (event->buttons() == Qt::LeftButton) + else if (event->button() == Qt::MiddleButton) { -#if 0 - if (tool == TOOLScroll) - { - // Extract current point from lParam/calc offset from previous point - - pt = e.GetPosition(); - ptOffset.x = pt.x - ptPrevious.x, - ptOffset.y = pt.y - ptPrevious.y; - - // NOTE: OffsetViewportOrg operates in DEVICE UNITS... - -//Seems there's no equivalent for this in wxWidgets...! -//!!! FIX !!! -// hdc = GetDC(hWnd); -// OffsetViewportOrgEx(hdc, ptOffset.x, ptOffset.y, NULL); -// ReleaseDC(hWnd, hdc); - -// this shows that it works, so the logic above must be faulty... -// And it is. It should convert the coords first, then do the subtraction to figure the offset... -// Above: DONE -// Then multiply it by the scaling factor. Whee! - // This looks wacky because we're using screen coords for the offset... - // Otherwise, we would subtract both offsets! - offsetX -= ptOffset.x, offsetY += ptOffset.y; - Refresh(); - } - else -#endif - if (tool == TOOLAddPt || tool == TOOLAddPoly || tool == TOOLSelect) - { - if (tool != TOOLAddPt || pts.GetNumPoints() > 0)//yecch. - { -//temporary, for testing. BTW, Select drag bug is here...! -#if 1 - QPoint pt2 = GetAdjustedMousePosition(event); - pts.SetXY(ptHighlight, pt2.x(), pt2.y()); - update(); -#endif - } - } - else if (tool == TOOLPolySelect) - { - if (pts.GetNumPoints() > 0) - { - QPoint pt2 = GetAdjustedMousePosition(event); - // Should also set onCurve here as well, depending on keystate -//Or should we? - pts.OffsetPoly(pts.GetPoly(ptHighlight), pt2.x() - pts.GetX(ptHighlight), pt2.y() - pts.GetY(ptHighlight)); - update(); - } - } + scrollDrag = false; + setCursor(Qt::ArrowCursor); } - else if (event->buttons() == Qt::NoButton) - { - // Moving, not dragging... - if (tool == TOOLSelect || tool == TOOLDelPt || tool == TOOLAddPt - || tool == TOOLPolySelect)// || tool == TOOLAddPoly) - { - QPoint pt2 = GetAdjustedMousePosition(event); - double closest = 1.0e+99; - - for(int i=0; i 1 && tool == TOOLAddPt) - { - double smallest = 1.0e+99; - - for(int i=0; i length of ls, -// then the perpendicular lies beyond the 2nd endpoint. - - if (pp < 0.0) - dist = v1.length(); - else if (pp > ls.length()) - dist = v2.length(); - else // distance = ?Det?(ls, v1) / |ls| - dist = fabs((ls.x * v1.y - v1.x * ls.y) / ls.length()); - -//The answer to the above looks like it might be found here: -// -//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 that the two dot products {s-e}.{s-p} and -//{e-s}.{e-p} are both non-negative. Perpendicular distance from the point to the segment is -//computed by first computing the area of the triangle the three points form, then dividing by the -//length of the segment. Distances are done just by the Pythagorean theorem. Twice the area of the -//triangle formed by three points is the determinant of the following matrix: -// -//sx sy 1 -//ex ey 1 -//px py 1 -// -//By translating the start point to the origin, this can be rewritten as: -//By subtracting row 1 from all rows, you get the following: -//[because sx = sy = 0. you could leave out the -sx/y terms below. because we subtracted -// row 1 from all rows (including row 1) row 1 turns out to be zero. duh!] -// -//0 0 0 -//(ex - sx) (ey - sy) 0 -//(px - sx) (py - sy) 0 -// -//which greatly simplifies the calculation of the determinant. +} - if (dist < smallest) - smallest = dist, ptNextHighlight = pts.GetNext(i), ptHighlight = i; - } - if (ptNextHighlight != oldPtNextHighlight) - { - oldPtNextHighlight = ptNextHighlight; - update(); - } - } - } +void DrawingView::wheelEvent(QWheelEvent * event) +{ + double zoomFactor = 1.25; + QSize sizeWin = size(); + Vector center(sizeWin.width() / 2.0, sizeWin.height() / 2.0); + center = Painter::QtToCartesianCoords(center); - ptPrevious = event->pos(); + // This is not centering for some reason. Need to figure out why. :-/ + if (event->delta() > 0) + { + Vector newOrigin = center - ((center - Painter::origin) / zoomFactor); + Painter::origin = newOrigin; + Painter::zoom *= zoomFactor; } - - event->accept(); -} - -void DrawingView::mouseReleaseEvent(QMouseEvent * event) -{ - if (event->button() == Qt::RightButton) + else { - ToolType newTool = toolPalette->FindSelectedTool(); + Vector newOrigin = center + ((-center + Painter::origin) * zoomFactor); + Painter::origin = newOrigin; + Painter::zoom /= zoomFactor; + } - // We only change the tool if a new one was actually selected. Otherwise, we do nothing. - if (newTool != TOOLNone) - { - tool = newTool; +// Object::gridSpacing = gridPixels / Painter::zoom; +// UpdateGridBackground(); + SetGridSize(Object::gridSpacing * Painter::zoom); + update(); +// zoomIndicator->setText(QString("Grid: %1\", BU: Inch").arg(Object::gridSpacing)); +} - if (tool == TOOLScroll || tool == TOOLZoom || tool == TOOLAddPoly - || tool == TOOLDelPoly) - ptHighlight = -1; - if (tool == TOOLAddPoly) - polyFirstPoint = true; - } +void DrawingView::keyPressEvent(QKeyEvent * event) +{ + if (toolAction) + toolAction->KeyDown(event->key()); +} - toolPalette->setVisible(false); - setCursor(cur[tool]); - // Just in case we changed highlighting style with the new tool... - update(); - } - else if (event->button() == Qt::MidButton) - { - setCursor(cur[tool]); // Restore previous cursor - } - else if (event->button() == Qt::LeftButton) - { -// if (tool == TOOLScroll || tool == TOOLZoom) -// ReleaseMouse(); -//this is prolly too much - ((TTEdit *)qApp)->charWnd->MakePathFromPoints(&pts); - ((TTEdit *)qApp)->charWnd->update(); - } - event->accept(); +void DrawingView::keyReleaseEvent(QKeyEvent * event) +{ + if (toolAction) + toolAction->KeyReleased(event->key()); } -#endif +