Browse Source

Schönerer Slider

Kevin Trometer 8 years ago
parent
commit
e4846251d1
2 changed files with 10 additions and 3 deletions
  1. 1 1
      src/ui/view/GUI.java
  2. 9 2
      src/ui/view/TimePanel.java

+ 1 - 1
src/ui/view/GUI.java

@@ -310,7 +310,7 @@ public class GUI implements CategoryListener {
 						&& tempCpsObject.getID() != 0) {
 					addElementPopUp = new AddElementPopUp();
 					addElementPopUp.setVisible(true);
-					controller.addElementCanvasObject(tempCpsObject.getName(),
+					controller.addElementCanvasObject(tempCpsObject.getID(),
 							addElementPopUp.getElement().getEleName(), addElementPopUp.getElement().getAmount(),
 							addElementPopUp.getElement().getEnergy());
 				}

+ 9 - 2
src/ui/view/TimePanel.java

@@ -62,15 +62,19 @@ public class TimePanel extends JPanel {
 		timeSlider.setPaintTicks(true);
 		timeSlider.setPaintLabels(true);
 		timeSlider.setMinorTickSpacing(1);
+		timeSlider.setMajorTickSpacing(5);
 		timeSlider.setToolTipText("Time Slider");
-		timeSlider.setMinimum(1);
 		timeSlider.setMaximum(model.getIterations());
-		timeSlider.setValue(1);
+		timeSlider.setValue(0);
 		timeSlider.setBackground(Color.WHITE);
+
+		// Panel
+		timeBtnPanel.setBorder(null);
 		timeBtnPanel.setBackground(Color.WHITE);
 
 		// Buttons
 		timeBtnPanel.setLayout(new FlowLayout(FlowLayout.CENTER, 0, 0));
+		playBtn.setToolTipText("Play");
 
 		playBtn.setBackground(Color.WHITE);
 		playBtn.setBorderPainted(false);
@@ -92,6 +96,7 @@ public class TimePanel extends JPanel {
 				}
 			}
 		});
+		timeResetBtn.setToolTipText("Reset");
 
 		timeResetBtn.setBorderPainted(false);
 		timeResetBtn.setBackground(Color.WHITE);
@@ -103,6 +108,7 @@ public class TimePanel extends JPanel {
 				timeSlider.setValue(timeSlider.getMinimum());
 			}
 		});
+		timeForwardBtn.setToolTipText("Forward");
 
 		timeForwardBtn.setBorderPainted(false);
 		timeForwardBtn.setContentAreaFilled(false);
@@ -114,6 +120,7 @@ public class TimePanel extends JPanel {
 				timeSlider.setValue(timeSlider.getValue() + 1);
 			}
 		});
+		timeBackwardBtn.setToolTipText("Backward");
 
 		timeBackwardBtn.setBackground(Color.WHITE);
 		timeBackwardBtn.setBorderPainted(false);