Navigation Menu

Skip to content

Commit

Permalink
[georeferencer] QGis -> Qgis for file, variable, function name
Browse files Browse the repository at this point in the history
  • Loading branch information
nirvn committed Jun 6, 2020
1 parent 291ba7f commit d357a27
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion images/images.qrc
Expand Up @@ -864,7 +864,7 @@
<file>themes/default/georeferencer/mGeorefRun.png</file>
<file>themes/default/georeferencer/mPushButtonPencil.png</file>
<file>themes/default/georeferencer/mActionGDALScript.png</file>
<file>themes/default/georeferencer/mActionLinkGeorefToQGis.png</file>
<file>themes/default/georeferencer/mActionLinkGeorefToQgis.png</file>
<file>themes/default/georeferencer/mActionLinkQGisToGeoref.png</file>
<file>themes/default/georeferencer/mActionLoadGCPpoints.png</file>
<file>themes/default/georeferencer/mActionAddGCPPoint.png</file>
Expand Down
22 changes: 11 additions & 11 deletions src/app/georeferencer/qgsgeorefmainwindow.cpp
Expand Up @@ -107,7 +107,7 @@ QgsGeoreferencerMainWindow::QgsGeoreferencerMainWindow( QWidget *parent, Qt::Win
setupConnections();
readSettings();

mActionLinkGeorefToQGis->setEnabled( false );
mActionLinkGeorefToQgis->setEnabled( false );
mActionLinkQGisToGeoref->setEnabled( false );

mCanvas->clearExtentHistory(); // reset zoomnext/zoomlast
Expand Down Expand Up @@ -287,9 +287,9 @@ void QgsGeoreferencerMainWindow::openRaster()
mCanvas->refresh();
QgisApp::instance()->mapCanvas()->refresh();

mActionLinkGeorefToQGis->setChecked( false );
mActionLinkGeorefToQgis->setChecked( false );
mActionLinkQGisToGeoref->setChecked( false );
mActionLinkGeorefToQGis->setEnabled( false );
mActionLinkGeorefToQgis->setEnabled( false );
mActionLinkQGisToGeoref->setEnabled( false );

mCanvas->clearExtentHistory(); // reset zoomnext/zoomlast
Expand Down Expand Up @@ -320,7 +320,7 @@ void QgsGeoreferencerMainWindow::doGeoreference()
// mGCPListWidget->setGeorefTransform(&mGeorefTransform);
// mTransformParamLabel->setText(tr("Transform: ") + convertTransformEnumToString(mTransformParam));

mActionLinkGeorefToQGis->setEnabled( false );
mActionLinkGeorefToQgis->setEnabled( false );
mActionLinkQGisToGeoref->setEnabled( false );
}
}
Expand Down Expand Up @@ -348,12 +348,12 @@ bool QgsGeoreferencerMainWindow::getTransformSettings()

if ( QgsGeorefTransform::InvalidTransform != mTransformParam )
{
mActionLinkGeorefToQGis->setEnabled( true );
mActionLinkGeorefToQgis->setEnabled( true );
mActionLinkQGisToGeoref->setEnabled( true );
}
else
{
mActionLinkGeorefToQGis->setEnabled( false );
mActionLinkGeorefToQgis->setEnabled( false );
mActionLinkQGisToGeoref->setEnabled( false );
}

Expand Down Expand Up @@ -460,12 +460,12 @@ void QgsGeoreferencerMainWindow::linkQGisToGeoref( bool link )
}
else
{
mActionLinkGeorefToQGis->setEnabled( false );
mActionLinkGeorefToQgis->setEnabled( false );
}
}
}

void QgsGeoreferencerMainWindow::linkGeorefToQGis( bool link )
void QgsGeoreferencerMainWindow::linkGeorefToQgis( bool link )
{
if ( link )
{
Expand Down Expand Up @@ -746,7 +746,7 @@ void QgsGeoreferencerMainWindow::extentsChangedQGisCanvas()
return;
}

if ( mActionLinkGeorefToQGis->isChecked() )
if ( mActionLinkGeorefToQgis->isChecked() )
{
// Update transform if necessary
if ( !updateGeorefTransform() )
Expand Down Expand Up @@ -883,8 +883,8 @@ void QgsGeoreferencerMainWindow::createActions()
mActionZoomNext->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionZoomNext.svg" ) ) );
connect( mActionZoomNext, &QAction::triggered, this, &QgsGeoreferencerMainWindow::zoomToNext );

mActionLinkGeorefToQGis->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/georeferencer/mActionLinkGeorefToQGis.png" ) ) );
connect( mActionLinkGeorefToQGis, &QAction::triggered, this, &QgsGeoreferencerMainWindow::linkGeorefToQGis );
mActionLinkGeorefToQgis->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/georeferencer/mActionLinkGeorefToQgis.png" ) ) );
connect( mActionLinkGeorefToQgis, &QAction::triggered, this, &QgsGeoreferencerMainWindow::linkGeorefToQgis );

mActionLinkQGisToGeoref->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/georeferencer/mActionLinkQGisToGeoref.png" ) ) );
connect( mActionLinkQGisToGeoref, &QAction::triggered, this, &QgsGeoreferencerMainWindow::linkQGisToGeoref );
Expand Down
2 changes: 1 addition & 1 deletion src/app/georeferencer/qgsgeorefmainwindow.h
Expand Up @@ -80,7 +80,7 @@ class QgsGeoreferencerMainWindow : public QMainWindow, private Ui::QgsGeorefPlug
void zoomToLast();
void zoomToNext();
void setPanTool();
void linkGeorefToQGis( bool link );
void linkGeorefToQgis( bool link );
void linkQGisToGeoref( bool link );

// gcps
Expand Down
6 changes: 3 additions & 3 deletions src/ui/georeferencer/qgsgeorefpluginguibase.ui
Expand Up @@ -49,7 +49,7 @@
<addaction name="mActionZoomLast"/>
<addaction name="mActionZoomNext"/>
<addaction name="separator"/>
<addaction name="mActionLinkGeorefToQGis"/>
<addaction name="mActionLinkGeorefToQgis"/>
<addaction name="mActionLinkQGisToGeoref"/>
</widget>
<widget class="QMenu" name="menuEdit">
Expand Down Expand Up @@ -143,7 +143,7 @@
<addaction name="mActionZoomLast"/>
<addaction name="mActionZoomNext"/>
<addaction name="separator"/>
<addaction name="mActionLinkGeorefToQGis"/>
<addaction name="mActionLinkGeorefToQgis"/>
<addaction name="mActionLinkQGisToGeoref"/>
</widget>
<widget class="QgsDockWidget" name="dockWidgetGCPpoints">
Expand Down Expand Up @@ -291,7 +291,7 @@
<string>Ctrl+C</string>
</property>
</action>
<action name="mActionLinkGeorefToQGis">
<action name="mActionLinkGeorefToQgis">
<property name="checkable">
<bool>true</bool>
</property>
Expand Down

0 comments on commit d357a27

Please sign in to comment.