Merge branch 'hlrs-vis:master' into kite-fix-2

Author: karthikeya-ms

src/OpenCOVER/cover/coVRAnimationManager.cpp

@@ -459,7 +459,7 @@ void opencover::coVRAnimationManager::setAnimationSkipMax(int maxFrames)
 }
 
 bool
-coVRAnimationManager::animationRunning()
+coVRAnimationManager::animationRunning() const
 {
     return m_animRunning;
 }

src/OpenCOVER/cover/coVRAnimationManager.h

@@ -92,7 +92,7 @@ class COVEREXPORT coVRAnimationManager
     void setAnimationSpeedMax(float maxSpeed);
     void setAnimationSkip(int frames, bool ignoreMax = false);
     void setAnimationSkipMax(int maxFrames);
-    bool animationRunning();
+    bool animationRunning() const;
     void enableAnimation(bool state);
     void setRemoteAnimationFrame(int currentFrame);
     void setRemoteAnimate(bool state);

src/module/general/ReadEnsight/CaseFile.cpp

@@ -19,6 +19,8 @@
 #include <iostream>
 #include <boost/algorithm/string.hpp>
 
+static const int DefaultTimeSet = 1;
+
 //
 // Constructor
 //
@@ -172,22 +174,21 @@ int CaseFile::getGeoTsIdx() const
 
 void CaseFile::addTimeSet(TimeSet *ts)
 {
-    timeSets_.push_back(ts);
     int idx = ts->getIdx();
     if (idx < 0) {
         std::cerr << "CaseFile::addTimeSet: invalid time set index " << idx << std::endl;
-        idx = 0;
         return;
     }
-    if (idx >= 0 && idx >= timeSets_.size()) {
-        timeSets_.resize(idx + 1);
-    }
+    lastTimeSet_ = ts;
     timeSets_[idx] = ts;
 }
 
-const TimeSet *CaseFile::getTimeSet(int idx) const
+TimeSet *CaseFile::getTimeSet(int idx) const
 {
-    return timeSets_[idx];
+    auto it = timeSets_.find(idx);
+    if (it == timeSets_.end())
+        return nullptr;
+    return it->second;
 }
 
 const TimeSet *CaseFile::getTimeSet(const std::string &field) const
@@ -198,45 +199,30 @@ const TimeSet *CaseFile::getTimeSet(const std::string &field) const
                   << std::endl;
         return nullptr;
     }
-    std::cerr << "CaseFile::getTimeSet: field " << field << ": mapping to idx " << it->second << std::endl;
-    if (it->second < 0) {
-        return nullptr;
-    }
-    if (it->second >= timeSets_.size()) {
-        return nullptr;
+    auto ts = it->second;
+    std::cerr << "CaseFile::getTimeSet: field " << field << ": mapping to idx " << ts << std::endl;
+    if (ts < 0) {
+        ts = DefaultTimeSet;
     }
-    return timeSets_[it->second];
+    return getTimeSet(ts);
 }
 
 const TimeSet *CaseFile::getGeoTimeSet() const
 {
-    if (geoTsIdx_ < 0)
-        return nullptr;
-    if (geoTsIdx_ >= timeSets_.size())
-        return nullptr;
-    return timeSets_[geoTsIdx_];
+    auto ts = geoTsIdx_;
+    if (ts < 0)
+        ts = DefaultTimeSet;
+    return getTimeSet(ts);
 }
 
 const TimeSet *CaseFile::getLastTimeSet() const
 {
-    return timeSets_.back();
+    return lastTimeSet_;
 }
 
 TimeSet *CaseFile::getLastTimeSet()
 {
-    return timeSets_.back();
-}
-
-std::vector<float> CaseFile::getAllRealTimes() const
-{
-    std::set<float> times;
-    for (auto ts = timeSets_.begin(); ts != timeSets_.end(); ts++) {
-        std::vector<float> rts = (*ts)->getRealTimes();
-        times.insert(rts.begin(), rts.end());
-    }
-    std::vector<float> ret;
-    std::copy(times.begin(), times.end(), std::back_inserter(ret));
-    return ret;
+    return lastTimeSet_;
 }
 
 std::vector<std::string> CaseFile::makeFileNames(const std::string &baseName, const TimeSet *refts) const
@@ -267,13 +253,31 @@ std::vector<std::string> CaseFile::makeFileNames(const std::string &baseName, co
 
 TimeSets CaseFile::getAllTimeSets() const
 {
+    auto used = usedTimeSets_;
+    used.insert(DefaultTimeSet);
     TimeSets ts;
-    for (int idx: usedTimeSets_) {
-        ts.push_back(timeSets_[idx]);
+    for (int idx: used) {
+        auto t = getTimeSet(idx);
+        if (t)
+            ts.push_back(getTimeSet(idx));
     }
     return ts;
 }
 
+std::vector<float> CaseFile::getAllRealTimes() const
+{
+    std::set<float> times;
+    auto timesets = getAllTimeSets();
+    for (auto ts = timesets.begin(); ts != timesets.end(); ts++) {
+        std::vector<float> rts = (*ts)->getRealTimes();
+        times.insert(rts.begin(), rts.end());
+    }
+    std::vector<float> ret;
+    std::copy(times.begin(), times.end(), std::back_inserter(ret));
+    return ret;
+}
+
+
 //
 // Destructor
 //

src/module/general/ReadEnsight/CaseFile.h

@@ -75,12 +75,12 @@ class CaseFile {
     bool empty() const { return empty_; };
 
     void addTimeSet(TimeSet *ts);
-    TimeSets getAllTimeSets() const;
+    TimeSet *getLastTimeSet();
     const TimeSet *getLastTimeSet() const;
-    const TimeSet *getTimeSet(int idx) const;
+    TimeSets getAllTimeSets() const;
+    TimeSet *getTimeSet(int idx) const;
     const TimeSet *getTimeSet(const std::string &field) const;
     const TimeSet *getGeoTimeSet() const;
-    TimeSet *getLastTimeSet();
     std::vector<float> getAllRealTimes() const;
 
     std::vector<std::string> makeFileNames(const std::string &baseName, const TimeSet *ts) const;
@@ -94,12 +94,13 @@ class CaseFile {
     std::string fullFilename_;
     std::string dir_;
     std::string projectNm_;
-    TimeSets timeSets_;
+    std::map<int, TimeSet *> timeSets_;
     std::map<std::string, int> fieldMap_;
     int geoTsIdx_; // time set index of geometry
     BinType binType_ = UNKNOWN;
     int connectivityFileIndex_ = -1; // index of the connectivity file, -1: all time steps
     std::set<int> usedTimeSets_;
+    TimeSet *lastTimeSet_ = nullptr;
 };
 
 // simple data class to store time step information

src/module/general/ReadEnsight/ReadEnsight.cpp

@@ -198,10 +198,9 @@ void ReadEnsight::param(const char *paramName, bool inMapLoading)
                         readGeo_ = true;
                         // this is dirty TBD do it better
                         ////// print Number of Timesteps
-                        const TimeSets &ts = case_.getAllTimeSets();
-                        TimeSets::const_iterator tsIter;
+                        const TimeSets ts = case_.getAllTimeSets();
                         int numTs = 0;
-                        for (tsIter = ts.begin(); tsIter != ts.end(); ++tsIter)
+                        for (auto tsIter = ts.begin(); tsIter != ts.end(); ++tsIter)
                         {
                             numTs += (*tsIter)->getNumTs();
                         }