ENH: Do not allow loading the same treatment machine twice

Re #218
SlicerRt · Oct 5, 2023 · 6fac598 · 6fac598
1 parent 959e529
commit 6fac598
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 20 deletions.
diff --git a/RoomsEyeView/Logic/vtkSlicerRoomsEyeViewModuleLogic.cxx b/RoomsEyeView/Logic/vtkSlicerRoomsEyeViewModuleLogic.cxx
@@ -69,7 +69,7 @@
 
 // Constants
 const char* vtkSlicerRoomsEyeViewModuleLogic::ORIENTATION_MARKER_MODEL_NODE_NAME = "RoomsEyeViewOrientationMarker";
-const char* vtkSlicerRoomsEyeViewModuleLogic::TREATMENT_MACHINE_FOLDER_ITEM_ATTRIBUTE_NAME = "TreatmentMachineFolder";
+const char* vtkSlicerRoomsEyeViewModuleLogic::TREATMENT_MACHINE_DESCRIPTOR_FILE_PATH_ATTRIBUTE_NAME = "TreatmentMachineDescriptorFilePath";
 //TODO: Add this dynamically to the IEC transform map
 static const char* ADDITIONALCOLLIMATORMOUNTEDDEVICES_TO_COLLIMATOR_TRANSFORM_NODE_NAME = "AdditionalCollimatorDevicesToCollimatorTransform";
 static rapidjson::Value JSON_EMPTY_VALUE;
@@ -499,7 +499,7 @@ void vtkSlicerRoomsEyeViewModuleLogic::LoadTreatmentMachine(vtkMRMLRoomsEyeViewN
   // Create subject hierarchy folder so that the treatment machine can be shown/hidden easily
   std::string subjectHierarchyFolderName = machineType + std::string("_Components");
   vtkIdType rootFolderItem = shNode->CreateFolderItem(shNode->GetSceneItemID(), subjectHierarchyFolderName);
-  shNode->SetItemAttribute(rootFolderItem, TREATMENT_MACHINE_FOLDER_ITEM_ATTRIBUTE_NAME, "1");
+  shNode->SetItemAttribute(rootFolderItem, TREATMENT_MACHINE_DESCRIPTOR_FILE_PATH_ATTRIBUTE_NAME, descriptorFilePath);
 
   // Load treatment machine models
 

diff --git a/RoomsEyeView/Logic/vtkSlicerRoomsEyeViewModuleLogic.h b/RoomsEyeView/Logic/vtkSlicerRoomsEyeViewModuleLogic.h
@@ -67,7 +67,7 @@ class VTK_SLICER_ROOMSEYEVIEW_LOGIC_EXPORT vtkSlicerRoomsEyeViewModuleLogic :
     }; 
 
   static const char* ORIENTATION_MARKER_MODEL_NODE_NAME;
-  static const char* TREATMENT_MACHINE_FOLDER_ITEM_ATTRIBUTE_NAME;
+  static const char* TREATMENT_MACHINE_DESCRIPTOR_FILE_PATH_ATTRIBUTE_NAME;
 
 public:
   static vtkSlicerRoomsEyeViewModuleLogic *New();

diff --git a/RoomsEyeView/qSlicerRoomsEyeViewModuleWidget.cxx b/RoomsEyeView/qSlicerRoomsEyeViewModuleWidget.cxx
@@ -455,6 +455,21 @@ void qSlicerRoomsEyeViewModuleWidget::onLoadTreatmentMachineButtonClicked()
     return;
   }
 
+  // Get treatment machine descriptor file path
+  QString treatmentMachineType(d->TreatmentMachineComboBox->currentData().toString());
+  QString descriptorFilePath;
+  if (!treatmentMachineType.compare("FromFile"))
+  {
+    // Ask user for descriptor JSON file if load from file option is selected
+    descriptorFilePath = QFileDialog::getOpenFileName( this, "Select treatment machine descriptor JSON file...",
+      QString(), "Json files (*.json);; All files (*)" ); 
+  }
+  else //TODO: Currently support two default types in addition to loading file. Need to rethink the module
+  {
+    QString relativeFilePath = QString("%1/%2.json").arg(treatmentMachineType).arg(treatmentMachineType);
+    descriptorFilePath = QDir(d->logic()->GetModuleShareDirectory().c_str()).filePath(relativeFilePath);
+  }
+
   // Check if there is a machine already loaded and ask user what to do if so
   vtkMRMLSubjectHierarchyNode* shNode = this->mrmlScene()->GetSubjectHierarchyNode();
   std::vector<vtkIdType> allItemIDs;
@@ -463,8 +478,14 @@ void qSlicerRoomsEyeViewModuleWidget::onLoadTreatmentMachineButtonClicked()
   std::vector<vtkIdType>::iterator itemIt;
   for (itemIt=allItemIDs.begin(); itemIt!=allItemIDs.end(); ++itemIt)
     {
-    std::string machineFolderAttValue = shNode->GetItemAttribute(*itemIt, vtkSlicerRoomsEyeViewModuleLogic::TREATMENT_MACHINE_FOLDER_ITEM_ATTRIBUTE_NAME);
-    if (!machineFolderAttValue.compare("1"))
+    std::string machineDescriptorFilePath = shNode->GetItemAttribute(*itemIt,
+      vtkSlicerRoomsEyeViewModuleLogic::TREATMENT_MACHINE_DESCRIPTOR_FILE_PATH_ATTRIBUTE_NAME);
+    if (!machineDescriptorFilePath.compare(descriptorFilePath.toUtf8().constData()))
+      {
+      QMessageBox::warning(this, tr("Machine already loaded"), tr("This treatment machine is already loaded."));
+      return;
+      }
+    if (!machineDescriptorFilePath.empty())
       {
       machineFolderItemIDs.push_back(*itemIt);
       }
@@ -503,21 +524,6 @@ void qSlicerRoomsEyeViewModuleWidget::onLoadTreatmentMachineButtonClicked()
       }
     }
 
-  // Get treatment machine descriptor file path
-  QString treatmentMachineType(d->TreatmentMachineComboBox->currentData().toString());
-  QString descriptorFilePath;
-  if (!treatmentMachineType.compare("FromFile"))
-  {
-    // Ask user for descriptor JSON file if load from file option is selected
-    descriptorFilePath = QFileDialog::getOpenFileName( this, "Select treatment machine descriptor JSON file...",
-      QString(), "Json files (*.json);; All files (*)" ); 
-  }
-  else //TODO: Currently support two default types in addition to loading file. Need to rethink the module
-  {
-    QString relativeFilePath = QString("%1/%2.json").arg(treatmentMachineType).arg(treatmentMachineType);
-    descriptorFilePath = QDir(d->logic()->GetModuleShareDirectory().c_str()).filePath(relativeFilePath);
-  }
-
   // Load and setup models
   paramNode->SetTreatmentMachineDescriptorFilePath(descriptorFilePath.toUtf8().constData());