Improve error handling when file doesn't exist (one pop-up instead of two)

Author: akenmorris

Studio/Data/Session.cpp

@@ -203,10 +203,6 @@ bool Session::save_project(QString filename) {
 bool Session::load_project(QString filename) {
   modified_ = false;
 
-  if (!QFile::exists(filename)) {
-    QMessageBox::critical(nullptr, "ShapeWorksStudio", "File does not exist: " + filename, QMessageBox::Ok);
-    return false;
-  }
 
   // clear the project out first
   filename_ = QFileInfo(filename).absoluteFilePath();

Studio/Interface/ShapeWorksStudioApp.cpp

@@ -32,7 +32,6 @@
 #include <Data/Session.h>
 #include <Data/Telemetry.h>
 #include <DeepSSM/DeepSSMTool.h>
-#include <ShapeWorksMONAI/MonaiLabelTool.h>
 #include <Groom/GroomTool.h>
 #include <Interface/CompareWidget.h>
 #include <Interface/ExportImageDialog.h>
@@ -45,6 +44,7 @@
 #include <Optimize/OptimizeTool.h>
 #include <Python/PythonWorker.h>
 #include <Shape.h>
+#include <ShapeWorksMONAI/MonaiLabelTool.h>
 #include <Utils/StudioUtils.h>
 #include <Visualization/Lightbox.h>
 #include <Visualization/Visualizer.h>
@@ -130,14 +130,15 @@ ShapeWorksStudioApp::ShapeWorksStudioApp() {
   connect(deepssm_tool_.data(), &DeepSSMTool::progress, this, &ShapeWorksStudioApp::handle_progress);
   connect(deepssm_tool_.data(), &DeepSSMTool::update_view, this, &ShapeWorksStudioApp::handle_display_setting_changed);
 
-
   // monai tool init
   monai_tool_ = QSharedPointer<monailabel::MonaiLabelTool>::create(preferences_);
   monai_tool_->set_app(this);
   ui_->stacked_widget->addWidget(monai_tool_.data());
   connect(monai_tool_.data(), &monailabel::MonaiLabelTool::progress, this, &ShapeWorksStudioApp::handle_progress);
-  connect(monai_tool_.data(), &monailabel::MonaiLabelTool::update_view, this, &ShapeWorksStudioApp::handle_display_setting_changed);
-  connect(monai_tool_.data(), &monailabel::MonaiLabelTool::sampleChanged, this, &ShapeWorksStudioApp::reset_num_viewers);
+  connect(monai_tool_.data(), &monailabel::MonaiLabelTool::update_view, this,
+          &ShapeWorksStudioApp::handle_display_setting_changed);
+  connect(monai_tool_.data(), &monailabel::MonaiLabelTool::sampleChanged, this,
+          &ShapeWorksStudioApp::reset_num_viewers);
 
   // resize from preferences
   if (!preferences_.get_window_geometry().isEmpty()) {
@@ -525,7 +526,6 @@ void ShapeWorksStudioApp::enable_possible_actions() {
   ui_->action_deepssm_mode->setEnabled(session_->get_project()->get_images_present() && original_present);
   ui_->action_monai_mode->setEnabled(session_->get_project()->get_images_present());
 
-
   // verification step for broken projects
   if (session_->get_tool_state() == Session::DEEPSSM_C && !ui_->action_deepssm_mode->isEnabled()) {
     session_->set_tool_state(Session::DATA_C);
@@ -915,7 +915,6 @@ void ShapeWorksStudioApp::handle_new_mesh() {
   }
 
   deepssm_tool_->handle_new_mesh();
-
 }
 
 //---------------------------------------------------------------------------
@@ -1153,7 +1152,7 @@ void ShapeWorksStudioApp::update_view_mode() {
       }
     }
 
-     else if (session_->get_tool_state() == Session::ANALYSIS_C) {
+    else if (session_->get_tool_state() == Session::ANALYSIS_C) {
       if (analysis_tool_->get_display_feature_map() != feature_map) {
         feature_map_override = analysis_tool_->get_display_feature_map();
       }
@@ -1206,9 +1205,7 @@ void ShapeWorksStudioApp::on_action_analysis_mode_triggered() { session_->set_to
 void ShapeWorksStudioApp::on_action_deepssm_mode_triggered() { session_->set_tool_state(Session::DEEPSSM_C); }
 
 //---------------------------------------------------------------------------
-void ShapeWorksStudioApp::on_action_monai_mode_triggered() {
-  session_->set_tool_state(Session::MONAI_C);
-}
+void ShapeWorksStudioApp::on_action_monai_mode_triggered() { session_->set_tool_state(Session::MONAI_C); }
 
 //---------------------------------------------------------------------------
 void ShapeWorksStudioApp::handle_project_changed() {
@@ -1501,6 +1498,12 @@ void ShapeWorksStudioApp::open_project(QString filename) {
   session_->set_loading(true);
 
   try {
+    if (!QFile::exists(filename)) {
+      QMessageBox::critical(nullptr, "ShapeWorksStudio", "File does not exist: " + filename, QMessageBox::Ok);
+      handle_progress(100);
+      return;
+    }
+
     if (!session_->load_project(filename)) {
       enable_possible_actions();
       handle_error("Project failed to load");
@@ -2150,7 +2153,7 @@ void ShapeWorksStudioApp::reset_num_viewers() {
 
     if (session_->get_tool_state() == Session::DEEPSSM_C) {
       num_samples = deepssm_tool_->get_shapes().size();
-    }  
+    }
 
     int value = 4;
     if (num_samples == 1) {
@@ -2165,7 +2168,7 @@ void ShapeWorksStudioApp::reset_num_viewers() {
       value = 4;  // 4x4
     }
     if (session_->get_tool_state() == Session::MONAI_C) {
-      value = 0; // single viewer always for MONAI tool state
+      value = 0;  // single viewer always for MONAI tool state
     }
     if (value != ui_->zoom_slider->value()) {
       ui_->zoom_slider->setValue(value);
@@ -2204,7 +2207,6 @@ void ShapeWorksStudioApp::update_view_combo() {
     set_view_combo_item_enabled(DisplayMode::Reconstructed, should_reconstruct_view_show());
   }
 
-
   std::string mode = AnalysisTool::MODE_ALL_SAMPLES_C;
   bool analysis_mode = ui_->action_analysis_mode->isChecked();
   if (analysis_mode) {