From e6ba472a35697c617fffa0210c7dd4aac19cdca9 Mon Sep 17 00:00:00 2001 From: vsr Date: Thu, 4 Oct 2007 08:54:54 +0000 Subject: [PATCH] *** empty log message *** --- src/VISU_I/VISU_Result_i.cc | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/VISU_I/VISU_Result_i.cc b/src/VISU_I/VISU_Result_i.cc index 5349251f..10ad7df1 100644 --- a/src/VISU_I/VISU_Result_i.cc +++ b/src/VISU_I/VISU_Result_i.cc @@ -783,7 +783,7 @@ namespace VISU try { multipr::Obj multiprObj; - multiprObj.create((const char*)theResult->GetFileInfoMultipr().absoluteFileName().toLatin1()); + multiprObj.create((const char*)theResult->GetFileInfoMultipr().filePath().toLatin1()); if (multiprObj.isValidDistributedMEDFile()) { theResult->SetIsDistributedMEDMultipr(true); @@ -1373,7 +1373,7 @@ VISU::Result_i } else { #ifdef ENABLE_MULTIPR - if (strlen((const char*)GetFileInfoMultipr().absoluteFilePath().toLatin1()) == 0) + if (strlen((const char*)GetFileInfoMultipr().filePath().toLatin1()) == 0) #endif { // sequential MED file @@ -1500,7 +1500,7 @@ Create(const char* theFileName) throw std::runtime_error("distributed MED file; bad format"); //cout << "MULTIPR: original med file=" << originalMEDFileName << endl; - myFileInfoMultipr.setFile(myFileInfo.absoluteFilePath()); + myFileInfoMultipr.setFile(myFileInfo.filePath()); myFileInfo.setFile(originalMEDFileName); } else @@ -1675,9 +1675,9 @@ VISU::Result_i myFileInfo.setFile(aFileName.c_str()); } if(MYDEBUG) - MESSAGE("Result_i::Restore - aFileName = " << (const char*)myFileInfo.absoluteFilePath().toLatin1() << "; " << myFileInfo.isFile()); + MESSAGE("Result_i::Restore - aFileName = " << (const char*)myFileInfo.filePath().toLatin1() << "; " << myFileInfo.isFile()); - const char* aPathLatin = (const char*)myFileInfo.absoluteFilePath().toLatin1(); + const char* aPathLatin = (const char*)myFileInfo.filePath().toLatin1(); if (HDFascii::isASCII(aPathLatin)) { MESSAGE("ConvertFromASCIIToHDF(" << aPathLatin << ")"); char* aResultPath = HDFascii::ConvertFromASCIIToHDF(aPathLatin); @@ -1700,7 +1700,7 @@ VISU::Result_i myFileInfo.setFile(QString(aResultPath) + QString(myFileInfo.baseName().toLatin1())); } else { // change current temporary file to the new: with hdf-format static QString aCommand; - aCommand.sprintf(" %s %s\0",aHDFFileName, (const char*)myFileInfo.absoluteFilePath().toLatin1()); + aCommand.sprintf(" %s %s\0",aHDFFileName, (const char*)myFileInfo.filePath().toLatin1()); aCommand = QDir::convertSeparators( aCommand ); aCommand.prepend( MOVE_COMMAND ); @@ -1722,7 +1722,7 @@ VISU::Result_i mySourceId = eFile; } if(MYDEBUG) MESSAGE("VISU::Result_i::Restore - mySourceId = " << mySourceId); - myInput = CreateConvertor((const char*)myFileInfo.absoluteFilePath().toLatin1()); + myInput = CreateConvertor((const char*)myFileInfo.filePath().toLatin1()); myInput->BuildEntities(); if(myIsBuildFields){ @@ -1740,7 +1740,7 @@ VISU::Result_i QString aComment; aComment.sprintf("myComment=%s;myType=%d;myFileName=%s;myInitFileName=%s", - GetComment(), VISU::TRESULT, (const char*)myFileInfo.absoluteFilePath().toLatin1(), + GetComment(), VISU::TRESULT, (const char*)myFileInfo.filePath().toLatin1(), myInitFileName.c_str()); // Restoring of Python dump SALOMEDS::GenericAttribute_var anAttr; if (!theSObject->FindAttribute(anAttr, "AttributeString")) @@ -1926,17 +1926,17 @@ VISU::Result_i if (mySourceId == eRestoredFile) { static QString aCommand; #ifndef WNT - aCommand.sprintf("rm %s",(const char*)myFileInfo.absoluteFilePath().toLatin1()); + aCommand.sprintf("rm %s",(const char*)myFileInfo.filePath().toLatin1()); #else - aCommand.sprintf("del /F %s",(const char*)myFileInfo.absoluteFilePath().toLatin1()); + aCommand.sprintf("del /F %s",(const char*)myFileInfo.filePath().toLatin1()); #endif int res = system((const char*)aCommand.toLatin1()); MESSAGE("Result_i::~Result_i - system("<<(const char*)aCommand.toLatin1()<<") = "<