2 graph hinzugefügt

src/ui/view/StatisticPane.java

@@ -29,7 +29,8 @@ public class StatisticPane extends JPanel{
     private DefaultListModel listModel =  new DefaultListModel();
     private Model model;
     private Control controller;
-    private StatisticGraph statGraph;
+    //private StatisticGraph statGraph;
+    private JPanel statGraph;
     
     public StatisticPane(Model m, Control c){
     	model = m;
@@ -64,7 +65,8 @@ public class StatisticPane extends JPanel{
     	
     	JComboBox comboBox = new JComboBox();
     	
-    	statGraph = new StatisticGraph(model, controller);
+    	//statGraph = new StatisticGraph(model, controller);
+    	statGraph = new JPanel();
     	
     	JButton btnRefresh = new JButton("Refresh Tracked Objects");
     	btnRefresh.addActionListener(new ActionListener() {
@@ -76,76 +78,93 @@ public class StatisticPane extends JPanel{
     			}
     		}
     	});
+    	
+    	JPanel panel = new JPanel();
     	GroupLayout groupLayout = new GroupLayout(this);
     	groupLayout.setHorizontalGroup(
     		groupLayout.createParallelGroup(Alignment.LEADING)
     			.addGroup(groupLayout.createSequentialGroup()
     				.addContainerGap()
     				.addGroup(groupLayout.createParallelGroup(Alignment.LEADING)
+    					.addGroup(groupLayout.createSequentialGroup()
+    						.addComponent(listScrollPane, GroupLayout.PREFERRED_SIZE, 177, GroupLayout.PREFERRED_SIZE)
+    						.addGap(263))
+    					.addGroup(groupLayout.createSequentialGroup()
+    						.addComponent(lblObject, GroupLayout.PREFERRED_SIZE, 56, GroupLayout.PREFERRED_SIZE)
+    						.addContainerGap(384, Short.MAX_VALUE))
     					.addGroup(groupLayout.createSequentialGroup()
     						.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)
-    						.addComponent(statGraph, GroupLayout.PREFERRED_SIZE, 226, GroupLayout.PREFERRED_SIZE))
-    					.addGroup(groupLayout.createSequentialGroup()
-    						.addComponent(btnRefresh)
-    						.addContainerGap(369, Short.MAX_VALUE))))
+    										.addGap(10)
+    										.addGroup(groupLayout.createParallelGroup(Alignment.LEADING)
+    											.addGroup(groupLayout.createSequentialGroup()
+    												.addComponent(lblGraph, GroupLayout.PREFERRED_SIZE, 54, GroupLayout.PREFERRED_SIZE)
+    												.addPreferredGap(ComponentPlacement.RELATED)
+    												.addComponent(comboBox, 0, 127, Short.MAX_VALUE))
+    											.addComponent(checkBox_1, GroupLayout.PREFERRED_SIZE, 101, GroupLayout.PREFERRED_SIZE)
+    											.addComponent(checkBox, GroupLayout.PREFERRED_SIZE, 111, GroupLayout.PREFERRED_SIZE)
+    											.addGroup(groupLayout.createSequentialGroup()
+    												.addComponent(lblName)
+    												.addPreferredGap(ComponentPlacement.RELATED)
+    												.addComponent(lblNewLabel, GroupLayout.PREFERRED_SIZE, 107, GroupLayout.PREFERRED_SIZE))))
+    									.addGroup(groupLayout.createSequentialGroup()
+    										.addGap(10)
+    										.addGroup(groupLayout.createParallelGroup(Alignment.LEADING)
+    											.addComponent(chckbxNewCheckBox)
+    											.addComponent(chckbxNewCheckBox_1))
+    										.addGap(35)))
+    								.addPreferredGap(ComponentPlacement.RELATED, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+    							.addGroup(groupLayout.createSequentialGroup()
+    								.addComponent(lblOverallStatistics, GroupLayout.PREFERRED_SIZE, 126, GroupLayout.PREFERRED_SIZE)
+    								.addPreferredGap(ComponentPlacement.RELATED))
+    							.addGroup(groupLayout.createSequentialGroup()
+    								.addComponent(btnRefresh)
+    								.addGap(63)))
+    						.addPreferredGap(ComponentPlacement.RELATED)
+    						.addGroup(groupLayout.createParallelGroup(Alignment.LEADING)
+    							.addComponent(panel, GroupLayout.DEFAULT_SIZE, 226, Short.MAX_VALUE)
+    							.addComponent(statGraph, GroupLayout.PREFERRED_SIZE, 226, GroupLayout.PREFERRED_SIZE)))))
     	);
     	groupLayout.setVerticalGroup(
     		groupLayout.createParallelGroup(Alignment.LEADING)
     			.addGroup(groupLayout.createSequentialGroup()
     				.addGroup(groupLayout.createParallelGroup(Alignment.LEADING)
     					.addGroup(groupLayout.createSequentialGroup()
-    						.addGap(17)
-    						.addComponent(statGraph, GroupLayout.DEFAULT_SIZE, 156, Short.MAX_VALUE))
-    					.addGroup(groupLayout.createSequentialGroup()
-    						.addContainerGap()
+    						.addGap(63)
     						.addComponent(lblOverallStatistics)
     						.addPreferredGap(ComponentPlacement.UNRELATED)
     						.addComponent(chckbxNewCheckBox)
     						.addPreferredGap(ComponentPlacement.UNRELATED)
     						.addComponent(chckbxNewCheckBox_1)
-    						.addGap(18)
+    						.addGap(48)
     						.addComponent(lblObject)
     						.addPreferredGap(ComponentPlacement.UNRELATED)
     						.addGroup(groupLayout.createParallelGroup(Alignment.BASELINE)
-    							.addComponent(lblNewLabel)
-    							.addComponent(lblName))
+    							.addComponent(lblName)
+    							.addComponent(lblNewLabel)))
+    					.addGroup(groupLayout.createSequentialGroup()
+    						.addGap(17)
+    						.addComponent(statGraph, GroupLayout.PREFERRED_SIZE, 140, GroupLayout.PREFERRED_SIZE)))
+    				.addGroup(groupLayout.createParallelGroup(Alignment.LEADING)
+    					.addGroup(groupLayout.createSequentialGroup()
+    						.addGap(80)
+    						.addComponent(checkBox)
     						.addPreferredGap(ComponentPlacement.UNRELATED)
-    						.addComponent(checkBox)))
-    				.addPreferredGap(ComponentPlacement.UNRELATED)
-    				.addComponent(checkBox_1)
+    						.addComponent(checkBox_1))
+    					.addGroup(Alignment.TRAILING, groupLayout.createSequentialGroup()
+    						.addPreferredGap(ComponentPlacement.RELATED)
+    						.addComponent(panel, GroupLayout.PREFERRED_SIZE, 123, GroupLayout.PREFERRED_SIZE)))
     				.addPreferredGap(ComponentPlacement.UNRELATED)
     				.addGroup(groupLayout.createParallelGroup(Alignment.BASELINE)
     					.addComponent(lblGraph)
     					.addComponent(comboBox, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE))
-    				.addGap(28)
+    				.addGap(27)
     				.addComponent(btnRefresh)
     				.addPreferredGap(ComponentPlacement.RELATED)
-    				.addComponent(listScrollPane, GroupLayout.PREFERRED_SIZE, 177, GroupLayout.PREFERRED_SIZE)
-    				.addContainerGap(26, Short.MAX_VALUE))
+    				.addComponent(listScrollPane, GroupLayout.PREFERRED_SIZE, 206, GroupLayout.PREFERRED_SIZE)
+    				.addContainerGap(91, Short.MAX_VALUE))
     	);
     	setLayout(groupLayout);