BUG: Mark translatable strings in Markups module

See Slicer/SlicerLanguagePacks#12
See Slicer#6647

Modules/Loadable/Markups/MRML/vtkMRMLMarkupsAngleNode.cxx

@@ -16,6 +16,7 @@
 ==============================================================================*/
 
 // MRML includes
+#include "vtkMRMLI18N.h"
 #include "vtkMRMLMarkupsDisplayNode.h"
 #include "vtkMRMLMarkupsAngleNode.h"
 #include "vtkMRMLMeasurementAngle.h"
@@ -41,6 +42,12 @@ vtkMRMLMarkupsAngleNode::vtkMRMLMarkupsAngleNode()
   this->MaximumNumberOfControlPoints = 3;
   this->RequiredNumberOfControlPoints = 3;
 
+  // Set markup type GUI display name
+  this->TypeDisplayName = vtkMRMLTr("vtkMRMLMarkupsAngleNode", "Angle");
+
+  // Set markup short name
+  this->DefaultNodeNamePrefix = vtkMRMLTr("vtkMRMLMarkupsAngleNode", "A");
+
   // Setup measurements calculated for this markup type
   vtkNew<vtkMRMLMeasurementAngle> angleMeasurement;
   angleMeasurement->SetName("angle");

Modules/Loadable/Markups/MRML/vtkMRMLMarkupsAngleNode.h

@@ -67,12 +67,6 @@ class  VTK_SLICER_MARKUPS_MODULE_MRML_EXPORT vtkMRMLMarkupsAngleNode : public vt
   /// Get markup type internal name
   const char* GetMarkupType() override {return "Angle";};
 
-  // Get markup type GUI display name
-  const char* GetTypeDisplayName() override {return "Angle";};
-
-  /// Get markup short name
-  const char* GetDefaultNodeNamePrefix() override {return "A";};
-
   /// Read node attributes from XML file
   void ReadXMLAttributes( const char** atts) override;
 

Modules/Loadable/Markups/MRML/vtkMRMLMarkupsClosedCurveNode.cxx

@@ -20,6 +20,7 @@
 // MRML includes
 #include "vtkCurveGenerator.h"
 #include "vtkCurveMeasurementsCalculator.h"
+#include "vtkMRMLI18N.h"
 #include "vtkMRMLMeasurementArea.h"
 #include "vtkMRMLMessageCollection.h"
 
@@ -52,6 +53,12 @@ vtkMRMLMarkupsClosedCurveNode::vtkMRMLMarkupsClosedCurveNode()
   this->CurveGenerator->SetCurveIsClosed(true);
   this->CurveMeasurementsCalculator->SetCurveIsClosed(true);
 
+  // Set markup type GUI display name
+  this->TypeDisplayName = vtkMRMLTr("vtkMRMLMarkupsClosedCurveNode", "Closed Curve");
+
+  // Set markup short name
+  this->DefaultNodeNamePrefix = vtkMRMLTr("vtkMRMLMarkupsClosedCurveNode", "CC");
+
   // Setup measurements calculated for this markup type
   vtkNew<vtkMRMLMeasurementArea> areaMeasurement;
   areaMeasurement->SetEnabled(false);

Modules/Loadable/Markups/MRML/vtkMRMLMarkupsClosedCurveNode.h

@@ -53,12 +53,6 @@ class  VTK_SLICER_MARKUPS_MODULE_MRML_EXPORT vtkMRMLMarkupsClosedCurveNode : pub
   /// Get markup type internal name
   const char* GetMarkupType() override {return "ClosedCurve";};
 
-  // Get markup type GUI display name
-  const char* GetTypeDisplayName() override {return "Closed Curve";};
-
-  /// Get markup short name
-  const char* GetDefaultNodeNamePrefix() override {return "CC";};
-
   /// Copy node content (excludes basic data, such as name and node references).
   /// \sa vtkMRMLNode::CopyContent
   vtkMRMLCopyContentDefaultMacro(vtkMRMLMarkupsClosedCurveNode);

Modules/Loadable/Markups/MRML/vtkMRMLMarkupsCurveNode.cxx

@@ -18,6 +18,7 @@
 #include "vtkMRMLMarkupsCurveNode.h"
 
 // MRML includes
+#include "vtkMRMLI18N.h"
 #include "vtkCurveGenerator.h"
 #include "vtkCurveMeasurementsCalculator.h"
 #include "vtkEventBroker.h"
@@ -73,6 +74,12 @@ vtkMRMLMarkupsCurveNode::vtkMRMLMarkupsCurveNode()
   // in place mode after placing a curve point.
   this->RequiredNumberOfControlPoints = 1e6;
 
+  // Set markup type GUI display name
+  this->TypeDisplayName = vtkMRMLTr("vtkMRMLMarkupsCurveNode", "Curve");
+
+  // Set markup short name
+  this->DefaultNodeNamePrefix = vtkMRMLTr("vtkMRMLMarkupsCurveNode", "OC");
+
   this->CleanFilter = vtkSmartPointer<vtkCleanPolyData>::New();
 
   this->TriangleFilter = vtkSmartPointer<vtkTriangleFilter>::New();

Modules/Loadable/Markups/MRML/vtkMRMLMarkupsCurveNode.h

@@ -108,12 +108,6 @@ class  VTK_SLICER_MARKUPS_MODULE_MRML_EXPORT vtkMRMLMarkupsCurveNode : public vt
   /// Get markup type internal name
   const char* GetMarkupType() override {return "Curve";};
 
-  // Get markup type GUI display name
-  const char* GetTypeDisplayName() override {return "Curve";};
-
-  /// Get markup short name
-  const char* GetDefaultNodeNamePrefix() override {return "OC";};
-
   /// Read node attributes from XML file
   void ReadXMLAttributes( const char** atts) override;
 

Modules/Loadable/Markups/MRML/vtkMRMLMarkupsFiducialNode.cxx

@@ -16,6 +16,7 @@
 ==============================================================================*/
 
 // MRML includes
+#include "vtkMRMLI18N.h"
 #include "vtkMRMLMarkupsFiducialDisplayNode.h"
 #include "vtkMRMLMarkupsFiducialNode.h"
 #include "vtkMRMLMarkupsFiducialStorageNode.h"
@@ -34,7 +35,14 @@ vtkMRMLNodeNewMacro(vtkMRMLMarkupsFiducialNode);
 
 
 //----------------------------------------------------------------------------
-vtkMRMLMarkupsFiducialNode::vtkMRMLMarkupsFiducialNode() = default;
+vtkMRMLMarkupsFiducialNode::vtkMRMLMarkupsFiducialNode()
+{
+  // Set markup type GUI display name
+  this->TypeDisplayName = vtkMRMLTr("vtkMRMLMarkupsFiducialNode", "Point List");
+
+  // Set markup short name
+  this->DefaultNodeNamePrefix = vtkMRMLTr("vtkMRMLMarkupsFiducialNode", "F");
+}
 
 //----------------------------------------------------------------------------
 vtkMRMLMarkupsFiducialNode::~vtkMRMLMarkupsFiducialNode() = default;

Modules/Loadable/Markups/MRML/vtkMRMLMarkupsFiducialNode.h

@@ -58,12 +58,6 @@ class  VTK_SLICER_MARKUPS_MODULE_MRML_EXPORT vtkMRMLMarkupsFiducialNode : public
   /// Get markup type internal name
   const char* GetMarkupType() override {return "Fiducial";};
 
-  // Get markup type GUI display name
-  const char* GetTypeDisplayName() override {return "Point List";};
-
-  /// Get markup short name
-  const char* GetDefaultNodeNamePrefix() override {return "F";};
-
   /// Read node attributes from XML file
   void ReadXMLAttributes( const char** atts) override;
 

Modules/Loadable/Markups/MRML/vtkMRMLMarkupsLineNode.cxx

@@ -16,6 +16,7 @@
 ==============================================================================*/
 
 // MRML includes
+#include "vtkMRMLI18N.h"
 #include "vtkMRMLMarkupsDisplayNode.h"
 #include "vtkMRMLMarkupsLineNode.h"
 #include "vtkMRMLMeasurementLength.h"
@@ -42,6 +43,12 @@ vtkMRMLMarkupsLineNode::vtkMRMLMarkupsLineNode()
   this->MaximumNumberOfControlPoints = 2;
   this->RequiredNumberOfControlPoints = 2;
 
+  // Set markup type GUI display name
+  this->TypeDisplayName = vtkMRMLTr("vtkMRMLMarkupsLineNode", "Line");
+
+  // Set markup short name
+  this->DefaultNodeNamePrefix = vtkMRMLTr("vtkMRMLMarkupsLineNode", "L");
+
   // Setup measurements calculated for this markup type
   vtkNew<vtkMRMLMeasurementLength> lengthMeasurement;
   lengthMeasurement->SetName("length");

Modules/Loadable/Markups/MRML/vtkMRMLMarkupsLineNode.h

@@ -55,12 +55,6 @@ class  VTK_SLICER_MARKUPS_MODULE_MRML_EXPORT vtkMRMLMarkupsLineNode : public vtk
   /// Get markup type internal name
   const char* GetMarkupType() override {return "Line";};
 
-  // Get markup type GUI display name
-  const char* GetTypeDisplayName() override {return "Line";};
-
-  /// Get markup short name
-  const char* GetDefaultNodeNamePrefix() override {return "L";};
-
   /// Read node attributes from XML file
   void ReadXMLAttributes( const char** atts) override;
 

Modules/Loadable/Markups/MRML/vtkMRMLMarkupsNode.cxx

@@ -18,6 +18,7 @@
 #include "vtkMRMLMarkupsNode.h"
 
 // MRML includes
+#include "vtkMRMLI18N.h"
 #include "vtkCurveGenerator.h"
 #include <vtkEventBroker.h>
 #include "vtkMRMLMarkupsDisplayNode.h"
@@ -532,6 +533,26 @@ void vtkMRMLMarkupsNode::SetLocked(int locked)
   this->InvokeCustomModifiedEvent(vtkMRMLMarkupsNode::LockModifiedEvent);
 }
 
+//----------------------------------------------------------------------------
+const char* vtkMRMLMarkupsNode::GetDefaultNodeNamePrefix()
+{
+  if(this->DefaultNodeNamePrefix.empty())
+  {
+    this->DefaultNodeNamePrefix = vtkMRMLTr("vtkMRMLMarkupsNode", "M");
+  }
+  return this->DefaultNodeNamePrefix.c_str();
+}
+
+//----------------------------------------------------------------------------
+const char* vtkMRMLMarkupsNode::GetTypeDisplayName()
+{
+  if(this->TypeDisplayName.empty())
+  {
+    this->TypeDisplayName = vtkMRMLTr("vtkMRMLMarkupsNode", "Markup");
+  }
+  return this->TypeDisplayName.c_str();
+}
+
 //---------------------------------------------------------------------------
 vtkMRMLMarkupsDisplayNode *vtkMRMLMarkupsNode::GetMarkupsDisplayNode()
 {

Modules/Loadable/Markups/MRML/vtkMRMLMarkupsNode.h

@@ -149,7 +149,10 @@ class  VTK_SLICER_MARKUPS_MODULE_MRML_EXPORT vtkMRMLMarkupsNode : public vtkMRML
   virtual const char* GetMarkupType() {return "Markup";};
 
   /// Get markup short name
-  virtual const char* GetDefaultNodeNamePrefix() {return "M";};
+  virtual const char* GetDefaultNodeNamePrefix();
+
+  /// Get markup type GUI display name
+  virtual const char* GetTypeDisplayName() override;
 
   /// Read node attributes from XML file
   void ReadXMLAttributes(const char** atts) override;
@@ -1029,6 +1032,14 @@ class  VTK_SLICER_MARKUPS_MODULE_MRML_EXPORT vtkMRMLMarkupsNode : public vtkMRML
 
   std::string PropertiesLabelText;
 
+  /// Store markup type GUI display name
+  /// \note It's displayed to the user and is therefore translated to the application language
+  std::string TypeDisplayName;
+
+  /// Store markup short name
+  /// \note It's displayed to the user and is therefore translated to the application language
+  std::string DefaultNodeNamePrefix;
+
   /// Transform that moves the xyz unit vectors and origin of the interaction handles to local coordinates
   vtkSmartPointer<vtkMatrix4x4> InteractionHandleToWorldMatrix;
 

Modules/Loadable/Markups/MRML/vtkMRMLMarkupsPlaneNode.cxx

@@ -19,6 +19,7 @@
 ==============================================================================*/
 
 // MRML includes
+#include "vtkMRMLI18N.h"
 #include "vtkMRMLMarkupsPlaneDisplayNode.h"
 #include "vtkMRMLMarkupsPlaneNode.h"
 #include "vtkMRMLMeasurementArea.h"
@@ -49,6 +50,12 @@ vtkMRMLMarkupsPlaneNode::vtkMRMLMarkupsPlaneNode()
   this->RequiredNumberOfControlPoints = 1;
   this->MaximumNumberOfControlPoints = 1;
 
+  // Set markup type GUI display name
+  this->TypeDisplayName = vtkMRMLTr("vtkMRMLMarkupsPlaneNode", "Plane");
+
+  // Set markup short name
+  this->DefaultNodeNamePrefix = vtkMRMLTr("vtkMRMLMarkupsPlaneNode", "P");
+
   this->ObjectToBaseMatrix = vtkSmartPointer<vtkMatrix4x4>::New();
   this->BaseToNodeMatrix = vtkSmartPointer<vtkMatrix4x4>::New();
 

Modules/Loadable/Markups/MRML/vtkMRMLMarkupsPlaneNode.h

@@ -90,12 +90,6 @@ class  VTK_SLICER_MARKUPS_MODULE_MRML_EXPORT vtkMRMLMarkupsPlaneNode : public vt
   /// Get markup type internal name
   const char* GetMarkupType() override {return "Plane";};
 
-  // Get markup type GUI display name
-  const char* GetTypeDisplayName() override {return "Plane";};
-
-  /// Get markup short name
-  const char* GetDefaultNodeNamePrefix() override {return "P";};
-
   /// Read node attributes from XML file
   void ReadXMLAttributes( const char** atts) override;
 

Modules/Loadable/Markups/MRML/vtkMRMLMarkupsROINode.cxx

@@ -21,6 +21,7 @@
 #include "vtkMRMLMarkupsROINode.h"
 
 // MRML includes
+#include <vtkMRMLI18N.h>
 #include <vtkMRMLMarkupsROIDisplayNode.h>
 #include <vtkMRMLMarkupsROIJsonStorageNode.h>
 #include "vtkMRMLMeasurementVolume.h"
@@ -58,6 +59,12 @@ vtkMRMLMarkupsROINode::vtkMRMLMarkupsROINode()
 {
   this->PropertiesLabelText = "";
 
+  // Set markup type GUI display name
+  this->TypeDisplayName = vtkMRMLTr("vtkMRMLMarkupsROINode", "ROI");
+
+  // Set markup short name
+  this->DefaultNodeNamePrefix = vtkMRMLTr("vtkMRMLMarkupsROINode", "R");
+
   this->RequiredNumberOfControlPoints = NUMBER_OF_BOX_CONTROL_POINTS;
   this->MaximumNumberOfControlPoints = -1;
   this->IsUpdatingControlPointsFromROI = false;

Modules/Loadable/Markups/MRML/vtkMRMLMarkupsROINode.h

@@ -76,12 +76,6 @@ class  VTK_SLICER_MARKUPS_MODULE_MRML_EXPORT vtkMRMLMarkupsROINode : public vtkM
   /// Get markup type internal name
   const char* GetMarkupType() override {return "ROI";};
 
-  // Get markup type GUI display name
-  const char* GetTypeDisplayName() override {return "ROI";};
-
-  /// Get markup short name
-  const char* GetDefaultNodeNamePrefix() override {return "R";};
-
   /// Copy node content (excludes basic data, such as name and node references).
   /// \sa vtkMRMLNode::CopyContent
   vtkMRMLCopyContentMacro(vtkMRMLMarkupsROINode);

Modules/Loadable/Markups/SubjectHierarchyPlugins/qSlicerSubjectHierarchyMarkupsPlugin.cxx

@@ -293,7 +293,7 @@ void qSlicerSubjectHierarchyMarkupsPluginPrivate::jumpToPoint(int controlPointIn
     return;
   }
 
-  vtkSlicerMarkupsLogic* markupsLogic = vtkSlicerMarkupsLogic::SafeDownCast(appLogic->GetModuleLogic("Markups"));
+  vtkSlicerMarkupsLogic* markupsLogic = vtkSlicerMarkupsLogic::SafeDownCast(appLogic->GetModuleLogic(/*no tr*/"Markups"));
   if (!markupsLogic)
   {
     qCritical() << Q_FUNC_INFO << ": could not get the Markups module logic.";
@@ -348,7 +348,7 @@ double qSlicerSubjectHierarchyMarkupsPlugin::canAddNodeToSubjectHierarchy(
     return 0.0;
   }
 
-  vtkSlicerMarkupsLogic* markupsLogic = vtkSlicerMarkupsLogic::SafeDownCast(appLogic->GetModuleLogic("Markups"));
+  vtkSlicerMarkupsLogic* markupsLogic = vtkSlicerMarkupsLogic::SafeDownCast(appLogic->GetModuleLogic(/*no tr*/"Markups"));
   if (!markupsLogic)
   {
     qCritical() << Q_FUNC_INFO << ": could not get the Markups module logic.";
@@ -402,7 +402,7 @@ double qSlicerSubjectHierarchyMarkupsPlugin::canOwnSubjectHierarchyItem(vtkIdTyp
     return 0.0;
   }
 
-  vtkSlicerMarkupsLogic* markupsLogic = vtkSlicerMarkupsLogic::SafeDownCast(appLogic->GetModuleLogic("Markups"));
+  vtkSlicerMarkupsLogic* markupsLogic = vtkSlicerMarkupsLogic::SafeDownCast(appLogic->GetModuleLogic(/*no tr*/"Markups"));
   if (!markupsLogic)
   {
     qCritical() << Q_FUNC_INFO << ": could not get the Markups module logic.";
@@ -800,7 +800,7 @@ void qSlicerSubjectHierarchyMarkupsPlugin::renamePoint()
   QString oldName(markupsNode->GetNthControlPointLabel(componentIndex).c_str());
 
   bool ok = false;
-  QString newName = QInputDialog::getText(nullptr, QString("Rename ") + oldName, "New name:", QLineEdit::Normal, oldName, &ok);
+  QString newName = QInputDialog::getText(nullptr, tr("Rename %1").arg(oldName), tr("New name:"), QLineEdit::Normal, oldName, &ok);
   if (!ok)
   {
     return;
@@ -831,7 +831,7 @@ void qSlicerSubjectHierarchyMarkupsPlugin::refocusCamera()
   // Get point index
   int componentIndex = d->ViewContextMenuEventData["ComponentIndex"].toInt();
 
-  vtkSlicerMarkupsLogic* markupsLogic = vtkSlicerMarkupsLogic::SafeDownCast(appLogic->GetModuleLogic("Markups"));
+  vtkSlicerMarkupsLogic* markupsLogic = vtkSlicerMarkupsLogic::SafeDownCast(appLogic->GetModuleLogic(/*no tr*/"Markups"));
   if (!markupsLogic)
   {
     qCritical() << Q_FUNC_INFO << ": could not get the Markups module logic.";
@@ -994,7 +994,7 @@ void qSlicerSubjectHierarchyMarkupsPlugin::editNodeTerminology()
     return;
   }
   vtkSlicerTerminologiesModuleLogic* terminologiesLogic = vtkSlicerTerminologiesModuleLogic::SafeDownCast(
-    qSlicerCoreApplication::application()->moduleLogic("Terminologies"));
+    qSlicerCoreApplication::application()->moduleLogic(/*no tr*/"Terminologies"));
   if (!terminologiesLogic)
   {
     qCritical() << Q_FUNC_INFO << ": Failed to get Terminologies module logic";