Add operator tag in series. Fix current rectify view.

nroduit · Aug 23, 2016 · 031d134 · 031d134
1 parent 8c7e201
commit 031d134
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 6 deletions.
diff --git a/...r/src/main/java/org/weasis/acquire/dockable/components/actions/rectify/RectifyAction.java b/...r/src/main/java/org/weasis/acquire/dockable/components/actions/rectify/RectifyAction.java
@@ -89,8 +89,7 @@ protected void updateCropGraphic() {
         }
     }
 
-    private static Rectangle2D adaptToValidateCropArea(Rectangle2D area) {
-        ViewCanvas<ImageElement> view = getView();
+    private static Rectangle2D adaptToValidateCropArea(ViewCanvas<ImageElement> view, Rectangle2D area) {
         AffineTransform transform = AffineTransform.getScaleInstance(1.0, 1.0);
         buildAffineTransform(transform, view.getDisplayOpManager(), view.getViewModel().getModelArea(),
             (Point) view.getActionValue(DefaultView2d.PROP_LAYER_OFFSET));
@@ -176,7 +175,7 @@ public void validate(AcquireImageInfo imageInfo, ViewCanvas<ImageElement> view)
         if (view.getImageLayer() instanceof RenderedImageLayer && currentCropArea != null) {
             imageInfo.getCurrentValues().setCropZone(null); // Force dirty value
             imageInfo.getNextValues()
-                .setCropZone(adaptToValidateCropArea(currentCropArea.getShape().getBounds()).getBounds());
+                .setCropZone(adaptToValidateCropArea(view, currentCropArea.getShape().getBounds()).getBounds());
             view.getDisplayOpManager().setParamValue(RotationOp.OP_NAME, RotationOp.P_ROTATE, 0);
             view.getDisplayOpManager().setParamValue(FlipOp.OP_NAME, FlipOp.P_FLIP, false);
             imageInfo.applyPostProcess(view);

diff --git a/...re/weasis-acquire-explorer/src/main/java/org/weasis/acquire/explorer/AcquisitionView.java b/...re/weasis-acquire-explorer/src/main/java/org/weasis/acquire/explorer/AcquisitionView.java
@@ -33,6 +33,7 @@
 import org.weasis.core.api.explorer.DataExplorerView;
 import org.weasis.core.api.explorer.model.DataExplorerModel;
 import org.weasis.core.api.media.data.MediaElement;
+import org.weasis.core.api.media.data.TagUtil;
 import org.weasis.core.api.service.BundlePreferences;
 import org.weasis.core.ui.docking.PluginTool;
 import org.weasis.core.ui.docking.UIManager;
@@ -75,7 +76,11 @@ public AcquisitionView() {
 
         this.acquireThumbnailListPane.loadDirectory(systemDrive.getID());
 
-        centralPane.setPluginName(TagD.getTagValue(AcquireManager.GLOBAL, Tag.PatientName, String.class));
+        String ptName = TagUtil.buildDicomPersonName(TagD.getTagValue(AcquireManager.GLOBAL, Tag.PatientName, String.class));
+        if(!org.weasis.core.api.util.StringUtil.hasLength(ptName)){
+            ptName = TagD.NO_VALUE;
+        }
+        centralPane.setPluginName(ptName);
 
         // Remove dropping capabilities in the central area (limit to import from browse panel)
         UIManager.MAIN_AREA.getComponent().setTransferHandler(null);

diff --git a/...asis-acquire-explorer/src/main/java/org/weasis/acquire/explorer/MediaImporterFactory.java b/...asis-acquire-explorer/src/main/java/org/weasis/acquire/explorer/MediaImporterFactory.java
@@ -87,6 +87,7 @@ private void initGlobalTags() {
                     buf = xml.getBytes(StandardCharsets.UTF_8);
                 }
                 stream = new ByteArrayInputStream(buf);
+        //        LOGGER.debug("xml:\n{}", new String(buf));
 
                 DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
                 DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();

diff --git a/...re/weasis-acquire-explorer/src/main/java/org/weasis/acquire/explorer/core/bean/Serie.java b/...re/weasis-acquire-explorer/src/main/java/org/weasis/acquire/explorer/core/bean/Serie.java
@@ -16,7 +16,9 @@
 
 import org.dcm4che3.data.Tag;
 import org.dcm4che3.util.UIDUtils;
+import org.weasis.acquire.explorer.AcquireManager;
 import org.weasis.core.api.media.data.TagUtil;
+import org.weasis.core.api.media.data.TagW;
 import org.weasis.dicom.codec.TagD;
 
 public class Serie extends AbstractTagable implements Comparable<Serie> {
@@ -58,6 +60,8 @@ private void init() {
         // Default Modality if not overridden
         tags.put(TagD.get(Tag.Modality), "XC");
         tags.put(TagD.get(Tag.SeriesInstanceUID), UIDUtils.createUID());
+        TagW operator = TagD.get(Tag.OperatorsName);
+        tags.put(operator, AcquireManager.GLOBAL.getTagValue(operator));
     }
 
     public Type getType() {

diff --git a/...rc/main/java/org/weasis/acquire/explorer/gui/central/meta/model/imp/AcquireSerieMeta.java b/...rc/main/java/org/weasis/acquire/explorer/gui/central/meta/model/imp/AcquireSerieMeta.java
@@ -21,9 +21,9 @@
 public class AcquireSerieMeta extends AcquireMetadataTableModel {
     private static final long serialVersionUID = 8912202268139591519L;
 
-    private static final TagW[] TAGS_TO_DISPLAY = TagD.getTagFromIDs(Tag.Modality, Tag.PerformingPhysicianName,Tag.BodyPartExamined, Tag.SeriesDescription);
+    private static final TagW[] TAGS_TO_DISPLAY = TagD.getTagFromIDs(Tag.Modality, Tag.OperatorsName, Tag.ReferringPhysicianName,Tag.BodyPartExamined, Tag.SeriesDescription);
 
-    private static final TagW[] TAGS_EDITABLE = TagD.getTagFromIDs(Tag.PerformingPhysicianName, Tag.BodyPartExamined, Tag.SeriesDescription);
+    private static final TagW[] TAGS_EDITABLE = TagD.getTagFromIDs(Tag.ReferringPhysicianName, Tag.BodyPartExamined, Tag.SeriesDescription);
 
     public AcquireSerieMeta(Serie serie) {
         super(serie);