Skip to content

Commit

Permalink
Remove no more usable tools Circle by 3 tangents
Browse files Browse the repository at this point in the history
  • Loading branch information
@lbartoletti
lbartoletti committed Sep 27, 2017
1 parent 48da691 commit 3f317b6
Show file tree
Hide file tree
Showing 6 changed files with 1 addition and 139 deletions.
2 changes: 0 additions & 2 deletions src/app/CMakeLists.txt
View file
Expand Up @@ -135,7 +135,6 @@ SET(QGIS_APP_SRCS
qgsmaptoolcircle2points.cpp
qgsmaptoolcircle3points.cpp
qgsmaptoolcirclecenterpoint.cpp
qgsmaptoolcircle3tangents.cpp
qgsmaptooladdellipse.cpp
qgsmaptoolellipsefoci.cpp
qgsmaptoolellipseextent.cpp
Expand Down Expand Up @@ -310,7 +309,6 @@ SET (QGIS_APP_MOC_HDRS
qgsmaptoolcircle2points.h
qgsmaptoolcircle3points.h
qgsmaptoolcirclecenterpoint.h
qgsmaptoolcircle3tangents.h
qgsmaptooladdellipse.h
qgsmaptoolellipsefoci.h
qgsmaptoolellipseextent.h
Expand Down
15 changes: 0 additions & 15 deletions src/app/qgisapp.cpp
View file
Expand Up @@ -338,7 +338,6 @@ Q_GUI_EXPORT extern int qt_defaultDpiX();
#include "qgsmaptoolcircle2points.h"
#include "qgsmaptoolcircle3points.h"
#include "qgsmaptoolcirclecenterpoint.h"
#include "qgsmaptoolcircle3tangents.h"
#include "qgsmaptoolellipsecenter2points.h"
#include "qgsmaptoolellipsecenterpoint.h"
#include "qgsmaptoolellipseextent.h"
Expand Down Expand Up @@ -1311,7 +1310,6 @@ QgisApp::~QgisApp()
delete mMapTools.mCircle2Points;
delete mMapTools.mCircle3Points;
delete mMapTools.mCircleCenterPoint;
delete mMapTools.mCircle3Tangents;
delete mMapTools.mEllipseCenter2Points;
delete mMapTools.mEllipseCenterPoint;
delete mMapTools.mEllipseExtent;
Expand Down Expand Up @@ -1787,7 +1785,6 @@ void QgisApp::createActions()
connect( mActionCircle2Points, &QAction::triggered, this, &QgisApp::circle2Points );
connect( mActionCircle3Points, &QAction::triggered, this, &QgisApp::circle3Points );
connect( mActionCircleCenterPoint, &QAction::triggered, this, &QgisApp::circleCenterPoint );
connect( mActionCircle3Tangents, &QAction::triggered, this, &QgisApp::circle3Tangents );
connect( mActionEllipseCenter2Points, &QAction::triggered, this, &QgisApp::ellipseCenter2Points );
connect( mActionEllipseCenterPoint, &QAction::triggered, this, &QgisApp::ellipseCenterPoint );
connect( mActionEllipseExtent, &QAction::triggered, this, &QgisApp::ellipseExtent );
Expand Down Expand Up @@ -2075,7 +2072,6 @@ void QgisApp::createActionGroups()
mMapToolGroup->addAction( mActionCircle2Points );
mMapToolGroup->addAction( mActionCircle3Points );
mMapToolGroup->addAction( mActionCircleCenterPoint );
mMapToolGroup->addAction( mActionCircle3Tangents );
mMapToolGroup->addAction( mActionEllipseCenter2Points );
mMapToolGroup->addAction( mActionEllipseCenterPoint );
mMapToolGroup->addAction( mActionEllipseExtent );
Expand Down Expand Up @@ -2600,7 +2596,6 @@ void QgisApp::createToolBars()
tbAddCircle->addAction( mActionCircle2Points );
tbAddCircle->addAction( mActionCircle3Points );
tbAddCircle->addAction( mActionCircleCenterPoint );
tbAddCircle->addAction( mActionCircle3Tangents );
tbAddCircle->setDefaultAction( mActionCircle2Points );
connect( tbAddCircle, &QToolButton::triggered, this, &QgisApp::toolButtonActionTriggered );
mRegularShapeDigitizeToolBar->insertWidget( mActionNodeTool, tbAddCircle );
Expand Down Expand Up @@ -3211,8 +3206,6 @@ void QgisApp::createCanvasTools()
mMapTools.mCircle3Points->setAction( mActionCircle3Points );
mMapTools.mCircleCenterPoint = new QgsMapToolCircleCenterPoint( dynamic_cast<QgsMapToolAddFeature *>( mMapTools.mAddFeature ), mMapCanvas );
mMapTools.mCircleCenterPoint->setAction( mActionCircleCenterPoint );
mMapTools.mCircle3Tangents = new QgsMapToolCircle3Tangents( dynamic_cast<QgsMapToolAddFeature *>( mMapTools.mAddFeature ), mMapCanvas );
mMapTools.mCircle3Tangents->setAction( mActionCircle3Tangents );
mMapTools.mEllipseCenter2Points = new QgsMapToolEllipseCenter2Points( dynamic_cast<QgsMapToolAddFeature *>( mMapTools.mAddFeature ), mMapCanvas );
mMapTools.mEllipseCenter2Points->setAction( mActionEllipseCenter2Points );
mMapTools.mEllipseCenterPoint = new QgsMapToolEllipseCenterPoint( dynamic_cast<QgsMapToolAddFeature *>( mMapTools.mAddFeature ), mMapCanvas );
Expand Down Expand Up @@ -7814,11 +7807,6 @@ void QgisApp::circleCenterPoint()
mMapCanvas->setMapTool( mMapTools.mCircleCenterPoint );
}

void QgisApp::circle3Tangents()
{
mMapCanvas->setMapTool( mMapTools.mCircle3Tangents );
}

void QgisApp::ellipseCenter2Points()
{
mMapCanvas->setMapTool( mMapTools.mEllipseCenter2Points );
Expand Down Expand Up @@ -11210,7 +11198,6 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer *layer )
mActionCircle2Points->setEnabled( false );
mActionCircle3Points->setEnabled( false );
mActionCircleCenterPoint->setEnabled( false );
mActionCircle3Tangents->setEnabled( false );
mActionEllipseCenter2Points->setEnabled( false );
mActionEllipseCenterPoint->setEnabled( false );
mActionEllipseExtent->setEnabled( false );
Expand Down Expand Up @@ -11362,8 +11349,6 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer *layer )
&& ( vlayer->geometryType() == QgsWkbTypes::LineGeometry || vlayer->geometryType() == QgsWkbTypes::PolygonGeometry ) );
mActionCircleCenterPoint->setEnabled( isEditable && ( canAddFeatures || canChangeGeometry )
&& ( vlayer->geometryType() == QgsWkbTypes::LineGeometry || vlayer->geometryType() == QgsWkbTypes::PolygonGeometry ) );
mActionCircle3Tangents->setEnabled( isEditable && ( canAddFeatures || canChangeGeometry )
&& ( vlayer->geometryType() == QgsWkbTypes::LineGeometry || vlayer->geometryType() == QgsWkbTypes::PolygonGeometry ) );
mActionEllipseCenter2Points->setEnabled( isEditable && ( canAddFeatures || canChangeGeometry )
&& ( vlayer->geometryType() == QgsWkbTypes::LineGeometry || vlayer->geometryType() == QgsWkbTypes::PolygonGeometry ) );
mActionEllipseCenterPoint->setEnabled( isEditable && ( canAddFeatures || canChangeGeometry )
Expand Down
4 changes: 0 additions & 4 deletions src/app/qgisapp.h
View file
Expand Up @@ -1229,8 +1229,6 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
void circle3Points();
//! activates the add circle from center and radius tool
void circleCenterPoint();
//! activates the add circle from 3 tangents tool
void circle3Tangents();
//! activates the add ellipse from center and 2 points tool
void ellipseCenter2Points();
//! activates the add ellipse from center point tool
Expand Down Expand Up @@ -1821,7 +1819,6 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
, mCircle2Points( nullptr )
, mCircle3Points( nullptr )
, mCircleCenterPoint( nullptr )
, mCircle3Tangents( nullptr )
, mEllipseCenter2Points( nullptr )
, mEllipseCenterPoint( nullptr )
, mEllipseExtent( nullptr )
Expand Down Expand Up @@ -1881,7 +1878,6 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
QgsMapTool *mCircle2Points = nullptr;
QgsMapTool *mCircle3Points = nullptr;
QgsMapTool *mCircleCenterPoint = nullptr;
QgsMapTool *mCircle3Tangents = nullptr;
QgsMapTool *mEllipseCenter2Points = nullptr;
QgsMapTool *mEllipseCenterPoint = nullptr;
QgsMapTool *mEllipseExtent = nullptr;
Expand Down
83 changes: 0 additions & 83 deletions src/app/qgsmaptoolcircle3tangents.cpp
View file

This file was deleted.

33 changes: 0 additions & 33 deletions src/app/qgsmaptoolcircle3tangents.h
View file

This file was deleted.

3 changes: 1 addition & 2 deletions src/ui/qgisapp.ui
View file
Expand Up @@ -279,7 +279,6 @@
<addaction name="mActionCircle2Points"/>
<addaction name="mActionCircle3Points"/>
<addaction name="mActionCircleCenterPoint"/>
<addaction name="mActionCircle3Tangents"/>
</widget>
<widget class="QMenu" name="mMenuEllipse">
<property name="title">
Expand Down Expand Up @@ -2923,7 +2922,7 @@ Acts on currently active editable layer</string>
<normaloff>:/images/themes/default/mActionRectangle3Points.svg</normaloff>:/images/themes/default/mActionRectangle3Points.svg</iconset>
</property>
<property name="text">
<string>Add Rectangle From 3 Points</string>
<string>Add Rectangle &amp;From 3 Points</string>
</property>
<property name="toolTip">
<string>Add rectangle from 3 points</string>
Expand Down

0 comments on commit 3f317b6

Please sign in to comment.