Merge remote branch 'origin/master'

[modules/paravis.git] / src / Plugins / MEDReader / IO / vtkMEDReader.cxx

diff --git a/src/Plugins/MEDReader/IO/vtkMEDReader.cxx b/src/Plugins/MEDReader/IO/vtkMEDReader.cxx
index 338c961c601d04199a3d10fad82a9cf97dabcb65..07d89f1b74021ad6f331516b6542e793cb8e47e2 100644 (file)
--- a/src/Plugins/MEDReader/IO/vtkMEDReader.cxx
+++ b/src/Plugins/MEDReader/IO/vtkMEDReader.cxx
@@ -50,6 +50,7 @@
 
 #include "MEDFileFieldRepresentationTree.hxx"
 
+#include <map>
 #include <string>
 #include <vector>
 #include <sstream>
@@ -150,7 +151,7 @@ class vtkMEDReader::vtkMEDReaderInternal
 {
 
 public:
-  vtkMEDReaderInternal(vtkMEDReader *master):TK(0),IsMEDOrSauv(true),IsStdOrMode(false),GenerateVect(false),SIL(0),LastLev0(-1),FirstCall0(2),PK(master)
+  vtkMEDReaderInternal(vtkMEDReader *master):TK(0),IsMEDOrSauv(true),IsStdOrMode(false),GenerateVect(false),SIL(0),LastLev0(-1),FirstCall0(2),PK(master),MyMTime(0)
   {
   }
   
@@ -184,6 +185,9 @@ public:
   int LastLev0;
   // The property keeper is usable only in pvsm mode.
   PropertyKeeper PK;
+  int MyMTime;
+  std::set<std::string> _wonderful_set;// this set is used by SetFieldsStatus method to detect the fact that SetFieldsStatus has been called for all items ! Great Items are not sorted ! Why ?
+  std::map<std::string,bool> _wonderful_ref;// this map stores the state before a SetFieldsStatus status.
 private:
   unsigned char FirstCall0;
 };
@@ -199,6 +203,7 @@ vtkMEDReader::vtkMEDReader():Internal(new vtkMEDReaderInternal(this))
 vtkMEDReader::~vtkMEDReader()
 {
   delete this->Internal;
+  this->Internal = 0;
 }
 
 void vtkMEDReader::Reload(int a)
@@ -212,8 +217,18 @@ void vtkMEDReader::Reload(int a)
   this->SetFileName(fName.c_str());
 }
 
+int vtkMEDReader::GetServerModifTime()
+{
+  if( !this->Internal )
+    return -1;
+  return this->Internal->MyMTime;
+}
+
 void vtkMEDReader::GenerateVectors(int val)
 {
+  if ( !this->Internal )
+    return;
+  
   if(this->Internal->FileName.empty())
     {//pvsm mode
       this->Internal->PK.pushGenerateVectorsValue(val);
@@ -230,6 +245,9 @@ void vtkMEDReader::GenerateVectors(int val)
 
 void vtkMEDReader::ChangeMode(int newMode)
 {
+  if ( !this->Internal )
+    return;
+  
   if(this->Internal->FileName.empty())
     {//pvsm mode
       this->Internal->PK.pushChangeModeValue(newMode);
@@ -248,6 +266,8 @@ const char *vtkMEDReader::GetSeparator()
 
 void vtkMEDReader::SetFileName(const char *fname)
 {
+  if(!this->Internal)
+    return;
   try
     {
       this->Internal->FileName=fname;
@@ -293,6 +313,8 @@ void vtkMEDReader::SetFileName(const char *fname)
 
 char *vtkMEDReader::GetFileName()
 {
+  if (!this->Internal)
+    return 0;
   return const_cast<char *>(this->Internal->FileName.c_str());
 }
 
@@ -353,19 +375,34 @@ int vtkMEDReader::RequestData(vtkInformation *request, vtkInformationVector **in
 
 void vtkMEDReader::SetFieldsStatus(const char* name, int status)
 {
-  //std::cerr << "vtkMEDReader::SetFieldsStatus(" << name << "," << status << ") called !" << std::endl;
+  if( !this->Internal )
+    return;
+
+  //this->Internal->_wonderful_set.insert(name);
   if(this->Internal->FileName.empty())
     {//pvsm mode
       this->Internal->PK.pushFieldStatusEntry(name,status);
       return ;
     }
+  if(this->Internal->_wonderful_set.empty())
+    this->Internal->_wonderful_ref=this->Internal->Tree.dumpState();// start of SetFieldsStatus serie -> store ref to compare at the end of the SetFieldsStatus serie.
+  this->Internal->_wonderful_set.insert(name);
   //not pvsm mode (general case)
   try
     {
       this->Internal->Tree.changeStatusOfAndUpdateToHaveCoherentVTKDataSet(this->Internal->Tree.getIdHavingZeName(name),status);
-      if(std::string(name)==GetFieldsTreeArrayName(GetNumberOfFieldsTreeArrays()-1))
-        if(!this->Internal->PluginStart0())
-          this->Modified();
+      if(this->Internal->_wonderful_set.size()==GetNumberOfFieldsTreeArrays())
+        {
+          if(this->Internal->_wonderful_ref!=this->Internal->Tree.dumpState())
+            {
+              if(!this->Internal->PluginStart0())
+                {
+                  this->Modified();
+                }
+              this->Internal->MyMTime++;
+            }
+          this->Internal->_wonderful_set.clear();
+        }
     }
   catch(INTERP_KERNEL::Exception& e)
     {
@@ -381,19 +418,23 @@ int vtkMEDReader::GetNumberOfFieldsTreeArrays()
 {
   if(!this->Internal)
     return 0;
-  int ret(this->Internal->Tree.getNumberOfLeavesArrays());
+  return this->Internal->Tree.getNumberOfLeavesArrays();
   //std::cerr << "vtkMEDReader::GetNumberOfFieldsTreeArrays called ! " << ret << std::endl;
-  return ret;
 }
 
 const char *vtkMEDReader::GetFieldsTreeArrayName(int index)
 {
+  if(!this->Internal)
+    return 0;
   return this->Internal->Tree.getNameOfC(index);
   //std::cerr << "vtkMEDReader::GetFieldsTreeArrayName(" << index << ") called ! " << ret << std::endl;
 }
 
 int vtkMEDReader::GetFieldsTreeArrayStatus(const char *name)
 {
+  if(!this->Internal)
+    return -1;
+
   int zeId(this->Internal->Tree.getIdHavingZeName(name));
   int ret(this->Internal->Tree.getStatusOf(zeId));
   return ret;
@@ -401,6 +442,9 @@ int vtkMEDReader::GetFieldsTreeArrayStatus(const char *name)
 
 void vtkMEDReader::SetTimesFlagsStatus(const char *name, int status)
 {
+  if (!this->Internal)
+    return;
+  
   if(this->Internal->FileName.empty())
     {//pvsm mode
       this->Internal->PK.pushTimesFlagsStatusEntry(name,status);
@@ -432,6 +476,8 @@ const char *vtkMEDReader::GetTimesFlagsArrayName(int index)
 
 int vtkMEDReader::GetTimesFlagsArrayStatus(const char *name)
 {
+  if(!this->Internal)
+    return -1;
   int pos(0);
   std::istringstream iss(name); iss >> pos;
   return (int)this->Internal->TK.getTimesFlagArray()[pos].first;
@@ -440,7 +486,7 @@ int vtkMEDReader::GetTimesFlagsArrayStatus(const char *name)
 void vtkMEDReader::UpdateSIL(vtkInformation *info)
 {
   if(!this->Internal)
-      return ;
+      return;
   vtkMutableDirectedGraph *sil(vtkMutableDirectedGraph::New());
   std::string meshName(this->BuildSIL(sil));
   if(meshName!=this->Internal->DftMeshName)
@@ -463,6 +509,8 @@ void vtkMEDReader::UpdateSIL(vtkInformation *info)
  */
 std::string vtkMEDReader::BuildSIL(vtkMutableDirectedGraph* sil)
 {
+  if (!this->Internal)
+    return std::string();
   sil->Initialize();
   vtkSmartPointer<vtkVariantArray> childEdge(vtkSmartPointer<vtkVariantArray>::New());
   childEdge->InsertNextValue(0);
@@ -499,6 +547,9 @@ std::string vtkMEDReader::BuildSIL(vtkMutableDirectedGraph* sil)
 
 double vtkMEDReader::PublishTimeStepsIfNeeded(vtkInformation *outInfo, bool& isUpdated)
 {
+  if(!this->Internal)
+    return 0.0;
+
   int lev0(-1);
   std::vector<double> tsteps;
   if(!this->Internal->IsStdOrMode)
@@ -521,6 +572,8 @@ double vtkMEDReader::PublishTimeStepsIfNeeded(vtkInformation *outInfo, bool& isU
 
 void vtkMEDReader::FillMultiBlockDataSetInstance(vtkMultiBlockDataSet *output, double reqTS)
 {
+  if( !this->Internal )
+    return;
   std::string meshName;
   vtkDataSet *ret(this->Internal->Tree.buildVTKInstance(this->Internal->IsStdOrMode,reqTS,meshName,this->Internal->TK));
   if(this->Internal->GenerateVect)