X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_GeoreferencementOp.cxx;h=eb89f4c471b89df580dae8eeecf46d1b5ef238c1;hb=80b3ef265c1b8564a52097094156256956017ae1;hp=80a0373e255dfafe3e89d7138e1be07834983bf9;hpb=347f7cf014bec3113cc79c89b0d19ef5735aab10;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/HYDROGUI_GeoreferencementOp.cxx b/src/HYDROGUI/HYDROGUI_GeoreferencementOp.cxx index 80a0373e..eb89f4c4 100644 --- a/src/HYDROGUI/HYDROGUI_GeoreferencementOp.cxx +++ b/src/HYDROGUI/HYDROGUI_GeoreferencementOp.cxx @@ -1,12 +1,8 @@ -// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -// -// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// +// Copyright (C) 2014-2015 EDF-R&D // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public // License as published by the Free Software Foundation; either -// version 2.1 of the License. +// version 2.1 of the License, or (at your option) any later version. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -65,15 +61,14 @@ void HYDROGUI_GeoreferencementOp::startOperation() } aPanel->reset(); + setPreviewManager( ::qobject_cast( + module()->getApp()->getViewManager( OCCViewer_Viewer::Type(), true ) ) ); + setCursor(); if ( myInitialMode == All ) { - int anAllMode = HYDROGUI_GeoreferencementDlg::AllProfiles; - aPanel->setMode( anAllMode ); - onModeActivated( anAllMode ); + onModeActivated( HYDROGUI_GeoreferencementDlg::AllProfiles ); } else if ( myInitialMode == Selected ) { - int aSelectionMode = HYDROGUI_GeoreferencementDlg::SelectedProfiles; - aPanel->setMode( aSelectionMode ); - onModeActivated( aSelectionMode ); + onModeActivated( HYDROGUI_GeoreferencementDlg::SelectedProfiles ); } LightApp_Application* anApp = module()->getApp(); @@ -81,20 +76,33 @@ void HYDROGUI_GeoreferencementOp::startOperation() dynamic_cast( anApp->getViewManager( OCCViewer_Viewer::Type(), false ) ); if ( aViewManager ) { connect( aViewManager, SIGNAL( mousePress( SUIT_ViewWindow*, QMouseEvent* ) ), - aPanel, SLOT( onMousePress( SUIT_ViewWindow*, QMouseEvent* ) ) ); + aPanel, SLOT( onMousePress( SUIT_ViewWindow*, QMouseEvent* ) ), + Qt::UniqueConnection ); } connect( anApp->desktop(), SIGNAL( windowActivated( SUIT_ViewWindow* ) ), - this, SLOT( onWindowActivated( SUIT_ViewWindow* ) ) ); + this, SLOT( onWindowActivated( SUIT_ViewWindow* ) ), Qt::UniqueConnection ); } void HYDROGUI_GeoreferencementOp::abortOperation() { + LightApp_Application* anApp = module()->getApp(); + if ( anApp && anApp->desktop() ) { + anApp->desktop()->disconnect( this ); + } + + restoreCursor(); HYDROGUI_Operation::abortOperation(); } void HYDROGUI_GeoreferencementOp::commitOperation() { + LightApp_Application* anApp = module()->getApp(); + if ( anApp && anApp->desktop() ) { + anApp->desktop()->disconnect( this ); + } + + restoreCursor(); HYDROGUI_Operation::commitOperation(); } @@ -102,14 +110,16 @@ HYDROGUI_InputPanel* HYDROGUI_GeoreferencementOp::createInputPanel() const { HYDROGUI_InputPanel* aPanel = new HYDROGUI_GeoreferencementDlg( module(), getName() ); connect( aPanel, SIGNAL( modeActivated( int ) ), SLOT( onModeActivated( int ) ) ); + connect( aPanel, SIGNAL( updateSelection() ), SLOT( onUpdateSelection() ) ); return aPanel; } bool HYDROGUI_GeoreferencementOp::processApply( int& theUpdateFlags, - QString& theErrorMsg ) + QString& theErrorMsg, + QStringList& theBrowseObjectsEntries ) { - theUpdateFlags = UF_Model; + theUpdateFlags = UF_Model | UF_OCCViewer | UF_OCC_Forced | UF_VTKViewer | UF_VTK_Forced | UF_VTK_Init; return store( theErrorMsg ); } @@ -125,23 +135,47 @@ void HYDROGUI_GeoreferencementOp::onModeActivated( const int theActualMode ) return; } - // Store the dialog data to the data model - if ( !store( anErrorMsg ) ) { - aPanel->setMode( theActualMode == HYDROGUI_GeoreferencementDlg::AllProfiles ? - HYDROGUI_GeoreferencementDlg::SelectedProfiles : - HYDROGUI_GeoreferencementDlg::AllProfiles ); + aPanel->setMode( theActualMode == HYDROGUI_GeoreferencementDlg::AllProfiles ? + HYDROGUI_GeoreferencementDlg::SelectedProfiles : + HYDROGUI_GeoreferencementDlg::AllProfiles); - if ( anErrorMsg.isEmpty() ) { - anErrorMsg = tr( "INSUFFICIENT_INPUT_DATA" ); + // Store the dialog data to the data model + bool isToStore = false; + // Check if modifications exists + if ( aPanel->isModified() ) { + // Show confirmation dialog + SUIT_MessageBox::StandardButtons aButtons = + SUIT_MessageBox::Yes | SUIT_MessageBox::No; + + isToStore = SUIT_MessageBox::question( module()->getApp()->desktop(), + tr( "CONFIRMATION" ), + tr( "CONFIRM_STORE" ), + aButtons, + SUIT_MessageBox::Yes) == SUIT_MessageBox::Yes; + } + // Store modifications if needed + if ( isToStore ) + { + startDocOperation(); + if ( !store( anErrorMsg ) ) + { + abortDocOperation(); + + anErrorMsg.append( "\n" + tr( "INPUT_VALID_DATA" ) ); + SUIT_MessageBox::critical( module()->getApp()->desktop(), + tr( "INSUFFICIENT_INPUT_DATA" ), + anErrorMsg ); + return; + } + else + { + commitDocOperation(); } - SUIT_MessageBox::critical( module()->getApp()->desktop(), - tr( "ERROR" ), - anErrorMsg ); - return; } - // Get georeferencement data from the data model - HYDROGUI_GeoreferencementDlg::ProfilesGeoDataMap aDataMap; + aPanel->setMode( theActualMode ); + + // Get the list of profiles HYDROData_SequenceOfObjects aSeqOfProfiles; if( theActualMode == HYDROGUI_GeoreferencementDlg::AllProfiles ) { @@ -154,28 +188,8 @@ void HYDROGUI_GeoreferencementOp::onModeActivated( const int theActualMode ) aSeqOfProfiles = HYDROGUI_Tool::GetSelectedObjects( module() ); } - HYDROData_SequenceOfObjects::Iterator anIter( aSeqOfProfiles ); - for ( ; anIter.More(); anIter.Next() ) { - Handle(HYDROData_Profile) aProfile = - Handle(HYDROData_Profile)::DownCast( anIter.Value() ); - if ( aProfile.IsNull() ) { - continue; - } - - HYDROGUI_GeoreferencementDlg::ProfileGeoData aGeoData; - - gp_XY aFirstPoint, aLastPoint; - if ( aProfile->GetFirstPoint( aFirstPoint ) && aProfile->GetLastPoint( aLastPoint ) ) { - aGeoData = - HYDROGUI_GeoreferencementDlg::ProfileGeoData( aFirstPoint.X(), aFirstPoint.Y(), - aLastPoint.X(), aLastPoint.Y() ); - } - - aDataMap.insert( aProfile->GetName(), aGeoData ); - } - - // Set the collected data to the dialog - aPanel->setData( aDataMap ); + // Set the profiles to the panel + setPanelData( aSeqOfProfiles ); } void HYDROGUI_GeoreferencementOp::onWindowActivated( SUIT_ViewWindow* theViewWindow ) @@ -192,7 +206,8 @@ void HYDROGUI_GeoreferencementOp::onWindowActivated( SUIT_ViewWindow* theViewWin ::qobject_cast( inputPanel() ); if ( aPanel ) { connect( aViewManager, SIGNAL( mousePress( SUIT_ViewWindow*, QMouseEvent* ) ), - aPanel, SLOT( onMousePress( SUIT_ViewWindow*, QMouseEvent* ) ) ); + aPanel, SLOT( onMousePress( SUIT_ViewWindow*, QMouseEvent* ) ), + Qt::UniqueConnection); } } } @@ -201,6 +216,8 @@ bool HYDROGUI_GeoreferencementOp::store( QString& theErrorMsg ) { // Clear the error string theErrorMsg.clear(); + + HYDROGUI_Module* aModule = module(); // Get the panel HYDROGUI_GeoreferencementDlg* aPanel = @@ -210,39 +227,91 @@ bool HYDROGUI_GeoreferencementOp::store( QString& theErrorMsg ) } // Get georeferencement data from the panel - HYDROGUI_GeoreferencementDlg::ProfilesGeoDataMap aGeoDataMap; - aPanel->getData( aGeoDataMap ); - - if ( aGeoDataMap.empty() ) { + HYDROGUI_GeoreferencementDlg::ProfilesGeoDataList aGeoDataList; + aPanel->getData( aGeoDataList ); + if ( aGeoDataList.empty() ) { return true; } // Check the data validity - foreach ( const QString& aProfileName, aGeoDataMap.keys() ) { - HYDROGUI_GeoreferencementDlg::ProfileGeoData aGeoData = - aGeoDataMap.value( aProfileName ); + foreach ( const HYDROGUI_GeoreferencementDlg::ProfileGeoData& aGeoData, aGeoDataList ) { if ( aGeoData.isIncomplete ) { - theErrorMsg = tr( "INCOMPLETE_DATA" ).arg( aProfileName ); + theErrorMsg = tr( "INCOMPLETE_DATA" ).arg( aGeoData.Name ); return false; } } // Store the data in the data model - foreach ( const QString& aProfileName, aGeoDataMap.keys() ) { + foreach ( const HYDROGUI_GeoreferencementDlg::ProfileGeoData& aGeoData, aGeoDataList ) { Handle(HYDROData_Profile) aProfile = Handle(HYDROData_Profile)::DownCast( - HYDROGUI_Tool::FindObjectByName( module(), aProfileName, KIND_PROFILE ) ); + HYDROGUI_Tool::FindObjectByName( module(), aGeoData.Name, KIND_PROFILE ) ); if ( !aProfile.IsNull() ) { - HYDROGUI_GeoreferencementDlg::ProfileGeoData aGeoData = - aGeoDataMap.value( aProfileName ); if ( !aGeoData.isEmpty ) { - aProfile->SetFirstPoint( gp_XY( aGeoData.Xg, aGeoData.Yg ) ); - aProfile->SetLastPoint( gp_XY( aGeoData.Xd, aGeoData.Yd ) ); + if ( !aProfile->IsValid() ) // Show the profile after it became valid + aModule->setObjectVisible( HYDROGUI_Tool::GetActiveOCCViewId( aModule ), aProfile, true ); + + aProfile->SetLeftPoint( gp_XY( aGeoData.Xg, aGeoData.Yg ), false ); + aProfile->SetRightPoint( gp_XY( aGeoData.Xd, aGeoData.Yd ), false ); } else { aProfile->Invalidate(); + aModule->setObjectVisible( HYDROGUI_Tool::GetActiveOCCViewId( aModule ), aProfile, false ); } + + aProfile->Update(); } } + aModule->update( UF_Model | UF_OCCViewer | UF_OCC_Forced ); + return true; } + +void HYDROGUI_GeoreferencementOp::onUpdateSelection() +{ + // Get the selected profiles + HYDROData_SequenceOfObjects aSeqOfProfiles = + HYDROGUI_Tool::GetSelectedObjects( module() ); + + // Set them to the dialog + setPanelData( aSeqOfProfiles ); +} + +void HYDROGUI_GeoreferencementOp::setPanelData( + const HYDROData_SequenceOfObjects& theProfiles ) +{ + // Get the panel + HYDROGUI_GeoreferencementDlg* aPanel = + ::qobject_cast( inputPanel() ); + if ( !aPanel ) { + return; + } + + // Get georeferencement data from the data model + HYDROGUI_GeoreferencementDlg::ProfilesGeoDataList aData; + + HYDROData_SequenceOfObjects::Iterator anIter( theProfiles ); + for ( ; anIter.More(); anIter.Next() ) { + Handle(HYDROData_Profile) aProfile = + Handle(HYDROData_Profile)::DownCast( anIter.Value() ); + if ( aProfile.IsNull() ) { + continue; + } + + HYDROGUI_GeoreferencementDlg::ProfileGeoData aGeoData( aProfile->GetName() ); + + gp_XY aFirstPoint, aLastPoint; + if ( aProfile->GetLeftPoint( aFirstPoint, false ) && + aProfile->GetRightPoint( aLastPoint, false ) ) { + aGeoData = + HYDROGUI_GeoreferencementDlg::ProfileGeoData( aGeoData.Name, + aFirstPoint.X(), aFirstPoint.Y(), + aLastPoint.X(), aLastPoint.Y() ); + } + + aData.append( aGeoData ); + } + + // Set the collected data to the dialog + aPanel->setData( aData ); +} \ No newline at end of file