ENH: more updates

QIICR · Mar 21, 2017 · 2c1aa3b · 2c1aa3b
1 parent e43d3be
commit 2c1aa3b
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 20 deletions.
diff --git a/include/dcmqi/MultiframeObject.h b/include/dcmqi/MultiframeObject.h
@@ -20,6 +20,7 @@
 #include <dcmtk/dcmiod/modequipment.h>
 #include <dcmtk/dcmiod/modenhequipment.h>
 #include <dcmtk/dcmiod/modmultiframedimension.h>
+#include <dcmtk/dcmiod/iodcontentitemmacro.h>
 
 #include "dcmqi/Exceptions.h"
 #include "dcmqi/ImageVolumeGeometry.h"
@@ -77,7 +78,7 @@ class MultiframeObject {
   virtual int initializeCompositeContext();
   virtual bool metaDataIsComplete();
 
-
+  ContentItemMacro* initializeContentItemMacro(CodeSequenceMacro, CodeSequenceMacro);
 
   // List of tags, and FGs they belong to, for initializing dimensions module
   int initializeDimensions(std::vector<std::pair<DcmTag, DcmTag> >);

diff --git a/libsrc/MultiframeObject.cpp b/libsrc/MultiframeObject.cpp
@@ -111,3 +111,21 @@ int MultiframeObject::initializePlaneOrientationFG() {
   );
   return EXIT_SUCCESS;
 }
+
+ContentItemMacro* MultiframeObject::initializeContentItemMacro(CodeSequenceMacro conceptName,
+                                                               CodeSequenceMacro conceptCode){
+  ContentItemMacro* item = new ContentItemMacro();
+  CodeSequenceMacro* concept = new CodeSequenceMacro(conceptName);
+  CodeSequenceMacro* value = new CodeSequenceMacro(conceptCode);
+
+  if (!item || !concept || !value)
+  {
+    return NULL;
+  }
+
+  item->getEntireConceptNameCodeSequence().push_back(concept);
+  item->getEntireConceptCodeSequence().push_back(value);
+  item->setValueType(ContentItemMacro::VT_CODE);
+
+  return EXIT_SUCCESS;
+}
diff --git a/libsrc/ParametricMapConverter.cpp b/libsrc/ParametricMapConverter.cpp
@@ -170,6 +170,7 @@ namespace dcmqi {
     // TODO: LutExplanation and LUTLabel should be added as Metainformation
     realWorldValueMappingItem->setLUTExplanation(metaInfo.metaInfoRoot["MeasurementUnitsCode"]["CodeMeaning"].asCString());
     realWorldValueMappingItem->setLUTLabel(metaInfo.metaInfoRoot["MeasurementUnitsCode"]["CodeValue"].asCString());
+
     ContentItemMacro* quantity = new ContentItemMacro;
     CodeSequenceMacro* qCodeName = new CodeSequenceMacro("G-C1C6", "SRT", "Quantity");
     CodeSequenceMacro* qSpec = new CodeSequenceMacro(

diff --git a/libsrc/ParametricMapObject.cpp b/libsrc/ParametricMapObject.cpp
@@ -154,37 +154,56 @@ int ParametricMapObject::initializeRWVMFG() {
 
   if(metaDataJson.isMember("MeasurementsUnitsCode")){
     CodeSequenceMacro& unitsCodeDcmtk = realWorldValueMappingItem->getMeasurementUnitsCode();
-    unitsCodeDcmtk = dcmqi::Helper::jsonToCodeSequenceMacro(metaDataJson["MeasurementsUnitsCode"]);
+    unitsCodeDcmtk.set(metaDataJson["MeasurementsUnitsCode"]["CodeValue"].asCString(),
+                         metaDataJson["MeasurementsUnitsCode"]["CodingSchemeDesignator"].asCString(),
+                         metaDataJson["MeasurementsUnitsCode"]["CodeMeaning"].asCString());
     cout << "Measurements units initialized to " <<
          dcmqi::Helper::codeSequenceMacroToString(unitsCodeDcmtk);
+
     realWorldValueMappingItem->setLUTExplanation(metaDataJson["MeasurementUnitsCode"]["CodeMeaning"].asCString());
     realWorldValueMappingItem->setLUTLabel(metaDataJson["MeasurementUnitsCode"]["CodeValue"].asCString());
   }
 
   if(metaDataJson.isMember("QuantityValueCode")){
-    CodeSequenceMacro& unitsCodeDcmtk = realWorldValueMappingItem->getMeasurementUnitsCode();
-    unitsCodeDcmtk = dcmqi::Helper::jsonToCodeSequenceMacro(metaDataJson["QuantityValueCode"]);
-
-    ContentItemMacro* quantity = new ContentItemMacro;
-    CodeSequenceMacro* qCodeName = new CodeSequenceMacro("G-C1C6", "SRT", "Quantity");
-    CodeSequenceMacro* qSpec = new CodeSequenceMacro(
-        metaDataJson["QuantityValueCode"]["CodeValue"].asCString(),
-        metaDataJson["QuantityValueCode"]["CodingSchemeDesignator"].asCString(),
-        metaDataJson["QuantityValueCode"]["CodeMeaning"].asCString());
-
-    if (!quantity || !qSpec || !qCodeName)
-    {
-      return NULL;
-    }
+    ContentItemMacro* item = initializeContentItemMacro(CodeSequenceMacro("G-C1C6", "SRT", "Quantity"),
+                                                                dcmqi::Helper::jsonToCodeSequenceMacro(metaDataJson["QuantityValueCode"]));
+    realWorldValueMappingItem->getEntireQuantityDefinitionSequence().push_back(item);
+  }
 
-    quantity->getEntireConceptNameCodeSequence().push_back(qCodeName);
-    quantity->getEntireConceptCodeSequence().push_back(qSpec);
-    realWorldValueMappingItem->getEntireQuantityDefinitionSequence().push_back(quantity);
-    quantity->setValueType(ContentItemMacro::VT_CODE);
+  // TODO: factor out defined CodeSequenceMacros into definitions as in dcmsr/include/dcmtk/dcmsr/codes
+  if(metaDataJson.isMember("MeasurementMethodCode")){
+    ContentItemMacro* item = initializeContentItemMacro(CodeSequenceMacro("G-C306", "SRT", "Measurement Method"),
+                                                                dcmqi::Helper::jsonToCodeSequenceMacro(metaDataJson["MeasurementMethodCode"]));
+    realWorldValueMappingItem->getEntireQuantityDefinitionSequence().push_back(item);
+  }
 
+  if(metaDataJson.isMember("ModelFittingMethodCode")){
+    // TODO: update this once CP-1665 is integrated into the standard
+    ContentItemMacro* item = initializeContentItemMacro(CodeSequenceMacro("xxxxx2", "99DCMCP1665", "Model Fitting Method"),
+                                                        dcmqi::Helper::jsonToCodeSequenceMacro(metaDataJson["ModelFittingMethodCode"]));
+    realWorldValueMappingItem->getEntireQuantityDefinitionSequence().push_back(item);
   }
 
+  if(metaDataJson.isMember("SourceImageDiffusionBValues")){
+    for(int bvalId=0;bvalId<metaDataJson["SourceImageDiffusionBValues"].size();bvalId++){
+      ContentItemMacro* bval = new ContentItemMacro;
+      CodeSequenceMacro* bvalUnits = new CodeSequenceMacro("s/mm2", "UCUM", "s/mm2");
+      // TODO: update this once CP-1665 is integrated into the standard
+      CodeSequenceMacro* qCodeName = new CodeSequenceMacro("xxxxx1", "99DCMCP1665", "Source image diffusion b-value");
 
+      if (!bval || !bvalUnits || !qCodeName)
+      {
+        return NULL;
+      }
+
+      bval->setValueType(ContentItemMacro::VT_NUMERIC);
+      bval->getEntireConceptNameCodeSequence().push_back(qCodeName);
+      bval->getEntireMeasurementUnitsCodeSequence().push_back(bvalUnits);
+      if(bval->setNumericValue(metaDataJson["SourceImageDiffusionBValues"][bvalId].asCString()).bad())
+        cout << "Failed to insert the value!" << endl;;
+      realWorldValueMappingItem->getEntireQuantityDefinitionSequence().push_back(bval);
+    }
+  }
 #if 0
 
   // initialize optional RWVM items, if available