Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
remove some unnecessary stuff
  • Loading branch information
NEDJIMAbelgacem authored and nyalldawson committed Jan 12, 2022
1 parent b8573c7 commit 94cb392
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 19 deletions.
11 changes: 0 additions & 11 deletions src/app/3d/qgs3dmapcanvasdockwidget.cpp
Expand Up @@ -213,11 +213,6 @@ Qgs3DMapCanvasDockWidget::Qgs3DMapCanvasDockWidget( QWidget *parent )

setWidget( contentsWidget );

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

onTotalPendingJobsCountChanged();
}

Expand Down Expand Up @@ -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 );
}
5 changes: 0 additions & 5 deletions src/app/3d/qgs3dmapcanvasdockwidget.h
Expand Up @@ -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();
Expand Down
6 changes: 4 additions & 2 deletions src/app/3d/qgs3dviewsmanager.cpp
Expand Up @@ -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 )
Expand Down Expand Up @@ -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();
}
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgisapp.cpp
Expand Up @@ -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 );
} );
Expand Down

0 comments on commit 94cb392

Please sign in to comment.