Add option in Timeline to set order of displayed PEs

This requires the user to provide a text file with one PE index on one line,
specifying the ordering of the PEs.

Change-Id: I16ada9bf2cdb628c0118faf0f8e84b750efc2d2f

Author: chin123

src/projections/Tools/Timeline/Data.java

@@ -395,7 +395,7 @@ private void storeRangeToPersistantStorage(){
 
 
 	/** Use the new set of PEs. The PEs will be stored internally in a Linked List */
-	public void setProcessorList(SortedSet<Integer> processorList){
+	public void setProcessorList(Collection<Integer> processorList){
 		peToLine.clear();
 
 		if(isSMPRun()){
@@ -428,16 +428,18 @@ public void setProcessorList(SortedSet<Integer> processorList){
 					if(curNID != prevNID){
 						//encounter a new set of PEs of a node, add the comm thd
 						//of the previous node
-						peToLine.add(prevCommPE);
-						commPEs.add(prevCommPE);
+						if (!commPEs.contains(prevCommPE)) {
+							peToLine.add(prevCommPE);
+							commPEs.add(prevCommPE);
+						}
 
 						prevNID = curNID;
 						prevCommPE = getCommThdPE(pe);
 					}
 					peToLine.add(pe);
 				}
 			}
-			if(!isLastAdded) peToLine.add(prevCommPE);
+			if(!commPEs.contains(prevCommPE) && !isLastAdded) peToLine.add(prevCommPE);
 		}else{
 			peToLine.addAll(processorList);
 		}		

src/projections/Tools/Timeline/WindowControls.java

@@ -9,8 +9,11 @@
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 import java.io.File;
+import java.io.FileReader;
 import java.net.URL;
 import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.Scanner;
 
 import javax.swing.ButtonGroup;
 import javax.swing.ImageIcon;
@@ -26,6 +29,7 @@
 import javax.swing.JRadioButtonMenuItem;
 import javax.swing.JTextField;
 import javax.swing.SwingWorker;
+import javax.swing.JFileChooser;
 
 import projections.gui.ChooseEntriesWindow;
 import projections.gui.FloatJTextField;
@@ -59,7 +63,7 @@ class WindowControls extends JPanel implements ActionListener,
 	// basic zoom controls
 	private JButton bDecrease, bIncrease, bReset;
 
-	private JButton bZoomSelected, bLoadSelected, bRanges;
+	private JButton bZoomSelected, bLoadSelected, bRanges, bOrder;
 
 	private JTextField highlightTime, selectionBeginTime, selectionEndTime,	selectionDiff;
 
@@ -114,7 +118,9 @@ class WindowControls extends JPanel implements ActionListener,
 	private JMenuItem mDisplayLegend;
 
 	private JMenuItem mDisplayTopTimesText;
-	
+
+	private JFileChooser chooseOrderfc;
+
 	protected WindowControls(TimelineWindow parentWindow_,
 			Data data_) {
 
@@ -132,7 +138,40 @@ protected WindowControls(TimelineWindow parentWindow_,
 		userEventWindow = new UserEventWindow(cbUserTable);
 
 	}
-	
+
+
+	protected void showOrderDialog() {
+		chooseOrderfc = new JFileChooser();
+		int returnVal = chooseOrderfc.showOpenDialog(parentWindow);
+		if(returnVal == JFileChooser.APPROVE_OPTION) {
+			String chosenFile = chooseOrderfc.getSelectedFile().getName();
+			String homeDir = System.getProperty("user.home");
+			String fullPath = String.join(File.separator, homeDir, chosenFile);
+
+			ArrayList<Integer> orderedList = readOrderFromFile(fullPath);
+			data.setProcessorList(orderedList);
+			parentWindow.refreshDisplay(true);
+			parentWindow.setVisible(true);
+		}
+
+	}
+
+	protected ArrayList<Integer> readOrderFromFile(String fileName) {
+		Scanner in = null;
+		try {
+			in = new Scanner(new FileReader(fileName));
+		} catch (java.io.FileNotFoundException ex) {
+			System.out.println("File not found: " + fileName);
+		}
+		ArrayList<Integer> orderedList = new ArrayList<Integer>();
+		String pe = null;
+
+		while (in.hasNextInt()) {
+			orderedList.add(in.nextInt());
+		}
+		in.close();
+		return orderedList;
+	}
 
 	protected void showDialog() {
 		if(dialog == null){
@@ -424,6 +463,10 @@ else if (c  == bRanges) {
 			showDialog();
 		}
 
+		else if (c  == bOrder) {
+			showOrderDialog();
+		}
+
 		else if (c  == bLoadSelected) {
 			loadSelected();
 			parentWindow.refreshDisplay(true);
@@ -743,6 +786,7 @@ private void CreateLayout() {
 		bZoomSelected = new JButton("Zoom Selection");
 		bLoadSelected = new JButton("Load Selection");
 		bRanges = new JButton("Load New Time/PE Range");
+		bOrder = new JButton("Set PE Order");
 
 		bZoomSelected.setEnabled(false);
 		bLoadSelected.setEnabled(false);
@@ -751,6 +795,7 @@ private void CreateLayout() {
 		bZoomSelected.addActionListener(this);
 		bLoadSelected.addActionListener(this);
 		bRanges.addActionListener(this);
+		bOrder.addActionListener(this);
 
 
 		highlightTime = new JTextField(" ");
@@ -774,6 +819,7 @@ private void CreateLayout() {
 		Util.gblAdd(zoomPanel, selectionEndTime,   gbc, 4, 2, 1, 1, 1, 1);
 		Util.gblAdd(zoomPanel, selectionDiff,      gbc, 5, 2, 1, 1, 1, 1);
 		Util.gblAdd(zoomPanel, bRanges,            gbc, 0, 1, 1, 1, 1, 1);
+		Util.gblAdd(zoomPanel, bOrder,             gbc, 1, 1, 1, 1, 1, 1);
 		Util.gblAdd(zoomPanel, new JLabel("Time At Mouse Cursor", JLabel.CENTER), gbc, 2, 1, 1, 1, 1, 1);
 		Util.gblAdd(zoomPanel, new JLabel("Selection Begin Time", JLabel.CENTER), gbc, 3, 1, 1, 1, 1, 1);
 		Util.gblAdd(zoomPanel, new JLabel("Selection End Time", JLabel.CENTER),	  gbc, 4, 1, 1, 1, 1, 1);