Skip to content

Commit

Permalink
BUG: Fixed issue with adding new node after rename cancelation (Slice…
Browse files Browse the repository at this point in the history 
…r#7598)

* BUG: Fix issue with adding new node after rename cancellation

Seperated create node logic from rename node logic, now node is created only when "ok" is clicked on the dialog for new node creation.

ENH:Improved code by declaring relevant strings as constants to avoid multiple tempropary object allocations.

* ENH: Improve localization support

Enhanced localization support for dialog titles and user-facing strings.
  • Loading branch information
@aramSofthenge
aramSofthenge committed Feb 27, 2024
1 parent 99b9692 commit a2020c7
Show file tree
Hide file tree
Showing 2 changed files with 86 additions and 36 deletions.
113 changes: 77 additions & 36 deletions Libs/MRML/Widgets/qMRMLNodeComboBox.cxx
View file
Expand Up @@ -43,6 +43,15 @@
#include <vtkMRMLNode.h>
#include <vtkMRMLScene.h>

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

namespace
{
const QString createNew = QObject::tr("Create new ");
const QString asSuffix = QObject::tr(" as...");
const QString renameTitlePrefix = QObject::tr("Rename ");
}

// --------------------------------------------------------------------------
qMRMLNodeComboBoxPrivate::qMRMLNodeComboBoxPrivate(qMRMLNodeComboBox& object)
: q_ptr(&object)
Expand Down Expand Up @@ -308,10 +317,10 @@ void qMRMLNodeComboBoxPrivate::updateActionItems(bool resetRootIndex)
foreach (QString nodeType, q->nodeTypes())
{
QString label = q->nodeTypeLabel(nodeType);
extraItems.append(qMRMLNodeComboBox::tr("Create new ") + label);
extraItems.append(createNew + label);
if (this->RenameEnabled)
{
extraItems.append(qMRMLNodeComboBox::tr("Create new ") + label + qMRMLNodeComboBox::tr(" as..."));
extraItems.append(createNew + label + asSuffix);
}
}
}
Expand Down Expand Up @@ -426,20 +435,42 @@ void qMRMLNodeComboBox::activateExtraItem(const QModelIndex& index)
Q_D(qMRMLNodeComboBox);
// FIXME: check the type of the item on a different role instead of the display role
QString data = this->model()->data(index, Qt::DisplayRole).toString();
if (d->AddEnabled && data.startsWith(tr("Create new ")) && !data.endsWith(tr(" as...")))
if (data.startsWith(createNew))
{
QString label = data.right(data.length()-tr("Create new ").length());
QString label = data.mid(createNew.length());
QString nodeTypeName;
foreach (QString nodeType, this->nodeTypes())
bool createAs = data.endsWith(asSuffix);
for (const auto& nodeType : this->nodeTypes())
{
QString foundLabel = this->nodeTypeLabel(nodeType);
if (foundLabel==label)
if (createAs)
{
foundLabel += asSuffix;
}
if (foundLabel == label)
{
nodeTypeName = nodeType;
break;
}
}
if (!nodeTypeName.isEmpty())
{
d->ComboBox->hidePopup();
if (createAs)
{
// Here, use createNodeAs to handle node creation and naming.
this->createNodeAs(nodeTypeName);
}
else
{
vtkMRMLNode* newNode = this->addNode(nodeTypeName);
if (newNode != nullptr)
{
this->setCurrentNode(newNode);
emit this->nodeAddedByUser(newNode);
}
}
}
d->ComboBox->hidePopup();
this->addNode(nodeTypeName);
}
else if (d->RemoveEnabled && data.startsWith(tr("Delete current ")))
{
Expand All @@ -456,24 +487,6 @@ void qMRMLNodeComboBox::activateExtraItem(const QModelIndex& index)
d->ComboBox->hidePopup();
this->renameCurrentNode();
}
else if (d->RenameEnabled && d->AddEnabled
&& data.startsWith(tr("Create new ")) && data.endsWith(tr(" as...")))
{
// Get the node type label by stripping "Create new" and "as..." from left and right
QString label = data.mid(tr("Create new ").length(), data.length()-tr("Create new ").length()-tr(" as...").length());
QString nodeTypeName;
foreach (QString nodeType, this->nodeTypes())
{
QString foundLabel = this->nodeTypeLabel(nodeType);
if (foundLabel==label)
{
nodeTypeName = nodeType;
}
}
d->ComboBox->hidePopup();
this->addNode(nodeTypeName);
this->renameCurrentNode();
}
else
{
// check for user added items
Expand Down Expand Up @@ -695,16 +708,44 @@ void qMRMLNodeComboBox::renameCurrentNode()
return;
}

// Use the dialog method to get the new name from the user
bool ok = false;
QString newName = QInputDialog::getText(
this, "Rename " + this->nodeTypeLabel(node->GetClassName()), "New name:",
QLineEdit::Normal, node->GetName(), &ok);
if (!ok)
QString currentName = node->GetName();
QString newName = getNameFromDialog(renameTitlePrefix + this->nodeTypeLabel(node->GetClassName()), currentName, &ok);

// Check if the user confirmed the action
if (ok && !newName.isEmpty())
{
return;
node->SetName(newName.toUtf8());
emit currentNodeRenamed(newName);
}
node->SetName(newName.toUtf8());
emit currentNodeRenamed(newName);
}
// --------------------------------------------------------------------------
void qMRMLNodeComboBox::createNodeAs(const QString& nodeTypeName)
{
QString label = this->nodeTypeLabel(nodeTypeName);
bool okPressed = false;
QString dialogTitle = createNew + label;
QString defaultName = "";
QString nodeName = this->getNameFromDialog(dialogTitle, defaultName, &okPressed);

if (okPressed && !nodeName.isEmpty())
{
vtkMRMLNode* newNode = this->addNode(nodeTypeName);
if (newNode != nullptr)
{
newNode->SetName(nodeName.toUtf8());
this->setCurrentNode(newNode);
emit this->nodeAddedByUser(newNode);
}
}
}

// --------------------------------------------------------------------------
QString qMRMLNodeComboBox::getNameFromDialog(const QString& dialogTitle, const QString& defaultName = QString(), bool* ok = nullptr)
{
QString newName = QInputDialog::getText(this, dialogTitle, tr("New name:"), QLineEdit::Normal, defaultName, ok);
return newName;
}

// --------------------------------------------------------------------------
Expand Down Expand Up @@ -988,10 +1029,10 @@ void qMRMLNodeComboBox::setAddEnabled(bool enable)
{
return;
}
if (enable && d->hasPostItem(tr("Create new ")))
if (enable && d->hasPostItem(createNew))
{
qDebug() << "setAddEnabled: An action starting with name "
<< tr("Create new ") << " already exists. "
<< createNew << " already exists. "
"Not enabling this property.";
return;
}
Expand Down Expand Up @@ -1282,7 +1323,7 @@ void qMRMLNodeComboBox::addMenuAction(QAction *newAction)
}
}
if ((d->AddEnabled
&& newAction->text().startsWith(tr("Create new "))) ||
&& newAction->text().startsWith(createNew)) ||
(d->RemoveEnabled
&& newAction->text().startsWith(tr("Delete current "))) ||
(d->EditEnabled
Expand Down
9 changes: 9 additions & 0 deletions Libs/MRML/Widgets/qMRMLNodeComboBox.h
View file
Expand Up @@ -397,6 +397,15 @@ protected slots:
private:
Q_DECLARE_PRIVATE(qMRMLNodeComboBox);
Q_DISABLE_COPY(qMRMLNodeComboBox);

/// \brief Creates a specified node type
void createNodeAs(const QString& nodeTypeName);

/// Retrieves a name from a dialog box input.
/// \param dialogTitle Title of the dialog box.
/// \param defaultName Default name to display in the input field.
/// \param ok Pointer to a boolean variable to indicate if the operation was successful.
virtual QString getNameFromDialog(const QString& dialogTitle, const QString& defaultName, bool* ok);
};

// --------------------------------------------------------------------------
Expand Down

0 comments on commit a2020c7

Please sign in to comment.