Menu
▾
▴
[dcm4che-commits] SF.net SVN: dcm4che:[13372] dcm4chee/dcm4chee-web/trunk
|
From: <jav...@us...> - 2010-05-19 08:49:09
|
Revision: 13372
http://dcm4che.svn.sourceforge.net/dcm4che/?rev=13372&view=rev
Author: javawilli
Date: 2010-05-19 08:48:59 +0000 (Wed, 19 May 2010)
Log Message:
-----------
[#WEB-78] add Webviewer and WADO support.
Added Paths:
-----------
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-oviyam/
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-oviyam/.classpath
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-oviyam/.project
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-oviyam/pom.xml
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-oviyam/src/
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-oviyam/src/main/
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-oviyam/src/main/java/
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-oviyam/src/main/java/org/
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-oviyam/src/main/java/org/dcm4chee/
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-oviyam/src/main/java/org/dcm4chee/web/
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-oviyam/src/main/java/org/dcm4chee/web/webview/
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-oviyam/src/main/java/org/dcm4chee/web/webview/oviyam/
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-oviyam/src/main/java/org/dcm4chee/web/webview/oviyam/OviyamLinkProvider.java
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-oviyam/src/main/resources/
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-oviyam/src/main/resources/META-INF/
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-oviyam/src/main/resources/META-INF/services/
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-oviyam/src/main/resources/META-INF/services/org.dcm4chee.web.common.webview.link.spi.WebviewerLinkProviderSPI
Removed Paths:
-------------
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-common/src/main/java/org/dcm4chee/web/common/webview/link/spi/OviyamLinkProvider.java
Deleted: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-common/src/main/java/org/dcm4chee/web/common/webview/link/spi/OviyamLinkProvider.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-common/src/main/java/org/dcm4chee/web/common/webview/link/spi/OviyamLinkProvider.java 2010-05-19 08:20:48 UTC (rev 13371)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-common/src/main/java/org/dcm4chee/web/common/webview/link/spi/OviyamLinkProvider.java 2010-05-19 08:48:59 UTC (rev 13372)
@@ -1,89 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is part of dcm4che, an implementation of DICOM(TM) in
- * Java(TM), hosted at http://sourceforge.net/projects/dcm4che.
- *
- * The Initial Developer of the Original Code is
- * Agfa-Gevaert AG.
- * Portions created by the Initial Developer are Copyright (C) 2008
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * See listed authors below.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-package org.dcm4chee.web.common.webview.link.spi;
-
-/**
- * @author Franz Willer <fra...@gm...>
- * @version $Revision$ $Date$
- * @since May 15, 2010
- */
-public class OviyamLinkProvider extends WebviewerLinkProviderSPI {
- private static String baseUrl = "http://localhost:8080/oviyam/oviyam?";
-
- public String getName() {
- return "oviyam";
- }
-
- public boolean supportPatientLevel() {
- return true;
- }
- public boolean supportStudyLevel() {
- return true;
- }
- public boolean supportSeriesLevel() {
- return true;
- }
- public boolean supportInstanceLevel() {
- return false;
- }
- public boolean supportPresentationState() {
- return false;
- }
- public boolean supportKeySelectionObject() {
- return false;
- }
- public String getUrlForPatient(String patientId, String issuer) {
- return baseUrl+"patientID="+patientId;
- }
- public String getUrlForStudy(String studyIuid){
- return baseUrl+"studyUID="+studyIuid;
- }
- public String getUrlForSeries(String seriesIuid){
- return baseUrl+"seriesUID="+seriesIuid;
- }
- public String getUrlForInstance(String sopIuid) {
- return null;
- }
- public String getUrlForPresentationState(String iuid) {
- return null;
- }
- public String getUrlForKeyObjectSelection(String iuid) {
- return null;
- }
-}
Added: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-oviyam/.classpath
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-oviyam/.classpath (rev 0)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-oviyam/.classpath 2010-05-19 08:48:59 UTC (rev 13372)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Added: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-oviyam/.project
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-oviyam/.project (rev 0)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-oviyam/.project 2010-05-19 08:48:59 UTC (rev 13372)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>dcm4chee-web-common</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ </natures>
+</projectDescription>
Added: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-oviyam/pom.xml
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-oviyam/pom.xml (rev 0)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-oviyam/pom.xml 2010-05-19 08:48:59 UTC (rev 13372)
@@ -0,0 +1,38 @@
+<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>dcm4chee-web</artifactId>
+ <groupId>dcm4che.dcm4chee</groupId>
+ <version>3.0.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>dcm4che.dcm4chee</groupId>
+ <artifactId>dcm4chee-web-oviyam</artifactId>
+ <packaging>jar</packaging>
+ <version>3.0.0-SNAPSHOT</version>
+ <name>URL Provider for OVIYAM Webviewer</name>
+ <description></description>
+ <dependencies>
+ <dependency>
+ <groupId>dcm4che.dcm4chee</groupId>
+ <artifactId>dcm4chee-web-common</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <inherited>true</inherited>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ <optimise>true</optimise>
+ <debug>true</debug>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Added: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-oviyam/src/main/java/org/dcm4chee/web/webview/oviyam/OviyamLinkProvider.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-oviyam/src/main/java/org/dcm4chee/web/webview/oviyam/OviyamLinkProvider.java (rev 0)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-oviyam/src/main/java/org/dcm4chee/web/webview/oviyam/OviyamLinkProvider.java 2010-05-19 08:48:59 UTC (rev 13372)
@@ -0,0 +1,93 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is part of dcm4che, an implementation of DICOM(TM) in
+ * Java(TM), hosted at http://sourceforge.net/projects/dcm4che.
+ *
+ * The Initial Developer of the Original Code is
+ * Agfa-Gevaert AG.
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * See listed authors below.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+package org.dcm4chee.web.webview.oviyam;
+
+import org.dcm4chee.web.common.webview.link.spi.WebviewerLinkProviderSPI;
+
+/**
+ * @author Franz Willer <fra...@gm...>
+ * @version $Revision$ $Date$
+ * @since May 15, 2010
+ */
+public class OviyamLinkProvider extends WebviewerLinkProviderSPI {
+ private static final long serialVersionUID = 4548297230882756086L;
+
+ private static String baseUrl = "http://localhost:8080/oviyam/oviyam?";
+
+ public String getName() {
+ return "oviyam";
+ }
+
+ public boolean supportPatientLevel() {
+ return true;
+ }
+ public boolean supportStudyLevel() {
+ return true;
+ }
+ public boolean supportSeriesLevel() {
+ return true;
+ }
+ public boolean supportInstanceLevel() {
+ return false;
+ }
+ public boolean supportPresentationState() {
+ return false;
+ }
+ public boolean supportKeySelectionObject() {
+ return false;
+ }
+ public String getUrlForPatient(String patientId, String issuer) {
+ return baseUrl+"patientID="+patientId;
+ }
+ public String getUrlForStudy(String studyIuid){
+ return baseUrl+"studyUID="+studyIuid;
+ }
+ public String getUrlForSeries(String seriesIuid){
+ return baseUrl+"seriesUID="+seriesIuid;
+ }
+ public String getUrlForInstance(String sopIuid) {
+ return null;
+ }
+ public String getUrlForPresentationState(String iuid) {
+ return null;
+ }
+ public String getUrlForKeyObjectSelection(String iuid) {
+ return null;
+ }
+}
Added: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-oviyam/src/main/resources/META-INF/services/org.dcm4chee.web.common.webview.link.spi.WebviewerLinkProviderSPI
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-oviyam/src/main/resources/META-INF/services/org.dcm4chee.web.common.webview.link.spi.WebviewerLinkProviderSPI (rev 0)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-oviyam/src/main/resources/META-INF/services/org.dcm4chee.web.common.webview.link.spi.WebviewerLinkProviderSPI 2010-05-19 08:48:59 UTC (rev 13372)
@@ -0,0 +1 @@
+org.dcm4chee.web.webview.oviyam.OviyamLinkProvider
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|