|
@@ -23,6 +23,10 @@ public class TimePanel extends JPanel implements ActionListener{
|
|
|
|
|
|
private static final long serialVersionUID = 1L;
|
|
private static final long serialVersionUID = 1L;
|
|
private static final int MAX_ITERATIONS=100000;
|
|
private static final int MAX_ITERATIONS=100000;
|
|
|
|
+ /*
|
|
|
|
+ * variable for calculating the performance
|
|
|
|
+ */
|
|
|
|
+ //private long performanceTime;
|
|
final JButton playBtn = new JButton();
|
|
final JButton playBtn = new JButton();
|
|
final JButton timeResetBtn = new JButton();
|
|
final JButton timeResetBtn = new JButton();
|
|
final JButton timeForwardBtn = new JButton();
|
|
final JButton timeForwardBtn = new JButton();
|
|
@@ -95,6 +99,13 @@ public class TimePanel extends JPanel implements ActionListener{
|
|
controller.setCurIteration(timeSlider.getValue());
|
|
controller.setCurIteration(timeSlider.getValue());
|
|
timer.setDelay(model.getTimerSpeed());
|
|
timer.setDelay(model.getTimerSpeed());
|
|
if (timeSlider.getValue() >= model.getIterations() - 1) {
|
|
if (timeSlider.getValue() >= model.getIterations() - 1) {
|
|
|
|
+ /*/calc and print performance
|
|
|
|
+ performanceTime = System.nanoTime()-performanceTime;
|
|
|
|
+
|
|
|
|
+ System.out.println(performanceTime/1000000000 + " Sekunden "
|
|
|
|
+ + (performanceTime%1000000000)/1000000 + " Millisekunden "
|
|
|
|
+ + (performanceTime%1000000)/1000 + " Mikrosekunden ");
|
|
|
|
+ //*/
|
|
running = false;
|
|
running = false;
|
|
playBtn.setIcon(new ImageIcon(Util.loadImage(this, "/Button_Images/play.png", 30, 30, Image.SCALE_SMOOTH)));
|
|
playBtn.setIcon(new ImageIcon(Util.loadImage(this, "/Button_Images/play.png", 30, 30, Image.SCALE_SMOOTH)));
|
|
timer.stop();
|
|
timer.stop();
|
|
@@ -151,8 +162,19 @@ public class TimePanel extends JPanel implements ActionListener{
|
|
running = !running;
|
|
running = !running;
|
|
controller.setIsSimRunning(running);
|
|
controller.setIsSimRunning(running);
|
|
if (running) {
|
|
if (running) {
|
|
- timer.start();
|
|
|
|
timer.setDelay(model.getTimerSpeed());
|
|
timer.setDelay(model.getTimerSpeed());
|
|
|
|
+
|
|
|
|
+ /*
|
|
|
|
+ * start the Performance Test
|
|
|
|
+ * /
|
|
|
|
+ performanceTime = System.nanoTime();
|
|
|
|
+ timeSlider.setValue(0);
|
|
|
|
+ timer.setDelay(0);
|
|
|
|
+ speedSlider.setValue(10);
|
|
|
|
+ timeSlider.setValue(0);
|
|
|
|
+ //*/
|
|
|
|
+
|
|
|
|
+ timer.start();
|
|
playBtn.setIcon(new ImageIcon(Util.loadImage(this, "/Button_Images/pause.png", 30, 30, Image.SCALE_SMOOTH)));
|
|
playBtn.setIcon(new ImageIcon(Util.loadImage(this, "/Button_Images/pause.png", 30, 30, Image.SCALE_SMOOTH)));
|
|
} else {
|
|
} else {
|
|
timer.stop();
|
|
timer.stop();
|