Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
make QgsDockableWidget
  • Loading branch information
NEDJIMAbelgacem committed Jan 14, 2022
1 parent 40879be commit f4c8d8a
Show file tree
Hide file tree
Showing 9 changed files with 110 additions and 248 deletions.
131 changes: 0 additions & 131 deletions src/app/3d/qgs3dmapcanvasdockwidget.cpp.bom

This file was deleted.

1 change: 0 additions & 1 deletion src/app/3d/qgs3dmaptoolidentify.cpp
Expand Up @@ -17,7 +17,6 @@

#include "qgsapplication.h"
#include "qgs3dmapcanvas.h"
#include "qgs3dmapcanvasdockwidget.h"
#include "qgs3dmapscene.h"
#include "qgs3dutils.h"
#include "qgsterrainentity_p.h"
Expand Down
10 changes: 5 additions & 5 deletions src/app/3d/qgs3dviewsmanagerdialog.cpp
Expand Up @@ -16,11 +16,11 @@
#include "qgs3dviewsmanagerdialog.h"

#include "qgisapp.h"
#include "qgs3dmapcanvasdockwidget.h"
#include "qgsnewnamedialog.h"
#include "qgs3dmapcanvas.h"
#include "qgsmapviewsmanager.h"
#include "qgs3dmapcanvaswidget.h"
#include "qgsdockablewidget.h"

#include <QMessageBox>

Expand Down Expand Up @@ -64,7 +64,7 @@ void Qgs3DViewsManagerDialog::showClicked()

QString viewName = m3DViewsListView->selectionModel()->selectedRows().at( 0 ).data( Qt::DisplayRole ).toString();

Qgs3DMapCanvasDockWidget *widget = QgisApp::instance()->open3DMapView( viewName );
QgsDockableWidget *widget = QgisApp::instance()->open3DMapView( viewName );
widget->show();

m3DViewsListView->selectionModel()->setCurrentIndex( m3DViewsListView->selectionModel()->currentIndex(), QItemSelectionModel::Select );
Expand All @@ -78,7 +78,7 @@ void Qgs3DViewsManagerDialog::hideClicked()

QString viewName = m3DViewsListView->selectionModel()->selectedRows().at( 0 ).data( Qt::DisplayRole ).toString();

Qgs3DMapCanvasDockWidget *widget = QgisApp::instance()->get3DMapViewDock( viewName );
QgsDockableWidget *widget = QgisApp::instance()->get3DMapViewDock( viewName );
widget->close();

m3DViewsListView->selectionModel()->setCurrentIndex( m3DViewsListView->selectionModel()->currentIndex(), QItemSelectionModel::Select );
Expand Down Expand Up @@ -115,7 +115,7 @@ void Qgs3DViewsManagerDialog::removeClicked()
QString viewName = m3DViewsListView->selectionModel()->selectedRows().at( 0 ).data( Qt::DisplayRole ).toString();

QgsProject::instance()->getViewsManager()->remove3DView( viewName );
if ( Qgs3DMapCanvasDockWidget *w = QgisApp::instance()->get3DMapViewDock( viewName ) )
if ( QgsDockableWidget *w = QgisApp::instance()->get3DMapViewDock( viewName ) )
{
w->close();
QgsProject::instance()->setDirty();
Expand All @@ -135,7 +135,7 @@ void Qgs3DViewsManagerDialog::renameClicked()

QgsProject::instance()->getViewsManager()->rename3DView( oldTitle, newTitle );

if ( Qgs3DMapCanvasDockWidget *widget = QgisApp::instance()->get3DMapViewDock( oldTitle ) )
if ( QgsDockableWidget *widget = QgisApp::instance()->get3DMapViewDock( oldTitle ) )
{
widget->setWindowTitle( newTitle );
Qgs3DMapCanvasWidget *canvasWidget = dynamic_cast< Qgs3DMapCanvasWidget * >( widget->widget() );
Expand Down
2 changes: 1 addition & 1 deletion src/app/CMakeLists.txt
Expand Up @@ -74,6 +74,7 @@ set(QGIS_APP_SRCS
qgsrecentprojectsitemsmodel.cpp
qgsvectorlayerdigitizingproperties.cpp
qgswelcomepage.cpp
qgsdockablewidget.cpp

qgsmaptooladdfeature.cpp
qgsmaptooladdpart.cpp
Expand Down Expand Up @@ -295,7 +296,6 @@ if (WITH_3D)
3d/qgs3dapputils.cpp
3d/qgs3dicongenerator.cpp
3d/qgs3dmapcanvas.cpp
3d/qgs3dmapcanvasdockwidget.cpp
3d/qgs3dmapconfigwidget.cpp
3d/qgs3dmaptool.cpp
3d/qgs3dmaptoolidentify.cpp
Expand Down
12 changes: 6 additions & 6 deletions src/app/layout/qgslayout3dmapwidget.cpp
Expand Up @@ -17,11 +17,11 @@

#include "qgisapp.h"
#include "qgs3dmapcanvas.h"
#include "qgs3dmapcanvasdockwidget.h"
#include "qgs3dmapsettings.h"
#include "qgscameracontroller.h"
#include <QMenu>
#include "qgs3dmapcanvaswidget.h"
#include "qgsdockablewidget.h"

float _normalizedAngle( float x )
{
Expand All @@ -35,7 +35,7 @@ void _prepare3DViewsMenu( QMenu *menu, QgsLayout3DMapWidget *w, Func1 slot )
{
QObject::connect( menu, &QMenu::aboutToShow, w, [menu, w, slot]
{
const QList<Qgs3DMapCanvasDockWidget *> lst = QgisApp::instance()->findChildren<Qgs3DMapCanvasDockWidget *>();
const QList<QgsDockableWidget *> lst = QgisApp::instance()->get3DMapViews();
menu->clear();
for ( auto dock : lst )
{
Expand All @@ -51,14 +51,14 @@ void _prepare3DViewsMenu( QMenu *menu, QgsLayout3DMapWidget *w, Func1 slot )
} );
}

Qgs3DMapCanvasDockWidget *_dock3DViewFromSender( QObject *sender )
QgsDockableWidget *_dock3DViewFromSender( QObject *sender )
{
QAction *action = qobject_cast<QAction *>( sender );
if ( !action )
return nullptr;

QString actionText = action->property( "name" ).toString();
const QList<Qgs3DMapCanvasDockWidget *> lst = QgisApp::instance()->findChildren<Qgs3DMapCanvasDockWidget *>();
const QList<QgsDockableWidget *> lst = QgisApp::instance()->get3DMapViews();
for ( auto dock : lst )
{
Qgs3DMapCanvasWidget *widget = dynamic_cast< Qgs3DMapCanvasWidget * >( dock->widget() );
Expand Down Expand Up @@ -122,7 +122,7 @@ void QgsLayout3DMapWidget::updateCameraPoseWidgetsFromItem()

void QgsLayout3DMapWidget::copy3DMapSettings()
{
Qgs3DMapCanvasDockWidget *dock = _dock3DViewFromSender( sender() );
QgsDockableWidget *dock = _dock3DViewFromSender( sender() );
if ( !dock )
return;
Qgs3DMapCanvasWidget *widget = dynamic_cast< Qgs3DMapCanvasWidget * >( dock->widget() );
Expand All @@ -144,7 +144,7 @@ void QgsLayout3DMapWidget::copy3DMapSettings()

void QgsLayout3DMapWidget::copeCameraPose()
{
Qgs3DMapCanvasDockWidget *dock = _dock3DViewFromSender( sender() );
QgsDockableWidget *dock = _dock3DViewFromSender( sender() );
if ( dock )
{
Qgs3DMapCanvasWidget *widget = dynamic_cast< Qgs3DMapCanvasWidget * >( dock->widget() );
Expand Down

0 comments on commit f4c8d8a

Please sign in to comment.