From: geay <anthony.geay@cea.fr>
Date: Tue, 25 Mar 2014 15:54:43 +0000 (+0100)
Subject: Add frequency info in mode mode.
X-Git-Tag: V7_4_0a1^2~4
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=4346a36e5514cd27831340d3a2ff5691523fde8d;p=modules%2Fparavis.git

Add frequency info in mode mode.
---

diff --git a/src/Plugins/MEDReader/IO/MEDFileFieldRepresentationTree.cxx b/src/Plugins/MEDReader/IO/MEDFileFieldRepresentationTree.cxx
index 5b5a2893..8832df19 100644
--- a/src/Plugins/MEDReader/IO/MEDFileFieldRepresentationTree.cxx
+++ b/src/Plugins/MEDReader/IO/MEDFileFieldRepresentationTree.cxx
@@ -1252,7 +1252,7 @@ vtkDataSet *MEDFileFieldRepresentationTree::buildVTKInstance(bool isStdOrMode, d
   if(!isStdOrMode)
     tr=new MEDStdTimeReq((int)zeTimeId);
   else
-    tr=new MEDModeTimeReq(tk.getTheVectOfBool());
+    tr=new MEDModeTimeReq(tk.getTheVectOfBool(),tk.getPostProcessedTime());
   vtkDataSet *ret(leaf.buildVTKInstanceNoTimeInterpolation(tr,_fields,_ms));
   delete tr;
   return ret;
diff --git a/src/Plugins/MEDReader/IO/MEDTimeReq.cxx b/src/Plugins/MEDReader/IO/MEDTimeReq.cxx
index e2b0d939..13fb5207 100644
--- a/src/Plugins/MEDReader/IO/MEDTimeReq.cxx
+++ b/src/Plugins/MEDReader/IO/MEDTimeReq.cxx
@@ -74,7 +74,7 @@ void MEDStdTimeReq::operator++() const
 
 ///////////
 
-MEDModeTimeReq::MEDModeTimeReq(const std::vector<bool>& v):_v(v),_it(0),_sz(0)
+MEDModeTimeReq::MEDModeTimeReq(const std::vector<bool>& v, const std::vector<double>& ts):_v(v),_ts(ts),_it(0),_sz(0)
 {
 }
 
@@ -120,7 +120,9 @@ std::string MEDModeTimeReq::buildName(const std::string& name) const
   oss2.width(len);
   oss2.fill('0'); oss2 << _it;
   //
-  oss << oss2.str() << "]"; 
+  oss << oss2.str() << "]";
+  if(_it<(int)_ts.size())
+    oss << " - " << _ts[_it];
   return oss.str();
 }
 
diff --git a/src/Plugins/MEDReader/IO/MEDTimeReq.hxx b/src/Plugins/MEDReader/IO/MEDTimeReq.hxx
index f4192411..7102eca7 100644
--- a/src/Plugins/MEDReader/IO/MEDTimeReq.hxx
+++ b/src/Plugins/MEDReader/IO/MEDTimeReq.hxx
@@ -55,7 +55,7 @@ private:
 class MEDModeTimeReq : public MEDTimeReq
 {
 public:
-  MEDModeTimeReq(const std::vector<bool>& v);
+  MEDModeTimeReq(const std::vector<bool>& v, const std::vector<double>& ts);
   ~MEDModeTimeReq();
   int size() const;
   int getCurrent() const;
@@ -65,6 +65,7 @@ public:
   void operator++() const;
 private:
   std::vector<bool> _v;
+  std::vector<double> _ts;
   mutable int _it;
   mutable int _sz;
 };