Skip to content

Commit

Permalink
Initial experimenting with DICOM RT plugin.
Browse files Browse the repository at this point in the history
  • Loading branch information
toskrip committed Feb 7, 2015
1 parent 9ba5c9d commit bf31350
Show file tree
Hide file tree
Showing 39 changed files with 7,850 additions and 110 deletions.
1 change: 1 addition & 0 deletions weasis-dicom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@
<module>weasis-dicom-explorer</module>
<module>weasis-dicom-viewer2d</module>
<module>weasis-dicom-sr</module>
<module>weasis-dicom-rt</module>
</modules>
</project>
60 changes: 60 additions & 0 deletions weasis-dicom/weasis-dicom-codec/weasis-dicom-codec.iml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="Osmorc" name="OSGi">
<configuration manifestGenerationMode="OsmorcControlled" manifestLocation="" jarfileLocation="weasis-dicom-codec-2.0.3-SNAPSHOT.jar" outputPathType="CompilerOutputPath" bndFileLocation="" bundlorFileLocation="" bundleActivator="org.weasis.dicom.codec.internal.Activator" bundleSymbolicName="weasis-dicom-codec" bundleVersion="2.0.3-SNAPSHOT" ignoreFilePattern="" useProjectDefaultManifestFileLocation="true" alwaysRebuildBundleJAR="false" doNotSynchronizeWithMaven="false">
<additionalProperties>
<property key="Export-Package" value="!org.weasis.dicom.codec.internal.*,org.weasis.dicom.codec.*,org.dcm4che3.*" />
<property key="Bundle-RequiredExecutionEnvironment" value="JavaSE-1.6" />
<property key="-removeheaders" value="Bnd-LastModified,Include-Resource,Private-Package,Tool,Built-By,Build-Jdk,Created-By" />
<property key="-nouses" value="true" />
<property key="Embed-Dependency" value="*;scope=compile;inline=true" />
<property key="Embed-Directory" value="lib" />
<property key="Embed-StripGroup" value="true" />
<property key="Bundle-Name" value="DICOM Codec [weasis-dicom-codec]" />
<property key="Include-Resource" value="@$MAVEN_REPOSITORY$/org/dcm4che/dcm4che-core/3.3.4/dcm4che-core-3.3.4.jar,@$MAVEN_REPOSITORY$/org/dcm4che/dcm4che-dict/3.3.4/dcm4che-dict-3.3.4.jar,@$MAVEN_REPOSITORY$/junit/junit/4.11/junit-4.11.jar,@$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar,@$MAVEN_REPOSITORY$/org/dcm4che/dcm4che-image/3.3.4/dcm4che-image-3.3.4.jar,@$MAVEN_REPOSITORY$/org/dcm4che/dcm4che-net/3.3.4/dcm4che-net-3.3.4.jar" />
</additionalProperties>
<additionalJARContents />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: org.dcm4che:dcm4che-core:3.3.4" level="project" />
<orderEntry type="library" name="Maven: org.dcm4che:dcm4che-dict:3.3.4" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.slf4j:slf4j-log4j12:1.7.5" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: log4j:log4j:1.2.17" level="project" />
<orderEntry type="library" name="Maven: junit:junit:4.11" level="project" />
<orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
<orderEntry type="library" name="Maven: org.dcm4che:dcm4che-image:3.3.4" level="project" />
<orderEntry type="library" name="Maven: org.dcm4che:dcm4che-net:3.3.4" level="project" />
<orderEntry type="module" module-name="weasis-imageio-codec" scope="PROVIDED" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.weasis.thirdparty.com.sun.media:clibwrapper_jiio:1.2-b04" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.weasis.thirdparty.com.sun.media:jai_imageio:1.2-b04" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.weasis.thirdparty.com.sun.media:vecmath:1.5.2" level="project" />
<orderEntry type="module" module-name="weasis-core-api" scope="PROVIDED" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.osgi:org.osgi.compendium:5.0.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.osgi:org.osgi.core:5.0.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.felix:org.apache.felix.scr.annotations:1.9.8" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.sling:org.apache.sling.commons.log:3.0.2-r1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.slf4j:slf4j-api:1.7.5" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.felix:org.apache.felix.gogo.command:0.14.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.felix:org.apache.felix.bundlerepository:1.6.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.easymock:easymock:2.4" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.felix:org.apache.felix.gogo.runtime:0.12.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.felix:org.apache.felix.gogo.shell:0.10.0-r1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.weasis.thirdparty.com.sun.media:jai-lib:1.1.4-b05" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.weasis.thirdparty.com.sun.media:jai_core:1.1.4-b05" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.weasis.thirdparty.com.sun.media:mlibwrapper_jai:1.1.4-b03" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.weasis.thirdparty.com.sun.media:jai_codec:1.1.4-b03" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.weasis.thirdparty:docking-frames:1.1.2-P8c2" level="project" />
</component>
</module>
61 changes: 61 additions & 0 deletions weasis-dicom/weasis-dicom-explorer/weasis-dicom-explorer.iml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="Osmorc" name="OSGi">
<configuration manifestGenerationMode="OsmorcControlled" manifestLocation="" jarfileLocation="weasis-dicom-explorer-2.0.3-SNAPSHOT.jar" outputPathType="CompilerOutputPath" bndFileLocation="" bundlorFileLocation="" bundleActivator="org.weasis.dicom.explorer.internal.Activator" bundleSymbolicName="weasis-dicom-explorer" bundleVersion="2.0.3-SNAPSHOT" ignoreFilePattern="" useProjectDefaultManifestFileLocation="true" alwaysRebuildBundleJAR="false" doNotSynchronizeWithMaven="false">
<additionalProperties>
<property key="Bundle-RequiredExecutionEnvironment" value="JavaSE-1.6" />
<property key="-removeheaders" value="Bnd-LastModified,Include-Resource,Private-Package,Tool,Built-By,Build-Jdk,Created-By" />
<property key="-nouses" value="true" />
<property key="Embed-Dependency" value="*;scope=compile;inline=true" />
<property key="Embed-Directory" value="lib" />
<property key="Embed-StripGroup" value="true" />
<property key="Bundle-Name" value="DICOM Data Explorer [weasis-dicom-explorer]" />
<property key="Include-Resource" value="config/wado_query.xsd=$MODULE_DIR$/src/main/resources/config/wado_query.xsd,icon/16x16/key-images.png=$MODULE_DIR$/src/main/resources/icon/16x16/key-images.png,icon/16x16/patient.png=$MODULE_DIR$/src/main/resources/icon/16x16/patient.png,icon/16x16/cd.png=$MODULE_DIR$/src/main/resources/icon/16x16/cd.png,icon/16x16/patient-ON.png=$MODULE_DIR$/src/main/resources/icon/16x16/patient-ON.png,org/weasis/dicom/explorer/messages.properties=$MODULE_DIR$/src/main/java/org/weasis/dicom/explorer/messages.properties" />
</additionalProperties>
<additionalJARContents />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="weasis-core-ui" scope="PROVIDED" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.simpleframework:simple-xml:2.7" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: stax:stax-api:1.0.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: it.cnr.imaa.essi:lablib-checkboxtree:3.3" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.swinglabs:jxlayer:3.0.4" level="project" />
<orderEntry type="module" module-name="weasis-dicom-codec" scope="PROVIDED" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.dcm4che:dcm4che-core:3.3.4" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.dcm4che:dcm4che-dict:3.3.4" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.slf4j:slf4j-log4j12:1.7.5" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: log4j:log4j:1.2.17" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: junit:junit:4.11" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.dcm4che:dcm4che-image:3.3.4" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.dcm4che:dcm4che-net:3.3.4" level="project" />
<orderEntry type="module" module-name="weasis-core-api" scope="PROVIDED" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.osgi:org.osgi.compendium:5.0.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.osgi:org.osgi.core:5.0.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.felix:org.apache.felix.scr.annotations:1.9.8" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.sling:org.apache.sling.commons.log:3.0.2-r1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.slf4j:slf4j-api:1.7.5" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.felix:org.apache.felix.gogo.command:0.14.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.felix:org.apache.felix.bundlerepository:1.6.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.easymock:easymock:2.4" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.felix:org.apache.felix.gogo.runtime:0.12.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.felix:org.apache.felix.gogo.shell:0.10.0-r1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.weasis.thirdparty.com.sun.media:jai-lib:1.1.4-b05" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.weasis.thirdparty.com.sun.media:jai_core:1.1.4-b05" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.weasis.thirdparty.com.sun.media:mlibwrapper_jai:1.1.4-b03" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.weasis.thirdparty.com.sun.media:jai_codec:1.1.4-b03" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.weasis.thirdparty:docking-frames:1.1.2-P8c2" level="project" />
</component>
</module>
28 changes: 28 additions & 0 deletions weasis-dicom/weasis-dicom-parent/weasis-dicom-parent.iml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="weasis-core-api" scope="PROVIDED" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.osgi:org.osgi.compendium:5.0.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.osgi:org.osgi.core:5.0.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.felix:org.apache.felix.scr.annotations:1.9.8" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.sling:org.apache.sling.commons.log:3.0.2-r1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.slf4j:slf4j-api:1.7.5" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.felix:org.apache.felix.gogo.command:0.14.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.felix:org.apache.felix.bundlerepository:1.6.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.easymock:easymock:2.4" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.felix:org.apache.felix.gogo.runtime:0.12.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.felix:org.apache.felix.gogo.shell:0.10.0-r1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.weasis.thirdparty.com.sun.media:jai-lib:1.1.4-b05" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.weasis.thirdparty.com.sun.media:jai_core:1.1.4-b05" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.weasis.thirdparty.com.sun.media:mlibwrapper_jai:1.1.4-b03" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.weasis.thirdparty.com.sun.media:jai_codec:1.1.4-b03" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.weasis.thirdparty:docking-frames:1.1.2-P8c2" level="project" />
</component>
</module>
5 changes: 5 additions & 0 deletions weasis-dicom/weasis-dicom-rt/conf/ext-config.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@

org.osgi.framework.startlevel.beginning=120

felix.auto.start.75= \
file:${maven.localRepository}/weasis/dicom/rt/weasis-dicom-rt/1.0-SNAPSHOT/weasis-dicom-rt-1.0-SNAPSHOT.jar \
74 changes: 74 additions & 0 deletions weasis-dicom/weasis-dicom-rt/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>weasis-parent</artifactId>
<groupId>org.weasis</groupId>
<version>2.0.3-SNAPSHOT</version>
<relativePath>../weasis-dicom-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>weasis.dicom.rt</groupId>
<artifactId>weasis-dicom-rt</artifactId>
<packaging>bundle</packaging>
<name>Tool panel sample [${project.artifactId}]</name>
<properties>
<bundle.symbolicName>${project.artifactId}</bundle.symbolicName>
</properties>
<version>1.0-SNAPSHOT</version>
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.weasis.core</groupId>
<artifactId>weasis-core-api</artifactId>
<version>${project.parent.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.weasis.core</groupId>
<artifactId>weasis-core-ui</artifactId>
<version>${project.parent.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.weasis.dicom</groupId>
<artifactId>weasis-dicom-viewer2d</artifactId>
<version>${project.parent.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.weasis.dicom</groupId>
<artifactId>weasis-dicom-codec</artifactId>
<version>2.0.3-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.weasis.imageio</groupId>
<artifactId>weasis-imageio-codec</artifactId>
<version>2.0.3-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.weasis.dicom</groupId>
<artifactId>weasis-dicom-explorer</artifactId>
<version>2.0.3-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.weasis.thirdparty.com.sun.media</groupId>
<artifactId>vecmath</artifactId>
<version>1.5.2</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
package org.weasis.dicom.rt;

import java.util.List;
import java.util.Map;

/**
* Created by toskrip on 2/1/15.
*/
public class Contour {

private String uid;
private String geometricType;
private int contourPoints;
private List<Map<Character, Float>> contourData;

public String getUid() {
return this.uid;
}

public void setUid(String value) {
this.uid = value;
}

public String getGeometricType() {
return this.geometricType;
}

public void setGeometricType(String value) {
this.geometricType = value;
}

public int getContourPoints() {
return this.contourPoints;
}

public void setContourPoints(int value) {
this.contourPoints = value;
}

public List<Map<Character, Float>> getContourData() {
return this.contourData;
}

public void setContourData(List<Map<Character, Float>> value) {
this.contourData = value;
}

}

0 comments on commit bf31350

Please sign in to comment.