Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix selection rectangle disappearing #949

Merged
merged 1 commit into from Apr 23, 2018
Merged

Fix selection rectangle disappearing #949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
50 changes: 50 additions & 0 deletions core_lib/src/interface/scribblearea.cpp
View file
Open in desktop
Expand Up @@ -1444,6 +1444,56 @@ void ScribbleArea::setSelection(QRectF rect, bool trueOrFalse)
// displaySelectionProperties();
}

/**
* @brief ScribbleArea::manageSelectionOrigin
* switches anchor point when crossing threshold
*/
void ScribbleArea::manageSelectionOrigin(QPointF currentPoint, QPointF originPoint)
{
int mouseX = currentPoint.x();
int mouseY = currentPoint.y();

QRectF selectRect;
if (currentTool()->type() == ToolType::SELECT) {
selectRect = mySelection;
}
else // MOVE
{
selectRect = myTempTransformedSelection;
}

if (mouseX <= originPoint.x())
{
selectRect.setLeft(mouseX);
selectRect.setRight(originPoint.x());
}
else
{
selectRect.setLeft(originPoint.x());
selectRect.setRight(mouseX);
}

if (mouseY <= originPoint.y())
{
selectRect.setTop(mouseY);
selectRect.setBottom(originPoint.y());
}
else
{
selectRect.setTop(originPoint.y());
selectRect.setBottom(mouseY);
}

if (currentTool()->type() == ToolType::SELECT) {
mySelection = selectRect;
}
else // MOVE
{
myTempTransformedSelection = selectRect;
}

}

void ScribbleArea::displaySelectionProperties()
{
Layer* layer = mEditor->layers()->currentLayer();
Expand Down
2 changes: 2 additions & 0 deletions core_lib/src/interface/scribblearea.h
View file
Open in desktop
Expand Up @@ -121,6 +121,8 @@ class ScribbleArea : public QWidget

bool isMouseInUse() { return mMouseInUse; }

void manageSelectionOrigin(QPointF currentPoint, QPointF originPoint);

signals:
void modification( int );
void multiLayerOnionSkinChanged( bool );
Expand Down
27 changes: 24 additions & 3 deletions core_lib/src/tool/movetool.cpp
View file
Open in desktop
Expand Up @@ -148,6 +148,8 @@ void MoveTool::pressOperation(QMouseEvent* event, Layer* layer)

mScribbleArea->setSelection(mScribbleArea->myTransformedSelection, true);
resetSelectionProperties();
} else {
anchorOriginPoint = getLastPoint();
}

if (mScribbleArea->getMoveMode() == ScribbleArea::MIDDLE)
Expand Down Expand Up @@ -216,18 +218,22 @@ void MoveTool::whichTransformationPoint()
if (QLineF(getLastPoint(), transformPoint.topLeft()).length() < 10)
{
mScribbleArea->setMoveMode(ScribbleArea::TOPLEFT);
anchorOriginPoint = mScribbleArea->mySelection.bottomRight();
}
if (QLineF(getLastPoint(), transformPoint.topRight()).length() < 10)
{
mScribbleArea->setMoveMode(ScribbleArea::TOPRIGHT);
anchorOriginPoint = mScribbleArea->mySelection.bottomLeft();
}
if (QLineF(getLastPoint(), transformPoint.bottomLeft()).length() < 10)
{
mScribbleArea->setMoveMode(ScribbleArea::BOTTOMLEFT);
anchorOriginPoint = mScribbleArea->mySelection.topRight();
}
if (QLineF(getLastPoint(), transformPoint.bottomRight()).length() < 10)
{
mScribbleArea->setMoveMode(ScribbleArea::BOTTOMRIGHT);
anchorOriginPoint = mScribbleArea->mySelection.topLeft();
}
}

Expand All @@ -244,30 +250,45 @@ void MoveTool::transformSelection(qreal offsetX, qreal offsetY)
break;

case ScribbleArea::TOPRIGHT:
{
mScribbleArea->myTempTransformedSelection =
mScribbleArea->myTransformedSelection.adjusted(0, offsetY, offsetX, 0);
break;

mScribbleArea->manageSelectionOrigin(getCurrentPoint(), anchorOriginPoint);
break;
}
case ScribbleArea::TOPLEFT:
{
mScribbleArea->myTempTransformedSelection =
mScribbleArea->myTransformedSelection.adjusted(offsetX, offsetY, 0, 0);
break;

mScribbleArea->manageSelectionOrigin(getCurrentPoint(), anchorOriginPoint);
break;
}
case ScribbleArea::BOTTOMLEFT:
{
mScribbleArea->myTempTransformedSelection =
mScribbleArea->myTransformedSelection.adjusted(offsetX, 0, 0, offsetY);
break;

mScribbleArea->manageSelectionOrigin(getCurrentPoint(), anchorOriginPoint);
break;
}
case ScribbleArea::BOTTOMRIGHT:
{
mScribbleArea->myTempTransformedSelection =
mScribbleArea->myTransformedSelection.adjusted(0, 0, offsetX, offsetY);

mScribbleArea->manageSelectionOrigin(getCurrentPoint(), anchorOriginPoint);
break;

}
case ScribbleArea::ROTATION:
{
mScribbleArea->myTempTransformedSelection =
mScribbleArea->myTransformedSelection; // @ necessary?
mScribbleArea->myRotatedAngle = getCurrentPixel().x() - getLastPressPixel().x();
break;
}
default:
break;
}
Expand Down
2 changes: 2 additions & 0 deletions core_lib/src/tool/movetool.h
View file
Open in desktop
Expand Up @@ -49,6 +49,8 @@ class MoveTool : public BaseTool
void actionOnVector(QMouseEvent *event, Layer *layer);
void storeClosestVectorCurve();
QPointF maintainAspectRatio(qreal offsetX, qreal offsetY);

QPointF anchorOriginPoint;
};

#endif
84 changes: 18 additions & 66 deletions core_lib/src/tool/selecttool.cpp
View file
Open in desktop
Expand Up @@ -25,11 +25,6 @@ GNU General Public License for more details.
#include "layermanager.h"
#include "toolmanager.h"


// Store selection origin so we can calculate
// the selection rectangle in mousePressEvent.
static QPointF gSelectionOrigin;

SelectTool::SelectTool(QObject* parent) :
BaseTool(parent)
{
Expand Down Expand Up @@ -57,13 +52,16 @@ void SelectTool::mousePressEvent(QMouseEvent* event)

if (event->button() == Qt::LeftButton)
{
gSelectionOrigin = getLastPoint(); // Store original click position for help with selection rectangle.
if (!mScribbleArea->somethingSelected)
{
anchorOriginPoint = getLastPoint(); // Store original click position for help with selection rectangle.
}

if (layer->type() == Layer::BITMAP || layer->type() == Layer::VECTOR)
if (layer->isPaintable())
{
if (layer->type() == Layer::VECTOR)
{
((LayerVector*)layer)->getLastVectorImageAtFrame(mEditor->currentFrame(), 0)->deselectAll();
static_cast<LayerVector*>(layer)->getLastVectorImageAtFrame(mEditor->currentFrame(), 0)->deselectAll();
}
mScribbleArea->setMoveMode(ScribbleArea::NONE);

Expand All @@ -72,18 +70,22 @@ void SelectTool::mousePressEvent(QMouseEvent* event)
if (BezierCurve::mLength(getLastPoint() - mScribbleArea->myTransformedSelection.topLeft()) < 6)
{
mScribbleArea->setMoveMode(ScribbleArea::TOPLEFT);
anchorOriginPoint = mScribbleArea->mySelection.bottomRight();
}
if (BezierCurve::mLength(getLastPoint() - mScribbleArea->myTransformedSelection.topRight()) < 6)
{
mScribbleArea->setMoveMode(ScribbleArea::TOPRIGHT);
anchorOriginPoint = mScribbleArea->mySelection.bottomLeft();
}
if (BezierCurve::mLength(getLastPoint() - mScribbleArea->myTransformedSelection.bottomLeft()) < 6)
{
mScribbleArea->setMoveMode(ScribbleArea::BOTTOMLEFT);
anchorOriginPoint = mScribbleArea->mySelection.topRight();
}
if (BezierCurve::mLength(getLastPoint() - mScribbleArea->myTransformedSelection.bottomRight()) < 6)
{
mScribbleArea->setMoveMode(ScribbleArea::BOTTOMRIGHT);
anchorOriginPoint = mScribbleArea->mySelection.topLeft();
}

// the user did not click on one of the corners
Expand Down Expand Up @@ -121,7 +123,7 @@ void SelectTool::mouseReleaseEvent(QMouseEvent* event)
{
mEditor->tools()->setCurrentTool(MOVE);

VectorImage* vectorImage = ((LayerVector*)layer)->getLastVectorImageAtFrame(mEditor->currentFrame(), 0);
VectorImage* vectorImage = static_cast<LayerVector*>(layer)->getLastVectorImageAtFrame(mEditor->currentFrame(), 0);
mScribbleArea->setSelection(vectorImage->getSelectionRect(), true);
if (mScribbleArea->mySelection.width() <= 0 && mScribbleArea->mySelection.height() <= 0)
{
Expand All @@ -147,70 +149,20 @@ void SelectTool::mouseMoveEvent(QMouseEvent* event)
Layer* layer = mEditor->layers()->currentLayer();
if (layer == NULL) { return; }

if ((event->buttons() & Qt::LeftButton) && mScribbleArea->somethingSelected && (layer->type() == Layer::BITMAP || layer->type() == Layer::VECTOR))
if ((event->buttons() & Qt::LeftButton) &&
mScribbleArea->somethingSelected &&
layer->isPaintable())
{
switch (mScribbleArea->getMoveMode())
{
case ScribbleArea::NONE:
{
// Resize the selection rectangle so it goes from the origin point
// (i.e. where the mouse was clicked) to the current mouse
// position.
int mouseX = getCurrentPoint().x();
int mouseY = getCurrentPoint().y();
QRectF& selectRect = mScribbleArea->mySelection;

if (mouseX < gSelectionOrigin.x())
{
selectRect.setLeft(mouseX);
selectRect.setRight(gSelectionOrigin.x());
}
else
{
selectRect.setLeft(gSelectionOrigin.x());
selectRect.setRight(mouseX);
}

if (mouseY < gSelectionOrigin.y())
{
selectRect.setTop(mouseY);
selectRect.setBottom(gSelectionOrigin.y());
}
else
{
selectRect.setTop(gSelectionOrigin.y());
selectRect.setBottom(mouseY);
}

break;
}

case ScribbleArea::TOPLEFT:
mScribbleArea->mySelection.setTopLeft(getCurrentPoint());
break;

case ScribbleArea::TOPRIGHT:
mScribbleArea->mySelection.setTopRight(getCurrentPoint());
break;

case ScribbleArea::BOTTOMLEFT:
mScribbleArea->mySelection.setBottomLeft(getCurrentPoint());
break;

case ScribbleArea::BOTTOMRIGHT:
mScribbleArea->mySelection.setBottomRight(getCurrentPoint());
break;

default:
break;
}
mScribbleArea->manageSelectionOrigin(getCurrentPoint(), anchorOriginPoint);

mScribbleArea->myTransformedSelection = mScribbleArea->mySelection.adjusted(0, 0, 0, 0);
mScribbleArea->myTempTransformedSelection = mScribbleArea->mySelection.adjusted(0, 0, 0, 0);

if (layer->type() == Layer::VECTOR)
{
((LayerVector*)layer)->getLastVectorImageAtFrame(mEditor->currentFrame(), 0)->select(mScribbleArea->mySelection);
static_cast<LayerVector*>(layer)->
getLastVectorImageAtFrame(mEditor->currentFrame(), 0)->
select(mScribbleArea->mySelection);
}
mScribbleArea->update();
}
Expand Down
5 changes: 5 additions & 0 deletions core_lib/src/tool/selecttool.h
View file
Open in desktop
Expand Up @@ -36,6 +36,11 @@ class SelectTool : public BaseTool
void mouseMoveEvent(QMouseEvent*) override;

bool keyPressEvent(QKeyEvent *event) override;


// Store selection origin so we can calculate
// the selection rectangle in mousePressEvent.
QPointF anchorOriginPoint;
};

#endif