Skip to content
Permalink
Browse files

Initialize in headers

  • Loading branch information
nyalldawson committed Jun 21, 2018
1 parent d2e3755 commit 57ed9edbb8af42b2544759a19e547fa4952d6f13
Showing with 7 additions and 13 deletions.
  1. +0 −6 src/gui/qgsadvanceddigitizingdockwidget.cpp
  2. +7 −7 src/gui/qgsadvanceddigitizingdockwidget.h
@@ -38,13 +38,7 @@
QgsAdvancedDigitizingDockWidget::QgsAdvancedDigitizingDockWidget( QgsMapCanvas *canvas, QWidget *parent )
: QgsDockWidget( parent )
, mMapCanvas( canvas )
, mCurrentMapToolSupportsCad( false )
, mCadEnabled( false )
, mConstructionMode( false )
, mCommonAngleConstraint( QgsSettings().value( QStringLiteral( "/Cad/CommonAngle" ), 90 ).toInt() )
, mSnappedToVertex( false )
, mSessionActive( false )
, mErrorMessage( nullptr )
{
setupUi( this );

@@ -452,29 +452,29 @@ class GUI_EXPORT QgsAdvancedDigitizingDockWidget : public QgsDockWidget, private
QgsMapCanvas *mMapCanvas = nullptr;
QgsAdvancedDigitizingCanvasItem *mCadPaintItem = nullptr;

CadCapacities mCapacities;
CadCapacities mCapacities = nullptr;

bool mCurrentMapToolSupportsCad;
bool mCurrentMapToolSupportsCad = false;

// CAD properties
//! is CAD currently enabled for current map tool
bool mCadEnabled;
bool mConstructionMode;
bool mCadEnabled = false;
bool mConstructionMode = false;

// constraints
std::unique_ptr< CadConstraint > mAngleConstraint;
std::unique_ptr< CadConstraint > mDistanceConstraint;
std::unique_ptr< CadConstraint > mXConstraint;
std::unique_ptr< CadConstraint > mYConstraint;
AdditionalConstraint mAdditionalConstraint;
int mCommonAngleConstraint; // if 0: do not snap to common angles
int mCommonAngleConstraint = 90; // if 0: do not snap to common angles

// point list and current snap point / segment
QList<QgsPointXY> mCadPointList;
QList<QgsPointXY> mSnappedSegment;
bool mSnappedToVertex;
bool mSnappedToVertex = false;

bool mSessionActive;
bool mSessionActive = false;

// error message
std::unique_ptr<QgsMessageBarItem> mErrorMessage;

0 comments on commit 57ed9ed

Please sign in to comment.
You can’t perform that action at this time.