-// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2015 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
// 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
#include "HYDROGUI_ImportBathymetryOp.h"
#include "HYDROGUI_DataModel.h"
+#include "HYDROGUI_DataObject.h"
#include "HYDROGUI_ImportBathymetryDlg.h"
#include "HYDROGUI_Module.h"
#include "HYDROGUI_Tool.h"
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->setInvertAltitudes( anIsAltitudesInverted );
}
}
}
}
bool HYDROGUI_ImportBathymetryOp::processApply( int& theUpdateFlags,
- QString& theErrorMsg )
+ QString& theErrorMsg,
+ QStringList& theBrowseObjectsEntries )
{
HYDROGUI_ImportBathymetryDlg* aPanel =
::qobject_cast<HYDROGUI_ImportBathymetryDlg*>( inputPanel() );
}
QString aFileName = aPanel->getFileName().simplified();
+ bool anIsInvertAltitudes = aPanel->isInvertAltitudes();
+
if ( aFileName.isEmpty() )
{
theErrorMsg = tr( "INCORRECT_FILE_NAME" );
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;
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->Update();
+
// Activate VTK viewer and show the bathymetry
SUIT_ViewManager* aVTKMgr = 0;
SUIT_ViewManager* aViewMgr = module()->getApp()->activeViewManager();
aVTKMgr = module()->getApp()->viewManager( SVTK_Viewer::Type() );
}
}
+
+ /*
// If there is no VTK viewer yet then create a new one
if ( !aVTKMgr )
{
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_Init | UF_VTK_Forced;
return true;
}
return;
QString anObjectName = aPanel->getObjectName().simplified();
- if ( anObjectName.isEmpty() )
+ //if ( anObjectName.isEmpty() )
{
anObjectName = aPanel->getFileName();
if ( !anObjectName.isEmpty() ) {