Skip to content

Commit

Permalink
Fix georeferencer help button
Browse files Browse the repository at this point in the history
  • Loading branch information
uclaros authored and nyalldawson committed Jun 18, 2020
1 parent 7fb552d commit 1e72b44
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 15 deletions.
10 changes: 0 additions & 10 deletions src/app/georeferencer/qgsgeorefmainwindow.cpp
Expand Up @@ -681,12 +681,6 @@ void QgsGeoreferencerMainWindow::localHistogramStretch()
mCanvas->refresh(); mCanvas->refresh();
} }


// Info slots
void QgsGeoreferencerMainWindow::showHelp()
{
QgsHelp::openHelp( QStringLiteral( "plugins/core_plugins/plugins_georeferencer.html#defining-the-transformation-settings" ) );
}

// Comfort slots // Comfort slots
void QgsGeoreferencerMainWindow::jumpToGCP( uint theGCPIndex ) void QgsGeoreferencerMainWindow::jumpToGCP( uint theGCPIndex )
{ {
Expand Down Expand Up @@ -905,10 +899,6 @@ void QgsGeoreferencerMainWindow::createActions()
connect( mActionFullHistogramStretch, &QAction::triggered, this, &QgsGeoreferencerMainWindow::fullHistogramStretch ); connect( mActionFullHistogramStretch, &QAction::triggered, this, &QgsGeoreferencerMainWindow::fullHistogramStretch );
mActionFullHistogramStretch->setEnabled( false ); mActionFullHistogramStretch->setEnabled( false );


// Help actions
mActionHelp = new QAction( tr( "Help" ), this );
connect( mActionHelp, &QAction::triggered, this, &QgsGeoreferencerMainWindow::showHelp );

mActionQuit->setShortcuts( QList<QKeySequence>() << QKeySequence( Qt::CTRL + Qt::Key_Q ) mActionQuit->setShortcuts( QList<QKeySequence>() << QKeySequence( Qt::CTRL + Qt::Key_Q )
<< QKeySequence( Qt::Key_Escape ) ); << QKeySequence( Qt::Key_Escape ) );
connect( mActionQuit, &QAction::triggered, this, &QWidget::close ); connect( mActionQuit, &QAction::triggered, this, &QWidget::close );
Expand Down
5 changes: 0 additions & 5 deletions src/app/georeferencer/qgsgeorefmainwindow.h
Expand Up @@ -101,9 +101,6 @@ class QgsGeoreferencerMainWindow : public QMainWindow, private Ui::QgsGeorefPlug
void showRasterPropertiesDialog(); void showRasterPropertiesDialog();
void showGeorefConfigDialog(); void showGeorefConfigDialog();


// plugin info
void showHelp();

// comfort // comfort
void jumpToGCP( uint theGCPIndex ); void jumpToGCP( uint theGCPIndex );
void extentsChangedGeorefCanvas(); void extentsChangedGeorefCanvas();
Expand Down Expand Up @@ -205,8 +202,6 @@ class QgsGeoreferencerMainWindow : public QMainWindow, private Ui::QgsGeorefPlug
QMenu *mPanelMenu = nullptr; QMenu *mPanelMenu = nullptr;
QMenu *mToolbarMenu = nullptr; QMenu *mToolbarMenu = nullptr;


QAction *mActionHelp = nullptr;

QgsGCPListWidget *mGCPListWidget = nullptr; QgsGCPListWidget *mGCPListWidget = nullptr;
QLineEdit *mScaleEdit = nullptr; QLineEdit *mScaleEdit = nullptr;
QLabel *mScaleLabel = nullptr; QLabel *mScaleLabel = nullptr;
Expand Down
7 changes: 7 additions & 0 deletions src/app/georeferencer/qgstransformsettingsdialog.cpp
Expand Up @@ -25,6 +25,7 @@
#include "qgstransformsettingsdialog.h" #include "qgstransformsettingsdialog.h"
#include "qgscoordinatereferencesystem.h" #include "qgscoordinatereferencesystem.h"
#include "qgsgui.h" #include "qgsgui.h"
#include "qgshelp.h"


QgsTransformSettingsDialog::QgsTransformSettingsDialog( const QString &raster, const QString &output, QgsTransformSettingsDialog::QgsTransformSettingsDialog( const QString &raster, const QString &output,
int countGCPpoints, QWidget *parent ) int countGCPpoints, QWidget *parent )
Expand Down Expand Up @@ -124,6 +125,7 @@ QgsTransformSettingsDialog::QgsTransformSettingsDialog( const QString &raster, c
cbxLoadInQgisWhenDone->setChecked( settings.value( QStringLiteral( "/Plugin-GeoReferencer/loadinqgis" ), false ).toBool() ); cbxLoadInQgisWhenDone->setChecked( settings.value( QStringLiteral( "/Plugin-GeoReferencer/loadinqgis" ), false ).toBool() );
saveGcpCheckBox->setChecked( settings.value( QStringLiteral( "/Plugin-GeoReferencer/save_gcp_points" ), false ).toBool() ); saveGcpCheckBox->setChecked( settings.value( QStringLiteral( "/Plugin-GeoReferencer/save_gcp_points" ), false ).toBool() );


connect( buttonBox, &QDialogButtonBox::helpRequested, this, &QgsTransformSettingsDialog::showHelp );
} }


void QgsTransformSettingsDialog::getTransformSettings( QgsGeorefTransform::TransformParametrisation &tp, void QgsTransformSettingsDialog::getTransformSettings( QgsGeorefTransform::TransformParametrisation &tp,
Expand Down Expand Up @@ -310,3 +312,8 @@ QIcon QgsTransformSettingsDialog::getThemeIcon( const QString &name )
} }
} }
} }

void QgsTransformSettingsDialog::showHelp()
{
QgsHelp::openHelp( QStringLiteral( "working_with_raster/georeferencer.html#defining-the-transformation-settings" ) );
}
1 change: 1 addition & 0 deletions src/app/georeferencer/qgstransformsettingsdialog.h
Expand Up @@ -44,6 +44,7 @@ class QgsTransformSettingsDialog : public QDialog, private Ui::QgsTransformSetti
void cmbTransformType_currentIndexChanged( const QString &text ); void cmbTransformType_currentIndexChanged( const QString &text );
void mWorldFileCheckBox_stateChanged( int state ); void mWorldFileCheckBox_stateChanged( int state );
QIcon getThemeIcon( const QString &name ); QIcon getThemeIcon( const QString &name );
void showHelp();


private: private:
bool checkGCPpoints( int count, int &minGCPpoints ); bool checkGCPpoints( int count, int &minGCPpoints );
Expand Down

0 comments on commit 1e72b44

Please sign in to comment.