Casefile

src/gui/WidgetDownloadDEM.cpp

@@ -48,13 +48,17 @@ WidgetDownloadDEM::WidgetDownloadDEM(QWidget *parent)
     QString pathToCerts = QString::fromStdString(pathToSslCerts);
     QSslSocket::addDefaultCaCertificates( pathToCerts, QSsl::Pem, QRegExp::FixedString);
 
+
+    wasDemFetched = false;
+    elevSource = "";
+
     demSelected = false;
 
     setupUi(this);
     setupGM();
     initializeGoogleMapsInterface();
     connectInputs();
-    this->readSettings();
+    this->readSettings(); // sets northBounds, southBound, eastBound, westBound initial values
 
     progressBar = new QProgressDialog(this);
     progressBar->setWindowModality(Qt::ApplicationModal);
@@ -211,6 +215,8 @@ void WidgetDownloadDEM::setupGM()
  */
 void WidgetDownloadDEM::saveDEM()
 {
+    wasDemFetched = true;
+
     QVariant mbr = wvGoogleMaps->page()->mainFrame()->evaluateJavaScript("mbr()");
     if(mbr.isNull()) {
         qDebug()<<"no mbr";
@@ -372,6 +378,7 @@ void WidgetDownloadDEM::updateDEMSource(int index)
 {
     switch(index){
     case 0: //SRTM
+        elevSource = "srtm";
         fetcher = FetchFactory::GetSurfaceFetch(FetchFactory::SRTM, FindDataPath("/data"));
         northDEMBound = srtm_northBound;
         southDEMBound = srtm_southBound;
@@ -381,6 +388,7 @@ void WidgetDownloadDEM::updateDEMSource(int index)
         break;
 #ifdef HAVE_GMTED
     case 1: //GMTED
+        elevSource = "gmted";
         fetcher = FetchFactory::GetSurfaceFetch(FetchFactory::WORLD_GMTED, FindDataPath("/data"));
         northDEMBound = world_gmted_northBound;
         southDEMBound = world_gmted_southBound;
@@ -391,6 +399,7 @@ void WidgetDownloadDEM::updateDEMSource(int index)
 #endif
 #ifdef WITH_LCP_CLIENT
     case 2: //LCP
+        elevSource = "lcp";
         fetcher = FetchFactory::GetSurfaceFetch(FetchFactory::LCP, FindDataPath("/data"));
         northDEMBound = lcp_northBound;
         southDEMBound = lcp_southBound;
@@ -567,6 +576,36 @@ void WidgetDownloadDEM::readSettings()
         longitude = 43.911944;
 }
 
+bool WidgetDownloadDEM::get_wasDemFetched()
+{
+    return wasDemFetched;
+}
+
+std::string WidgetDownloadDEM::get_elevSource()
+{
+    return elevSource;
+}
+
+double WidgetDownloadDEM::get_northBound()
+{
+    return northBound;
+}
+
+double WidgetDownloadDEM::get_southBound()
+{
+    return southBound;
+}
+
+double WidgetDownloadDEM::get_eastBound()
+{
+    return eastBound;
+}
+
+double WidgetDownloadDEM::get_westBound()
+{
+    return westBound;
+}
+
 /**
  * @brief Handles close events of GUI such as clicking X close icon
  *

src/gui/WidgetDownloadDEM.h

@@ -67,7 +67,14 @@ class WidgetDownloadDEM : public QWidget, private Ui::WidgetDownloadDEM
     void writeSettings();
     void readSettings();
     int fetchBoundBox(double *boundsBox, const char *fileName, double resolution);
-
+
+    bool get_wasDemFetched();
+    std::string get_elevSource();
+    double get_northBound();
+    double get_southBound();
+    double get_eastBound();
+    double get_westBound();
+
 protected:
     void closeEvent(QCloseEvent *event);
 
@@ -89,6 +96,9 @@ class WidgetDownloadDEM : public QWidget, private Ui::WidgetDownloadDEM
 private:
     QDialog dlg;
 
+    bool wasDemFetched;
+    std::string elevSource;
+
     double latitude;
     double longitude;
     double northBound;