Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'BR_LCM_COMP' into HEAD
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_GeoreferencementOp.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_GeoreferencementOp.cxx
b/src/HYDROGUI/HYDROGUI_GeoreferencementOp.cxx
index 269cd83e7d2f72e0ed9941e7612f72f263b0a584..eb89f4c471b89df580dae8eeecf46d1b5ef238c1 100644
(file)
--- 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
// 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
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-65,6
+61,9
@@
void HYDROGUI_GeoreferencementOp::startOperation()
}
aPanel->reset();
}
aPanel->reset();
+ setPreviewManager( ::qobject_cast<OCCViewer_ViewManager*>(
+ module()->getApp()->getViewManager( OCCViewer_Viewer::Type(), true ) ) );
+ setCursor();
if ( myInitialMode == All ) {
onModeActivated( HYDROGUI_GeoreferencementDlg::AllProfiles );
if ( myInitialMode == All ) {
onModeActivated( HYDROGUI_GeoreferencementDlg::AllProfiles );
@@
-77,20
+76,33
@@
void HYDROGUI_GeoreferencementOp::startOperation()
dynamic_cast<OCCViewer_ViewManager*>( anApp->getViewManager( OCCViewer_Viewer::Type(), false ) );
if ( aViewManager ) {
connect( aViewManager, SIGNAL( mousePress( SUIT_ViewWindow*, QMouseEvent* ) ),
dynamic_cast<OCCViewer_ViewManager*>( 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* ) ),
}
connect( anApp->desktop(), SIGNAL( windowActivated( SUIT_ViewWindow* ) ),
- this, SLOT( onWindowActivated( SUIT_ViewWindow* ) ) );
+ this, SLOT( onWindowActivated( SUIT_ViewWindow* ) )
, Qt::UniqueConnection
);
}
void HYDROGUI_GeoreferencementOp::abortOperation()
{
}
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()
{
HYDROGUI_Operation::abortOperation();
}
void HYDROGUI_GeoreferencementOp::commitOperation()
{
+ LightApp_Application* anApp = module()->getApp();
+ if ( anApp && anApp->desktop() ) {
+ anApp->desktop()->disconnect( this );
+ }
+
+ restoreCursor();
HYDROGUI_Operation::commitOperation();
}
HYDROGUI_Operation::commitOperation();
}
@@
-104,9
+116,10
@@
HYDROGUI_InputPanel* HYDROGUI_GeoreferencementOp::createInputPanel() const
}
bool HYDROGUI_GeoreferencementOp::processApply( int& theUpdateFlags,
}
bool HYDROGUI_GeoreferencementOp::processApply( int& theUpdateFlags,
- QString& theErrorMsg )
+ QString& theErrorMsg,
+ QStringList& theBrowseObjectsEntries )
{
{
- theUpdateFlags = UF_Model | UF_OCCViewer | UF_OCC_Forced;
+ theUpdateFlags = UF_Model | UF_OCCViewer | UF_OCC_Forced
| UF_VTKViewer | UF_VTK_Forced | UF_VTK_Init
;
return store( theErrorMsg );
}
return store( theErrorMsg );
}
@@
-141,12
+154,23
@@
void HYDROGUI_GeoreferencementOp::onModeActivated( const int theActualMode )
SUIT_MessageBox::Yes) == SUIT_MessageBox::Yes;
}
// Store modifications if needed
SUIT_MessageBox::Yes) == SUIT_MessageBox::Yes;
}
// Store modifications if needed
- if ( isToStore && !store( anErrorMsg ) ) {
- anErrorMsg.append( "\n" + tr( "INPUT_VALID_DATA" ) );
- SUIT_MessageBox::critical( module()->getApp()->desktop(),
- tr( "INSUFFICIENT_INPUT_DATA" ),
- anErrorMsg );
- return;
+ 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();
+ }
}
aPanel->setMode( theActualMode );
}
aPanel->setMode( theActualMode );
@@
-182,7
+206,8
@@
void HYDROGUI_GeoreferencementOp::onWindowActivated( SUIT_ViewWindow* theViewWin
::qobject_cast<HYDROGUI_GeoreferencementDlg*>( inputPanel() );
if ( aPanel ) {
connect( aViewManager, SIGNAL( mousePress( SUIT_ViewWindow*, QMouseEvent* ) ),
::qobject_cast<HYDROGUI_GeoreferencementDlg*>( inputPanel() );
if ( aPanel ) {
connect( aViewManager, SIGNAL( mousePress( SUIT_ViewWindow*, QMouseEvent* ) ),
- aPanel, SLOT( onMousePress( SUIT_ViewWindow*, QMouseEvent* ) ) );
+ aPanel, SLOT( onMousePress( SUIT_ViewWindow*, QMouseEvent* ) ),
+ Qt::UniqueConnection);
}
}
}
}
}
}
@@
-191,6
+216,8
@@
bool HYDROGUI_GeoreferencementOp::store( QString& theErrorMsg )
{
// Clear the error string
theErrorMsg.clear();
{
// Clear the error string
theErrorMsg.clear();
+
+ HYDROGUI_Module* aModule = module();
// Get the panel
HYDROGUI_GeoreferencementDlg* aPanel =
// Get the panel
HYDROGUI_GeoreferencementDlg* aPanel =
@@
-200,44
+227,42
@@
bool HYDROGUI_GeoreferencementOp::store( QString& theErrorMsg )
}
// Get georeferencement data from the panel
}
// 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
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 ) {
if ( aGeoData.isIncomplete ) {
- theErrorMsg = tr( "INCOMPLETE_DATA" ).arg( a
Profile
Name );
+ theErrorMsg = tr( "INCOMPLETE_DATA" ).arg( a
GeoData.
Name );
return false;
}
}
// Store the data in the data model
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(
Handle(HYDROData_Profile) aProfile =
Handle(HYDROData_Profile)::DownCast(
- HYDROGUI_Tool::FindObjectByName( module(), a
Profile
Name, KIND_PROFILE ) );
+ HYDROGUI_Tool::FindObjectByName( module(), a
GeoData.
Name, KIND_PROFILE ) );
if ( !aProfile.IsNull() ) {
if ( !aProfile.IsNull() ) {
- HYDROGUI_GeoreferencementDlg::ProfileGeoData aGeoData =
- aGeoDataMap.value( aProfileName );
if ( !aGeoData.isEmpty ) {
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();
} else {
aProfile->Invalidate();
+ aModule->setObjectVisible( HYDROGUI_Tool::GetActiveOCCViewId( aModule ), aProfile, false );
}
aProfile->Update();
}
}
}
aProfile->Update();
}
}
- module()->update( UF_Model | UF_OCCViewer | UF_OCC_Forced );
- commitDocOperation(); // TODO: analyze the consequences
+ aModule->update( UF_Model | UF_OCCViewer | UF_OCC_Forced );
return true;
}
return true;
}
@@
-263,7
+288,7
@@
void HYDROGUI_GeoreferencementOp::setPanelData(
}
// Get georeferencement data from the data model
}
// Get georeferencement data from the data model
- HYDROGUI_GeoreferencementDlg::ProfilesGeoData
Map aDataMap
;
+ HYDROGUI_GeoreferencementDlg::ProfilesGeoData
List aData
;
HYDROData_SequenceOfObjects::Iterator anIter( theProfiles );
for ( ; anIter.More(); anIter.Next() ) {
HYDROData_SequenceOfObjects::Iterator anIter( theProfiles );
for ( ; anIter.More(); anIter.Next() ) {
@@
-273,18
+298,20
@@
void HYDROGUI_GeoreferencementOp::setPanelData(
continue;
}
continue;
}
- HYDROGUI_GeoreferencementDlg::ProfileGeoData aGeoData;
+ HYDROGUI_GeoreferencementDlg::ProfileGeoData aGeoData
( aProfile->GetName() )
;
gp_XY aFirstPoint, aLastPoint;
gp_XY aFirstPoint, aLastPoint;
- if ( aProfile->GetFirstPoint( aFirstPoint ) && aProfile->GetLastPoint( aLastPoint ) ) {
+ if ( aProfile->GetLeftPoint( aFirstPoint, false ) &&
+ aProfile->GetRightPoint( aLastPoint, false ) ) {
aGeoData =
aGeoData =
- HYDROGUI_GeoreferencementDlg::ProfileGeoData( aFirstPoint.X(), aFirstPoint.Y(),
+ HYDROGUI_GeoreferencementDlg::ProfileGeoData( aGeoData.Name,
+ aFirstPoint.X(), aFirstPoint.Y(),
aLastPoint.X(), aLastPoint.Y() );
}
aLastPoint.X(), aLastPoint.Y() );
}
- aData
Map.insert( aProfile->GetName(),
aGeoData );
+ aData
.append(
aGeoData );
}
// Set the collected data to the dialog
}
// Set the collected data to the dialog
- aPanel->setData( aData
Map
);
+ aPanel->setData( aData );
}
\ No newline at end of file
}
\ No newline at end of file