Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions app/qml/map/MMMapController.qml
Original file line number Diff line number Diff line change
Expand Up @@ -1152,6 +1152,7 @@ Item {
activeFeature: root.state === "edit" ? internal.featurePairToEdit.feature : __inputUtils.emptyFeature()

onCanceled: {
internal.featurePairToEdit = null
root.hideInfoTextMessage()

if ( root.state === "record" )
Expand All @@ -1171,6 +1172,7 @@ Item {
}

onDone: function( featureLayerPair ) {
internal.featurePairToEdit = null
root.hideInfoTextMessage()

if ( root.state === "record" )
Expand Down Expand Up @@ -1226,6 +1228,7 @@ Item {
featureToSplit: internal.featurePairToEdit

onDone: function (success) {
internal.featurePairToEdit = null
// close all feature forms, show banner if it went fine or not
root.hideInfoTextMessage()

Expand All @@ -1245,6 +1248,7 @@ Item {
}

onCanceled: {
internal.featurePairToEdit = null
// go back to feature form
root.hideInfoTextMessage()

Expand Down Expand Up @@ -1285,7 +1289,7 @@ Item {

// visibility of buttons in "more" menu
property bool splitGeometryButtonVisible: !internal.isPointLayer && !root.isStreaming && root.state === "edit"
property bool addPartButtonVisible: internal.isMultiPartLayer && !root.isStreaming && root.state === "edit"
property bool addPartButtonVisible: internal.isMultiPartLayer && !root.isStreaming && isInRecordState
property bool redrawGeometryButtonVisible: root.state === "edit"
property bool streamingModeButtonVisible: !internal.isPointLayer || internal.isMultiPartLayer

Expand Down Expand Up @@ -1352,10 +1356,13 @@ Item {
}

function addPart( featurepair) {
__activeProject.setActiveLayer( featurepair.layer )
if ( featurepair )
{
__activeProject.setActiveLayer( featurepair.layer )
internal.featurePairToEdit = featurepair
}
root.showInfoTextMessage( qsTr( "Add new part to the geometry" ) )

internal.featurePairToEdit = featurepair

// You should be already in state == "edit"
if ( recordingToolsLoader.active ) {
Expand Down
Loading