-// Copyright (C) 2014-2017 CEA/DEN, EDF R&D
+// Copyright (C) 2014-2021 CEA/DEN, 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
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// See http://www.salome-platform.org/ or
-// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#include "SHAPERGUI_DataModel.h"
#include <ModelAPI_Session.h>
#include <ModelAPI_AttributeString.h>
+#include <ModelAPI_AttributeBoolean.h>
#include <ExchangePlugin_Dump.h>
#include <LightApp_Study.h>
LightApp_Study* aStudy = dynamic_cast<LightApp_Study*>( myModule->application()->activeStudy() );
QString aNewTmpDir = aStudy->GetTmpDir("", false).c_str();
- bool isDone = true;
QDir aDir(aTmpDir);
QStringList aFiles = aDir.entryList(QDir::Files);
QStringList::const_iterator anIt = aFiles.begin(), aLast = aFiles.end();
QString aFileName = *anIt;
QString aCurrentFile = SUIT_Tools::addSlash(aTmpDir) + aFileName;
- QString aNewFile = SUIT_Tools::addSlash(aNewTmpDir) + aFileName;
- if (!QFile::copy(aCurrentFile, aNewFile))
- isDone = false;
- }
- if (isDone) {
- myTmpDirectory = aNewTmpDir;
- }
- else {
- removeDirectory(aNewTmpDir);
- myTmpDirectory = "";
+ XGUI_Workshop* aWorkShop = myModule->workshop();
+ aWorkShop->openFile(aCurrentFile);
}
- SessionPtr aMgr = ModelAPI_Session::get();
- aMgr->load(qPrintable(aNewTmpDir));
myModule->setIsOpened(true);
return true;
}
bool SHAPERGUI_DataModel::save(QStringList& theFiles)
{
+ // Publish to study before saving of the data model
+ myModule->publishToStudy();
+
LightApp_DataModel::save( theFiles );
XGUI_Workshop* aWorkShop = myModule->workshop();
std::list<std::string> aFileNames;
bool isMultiFile = aResMgr ? aResMgr->booleanValue("Study", "multi_file", false) : false;
std::string aTmpDir = aStudy->GetTmpDir(qPrintable(myStudyPath), isMultiFile);
- //std::string aTmpDir = aStudy->GetTmpDir("", false);//true );
- theFiles.append(QString(aTmpDir.c_str()));
+ QString aTmp = QString(aTmpDir.c_str());
+ theFiles.append(aTmp);
SessionPtr aMgr = ModelAPI_Session::get();
if (aMgr->isAutoUpdateBlocked())
aMgr->blockAutoUpdate(false);
- aWorkShop->saveDocument(QString(aTmpDir.c_str()), aFileNames);
- std::list<std::string>::iterator aIt;
- for (aIt = aFileNames.begin(); aIt != aFileNames.end(); ++aIt) {
- QString aName((*aIt).c_str());
- aName.replace(QChar('\\'), QChar('/'));
- int aN = aName.lastIndexOf('/');
- theFiles.append(aName.right(aName.length() - aN - 1));
- }
+ //aWorkShop->saveDocument(QString(aTmpDir.c_str()), aFileNames);
+ aWorkShop->setCurrentDataFile(aTmp + "shaper.shaper");
+ aWorkShop->onSave();
+ QString aName = aWorkShop->currentDataFile();
+ aName.replace(QChar('\\'), QChar('/'));
+ int aN = aName.lastIndexOf('/');
+ theFiles.append(aName.right(aName.length() - aN - 1));
+
return true;
}
bool SHAPERGUI_DataModel::close()
{
myModule->workshop()->closeDocument();
- removeDirectory(myTmpDirectory);
- myTmpDirectory = "";
return LightApp_DataModel::close();
}
if (!aStudy)
return false;
+ myModule->publishToStudy();
+
std::shared_ptr<ModelAPI_Document> aDoc = ModelAPI_Session::get()->activeDocument();
ModelAPI_Session::get()->startOperation(ExchangePlugin_Dump::ID());
FeaturePtr aFeature = aDoc->addFeature(ExchangePlugin_Dump::ID());
if (aFeature.get()) {
+ // keep path to the true dumping directory for external files dumping
+ AttributeStringPtr aAttr = aFeature->string(ExchangePlugin_Dump::DUMP_DIR_ID());
+ if (aAttr.get()) {
+ QString aDirPath = QFileInfo(thePath).path();
+ aAttr->setValue(aDirPath.toStdString());
+ }
+
+ // tmp path to write the script
std::string aTmpDir = aStudy->GetTmpDir(thePath.toStdString().c_str(), isMultiFile);
std::string aFileName = aTmpDir + DUMP_NAME;
QFile::remove(aFileName.c_str());
}
- AttributeStringPtr aAttr = aFeature->string(ExchangePlugin_Dump::FILE_PATH_ID());
+ aAttr = aFeature->string(ExchangePlugin_Dump::FILE_PATH_ID());
if (aAttr.get())
aAttr->setValue(aFileName);
aAttr = aFeature->string(ExchangePlugin_Dump::FILE_FORMAT_ID());
if (aAttr.get())
aAttr->setValue(".py");
+
+#ifdef HAVE_SALOME
+ aFeature->boolean(ExchangePlugin_Dump::EXPORT_VARIABLES_ID())->setValue(true);
+#endif
+
ModelAPI_Session::get()->finishOperation();
if (QFile::exists(aFileName.c_str())) {
- if (isMultiFile) {
- QFile aInFile(aFileName.c_str());
- if (!aInFile.open(QIODevice::ReadOnly | QIODevice::Text))
- return false;
- QTextStream aText(&aInFile);
- QString aTrace(aText.readAll());
- aInFile.close();
+ QFile aInFile(aFileName.c_str());
+ if (!aInFile.open(QIODevice::ReadOnly | QIODevice::Text))
+ return false;
+ QTextStream aText(&aInFile);
+ QString aTrace(aText.readAll());
+ aInFile.close();
+ if (isMultiFile) {
QStringList aBuffer;
- aBuffer.push_back(QString("def RebuildData( theStudy ):"));
+ aBuffer.push_back(QString("def RebuildData():"));
QStringList aList(aTrace.split("\n"));
foreach(QString aStr, aList) {
QString s = " " + aStr;
aBuffer.push_back(s);
}
aTrace = aBuffer.join("\n");
+ }
- QFile aOutFile(aFileName.c_str());
- if (!aOutFile.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate))
- return false;
+ QFile aOutFile(aFileName.c_str());
+ // binary for SALOME, issue 16931
+ if (!aOutFile.open(QIODevice::WriteOnly | QIODevice::Truncate))
+ return false;
+
+ QTextStream aOut(&aOutFile);
+ aOut << aTrace << "\n";
+ aOut.flush();
+ aOutFile.close();
- QTextStream aOut(&aOutFile);
- aOut << aTrace.toStdString().c_str() << "\n";
- aOut.flush();
- aOutFile.close();
- }
theListOfFiles.append(aTmpDir.c_str());
theListOfFiles.append(DUMP_NAME);
return true;
}
return false;
}
-
