sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-14 00:07:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

rename QgsLocatorWidgetCore to QgsLocatorModelBridge

Browse Source
This commit is contained in:
Denis Rouzaud 2018-11-06 13:49:14 -04:00
parent c1bfd6459c
commit 107e646219
8 changed files with 157 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
python/core/auto_generated/locator/qgslocatormodelbridge.sip.in Normal file
View File

@ -0,0 +1,98 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/locator/qgslocatormodelbridge.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
class QgsLocatorModelBridge : QObject
{
%Docstring
The QgsLocatorModelBridge class provides the core functionality
to be used in a locator widget.
.. versionadded:: 3.6
%End
%TypeHeaderCode
#include "qgslocatormodelbridge.h"
%End
public:
explicit QgsLocatorModelBridge( QObject *parent = 0 );
%Docstring
Constructor of QgsLocatorModelBridge
%End
void performSearch( const QString &text );
%Docstring
Perform a search
%End
QgsLocator *locator() const;
%Docstring
Returns the locator
%End
QgsLocatorProxyModel *proxyModel() const;
%Docstring
Returns the proxy model
%End
bool hasQueueRequested() const;
%Docstring
Returns true if some text to be search is pending in the queue
%End
bool isRunning() const;
%Docstring
Returns true if the a search is currently running
%End
signals:
void resultAdded();
%Docstring
Emitted when a result is added
%End
void isRunningChanged();
%Docstring
Emitted when the running status changes
%End
void resultsCleared();
%Docstring
Emitted when the results are cleared
%End
public slots:
void invalidateResults();
%Docstring
This will invalidate current search results
%End
void updateCanvasExtent( const QgsRectangle &extent );
%Docstring
Update the canvas extent used to create search context
%End
void updateCanvasCrs( const QgsCoordinateReferenceSystem &crs );
%Docstring
Update the canvas CRS used to create search context
%End
};
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/locator/qgslocatormodelbridge.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/

14
python/core/auto_generated/locator/qgslocatorwidgetcore.sip.in
View File

@ -1,7 +1,7 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/locator/qgslocatorwidgetcore.h *
* src/core/locator/qgslocatormodelbridge.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
@ -12,22 +12,22 @@
class QgsLocatorWidgetCore : QObject
class QgsLocatorModelBridge : QObject
{
%Docstring
The QgsLocatorWidgetCore class provides the core functionality
The QgsLocatorModelBridge class provides the core functionality
to be used in a locator widget.
.. versionadded:: 3.6
%End
%TypeHeaderCode
#include "qgslocatorwidgetcore.h"
#include "qgslocatormodelbridge.h"
%End
public:
explicit QgsLocatorWidgetCore( QObject *parent = 0 );
explicit QgsLocatorModelBridge( QObject *parent = 0 );
%Docstring
Constructor of QgsLocatorWidgetCore
Constructor of QgsLocatorModelBridge
%End
void performSearch( const QString &text );
@ -92,7 +92,7 @@ Update the canvas CRS used to create search context
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/locator/qgslocatorwidgetcore.h *
* src/core/locator/qgslocatormodelbridge.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/

2
python/core/core_auto.sip
View File

@ -382,7 +382,7 @@
%Include auto_generated/locator/qgslocator.sip
%Include auto_generated/locator/qgslocatorfilter.sip
%Include auto_generated/locator/qgslocatormodel.sip
%Include auto_generated/locator/qgslocatorwidgetcore.sip
%Include auto_generated/locator/qgslocatormodelbridge.sip
%Include auto_generated/processing/qgsprocessingalgrunnertask.sip
%Include auto_generated/processing/qgsprocessingfeedback.sip
%Include auto_generated/processing/qgsprocessingprovider.sip

4
src/core/CMakeLists.txt
View File

@ -109,7 +109,7 @@ SET(QGIS_CORE_SRCS
locator/qgslocator.cpp
locator/qgslocatorfilter.cpp
locator/qgslocatormodel.cpp
locator/qgslocatorwidgetcore.cpp
locator/qgslocatormodelbridge.cpp
processing/qgsprocessingalgorithm.cpp
processing/qgsprocessingalgrunnertask.cpp
@ -682,7 +682,7 @@ SET(QGIS_CORE_MOC_HDRS
locator/qgslocator.h
locator/qgslocatorfilter.h
locator/qgslocatormodel.h
locator/qgslocatorwidgetcore.h
locator/qgslocatormodelbridge.h
processing/qgsprocessingalgrunnertask.h
processing/qgsprocessingfeedback.h

34
src/core/locator/qgslocatorwidgetcore.cpp → src/core/locator/qgslocatormodelbridge.cpp
View File

@ -1,5 +1,5 @@
/***************************************************************************
qgslocatorwidgetcore.cpp
qgslocatormodelbridge.cpp
------------------
begin : November 2018
copyright : (C) 2018 by Denis Rouzaud
@ -15,12 +15,12 @@
* *
***************************************************************************/
#include "qgslocatorwidgetcore.h"
#include "qgslocatormodelbridge.h"
#include "qgslocator.h"
#include "qgslocatormodel.h"
#include "qgsmapsettings.h"
QgsLocatorWidgetCore::QgsLocatorWidgetCore( QObject *parent )
QgsLocatorModelBridge::QgsLocatorModelBridge( QObject *parent )
: QObject( parent )
, mLocator( new QgsLocator( this ) )
, mLocatorModel( new QgsLocatorModel( this ) )
@ -28,16 +28,16 @@ QgsLocatorWidgetCore::QgsLocatorWidgetCore( QObject *parent )
mProxyModel = new QgsLocatorProxyModel( mLocatorModel );
mProxyModel->setSourceModel( mLocatorModel );
connect( mLocator, &QgsLocator::foundResult, this, &QgsLocatorWidgetCore::addResult );
connect( mLocator, &QgsLocator::finished, this, &QgsLocatorWidgetCore::searchFinished );
connect( mLocator, &QgsLocator::foundResult, this, &QgsLocatorModelBridge::addResult );
connect( mLocator, &QgsLocator::finished, this, &QgsLocatorModelBridge::searchFinished );
}
bool QgsLocatorWidgetCore::isRunning() const
bool QgsLocatorModelBridge::isRunning() const
{
return mIsRunning;
}
void QgsLocatorWidgetCore::setIsRunning( bool isRunning )
void QgsLocatorModelBridge::setIsRunning( bool isRunning )
{
if ( mIsRunning == isRunning )
return;
@ -46,30 +46,30 @@ void QgsLocatorWidgetCore::setIsRunning( bool isRunning )
emit isRunningChanged();
}
void QgsLocatorWidgetCore::invalidateResults()
void QgsLocatorModelBridge::invalidateResults()
{
mLocator->cancelWithoutBlocking();
mLocatorModel->clear();
}
void QgsLocatorWidgetCore::updateCanvasExtent( const QgsRectangle &extent )
void QgsLocatorModelBridge::updateCanvasExtent( const QgsRectangle &extent )
{
mCanvasExtent = extent;
}
void QgsLocatorWidgetCore::updateCanvasCrs( const QgsCoordinateReferenceSystem &crs )
void QgsLocatorModelBridge::updateCanvasCrs( const QgsCoordinateReferenceSystem &crs )
{
mCanvasCrs = crs;
}
void QgsLocatorWidgetCore::addResult( const QgsLocatorResult &result )
void QgsLocatorModelBridge::addResult( const QgsLocatorResult &result )
{
mLocatorModel->addResult( result );
emit resultAdded();
}
void QgsLocatorWidgetCore::searchFinished()
void QgsLocatorModelBridge::searchFinished()
{
if ( mHasQueuedRequest )
{
@ -86,7 +86,7 @@ void QgsLocatorWidgetCore::searchFinished()
}
}
void QgsLocatorWidgetCore::performSearch( const QString &text )
void QgsLocatorModelBridge::performSearch( const QString &text )
{
setIsRunning( true );
if ( mLocator->isRunning() )
@ -107,22 +107,22 @@ void QgsLocatorWidgetCore::performSearch( const QString &text )
}
}
QgsLocator *QgsLocatorWidgetCore::locator() const
QgsLocator *QgsLocatorModelBridge::locator() const
{
return mLocator;
}
QgsLocatorProxyModel *QgsLocatorWidgetCore::proxyModel() const
QgsLocatorProxyModel *QgsLocatorModelBridge::proxyModel() const
{
return mProxyModel;
}
bool QgsLocatorWidgetCore::hasQueueRequested() const
bool QgsLocatorModelBridge::hasQueueRequested() const
{
return mHasQueuedRequest;
}
QgsLocatorContext QgsLocatorWidgetCore::createContext()
QgsLocatorContext QgsLocatorModelBridge::createContext()
{
QgsLocatorContext context;
context.targetExtent = mCanvasExtent;

16
src/core/locator/qgslocatorwidgetcore.h → src/core/locator/qgslocatormodelbridge.h
View File

@ -1,5 +1,5 @@
/***************************************************************************
qgslocatorwidgetcore.h
qgslocatormodelbridge.h
------------------
begin : November 2018
copyright : (C) 2018 by Denis Rouzaud
@ -15,8 +15,8 @@
* *
***************************************************************************/
#ifndef QGSLOCATORWIDGETCORE_H
#define QGSLOCATORWIDGETCORE_H
#ifndef QGSLOCATORMODELBRIDGE_H
#define QGSLOCATORMODELBRIDGE_H
#include <QObject>
@ -33,17 +33,17 @@ class QgsLocatorProxyModel;
/**
* \ingroup core
* The QgsLocatorWidgetCore class provides the core functionality
* The QgsLocatorModelBridge class provides the core functionality
* to be used in a locator widget.
* \since QGIS 3.6
*/
class CORE_EXPORT QgsLocatorWidgetCore : public QObject
class CORE_EXPORT QgsLocatorModelBridge : public QObject
{
Q_OBJECT
Q_PROPERTY( bool isRunning READ isRunning NOTIFY isRunningChanged )
public:
//! Constructor of QgsLocatorWidgetCore
explicit QgsLocatorWidgetCore( QObject *parent = nullptr );
//! Constructor of QgsLocatorModelBridge
explicit QgsLocatorModelBridge( QObject *parent = nullptr );
//! Perform a search
Q_INVOKABLE void performSearch( const QString &text );
@ -104,4 +104,4 @@ class CORE_EXPORT QgsLocatorWidgetCore : public QObject
QgsCoordinateReferenceSystem mCanvasCrs;
};
#endif // QGSLOCATORWIDGETCORE_H
#endif // QGSLOCATORMODELBRIDGE_H

44
src/gui/locator/qgslocatorwidget.cpp
View File

@ -18,7 +18,7 @@
#include "qgslocator.h"
#include "qgslocatormodel.h"
#include "qgslocatorwidget.h"
#include "qgslocatorwidgetcore.h"
#include "qgslocatormodelbridge.h"
#include "qgsfilterlineedit.h"
#include "qgsmapcanvas.h"
#include "qgsapplication.h"
@ -29,7 +29,7 @@
QgsLocatorWidget::QgsLocatorWidget( QWidget *parent )
: QWidget( parent )
, mWidgetCore( new QgsLocatorWidgetCore( this ) )
, mModelBridge( new QgsLocatorModelBridge( this ) )
, mLineEdit( new QgsFilterLineEdit() )
, mResultsView( new QgsLocatorResultsView() )
{
@ -70,16 +70,16 @@ QgsLocatorWidget::QgsLocatorWidget( QWidget *parent )
mResultsContainer->setLayout( containerLayout );
mResultsContainer->hide();
mResultsView->setModel( mWidgetCore->proxyModel() );
mResultsView->setModel( mModelBridge->proxyModel() );
mResultsView->setUniformRowHeights( true );
mResultsView->setIconSize( QSize( 16, 16 ) );
mResultsView->recalculateSize();
connect( mLineEdit, &QLineEdit::textChanged, this, &QgsLocatorWidget::scheduleDelayedPopup );
connect( mResultsView, &QAbstractItemView::activated, this, &QgsLocatorWidget::acceptCurrentEntry );
connect( mWidgetCore, &QgsLocatorWidgetCore::resultAdded, this, &QgsLocatorWidget::resultAdded );
connect( mWidgetCore, &QgsLocatorWidgetCore::isRunningChanged, this, [ = ]() {mLineEdit->setShowSpinner( mWidgetCore->isRunning() );} );
connect( mWidgetCore, & QgsLocatorWidgetCore::resultsCleared, this, [ = ]() {mHasSelectedResult = false;} );
connect( mModelBridge, &QgsLocatorModelBridge::resultAdded, this, &QgsLocatorWidget::resultAdded );
connect( mModelBridge, &QgsLocatorModelBridge::isRunningChanged, this, [ = ]() {mLineEdit->setShowSpinner( mModelBridge->isRunning() );} );
connect( mModelBridge, & QgsLocatorModelBridge::resultsCleared, this, [ = ]() {mHasSelectedResult = false;} );
// have a tiny delay between typing text in line edit and showing the window
mPopupTimer.setInterval( 100 );
@ -95,7 +95,7 @@ QgsLocatorWidget::QgsLocatorWidget( QWidget *parent )
installEventFilter( this );
window()->installEventFilter( this );
mWidgetCore->locator()->registerFilter( new QgsLocatorFilterFilter( this, this ) );
mModelBridge->locator()->registerFilter( new QgsLocatorFilterFilter( this, this ) );
mMenu = new QMenu( this );
QAction *menuAction = mLineEdit->addAction( QgsApplication::getThemeIcon( QStringLiteral( "/search.svg" ) ), QLineEdit::LeadingPosition );
@ -111,7 +111,7 @@ QgsLocatorWidget::QgsLocatorWidget( QWidget *parent )
QgsLocator *QgsLocatorWidget::locator()
{
return mWidgetCore->locator();
return mModelBridge->locator();
}
void QgsLocatorWidget::setMapCanvas( QgsMapCanvas *canvas )
@ -129,8 +129,8 @@ void QgsLocatorWidget::setMapCanvas( QgsMapCanvas *canvas )
if ( mMapCanvas )
{
mCanvasConnections
<< connect( mMapCanvas, &QgsMapCanvas::extentsChanged, this, [ = ]() {mWidgetCore->updateCanvasExtent( mMapCanvas->extent() );} )
<< connect( mMapCanvas, &QgsMapCanvas::destinationCrsChanged, this, [ = ]() {mWidgetCore->updateCanvasCrs( mMapCanvas->mapSettings().destinationCrs() );} ) ;
<< connect( mMapCanvas, &QgsMapCanvas::extentsChanged, this, [ = ]() {mModelBridge->updateCanvasExtent( mMapCanvas->extent() );} )
<< connect( mMapCanvas, &QgsMapCanvas::destinationCrsChanged, this, [ = ]() {mModelBridge->updateCanvasCrs( mMapCanvas->mapSettings().destinationCrs() );} ) ;
}
}
@ -144,7 +144,7 @@ void QgsLocatorWidget::search( const QString &string )
void QgsLocatorWidget::invalidateResults()
{
mWidgetCore->invalidateResults();
mModelBridge->invalidateResults();
mResultsContainer->hide();
}
@ -155,25 +155,25 @@ void QgsLocatorWidget::scheduleDelayedPopup()
void QgsLocatorWidget::resultAdded()
{
bool selectFirst = !mHasSelectedResult || mWidgetCore->proxyModel()->rowCount() == 0;
bool selectFirst = !mHasSelectedResult || mModelBridge->proxyModel()->rowCount() == 0;
if ( selectFirst )
{
int row = -1;
bool selectable = false;
while ( !selectable && row < mWidgetCore->proxyModel()->rowCount() )
while ( !selectable && row < mModelBridge->proxyModel()->rowCount() )
{
row++;
selectable = mWidgetCore->proxyModel()->flags( mWidgetCore->proxyModel()->index( row, 0 ) ).testFlag( Qt::ItemIsSelectable );
selectable = mModelBridge->proxyModel()->flags( mModelBridge->proxyModel()->index( row, 0 ) ).testFlag( Qt::ItemIsSelectable );
}
if ( selectable )
mResultsView->setCurrentIndex( mWidgetCore->proxyModel()->index( row, 0 ) );
mResultsView->setCurrentIndex( mModelBridge->proxyModel()->index( row, 0 ) );
}
}
void QgsLocatorWidget::performSearch()
{
mPopupTimer.stop();
mWidgetCore->performSearch( mLineEdit->text() );
mModelBridge->performSearch( mLineEdit->text() );
showList();
}
@ -185,7 +185,7 @@ void QgsLocatorWidget::showList()
void QgsLocatorWidget::triggerSearchAndShowList()
{
if ( mWidgetCore->proxyModel()->rowCount() == 0 )
if ( mModelBridge->proxyModel()->rowCount() == 0 )
performSearch();
else
showList();
@ -261,7 +261,7 @@ bool QgsLocatorWidget::eventFilter( QObject *obj, QEvent *event )
void QgsLocatorWidget::configMenuAboutToShow()
{
mMenu->clear();
for ( QgsLocatorFilter *filter : mWidgetCore->locator()->filters() )
for ( QgsLocatorFilter *filter : mModelBridge->locator()->filters() )
{
if ( !filter->enabled() )
continue;
@ -275,7 +275,7 @@ void QgsLocatorWidget::configMenuAboutToShow()
else
{
QStringList parts = currentText.split( ' ' );
if ( parts.count() > 1 && mWidgetCore->locator()->filters( parts.at( 0 ) ).count() > 0 )
if ( parts.count() > 1 && mModelBridge->locator()->filters( parts.at( 0 ) ).count() > 0 )
{
parts.pop_front();
currentText = parts.join( ' ' );
@ -297,7 +297,7 @@ void QgsLocatorWidget::configMenuAboutToShow()
void QgsLocatorWidget::acceptCurrentEntry()
{
if ( mWidgetCore->hasQueueRequested() )
if ( mModelBridge->hasQueueRequested() )
{
return;
}
@ -310,10 +310,10 @@ void QgsLocatorWidget::acceptCurrentEntry()
if ( !index.isValid() )
return;
QgsLocatorResult result = mWidgetCore->proxyModel()->data( index, QgsLocatorModel::ResultDataRole ).value< QgsLocatorResult >();
QgsLocatorResult result = mModelBridge->proxyModel()->data( index, QgsLocatorModel::ResultDataRole ).value< QgsLocatorResult >();
mResultsContainer->hide();
mLineEdit->clearFocus();
mWidgetCore->locator()->clearPreviousResults();
mModelBridge->locator()->clearPreviousResults();
result.filter->triggerResult( result );
}
}

4
src/gui/locator/qgslocatorwidget.h
View File

@ -31,7 +31,7 @@ class QgsLocator;
class QgsFilterLineEdit;
class QgsLocatorResultsView;
class QgsMapCanvas;
class QgsLocatorWidgetCore;
class QgsLocatorModelBridge;
/**
* \class QgsLocatorWidget
@ -96,7 +96,7 @@ class GUI_EXPORT QgsLocatorWidget : public QWidget
void resultAdded();
private:
QgsLocatorWidgetCore *mWidgetCore = nullptr;
QgsLocatorModelBridge *mModelBridge = nullptr;
QgsFilterLineEdit *mLineEdit = nullptr;
QgsFloatingWidget *mResultsContainer = nullptr;
QgsLocatorResultsView *mResultsView = nullptr;