Merge with version on tag OCC-V2_1_0d

[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 13d2f6b1a8cfa0615381c31d4a6a9be35f09098c..e1245e97bc75efe6beab0513edf7ca228c685e8c 100644 (file)
--- a/src/VISU_I/VISU_TimeAnimation.cxx
+++ b/src/VISU_I/VISU_TimeAnimation.cxx
@@ -93,10 +93,6 @@ void VISU_TimeAnimation::clearData(FieldData& theData) {
   vtkRenderer* aRen = myView->getRenderer();
   if (!theData.myActors.empty()) {
     for (int i = 0, iEnd = theData.myActors.size(); i < iEnd; i++) {
-      //_CS_PhB      if (theData.myActors.at(i) != 0) {
-      //_CS_PhB        theData.myActors.at(i)->RemoveFromRender(aRen);
-      //_CS_PhB        theData.myActors.at(i)->Delete();
-      //_CS_PhB     }
       if (theData.myActors[i] != 0) {
        theData.myActors[i]->RemoveFromRender(aRen);
        theData.myActors[i]->Delete();
@@ -106,9 +102,6 @@ void VISU_TimeAnimation::clearData(FieldData& theData) {
   }
   if (!theData.myPrs.empty()) {
     for (int i = 0, iEnd = theData.myPrs.size(); i < iEnd; i++) 
-     //_CS_PhB if (theData.myPrs.at(i) != 0) {
-     //_CS_PhB theData.myPrs.at(i)->_remove_ref();
-     //_CS_PhB     }
       if (theData.myPrs[i] != 0) {
        theData.myPrs[i]->_remove_ref();
       }
@@ -147,11 +140,6 @@ void VISU_TimeAnimation::generatePresentations(CORBA::Long theFieldNum) {
     aTimeStamp = anIter->Value();
     if (aTimeStamp->_is_nil()) continue;
 
-   //_CS_PhB aData.myTiming.at(i) = getTimeValue(aTimeStamp);
-   //_CS_PhB if (isRangeDefined()) {
-   //_CS_PhB   if (aData.myTiming.at(i) < myMinVal) continue;
-   //_CS_PhB   if (aData.myTiming.at(i) > myMaxVal) break;
-   //_CS_PhB }
     aData.myTiming[i] = getTimeValue(aTimeStamp);
     if (isRangeDefined()) {
       if (aData.myTiming[i] < myMinVal) continue;
@@ -172,7 +160,6 @@ void VISU_TimeAnimation::generatePresentations(CORBA::Long theFieldNum) {
                         aFieldName.latin1(), aTimeStampId);
        //VISU::ScalarMap_var aTmp = aPresent->_this();
        //aPresent->_remove_ref();
-    //_CS_PhB  aData.myPrs.at(i) = aPresent;
        aData.myPrs[i] = aPresent;
       }
       break;
@@ -184,7 +171,6 @@ void VISU_TimeAnimation::generatePresentations(CORBA::Long theFieldNum) {
                         aFieldName.latin1(), aTimeStampId);
        //VISU::IsoSurfaces_var aTmp = aPresent->_this();
        //aPresent->_remove_ref();
-    //_CS_PhB aData.myPrs.at(i) = aPresent;
        aData.myPrs[i] = aPresent;
       }
       break;
@@ -196,7 +182,6 @@ void VISU_TimeAnimation::generatePresentations(CORBA::Long theFieldNum) {
                         aFieldName.latin1(), aTimeStampId);
        //VISU::CutPlanes_var aTmp = aPresent->_this();
        //aPresent->_remove_ref();
-     //_CS_PhB         aData.myPrs.at(i) = aPresent;
        aData.myPrs[i] = aPresent;
       }
       break;
@@ -208,7 +193,6 @@ void VISU_TimeAnimation::generatePresentations(CORBA::Long theFieldNum) {
                         aFieldName.latin1(), aTimeStampId);
        //VISU::DeformedShape_var aTmp = aPresent->_this();
        //aPresent->_remove_ref();
-     //_CS_PhB aData.myPrs.at(i) = aPresent;
        aData.myPrs[i] = aPresent;
       }
       break;
@@ -220,7 +204,6 @@ void VISU_TimeAnimation::generatePresentations(CORBA::Long theFieldNum) {
                         aFieldName.latin1(), aTimeStampId);
        //VISU::Vectors_var aTmp = aPresent->_this();
        //aPresent->_remove_ref();
-     //_CS_PhB         aData.myPrs.at(i) = aPresent;
        aData.myPrs[i] = aPresent;
       }
       break;
@@ -232,13 +215,10 @@ void VISU_TimeAnimation::generatePresentations(CORBA::Long theFieldNum) {
                         aFieldName.latin1(), aTimeStampId);
        //VISU::StreamLines_var aTmp = aPresent->_this();
        //aPresent->_remove_ref();
-     //_CS_PhB aData.myPrs.at(i) = aPresent;
        aData.myPrs[i] = aPresent;
       }
       break;
     }
-   //_CS_PhB if (aData.myPrs.at(i)->GetMin() < aMin) aMin = aData.myPrs.at(i)->GetMin();
-   //_CS_PhB if (aData.myPrs.at(i)->GetMax() > aMax) aMax = aData.myPrs.at(i)->GetMax();
     if (aData.myPrs[i]->GetMin() < aMin) aMin = aData.myPrs[i]->GetMin();
     if (aData.myPrs[i]->GetMax() > aMax) aMax = aData.myPrs[i]->GetMax();
     i++;
@@ -247,11 +227,9 @@ void VISU_TimeAnimation::generatePresentations(CORBA::Long theFieldNum) {
   QString aFixRange = QAD_CONFIG->getSetting("Visu:SBImposeRange");
   if (aFixRange.compare("true") != 0) {
     for (i = 0; i < aData.myNbFrames; i++) 
-    //_CS_PhB  aData.myPrs.at(i)->SetRange(aMin, aMax);
       aData.myPrs[i]->SetRange(aMin, aMax);
     if(aData.myPrsType == VISU::TISOSURFACE)
       for (i = 0; i < aData.myNbFrames; i++)
- //_CS_PhB     if(VISU::IsoSurfaces_i* aPrs = dynamic_cast<VISU::IsoSurfaces_i*>(aData.myPrs.at(i)))
        if(VISU::IsoSurfaces_i* aPrs = dynamic_cast<VISU::IsoSurfaces_i*>(aData.myPrs[i]))
           aPrs->SetSubRange(aMin, aMax);
   }
@@ -277,7 +255,6 @@ CORBA::Boolean VISU_TimeAnimation::generateFrames() {
     for (long j = 0; j < aData.myNbFrames; j++) {
       VISU_Actor* aActor = NULL;
       try{
- //_CS_PhB     aActor = aData.myPrs.at(j)->CreateActor();
        aActor = aData.myPrs[j]->CreateActor();
        myView->AddActor(aActor);
        if(j == 0)
@@ -286,16 +263,13 @@ CORBA::Boolean VISU_TimeAnimation::generateFrames() {
          aActor->VisibilityOff();
       }catch(...){ //catch(std::runtime_error& exc){
        aNoError = false;
- //_CS_PhB     myLastError += QString("%1 ").arg(aData.myTiming.at(j));
        myLastError += QString("%1 ").arg(aData.myTiming[j]);
       }
- //_CS_PhB     aData.myActors.at(j) = aActor;
       aData.myActors[j] = aActor;
     }
   }
   myFrame = 0;
-  myLastError += QString(" timestamp(s) cannot /local/salome/SALOME2/VISU/V1_4_1a/VISU_SRC/src/VISU_I/VISU_TimeAnimation.cxxbe created.");
-  //_CS_PhB     emit frameChanged(myFrame, myFieldsLst[0].myTiming.at(myFrame));
+  myLastError += QString(" timestamp(s) cannot be created.");
   emit frameChanged(myFrame, myFieldsLst[0].myTiming[myFrame]);
   myView->Repaint();
   return aNoError;
@@ -307,16 +281,11 @@ void VISU_TimeAnimation::clearView() {
     MESSAGE("Viewer is nod defined for animation");
     return;
   }
-  //_CS_PhB : "mt" ne sert pas dans cette methode  VISU::Mutex mt(myMutex,qApp,MYDELAY);
   vtkRenderer* aRen = myView->getRenderer();
   for (int i = 0; i < getNbFields(); i++) {
     FieldData& aData = myFieldsLst[i];
     if (!aData.myActors.empty()) {
       for (int i = 0, iEnd = aData.myActors.size(); i < iEnd; i++) {
-//_CS_PhB      if (aData.myActors.at(i) != 0) {
-//_CS_PhB        aData.myActors.at(i)->RemoveFromRender(aRen);
-//_CS_PhB        aData.myActors.at(i)->Delete();
-//_CS_PhB      }
        if (aData.myActors[i] != 0) {
          aData.myActors[i]->RemoveFromRender(aRen);
          aData.myActors[i]->Delete();
@@ -325,7 +294,7 @@ void VISU_TimeAnimation::clearView() {
       aData.myActors.clear();
     }
   }
-  myView->getRW()->getRenderWindow()->Render();
+  VISU::RepaintView(myView);
   //myView->update();
 }
 
@@ -348,19 +317,14 @@ void VISU_TimeAnimation::nextFrame() {
   if (myFrame < (myFieldsLst[0].myNbFrames-1)) {
     int i;
     for (i = 0; i < getNbFields(); i++) 
-
-//_CS_PhB      if (myFieldsLst[i].myActors.at(myFrame) != 0)
-//_CS_PhB      myFieldsLst[i].myActors.at(myFrame)->VisibilityOff();
       if (myFieldsLst[i].myActors[myFrame] != 0)
        myFieldsLst[i].myActors[myFrame]->VisibilityOff();
+
     myFrame++;
     for (i = 0; i < getNbFields(); i++) 
-//_CS_PhB      if (myFieldsLst[i].myActors.at(myFrame) != 0)
-//_CS_PhB      myFieldsLst[i].myActors.at(myFrame)->VisibilityOn(); 
       if (myFieldsLst[i].myActors[myFrame] != 0)
        myFieldsLst[i].myActors[myFrame]->VisibilityOn();
  
-//_CS_PhB     emit frameChanged(myFrame, myFieldsLst[0].myTiming.at(myFrame));
     emit frameChanged(myFrame, myFieldsLst[0].myTiming[myFrame]);
     myView->Repaint();
   }
@@ -372,19 +336,14 @@ void VISU_TimeAnimation::prevFrame() {
   if (myFrame > 0) {
     int i;
     for (i = 0; i < getNbFields(); i++) 
-  //_CS_PhB     if (myFieldsLst[i].myActors.at(myFrame) != 0)
-//_CS_PhB      myFieldsLst[i].myActors.at(myFrame)->VisibilityOff();
       if (myFieldsLst[i].myActors[myFrame] != 0)
        myFieldsLst[i].myActors[myFrame]->VisibilityOff();
 
     myFrame--;
     for (i = 0; i < getNbFields(); i++) 
-  //_CS_PhB     if (myFieldsLst[i].myActors.at(myFrame) != 0)
-//_CS_PhB      myFieldsLst[i].myActors.at(myFrame)->VisibilityOn();    
       if (myFieldsLst[i].myActors[myFrame] != 0)
        myFieldsLst[i].myActors[myFrame]->VisibilityOn(); 
    
-  //_CS_PhB   emit frameChanged(myFrame, myFieldsLst[0].myTiming.at(myFrame));
     emit frameChanged(myFrame, myFieldsLst[0].myTiming[myFrame]);
     myView->Repaint();
   }
@@ -396,19 +355,14 @@ void VISU_TimeAnimation::firstFrame() {
   int i;
   for (i = 0; i < getNbFields(); i++) 
     if(!myFieldsLst[i].myActors.empty())
-  //_CS_PhB    if (myFieldsLst[i].myActors.at(myFrame) != 0)
-//_CS_PhB      myFieldsLst[i].myActors.at(myFrame)->VisibilityOff();
       if (myFieldsLst[i].myActors[myFrame] != 0)
        myFieldsLst[i].myActors[myFrame]->VisibilityOff();
   myFrame = 0;
   for (i = 0; i < getNbFields(); i++) 
     if(!myFieldsLst[i].myActors.empty())
- //_CS_PhB    if (myFieldsLst[i].myActors.at(myFrame) != 0)
-//_CS_PhB      myFieldsLst[i].myActors.at(myFrame)->VisibilityOn();    
       if (myFieldsLst[i].myActors[myFrame] != 0)
        myFieldsLst[i].myActors[myFrame]->VisibilityOn();    
   if(!myFieldsLst[0].myTiming.empty()){
- //_CS_PhB   emit frameChanged(myFrame, myFieldsLst[0].myTiming.at(myFrame));
     emit frameChanged(myFrame, myFieldsLst[0].myTiming[myFrame]);
     myView->Repaint();
   }
@@ -419,18 +373,14 @@ void VISU_TimeAnimation::lastFrame() {
   stopAnimation();
   int i;
   for (i = 0; i < getNbFields(); i++) 
- //_CS_PhB   if (myFieldsLst[i].myActors.at(myFrame) != 0)
- //_CS_PhB     myFieldsLst[i].myActors.at(myFrame)->VisibilityOff();
    if (myFieldsLst[i].myActors[myFrame] != 0)
       myFieldsLst[i].myActors[myFrame]->VisibilityOff();
+
   myFrame = myFieldsLst[0].myNbFrames-1;
   for (i = 0; i < getNbFields(); i++) 
-//_CS_PhB    if (myFieldsLst[i].myActors.at(myFrame) != 0)
-//_CS_PhB      myFieldsLst[i].myActors.at(myFrame)->VisibilityOn();
     if (myFieldsLst[i].myActors[myFrame] != 0)
       myFieldsLst[i].myActors[myFrame]->VisibilityOn();
 
-//_CS_PhB  emit frameChanged(myFrame, myFieldsLst[0].myTiming.at(myFrame));
   emit frameChanged(myFrame, myFieldsLst[0].myTiming[myFrame]);
   myView->Repaint();
 }
@@ -446,19 +396,14 @@ void VISU_TimeAnimation::gotoFrame(CORBA::Long theFrame) {
   qApp->syncX();
   int i;
   for (i = 0; i < getNbFields(); i++) 
-//_CS_PhB    if (myFieldsLst[i].myActors.at(myFrame) != 0)
-//_CS_PhB      myFieldsLst[i].myActors.at(myFrame)->VisibilityOff();
     if (myFieldsLst[i].myActors[myFrame] != 0)
       myFieldsLst[i].myActors[myFrame]->VisibilityOff();
 
   myFrame = theFrame;
   for (i = 0; i < getNbFields(); i++) 
-//_CS_PhB    if (myFieldsLst[i].myActors.at(myFrame) != 0)
-//_CS_PhB      myFieldsLst[i].myActors.at(myFrame)->VisibilityOn();
     if (myFieldsLst[i].myActors[myFrame] != 0)
       myFieldsLst[i].myActors[myFrame]->VisibilityOn();
 
-//_CS_PhB  emit frameChanged(myFrame, myFieldsLst[0].myTiming.at(myFrame));
   emit frameChanged(myFrame, myFieldsLst[0].myTiming[myFrame]);
   myView->Repaint();
   qApp->flushX(); 
@@ -473,7 +418,6 @@ VISU::ScalarMap_ptr VISU_TimeAnimation::getPresentation(CORBA::Long theField, CO
     return VISU::ScalarMap::_nil();
   if ((theFrame < 0) || (theFrame > (myFieldsLst[theField].myNbFrames - 1)))
     return VISU::ScalarMap::_nil();
-//_CS_PhB  return myFieldsLst[theField].myPrs.at(theFrame)->_this();
   return myFieldsLst[theField].myPrs[theFrame]->_this();
 }
 
@@ -494,27 +438,19 @@ void VISU_TimeAnimation::run() {
   double aOneVal;
   bool isDumping = !myDumpPath.isEmpty();
   aOneVal = (myFieldsLst[0].myNbFrames > 2) ?
- //_CS_PhB    myFieldsLst[0].myTiming.at(1) - myFieldsLst[0].myTiming.at(0) : 1;
     myFieldsLst[0].myTiming[1] - myFieldsLst[0].myTiming[0] : 1;
   qApp->lock();      
   while (myIsActive) {
- //_CS_PhB    emit frameChanged(myFrame, myFieldsLst[0].myTiming.at(myFrame));
     emit frameChanged(myFrame, myFieldsLst[0].myTiming[myFrame]);
     for (int i = 0; i < getNbFields(); i++) {
       FieldData& aData = myFieldsLst[i];
       if (myFrame > 0) {
-//_CS_PhB      if (aData.myActors.at(myFrame-1) != 0) 
-//_CS_PhB        aData.myActors.at(myFrame-1)->VisibilityOff();
        if (aData.myActors[myFrame-1] != 0) 
          aData.myActors[myFrame-1]->VisibilityOff();
       } else { 
-//_CS_PhB      if (aData.myActors.at(aData.myNbFrames-1) != 0)
-//_CS_PhB        aData.myActors.at(aData.myNbFrames-1)->VisibilityOff();
        if (aData.myActors[aData.myNbFrames-1] != 0)
          aData.myActors[aData.myNbFrames-1]->VisibilityOff();
       }
-//_CS_PhB      if (aData.myActors.at(myFrame) != 0) {
-//_CS_PhB      aData.myActors.at(myFrame)->VisibilityOn();
       if (aData.myActors[myFrame] != 0) {
        aData.myActors[myFrame]->VisibilityOn();
       }
@@ -523,7 +459,6 @@ void VISU_TimeAnimation::run() {
     if (isDumping) {
       QPixmap px = QPixmap::grabWindow(myView->getViewWidget()->winId());
       QString aFile(myDumpPath);
-//_CS_PhB      QString aName = QString("%1").arg(myFieldsLst[0].myTiming.at(myFrame));
       QString aName = QString("%1").arg(myFieldsLst[0].myTiming[myFrame]);
       int aPos = -1;
       while ((aPos = aName.find(".")) > -1 )
@@ -531,7 +466,7 @@ void VISU_TimeAnimation::run() {
       aFile += aName;
       aFile += ".jpeg";
       px.save(aFile, "JPEG");
-    }//_CS_PhB
+    }
     if (!isDumping) {
       if (myProportional) {
        switch (myFrame) {
@@ -540,14 +475,12 @@ void VISU_TimeAnimation::run() {
          break;        
        case 1:
          if (myFieldsLst[0].myNbFrames > 2)
-//_CS_PhB          k = (myFieldsLst[0].myTiming.at(myFrame+1) - myFieldsLst[0].myTiming.at(myFrame))/aOneVal;
            k = (myFieldsLst[0].myTiming[myFrame+1] - myFieldsLst[0].myTiming[myFrame])/aOneVal;
          else
            k = 1;
          break;        
        default:
          k = (myFrame < (myFieldsLst[0].myNbFrames-1))? 
-//_CS_PhB          (myFieldsLst[0].myTiming.at(myFrame+1) - myFieldsLst[0].myTiming.at(myFrame))/aOneVal : 1;
            (myFieldsLst[0].myTiming[myFrame+1] - myFieldsLst[0].myTiming[myFrame])/aOneVal : 1;
        }
       } else
@@ -611,6 +544,7 @@ double VISU_TimeAnimation::getTimeValue(SALOMEDS::SObject_var theTimeStamp) {
     QString aNameString(aName->Value());
     return aNameString.toDouble();
   }
+  return -1.0;
 }
   
 //************************************************************************