razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Merge pull request #2809 from manongjohn/improve_vector_stroke_selection

Browse source 
Improve vector stroke selection
This commit is contained in:
Rodney 2019-10-17 19:34:53 -05:00 committed by GitHub
commit db6b5f45a9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
toonz/sources/tnztools/vectorselectiontool.cpp
View file

@ -94,13 +94,21 @@ FourPoints getFourPointsFromVectorImage(const TVectorImageP &img,
//-----------------------------------------------------------------------------
bool getStrokeIndexFromPos(UINT &index, const TVectorImageP &vi,
const TPointD &pos, double pixelSize) {
const TPointD &pos, double pixelSize, TAffine aff) {
if (!vi) return false;
double t, dist2 = 0;
double maxDist = 5 * pixelSize;
double maxDist2 = maxDist * maxDist;
vi->getNearestStroke(pos, t, index, dist2);
return (dist2 < maxDist2 * 4);
double maxDist = 5 * pixelSize;
double maxDist2 = maxDist * maxDist;
double checkDist = maxDist2 * 4;
if (vi->getNearestStroke(pos, t, index, dist2)) {
TStroke *strokeRef = vi->getStroke(index);
TThickPoint cursor = strokeRef->getThickPoint(t);
double len = cursor.thick * pixelSize * sqrt(aff.det());
checkDist = std::max(checkDist, (len * len));
}
return (dist2 < checkDist);
}
//-----------------------------------------------------------------------------
@ -1448,9 +1456,10 @@ void VectorSelectionTool::modifySelectionOnClick(TImageP image,
UINT index = 0;
bool modifiableSel = isModifiableSelectionType(),
strokeAtPos = getStrokeIndexFromPos(index, vi, pos, getPixelSize()),
addStroke = strokeAtPos && !m_strokeSelection.isSelected(index),
toggleStroke = strokeAtPos && e.isShiftPressed();
strokeAtPos = getStrokeIndexFromPos(index, vi, pos, getPixelSize(),
getViewer()->getViewMatrix()),
addStroke = strokeAtPos && !m_strokeSelection.isSelected(index),
toggleStroke = strokeAtPos && e.isShiftPressed();
m_selecting =
(modifiableSel && !strokeAtPos // There must be no stroke under cursor
@ -2155,7 +2164,8 @@ void VectorSelectionTool::updateAction(TPointD pos, const TMouseEvent &e) {
if ((isLevelType() &&
bbox.contains(pos)) // What about isSelectedFramesType()??
|| (getStrokeIndexFromPos(index, vi, pos, getPixelSize()) &&
|| (getStrokeIndexFromPos(index, vi, pos, getPixelSize(),
getViewer()->getViewMatrix()) &&
m_strokeSelection.isSelected(index))) {
m_what = Inside;
m_cursorId =