Merge branch 'hotfix-1.0.1'

starviewer-medical · Jul 14, 2020 · f455c2e · f455c2e
2 parents 2b98662 + 7fdd079
commit f455c2e
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 4 deletions.
diff --git a/starviewer/releasenotes/changelog.html b/starviewer/releasenotes/changelog.html
@@ -59,6 +59,17 @@
  </head>
  <body>
  <h1>Starviewer Changelog</h1>
+ <div class="minorRelease">
+ <div class="version">
+ <span class="versionNumber">Starviewer 1.0.1</span>
+ <span class="versionDate">(Publicat el 14 de juliol de 2020)</span>
+ </div>
+ <div class="fixed">
+ <ul>
+ <li>Es resol un problema pel qual no es calculava el SUV en algunes images de PET d'un centre específic. <span class="ticket">2146</span></li>
+ </ul>
+ </div>
+ </div>
  <div class="majorRelease">
  <div class="version">
  <span class="versionNumber">Starviewer 1.0.0</span>

diff --git a/starviewer/src/core/dicomtagreader.cpp b/starviewer/src/core/dicomtagreader.cpp
@@ -376,6 +376,12 @@ DICOMValueAttribute* DICOMTagReader::convertToDICOMValueAttribute(DcmElement *dc
  }
 
  dicomValueAttribute->setValue(string);
+
+ // HACK for wrong VR (#2146)
+ if (dcmtkDICOMElement->getVR() == EVR_UN)
+ {
+ dicomValueAttribute->setValueRepresentation(DICOMValueAttribute::Unknown);
+ }
  }
  else
  {

diff --git a/starviewer/src/core/dicomvalueattribute.cpp b/starviewer/src/core/dicomvalueattribute.cpp
@@ -18,6 +18,7 @@
 
 #include <QVariant>
 #include <QDate>
+#include <QVector>
 
 namespace udg {
 
@@ -119,7 +120,23 @@ double DICOMValueAttribute::getValueAsDouble()
 
 QString DICOMValueAttribute::getValueAsQString()
 {
- return m_value.toString();
+ // HACK for wrong VR (#2146)
+ if (m_valueRepresentation == Unknown)
+ {
+ QString hexString = m_value.toString();
+ const auto &hexBytes = hexString.splitRef("\\");
+ QByteArray byteArray;
+ byteArray.reserve(hexBytes.size());
+ foreach (const auto &hexByte, hexBytes)
+ {
+ byteArray.append(hexByte.toInt(nullptr, 16));
+ }
+ return QString::fromLatin1(byteArray); // most likely Latin-1
+ }
+ else
+ {
+ return m_value.toString();
+ }
 }
 
 QByteArray DICOMValueAttribute::getValueAsByteArray()

diff --git a/starviewer/src/core/dicomvalueattribute.h b/starviewer/src/core/dicomvalueattribute.h
@@ -65,7 +65,6 @@ class DICOMValueAttribute : public DICOMAttribute {
  /// Retorna el tipus del valor
  ValueRepresentation getValueRepresentation();
 
-protected:
  /// Assigna el tipus del valor
  void setValueRepresentation(ValueRepresentation value);
 

diff --git a/starviewer/src/core/starviewerapplication.h b/starviewer/src/core/starviewerapplication.h
@@ -25,8 +25,8 @@ namespace udg {
  #define CE_SUFFIX ""
 #endif
 
-const QString StarviewerVersionString("1.0.0" CE_SUFFIX);
-const QString StarviewerBuildID("2020022100");
+const QString StarviewerVersionString("1.0.1" CE_SUFFIX);
+const QString StarviewerBuildID("2020071400");
 
 #undef CE_SUFFIX