Skip to content

Commit

Permalink
Merge pull request #25 from salimkanoun/dev
Browse files Browse the repository at this point in the history 
version 1.2
  • Loading branch information
@salimkanoun
salimkanoun authored Feb 18, 2019
2 parents 56aa4d3 + 4481f44 commit 4004333
Show file tree
Hide file tree
Showing 13 changed files with 704 additions and 281 deletions.
257 changes: 84 additions & 173 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,179 +185,90 @@

<dependencies>


<dependency>

<groupId>net.imagej</groupId>

<artifactId>ij</artifactId>

<version>1.51s</version>

</dependency>


<dependency>

<groupId>org.kie.modules</groupId>

<artifactId>org-apache-commons-lang3</artifactId>

<version>6.5.0.Final</version>

<type>pom</type>

</dependency>


<dependency>

<groupId>org.apache.commons</groupId>

<artifactId>commons-io</artifactId>

<version>1.3.2</version>

</dependency>


<dependency>

<groupId>com.github.stephenc.java-iso-tools</groupId>

<artifactId>sabre</artifactId>

<version>2.0.1</version>

</dependency>


<dependency>

<groupId>com.googlecode.json-simple</groupId>

<artifactId>json-simple</artifactId>

<version>1.1</version>

</dependency>


<dependency>

<groupId>com.google.code.gson</groupId>

<artifactId>gson</artifactId>

<version>2.8.5</version>

</dependency>


<dependency>

<groupId>com.github.stephenc.java-iso-tools</groupId>

<artifactId>iso9660-writer</artifactId>

<version>2.0.1</version>

</dependency>


<dependency>

<groupId>com.github.lookfirst</groupId>

<artifactId>sardine</artifactId>

<version>5.7</version>

</dependency>


<dependency>

<groupId>commons-vfs</groupId>

<artifactId>commons-vfs</artifactId>

<version>20050307052300</version>

</dependency>


<dependency>

<groupId>commons-net</groupId>

<artifactId>commons-net</artifactId>

<version>3.6</version>

</dependency>


<dependency>

<groupId>org.apache.commons</groupId>

<artifactId>commons-vfs2</artifactId>

<version>2.2</version>

</dependency>


<dependency>

<groupId>org.apache.commons</groupId>

<artifactId>commons-csv</artifactId>

<version>1.5</version>

</dependency>


<dependency>

<groupId>com.michaelbaranov</groupId>

<artifactId>microba</artifactId>

<version>0.4.4.3</version>

</dependency>


<dependency>

<groupId>mysql</groupId>

<artifactId>mysql-connector-java</artifactId>

<version>5.1.14</version>

</dependency>


<dependency>

<groupId>net.sf.packtag</groupId>

<artifactId>packtag-core</artifactId>

<version>3.8</version>

</dependency>

<dependency>
<groupId>com.vnetpublishing.java</groupId>
<artifactId>super-user-application</artifactId>
<version>0.0.5</version>
</dependency>

<dependency>
<groupId>net.imagej</groupId>
<artifactId>ij</artifactId>
<version>1.51s</version>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-io</artifactId>
<version>1.3.2</version>
</dependency>

<dependency>
<groupId>com.github.stephenc.java-iso-tools</groupId>
<artifactId>sabre</artifactId>
<version>2.0.1</version>
</dependency>

<dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
<version>1.1</version>
</dependency>

<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.5</version>
</dependency>

<dependency>
<groupId>com.github.stephenc.java-iso-tools</groupId>
<artifactId>iso9660-writer</artifactId>
<version>2.0.1</version>
</dependency>

<dependency>
<groupId>com.github.lookfirst</groupId>
<artifactId>sardine</artifactId>
<version>5.7</version>
</dependency>

<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
<version>3.6</version>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-vfs2</artifactId>
<version>2.2</version>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-csv</artifactId>
<version>1.5</version>
</dependency>

<dependency>
<groupId>com.michaelbaranov</groupId>
<artifactId>microba</artifactId>
<version>0.4.4.3</version>
</dependency>

<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.14</version>
</dependency>

<dependency>
<groupId>net.sf.packtag</groupId>
<artifactId>packtag-core</artifactId>
<version>3.8</version>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.8.1</version>
</dependency>

</dependencies>

</project>
2 changes: 1 addition & 1 deletion src/Orthanc_Standalone/Orthanc.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
// folders, in which case they will be scanned non-recursively to
// find shared libraries. Backslashes must be either escaped by
// doubling them, or replaced by forward slashes "/".
"Plugins" : [
"Plugins" : ["./"
],

// Maximum number of processing jobs that are simultaneously running
Expand Down
40 changes: 40 additions & 0 deletions src/Run_Pet_Ct.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@


import java.util.ArrayList;

import ij.IJ;
import ij.ImageJ;
import ij.ImagePlus;

public class Run_Pet_Ct {


public Run_Pet_Ct(ArrayList<ImagePlus> imagePlusList) {
String seriesUIDs = ChoosePetCt.buildSeriesUIDs(imagePlusList);
if( seriesUIDs == null) return;
if( seriesUIDs.startsWith("2CTs")) seriesUIDs = "";
IJ.runPlugIn("Pet_Ct_Viewer", seriesUIDs);
wait4bkgd();
}

private void wait4bkgd() {
Integer i = 0, j;
while( ChoosePetCt.loadingData == 1 || ChoosePetCt.loadingData == 3) {
mySleep(200);
i++;
if( (i % 20) == 0 && ChoosePetCt.loadingData == 1) {
ImageJ ij = IJ.getInstance();
if( ij != null) ij.toFront();
j = i/5;
IJ.showStatus("Loading data, please wait " + j.toString());
}
}
}

private void mySleep(int msec) {
try {
Thread.sleep(msec);
} catch (Exception e) { e.printStackTrace();}
}

}
Loading

0 comments on commit 4004333

Please sign in to comment.