#48 done

src/ui/controller/Control.java

@@ -966,5 +966,13 @@ public class Control {
 	public void setIsSimRunning(boolean isRunning) {
 		globalController.setIsSimRunning(isRunning);
 	}
+	
+	/**
+	 * Sets showConsoleLog.
+	 * @param showConsoleLog
+	 */
+	public void setShowConsoleLog(boolean showConsoleLog) {
+		globalController.setShowConsoleLog(showConsoleLog);
+	}
 
 }

src/ui/controller/GlobalController.java

@@ -156,4 +156,12 @@ public class GlobalController {
 			}
 		}
 	}
+	
+	/**
+	 * Sets showConsoleLog.
+	 * @param showConsoleLog
+	 */
+	public void setShowConsoleLog(boolean showConsoleLog) {
+		model.setShowConsoleLog(showConsoleLog);
+	}
 }

src/ui/model/Model.java

@@ -72,6 +72,8 @@ public class Model {
 	private int numberOfSaves = 35;
 	// if the simulation is running and has not been reseted
 	private boolean isSimRunning = false;
+	//if the console log of the program should be displayed
+	private boolean showConsoleLog = true;
 	/*
 	 * Array of all categories in the model. It is set by default with the
 	 * categories ENERGY, BUILDINGS and COMPONENTS
@@ -894,5 +896,20 @@ public class Model {
 	public void setIsSimRunning(boolean isRunning) {
 		isSimRunning = isRunning;
 	}
+	
+	/**
+	 * Returns showConsoleLog.
+	 */
+	public boolean getShowConsoleLog(){
+		return this.showConsoleLog;
+	}
+
+	/**
+	 * Sets showConsoleLog.
+	 * @param showConsoleLog
+	 */
+	public void setShowConsoleLog(boolean showConsoleLog) {
+		this.showConsoleLog = showConsoleLog;
+	}
 }
 

src/ui/view/GUI.java

@@ -32,6 +32,7 @@ import javax.swing.DefaultComboBoxModel;
 import javax.swing.ImageIcon;
 import javax.swing.InputMap;
 import javax.swing.JButton;
+import javax.swing.JCheckBox;
 import javax.swing.JComboBox;
 import javax.swing.JComponent;
 import javax.swing.JDialog;
@@ -109,7 +110,7 @@ public class GUI<E> implements CategoryListener {
 	private final JMenu mnNewMenuOptions = new JMenu("Options");
 	private final JMenu mnNewMenuView = new JMenu("View");
 	private final JMenu mnHelp = new JMenu("Help");
-	private final JMenu mnAlgorithm = new JMenu("Algorithm");
+	private JCheckBox consoleLogCheckBox = new JCheckBox("Show program console log");
 	private final JMenuItem mntmOpen = new JMenuItem("Open");
 	private final JMenuItem mntmNew = new JMenuItem("New");
 	private final JMenuItem mntmSave = new JMenuItem("Save");
@@ -701,7 +702,15 @@ public class GUI<E> implements CategoryListener {
 				tree.repaint();
 			}
 		});
-
+		mnNewMenuOptions.add(consoleLogCheckBox);
+		consoleLogCheckBox.setSelected(true);
+		consoleLogCheckBox.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent arg0) {
+				controller.setShowConsoleLog(consoleLogCheckBox.isSelected());
+			}
+		});
+		
 		menuBar.add(mnNewMenuView);
 
 		mnNewMenuView.add(mntmCanvasSize);

src/ui/view/MyCanvas.java

@@ -290,10 +290,12 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 							((HolonObject) o).updateTrackingInfo();
 						}
 					}
-					controller.addTextToConsole("Tracking: ", Color.BLACK, 12, false, false, false);
-					controller.addTextToConsole("" + o.getName(), Color.BLUE, 12, true, false, false);
-					controller.addTextToConsole(", ID:", Color.BLACK, 12, false, false, false);
-					controller.addTextToConsole("" + o.getId(), Color.RED, 12, true, false, true);
+					if (model.getShowConsoleLog()) {
+						controller.addTextToConsole("Tracking: ", Color.BLACK, 12, false, false, false);
+						controller.addTextToConsole("" + o.getName(), Color.BLUE, 12, true, false, false);
+						controller.addTextToConsole(", ID:", Color.BLACK, 12, false, false, false);
+						controller.addTextToConsole("" + o.getId(), Color.RED, 12, true, false, true);
+					}
 				}
 			}
 		});
@@ -321,10 +323,12 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 							((HolonObject) o).setTrackingProd(new float[100]);
 							((HolonObject) o).setTrackingCons(new float[100]);
 						}
-						controller.addTextToConsole("Untracking: ", Color.BLACK, 12, false, false, false);
-						controller.addTextToConsole("" + o.getName(), Color.BLUE, 12, true, false, false);
-						controller.addTextToConsole(", ID:", Color.BLACK, 12, false, false, false);
-						controller.addTextToConsole("" + o.getId(), Color.RED, 12, true, false, true);
+						if (model.getShowConsoleLog()) {
+							controller.addTextToConsole("Untracking: ", Color.BLACK, 12, false, false, false);
+							controller.addTextToConsole("" + o.getName(), Color.BLUE, 12, true, false, false);
+							controller.addTextToConsole(", ID:", Color.BLACK, 12, false, false, false);
+							controller.addTextToConsole("" + o.getId(), Color.RED, 12, true, false, true);
+						}
 					}
 				}
 			}
@@ -358,7 +362,7 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 							tabbedPane = (JTabbedPane) tempSplit.getLeftComponent();
 							tabbedPane2 = null;
 						}
-						//Look if the uppernode is open in a Tab
+						// Look if the uppernode is open in a Tab
 						for (int i = 4; i < tabbedPane.getTabCount(); i++) {
 							if (tabbedPane.getComponentAt(i) == null) {
 							} else if (((UpperNodeCanvas) ((JScrollPane) tabbedPane.getComponentAt(i)).getViewport()
@@ -373,8 +377,8 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 							if (tabbedPane2 != null
 									&& ((UpperNodeCanvas) ((JScrollPane) tabbedPane2.getSelectedComponent())
 											.getViewport().getComponent(0)).upperNode.getId() == cps.getId()) {
-								((ButtonTabComponent) tabbedPane
-										.getTabComponentAt(tabbedPane2.getSelectedIndex())).removeTabs();
+								((ButtonTabComponent) tabbedPane.getTabComponentAt(tabbedPane2.getSelectedIndex()))
+										.removeTabs();
 							}
 						} catch (Exception e2) {
 						}
@@ -457,7 +461,7 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 			}
 		}
 
-		//SubNet Coloring
+		// SubNet Coloring
 		int i = 0;
 		for (SubNet s : controller.getSimManager().getSubNets()) {
 
@@ -723,10 +727,12 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 			cy = cps.getPosition().y - controller.getScaleDiv2();
 			if (x - controller.getScale() <= cx && y - controller.getScale() <= cy && x >= cx && y >= cy) {
 				tempCps = cps;
-				controller.addTextToConsole("Selected: ", Color.BLACK, 12, false, false, false);
-				controller.addTextToConsole("" + cps.getName(), Color.BLUE, 12, true, false, false);
-				controller.addTextToConsole(", ID:", Color.BLACK, 12, false, false, false);
-				controller.addTextToConsole("" + cps.getId(), Color.RED, 12, true, false, true);
+				if (model.getShowConsoleLog()) {
+					controller.addTextToConsole("Selected: ", Color.BLACK, 12, false, false, false);
+					controller.addTextToConsole("" + cps.getName(), Color.BLUE, 12, true, false, false);
+					controller.addTextToConsole(", ID:", Color.BLACK, 12, false, false, false);
+					controller.addTextToConsole("" + cps.getId(), Color.RED, 12, true, false, true);
+				}
 				dragging = true;
 				if (e.isControlDown() && tempCps != null) {
 					if (model.getSelectedCpsObjects().contains(tempCps)) {

src/ui/view/UpperNodeCanvas.java

@@ -305,10 +305,12 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
 							controller.addTrackingObj((HolonObject) o);
 							((HolonObject) o).updateTrackingInfo();
 						}
-						controller.addTextToConsole("Tracking: ", Color.BLACK, 12, false, false, false);
-						controller.addTextToConsole("" + o.getName(), Color.BLUE, 12, true, false, false);
-						controller.addTextToConsole(", ID:", Color.BLACK, 12, false, false, false);
-						controller.addTextToConsole("" + o.getId(), Color.RED, 12, true, false, true);
+						if (model.getShowConsoleLog()) {
+							controller.addTextToConsole("Tracking: ", Color.BLACK, 12, false, false, false);
+							controller.addTextToConsole("" + o.getName(), Color.BLUE, 12, true, false, false);
+							controller.addTextToConsole(", ID:", Color.BLACK, 12, false, false, false);
+							controller.addTextToConsole("" + o.getId(), Color.RED, 12, true, false, true);
+						}
 					}
 				}
 			}
@@ -874,10 +876,12 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
 				cy = cps.getPosition().y - model.getScaleDiv2();
 				if (x - controller.getScale() <= cx && y - controller.getScale() <= cy && x >= cx && y >= cy) {
 					tempCps = cps;
-					controller.addTextToConsole("Selected: ", Color.BLACK, 12, false, false, false);
-					controller.addTextToConsole("" + cps.getName(), Color.BLUE, 12, true, false, false);
-					controller.addTextToConsole(", ID:", Color.BLACK, 12, false, false, false);
-					controller.addTextToConsole("" + cps.getId(), Color.RED, 12, true, false, true);
+					if (model.getShowConsoleLog()) {
+						controller.addTextToConsole("Selected: ", Color.BLACK, 12, false, false, false);
+						controller.addTextToConsole("" + cps.getName(), Color.BLUE, 12, true, false, false);
+						controller.addTextToConsole(", ID:", Color.BLACK, 12, false, false, false);
+						controller.addTextToConsole("" + cps.getId(), Color.RED, 12, true, false, true);
+					}
 					dragging = true;
 					if (e.isControlDown() && tempCps != null) {
 						if (model.getSelectedCpsObjects().contains(tempCps)) {
@@ -914,11 +918,13 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
 						&& x >= (upperNode.getLeftBorder() >> 1) - model.getScaleDiv2()
 						&& y >= (scalediv20 + 5 + (model.getScale() + scalediv20 + 10) * count)) {
 					tempCps = cps;
-					controller.addTextToConsole("Selected: ", Color.BLACK, 12, false, false, false);
-					controller.addTextToConsole("" + cps.getName(), Color.BLUE, 12, true, false, false);
-					controller.addTextToConsole(", ID:", Color.BLACK, 12, false, false, false);
-					controller.addTextToConsole("" + cps.getId(), Color.RED, 12, true, false, true);
-					controller.setSelectedObjectID(tempCps.getId());
+					if (model.getShowConsoleLog()) {
+						controller.addTextToConsole("Selected: ", Color.BLACK, 12, false, false, false);
+						controller.addTextToConsole("" + cps.getName(), Color.BLUE, 12, true, false, false);
+						controller.addTextToConsole(", ID:", Color.BLACK, 12, false, false, false);
+						controller.addTextToConsole("" + cps.getId(), Color.RED, 12, true, false, true);
+						controller.setSelectedObjectID(tempCps.getId());
+					}
 					// If drawing an Edge (CTRL down)
 					if (tempCps.getClass() == HolonObject.class) {
 						HolonObject tempObj = ((HolonObject) tempCps);