Skip to content

Commit

Permalink
ENH: Select last selected terminology context that contains given entry
Browse files Browse the repository at this point in the history 
When opening the terminology selector (navigator), the terminology contexts containing the given terminology entry are found, first among the last selected terminology contexts (last selected searched first), then among all. The first of the resulting list is selected (i.e. the last selected terminology context that contains the given category/type/modifier)

Re Slicer#6975, Slicer#7593
  • Loading branch information
@cpinter
cpinter committed Dec 22, 2024
1 parent 3f5378d commit 4388ca5
Show file tree
Hide file tree
Showing 2 changed files with 93 additions and 35 deletions.
1 change: 1 addition & 0 deletions Modules/Loadable/Colors/Widgets/qSlicerTerminologyEditorWidget.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ void qSlicerTerminologyEditorWidget::setTerminologyInfo(qSlicerTerminologyNaviga
{
Q_D(qSlicerTerminologyEditorWidget);
d->TerminologyInfo = terminologyInfo;
d->updateGUIFromTerminologyInfo();
}

//-----------------------------------------------------------------------------
Expand Down
127 changes: 92 additions & 35 deletions Modules/Loadable/Terminologies/Widgets/qSlicerTerminologyNavigatorWidget.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,9 @@ class qSlicerTerminologyNavigatorWidgetPrivate: public Ui_qSlicerTerminologyNavi
/// \return -1 if not found
int findComboBoxIndexForModifier(ctkComboBox* comboBox, vtkSlicerTerminologyType* modifier);

/// Select given terminology context in the combobox
void selectTerminologyContext(QString contextName);

public:
/// Name (SegmentationCategoryTypeContextName) of the current terminology
QString CurrentTerminologyName;
Expand Down Expand Up @@ -569,7 +572,7 @@ QTableWidgetItem* qSlicerTerminologyNavigatorWidgetPrivate::findTableWidgetItemF
}
}

return nullptr;
return nullptr;
}

//-----------------------------------------------------------------------------
Expand Down Expand Up @@ -615,6 +618,25 @@ int qSlicerTerminologyNavigatorWidgetPrivate::findComboBoxIndexForModifier(ctkCo
return modifierIndex;
}

//-----------------------------------------------------------------------------
void qSlicerTerminologyNavigatorWidgetPrivate::selectTerminologyContext(QString contextName)
{
Q_Q(qSlicerTerminologyNavigatorWidget);

int terminologyIndex = this->ComboBox_Terminology->findText(contextName);
if (terminologyIndex == -1)
{
qCritical() << Q_FUNC_INFO << ": Failed to find terminology with context name '" << contextName << "'";
return;
}
if (terminologyIndex != this->ComboBox_Terminology->currentIndex())
{
q->setCurrentTerminology(this->ComboBox_Terminology->itemText(terminologyIndex));
}
QSignalBlocker blocker(this->ComboBox_Terminology);
this->ComboBox_Terminology->setCurrentIndex(terminologyIndex);
}

//-----------------------------------------------------------------------------


Expand Down Expand Up @@ -712,6 +734,17 @@ void qSlicerTerminologyNavigatorWidget::setTerminologyInfo(TerminologyInfoBundle
|| (d->ColorPickerButton_RecommendedRGB->color() != d->terminologyRecommendedColor());
d->pushButton_ResetColor->setEnabled(enableResetColor && !noneType);
}

// Set last selected terminology context if empty entry was selected
QSettings* settings = qSlicerApplication::application()->settingsDialog()->settings();
if (settings->contains("Terminology/LastTerminologyContexts"))
{
QStringList lastTerminologyContextNames = settings->value("Terminology/LastTerminologyContexts").toStringList();
if (lastTerminologyContextNames.size() > 0)
{
d->selectTerminologyContext(lastTerminologyContextNames[0]);
}
}
}

//-----------------------------------------------------------------------------
Expand Down Expand Up @@ -807,6 +840,11 @@ bool qSlicerTerminologyNavigatorWidget::setTerminologyEntry(vtkSlicerTerminology
qCritical() << Q_FUNC_INFO << ": Invalid terminology entry object";
return false;
}
vtkSlicerTerminologiesModuleLogic* logic = d->terminologyLogic();
if (!logic)
{
return false;
}

// If entry is empty then select none type for no terminology
if (!entry->GetTerminologyContextName() && !entry->GetCategoryObject()->GetCodeValue())
Expand All @@ -815,44 +853,48 @@ bool qSlicerTerminologyNavigatorWidget::setTerminologyEntry(vtkSlicerTerminology
return true;
}

// Select terminology
QString terminologyContextName(entry->GetTerminologyContextName()?entry->GetTerminologyContextName():"");
if (terminologyContextName.isEmpty())
// Get category and type objects
vtkSlicerTerminologyCategory* categoryObject = entry->GetCategoryObject();
if (!categoryObject)
{
QSettings* settings = qSlicerApplication::application()->settingsDialog()->settings();
if (settings->contains("Terminology/LastTerminologyContext"))
{
QString lastTerminologyContextName = settings->value("Terminology/LastTerminologyContext").toString();
if (!lastTerminologyContextName.isEmpty())
{
terminologyContextName = lastTerminologyContextName;
}
else
{
return false; // The terminology is not invalid but empty
}
}
return false; // The terminology is not invalid but empty
}
int terminologyIndex = d->ComboBox_Terminology->findText(terminologyContextName);
if (terminologyIndex == -1)
vtkSlicerTerminologyType* typeObject = entry->GetTypeObject();
vtkSlicerTerminologyType* typeModifierObject = entry->GetTypeModifierObject();

// Get list of last terminology contexts selected by the user from application settings
std::vector<std::string> preferredTerminologyNames;
QSettings* settings = qSlicerApplication::application()->settingsDialog()->settings();
if (settings->contains("Terminology/LastTerminologyContexts"))
{
qCritical() << Q_FUNC_INFO << ": Failed to find terminology with context name " << terminologyContextName;
return false;
QStringList lastTerminologyContextNames = settings->value("Terminology/LastTerminologyContexts").toStringList();
for (auto name : lastTerminologyContextNames)
{
preferredTerminologyNames.push_back(name.toUtf8().constData());
}
}
if (terminologyIndex != d->ComboBox_Terminology->currentIndex())

// Get last terminology context selected by the user that contains the currently set terminology entry
std::vector<std::string> foundTerminologyNames = logic->FindTerminologyNames(categoryObject->GetCodingSchemeDesignator(), categoryObject->GetCodeValue(),
(typeObject ? typeObject->GetCodingSchemeDesignator() : ""), (typeObject ? typeObject->GetCodeValue() : ""),
(typeModifierObject && typeModifierObject->GetCodingSchemeDesignator() ? typeModifierObject->GetCodingSchemeDesignator() : ""),
(typeModifierObject && typeModifierObject->GetCodeValue() ? typeModifierObject->GetCodeValue() : ""),
preferredTerminologyNames);
if (!preferredTerminologyNames.empty() && foundTerminologyNames.empty())
{
this->setCurrentTerminology(d->ComboBox_Terminology->itemText(terminologyIndex));
// Try to get first terminology containing the given entry among all loaded contexts, if the preferred terminologies do not contain it
foundTerminologyNames = logic->FindTerminologyNames(categoryObject->GetCodingSchemeDesignator(), categoryObject->GetCodeValue(),
(typeObject ? typeObject->GetCodingSchemeDesignator() : ""), (typeObject ? typeObject->GetCodeValue() : ""),
(typeModifierObject && typeModifierObject->GetCodingSchemeDesignator() ? typeModifierObject->GetCodingSchemeDesignator() : ""),
(typeModifierObject && typeModifierObject->GetCodeValue() ? typeModifierObject->GetCodeValue() : ""),
std::vector<std::string>());
}
d->ComboBox_Terminology->blockSignals(true);
d->ComboBox_Terminology->setCurrentIndex(terminologyIndex);
d->ComboBox_Terminology->blockSignals(false);
QString terminologyContextNameToSelect(foundTerminologyNames.empty() ? "" : foundTerminologyNames[0].c_str());

// Select terminology
d->selectTerminologyContext(terminologyContextNameToSelect);

// Select category
vtkSlicerTerminologyCategory* categoryObject = entry->GetCategoryObject();
if (!categoryObject)
{
return false; // The terminology is not invalid but empty
}
bool returnValue = true;
if (!this->setCurrentCategory(categoryObject))
{
Expand All @@ -861,7 +903,6 @@ bool qSlicerTerminologyNavigatorWidget::setTerminologyEntry(vtkSlicerTerminology
}

// Select type
vtkSlicerTerminologyType* typeObject = entry->GetTypeObject();
if (!typeObject)
{
qCritical() << Q_FUNC_INFO << ": No type object in terminology entry";
Expand All @@ -874,7 +915,6 @@ bool qSlicerTerminologyNavigatorWidget::setTerminologyEntry(vtkSlicerTerminology
}

// Select type modifier
vtkSlicerTerminologyType* typeModifierObject = entry->GetTypeModifierObject();
if (typeObject && typeObject->GetHasModifiers() && typeModifierObject && typeModifierObject->GetCodeValue())
{
if (!this->setCurrentTypeModifier(typeModifierObject))
Expand Down Expand Up @@ -1466,11 +1506,28 @@ void qSlicerTerminologyNavigatorWidget::onTerminologySelectionChanged(int index)
QString terminologyName = d->ComboBox_Terminology->itemText(index);
this->setCurrentTerminology(terminologyName);

// Save last selection to application settings
// Save last used terminology context in application settings
if (!d->TerminologyComboboxPopulating)
{
QSettings* settings = qSlicerApplication::application()->settingsDialog()->settings();
settings->setValue("Terminology/LastTerminologyContext", terminologyName);
QStringList lastTerminologyContextNames = settings->value("Terminology/LastTerminologyContexts").toStringList();
if (!lastTerminologyContextNames.isEmpty())
{
if (lastTerminologyContextNames.size() == 1 && lastTerminologyContextNames[0] == terminologyName)
{
// Nothing to change
return;
}
// Remove the terminology name from the list so that there are no duplicate entries in the list
lastTerminologyContextNames.removeOne(terminologyName);
// Prepend terminology name to the list so that the last used terminology is first
lastTerminologyContextNames.insert(0, terminologyName);
}
else
{
lastTerminologyContextNames.push_back(terminologyName);
}
settings->setValue("Terminology/LastTerminologyContexts", lastTerminologyContextNames);
}
}

Expand Down

0 comments on commit 4388ca5

Please sign in to comment.