Merge pull request #22 from salimkanoun/dev

Dev
salimkanoun · Oct 29, 2018 · 05ae366 · 05ae366
2 parents 3e2f352 + 8c9500d
commit 05ae366
Show file tree

Hide file tree

Showing 16 changed files with 435 additions and 307 deletions.
diff --git a/pom.xml b/pom.xml
@@ -352,6 +352,12 @@
 
 </dependency>
 
+<dependency>
+	<groupId>com.vnetpublishing.java</groupId>
+	<artifactId>super-user-application</artifactId>
+	<version>0.0.5</version>
+</dependency>
+
 </dependencies>
 
 </project>
diff --git a/src/org/petctviewer/orthanc/anonymize/CloseWindowAdapter.java b/src/org/petctviewer/orthanc/anonymize/CloseWindowAdapter.java
@@ -63,7 +63,6 @@ public void windowClosing(WindowEvent e) {
 	private void closeAll() {
 		if (monitoring.isRunningMonitoringService())  monitoring.closeAllMonitoringServices();
 		if(runOrthanc.getIsStarted()) {
-
 			runOrthanc.stopOrthanc();
 		}
 		frame.dispose();

diff --git a/src/org/petctviewer/orthanc/anonymize/QueryFillStore.java b/src/org/petctviewer/orthanc/anonymize/QueryFillStore.java
@@ -18,7 +18,6 @@
 package org.petctviewer.orthanc.anonymize;
 
 import java.io.IOException;
-import java.net.MalformedURLException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -47,7 +46,7 @@ public QueryFillStore(ParametreConnexionHttp connexion){
 	}
 
 	public QueryFillStore(ParametreConnexionHttp connexion, String level, String inputType, String input, 
-			String date, String studyDesc) throws MalformedURLException{
+			String date, String studyDesc) {
 
 		this.connexion=connexion;
 
@@ -126,7 +125,7 @@ public String getQuery(){
 		return this.query;
 	}
 
-	private String sendQuery(String action) throws IOException{
+	private String sendQuery(String action){
 		StringBuilder sb = new StringBuilder();
 
 		if(action.equals("storeIDs") && this.url.toString().contains("tools/find")){
@@ -140,7 +139,7 @@ private String sendQuery(String action) throws IOException{
 		return sb.toString();
 	}
 
-	private void storeIDs() throws IOException{
+	private void storeIDs(){
 
 		if(this.level.equals("series")){
 
@@ -188,9 +187,10 @@ public ArrayList<String> getIDs(){
 	}
 
 	// Renvoie les responses JSON par niveau de query
-	public List<JSONObject> getJsonResponse() throws IOException{
+	public List<JSONObject> getJsonResponse() {
 		ids.removeAll(ids);
 		this.storeIDs();
+
 		List<JSONObject> jsonResponses=new ArrayList<JSONObject>();
 
 		for(String id : ids){
@@ -237,7 +237,7 @@ public Object[] getAET() {
 			for (int i=0 ; i<aet.size(); i++){
 				indexes.add(aet.get(i).toString());
 			}
-		} catch (ParseException | IOException e) {e.printStackTrace();}
+		} catch (ParseException e) {e.printStackTrace();}
 
 		// We convert the ArrayList to an Object[]
 		return indexes.toArray();
@@ -266,7 +266,7 @@ public Object[] getPeers() {
 			for (int i=0 ; i<peers.size(); i++){
 				indexes.add(peers.get(i).toString());
 			}
-		} catch (ParseException | IOException e) {e.printStackTrace();}
+		} catch (ParseException e) {e.printStackTrace();}
 
 		// We convert the ArrayList to an Object[]
 		return indexes.toArray();

diff --git a/src/org/petctviewer/orthanc/anonymize/TableDataExportSeries.java b/src/org/petctviewer/orthanc/anonymize/TableDataExportSeries.java
@@ -19,7 +19,6 @@
 
 import java.io.IOException;
 import java.net.HttpURLConnection;
-import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -121,13 +120,7 @@ protected Void doInBackground() {
 			@Override
 			protected void done(){
 				clear();
-				try {
-					addSerie(studyID);
-				} catch (IOException e) {
-					e.printStackTrace();
-				} catch (ParseException e) {
-					e.printStackTrace();
-				}
+				addSerie(studyID);
 				stateExport.setText("<html><font color='green'>The description has been changed.</font></html>");
 				frame.pack();
 			}
@@ -142,7 +135,7 @@ public Serie getSerie(int rowIndex){
 		return this.series.get(rowIndex);
 	}
 
-	public boolean checkSopClassUid(String instanceUid) throws IOException{
+	public boolean checkSopClassUid(String instanceUid) {
 		if(instanceUid != null){
 			url="/instances/" + instanceUid + "/metadata/SopClassUid";
 			StringBuilder sb =connexionHttp.makeGetConnectionAndStringBuilder(url);
@@ -194,7 +187,7 @@ public ArrayList<Serie> getSeries(){
 		return this.series;
 	}
 
-	public void addSerie(String studyID) throws IOException, ParseException{
+	public void addSerie(String studyID) {
 		this.studyID = studyID;
 
 		QueryFillStore querySeries = new QueryFillStore(connexionHttp,"series", null, studyID, null, null);

diff --git a/src/org/petctviewer/orthanc/anonymize/TableDataSeries.java b/src/org/petctviewer/orthanc/anonymize/TableDataSeries.java
@@ -18,14 +18,9 @@
 package org.petctviewer.orthanc.anonymize;
 
 import java.io.IOException;
-//import java.net.HttpURLConnection;
-import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-//import javax.swing.SwingWorker;
 import javax.swing.table.AbstractTableModel;
 
 import org.json.simple.JSONArray;
@@ -42,12 +37,10 @@ public class TableDataSeries extends AbstractTableModel{
 	private String url;
 	private ParametreConnexionHttp connexionHttp;
 
-	public TableDataSeries(ParametreConnexionHttp connexionHttp, JLabel state, JFrame frame){
+	public TableDataSeries(ParametreConnexionHttp connexionHttp){
 		super();
 		//Recupere les settings
 		this.connexionHttp=connexionHttp;
-		//this.state = state;
-		//this.frame = frame;
 
 	}
 
@@ -145,7 +138,7 @@ public void removeSerie(int rowIndex){
 		fireTableRowsDeleted(rowIndex, rowIndex);
 	}
 
-	public void addSerie(String studyID) throws IOException, ParseException{
+	public void addSerie(String studyID) {
 		//this.studyID = studyID;
 		QueryFillStore querySeries = new QueryFillStore(connexionHttp,"series", null, studyID, null, null);
 		List<JSONObject> jsonResponsesPatient=querySeries.getJsonResponse();

diff --git a/src/org/petctviewer/orthanc/anonymize/TablePatientsMouseListener.java b/src/org/petctviewer/orthanc/anonymize/TablePatientsMouseListener.java
@@ -48,7 +48,7 @@ public void mouseClicked(MouseEvent event) {
 		this.modeleSeries.clear();
 
 		try {
-			if(this.modele.getRowCount() != 0){
+			if(this.modele.getRowCount() != 0 && tableau.getSelectedRow() != -1){
 				String patientName = (String)this.tableau.getValueAt(this.tableau.getSelectedRow(), 0);
 				String patientID = (String)this.tableau.getValueAt(this.tableau.getSelectedRow(), 1);
 				String patientUID = (String)this.tableau.getValueAt(this.tableau.getSelectedRow(), 2);

diff --git a/src/org/petctviewer/orthanc/anonymize/TableStudiesMouseListener.java b/src/org/petctviewer/orthanc/anonymize/TableStudiesMouseListener.java
@@ -19,8 +19,6 @@
 
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import java.io.IOException;
-
 import javax.swing.JFrame;
 import javax.swing.JTable;
 import javax.swing.ListSelectionModel;
@@ -50,9 +48,6 @@ public void mouseClicked(MouseEvent event) {
 				String studyID = (String)this.tableau.getValueAt(this.tableau.getSelectedRow(), 3);
 				this.modeleSeries.addSerie(studyID);
 			}
-		} catch (IOException e1) {
-			e1.printStackTrace();
-
 		} catch (Exception e1) {
 			//ignore
 		}