Merge pull request #28 from salimkanoun/dev

Dev
salimkanoun · Mar 25, 2019 · beaad53 · beaad53
2 parents 8504b74 + 01a9905
commit beaad53
Show file tree

Hide file tree

Showing 146 changed files with 10,731 additions and 11,612 deletions.
diff --git a/pom.xml b/pom.xml
@@ -203,12 +203,6 @@
 		<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>

diff --git a/src/Orthanc_Standalone/Orthanc-1.5.1-Release.exe b/src/Orthanc_Standalone/Orthanc-1.5.1-Release.exe
diff --git a/src/Orthanc_Standalone/Orthanc-1.5.1-ReleaseLinux b/src/Orthanc_Standalone/Orthanc-1.5.1-ReleaseLinux
diff --git a/src/Orthanc_Standalone/Orthanc-1.5.1-ReleaseMac b/src/Orthanc_Standalone/Orthanc-1.5.1-ReleaseMac
diff --git a/src/Orthanc_Standalone/Orthanc-1.5.1-Release_32.exe b/src/Orthanc_Standalone/Orthanc-1.5.1-Release_32.exe
diff --git a/src/Orthanc_Standalone/Orthanc-1.5.6-ReleaseLinux b/src/Orthanc_Standalone/Orthanc-1.5.6-ReleaseLinux
diff --git a/src/Orthanc_Standalone/Orthanc-1.5.6-ReleaseMac b/src/Orthanc_Standalone/Orthanc-1.5.6-ReleaseMac
diff --git a/src/Orthanc_Standalone/Orthanc-1.5.6-Release_32.exe b/src/Orthanc_Standalone/Orthanc-1.5.6-Release_32.exe
diff --git a/src/Orthanc_Standalone/OrthancTransfers.dll b/src/Orthanc_Standalone/OrthancTransfers.dll
diff --git a/src/Orthanc_Standalone/OrthancWebViewer-2.4_32.dll b/src/Orthanc_Standalone/OrthancWebViewer-2.4_32.dll
diff --git a/src/Orthanc_Standalone/OrthancWebViewer.dll b/src/Orthanc_Standalone/OrthancWebViewer.dll
diff --git a/src/Orthanc_Standalone/libOrthancTransfers.dylib b/src/Orthanc_Standalone/libOrthancTransfers.dylib
diff --git a/src/Orthanc_Standalone/libOrthancTransfers.so b/src/Orthanc_Standalone/libOrthancTransfers.so
diff --git a/src/Orthanc_Standalone/libOrthancWebViewer.so b/src/Orthanc_Standalone/libOrthancWebViewer.so
diff --git a/src/logos/chu.png b/src/logos/chu.png
diff --git a/src/logos/claudiusregaud.png b/src/logos/claudiusregaud.png
diff --git a/src/logos/iut.png b/src/logos/iut.png
diff --git a/src/logos/logo.png b/src/logos/logo.png
diff --git a/src/logos/orthanc-logo.png b/src/logos/orthanc-logo.png
diff --git a/src/org/petctviewer/orthanc/CTP/CTP.java b/src/org/petctviewer/orthanc/CTP/CTP.java
diff --git a/src/org/petctviewer/orthanc/Jsonsettings/Connection_Dialog.java b/src/org/petctviewer/orthanc/Jsonsettings/Connection_Dialog.java
@@ -1,6 +1,4 @@
 package org.petctviewer.orthanc.Jsonsettings;
-import java.awt.EventQueue;
-
 import javax.swing.JDialog;
 import javax.swing.JPanel;
 import java.awt.BorderLayout;
@@ -20,23 +18,6 @@ public class Connection_Dialog extends JDialog {
 	private String login;
 	private String password;
 
-	/**
-	 * Launch the application.
-	 */
-	public static void main(String[] args) {
-		EventQueue.invokeLater(new Runnable() {
-			public void run() {
-				try {
-					Connection_Dialog dialog = new Connection_Dialog();
-					dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
-					dialog.setVisible(true);
-				} catch (Exception e) {
-					e.printStackTrace();
-				}
-			}
-		});
-	}
-
 	/**
 	 * Create the dialog.
 	 */
@@ -99,13 +80,17 @@ public void actionPerformed(ActionEvent arg0) {
 		panel_2.add(lblEnterCorrectSettings);
 
 	}
-protected String getAddress(){
-	return address;
+
+	protected String getAddress(){
+		return address;
 	}
-protected String getLogin(){
-	return login;
+
+	protected String getLogin(){
+		return login;
 	}
-protected String getPassword(){
-	return password;
+
+	protected String getPassword(){
+		return password;
 	}
+
 }
diff --git a/src/org/petctviewer/orthanc/Jsonsettings/Content_Dialog.java b/src/org/petctviewer/orthanc/Jsonsettings/Content_Dialog.java
@@ -26,7 +26,8 @@
 import javax.swing.JTable;
 import javax.swing.table.DefaultTableModel;
 
-import org.json.simple.JSONArray;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
 
 import java.awt.event.ActionListener;
 import java.awt.event.ActionEvent;
@@ -38,19 +39,6 @@ public class Content_Dialog extends JDialog {
 	private JTable table;
 	private DefaultTableModel model;
 
-	/**
-	 * Launch the application.
-	 */
-	public static void main(String[] args) {
-		try {
-			Content_Dialog dialog = new Content_Dialog(new Json_Settings());
-			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
-			dialog.setVisible(true);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
 	/**
 	 * Create the dialog.
 	 */
@@ -71,7 +59,7 @@ public Content_Dialog(Json_Settings settings) {
 				settings.contentType.keySet().toArray(contentType);
 				for (int i=0 ; i<contentType.length;i++){
 					model.addRow(new Object[]{"Name", "0", "MIME"});
-					JSONArray content=settings.contentType.get(contentType[i]);
+					JsonArray content=settings.contentType.get(contentType[i]).getAsJsonArray();
 					table.setValueAt(contentType[i], i, 0);
 					table.setValueAt(Integer.valueOf(content.get(0).toString()), i, 1);
 					table.setValueAt(content.get(1).toString(), i, 2);
@@ -128,7 +116,7 @@ public void actionPerformed(ActionEvent e) {
 				okButton.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
 						//On vide les ancienne content
-						settings.contentType.clear();
+						settings.contentType=new JsonObject();
 						for (int i=0; i<table.getRowCount(); i++){
 							settings.addContentType(table.getValueAt(i, 0).toString(), Integer.valueOf(table.getValueAt(i, 1).toString()), table.getValueAt(i, 2).toString());
 						}

diff --git a/src/org/petctviewer/orthanc/Jsonsettings/DicomDialog.java b/src/org/petctviewer/orthanc/Jsonsettings/DicomDialog.java
@@ -26,26 +26,16 @@
 import javax.swing.JTable;
 import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableColumn;
+
+import com.google.gson.JsonObject;
+
 import javax.swing.JScrollPane;
 import java.awt.event.ActionListener;
 import java.awt.event.ActionEvent;
 
 @SuppressWarnings("serial")
 public class DicomDialog extends JDialog {
 	private JTable table;
-	/**
-	 * Launch the application.
-	 */
-	public static void main(String[] args) {
-		try {
-			DicomDialog dialog = new DicomDialog(new Json_Settings());
-			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
-			dialog.setAlwaysOnTop(true);
-			dialog.setVisible(true);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
 
 	/**
 	 * Create the dialog.
@@ -80,12 +70,12 @@ public DicomDialog(Json_Settings settings) {
 						model.addRow(new Object[]{"Name", "AET", "IP", "0", "GenericNoUniversalWildcard"});
 						//On recupere les variable des arrays de la Hasmap des dicomNode
 						table.setValueAt(aetDispo[i], i, 0);
-						table.setValueAt(settings.dicomNode.get(aetDispo[i]).get(0).toString(), i, 1);
-						table.setValueAt(settings.dicomNode.get(aetDispo[i]).get(1).toString(), i, 2);
-						table.setValueAt(settings.dicomNode.get(aetDispo[i]).get(2).toString(), i, 3);
+						table.setValueAt(settings.dicomNode.get(aetDispo[i]).getAsJsonArray().get(0).getAsString(), i, 1);
+						table.setValueAt(settings.dicomNode.get(aetDispo[i]).getAsJsonArray().get(1).getAsString(), i, 2);
+						table.setValueAt(settings.dicomNode.get(aetDispo[i]).getAsJsonArray().get(2).getAsString(), i, 3);
 						//Le manifacturer n'est pas obligatoire
-						if (settings.dicomNode.get(aetDispo[i]).size()==3) table.setValueAt("Generic", i, 4);
-						if (settings.dicomNode.get(aetDispo[i]).size()==4) table.setValueAt(settings.dicomNode.get(aetDispo[i]).get(3).toString(), i, 4);
+						if (settings.dicomNode.get(aetDispo[i]).getAsJsonArray().size()==3) table.setValueAt("Generic", i, 4);
+						if (settings.dicomNode.get(aetDispo[i]).getAsJsonArray().size()==4) table.setValueAt(settings.dicomNode.get(aetDispo[i]).getAsJsonArray().get(3).getAsString(), i, 4);
 					}
 
 
@@ -104,7 +94,7 @@ public DicomDialog(Json_Settings settings) {
 				okButton.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent arg0) {
 						//On vide l'ancienne variable des dicom node (pour effacer ceux qui aurait ete supprimee)
-						settings.dicomNode.clear();
+						settings.dicomNode=new JsonObject();
 						//On en construit une nouvelle à partir des valeurs du tableau
 						for (int i=0; i<table.getRowCount();i++)
 						{
@@ -157,7 +147,7 @@ public void actionPerformed(ActionEvent arg0) {
 				okButton.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
 						//On vide la liste des dicomnodes avant de la reconstruire
-						settings.dicomNode.clear();
+						settings.dicomNode=new JsonObject();
 						for (int i=0; i<table.getRowCount(); i++){
 							settings.addDicomNode(table.getValueAt(i, 0).toString(), table.getValueAt(i, 1).toString(), table.getValueAt(i, 2).toString(), Integer.valueOf(table.getValueAt(i, 3).toString()), table.getValueAt(i, 4).toString());
 						}