[dcm4che-commits] SF.net SVN: dcm4che: [5585] dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src

[<gun...@us...>]

Revision: 5585
          http://dcm4che.svn.sourceforge.net/dcm4che/?rev=5585&view=rev
Author:   gunterze
Date:     2007-12-04 15:36:01 -0800 (Tue, 04 Dec 2007)

Log Message:
-----------
[#DCMEE-657] Upgrade to Enhanced Multi-frame Image Service

Modified Paths:
--------------
    dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/etc/conf/xmdesc/dcm4chee-upgrade2emf-xmbean.xml
    dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/java/org/dcm4chex/archive/emf/UpgradeToEnhancedMFService.java

Modified: dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/etc/conf/xmdesc/dcm4chee-upgrade2emf-xmbean.xml
===================================================================
--- dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/etc/conf/xmdesc/dcm4chee-upgrade2emf-xmbean.xml	2007-12-04 22:47:04 UTC (rev 5584)
+++ dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/etc/conf/xmdesc/dcm4chee-upgrade2emf-xmbean.xml	2007-12-04 23:36:01 UTC (rev 5585)
@@ -42,22 +42,22 @@
   </descriptors>
  </attribute>
  <attribute access="read-write"
-  getMethod="isUsePatientStudySeriesAttributesFromDB"
-  setMethod="setUsePatientStudySeriesAttributesFromDB">
+  getMethod="isMergePatientStudySeriesAttributesFromDB"
+  setMethod="setMergePatientStudySeriesAttributesFromDB">
   <description>
-   Defines, if Patient, Study and Series attributes are taken from
-   corresponding DB records, so the XSL stylesheets need not to copy such
-   attributes from the Single-frame images to the generated Multi-frame image.
-   As a side-effect, equality of values of such attributes over all source
-   images will not be verified and therefore the generation of the 
-   Multi-frame image will not fail caused by inconsistency of Patient, Study
-   or Series attribute values inside the Series of source images.
-   &lt;p&gt;Copy of the Series Instance UID from the DB is always excluded, so
-   it can be defined by the style sheet - by copying the Series Instance UID
-   attribute into the output, or not - if the generated Multi-frame image
-   shall be put into the same Series as the source images, or not.
+   &lt;p&gt;Defines, if Patient, Study and Series attributes are merged from
+   corresponding DB records into the generated Multi-frame image, so they need
+   not be copied by XSLT from the Single-frame images to the generated
+   Multi-frame image. Attributes not copied by XSLT are not verified for
+   equality of values over all source images. Therefore, skipping such
+   attributes by XSLT allows the generation of the Multi-frame image even if
+   the attribute value differs between source images.&lt;/p&gt;
+   &lt;p&gt;Series Instance UID is never merged from the DB, so it can be
+   defined by the XSL style sheet - by copying the Series Instance UID
+   attribute into the output, or not - if the generated Multi-frame image shall
+   be put into the same Series as the source images, or not.&lt;/p&gt;
   </description>
-  <name>UsePatientStudySeriesAttributesFromDB</name>
+  <name>MergePatientStudySeriesAttributesFromDB</name>
   <type>boolean</type>
   <descriptors>
    <value value="true" />

Modified: dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/java/org/dcm4chex/archive/emf/UpgradeToEnhancedMFService.java
===================================================================
--- dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/java/org/dcm4chex/archive/emf/UpgradeToEnhancedMFService.java	2007-12-04 22:47:04 UTC (rev 5584)
+++ dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/java/org/dcm4chex/archive/emf/UpgradeToEnhancedMFService.java	2007-12-04 23:36:01 UTC (rev 5585)
@@ -92,7 +92,7 @@
 
     private int concurrency = 1;
 
-    private boolean usePatientStudySeriesAttributesFromDB;
+    private boolean mergePatientStudySeriesAttributesFromDB;
 
     private boolean noPixelData;
 
@@ -154,13 +154,13 @@
         templates.setConfigDir(path);
     }
 
-    public final boolean isUsePatientStudySeriesAttributesFromDB() {
-        return usePatientStudySeriesAttributesFromDB;
+    public final boolean isMergePatientStudySeriesAttributesFromDB() {
+        return mergePatientStudySeriesAttributesFromDB;
     }
 
-    public final void setUsePatientStudySeriesAttributesFromDB(
-            boolean usePatientStudySeriesAttributesFromDB) {
-        this.usePatientStudySeriesAttributesFromDB = usePatientStudySeriesAttributesFromDB;
+    public final void setMergePatientStudySeriesAttributesFromDB(
+            boolean mergeFromDB) {
+        this.mergePatientStudySeriesAttributesFromDB = mergeFromDB;
     }
 
     public final int getConcurrency() {
@@ -321,7 +321,7 @@
             builder.add(files[i] = locateInstance(iuid));
         }
         Dataset mfds = builder.build();
-        if (usePatientStudySeriesAttributesFromDB) {
+        if (mergePatientStudySeriesAttributesFromDB) {
             mfds.putAll(seriesStored.getSeriesAttrs().exclude(SERIES_IUID));
             mfds.putAll(seriesStored.getStudyAttrs());
             mfds.putAll(seriesStored.getPatientAttrs());


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.