Merge pull request #746 from firelab/GUI-Redesign-someFixes

Small Fixes for test build of Qt6 GUI

Author: masonwillman

src/gui/main.cpp

@@ -36,13 +36,15 @@ int main(int argc, char *argv[])
     MainWindow* w = nullptr;
     try {
         w = new MainWindow;
+        w->setMinimumSize(800, 600);
+        w->resize(800, 600);
     } catch (...) {
         return 1;
     }
 
     // Set the Splash Screen
     QPixmap pix(":wn-splash.png");
-    QSplashScreen *splash = new QSplashScreen(pix.scaled(1200, 320, Qt::KeepAspectRatioByExpanding));
+    QSplashScreen *splash = new QSplashScreen(pix.scaled(600, 160, Qt::KeepAspectRatioByExpanding));
 
     QGraphicsOpacityEffect *effect = new QGraphicsOpacityEffect(splash);
     splash->setGraphicsEffect(effect);

src/gui/mainWindow.cpp

@@ -93,8 +93,10 @@ MainWindow::MainWindow(QWidget *parent)
 
     connectSignals();
 
+    ui->treeWidget->blockSignals(true);
     ui->treeWidget->topLevelItem(0)->setSelected(true);
-    ui->inputsStackedWidget->setCurrentIndex(1); // setSelected shows the blank page, have to have this to show proper page
+    ui->inputsStackedWidget->setCurrentIndex(1);
+    ui->treeWidget->blockSignals(false);
 
     int nCPUs = QThread::idealThreadCount();
     ui->availableProcessorsLabel->setText("Available Processors:  " + QString::number(nCPUs));
@@ -305,6 +307,8 @@ void MainWindow::cancelSolve()
 
 void MainWindow::treeWidgetItemSelectionChanged()
 {
+    webEngineView->page()->runJavaScript("stopRectangleDrawing();");
+
     int column = ui->treeWidget->currentColumn();
     int pageIndex = ui->treeWidget->selectedItems().first()->data(column, Qt::UserRole).toInt(); // assume 0 since no multi selection
     ui->inputsStackedWidget->setCurrentIndex(pageIndex);
@@ -1335,6 +1339,22 @@ bool MainWindow::setOutputFlags(NinjaArmyH* ninjaArmy,
         return false;
     }
 
+    ninjaErr = NinjaSetAsciiAaigridOutFlag(ninjaArmy, i, ui->fireBehaviorGroupBox->isChecked(), papszOptions);
+    //ninjaErr = NinjaSetAsciiAaigridOutFlag(ninjaArmy, i+10, ui->fireBehaviorGroupBox->isChecked(), papszOptions);  // test error handling
+    if (ninjaErr != NINJA_SUCCESS)
+    {
+        qDebug() << "NinjaSetAsciiAaigridOutFlag: ninjaErr =" << ninjaErr;
+        return false;
+    }
+
+    ninjaErr = NinjaSetAsciiProjOutFlag(ninjaArmy, i, ui->fireBehaviorGroupBox->isChecked(), papszOptions);
+    //ninjaErr = NinjaSetAsciiProjOutFlag(ninjaArmy, i+10, ui->fireBehaviorGroupBox->isChecked(), papszOptions);  // test error handling
+    if (ninjaErr != NINJA_SUCCESS)
+    {
+        qDebug() << "NinjaSetAsciiProjOutFlag: ninjaErr =" << ninjaErr;
+        return false;
+    }
+
     ninjaErr = NinjaSetAsciiResolution(ninjaArmy, i, ui->fireBehaviorMeshResolutionSpinBox->value(), ui->fireBehaviorMeshResolutionComboBox->itemData(ui->fireBehaviorMeshResolutionComboBox->currentIndex()).toString().toUtf8().constData(), papszOptions);
     //ninjaErr = NinjaSetAsciiResolution(ninjaArmy, i+10, ui->fireBehaviorMeshResolutionSpinBox->value(), ui->fireBehaviorMeshResolutionComboBox->itemData(ui->fireBehaviorMeshResolutionComboBox->currentIndex()).toString().toUtf8().constData(), papszOptions);  // test error handling  // hrm, ninjaCom isn't triggering for this one, though the error returns, leading to it hanging without a proper message.
     //ninjaErr = NinjaSetAsciiResolution(ninjaArmy, i, ui->fireBehaviorMeshResolutionSpinBox->value(), "fudge", papszOptions);  // test error handling

src/gui/mapBridge.cpp

@@ -45,10 +45,6 @@ void MapBridge::receiveBoundingBox(const QString &jsonCoords)
     double east = obj["east"].toDouble();
     double west = obj["west"].toDouble();
 
-    qDebug() << "Bounding box received:";
-    qDebug() << "North:" << north << "South:" << south;
-    qDebug() << "East:" << east << "West:" << west;
-
     emit boundingBoxReceived(north, south, east, west);
 }
 

src/gui/pointInitializationInput.cpp

@@ -407,6 +407,7 @@ void PointInitializationInput::weatherStationDataDownloadButtonClicked()
     futureWatcher->setFuture(future);
 
     connect(futureWatcher, &QFutureWatcher<int>::finished, this, &PointInitializationInput::fetchStationDataFinished);
+    connect(progress, &QProgressDialog::canceled, this, &PointInitializationInput::fetchStationDataFinished);
 }
 
 int PointInitializationInput::fetchStationFromBbox(NinjaToolsH* ninjaTools,
@@ -547,27 +548,38 @@ int PointInitializationInput::fetchStationByName(NinjaToolsH* ninjaTools,
 
 void PointInitializationInput::fetchStationDataFinished()
 {
-    // get the return value of the QtConcurrent::run() function
-    int result = futureWatcher->future().result();
+    if(!futureWatcher)
+    {
+        return;
+    }
 
-    if(result == NINJA_SUCCESS)
+    if(progress && progress->wasCanceled())
     {
-        emit writeToConsoleSignal("Finished fetching station data.", Qt::darkGreen);
+        futureWatcher->waitForFinished();
+    }
+    else
+    {
+        // get the return value of the QtConcurrent::run() function
+        int result = futureWatcher->future().result();
 
-        if (progress)
+        if(result == NINJA_SUCCESS)
         {
-            progress->close();
-            progress->deleteLater();
-            progress = nullptr;
-        }
+            emit writeToConsoleSignal("Finished fetching station data.", Qt::darkGreen);
 
-        ui->inputsStackedWidget->setCurrentIndex(7);
+            if (progress)
+            {
+                progress->close();
+                progress->deleteLater();
+                progress = nullptr;
+            }
 
-    } else
-    {
-        emit writeToConsoleSignal("Failed to fetch station data.");
-    }
+            ui->inputsStackedWidget->setCurrentIndex(7);
 
+        } else
+        {
+            emit writeToConsoleSignal("Failed to fetch station data.");
+        }
+    }
     // delete the futureWatcher every time, whether success or failure
     if (futureWatcher)
     {

src/gui/surfaceInput.cpp

@@ -361,49 +361,62 @@ void SurfaceInput::startFetchDEM(QVector<double> boundingBox, std::string demFil
     futureWatcher->setFuture(future);
 
     connect(futureWatcher, &QFutureWatcher<int>::finished, this, &SurfaceInput::fetchDEMFinished);
+    connect(progress, &QProgressDialog::canceled, this, &SurfaceInput::fetchDEMFinished);
 }
 
 void SurfaceInput::fetchDEMFinished()
 {
-    // get the return value of the QtConcurrent::run() function
-    int result = futureWatcher->future().result();
+    if(!futureWatcher)
+    {
+        return;
+    }
 
-    if(result == NINJA_SUCCESS)
+    if(progress && progress->wasCanceled())
+    {
+        futureWatcher->waitForFinished();
+    }
+    else
     {
-        emit writeToConsoleSignal("Finished fetching DEM file.", Qt::darkGreen);
+        // get the return value of the QtConcurrent::run() function
+        int result = futureWatcher->future().result();
 
-        bool retVal = loadDemMetadata(pendingDownloadDemFilePath);
-        if(retVal == true)
+        if(result == NINJA_SUCCESS)
         {
-            ui->elevationInputFileLineEdit->setProperty("fullpath", pendingDownloadDemFilePath);
-            ui->elevationInputFileLineEdit->setText(QFileInfo(pendingDownloadDemFilePath).fileName());
-            ui->elevationInputFileLineEdit->setToolTip(pendingDownloadDemFilePath);
-            ui->inputsStackedWidget->setCurrentIndex(3);
+            emit writeToConsoleSignal("Finished fetching DEM file.", Qt::darkGreen);
+
+            bool retVal = loadDemMetadata(pendingDownloadDemFilePath);
+            if(retVal == true)
+            {
+                ui->elevationInputFileLineEdit->setProperty("fullpath", pendingDownloadDemFilePath);
+                ui->elevationInputFileLineEdit->setText(QFileInfo(pendingDownloadDemFilePath).fileName());
+                ui->elevationInputFileLineEdit->setToolTip(pendingDownloadDemFilePath);
+                ui->inputsStackedWidget->setCurrentIndex(3);
+            }
+            //else  // if(retVal == false)
+            //{
+            //    // message is handled in loadDemMetadata()
+            //    // don't want to return here, need to wrap up all the other todos of this function or things won't close properly
+            //    //return;
+            //}
+
+            if(progress)
+            {
+                progress->close();
+                progress->deleteLater();
+                progress = nullptr;
+            }
         }
-        //else  // if(retVal == false)
-        //{
-        //    // message is handled in loadDemMetadata()
-        //    // don't want to return here, need to wrap up all the other todos of this function or things won't close properly
-        //    //return;
-        //}
-
-        if(progress)
+        else
         {
-            progress->close();
-            progress->deleteLater();
-            progress = nullptr;
+            emit writeToConsoleSignal("Failed to fetch DEM file.");
         }
-    }
-    else
-    {
-        emit writeToConsoleSignal("Failed to fetch DEM file.");
-    }
 
-    // delete the futureWatcher every time, whether success or failure
-    if(futureWatcher)
-    {
-        futureWatcher->deleteLater();
-        futureWatcher = nullptr;
+        // delete the futureWatcher every time, whether success or failure
+        if(futureWatcher)
+        {
+            futureWatcher->deleteLater();
+            futureWatcher = nullptr;
+        }
     }
 }
 
@@ -719,6 +732,8 @@ int SurfaceInput::fetchDEMFile(QVector<double> boundingBox, std::string demFile,
 
 bool SurfaceInput::loadDemMetadata(const QString demFilePath)
 {
+    CPLSetConfigOption( "GDAL_PAM_ENABLED", "OFF" );
+
     double adfGeoTransform[6];
     GDALDataset *poInputDS;
 
@@ -794,6 +809,8 @@ bool SurfaceInput::loadDemMetadata(const QString demFilePath)
 
     GDALClose((GDALDatasetH)poInputDS);
 
+    CPLSetConfigOption( "GDAL_PAM_ENABLED", "ON" );
+
     return true;
 }
 

src/gui/weatherModelInput.cpp

@@ -109,6 +109,7 @@ void WeatherModelInput::weatherModelDownloadButtonClicked()
 
     connect(futureWatcher, &QFutureWatcher<int>::finished,
             this, &WeatherModelInput::weatherModelDownloadFinished);
+    connect(progress, &QProgressDialog::canceled, this, &WeatherModelInput::weatherModelDownloadFinished);
 }
 
 void WeatherModelInput::updateProgressMessage(const QString message)
@@ -278,29 +279,41 @@ int WeatherModelInput::fetchPastcastWeather(
 
 void WeatherModelInput::weatherModelDownloadFinished()
 {
-    // get the return value of the QtConcurrent::run() function
-    int result = futureWatcher->future().result();
+    if(!futureWatcher)
+    {
+        return;
+    }
 
-    if(result == NINJA_SUCCESS)
+    if(progress && progress->wasCanceled())
+    {
+        futureWatcher->waitForFinished();
+    }
+    else
     {
-        emit writeToConsoleSignal("Finished fetching weather model data.", Qt::darkGreen);
+        // get the return value of the QtConcurrent::run() function
+        int result = futureWatcher->future().result();
 
-        if (progress)
+        if(result == NINJA_SUCCESS)
         {
-            progress->close();
-            progress->deleteLater();
-            progress = nullptr;
+            emit writeToConsoleSignal("Finished fetching weather model data.", Qt::darkGreen);
+
+            if (progress)
+            {
+                progress->close();
+                progress->deleteLater();
+                progress = nullptr;
+            }
+        } else
+        {
+            emit writeToConsoleSignal("Failed to fetch weather model data.");
         }
-    } else
-    {
-        emit writeToConsoleSignal("Failed to fetch weather model data.");
-    }
 
-    // delete the futureWatcher every time, whether success or failure
-    if (futureWatcher)
-    {
-        futureWatcher->deleteLater();
-        futureWatcher = nullptr;
+        // delete the futureWatcher every time, whether success or failure
+        if (futureWatcher)
+        {
+            futureWatcher->deleteLater();
+            futureWatcher = nullptr;
+        }
     }
 }
 

src/ninja/windninja.cpp

@@ -2042,6 +2042,31 @@ WINDNINJADLL_EXPORT NinjaErr NinjaSetAsciiOutFlag
     }
 }
 
+WINDNINJADLL_EXPORT NinjaErr NinjaSetAsciiAaigridOutFlag
+    ( NinjaArmyH * army, const int nIndex, const bool flag, char ** papszOptions )
+{
+    if( NULL != army )
+    {
+        return reinterpret_cast<ninjaArmy*>( army )->setAsciiAaigridOutFlag( nIndex, flag );
+    }
+    else
+    {
+        return NINJA_E_NULL_PTR;
+    }
+}
+
+WINDNINJADLL_EXPORT NinjaErr NinjaSetAsciiProjOutFlag
+    ( NinjaArmyH * army, const int nIndex, const bool flag, char ** papszOptions )
+{
+    if( NULL != army )
+    {
+        return reinterpret_cast<ninjaArmy*>( army )->setAsciiProjOutFlag( nIndex, flag );
+    }
+    else
+    {
+        return NINJA_E_NULL_PTR;
+    }
+}
 
 /**
  * \brief Set the resolution of the raster output for a simulation.

src/ninja/windninja.h

@@ -342,6 +342,12 @@ typedef int  NinjaErr;
     WINDNINJADLL_EXPORT NinjaErr NinjaSetAsciiOutFlag
         ( NinjaArmyH * ninjaArmy, const int nIndex, const bool flag, char ** papszOptions );
 
+    WINDNINJADLL_EXPORT NinjaErr NinjaSetAsciiAaigridOutFlag
+        ( NinjaArmyH * ninjaArmy, const int nIndex, const bool flag, char ** papszOptions );
+
+    WINDNINJADLL_EXPORT NinjaErr NinjaSetAsciiProjOutFlag
+        ( NinjaArmyH * ninjaArmy, const int nIndex, const bool flag, char ** papszOptions );
+
     WINDNINJADLL_EXPORT NinjaErr NinjaSetAsciiResolution
         ( NinjaArmyH * ninjaArmy, const int nIndex, const double resolution,
           const char * units, char ** options );