diff --git a/weasis-dicom/weasis-dicom-3d/viewer3d/src/main/java/org/weasis/dicom/viewer3d/vr/VolumeBuilder.java b/weasis-dicom/weasis-dicom-3d/viewer3d/src/main/java/org/weasis/dicom/viewer3d/vr/VolumeBuilder.java index cf05eeccb..99473f625 100755 --- a/weasis-dicom/weasis-dicom-3d/viewer3d/src/main/java/org/weasis/dicom/viewer3d/vr/VolumeBuilder.java +++ b/weasis-dicom/weasis-dicom-3d/viewer3d/src/main/java/org/weasis/dicom/viewer3d/vr/VolumeBuilder.java @@ -204,10 +204,6 @@ public void run() { Instant timeStarted = Instant.now(); double lastPos = 0; - String patientPseudoUID = DicomModel.getPatientPseudoUID(volTexture.getSeries()); - List segList = - DicomSeries.getHiddenElementsFromPatient(patientPseudoUID, SegSpecialElement.class); - List list = volTexture.getVolumeImages(); for (int i = 0; i < list.size(); i++) { if (isInterrupted()) { @@ -276,28 +272,6 @@ public void run() { i, Duration.between(start, Instant.now()).toMillis()); - if (!segList.isEmpty()) { - Mat mask = Mat.zeros(imageMLUT.size(), imageMLUT.type()); - for (SegSpecialElement seg : segList) { - if (seg.isVisible() && seg.containsSopInstanceUIDReference(imageElement)) { - Collection contours = seg.getContours(imageElement); - if (!contours.isEmpty()) { - for (EditableContour c : contours) { - NonEditableGraphic graphic = c.getNonEditableGraphic(); - if (graphic != null) { - List pts = - ImageProcessor.transformShapeToContour(graphic.getShape(), false); - // TODO check the limit value - Imgproc.fillPoly(mask, pts, new Scalar(c.getCategory().getId())); - } - } - // Core.bitwise_and(src, mask, src); - } - } - } - imageMLUT = ImageCV.toImageCV(mask); - } - sumMemory += imageMLUT.physicalBytes(); if (sumMemory > maxMemory) { start = Instant.now(); diff --git a/weasis-dicom/weasis-dicom-viewer2d/src/main/java/org/weasis/dicom/viewer2d/EventManager.java b/weasis-dicom/weasis-dicom-viewer2d/src/main/java/org/weasis/dicom/viewer2d/EventManager.java index c549384fc..6e11a5074 100755 --- a/weasis-dicom/weasis-dicom-viewer2d/src/main/java/org/weasis/dicom/viewer2d/EventManager.java +++ b/weasis-dicom/weasis-dicom-viewer2d/src/main/java/org/weasis/dicom/viewer2d/EventManager.java @@ -738,11 +738,11 @@ private void koAction(Feature action, Object selected) { private ComboItemListener newLutAction() { List luts = new ArrayList<>(); - luts.add(ColorLut.GRAY.getByteLut()); + luts.add(ByteLutCollection.Lut.GRAY.getByteLut()); ByteLutCollection.readLutFilesFromResourcesDir( luts, ResourceUtil.getResource(DicomResource.LUTS)); // Set default first as the list has been sorted - luts.add(0, ColorLut.IMAGE.getByteLut()); + luts.add(0, ByteLutCollection.Lut.IMAGE.getByteLut()); return new ComboItemListener<>(ActionW.LUT, luts.toArray(new ByteLut[0])) {