|
@@ -39,7 +39,7 @@ public class TimePanel extends JPanel implements ActionListener{
|
|
private final JPanel timeBtnPanel = new JPanel();
|
|
private final JPanel timeBtnPanel = new JPanel();
|
|
private final JPanel iterationsPanel=new JPanel();
|
|
private final JPanel iterationsPanel=new JPanel();
|
|
private final JPanel timePanel=new JPanel();
|
|
private final JPanel timePanel=new JPanel();
|
|
- JSlider timeSlider = new JSlider() {//TODO:
|
|
|
|
|
|
+ JSlider timeSlider = new JSlider() {
|
|
/**
|
|
/**
|
|
*
|
|
*
|
|
*/
|
|
*/
|
|
@@ -277,7 +277,7 @@ public class TimePanel extends JPanel implements ActionListener{
|
|
iterationsPanel.add(iterationsLabel, BorderLayout.NORTH);
|
|
iterationsPanel.add(iterationsLabel, BorderLayout.NORTH);
|
|
iterationsField=new JTextField(6);//Considering hundreds of thousands in an extreme case
|
|
iterationsField=new JTextField(6);//Considering hundreds of thousands in an extreme case
|
|
iterationsField.setText(""+cont.getModel().getIterations());
|
|
iterationsField.setText(""+cont.getModel().getIterations());
|
|
- iterationsField.addActionListener(this);//TODO
|
|
|
|
|
|
+ iterationsField.addActionListener(this);
|
|
iterationsPanel.add(iterationsField);
|
|
iterationsPanel.add(iterationsField);
|
|
iterationsPanel.add(new JLabel(), BorderLayout.SOUTH);
|
|
iterationsPanel.add(new JLabel(), BorderLayout.SOUTH);
|
|
timePanel.setLayout(new BorderLayout());
|
|
timePanel.setLayout(new BorderLayout());
|
|
@@ -340,11 +340,11 @@ public class TimePanel extends JPanel implements ActionListener{
|
|
else resetField=false;
|
|
else resetField=false;
|
|
if(resetField)iterationsField.setText(""+iterations);
|
|
if(resetField)iterationsField.setText(""+iterations);
|
|
controller.getModel().setIterations(Integer.parseInt(iterationsField.getText()));
|
|
controller.getModel().setIterations(Integer.parseInt(iterationsField.getText()));
|
|
- timeSlider.setMaximum(controller.getModel().getIterations()-1);//TODO forgot this
|
|
|
|
|
|
+ timeSlider.setMaximum(controller.getModel().getIterations()-1);
|
|
timeSlider.setLabelTable(null);//Otherwise the ticks won't update
|
|
timeSlider.setLabelTable(null);//Otherwise the ticks won't update
|
|
timeSlider.setMajorTickSpacing((int)Math.ceil(((double)controller.getModel().getIterations())/20));
|
|
timeSlider.setMajorTickSpacing((int)Math.ceil(((double)controller.getModel().getIterations())/20));
|
|
- timeSlider.setMinorTickSpacing((int)Math.ceil(((double)controller.getModel().getIterations())/100));
|
|
|
|
- parentGUI.updateIterations();
|
|
|
|
|
|
+ timeSlider.setMinorTickSpacing((int)Math.ceil(((double)controller.getModel().getIterations())/100));//Even though the final mark can't actually be reached.
|
|
|
|
+ parentGUI.updateIterations();//First one in the chain
|
|
}catch(NumberFormatException e){
|
|
}catch(NumberFormatException e){
|
|
|
|
|
|
}
|
|
}
|