Skip to content
Permalink
Browse files
remove some unnecessary stuff
  • Loading branch information
NEDJIMAbelgacem authored and nyalldawson committed Jan 12, 2022
1 parent b8573c7 commit 94cb3929a8f4c17328c929dbdb3b25fd1c665c19
Showing with 5 additions and 19 deletions.
  1. +0 −11 src/app/3d/qgs3dmapcanvasdockwidget.cpp
  2. +0 −5 src/app/3d/qgs3dmapcanvasdockwidget.h
  3. +4 −2 src/app/3d/qgs3dviewsmanager.cpp
  4. +1 −1 src/app/qgisapp.cpp
@@ -213,11 +213,6 @@ Qgs3DMapCanvasDockWidget::Qgs3DMapCanvasDockWidget( QWidget *parent )

setWidget( contentsWidget );

connect( this, &Qgs3DMapCanvasDockWidget::closed, [&]()
{
emit widgetClosed( this->windowTitle() );
} );

onTotalPendingJobsCountChanged();
}

@@ -480,9 +475,3 @@ void Qgs3DMapCanvasDockWidget::currentMapThemeRenamed( const QString &theme, con
mCanvas->map()->setTerrainMapTheme( newTheme );
}
}

void Qgs3DMapCanvasDockWidget::setName( const QString &name )
{
setWindowTitle( name );
mapCanvas3D()->setObjectName( name );
}
@@ -51,11 +51,6 @@ class APP_EXPORT Qgs3DMapCanvasDockWidget : public QgsDockWidget

Qgs3DMapToolMeasureLine *measurementLineTool() { return mMapToolMeasureLine; }

void setName( const QString &name );

signals:
void widgetClosed( const QString &name );

private slots:
void resetView();
void configure();
@@ -15,9 +15,10 @@

#include "qgs3dviewsmanager.h"

#include "qgisapp.h"
#include "qgs3dmapcanvasdockwidget.h"
#include "qgsnewnamedialog.h"
#include "qgisapp.h"
#include "qgs3dmapcanvas.h"

Qgs3DViewsManager::Qgs3DViewsManager( QWidget *parent, Qt::WindowFlags f )
: QDialog( parent, f )
@@ -101,7 +102,8 @@ void Qgs3DViewsManager::renameClicked()
{
m3DMapViewsWidgets->remove( oldTitle );
m3DMapViewsWidgets->insert( newTitle, widget );
widget->setName( newTitle );
widget->setWindowTitle( newTitle );
widget->mapCanvas3D()->setObjectName( newTitle );
}
reload();
}
@@ -13968,7 +13968,7 @@ Qgs3DMapCanvasDockWidget *QgisApp::createNew3DMapCanvasDock( const QString &name
map3DWidget->mapCanvas3D()->setTemporalController( mTemporalControllerWidget->temporalController() );
m3DMapViewsWidgets[ name ] = map3DWidget;

connect( map3DWidget, &Qgs3DMapCanvasDockWidget::widgetClosed, [&]( const QString & name )
connect( map3DWidget, &Qgs3DMapCanvasDockWidget::closed, [ &, name]()
{
m3DMapViewsWidgets.remove( name );
} );

0 comments on commit 94cb392

Please sign in to comment.