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 50eb1cad4695421d2b0b130e729faf04f4938535..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 );
@@
-92,6
+91,7
@@
void HYDROGUI_GeoreferencementOp::abortOperation()
anApp->desktop()->disconnect( this );
}
anApp->desktop()->disconnect( this );
}
+ restoreCursor();
HYDROGUI_Operation::abortOperation();
}
HYDROGUI_Operation::abortOperation();
}
@@
-102,6
+102,7
@@
void HYDROGUI_GeoreferencementOp::commitOperation()
anApp->desktop()->disconnect( this );
}
anApp->desktop()->disconnect( this );
}
+ restoreCursor();
HYDROGUI_Operation::commitOperation();
}
HYDROGUI_Operation::commitOperation();
}
@@
-115,7
+116,8
@@
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 | UF_VTKViewer | UF_VTK_Forced | UF_VTK_Init;
{
theUpdateFlags = UF_Model | UF_OCCViewer | UF_OCC_Forced | UF_VTKViewer | UF_VTK_Forced | UF_VTK_Init;
@@
-152,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 );
@@
-238,8
+251,8
@@
bool HYDROGUI_GeoreferencementOp::store( QString& theErrorMsg )
if ( !aProfile->IsValid() ) // Show the profile after it became valid
aModule->setObjectVisible( HYDROGUI_Tool::GetActiveOCCViewId( aModule ), aProfile, true );
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 ) );
- aProfile->SetRightPoint( gp_XY( aGeoData.Xd, aGeoData.Yd ) );
+ 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 );
} else {
aProfile->Invalidate();
aModule->setObjectVisible( HYDROGUI_Tool::GetActiveOCCViewId( aModule ), aProfile, false );
@@
-250,7
+263,6
@@
bool HYDROGUI_GeoreferencementOp::store( QString& theErrorMsg )
}
aModule->update( UF_Model | UF_OCCViewer | UF_OCC_Forced );
}
aModule->update( UF_Model | UF_OCCViewer | UF_OCC_Forced );
- commitDocOperation(); // TODO: analyze the consequences
return true;
}
return true;
}
@@
-289,7
+301,8
@@
void HYDROGUI_GeoreferencementOp::setPanelData(
HYDROGUI_GeoreferencementDlg::ProfileGeoData aGeoData( aProfile->GetName() );
gp_XY aFirstPoint, aLastPoint;
HYDROGUI_GeoreferencementDlg::ProfileGeoData aGeoData( aProfile->GetName() );
gp_XY aFirstPoint, aLastPoint;
- if ( aProfile->GetLeftPoint( aFirstPoint ) && aProfile->GetRightPoint( aLastPoint ) ) {
+ if ( aProfile->GetLeftPoint( aFirstPoint, false ) &&
+ aProfile->GetRightPoint( aLastPoint, false ) ) {
aGeoData =
HYDROGUI_GeoreferencementDlg::ProfileGeoData( aGeoData.Name,
aFirstPoint.X(), aFirstPoint.Y(),
aGeoData =
HYDROGUI_GeoreferencementDlg::ProfileGeoData( aGeoData.Name,
aFirstPoint.X(), aFirstPoint.Y(),