ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-26 01:10:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch merge_1_2_d

Browse Source
This commit is contained in:
jrt 2004-01-29 17:33:20 +00:00
parent 30d5082e4a
commit 253bd8edea
3 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/SMESHGUI/SMESHGUI_StudyAPI.cxx
View File

@ -89,10 +89,10 @@ SMESHGUI_StudyAPI::SMESHGUI_StudyAPI ( SALOMEDS::Study_ptr aStudy,
// NRI : Temporary added // NRI : Temporary added
if ( myStudy->GetProperties()->IsLocked() ) { if ( myStudy->GetProperties()->IsLocked() ) {
QAD_MessageBox::warn1 ( (QWidget*)QAD_Application::getDesktop(), // QAD_MessageBox::warn1 ( (QWidget*)QAD_Application::getDesktop(),
QObject::tr("WARNING"), // QObject::tr("WARNING"),
QObject::tr("WRN_STUDY_LOCKED"), // QObject::tr("WRN_STUDY_LOCKED"),
QObject::tr("BUT_OK") ); // QObject::tr("BUT_OK") );
return; return;
} }

7
src/SMESHGUI/SMESHGUI_Swig.cxx
View File

@ -91,6 +91,8 @@ void SMESH_Swig::Init(int studyID)
SALOMEDS::SComponent_var father = myStudy->FindComponent("MESH"); SALOMEDS::SComponent_var father = myStudy->FindComponent("MESH");
if (father->_is_nil()) { if (father->_is_nil()) {
bool aLocked = myStudy->GetProperties()->IsLocked();
if (aLocked) myStudy->GetProperties()->SetLocked(false);
father = myStudyBuilder->NewComponent("MESH"); father = myStudyBuilder->NewComponent("MESH");
anAttr = myStudyBuilder->FindOrCreateAttribute(father, "AttributeName"); anAttr = myStudyBuilder->FindOrCreateAttribute(father, "AttributeName");
aName = SALOMEDS::AttributeName::_narrow(anAttr); aName = SALOMEDS::AttributeName::_narrow(anAttr);
@ -99,10 +101,9 @@ void SMESH_Swig::Init(int studyID)
anAttr = myStudyBuilder->FindOrCreateAttribute(father, "AttributePixMap"); anAttr = myStudyBuilder->FindOrCreateAttribute(father, "AttributePixMap");
aPixmap = SALOMEDS::AttributePixMap::_narrow(anAttr); aPixmap = SALOMEDS::AttributePixMap::_narrow(anAttr);
aPixmap->SetPixMap( "ICON_OBJBROWSER_SMESH" ); aPixmap->SetPixMap( "ICON_OBJBROWSER_SMESH" );
myStudyBuilder->DefineComponentInstance(father, CompMesh );
if (aLocked) myStudy->GetProperties()->SetLocked(true);
} }
myStudyBuilder->DefineComponentInstance(father, CompMesh );
mySComponentMesh = SALOMEDS::SComponent::_narrow( father );
// Tags definition // Tags definition
Tag_HypothesisRoot = 1; Tag_HypothesisRoot = 1;
Tag_AlgorithmsRoot = 2; Tag_AlgorithmsRoot = 2;

23
src/SMESH_I/SMESH_Gen_i.cxx
View File

@ -425,13 +425,13 @@ SALOMEDS::TMPFile* SMESH_Gen_i::Save(SALOMEDS::SComponent_ptr theComponent,
SALOMEDS::ListOfFileNames_var aFileSeq = new SALOMEDS::ListOfFileNames; SALOMEDS::ListOfFileNames_var aFileSeq = new SALOMEDS::ListOfFileNames;
aFileSeq->length(NUM_TMP_FILES); aFileSeq->length(NUM_TMP_FILES);
TCollection_AsciiString aStudyName(SALOMEDS_Tool::GetNameFromPath(theComponent->GetStudy()->URL())); TCollection_AsciiString aStudyName("");
// Set names of temporary files // Set names of temporary files
TCollection_AsciiString filename = aStudyName + TCollection_AsciiString("SMESH.hdf"); TCollection_AsciiString filename = aStudyName + TCollection_AsciiString("_SMESH.hdf");
TCollection_AsciiString hypofile = aStudyName + TCollection_AsciiString("SMESH_Hypo.txt"); TCollection_AsciiString hypofile = aStudyName + TCollection_AsciiString("_SMESH_Hypo.txt");
TCollection_AsciiString algofile = aStudyName + TCollection_AsciiString("SMESH_Algo.txt"); TCollection_AsciiString algofile = aStudyName + TCollection_AsciiString("_SMESH_Algo.txt");
TCollection_AsciiString meshfile = aStudyName + TCollection_AsciiString("SMESH_Mesh.med"); TCollection_AsciiString meshfile = aStudyName + TCollection_AsciiString("_SMESH_Mesh.med");
aFileSeq[0] = CORBA::string_dup(filename.ToCString()); aFileSeq[0] = CORBA::string_dup(filename.ToCString());
aFileSeq[1] = CORBA::string_dup(hypofile.ToCString()); aFileSeq[1] = CORBA::string_dup(hypofile.ToCString());
aFileSeq[2] = CORBA::string_dup(algofile.ToCString()); aFileSeq[2] = CORBA::string_dup(algofile.ToCString());
@ -848,7 +848,7 @@ SALOMEDS::TMPFile* SMESH_Gen_i::Save(SALOMEDS::SComponent_ptr theComponent,
aStreamFile = SALOMEDS_Tool::PutFilesToStream(tmpDir.ToCString(), aFileSeq.in(), isMultiFile); aStreamFile = SALOMEDS_Tool::PutFilesToStream(tmpDir.ToCString(), aFileSeq.in(), isMultiFile);
// Remove temporary files and directory // Remove temporary files and directory
if (isMultiFile) SALOMEDS_Tool::RemoveTemporaryFiles(tmpDir.ToCString(), aFileSeq.in(), true); if (!isMultiFile) SALOMEDS_Tool::RemoveTemporaryFiles(tmpDir.ToCString(), aFileSeq.in(), true);
MESSAGE("End SMESH_Gen_i::Save"); MESSAGE("End SMESH_Gen_i::Save");
@ -883,11 +883,14 @@ bool SMESH_Gen_i::Load(SALOMEDS::SComponent_ptr theComponent,
tmpDir.ToCString(), tmpDir.ToCString(),
isMultiFile); isMultiFile);
TCollection_AsciiString aStudyName("");
if (isMultiFile) aStudyName = (SALOMEDS_Tool::GetNameFromPath(theComponent->GetStudy()->URL()));
// Set names of temporary files // Set names of temporary files
TCollection_AsciiString filename = tmpDir + aFileSeq[0];//"SMESH.hdf"; TCollection_AsciiString filename = tmpDir + aStudyName + TCollection_AsciiString("_SMESH.hdf");
TCollection_AsciiString hypofile = tmpDir + aFileSeq[1];//"SMESH_Hypo.txt"; TCollection_AsciiString hypofile = tmpDir + aStudyName + TCollection_AsciiString("_SMESH_Hypo.txt");
TCollection_AsciiString algofile = tmpDir + aFileSeq[2];//"SMESH_Algo.txt"; TCollection_AsciiString algofile = tmpDir + aStudyName + TCollection_AsciiString("_SMESH_Algo.txt");
TCollection_AsciiString meshfile = tmpDir + aFileSeq[3];//"SMESH_Mesh.med"; TCollection_AsciiString meshfile = tmpDir + aStudyName + TCollection_AsciiString("_SMESH_Mesh.med");
SALOMEDS::Study_var Study = theComponent->GetStudy(); SALOMEDS::Study_var Study = theComponent->GetStudy();
int studyId = Study->StudyId(); int studyId = Study->StudyId();