X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdrawingview.cpp;h=3baa2d77eed71712dd168fa79ff6ddb73e016faa;hb=d9f34cb7917e396a1df805687234d5473d82283b;hp=2e435d26fe0456a743a8256eef0ded1df12864e0;hpb=92b64dc831492f1d6311a8baece66408f7659f67;p=architektonas diff --git a/src/drawingview.cpp b/src/drawingview.cpp index 2e435d2..3baa2d7 100644 --- a/src/drawingview.cpp +++ b/src/drawingview.cpp @@ -809,8 +809,9 @@ void DrawingView::ToolHandler(int mode, Point p) void DrawingView::ToolDraw(Painter * painter) { - if (Global::tool == TTLine) + switch (Global::tool) { + case TTLine: if (Global::toolState == TSNone) { painter->DrawHandle(toolPoint[0]); @@ -830,9 +831,10 @@ void DrawingView::ToolDraw(Painter * painter) QString text = tr("Length: %1 in.\n") + QChar(0x2221) + tr(": %2"); informativeText = text.arg(absLength).arg(absAngle); } - } - else if (Global::tool == TTCircle) - { + + break; + + case TTCircle: if (Global::toolState == TSNone) { painter->DrawHandle(toolPoint[0]); @@ -850,9 +852,10 @@ void DrawingView::ToolDraw(Painter * painter) QString text = tr("Radius: %1 in."); informativeText = text.arg(length); } - } - else if (Global::tool == TTArc) - { + + break; + + case TTArc: if (Global::toolState == TSNone) { painter->DrawHandle(toolPoint[0]); @@ -894,9 +897,10 @@ void DrawingView::ToolDraw(Painter * painter) QString text = tr("Arc span: %1") + QChar(0x00B0); informativeText = text.arg(RADIANS_TO_DEGREES * span); } - } - else if (Global::tool == TTRotate) - { + + break; + + case TTRotate: if ((Global::toolState == TSNone) || (Global::toolState == TSPoint1)) painter->DrawHandle(toolPoint[0]); else if ((Global::toolState == TSPoint2) && shiftDown) @@ -915,9 +919,10 @@ void DrawingView::ToolDraw(Painter * painter) if (ctrlDown) informativeText += " (Copy)"; } - } - else if (Global::tool == TTMirror) - { + + break; + + case TTMirror: if ((Global::toolState == TSNone) || (Global::toolState == TSPoint1)) painter->DrawHandle(toolPoint[0]); else if ((Global::toolState == TSPoint2) && shiftDown) @@ -941,9 +946,10 @@ void DrawingView::ToolDraw(Painter * painter) if (ctrlDown) informativeText += " (Copy)"; } - } - else if (Global::tool == TTDimension) - { + + break; + + case TTDimension: if (Global::toolState == TSNone) { painter->DrawHandle(toolPoint[0]); @@ -963,9 +969,10 @@ void DrawingView::ToolDraw(Painter * painter) QString text = tr("Length: %1 in.\n") + QChar(0x2221) + tr(": %2"); informativeText = text.arg(absLength).arg(absAngle); } - } - else if (Global::tool == TTTrim) - { + + break; + + case TTTrim: if (toolObj[0] != NULL) { // We're assuming ATM it's just a line... @@ -974,9 +981,10 @@ void DrawingView::ToolDraw(Painter * painter) // QString text = tr("Arc span: %1") + QChar(0x00B0); // informativeText = text.arg(RADIANS_TO_DEGREES * span); } - } - else if (Global::tool == TTParallel) - { + + break; + + case TTParallel: if (Global::toolState == TSPoint1) { painter->SetPen(0xFF00FF, 2.0, LSSolid); @@ -1005,6 +1013,11 @@ void DrawingView::ToolDraw(Painter * painter) } } } + + break; + + default: + break; } } @@ -2626,6 +2639,10 @@ bool DrawingView::HitTest(Object * obj, Point point) { bool needUpdate = false; + // Make sure we don't hit test stuff on an invisible layer... + if (Global::layerHidden[obj->layer] == true) + return false; + switch (obj->type) { case OTLine: