Fix for bugs 10287, 9986: SIGSEGV in VISU on Views management

[modules/visu.git] / src / VISU_I / VISU_TimeAnimation.cxx

diff --git a/src/VISU_I/VISU_TimeAnimation.cxx b/src/VISU_I/VISU_TimeAnimation.cxx
index 95f43444122660bcbb133a57c6fecf0ee1213061..95b90d5b342d1fc96dd02c065addb6eb3d4be64b 100644 (file)
--- a/src/VISU_I/VISU_TimeAnimation.cxx
+++ b/src/VISU_I/VISU_TimeAnimation.cxx
@@ -59,9 +59,7 @@ VISU_TimeAnimation::VISU_TimeAnimation (_PTR(Study) theStudy,
 
   if (!CORBA::is_nil(theView3D)) {
     VISU::View3D_i* pView = dynamic_cast<VISU::View3D_i*>(GetServant(theView3D).in());
-    //QAD_StudyFrame* aStudyFrame = pView->GetStudyFrame();
-    //myView = VISU::GetViewFrame(aStudyFrame);
-    SUIT_ViewWindow* aVW = pView->myViewWindow;
+    SUIT_ViewWindow* aVW = pView->GetViewWindow();
     myView = VISU::GetViewWindow(aVW);
   }
 
@@ -111,24 +109,9 @@ void VISU_TimeAnimation::addField (_PTR(SObject) theField)
 //************************************************************************
 void VISU_TimeAnimation::addField (SALOMEDS::SObject_ptr theField)
 {
-  FieldData aNewData;
-  _PTR(SObject) aField = VISU::GetClientSObject(theField, myStudy);
-  aNewData.myField = aField;
-  aNewData.myNbFrames = 0;
-  aNewData.myPrsType = VISU::TSCALARMAP;
-  VISU::Storable::TRestoringMap aMap = getMapOfValue(aNewData.myField);
-  aNewData.myNbTimes = VISU::Storable::FindValue(aMap,"myNbTimeStamps").toLong();
-  myFieldsLst.append(aNewData);
-
-  //find Min/Max timestamps
-  if ((myTimeMin == 0) && (myTimeMax == 0)) {
-    _PTR(ChildIterator) anIter = myStudy->NewChildIterator(aField);
-    anIter->Next(); // First is reference on support
-    myTimeMin = getTimeValue(anIter->Value());
-    for(; anIter->More(); anIter->Next()) {
-      myTimeMax = getTimeValue(anIter->Value());
-    }
-  }
+  SALOMEDS::SObject_var theFieldDup = SALOMEDS::SObject::_duplicate(theField);
+  _PTR(SObject) aField = VISU::GetClientSObject(theFieldDup, myStudy);
+  addField(aField);
 }
 
 
@@ -231,7 +214,7 @@ void VISU_TimeAnimation::generatePresentations(CORBA::Long theFieldNum) {
       }
       break;
 
-    case VISU::TPLOT3D: // Cut Planes
+    case VISU::TPLOT3D: // Plot3d
       {
        VISU::Plot3D_i* aPresent = new VISU::Plot3D_i (pResult, false);
        aPresent->Create(aMeshName.latin1(), anEntity,
@@ -281,8 +264,9 @@ void VISU_TimeAnimation::generatePresentations(CORBA::Long theFieldNum) {
     i++;
   }
   aData.myNbFrames = i;
-  QString aFixRange = VISU::GetResourceMgr()->stringValue("Visu:SBImposeRange");
-  if (aFixRange.compare("true") != 0) {
+
+  int rangeType = VISU::GetResourceMgr()->integerValue("VISU" , "scalar_range_type", 0);
+  if ( rangeType != 1 ) {
     for (i = 0; i < aData.myNbFrames; i++) {
       aData.myPrs[i]->SetRange(aMin, aMax);
       aData.myPrs[i]->SetOffset(aData.myOffset);
@@ -678,18 +662,18 @@ SALOMEDS::SObject_ptr VISU_TimeAnimation::publishInStudy()
 
   for (int i = 0; i < getNbFields(); i++) {
     FieldData& aData = myFieldsLst[i];
+
     _PTR(SObject) newObj = aStudyBuilder->NewObject(aAnimSObject);
     aStudyBuilder->Addreference(newObj, aData.myField);
+
     if (aData.myPrs.empty()) {
-      VISU::CreateAttributes(myStudy, newObj->GetID().c_str(),"","",
-                             GetPresentationComment(aData.myPrsType).c_str(),"","",true);
-    } else {
-      ostringstream strOut;
-      aData.myPrs[0]->ToStream(strOut);
-      string aPrsComment = strOut.str();
-      VISU::CreateAttributes(myStudy, newObj->GetID().c_str(),"","",
-                             aData.myPrs[0]->GetComment(),"",aPrsComment.c_str(),true);
+      generatePresentations(i);
     }
+    ostringstream strOut;
+    aData.myPrs[0]->ToStream(strOut);
+    string aPrsComment = strOut.str();
+    VISU::CreateAttributes(myStudy, newObj->GetID().c_str(),"","",
+                           aData.myPrs[0]->GetComment(),"",aPrsComment.c_str(),true);
   }
   aStudyBuilder->CommitCommand();
 
@@ -699,10 +683,10 @@ SALOMEDS::SObject_ptr VISU_TimeAnimation::publishInStudy()
 //************************************************************************
 void VISU_TimeAnimation::saveAnimation()
 {
-  if (myStudy->GetProperties()->IsLocked())  return;
+  if (myStudy->GetProperties()->IsLocked()) return;
   if (myAnimEntry.isEmpty()) return;
 
-  _PTR(SObject) aAnimSObject = myStudy->FindObjectID(myAnimEntry);
+  _PTR(SObject) aAnimSObject = myStudy->FindObjectID(myAnimEntry.latin1());
   if (!aAnimSObject) return;
 
   _PTR(StudyBuilder) aStudyBuilder = myStudy->NewBuilder();
@@ -717,29 +701,28 @@ void VISU_TimeAnimation::saveAnimation()
   _PTR(GenericAttribute) anAttr;
   anAttr = aStudyBuilder->FindOrCreateAttribute(aAnimSObject, "AttributeComment");
   _PTR(AttributeComment) aCmnt (anAttr);
-  aCmnt->SetValue(aComment);
+  aCmnt->SetValue(aComment.latin1());
 
   _PTR(ChildIterator) anIter = myStudy->NewChildIterator(aAnimSObject);
-  int i;
-  for (i = 0, anIter->Init(); anIter->More(); anIter->Next(), i++) {
+  int i = 0, nbf = getNbFields();
+  for (anIter->Init(); anIter->More(); anIter->Next(), i++) {
+    if (i >= nbf) break; // it must not be
     FieldData& aData = myFieldsLst[i];
 
+    // Get presentation name and comment
+    if (aData.myPrs.empty()) {
+      generatePresentations(i);
+    }
+    ostringstream strOut;
+    aData.myPrs[0]->ToStream(strOut);
+    string aPrsComment = strOut.str();
+    string aPrsNameTxt = aData.myPrs[0]->GetComment();
+
+    // Save in study
     _PTR(SObject) aRefObj = anIter->Value();
     _PTR(ChildIterator) anPrsIter = myStudy->NewChildIterator(aRefObj);
     anPrsIter->Init();
 
-    string aPrsComment, aPrsNameTxt;
-    if (aData.myPrs.empty()) {
-      aPrsComment = "";
-      aPrsNameTxt = GetPresentationComment(aData.myPrsType);
-    } else {
-      ostringstream strOut;
-      aData.myPrs[0]->ToStream(strOut);
-      aPrsComment = strOut.str();
-
-      aPrsNameTxt = aData.myPrs[0]->GetComment();
-    }
-
     if (anPrsIter->More()) {
       _PTR(SObject) aPrsObj = anPrsIter->Value();
       anAttr = aStudyBuilder->FindOrCreateAttribute(aPrsObj, "AttributeComment");
@@ -830,7 +813,8 @@ void VISU_TimeAnimation::restoreFromStudy(_PTR(SObject) theField)
     }
     aData.myPrs[0]->GetOffset(aData.myOffset);
     for (int i = 1; i < aData.myNbFrames; i++) {
-      aData.myPrs[i]->SameAs(aData.myPrs[0]);
+      //jfa 03.08.2005:aData.myPrs[i]->SameAs(aData.myPrs[0]);
+      aData.myPrs[i]->SameAsParams(aData.myPrs[0]);//jfa 03.08.2005
     }
   }
   string aStr = aAnimSObject->GetID();