Merge branch 'hotfix-0.13.2'

starviewer-medical · May 3, 2016 · 58f0fad · 58f0fad
2 parents f3e8f8b + 5932a10
commit 58f0fad
Show file tree

Hide file tree

Showing 43 changed files with 2,455 additions and 464 deletions.
diff --git a/starviewer/doc/help/shortcuts/Starviewer_Shortcuts_guide.docx b/starviewer/doc/help/shortcuts/Starviewer_Shortcuts_guide.docx
diff --git a/starviewer/doc/help/usermanual/Starviewer_User_guide.docx b/starviewer/doc/help/usermanual/Starviewer_User_guide.docx
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 0.13.2</span>
+ <span class="versionDate">(Publicat el 3 de maig de 2016)</span>
+ </div>
+ <div class="new">
+ <ul>
+ <li>S'afegeix la possibilitat de configurar aplicacions externes per obrir l'estudi i sèrie actuals. <span class="ticket">2115</span></li>
+ </ul>
+ </div>
+ </div>
  <div class="minorRelease">
  <div class="version">
  <span class="versionNumber">Starviewer 0.13.1</span>

diff --git a/starviewer/src/core/core.pro b/starviewer/src/core/core.pro
@@ -21,7 +21,8 @@ FORMS += qlogviewerbase.ui \
  q2dviewerconfigurationscreenbase.ui \
  qlayoutoptionswidgetbase.ui \
  qnotificationpopupbase.ui \
- qfusionlayoutwidgetbase.ui
+ qfusionlayoutwidgetbase.ui \
+ qexternalapplicationconfigurationscreenbase.ui
 
 TRANSLATIONS += core_ca_ES.ts \
  core_es_ES.ts \
@@ -426,7 +427,10 @@ HEADERS += extensionfactory.h \
  hangingprotocolfiller.h \
  qfusionlayoutwidget.h \
  gridicon.h \
- itemmenu.h
+ itemmenu.h \
+ qexternalapplicationconfigurationscreen.h \
+ externalapplication.h \
+ externalapplicationsmanager.h
 
 SOURCES += extensionmediator.cpp \
  displayableid.cpp \
@@ -800,7 +804,10 @@ SOURCES += extensionmediator.cpp \
  hangingprotocolfiller.cpp \
  qfusionlayoutwidget.cpp \
  gridicon.cpp \
- itemmenu.cpp
+ itemmenu.cpp \
+ qexternalapplicationconfigurationscreen.cpp \
+ externalapplication.cpp \
+ externalapplicationsmanager.cpp
 
 win32 {
  HEADERS += windowsfirewallaccess.h \

diff --git a/starviewer/src/core/core_ca_ES.ts b/starviewer/src/core/core_ca_ES.ts
@@ -82,7 +82,7 @@
  <translation>La previsualització no està disponible</translation>
  </message>
  <message>
- <location filename="coresettings.cpp" line="127"/>
+ <location filename="coresettings.cpp" line="129"/>
  <source>PNG (*.png)</source>
  <translation></translation>
  </message>
@@ -1174,6 +1174,127 @@ S&apos;inhabilitarà l&apos;ombreig, de manera que no es visualitzarà com s&apo
  <translation>D&apos;acord</translation>
  </message>
 </context>
+<context>
+ <name>udg::QExternalApplicationConfigurationScreen</name>
+ <message>
+ <location filename="qexternalapplicationconfigurationscreen.cpp" line="61"/>
+ <location filename="qexternalapplicationconfigurationscreen.cpp" line="84"/>
+ <source>URL</source>
+ <translation>URL</translation>
+ </message>
+ <message>
+ <location filename="qexternalapplicationconfigurationscreen.cpp" line="80"/>
+ <source>Command</source>
+ <translation>Ordre</translation>
+ </message>
+ <message>
+ <location filename="qexternalapplicationconfigurationscreen.cpp" line="147"/>
+ <location filename="qexternalapplicationconfigurationscreen.cpp" line="153"/>
+ <source>New application</source>
+ <translation>Nova aplicació</translation>
+ </message>
+</context>
+<context>
+ <name>udg::QExternalApplicationConfigurationScreenBase</name>
+ <message>
+ <location filename="qexternalapplicationconfigurationscreenbase.ui" line="20"/>
+ <source>External applications</source>
+ <translation type="unfinished">Aplicacions externes</translation>
+ </message>
+ <message>
+ <location filename="qexternalapplicationconfigurationscreenbase.ui" line="30"/>
+ <source>Delete</source>
+ <translation>Elimina</translation>
+ </message>
+ <message>
+ <location filename="qexternalapplicationconfigurationscreenbase.ui" line="37"/>
+ <source>Down</source>
+ <translation>Baixa</translation>
+ </message>
+ <message>
+ <location filename="qexternalapplicationconfigurationscreenbase.ui" line="44"/>
+ <source>Add command</source>
+ <translation>Afegeix ordre</translation>
+ </message>
+ <message>
+ <location filename="qexternalapplicationconfigurationscreenbase.ui" line="70"/>
+ <source>Type</source>
+ <translation>Tipus</translation>
+ </message>
+ <message>
+ <location filename="qexternalapplicationconfigurationscreenbase.ui" line="75"/>
+ <source>Name</source>
+ <translation>Nom</translation>
+ </message>
+ <message>
+ <location filename="qexternalapplicationconfigurationscreenbase.ui" line="80"/>
+ <source>URL</source>
+ <oldsource>Url</oldsource>
+ <translation>URL</translation>
+ </message>
+ <message>
+ <location filename="qexternalapplicationconfigurationscreenbase.ui" line="88"/>
+ <source>Up</source>
+ <translation>Puja</translation>
+ </message>
+ <message>
+ <location filename="qexternalapplicationconfigurationscreenbase.ui" line="101"/>
+ <source>&lt;html&gt;
+&lt;head/&gt;
+&lt;body&gt;
+
+&lt;p&gt;External applications can be an URL which is opened with the system&apos;s default browser or a system command.&lt;/p&gt;
+&lt;p&gt;If an URL or command has the following parameters, then they will be replaced with the corresponding real values before doing the launch.&lt;/p&gt;
+
+&lt;ul&gt;
+&lt;li&gt;&lt;b&gt;{%StudyInstanceUID%}&lt;/b&gt; Study UID.&lt;/li&gt;
+&lt;li&gt;&lt;b&gt;{%SeriesInstanceUID%}&lt;/b&gt; Series UID.&lt;/li&gt;
+&lt;li&gt;&lt;b&gt;{%AccessionNumber%}&lt;/b&gt; Accession number.&lt;/li&gt;
+&lt;li&gt;&lt;b&gt;{%PatientID%}&lt;/b&gt; Patient ID.&lt;/li&gt;
+&lt;/ul&gt;
+&lt;p&gt;Be aware of the security risks when defining external applications. Code injection attacks through command invocation may happen when opening a malicious DICOM file. Files may also be altered by a MITM attacker between the user and the PACS server.&lt;/p&gt;
+&lt;/body&gt;
+&lt;/html&gt;</source>
+ <oldsource>&lt;html&gt;
+&lt;head/&gt;
+&lt;body&gt;
+
+&lt;p&gt;External applications can be an URL which is opened with the system&apos;s default browser or a system command.&lt;/p&gt;
+&lt;p&gt;If an URL or command has the following parameters, then they will be replaced with the corresponding real values before doing the launch.&lt;/p&gt;
+
+&lt;ul&gt;
+&lt;li&gt;&lt;b&gt;{%StudyInstanceUID%}&lt;/b&gt; Study UID.&lt;/li&gt;
+&lt;li&gt;&lt;b&gt;{%SeriesInstanceUID%}&lt;/b&gt; Series UID.&lt;/li&gt;
+&lt;li&gt;&lt;b&gt;{%AccessionNumber%}&lt;/b&gt; Accession number.&lt;/li&gt;
+&lt;li&gt;&lt;b&gt;{%PatientID%}&lt;/b&gt; Patient ID.&lt;/li&gt;
+&lt;/ul&gt;
+&lt;p&gt;When launching an URL with browser parameter values will be percent encoded (url encoding).&lt;/p&gt;
+&lt;p&gt;Be aware of the security risks when defining external applications. Code injection attacks through command invocation may happen when opening a malicious DICOM file. Files may also be altered by a MITM attacker between the user and the PACS server.&lt;/p&gt;
+&lt;/body&gt;
+&lt;/html&gt;</oldsource>
+ <translation>&lt;html&gt;
+&lt;head/&gt;
+&lt;body&gt;
+
+&lt;p&gt;Les aplicacions externes consisteixen en una URL que pot ser oberta per el navegador o executada com una ordre del sistema.&lt;/p&gt;
+&lt;p&gt;Si una URL o ordre té els següents paràmetres, llavors aquests seràn substituïts per els seus valors reals corresponents en el moment de fer el llançament.&lt;/p&gt;
+
+&lt;ul&gt;
+&lt;li&gt;&lt;b&gt;{%StudyInstanceUID%}&lt;/b&gt; UID de l&apos;estudi.&lt;/li&gt;
+&lt;li&gt;&lt;b&gt;{%SeriesInstanceUID%}&lt;/b&gt; UID de la sèrie.&lt;/li&gt;
+&lt;li&gt;&lt;b&gt;{%AccessionNumber%}&lt;/b&gt; Nombre d&apos;adhesió.&lt;/li&gt;
+&lt;li&gt;&lt;b&gt;{%PatientID%}&lt;/b&gt; ID del pacient.&lt;/li&gt;
+&lt;/ul&gt;
+&lt;p&gt;Tingueu en compte els riscs en definir aplicacions externes. A través d&apos;un fitxer DICOM maligne es poden produïr atacs d&apos;injecció de codi a través de l&apos;invocació d&apos;ordres. Els fitxers també poden veure&apos;s alterats per mitjà d&apos;atacs MITM entre l&apos;usuari i el servidor PACS.&lt;/p&gt;
+&lt;/body&gt;
+&lt;/html&gt;</translation>
+ </message>
+ <message>
+ <location filename="qexternalapplicationconfigurationscreenbase.ui" line="126"/>
+ <source>Add URL</source>
+ <translation>Afegeix URL</translation>
+ </message>
+</context>
 <context>
  <name>udg::QFusionLayoutWidget</name>
  <message>

diff --git a/starviewer/src/core/core_en_GB.ts b/starviewer/src/core/core_en_GB.ts
@@ -82,7 +82,7 @@
  <translation type="unfinished"></translation>
  </message>
  <message>
- <location filename="coresettings.cpp" line="127"/>
+ <location filename="coresettings.cpp" line="129"/>
  <source>PNG (*.png)</source>
  <translation type="unfinished"></translation>
  </message>
@@ -1166,6 +1166,112 @@ Shading will be disabled, it will not render as expected.</source>
  <translation type="unfinished"></translation>
  </message>
 </context>
+<context>
+ <name>udg::QExternalApplicationConfigurationScreen</name>
+ <message>
+ <location filename="qexternalapplicationconfigurationscreen.cpp" line="61"/>
+ <location filename="qexternalapplicationconfigurationscreen.cpp" line="84"/>
+ <source>URL</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="qexternalapplicationconfigurationscreen.cpp" line="80"/>
+ <source>Command</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="qexternalapplicationconfigurationscreen.cpp" line="147"/>
+ <location filename="qexternalapplicationconfigurationscreen.cpp" line="153"/>
+ <source>New application</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>udg::QExternalApplicationConfigurationScreenBase</name>
+ <message>
+ <location filename="qexternalapplicationconfigurationscreenbase.ui" line="20"/>
+ <source>External applications</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="qexternalapplicationconfigurationscreenbase.ui" line="30"/>
+ <source>Delete</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="qexternalapplicationconfigurationscreenbase.ui" line="37"/>
+ <source>Down</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="qexternalapplicationconfigurationscreenbase.ui" line="44"/>
+ <source>Add command</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="qexternalapplicationconfigurationscreenbase.ui" line="70"/>
+ <source>Type</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="qexternalapplicationconfigurationscreenbase.ui" line="75"/>
+ <source>Name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="qexternalapplicationconfigurationscreenbase.ui" line="80"/>
+ <source>URL</source>
+ <oldsource>Url</oldsource>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="qexternalapplicationconfigurationscreenbase.ui" line="88"/>
+ <source>Up</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="qexternalapplicationconfigurationscreenbase.ui" line="101"/>
+ <source>&lt;html&gt;
+&lt;head/&gt;
+&lt;body&gt;
+
+&lt;p&gt;External applications can be an URL which is opened with the system&apos;s default browser or a system command.&lt;/p&gt;
+&lt;p&gt;If an URL or command has the following parameters, then they will be replaced with the corresponding real values before doing the launch.&lt;/p&gt;
+
+&lt;ul&gt;
+&lt;li&gt;&lt;b&gt;{%StudyInstanceUID%}&lt;/b&gt; Study UID.&lt;/li&gt;
+&lt;li&gt;&lt;b&gt;{%SeriesInstanceUID%}&lt;/b&gt; Series UID.&lt;/li&gt;
+&lt;li&gt;&lt;b&gt;{%AccessionNumber%}&lt;/b&gt; Accession number.&lt;/li&gt;
+&lt;li&gt;&lt;b&gt;{%PatientID%}&lt;/b&gt; Patient ID.&lt;/li&gt;
+&lt;/ul&gt;
+&lt;p&gt;Be aware of the security risks when defining external applications. Code injection attacks through command invocation may happen when opening a malicious DICOM file. Files may also be altered by a MITM attacker between the user and the PACS server.&lt;/p&gt;
+&lt;/body&gt;
+&lt;/html&gt;</source>
+ <oldsource>&lt;html&gt;
+&lt;head/&gt;
+&lt;body&gt;
+
+&lt;p&gt;External applications can be an URL which is opened with the system&apos;s default browser or a system command.&lt;/p&gt;
+&lt;p&gt;If an URL or command has the following parameters, then they will be replaced with the corresponding real values before doing the launch.&lt;/p&gt;
+
+&lt;ul&gt;
+&lt;li&gt;&lt;b&gt;{%StudyInstanceUID%}&lt;/b&gt; Study UID.&lt;/li&gt;
+&lt;li&gt;&lt;b&gt;{%SeriesInstanceUID%}&lt;/b&gt; Series UID.&lt;/li&gt;
+&lt;li&gt;&lt;b&gt;{%AccessionNumber%}&lt;/b&gt; Accession number.&lt;/li&gt;
+&lt;li&gt;&lt;b&gt;{%PatientID%}&lt;/b&gt; Patient ID.&lt;/li&gt;
+&lt;/ul&gt;
+&lt;p&gt;When launching an URL with browser parameter values will be percent encoded (url encoding).&lt;/p&gt;
+&lt;p&gt;Be aware of the security risks when defining external applications. Code injection attacks through command invocation may happen when opening a malicious DICOM file. Files may also be altered by a MITM attacker between the user and the PACS server.&lt;/p&gt;
+&lt;/body&gt;
+&lt;/html&gt;</oldsource>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="qexternalapplicationconfigurationscreenbase.ui" line="126"/>
+ <source>Add URL</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
 <context>
  <name>udg::QFusionLayoutWidget</name>
  <message>