Graph jz sichtbar im StatisticPanel

src/ui/controller/StatsController.java

@@ -25,9 +25,11 @@ public class StatsController {
 
 	public void addTrackingObj(HolonObject obj) {
 		model.getTrackingObj().add(obj);
+		/*
 		for(int i = 0; i < model.getTrackingObj().size(); i++){
 			System.out.println(model.getTrackingObj().get(i).getName() + " " + model.getTrackingObj().get(i).getID());
 		}
+		*/
 	}
 
 	public void removeTrackingObj(HolonObject obj) {

src/ui/view/StatisticPane.java

@@ -29,7 +29,7 @@ public class StatisticPane extends JPanel{
     private DefaultListModel listModel =  new DefaultListModel();
     private Model model;
     private Control controller;
-    private JPanel statGraph;
+    private StatisticGraph statGraph;
     
     public StatisticPane(Model m, Control c){
     	model = m;
@@ -64,11 +64,12 @@ public class StatisticPane extends JPanel{
     	
     	JComboBox comboBox = new JComboBox();
     	
-    	statGraph = new JPanel();
+    	statGraph = new StatisticGraph(model, controller);
     	
-    	JButton btnRefresh = new JButton("Refresh");
+    	JButton btnRefresh = new JButton("Refresh Tracked Objects");
     	btnRefresh.addActionListener(new ActionListener() {
     		public void actionPerformed(ActionEvent e) {
+    			listModel.removeAllElements();
     			for(int i = 0; i < controller.getTrackingObj().size(); i++){
     				listModel.addElement(controller.getTrackingObj().get(i).getName() +
     						controller.getTrackingObj().get(i).getID());
@@ -82,34 +83,35 @@ public class StatisticPane extends JPanel{
     				.addContainerGap()
     				.addGroup(groupLayout.createParallelGroup(Alignment.LEADING)
     					.addGroup(groupLayout.createSequentialGroup()
-    						.addGap(10)
-    						.addGroup(groupLayout.createParallelGroup(Alignment.LEADING)
-    							.addComponent(chckbxNewCheckBox_1)
-    							.addComponent(chckbxNewCheckBox)))
-    					.addComponent(lblObject, GroupLayout.PREFERRED_SIZE, 56, GroupLayout.PREFERRED_SIZE)
-    					.addGroup(groupLayout.createSequentialGroup()
-    						.addGap(10)
     						.addGroup(groupLayout.createParallelGroup(Alignment.LEADING)
     							.addGroup(groupLayout.createSequentialGroup()
-    								.addGap(4)
-    								.addComponent(lblName)
-    								.addPreferredGap(ComponentPlacement.RELATED)
-    								.addComponent(lblNewLabel, GroupLayout.PREFERRED_SIZE, 107, GroupLayout.PREFERRED_SIZE))
-    							.addComponent(checkBox_1, GroupLayout.PREFERRED_SIZE, 101, GroupLayout.PREFERRED_SIZE)
-    							.addGroup(groupLayout.createParallelGroup(Alignment.LEADING, false)
-    								.addGroup(groupLayout.createSequentialGroup()
-    									.addComponent(lblGraph, GroupLayout.PREFERRED_SIZE, 54, GroupLayout.PREFERRED_SIZE)
-    									.addPreferredGap(ComponentPlacement.RELATED)
-    									.addComponent(comboBox, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
-    								.addComponent(checkBox, GroupLayout.PREFERRED_SIZE, 111, GroupLayout.PREFERRED_SIZE))))
-    					.addComponent(lblOverallStatistics, GroupLayout.PREFERRED_SIZE, 126, GroupLayout.PREFERRED_SIZE)
-    					.addComponent(listScrollPane, GroupLayout.PREFERRED_SIZE, 177, GroupLayout.PREFERRED_SIZE))
-    				.addPreferredGap(ComponentPlacement.RELATED, 37, Short.MAX_VALUE)
-    				.addGroup(groupLayout.createParallelGroup(Alignment.LEADING, false)
+    								.addGap(10)
+    								.addGroup(groupLayout.createParallelGroup(Alignment.LEADING)
+    									.addComponent(chckbxNewCheckBox_1)
+    									.addComponent(chckbxNewCheckBox)))
+    							.addComponent(lblObject, GroupLayout.PREFERRED_SIZE, 56, GroupLayout.PREFERRED_SIZE)
+    							.addGroup(groupLayout.createSequentialGroup()
+    								.addGap(10)
+    								.addGroup(groupLayout.createParallelGroup(Alignment.LEADING)
+    									.addGroup(groupLayout.createSequentialGroup()
+    										.addGap(4)
+    										.addComponent(lblName)
+    										.addPreferredGap(ComponentPlacement.RELATED)
+    										.addComponent(lblNewLabel, GroupLayout.PREFERRED_SIZE, 107, GroupLayout.PREFERRED_SIZE))
+    									.addComponent(checkBox_1, GroupLayout.PREFERRED_SIZE, 101, GroupLayout.PREFERRED_SIZE)
+    									.addGroup(groupLayout.createParallelGroup(Alignment.LEADING, false)
+    										.addGroup(groupLayout.createSequentialGroup()
+    											.addComponent(lblGraph, GroupLayout.PREFERRED_SIZE, 54, GroupLayout.PREFERRED_SIZE)
+    											.addPreferredGap(ComponentPlacement.RELATED)
+    											.addComponent(comboBox, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+    										.addComponent(checkBox, GroupLayout.PREFERRED_SIZE, 111, GroupLayout.PREFERRED_SIZE))))
+    							.addComponent(lblOverallStatistics, GroupLayout.PREFERRED_SIZE, 126, GroupLayout.PREFERRED_SIZE)
+    							.addComponent(listScrollPane, GroupLayout.PREFERRED_SIZE, 177, GroupLayout.PREFERRED_SIZE))
+    						.addPreferredGap(ComponentPlacement.RELATED, 37, Short.MAX_VALUE)
+    						.addComponent(statGraph, GroupLayout.PREFERRED_SIZE, 226, GroupLayout.PREFERRED_SIZE))
     					.addGroup(groupLayout.createSequentialGroup()
     						.addComponent(btnRefresh)
-    						.addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
-    					.addComponent(statGraph, Alignment.TRAILING, GroupLayout.PREFERRED_SIZE, 226, GroupLayout.PREFERRED_SIZE)))
+    						.addContainerGap(369, Short.MAX_VALUE))))
     	);
     	groupLayout.setVerticalGroup(
     		groupLayout.createParallelGroup(Alignment.LEADING)
@@ -133,20 +135,17 @@ public class StatisticPane extends JPanel{
     							.addComponent(lblName))
     						.addPreferredGap(ComponentPlacement.UNRELATED)
     						.addComponent(checkBox)))
-    				.addGroup(groupLayout.createParallelGroup(Alignment.LEADING)
-    					.addGroup(groupLayout.createSequentialGroup()
-    						.addPreferredGap(ComponentPlacement.UNRELATED)
-    						.addComponent(checkBox_1)
-    						.addPreferredGap(ComponentPlacement.UNRELATED)
-    						.addGroup(groupLayout.createParallelGroup(Alignment.BASELINE)
-    							.addComponent(lblGraph)
-    							.addComponent(comboBox, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE))
-    						.addGap(57)
-    						.addComponent(listScrollPane, GroupLayout.PREFERRED_SIZE, 177, GroupLayout.PREFERRED_SIZE))
-    					.addGroup(groupLayout.createSequentialGroup()
-    						.addGap(125)
-    						.addComponent(btnRefresh)))
-    				.addContainerGap(25, Short.MAX_VALUE))
+    				.addPreferredGap(ComponentPlacement.UNRELATED)
+    				.addComponent(checkBox_1)
+    				.addPreferredGap(ComponentPlacement.UNRELATED)
+    				.addGroup(groupLayout.createParallelGroup(Alignment.BASELINE)
+    					.addComponent(lblGraph)
+    					.addComponent(comboBox, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE))
+    				.addGap(28)
+    				.addComponent(btnRefresh)
+    				.addPreferredGap(ComponentPlacement.RELATED)
+    				.addComponent(listScrollPane, GroupLayout.PREFERRED_SIZE, 177, GroupLayout.PREFERRED_SIZE)
+    				.addContainerGap(26, Short.MAX_VALUE))
     	);
     	setLayout(groupLayout);