From 7b0646151b1635cc9eb7c2fd96d0f18b53feb045 Mon Sep 17 00:00:00 2001
From: James Hogan <james@albanarts.com>
Date: Thu, 5 Mar 2009 02:55:32 +0000
Subject: [PATCH] Snapshot loading loads std dev graph

---
 geo/tcElevationOptimization.cpp | 24 ++++++++++++++++++------
 geo/tcElevationOptimization.h   |  3 +++
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/geo/tcElevationOptimization.cpp b/geo/tcElevationOptimization.cpp
index 563847f..0f547b2 100644
--- a/geo/tcElevationOptimization.cpp
+++ b/geo/tcElevationOptimization.cpp
@@ -125,6 +125,7 @@ tcElevationOptimization::tcElevationOptimization(const QList<tcShadowClassifying
 , m_stdDevNonVoidCurve(new QwtPlotCurve())
 , m_snapshotFile()
 , m_snapshotReadFile()
+, m_snapshotReading(false)
 , m_snapshotSlider(0)
 {
   m_plot->setWindowFlags(Qt::Tool | Qt::WindowStaysOnTopHint);
@@ -886,7 +887,7 @@ void tcElevationOptimization::sampleStdDeviations()
                   .arg(stdDevAll).arg(stdDevVoid).arg(stdDevNonVoid));
   //m_configWidget->update();
 
-  if (m_snapshotReadFile.isEmpty())
+  if (m_snapshotReadFile.isEmpty() || m_snapshotReading)
   {
     m_plotX.append(m_plotX.size()+1);
     m_stdDevData.append(stdDevAll);
@@ -1030,9 +1031,6 @@ void tcElevationOptimization::loadSnapShots()
     // force update of region
     m_configWidget->requestSlice(p1, p2);
 
-    // load first sample
-    loadSnapShot(1);
-
     // Find number of snaps
     int max = 0;
     bool exists = true;
@@ -1047,6 +1045,17 @@ void tcElevationOptimization::loadSnapShots()
     --max;
     m_snapshotSlider->setRange(1, max);
     m_snapshotSlider->setEnabled(true);
+
+    // load first sample
+    clearStdDeviations();
+    m_snapshotReading = true;
+    for (int i = 1; i <= max; ++i)
+    {
+      loadSnapShot(i);
+    }
+    m_snapshotReading = false;
+    loadSnapShot(max);
+    m_snapshotSlider->setValue(max);
   }
   else
   {
@@ -1086,8 +1095,11 @@ void tcElevationOptimization::loadSnapShot(int id)
           }
         }
         sampleStdDeviations();
-        invalidate();
-        m_configWidget->requestRedraw();
+        if (!m_snapshotReading)
+        {
+          invalidate();
+          m_configWidget->requestRedraw();
+        }
       }
     }
   }
diff --git a/geo/tcElevationOptimization.h b/geo/tcElevationOptimization.h
index 5d4f976..dc79766 100644
--- a/geo/tcElevationOptimization.h
+++ b/geo/tcElevationOptimization.h
@@ -328,6 +328,9 @@ class tcElevationOptimization : public tcChannelDem
     /// Snapshot read file.
     QString m_snapshotReadFile;
 
+    /// Whether currently reading snapshots.
+    bool m_snapshotReading;
+
     /// Snapshot time slider.
     QSlider* m_snapshotSlider;
 };
-- 
2.11.4.GIT