Split Display (gui) and Maze (work), prepare for another model
- prepare for a shorter storage model without any resolution
This commit is contained in:
philippe lhardy
@@ -1,70 +1,74 @@
|
||||
package org.artisanlogiciel.games.maze.gui;
|
||||
|
||||
import org.artisanlogiciel.games.maze.*;
|
||||
import org.artisanlogiciel.games.maze.LabyModel;
|
||||
import org.artisanlogiciel.games.maze.Maze;
|
||||
import org.artisanlogiciel.games.maze.MazeParams;
|
||||
import org.artisanlogiciel.games.maze.MazeParamsFixed;
|
||||
import org.artisanlogiciel.games.maze.persist.MazePersistRaw;
|
||||
import org.artisanlogiciel.games.maze.persist.MazePersistWorldEdit;
|
||||
import org.artisanlogiciel.games.maze.solve.SolvingModel;
|
||||
import org.artisanlogiciel.games.stl.Maze3dParams;
|
||||
import org.artisanlogiciel.games.stl.Wall3dStream;
|
||||
import org.artisanlogiciel.graphics.Drawing;
|
||||
import org.artisanlogiciel.graphics.SvgWriter;
|
||||
import org.artisanlogiciel.osm.OsmReader;
|
||||
import org.artisanlogiciel.osm.convert.OsmToDrawing;
|
||||
import org.artisanlogiciel.xpm.Xpm;
|
||||
|
||||
import javax.imageio.ImageIO;
|
||||
import javax.swing.*;
|
||||
import javax.swing.event.ChangeEvent;
|
||||
import javax.swing.event.ChangeListener;
|
||||
import java.awt.*;
|
||||
import java.awt.event.ActionEvent;
|
||||
import java.awt.event.ActionListener;
|
||||
import java.awt.event.ComponentAdapter;
|
||||
import java.awt.event.ComponentEvent;
|
||||
import java.awt.image.BufferedImage;
|
||||
import java.io.*;
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
import java.io.IOException;
|
||||
import java.util.Locale;
|
||||
|
||||
/**
|
||||
* Display is Main JFrame for this tool
|
||||
**/
|
||||
public class Display extends JFrame
|
||||
public class Display extends Maze
|
||||
implements StatusListener
|
||||
{
|
||||
// to please eclipse, not supposed to be serialized
|
||||
private static final long serialVersionUID = 8500214871372184418L;
|
||||
|
||||
|
||||
LabyLayers layers = new LabyLayers();
|
||||
int layer = 0;
|
||||
|
||||
MazeComponent maze;
|
||||
MazeControler controler;
|
||||
LabyModel model;
|
||||
|
||||
boolean autoSize;
|
||||
|
||||
public boolean isStatusEnable() {
|
||||
return statusEnable;
|
||||
}
|
||||
|
||||
public void setStatusEnable(boolean statusEnable) {
|
||||
this.statusEnable = statusEnable;
|
||||
}
|
||||
|
||||
public void addDrawing(Drawing drawing, boolean add)
|
||||
{
|
||||
if (maze != null)
|
||||
{
|
||||
maze.addDrawing(drawing,add);
|
||||
}
|
||||
}
|
||||
|
||||
boolean statusEnable = true;
|
||||
boolean mGrow = false;
|
||||
|
||||
MazeParams params = null;
|
||||
JTextField statusField = null;
|
||||
|
||||
Maze3dSettings stlsettings;
|
||||
|
||||
Display(LabyModel model, int W, int H, MazeParams params) {
|
||||
super(MazeDefault.labels.getString("title"));
|
||||
if (params != null) {
|
||||
// fixedParams = new MazeParamsFixed(params.getSaveDir(),params.getWidth(),params.getHeight(),params.getMaxDepth());
|
||||
this.params = params;
|
||||
}
|
||||
this.model = model;
|
||||
maze = createMazeComponent(model, W, H);
|
||||
MazeFrame mazeFrame;
|
||||
|
||||
Container con = this.getContentPane();
|
||||
JScrollPane scrollableMaze = new JScrollPane(maze);
|
||||
con.add(scrollableMaze, BorderLayout.CENTER);
|
||||
controler = new MazeControler(this,params);
|
||||
con.add(controler.getMoveControl(), BorderLayout.NORTH);
|
||||
con.add(controler.getGenerationControl(), BorderLayout.SOUTH);
|
||||
private class MazeFrame extends JFrame
|
||||
{
|
||||
MazeFrame(LabyModel model, int W, int H, MazeParams params) {
|
||||
super(MazeDefault.labels.getString("title"));
|
||||
maze = createMazeComponent(model, W, H);
|
||||
|
||||
Container con = this.getContentPane();
|
||||
JScrollPane scrollableMaze = new JScrollPane(maze);
|
||||
con.add(scrollableMaze, BorderLayout.CENTER);
|
||||
controler = new MazeControler(Display.this, params);
|
||||
con.add(controler.getMoveControl(), BorderLayout.NORTH);
|
||||
con.add(controler.getGenerationControl(), BorderLayout.SOUTH);
|
||||
|
||||
/*
|
||||
scrollableMaze.addComponentListener(new ComponentAdapter() {
|
||||
@@ -78,10 +82,22 @@ implements StatusListener
|
||||
*/
|
||||
|
||||
|
||||
model.setMazeListener(maze);
|
||||
setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
|
||||
setBounds(W, H, W, H);
|
||||
setVisible(true);
|
||||
model.setMazeListener(maze);
|
||||
setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
|
||||
setBounds(W, H, W, H);
|
||||
setVisible(true);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public Display(LabyModel model, int W, int H, MazeParams params)
|
||||
{
|
||||
super(model);
|
||||
mazeFrame = new MazeFrame(model,W,H,params);
|
||||
if (params != null) {
|
||||
// fixedParams = new MazeParamsFixed(params.getSaveDir(),params.getWidth(),params.getHeight(),params.getMaxDepth());
|
||||
this.params = params;
|
||||
}
|
||||
}
|
||||
|
||||
private MazeComponent createMazeComponent(LabyModel model, int W, int H) {
|
||||
@@ -120,12 +136,6 @@ implements StatusListener
|
||||
}
|
||||
}
|
||||
|
||||
void setModel( LabyModel model)
|
||||
{
|
||||
this.model = model;
|
||||
layers.addLabyModel(layer, model);
|
||||
}
|
||||
|
||||
void resetModel() {
|
||||
// recreate labyrinth
|
||||
if (params != null) {
|
||||
@@ -135,7 +145,8 @@ implements StatusListener
|
||||
}
|
||||
}
|
||||
|
||||
void refresh()
|
||||
@Override
|
||||
protected void refresh()
|
||||
{
|
||||
// reinit labyrinth view
|
||||
if (params != null) {
|
||||
@@ -195,97 +206,6 @@ implements StatusListener
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
// to allow to log / write somewher into screen...
|
||||
void writeSentence(String pSentence) {
|
||||
// TODO
|
||||
addStatus(pSentence);
|
||||
}
|
||||
|
||||
void writeError(String pError) {
|
||||
System.err.println(pError);
|
||||
}
|
||||
|
||||
public Drawing createDrawing() {
|
||||
return new DrawingGenerator(model).createDrawing();
|
||||
}
|
||||
|
||||
void saveImc() {
|
||||
Drawing d = createDrawing();
|
||||
|
||||
if (d != null) {
|
||||
File outfile = getFileForExtension("imc");
|
||||
writeSentence("Saving to " + outfile + " ...");
|
||||
try {
|
||||
DataOutputStream out = new DataOutputStream(new FileOutputStream(outfile));
|
||||
d.saveLinesKompressed(out);
|
||||
out.flush();
|
||||
out.close();
|
||||
writeSentence("... Done.");
|
||||
} catch (IOException io) {
|
||||
io.printStackTrace(System.err);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
File getFileForExtension(final String extension)
|
||||
{
|
||||
return new File(params.getSaveDir(), params.getName() + "." + extension);
|
||||
}
|
||||
|
||||
void saveSvg() {
|
||||
Drawing d = createDrawing();
|
||||
|
||||
if (d != null) {
|
||||
File outfile = getFileForExtension("svg");
|
||||
writeSentence("Saving to " + outfile + " ...");
|
||||
try {
|
||||
DataOutputStream out = new DataOutputStream(new FileOutputStream(outfile));
|
||||
SvgWriter writer = new SvgWriter(d.getInternLines());
|
||||
writer.writeTo(out);
|
||||
out.flush();
|
||||
out.close();
|
||||
writeSentence("... Done.");
|
||||
} catch (IOException io) {
|
||||
io.printStackTrace(System.err);
|
||||
}
|
||||
} else {
|
||||
writeError("drawing creation failed");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void savePng() {
|
||||
File file = getFileForExtension("png");
|
||||
// BufferedImage bi = new BufferedImage(this.getSize().width, this.getSize().height, BufferedImage.TYPE_INT_ARGB);
|
||||
BufferedImage bi = new BufferedImage(maze.getSize().width, maze.getSize().height, BufferedImage.TYPE_INT_ARGB);
|
||||
Graphics g = bi.createGraphics();
|
||||
// this.paint(g);
|
||||
maze.paint(g);
|
||||
g.dispose();
|
||||
try {
|
||||
ImageIO.write(bi, "png", file);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
void saveText() {
|
||||
File outfile = getFileForExtension("txt");
|
||||
writeSentence("Saving to " + outfile + " ...");
|
||||
try {
|
||||
DataOutputStream out = new DataOutputStream(new FileOutputStream(outfile));
|
||||
out.write(model.toLabyMap().toString().getBytes());
|
||||
out.flush();
|
||||
out.close();
|
||||
writeSentence("... Done.");
|
||||
} catch (IOException io) {
|
||||
io.printStackTrace(System.err);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public void addStatus(String pStatus)
|
||||
{
|
||||
if ( statusEnable ) {
|
||||
@@ -293,170 +213,6 @@ implements StatusListener
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void loadRaw() {
|
||||
File infile = new File(params.getSaveDir(), params.getName() + ".raw");
|
||||
FileInputStream inputStream = null;
|
||||
try {
|
||||
inputStream = new FileInputStream(infile);
|
||||
setModel(new MazePersistRaw().parseInputStream("raw",inputStream));
|
||||
} catch (IOException io) {
|
||||
io.printStackTrace(System.err);
|
||||
statusField.setText("[ERROR] Can't load " + infile.getAbsolutePath());
|
||||
}
|
||||
finally
|
||||
{
|
||||
if (inputStream != null )
|
||||
{
|
||||
// cleanup
|
||||
try {
|
||||
inputStream.close();
|
||||
}
|
||||
catch (Exception any)
|
||||
{
|
||||
// don't care really
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void loadOsm(boolean add, int mulx, int muly) {
|
||||
if ( maze != null ) {
|
||||
new Thread() {
|
||||
@Override
|
||||
public void run() {
|
||||
File infile = new File(params.getSaveDir(), params.getName() + ".osm");
|
||||
FileInputStream inputStream = null;
|
||||
try {
|
||||
// TODO really use InputStream and not pathname
|
||||
OsmReader reader = new OsmReader(infile.getCanonicalPath());
|
||||
reader.read();
|
||||
OsmToDrawing converter = new OsmToDrawing(reader, mulx,muly);
|
||||
Drawing drawing = converter.getDrawing(reader.getWays());
|
||||
statusEnable = false;
|
||||
maze.addDrawing(drawing,add);
|
||||
statusEnable = true;
|
||||
} catch (IOException io) {
|
||||
io.printStackTrace(System.err);
|
||||
statusField.setText("[ERROR] Can't load " + infile.getAbsolutePath());
|
||||
} finally {
|
||||
if (inputStream != null) {
|
||||
// cleanup
|
||||
try {
|
||||
inputStream.close();
|
||||
} catch (Exception any) {
|
||||
// don't care really
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}.start();
|
||||
}
|
||||
}
|
||||
|
||||
void loadImc(boolean add) {
|
||||
if ( maze != null ) {
|
||||
new Thread() {
|
||||
@Override
|
||||
public void run() {
|
||||
File infile = new File(params.getSaveDir(), params.getName() + ".imc");
|
||||
FileInputStream inputStream = null;
|
||||
try {
|
||||
inputStream = new FileInputStream(infile);
|
||||
// TODO
|
||||
// model = new MazePersistRaw().parseInputStream("raw",inputStream);
|
||||
Drawing drawing = new Drawing();
|
||||
drawing.loadLinesExpanded(new DataInputStream(inputStream));
|
||||
statusEnable = false;
|
||||
maze.addDrawing(drawing,add);
|
||||
statusEnable = true;
|
||||
} catch (IOException io) {
|
||||
io.printStackTrace(System.err);
|
||||
statusField.setText("[ERROR] Can't load " + infile.getAbsolutePath());
|
||||
} finally {
|
||||
if (inputStream != null) {
|
||||
// cleanup
|
||||
try {
|
||||
inputStream.close();
|
||||
} catch (Exception any) {
|
||||
// don't care really
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}.start();
|
||||
}
|
||||
}
|
||||
|
||||
void loadDrawing(boolean add) {
|
||||
if ( maze != null ) {
|
||||
new Thread() {
|
||||
@Override
|
||||
public void run() {
|
||||
File infile = new File(params.getSaveDir(), params.getName() + ".drawing");
|
||||
FileInputStream inputStream = null;
|
||||
try {
|
||||
inputStream = new FileInputStream(infile);
|
||||
// TODO
|
||||
// model = new MazePersistRaw().parseInputStream("raw",inputStream);
|
||||
Drawing drawing = new Drawing();
|
||||
drawing.loadLines(new DataInputStream(inputStream));
|
||||
statusEnable = false;
|
||||
maze.addDrawing(drawing,add);
|
||||
statusEnable = true;
|
||||
} catch (IOException io) {
|
||||
io.printStackTrace(System.err);
|
||||
statusField.setText("[ERROR] Can't load " + infile.getAbsolutePath());
|
||||
} finally {
|
||||
if (inputStream != null) {
|
||||
// cleanup
|
||||
try {
|
||||
inputStream.close();
|
||||
} catch (Exception any) {
|
||||
// don't care really
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}.start();
|
||||
}
|
||||
}
|
||||
|
||||
void loadWorldEdit(boolean add) {
|
||||
if ( maze != null ) {
|
||||
File infile = new File(params.getSaveDir(), params.getName() + ".we");
|
||||
FileInputStream inputStream = null;
|
||||
try {
|
||||
inputStream = new FileInputStream(infile);
|
||||
LabyLayers newLayers = new MazePersistWorldEdit().parseInputStream("we",inputStream);
|
||||
if ( ! newLayers.isEmpty()) {
|
||||
int l = layer;
|
||||
for (int i = newLayers.getMin(); i <= newLayers.getMax(); i++) {
|
||||
LabyModel m = newLayers.getLayer(i);
|
||||
if (m != null) {
|
||||
System.out.println("add layer " + l);
|
||||
layers.addLabyModel(l, m);
|
||||
l++;
|
||||
}
|
||||
}
|
||||
setModel(layers.getLayer(layer));
|
||||
}
|
||||
} catch (IOException io) {
|
||||
io.printStackTrace(System.err);
|
||||
statusField.setText("[ERROR] Can't load " + infile.getAbsolutePath());
|
||||
} finally {
|
||||
if (inputStream != null) {
|
||||
// cleanup
|
||||
try {
|
||||
inputStream.close();
|
||||
} catch (Exception any) {
|
||||
// don't care really
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
JButton addDirection(final JPanel panel, final String direction, String key, Action goAction) {
|
||||
String actionName = "go" + direction;
|
||||
JButton button = new JButton(direction);
|
||||
@@ -472,78 +228,23 @@ implements StatusListener
|
||||
Display display = new Display(model, W, H, params);
|
||||
}
|
||||
|
||||
void saveWorldEdit() {
|
||||
File outfile = getFileForExtension("we");
|
||||
if (!outfile.exists()) {
|
||||
addStatus("Saving we to " + outfile + " ...");
|
||||
try {
|
||||
FileOutputStream out = new FileOutputStream(outfile);
|
||||
new MazePersistWorldEdit(layers).streamOut("we", out);
|
||||
out.close();
|
||||
addStatus("... Done.");
|
||||
} catch (IOException io) {
|
||||
io.printStackTrace(System.err);
|
||||
}
|
||||
} else {
|
||||
addStatus("we file " + outfile + " already exists");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public void saveStl(MazeParamsFixed params, LabyModel model, Maze3dParams wallparams) {
|
||||
File outfile = getFileForExtension("stl");
|
||||
if (!outfile.exists()) {
|
||||
addStatus("Saving stl to " + outfile + " ...");
|
||||
try {
|
||||
FileOutputStream out = new FileOutputStream(outfile);
|
||||
new Wall3dStream(params.getName(), model, out, wallparams).stream();
|
||||
out.close();
|
||||
addStatus("... Done.");
|
||||
} catch (IOException io) {
|
||||
io.printStackTrace(System.err);
|
||||
}
|
||||
} else {
|
||||
addStatus("stl file " + outfile + " already exists");
|
||||
/**
|
||||
* Not part of generic Maze since using ImageIo and Graphics
|
||||
*/
|
||||
void savePng() {
|
||||
File file = getFileForExtension("png");
|
||||
// BufferedImage bi = new BufferedImage(this.getSize().width, this.getSize().height, BufferedImage.TYPE_INT_ARGB);
|
||||
BufferedImage bi = new BufferedImage(maze.getSize().width, maze.getSize().height, BufferedImage.TYPE_INT_ARGB);
|
||||
Graphics g = bi.createGraphics();
|
||||
// this.paint(g);
|
||||
maze.paint(g);
|
||||
g.dispose();
|
||||
try {
|
||||
ImageIO.write(bi, "png", file);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public void save(MazeParamsFixed params, LabyModel model) {
|
||||
File outfile = getFileForExtension("raw");
|
||||
if (!outfile.exists()) {
|
||||
addStatus("Saving to " + outfile + " ...");
|
||||
try {
|
||||
FileOutputStream out = new FileOutputStream(outfile);
|
||||
MazePersistRaw persist = new MazePersistRaw(model);
|
||||
persist.streamOut("raw", out);
|
||||
out.flush();
|
||||
out.close();
|
||||
addStatus("... Done.");
|
||||
} catch (IOException io) {
|
||||
io.printStackTrace(System.err);
|
||||
}
|
||||
} else {
|
||||
addStatus("" + outfile + " already exists");
|
||||
}
|
||||
}
|
||||
|
||||
int setLayer(int x)
|
||||
{
|
||||
addStatus("set layer " + x);
|
||||
LabyModel layermodel = layers.getLayer(x);
|
||||
if ( layermodel == null )
|
||||
{
|
||||
// clone it
|
||||
model = new LabyModel(model);
|
||||
layers.addLabyModel(x, model);
|
||||
}
|
||||
else
|
||||
{
|
||||
model = layermodel;
|
||||
}
|
||||
layer = x;
|
||||
refresh();
|
||||
return layer;
|
||||
}
|
||||
|
||||
public static void main(String pArgs[]) {
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package org.artisanlogiciel.games.maze.gui;
|
||||
|
||||
import org.artisanlogiciel.games.maze.*;
|
||||
import org.artisanlogiciel.games.maze.model.LabyModelProvider;
|
||||
import org.artisanlogiciel.games.maze.solve.DirectionPosition;
|
||||
import org.artisanlogiciel.games.maze.solve.MazeResolutionListener;
|
||||
import org.artisanlogiciel.graphics.Drawing;
|
||||
@@ -25,8 +26,7 @@ public class MazeComponent
|
||||
{
|
||||
private static final long serialVersionUID = 3163272907991176390L;
|
||||
|
||||
// WallsProvider map;
|
||||
LabyModel map;
|
||||
LabyModelProvider map;
|
||||
final MazeCellParameters cp;
|
||||
Position current = null;
|
||||
LinkedList<DirectionPosition> solvedPath = null;
|
||||
|
||||
@@ -24,7 +24,7 @@ public class MazeControler extends JPanel {
|
||||
|
||||
|
||||
private void setMazeName(String pName) {
|
||||
MazeParamsFixed p = (MazeParamsFixed) display.params;
|
||||
MazeParamsFixed p = (MazeParamsFixed) display.getParams();
|
||||
p.setName(pName);
|
||||
}
|
||||
|
||||
@@ -158,8 +158,8 @@ public class MazeControler extends JPanel {
|
||||
new AbstractAction() {
|
||||
public void actionPerformed(ActionEvent evt) {
|
||||
setMazeName(saveName.getText());
|
||||
MazeParamsFixed p = (MazeParamsFixed) display.params;
|
||||
display.save(p, display.model);
|
||||
MazeParamsFixed p = (MazeParamsFixed) display.getParams();
|
||||
display.saveRaw(p);
|
||||
}
|
||||
});
|
||||
|
||||
@@ -175,8 +175,8 @@ public class MazeControler extends JPanel {
|
||||
public void actionPerformed(ActionEvent evt) {
|
||||
//
|
||||
setMazeName(saveName.getText());
|
||||
MazeParamsFixed p = (MazeParamsFixed) display.params;
|
||||
display.saveStl(p, display.model, display.stlsettings.createParams());
|
||||
MazeParamsFixed p = (MazeParamsFixed) display.getParams();
|
||||
display.saveStl(p, display.stlsettings.createParams());
|
||||
}
|
||||
};
|
||||
final JButton saveStlButton = newSaveButton("stl", saveStlAction);
|
||||
|
||||
Reference in New Issue
Block a user