diff --git a/java/org/artisanlogiciel/games/Display.java b/java/org/artisanlogiciel/games/Display.java index 722c7bd..592f838 100644 --- a/java/org/artisanlogiciel/games/Display.java +++ b/java/org/artisanlogiciel/games/Display.java @@ -26,9 +26,11 @@ import javax.swing.JButton; import javax.swing.JComponent; import javax.swing.JCheckBox; import javax.swing.JFrame; +import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JSlider; +import javax.swing.JTextField; import javax.swing.KeyStroke; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; @@ -161,10 +163,17 @@ public class Display extends JFrame private class MazeSettings extends JPanel { + MazeParamsFixed params; + + JTextField textWidth = null; + JTextField textHeight = null; + JTextField textDepth = null; + // TODO set width and height and depth of maze with gui public MazeSettings() { super(); + params = new MazeParamsFixed(); createSettingsGui(); } @@ -178,11 +187,24 @@ public class Display extends JFrame recreateModel(); } }); - add(buttonCreate,BorderLayout.CENTER); + add(buttonCreate); + JLabel widthLabel = new JLabel("width"); + textWidth = new JTextField("010"); + add(widthLabel); + add(textWidth); + JLabel heightLabel = new JLabel("height"); + textHeight = new JTextField("010"); + add(heightLabel); + add(textHeight); + JLabel depthLabel = new JLabel("depth"); + textDepth = new JTextField("015"); + add(depthLabel); + add(textDepth); } - - } + + + } private class MazeParamsFixed implements MazeParams { @@ -192,15 +214,24 @@ public class Display extends JFrame File labdir; String name; - public MazeParamsFixed(File saveDir, int W, int H, int MD) + public MazeParamsFixed() + { + } + + public void setParams(File saveDir, int W, int H, int MD) { - name = null; labdir = saveDir; width=W; height=H; maxdepth=MD; } + public MazeParamsFixed(File saveDir, int W, int H, int MD) + { + name = null; + setParams(saveDir,W,H,MD); + } + public int getWidth() { return width; @@ -475,7 +506,6 @@ public class Display extends JFrame private static class MazeComponent extends JComponent implements MazeCreationListener, MazeResolutionListener { private static final long serialVersionUID = 3163272907991176390L; - WallsProvider map; final MazeCellParameters cp;