#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 );
}
bool HYDROGUI_ImportBathymetryOp::processApply( int& theUpdateFlags,
- QString& theErrorMsg )
+ QString& theErrorMsg,
+ QStringList& theBrowseObjectsEntries )
{
HYDROGUI_ImportBathymetryDlg* aPanel =
::qobject_cast<HYDROGUI_ImportBathymetryDlg*>( inputPanel() );
if ( aBathymetryObj.IsNull() )
return false;
- QString anOldFileName = aBathymetryObj->GetFilePath();
+ QString anOldFileName = HYDROGUI_Tool::ToQString( aBathymetryObj->GetFilePath() );
if ( aFileName != anOldFileName )
{
aBathymetryObj->SetAltitudesInverted( anIsInvertAltitudes, false );
- if ( !aBathymetryObj->ImportFromFile( aFileName ) )
+ if ( !aBathymetryObj->ImportFromFile( HYDROGUI_Tool::ToAsciiString( aFileName ) ) )
{
theErrorMsg = tr( "BAD_IMPORTED_BATHYMETRY_FILE" ).arg( aFileName );
return false;
}
theUpdateFlags = UF_Model | UF_VTKViewer | UF_VTK_Init | UF_VTK_Forced;
+
+ if( !myIsEdit )
+ {
+ QString anEntry = HYDROGUI_DataObject::dataObjectEntry( aBathymetryObj );
+ theBrowseObjectsEntries.append( anEntry );
+ }
+
return true;
}
return;
QString anObjectName = aPanel->getObjectName().simplified();
- if ( anObjectName.isEmpty() )
+ //if ( anObjectName.isEmpty() )
{
anObjectName = aPanel->getFileName();
if ( !anObjectName.isEmpty() ) {