{
QString aName = myEditedObject->GetName();
QString aFileName = myEditedObject->GetFilePath();
+ bool anIsAltitudesInverted = myEditedObject->IsAltitudesInverted();
+
aPanel->setObjectName( aName );
aPanel->setFileName( aFileName );
+ aPanel->setInvertAltitudes( anIsAltitudesInverted );
}
}
}
}
QString aFileName = aPanel->getFileName().simplified();
+ bool anIsInvertAltitudes = aPanel->isInvertAltitudes();
+
if ( aFileName.isEmpty() )
{
theErrorMsg = tr( "INCORRECT_FILE_NAME" );
if ( aBathymetryObj.IsNull() )
return false;
- if ( !aBathymetryObj->ImportFromFile( aFileName ) )
+ QString anOldFileName = aBathymetryObj->GetFilePath();
+ if ( aFileName != anOldFileName )
{
- theErrorMsg = tr( "BAD_IMPORTED_BATHYMETRY_FILE" ).arg( aFileName );
- return false;
+ aBathymetryObj->SetAltitudesInverted( anIsInvertAltitudes, false );
+ if ( !aBathymetryObj->ImportFromFile( aFileName ) )
+ {
+ theErrorMsg = tr( "BAD_IMPORTED_BATHYMETRY_FILE" ).arg( aFileName );
+ return false;
+ }
+ }
+ else if ( anIsInvertAltitudes != aBathymetryObj->IsAltitudesInverted() )
+ {
+ aBathymetryObj->SetAltitudesInverted( anIsInvertAltitudes );
}
aBathymetryObj->SetName( anObjectName );
return;
QString anObjectName = aPanel->getObjectName().simplified();
- if ( anObjectName.isEmpty() )
+ //if ( anObjectName.isEmpty() )
{
anObjectName = aPanel->getFileName();
if ( !anObjectName.isEmpty() ) {