Commit 5cdc6298 authored by finetjul's avatar finetjul
Browse files

STYLE: Minor indentation and factorization changes in Annotations module

git-svn-id: http://svn.slicer.org/Slicer4/trunk@21546 3bd1e089-480b-0410-8dfb-8563597acbee
parent 2c6462ba
...@@ -466,9 +466,11 @@ void qSlicerAnnotationModuleWidget::updateActiveHierarchyLabel() ...@@ -466,9 +466,11 @@ void qSlicerAnnotationModuleWidget::updateActiveHierarchyLabel()
if (id) if (id)
{ {
//idString = QString(" (") + QString(id) + QString(")"); //idString = QString(" (") + QString(id) + QString(")");
if (d->logic() && d->logic()->GetMRMLScene() && d->logic()->GetMRMLScene()->GetNodeByID(id)) vtkMRMLNode* node = d->logic()->GetMRMLScene() ?
d->logic()->GetMRMLScene()->GetNodeByID(id) : 0;
if (node)
{ {
name = QString(d->logic()->GetMRMLScene()->GetNodeByID(id)->GetName()); name = QString(node->GetName());
} }
} }
d->activeHierarchyLabel->setText(QString("Active list: ") + name); d->activeHierarchyLabel->setText(QString("Active list: ") + name);
......
...@@ -79,10 +79,10 @@ protected slots: ...@@ -79,10 +79,10 @@ protected slots:
protected: protected:
QScopedPointer<qMRMLAnnotationTreeViewPrivate> d_ptr; QScopedPointer<qMRMLAnnotationTreeViewPrivate> d_ptr;
#ifndef QT_NO_CURSOR #ifndef QT_NO_CURSOR
void mouseMoveEvent(QMouseEvent* e); void mouseMoveEvent(QMouseEvent* e);
bool viewportEvent(QEvent* e); bool viewportEvent(QEvent* e);
#endif #endif
virtual void mousePressEvent(QMouseEvent* event); virtual void mousePressEvent(QMouseEvent* event);
virtual void toggleVisibility(const QModelIndex& index); virtual void toggleVisibility(const QModelIndex& index);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment