Merge pull request #2255 from SCIInstitute/2251-notes-column

2251 - Fix notes column
SCIInstitute · May 18, 2024 · 8251992 · 8251992
2 parents 9e14f5d + a659d80
commit 8251992
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 10 deletions.
diff --git a/Libs/Project/ProjectReader.cpp b/Libs/Project/ProjectReader.cpp
@@ -68,12 +68,12 @@ void ProjectReader::load_subjects(StringMapList list) {
     if (contains(item, "excluded")) {
       subject->set_excluded(Variant(item["excluded"]));
     }
-    if (name == "") {
-      if (subject->get_original_filenames().size() != 0) {
+    if (name.empty()) {
+      if (!subject->get_original_filenames().empty()) {
         name = StringUtils::getBaseFilenameWithoutExtension(subject->get_original_filenames()[0]);
-      } else if (subject->get_groomed_filenames().size() != 0) {
+      } else if (!subject->get_groomed_filenames().empty()) {
         name = StringUtils::getBaseFilenameWithoutExtension(subject->get_groomed_filenames()[0]);
-      } else if (subject->get_local_particle_filenames().size() > 0) {
+      } else if (!subject->get_local_particle_filenames().empty()) {
         name = StringUtils::getBaseFilenameWithoutExtension(subject->get_local_particle_filenames()[0]);
       }
     }

diff --git a/Studio/Data/DataTool.cpp b/Studio/Data/DataTool.cpp
@@ -656,19 +656,32 @@ void DataTool::table_data_edited() {
   }
 
   bool change = false;
+
+  // find name and notes columns
+  int name_column = -1;
+  int notes_column = -1;
+  for (int i = 0; i < ui_->table->columnCount(); i++) {
+    if (ui_->table->horizontalHeaderItem(i)->text() == "name") {
+      name_column = i;
+    } else if (ui_->table->horizontalHeaderItem(i)->text() == "notes") {
+      notes_column = i;
+    }
+  }
+
   // iterate over all rows, not just selected
   for (int row = 0; row < ui_->table->rowCount(); row++) {
     auto shape = session_->get_shapes()[row];
     auto old_name = shape->get_subject()->get_display_name();
     auto old_notes = shape->get_subject()->get_notes();
-    if (ui_->table->item(row, 0) == nullptr) {
-      continue;
+
+    std::string new_name;
+    if (name_column != -1) {
+      new_name = ui_->table->item(row, name_column)->text().toStdString();
     }
-    auto new_name = ui_->table->item(row, 0)->text().toStdString();
-    if (ui_->table->item(row, 1) == nullptr) {
-      continue;
+    std::string new_notes;
+    if (notes_column != -1) {
+      new_notes = ui_->table->item(row, notes_column)->text().toStdString();
     }
-    auto new_notes = ui_->table->item(row, 1)->text().toStdString();
     if (old_name != new_name) {
       shape->get_subject()->set_display_name(new_name);
       shape->update_annotations();