From: mkr Date: Fri, 13 Nov 2015 10:45:12 +0000 (+0300) Subject: Debug of land cover map creation. X-Git-Tag: v1.5~49 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ebcdbfb631c1efa944974d32da5204e820ec1201;p=modules%2Fhydro.git Debug of land cover map creation. --- diff --git a/src/HYDROGUI/HYDROGUI_LandCoverMapDlg.h b/src/HYDROGUI/HYDROGUI_LandCoverMapDlg.h index d611b171..62fd5601 100644 --- a/src/HYDROGUI/HYDROGUI_LandCoverMapDlg.h +++ b/src/HYDROGUI/HYDROGUI_LandCoverMapDlg.h @@ -56,7 +56,6 @@ public: signals: void landCoverMapChanged( const QString& theName ); - void CreatePreview( const QStringList& thePolylineFaceNames ); private slots: void onLandCoverMapChanged(); diff --git a/src/HYDROGUI/HYDROGUI_LandCoverMapOp.cxx b/src/HYDROGUI/HYDROGUI_LandCoverMapOp.cxx index 2ec102f4..a04f5a1c 100644 --- a/src/HYDROGUI/HYDROGUI_LandCoverMapOp.cxx +++ b/src/HYDROGUI/HYDROGUI_LandCoverMapOp.cxx @@ -118,8 +118,8 @@ void HYDROGUI_LandCoverMapOp::startOperation() aPanel->setObjectName( anObjectName ); closePreview(); - QStringList aPolylineFaceNames; - onCreatePreview( aPolylineFaceNames ); + if ( myOperationId != CreateLandCoverMapId ) + onCreatePreview(); aPanel->blockSignals( false ); @@ -149,8 +149,6 @@ HYDROGUI_InputPanel* HYDROGUI_LandCoverMapOp::createInputPanel() const HYDROGUI_LandCoverMapDlg* aPanel = new HYDROGUI_LandCoverMapDlg( module(), getName(), myOperationId ); connect( aPanel, SIGNAL( landCoverMapChanged( const QString& ) ), this, SLOT( onLandCoverMapChanged( const QString& ) ) ); - connect( aPanel, SIGNAL( CreatePreview( const QStringList& ) ), - this, SLOT( onCreatePreview( const QStringList& ) ) ); return aPanel; } @@ -355,13 +353,12 @@ void HYDROGUI_LandCoverMapOp::onLandCoverMapChanged( const QString& theName ) { // Show preview of the newly selected land cover map closePreview(); - QStringList aPolylineFaceNames; - onCreatePreview( aPolylineFaceNames ); + onCreatePreview(); } } } -void HYDROGUI_LandCoverMapOp::onCreatePreview( const QStringList& thePolylineFaceNames ) +void HYDROGUI_LandCoverMapOp::onCreatePreview() { HYDROGUI_LandCoverMapDlg* aPanel = ::qobject_cast( inputPanel() ); if ( !aPanel ) diff --git a/src/HYDROGUI/HYDROGUI_LandCoverMapOp.h b/src/HYDROGUI/HYDROGUI_LandCoverMapOp.h index 55cc12df..1a33bf25 100644 --- a/src/HYDROGUI/HYDROGUI_LandCoverMapOp.h +++ b/src/HYDROGUI/HYDROGUI_LandCoverMapOp.h @@ -47,7 +47,7 @@ protected: protected slots: void onLandCoverMapChanged( const QString& theName ); - void onCreatePreview( const QStringList& thePolylineFaceNames ); + void onCreatePreview(); void onViewerSelectionChanged(); private: