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
refs #727, #736: fix for the first bug and for the second part (Bug2) of the last...
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_ImportBathymetryOp.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_ImportBathymetryOp.cxx
b/src/HYDROGUI/HYDROGUI_ImportBathymetryOp.cxx
index 8fb9c815ab706ad2d6ba76311fe57dc763f5ca54..d8b3abbcbed60229142e862776e673b9dd715e6c 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_ImportBathymetryOp.cxx
+++ b/
src/HYDROGUI/HYDROGUI_ImportBathymetryOp.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
@@
-23,9
+19,11
@@
#include "HYDROGUI_ImportBathymetryOp.h"
#include "HYDROGUI_DataModel.h"
#include "HYDROGUI_ImportBathymetryOp.h"
#include "HYDROGUI_DataModel.h"
+#include "HYDROGUI_DataObject.h"
#include "HYDROGUI_ImportBathymetryDlg.h"
#include "HYDROGUI_Module.h"
#include "HYDROGUI_Tool.h"
#include "HYDROGUI_ImportBathymetryDlg.h"
#include "HYDROGUI_Module.h"
#include "HYDROGUI_Tool.h"
+#include "HYDROGUI_Tool2.h"
#include "HYDROGUI_UpdateFlags.h"
#include <HYDROData_Bathymetry.h>
#include "HYDROGUI_UpdateFlags.h"
#include <HYDROData_Bathymetry.h>
@@
-62,13
+60,17
@@
void HYDROGUI_ImportBathymetryOp::startOperation()
if( myIsEdit )
{
if( myIsEdit )
{
- myEditedObject = Handle(HYDROData_Bathymetry)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) );
+ if ( isApplyAndClose() )
+ myEditedObject = Handle(HYDROData_Bathymetry)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) );
if( !myEditedObject.IsNull() )
{
QString aName = myEditedObject->GetName();
if( !myEditedObject.IsNull() )
{
QString aName = myEditedObject->GetName();
- QString aFileName = myEditedObject->GetFilePath();
+ QString aFileName = HYDROGUI_Tool::ToQString( myEditedObject->GetFilePath() );
+ bool anIsAltitudesInverted = myEditedObject->IsAltitudesInverted();
+
aPanel->setObjectName( aName );
aPanel->setFileName( aFileName );
aPanel->setObjectName( aName );
aPanel->setFileName( aFileName );
+ aPanel->setInvertAltitudes( anIsAltitudesInverted );
}
}
}
}
}
}
@@
-93,7
+95,8
@@
HYDROGUI_InputPanel* HYDROGUI_ImportBathymetryOp::createInputPanel() const
}
bool HYDROGUI_ImportBathymetryOp::processApply( int& theUpdateFlags,
}
bool HYDROGUI_ImportBathymetryOp::processApply( int& theUpdateFlags,
- QString& theErrorMsg )
+ QString& theErrorMsg,
+ QStringList& theBrowseObjectsEntries )
{
HYDROGUI_ImportBathymetryDlg* aPanel =
::qobject_cast<HYDROGUI_ImportBathymetryDlg*>( inputPanel() );
{
HYDROGUI_ImportBathymetryDlg* aPanel =
::qobject_cast<HYDROGUI_ImportBathymetryDlg*>( inputPanel() );
@@
-108,6
+111,8
@@
bool HYDROGUI_ImportBathymetryOp::processApply( int& theUpdateFlags,
}
QString aFileName = aPanel->getFileName().simplified();
}
QString aFileName = aPanel->getFileName().simplified();
+ bool anIsInvertAltitudes = aPanel->isInvertAltitudes();
+
if ( aFileName.isEmpty() )
{
theErrorMsg = tr( "INCORRECT_FILE_NAME" );
if ( aFileName.isEmpty() )
{
theErrorMsg = tr( "INCORRECT_FILE_NAME" );
@@
-121,12
+126,15
@@
bool HYDROGUI_ImportBathymetryOp::processApply( int& theUpdateFlags,
return false;
}
return false;
}
- // check that there are no other objects with the same name in the document
- Handle(HYDROData_Entity) anObject = HYDROGUI_Tool::FindObjectByName( module(), anObjectName );
- if ( ( !myIsEdit ) && ( !anObject.IsNull() ) )
+ if( !myIsEdit || ( !myEditedObject.IsNull() && myEditedObject->GetName() != anObjectName ) )
{
{
- theErrorMsg = tr( "OBJECT_EXISTS_IN_DOCUMENT" ).arg( anObjectName );
- return false;
+ // check that there are no other objects with the same name in the document
+ Handle(HYDROData_Entity) anObject = HYDROGUI_Tool::FindObjectByName( module(), anObjectName );
+ if( !anObject.IsNull() )
+ {
+ theErrorMsg = tr( "OBJECT_EXISTS_IN_DOCUMENT" ).arg( anObjectName );
+ return false;
+ }
}
Handle(HYDROData_Bathymetry) aBathymetryObj;
}
Handle(HYDROData_Bathymetry) aBathymetryObj;
@@
-142,14
+150,25
@@
bool HYDROGUI_ImportBathymetryOp::processApply( int& theUpdateFlags,
if ( aBathymetryObj.IsNull() )
return false;
if ( aBathymetryObj.IsNull() )
return false;
- if ( !aBathymetryObj->ImportFromFile( aFileName ) )
+ QString anOldFileName = HYDROGUI_Tool::ToQString( aBathymetryObj->GetFilePath() );
+ if ( aFileName != anOldFileName )
{
{
- theErrorMsg = tr( "BAD_IMPORTED_BATHYMETRY_FILE" ).arg( aFileName );
- return false;
+ aBathymetryObj->SetAltitudesInverted( anIsInvertAltitudes, false );
+ if ( !aBathymetryObj->ImportFromFile( HYDROGUI_Tool::ToAsciiString( aFileName ) ) )
+ {
+ theErrorMsg = tr( "BAD_IMPORTED_BATHYMETRY_FILE" ).arg( aFileName );
+ return false;
+ }
+ }
+ else if ( anIsInvertAltitudes != aBathymetryObj->IsAltitudesInverted() )
+ {
+ aBathymetryObj->SetAltitudesInverted( anIsInvertAltitudes );
}
aBathymetryObj->SetName( anObjectName );
}
aBathymetryObj->SetName( anObjectName );
+ aBathymetryObj->Update();
+
// Activate VTK viewer and show the bathymetry
SUIT_ViewManager* aVTKMgr = 0;
SUIT_ViewManager* aViewMgr = module()->getApp()->activeViewManager();
// Activate VTK viewer and show the bathymetry
SUIT_ViewManager* aVTKMgr = 0;
SUIT_ViewManager* aViewMgr = module()->getApp()->activeViewManager();
@@
-165,6
+184,8
@@
bool HYDROGUI_ImportBathymetryOp::processApply( int& theUpdateFlags,
aVTKMgr = module()->getApp()->viewManager( SVTK_Viewer::Type() );
}
}
aVTKMgr = module()->getApp()->viewManager( SVTK_Viewer::Type() );
}
}
+
+ /*
// If there is no VTK viewer yet then create a new one
if ( !aVTKMgr )
{
// If there is no VTK viewer yet then create a new one
if ( !aVTKMgr )
{
@@
-174,9
+195,17
@@
bool HYDROGUI_ImportBathymetryOp::processApply( int& theUpdateFlags,
if ( aVTKMgr )
{
module()->setObjectVisible( (size_t)aVTKMgr->getViewModel(), aBathymetryObj, true );
if ( aVTKMgr )
{
module()->setObjectVisible( (size_t)aVTKMgr->getViewModel(), aBathymetryObj, true );
+ }*/
+
+ theUpdateFlags = UF_Model | UF_OCCViewer | UF_OCC_Forced |
+ UF_VTKViewer | UF_VTK_Forced;
+
+ if( !myIsEdit )
+ {
+ QString anEntry = HYDROGUI_DataObject::dataObjectEntry( aBathymetryObj );
+ theBrowseObjectsEntries.append( anEntry );
}
}
- theUpdateFlags = UF_Model | UF_VTKViewer | UF_VTK_Forced;
return true;
}
return true;
}
@@
-188,9
+217,16
@@
void HYDROGUI_ImportBathymetryOp::onFileSelected()
return;
QString anObjectName = aPanel->getObjectName().simplified();
return;
QString anObjectName = aPanel->getObjectName().simplified();
- if ( anObjectName.isEmpty() )
+
//
if ( anObjectName.isEmpty() )
{
{
- anObjectName = HYDROGUI_Tool::GenerateObjectName( module(), tr( "DEFAULT_BATHYMETRY_NAME" ) );
+ anObjectName = aPanel->getFileName();
+ if ( !anObjectName.isEmpty() ) {
+ anObjectName = QFileInfo( anObjectName ).baseName();
+ }
+
+ if ( anObjectName.isEmpty() ) {
+ anObjectName = HYDROGUI_Tool::GenerateObjectName( module(), tr( "DEFAULT_BATHYMETRY_NAME" ) );
+ }
aPanel->setObjectName( anObjectName );
}
}
aPanel->setObjectName( anObjectName );
}
}