Merge pull request #31 from salimkanoun/dev

Dev
salimkanoun · May 17, 2019 · 4517056 · 4517056
2 parents 22f13fa + 33c7317
commit 4517056
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 5 deletions.
diff --git a/src/org/petctviewer/orthanc/OTP/OTP_Gui.java b/src/org/petctviewer/orthanc/OTP/OTP_Gui.java
@@ -139,7 +139,7 @@ public void itemStateChanged(ItemEvent arg0) {
 											//String investigatorName=patient.get("investigatorName").getAsString();
 											//String country=patient.get("country").getAsString();
 											//String centerNumber=patient.get("centerNumber").getAsString();
-											String acquisitionDate=(String) patient.get("acquisitionDate").toString().replaceAll("-", "/");
+											String acquisitionDate=patient.get("acquisitionDate").getAsString().replaceAll("-", "/");
 											modelTablePatient.addRow(new Object[]{numeroPatient, lastName, firstName, patientSex , patientDOB, acquisitionDate});
 											//SK MANQUE ACQUISITION DATE DANS L API
 										}

diff --git a/src/org/petctviewer/orthanc/OTP/standalone/Setup_OTP_Panel.java b/src/org/petctviewer/orthanc/OTP/standalone/Setup_OTP_Panel.java
@@ -0,0 +1,36 @@
+package org.petctviewer.orthanc.OTP.standalone;
+
+import java.awt.GridLayout;
+
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+
+public class Setup_OTP_Panel extends JPanel {
+
+	private static final long serialVersionUID = 1L;
+	JTextField proxyAdress;
+	JTextField proxyPort;
+
+	public Setup_OTP_Panel() {
+		super(new GridLayout());
+		proxyAdress=new JTextField("10.1.50.1");
+		proxyAdress.setColumns(20);
+		proxyPort=new JTextField("8080");
+		proxyPort.setColumns(4);
+		this.add(proxyAdress);
+		this.add(proxyPort);
+
+
+
+
+	}
+
+	public String getProxyAdress() {
+		return proxyAdress.getText();
+	}
+
+	public String getProxyPort() {
+		return proxyPort.getText();
+	}
+
+}
diff --git a/src/org/petctviewer/orthanc/OTP/standalone/Start_OTP_Import.java b/src/org/petctviewer/orthanc/OTP/standalone/Start_OTP_Import.java
@@ -5,6 +5,8 @@
 import java.util.prefs.Preferences;
 
 import javax.swing.JPanel;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
 
 import org.petctviewer.orthanc.anonymize.QueryOrthancData;
 import org.petctviewer.orthanc.anonymize.VueAnon;
@@ -49,6 +51,30 @@ public static void main(String[] args) {
 		anon.tabbedPane.add("Export Anonymized", p2);
 		anon.exportTabForOtp();
 
+		/*
+		 * SK A REFAIRE TESTER A ALINA
+		Setup_OTP_Panel otpPanel=new Setup_OTP_Panel();
+		anon.tabbedPane.add("Setup", otpPanel);
+		
+		anon.tabbedPane.addChangeListener(new ChangeListener() {
+
+			@Override
+			public void stateChanged(ChangeEvent e) {
+			     
+		    	 System.setProperty("http.proxyHost", otpPanel.getProxyAdress());
+			     System.setProperty("http.proxyPort", otpPanel.getProxyPort());
+			     System.setProperty("https.proxyHost",  otpPanel.getProxyAdress());
+			     System.setProperty("https.proxyPort", otpPanel.getProxyPort());
+
+				
+			}
+			
+		});
+		*/
+
+
+
+
 	}
 
 

diff --git a/src/org/petctviewer/orthanc/monitoring/cdburner/CD_Burner.java b/src/org/petctviewer/orthanc/monitoring/cdburner/CD_Burner.java
@@ -261,10 +261,9 @@ private void makeCDFromPatient(List<String> newStablePatientID) {
 			table_burning_history.setValueAt("Sent to Burner", rownumber, 5);
 
 
-			JButton button=(JButton) table_burning_history.getValueAt(rownumber, 6);
-			button.setText("Test Salim");
-			//table_burning_history.setValueAt(new Cancel_Cd_Button(requestFileName,(String) requestFileAndID[1],isPrimera), rownumber, 6);
-
+			//Add cancel Button
+			table_burning_history.setValueAt(requestFileAndID[1], rownumber, 7);
+			table_burning_history.setValueAt(requestFileName, rownumber, 8);
 
 			//On efface tout a la sortie JVM
 			recursiveDeleteOnExit(folder);