Polygon Editing Tools Improvements #1674

ketanhwr · 2017-08-03T15:03:00Z

The opacity for preview edge is (1/3)rd of the fixed edges. Here's a screenshot:

ketanhwr · 2017-08-04T06:16:43Z

I've also added an option to extend a polyline (#157). Here's a gif for demonstration:

Ablu · 2017-08-04T06:24:40Z

src/tiled/editpolygontool.cpp

+
+    if (mapObject->shape() == MapObject::Polyline) {
+        QAction *extendPolyline = menu.addAction(tr("Extend Polyline"));
+        extendPolyline->setEnabled(n == 1 && firstHandle->pointIndex() == mapObject->polygon().size() - 1);


I found this boolean expression a bit hard to read... Maybe passing it into a variable could help here (would also shorten the line a bit). But that might be personal taste...

ketanhwr · 2017-08-04T20:13:46Z

Now, the user can extend a polyline from both the first point and the end point. Also, the user can use right click to cancel extending the polyline.

ketanhwr · 2017-08-05T11:20:37Z

While 'Extending' a polyline, the user can now choose to close it as well (Basically convert it into a polygon). (#404)

ketanhwr · 2017-08-05T12:15:33Z

When the user selects two nodes on a polygon which are side-by-side, then the user can delete that edge which will convert that polygon into a polyline.

ketanhwr · 2017-08-05T12:22:25Z

Conversion between Polygon/Polyline is shown in the gif here 🙂

ketanhwr · 2017-08-06T07:05:47Z

My previous commit closes #1555. Delete key now deletes the selected nodes. If no nodes are selected, then the object is deleted which was previously the standard action.

Ablu · 2017-08-06T08:47:31Z

Looks nice already

Maybe ESC should cancel the extension process too (not only right click).
And I find it a bit weird that during closing a polyline, the polygon preview is displayed without snapping the previewed point to the starting point.

Ablu · 2017-08-06T08:57:43Z

src/tiled/editpolygontool.cpp

+
+    QPolygonF polygon = mapObject->polygon();
+
+    if ((polygon.last() - polygon.first()).manhattanLength() < QApplication::startDragDistance() * 1.0)


Maybe introduce a variable for the left side of the < here, to keep the line shorter?

Ablu · 2017-08-06T08:58:14Z

src/tiled/editpolygontool.cpp

+    QPolygonF polygon = mapObject->polygon();
+
+    if ((polygon.last() - polygon.first()).manhattanLength() < QApplication::startDragDistance() * 1.0) {
+


unneeded empty line

Ablu

left some quick comments

Ablu · 2017-08-06T09:01:03Z

src/tiled/editpolygontool.cpp

+    if (mapObject->shape() == MapObject::Polyline) {
+        QAction *extendPolyline = menu.addAction(tr("Extend Polyline"));
+
+        bool indexCheck = (firstHandle->pointIndex() == mapObject->polygon().size() - 1) ||


I find the name indexCheck a bit weird... Maybe handleCanBeExtended?

Ablu · 2017-08-06T09:06:38Z

src/tiled/mapeditor.cpp

@@ -479,7 +480,10 @@ void MapEditor::performStandardAction(StandardAction action)
        paste(ClipboardManager::PasteInPlace);
        break;
    case DeleteAction:
-        MapDocumentActionHandler::instance()->delete_();
+        if (mEditPolygonTool->countSelectedHandles())


I personally do not like these implicit > 0 checks on integer values in this context. I usually prefer to write > 0 here. But not sure what @bjorn. Thinks here...

Well, I think, since this is really checking if there are any selected handles, it should be:

if (mEditPolygonTool->hasSelectedHandles())

And

bool hasSelectedHandles() const { return !mSelectedHandles.isEmpty(); }

bjorn

Just two points of feedback, didn't get around to a full review yet.

bjorn · 2017-08-06T09:14:27Z

src/tiled/mapeditor.cpp

@@ -479,7 +480,10 @@ void MapEditor::performStandardAction(StandardAction action)
        paste(ClipboardManager::PasteInPlace);
        break;
    case DeleteAction:
-        MapDocumentActionHandler::instance()->delete_();
+        if (mEditPolygonTool->countSelectedHandles())


Well, I think, since this is really checking if there are any selected handles, it should be:

if (mEditPolygonTool->hasSelectedHandles())

And

bool hasSelectedHandles() const { return !mSelectedHandles.isEmpty(); }

bjorn · 2017-08-06T09:16:19Z

src/libtiled/isometricrenderer.cpp

@@ -441,22 +441,52 @@ void IsometricRenderer::drawMapObject(QPainter *painter,
            const QPolygonF polygon = object->polygon().translated(pos);
            QPolygonF screenPolygon = pixelToScreenCoords(polygon);

+            if (screenPolygon.size() == 1)
+                screenPolygon.push_back(screenPolygon[0]);


Please prefer to use the Qt-style members instead of those provided for STL compatibility, so append instead of push_back and removeLast / removeFirst instead of pop_back / pop_front.

bjorn · 2017-08-06T12:27:21Z

In general, I think this pull request is too much of a collection of different issues. It would really help if separate pull requests were opened for things that aren't directly related to each other.

ketanhwr · 2017-08-06T16:26:15Z

In general, I think this pull request is too much of a collection of different issues. It would really help if separate pull requests were opened for things that aren't directly related to each other.

So should I close this PR, and open separate PRs for different issues? :|

bjorn · 2017-08-06T16:53:30Z

So should I close this PR, and open separate PRs for different issues? :|

I'd say keep this one for "reduced opacity of last edge" and "add option to extend polyline" (including from first node and right-click to cancel). And create separate PRs for:

Added action to delete polygon edge
Added option to close a polyline
Delete key now deletes selected nodes

Unless inter-dependent code makes this very difficult.

Extending can be started from both first point and last point. Escape and Delete Key can be used to cancel the extending.

) Need to select two consecutive nodes in a polygon to delete an edge.

bjorn

Don't forget to initialize mComplete and mLastEdgeIncomplete.

In trying this out, I'm not convinced that rendering the new edge at lower opacity is currently helpful. All it does for me is to make it less visible.

Regarding the extending of the polyline, I'm wondering why it works only for a single segment. After extending by one segment, I think it should automatically allow me to extend with another segment, until I decide to press Enter or right-click, like it is when creating a new polyline.

Also, if we snap to the other end of the polyline to create a polygon, then I'd expect this snapping to be also available when creating a new polyline. Essentially implementing both parts of issue #404.

In general, I still think all these enhancements are quite independent and it would be better to do it as separate pull requests. It's easier to provide targeted feedback that way and some parts could be merged, like the handling of the Delete key.

bjorn · 2017-08-10T10:00:16Z

src/tiled/editpolygontool.cpp

+    QPolygonF polygon = mapObject->polygon();
+    qreal distance = (polygon.last() - polygon.first()).manhattanLength();
+
+    if (distance < QApplication::startDragDistance() * 1.0)


What's the point of multiplying by 1.0?

Also, distance should be measured in screen pixels. Unfortunately, there is no way to determine the screen coordinates for a polygon point without a reference to the MapView, but for now we should at least use renderer->pixelToScreenCoords.

Finally, when the snapping triggers, it should change pixelCoords to match the point to which it was snapped.

bjorn · 2017-08-10T10:01:53Z

src/tiled/editpolygontool.cpp

@@ -566,6 +598,92 @@ void EditPolygonTool::updateMovingItems(const QPointF &pos,
    }
 }

+void EditPolygonTool::addNode(const QPointF &pos,


The name addNode does not seem to reflect what this function is doing.

bjorn · 2017-08-10T12:30:11Z

src/tiled/editpolygontool.cpp

+
+    QPolygonF polygon = mapObject->polygon();
+
+    if (mapObject->shape() == MapObject::Polygon)


There is no point in this check, is there?

ketanhwr · 2017-08-10T19:00:54Z

Also, if we snap to the other end of the polyline to create a polygon, then I'd expect this snapping to be also available when creating a new polyline. Essentially implementing both parts of issue #404.

So basically, merge both the tools into a single tool ?

ketanhwr · 2017-08-10T19:03:04Z

In general, I still think all these enhancements are quite independent and it would be better to do it as separate pull requests. It's easier to provide targeted feedback that way and some parts could be merged, like the handling of the Delete key.

Alright, then I'll close the current pull request.

ketanhwr changed the title ~~Preview last edge while creating polyline~~ Polygon Editing Tools Improvements Aug 4, 2017

Ablu reviewed Aug 4, 2017

View reviewed changes

Ablu reviewed Aug 6, 2017

View reviewed changes

ketanhwr force-pushed the polygon branch from f4c2cd8 to 1d7db54 Compare August 6, 2017 09:03

Ablu reviewed Aug 6, 2017

View reviewed changes

bjorn requested changes Aug 6, 2017

View reviewed changes

ketanhwr added 4 commits August 6, 2017 22:43

Reduced opacity of last edge while creating polyline

01af27d

Adds option to Extend Polyline (mapeditor#157)

4653e88

Extending can be started from both first point and last point. Escape and Delete Key can be used to cancel the extending.

Adds option to close Polyline into Polygon and vice versa (mapeditor#404

ce11460

) Need to select two consecutive nodes in a polygon to delete an edge.

Delete key deletes selected nodes (mapeditor#1555)

d402815

ketanhwr force-pushed the polygon branch from 1d7db54 to d402815 Compare August 6, 2017 17:16

bjorn requested changes Aug 10, 2017

View reviewed changes

ketanhwr closed this Aug 10, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Polygon Editing Tools Improvements #1674

Polygon Editing Tools Improvements #1674

ketanhwr commented Aug 3, 2017

ketanhwr commented Aug 4, 2017

Ablu Aug 4, 2017

ketanhwr commented Aug 4, 2017

ketanhwr commented Aug 5, 2017 •

edited

Loading

ketanhwr commented Aug 5, 2017

ketanhwr commented Aug 5, 2017 •

edited

Loading

ketanhwr commented Aug 6, 2017

Ablu commented Aug 6, 2017

Ablu Aug 6, 2017

Ablu Aug 6, 2017

Ablu left a comment

Ablu Aug 6, 2017

Ablu Aug 6, 2017

bjorn Aug 6, 2017

bjorn left a comment

bjorn Aug 6, 2017

bjorn Aug 6, 2017

bjorn commented Aug 6, 2017

ketanhwr commented Aug 6, 2017

bjorn commented Aug 6, 2017

bjorn left a comment

bjorn Aug 10, 2017

bjorn Aug 10, 2017

bjorn Aug 10, 2017

ketanhwr commented Aug 10, 2017

ketanhwr commented Aug 10, 2017


		QPolygonF polygon = mapObject->polygon();

		if ((polygon.last() - polygon.first()).manhattanLength() < QApplication::startDragDistance() * 1.0)


		QPolygonF polygon = mapObject->polygon();

		if (mapObject->shape() == MapObject::Polygon)

Polygon Editing Tools Improvements #1674

Polygon Editing Tools Improvements #1674

Conversation

ketanhwr commented Aug 3, 2017

ketanhwr commented Aug 4, 2017

Choose a reason for hiding this comment

ketanhwr commented Aug 4, 2017

ketanhwr commented Aug 5, 2017 • edited Loading

ketanhwr commented Aug 5, 2017

ketanhwr commented Aug 5, 2017 • edited Loading

ketanhwr commented Aug 6, 2017

Ablu commented Aug 6, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Ablu left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bjorn left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bjorn commented Aug 6, 2017

ketanhwr commented Aug 6, 2017

bjorn commented Aug 6, 2017

bjorn left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ketanhwr commented Aug 10, 2017

ketanhwr commented Aug 10, 2017

ketanhwr commented Aug 5, 2017 •

edited

Loading

ketanhwr commented Aug 5, 2017 •

edited

Loading