Skip to content

Commit 5256e57

Browse files
author
timlinux
committed
[FEATURE] (well its an un-feature really but doc team may want to note this. The add, move and delete vertex buttons are now removed and the node tool is moved from the advanced editing toolbar to the standard editing toolbar. The node tool replaces the functionality of the three removed items
git-svn-id: http://svn.osgeo.org/qgis/trunk@12072 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent fe1fb1c commit 5256e57

File tree

3 files changed

+57
-39
lines changed

3 files changed

+57
-39
lines changed

‎src/app/qgisapp.cpp‎

Lines changed: 47 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -488,9 +488,10 @@ QgisApp::~QgisApp()
488488
delete mMapTools.mReshapeFeatures;
489489
delete mMapTools.mSplitFeatures;
490490
delete mMapTools.mSelect;
491-
delete mMapTools.mVertexAdd;
492-
delete mMapTools.mVertexMove;
493-
delete mMapTools.mVertexDelete;
491+
//these three tools to be deprecated - use node tool rather
492+
//delete mMapTools.mVertexAdd;
493+
//delete mMapTools.mVertexMove;
494+
//delete mMapTools.mVertexDelete;
494495
delete mMapTools.mAddRing;
495496
delete mMapTools.mSimplifyFeature;
496497
delete mMapTools.mDeleteRing;
@@ -693,6 +694,8 @@ void QgisApp::createActions()
693694
connect( mActionDeleteSelected, SIGNAL( triggered() ), this, SLOT( deleteSelected() ) );
694695
mActionDeleteSelected->setEnabled( false );
695696

697+
//these three tools to be deprecated - use node tool rather
698+
/**
696699
mActionAddVertex = new QAction( getThemeIcon( "mActionAddVertex.png" ), tr( "Add Vertex" ), this );
697700
shortcuts->registerAction( mActionAddVertex );
698701
mActionAddVertex->setStatusTip( tr( "Add Vertex" ) );
@@ -710,6 +713,7 @@ void QgisApp::createActions()
710713
mActionDeleteVertex->setStatusTip( tr( "Delete Vertex" ) );
711714
connect( mActionDeleteVertex, SIGNAL( triggered() ), this, SLOT( deleteVertex() ) );
712715
mActionDeleteVertex->setEnabled( false );
716+
*/
713717

714718
mActionAddRing = new QAction( getThemeIcon( "mActionAddRing.png" ), tr( "Add Ring" ), this );
715719
shortcuts->registerAction( mActionAddRing );
@@ -1094,12 +1098,15 @@ void QgisApp::createActionGroups()
10941098
mActionSplitFeatures->setCheckable( true );
10951099
mMapToolGroup->addAction( mActionSplitFeatures );
10961100
mMapToolGroup->addAction( mActionDeleteSelected );
1101+
//these three tools are deprecated - use node tool rather
1102+
/**
10971103
mActionAddVertex->setCheckable( true );
10981104
mMapToolGroup->addAction( mActionAddVertex );
10991105
mActionDeleteVertex->setCheckable( true );
11001106
mMapToolGroup->addAction( mActionDeleteVertex );
11011107
mActionMoveVertex->setCheckable( true );
11021108
mMapToolGroup->addAction( mActionMoveVertex );
1109+
*/
11031110
mActionAddRing->setCheckable( true );
11041111
mMapToolGroup->addAction( mActionAddRing );
11051112
mActionAddIsland->setCheckable( true );
@@ -1195,9 +1202,10 @@ void QgisApp::createMenus()
11951202
mEditMenu->addAction( mActionCapturePolygon );
11961203
mEditMenu->addAction( mActionMoveFeature );
11971204
mEditMenu->addAction( mActionDeleteSelected );
1198-
mEditMenu->addAction( mActionAddVertex );
1199-
mEditMenu->addAction( mActionMoveVertex );
1200-
mEditMenu->addAction( mActionDeleteVertex );
1205+
//these three tools are deprecated - use node tool rather
1206+
//mEditMenu->addAction( mActionAddVertex );
1207+
//mEditMenu->addAction( mActionMoveVertex );
1208+
//mEditMenu->addAction( mActionDeleteVertex );
12011209

12021210
mActionEditSeparator2 = mEditMenu->addSeparator();
12031211

@@ -1397,9 +1405,11 @@ void QgisApp::createToolBars()
13971405
mDigitizeToolBar->addAction( mActionCaptureLine );
13981406
mDigitizeToolBar->addAction( mActionCapturePolygon );
13991407
mDigitizeToolBar->addAction( mActionMoveFeature );
1400-
mDigitizeToolBar->addAction( mActionMoveVertex );
1401-
mDigitizeToolBar->addAction( mActionAddVertex );
1402-
mDigitizeToolBar->addAction( mActionDeleteVertex );
1408+
mDigitizeToolBar->addAction( mActionNodeTool );
1409+
//these three tools are deprecated - use node tool rather
1410+
//mDigitizeToolBar->addAction( mActionMoveVertex );
1411+
//mDigitizeToolBar->addAction( mActionAddVertex );
1412+
//mDigitizeToolBar->addAction( mActionDeleteVertex );
14031413
mDigitizeToolBar->addAction( mActionDeleteSelected );
14041414
mDigitizeToolBar->addAction( mActionCutFeatures );
14051415
mDigitizeToolBar->addAction( mActionCopyFeatures );
@@ -1419,7 +1429,6 @@ void QgisApp::createToolBars()
14191429
mAdvancedDigitizeToolBar->addAction( mActionReshapeFeatures );
14201430
mAdvancedDigitizeToolBar->addAction( mActionSplitFeatures );
14211431
mAdvancedDigitizeToolBar->addAction( mActionMergeFeatures );
1422-
mAdvancedDigitizeToolBar->addAction( mActionNodeTool );
14231432
mAdvancedDigitizeToolBar->addAction( mActionRotatePointSymbols );
14241433
mToolbarMenu->addAction( mAdvancedDigitizeToolBar->toggleViewAction() );
14251434

@@ -1664,9 +1673,11 @@ void QgisApp::setTheme( QString theThemeName )
16641673
mActionReshapeFeatures->setIcon( getThemeIcon( "/mActionReshape.png" ) );
16651674
mActionSplitFeatures->setIcon( getThemeIcon( "/mActionSplitFeatures.png" ) );
16661675
mActionDeleteSelected->setIcon( getThemeIcon( "/mActionDeleteSelected.png" ) );
1667-
mActionAddVertex->setIcon( getThemeIcon( "/mActionAddVertex.png" ) );
1668-
mActionMoveVertex->setIcon( getThemeIcon( "/mActionMoveVertex.png" ) );
1669-
mActionDeleteVertex->setIcon( getThemeIcon( "/mActionDeleteVertex.png" ) );
1676+
//these three icons to be deprecated
1677+
//mActionAddVertex->setIcon( getThemeIcon( "/mActionAddVertex.png" ) );
1678+
//mActionMoveVertex->setIcon( getThemeIcon( "/mActionMoveVertex.png" ) );
1679+
//mActionDeleteVertex->setIcon( getThemeIcon( "/mActionDeleteVertex.png" ) );
1680+
mActionNodeTool->setIcon( getThemeIcon( "/mActionNodeTool.png" ) );
16701681
mActionSimplifyFeature->setIcon( getThemeIcon( "/mActionSimplify.png" ) );
16711682
mActionUndo->setIcon( getThemeIcon( "/mActionUndo.png" ) );
16721683
mActionRedo->setIcon( getThemeIcon( "/mActionRedo.png" ) );
@@ -1676,7 +1687,6 @@ void QgisApp::setTheme( QString theThemeName )
16761687
mActionDeletePart->setIcon( getThemeIcon( "/mActionDeletePart.png" ) );
16771688
mActionMergeFeatures->setIcon( getThemeIcon( "/mActionMergeFeatures.png" ) );
16781689
mActionRotatePointSymbols->setIcon( getThemeIcon( "mActionRotatePointSymbols.png" ) );
1679-
mActionNodeTool->setIcon( getThemeIcon( "/mActionNodeTool.png" ) );
16801690
mActionZoomIn->setIcon( getThemeIcon( "/mActionZoomIn.png" ) );
16811691
mActionZoomOut->setIcon( getThemeIcon( "/mActionZoomOut.png" ) );
16821692
mActionZoomFullExtent->setIcon( getThemeIcon( "/mActionZoomFullExtent.png" ) );
@@ -1798,12 +1808,13 @@ void QgisApp::createCanvas()
17981808
mMapTools.mSplitFeatures->setAction( mActionSplitFeatures );
17991809
mMapTools.mSelect = new QgsMapToolSelect( mMapCanvas );
18001810
mMapTools.mSelect->setAction( mActionSelect );
1801-
mMapTools.mVertexAdd = new QgsMapToolAddVertex( mMapCanvas );
1802-
mMapTools.mVertexAdd->setAction( mActionAddVertex );
1803-
mMapTools.mVertexMove = new QgsMapToolMoveVertex( mMapCanvas );
1804-
mMapTools.mVertexMove->setAction( mActionMoveVertex );
1805-
mMapTools.mVertexDelete = new QgsMapToolDeleteVertex( mMapCanvas );
1806-
mMapTools.mVertexDelete->setAction( mActionDeleteVertex );
1811+
//these three tools to be deprecated - use node tool rather
1812+
//mMapTools.mVertexAdd = new QgsMapToolAddVertex( mMapCanvas );
1813+
//mMapTools.mVertexAdd->setAction( mActionAddVertex );
1814+
//mMapTools.mVertexMove = new QgsMapToolMoveVertex( mMapCanvas );
1815+
//mMapTools.mVertexMove->setAction( mActionMoveVertex );
1816+
//mMapTools.mVertexDelete = new QgsMapToolDeleteVertex( mMapCanvas );
1817+
//mMapTools.mVertexDelete->setAction( mActionDeleteVertex );
18071818
mMapTools.mAddRing = new QgsMapToolAddRing( mMapCanvas );
18081819
mMapTools.mAddRing->setAction( mActionAddRing );
18091820
mMapTools.mAddIsland = new QgsMapToolAddIsland( mMapCanvas );
@@ -5716,9 +5727,10 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer* layer )
57165727
mActionCapturePolygon->setEnabled( false );
57175728
mActionCaptureLine->setVisible( false );
57185729
mActionCapturePolygon->setVisible( false );
5719-
mActionAddVertex->setEnabled( false );
5720-
mActionDeleteVertex->setEnabled( false );
5721-
mActionMoveVertex->setEnabled( false );
5730+
//these three tools to be deprecated - use node tool rather
5731+
//mActionAddVertex->setEnabled( false );
5732+
//mActionDeleteVertex->setEnabled( false );
5733+
//mActionMoveVertex->setEnabled( false );
57225734
mActionAddRing->setEnabled( false );
57235735
mActionAddIsland->setEnabled( false );
57245736
mActionReshapeFeatures->setEnabled( false );
@@ -5804,9 +5816,10 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer* layer )
58045816
//are add/delete/move vertex supported?
58055817
if ( vlayer->isEditable() && dprovider->capabilities() & QgsVectorDataProvider::ChangeGeometries )
58065818
{
5807-
mActionAddVertex->setEnabled( true );
5808-
mActionMoveVertex->setEnabled( true );
5809-
mActionDeleteVertex->setEnabled( true );
5819+
//these three tools to be deprecated - use node tool rather
5820+
//mActionAddVertex->setEnabled( true );
5821+
//mActionMoveVertex->setEnabled( true );
5822+
//mActionDeleteVertex->setEnabled( true );
58105823
if ( vlayer->geometryType() == QGis::Polygon )
58115824
{
58125825
mActionAddRing->setEnabled( true );
@@ -5817,9 +5830,9 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer* layer )
58175830
}
58185831
else
58195832
{
5820-
mActionAddVertex->setEnabled( false );
5821-
mActionMoveVertex->setEnabled( false );
5822-
mActionDeleteVertex->setEnabled( false );
5833+
//mActionAddVertex->setEnabled( false );
5834+
//mActionMoveVertex->setEnabled( false );
5835+
//mActionDeleteVertex->setEnabled( false );
58235836
}
58245837
return;
58255838
}
@@ -5839,15 +5852,16 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer* layer )
58395852
mActionDeleteSelected->setEnabled( false );
58405853
mActionAddRing->setEnabled( false );
58415854
mActionAddIsland->setEnabled( false );
5842-
mActionAddVertex->setEnabled( false );
5843-
mActionDeleteVertex->setEnabled( false );
5844-
mActionMoveVertex->setEnabled( false );
5855+
//these three tools to be deprecated - use node tool rather
5856+
//mActionAddVertex->setEnabled( false );
5857+
//mActionDeleteVertex->setEnabled( false );
5858+
//mActionMoveVertex->setEnabled( false );
5859+
mActionNodeTool->setEnabled( false );
58455860
mActionMoveFeature->setEnabled( false );
58465861
mActionCopyFeatures->setEnabled( false );
58475862
mActionCutFeatures->setEnabled( false );
58485863
mActionPasteFeatures->setEnabled( false );
58495864
mActionRotatePointSymbols->setEnabled( false );
5850-
mActionNodeTool->setEnabled( false );
58515865
mActionDeletePart->setEnabled( false );
58525866

58535867
//NOTE: This check does not really add any protection, as it is called on load not on layer select/activate

‎src/app/qgisapp.h‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -224,9 +224,10 @@ class QgisApp : public QMainWindow
224224
QAction *actionDeleteSelected() { return mActionDeleteSelected; }
225225
QAction *actionMoveFeature() { return mActionMoveFeature; }
226226
QAction *actionSplitFeatures() { return mActionSplitFeatures; }
227-
QAction *actionAddVertex() { return mActionAddVertex; }
228-
QAction *actionDeleteVertex() { return mActionDeleteVertex; }
229-
QAction *actionMoveVertex() { return mActionMoveVertex; }
227+
//These three tools are deprecated - use node tool rather...
228+
//QAction *actionAddVertex() { return mActionAddVertex; }
229+
//QAction *actionDeleteVertex() { return mActionDeleteVertex; }
230+
//QAction *actionMoveVertex() { return mActionMoveVertex; }
230231
QAction *actionAddRing() { return mActionAddRing; }
231232
QAction *actionAddIsland() { return mActionAddIsland; }
232233
QAction *actionSimplifyFeature() { return mActionSimplifyFeature; }

‎src/app/qgisappinterface.cpp‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -247,9 +247,12 @@ QAction *QgisAppInterface::actionCapturePolygon() { return qgis->actionCapturePo
247247
QAction *QgisAppInterface::actionDeleteSelected() { return qgis->actionDeleteSelected(); }
248248
QAction *QgisAppInterface::actionMoveFeature() { return qgis->actionMoveFeature(); }
249249
QAction *QgisAppInterface::actionSplitFeatures() { return qgis->actionSplitFeatures(); }
250-
QAction *QgisAppInterface::actionAddVertex() { return qgis->actionAddVertex(); }
251-
QAction *QgisAppInterface::actionDeleteVertex() { return qgis->actionDeleteVertex(); }
252-
QAction *QgisAppInterface::actionMoveVertex() { return qgis->actionMoveVertex(); }
250+
//these three actions are removed from the ui as of qgis v1.4
251+
//for plugin api completeness we now return a null pointer
252+
//but these should be removed from the plugin interface for v2
253+
QAction *QgisAppInterface::actionAddVertex() { return 0; }
254+
QAction *QgisAppInterface::actionDeleteVertex() { return 0; }
255+
QAction *QgisAppInterface::actionMoveVertex() { return 0; }
253256
QAction *QgisAppInterface::actionAddRing() { return qgis->actionAddRing(); }
254257
QAction *QgisAppInterface::actionAddIsland() { return qgis->actionAddIsland(); }
255258
QAction *QgisAppInterface::actionEditSeparator2() { return qgis->actionEditSeparator2(); }

0 commit comments

Comments
 (0)