export many layers
- remark : wrong merge code ( dverged on two latptops .. ) possible loss
This commit is contained in:
philippe lhardy
@@ -62,7 +62,7 @@ implements StatusListener
|
||||
Container con = this.getContentPane();
|
||||
JScrollPane scrollableMaze = new JScrollPane(maze);
|
||||
con.add(scrollableMaze, BorderLayout.CENTER);
|
||||
controler = new MazeControler(params);
|
||||
controler = new MazeControler(this,params);
|
||||
con.add(controler.getMoveControl(), BorderLayout.NORTH);
|
||||
con.add(controler.getGenerationControl(), BorderLayout.SOUTH);
|
||||
|
||||
@@ -294,430 +294,7 @@ implements StatusListener
|
||||
}
|
||||
|
||||
|
||||
private class MazeControler extends JPanel {
|
||||
/**
|
||||
*
|
||||
*/
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
private MazeSettings settings = null;
|
||||
|
||||
private void setMazeName(String pName) {
|
||||
MazeParamsFixed p = (MazeParamsFixed) params;
|
||||
p.setName(pName);
|
||||
}
|
||||
|
||||
private JMenu createLoadingMenu() {
|
||||
JMenu loadMenu = new JMenu(MazeDefault.labels.getString("load") );
|
||||
|
||||
final JTextField loadName = new JTextField("newlaby");
|
||||
|
||||
loadMenu.add(loadName);
|
||||
|
||||
Action loadRawAction = new AbstractAction() {
|
||||
public void actionPerformed(ActionEvent evt) {
|
||||
//
|
||||
addStatus("load raw");
|
||||
|
||||
String filename = loadName.getText();
|
||||
|
||||
if ((filename.length() > 0)) {
|
||||
setMazeName(filename);
|
||||
loadRaw();
|
||||
refresh();
|
||||
}
|
||||
|
||||
}
|
||||
};
|
||||
JButton loadRawButton = new JButton(MazeDefault.labels.getString("load" ) + " raw");
|
||||
loadRawButton.addActionListener(loadRawAction);
|
||||
loadMenu.add(loadRawButton);
|
||||
|
||||
Action loadImcAction = new AbstractAction() {
|
||||
public void actionPerformed(ActionEvent evt) {
|
||||
//
|
||||
addStatus("load Imc");
|
||||
|
||||
String filename = loadName.getText();
|
||||
|
||||
if ((filename.length() > 0)) {
|
||||
setMazeName(filename);
|
||||
loadImc(false);
|
||||
refresh();
|
||||
}
|
||||
|
||||
}
|
||||
};
|
||||
JButton loadImcButton = new JButton(MazeDefault.labels.getString("load" ) + " imc");
|
||||
loadImcButton.addActionListener(loadImcAction);
|
||||
|
||||
loadMenu.add(loadImcButton);
|
||||
|
||||
Action loadDrawingAction = new AbstractAction() {
|
||||
public void actionPerformed(ActionEvent evt) {
|
||||
//
|
||||
addStatus("load Drawing");
|
||||
|
||||
String filename = loadName.getText();
|
||||
|
||||
if ((filename.length() > 0)) {
|
||||
setMazeName(filename);
|
||||
loadDrawing(false);
|
||||
refresh();
|
||||
}
|
||||
|
||||
}
|
||||
};
|
||||
JButton loadDrawingButton = new JButton(MazeDefault.labels.getString("load" ) + " Drawing");
|
||||
loadDrawingButton.addActionListener(loadDrawingAction);
|
||||
|
||||
loadMenu.add(loadDrawingButton);
|
||||
|
||||
Action loadOsmAction = new AbstractAction() {
|
||||
public void actionPerformed(ActionEvent evt) {
|
||||
//
|
||||
addStatus("load Osm");
|
||||
|
||||
String filename = loadName.getText();
|
||||
|
||||
if ((filename.length() > 0)) {
|
||||
setMazeName(filename);
|
||||
// UTM 32T ? approx (long,lat) to meter
|
||||
loadOsm(false, 78000,78000);
|
||||
refresh();
|
||||
}
|
||||
|
||||
}
|
||||
};
|
||||
loadMenu.add(newLoadButton("osm", loadOsmAction));
|
||||
|
||||
loadMenu.add(newLoadButton("we",
|
||||
new AbstractAction() {
|
||||
public void actionPerformed(ActionEvent evt) {
|
||||
//
|
||||
addStatus("load WoldEdit");
|
||||
|
||||
String filename = loadName.getText();
|
||||
|
||||
if ((filename.length() > 0)) {
|
||||
setMazeName(filename);
|
||||
loadWorldEdit(false);
|
||||
refresh();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
));
|
||||
return loadMenu;
|
||||
}
|
||||
|
||||
private JMenu createSavingMenu() {
|
||||
final JTextField saveName = new JTextField("newlaby");
|
||||
|
||||
final JButton savePngButton = newSaveButton( "png",
|
||||
new AbstractAction() {
|
||||
public void actionPerformed(ActionEvent evt) {
|
||||
//
|
||||
addStatus("save png");
|
||||
setMazeName(saveName.getText());
|
||||
savePng();
|
||||
}
|
||||
});
|
||||
|
||||
final JButton saveSvgButton = newSaveButton("svg",
|
||||
new AbstractAction() {
|
||||
public void actionPerformed(ActionEvent evt) {
|
||||
writeSentence("save svg");
|
||||
setMazeName(saveName.getText());
|
||||
saveSvg();
|
||||
}
|
||||
});
|
||||
|
||||
final JButton saveButton = newSaveButton("raw",
|
||||
new AbstractAction() {
|
||||
public void actionPerformed(ActionEvent evt) {
|
||||
setMazeName(saveName.getText());
|
||||
MazeParamsFixed p = (MazeParamsFixed) params;
|
||||
save(p, model);
|
||||
}
|
||||
});
|
||||
|
||||
Action saveImcAction = new AbstractAction() {
|
||||
public void actionPerformed(ActionEvent evt) {
|
||||
setMazeName(saveName.getText());
|
||||
saveImc();
|
||||
}
|
||||
};
|
||||
final JButton saveImcButton = newSaveButton("imc", saveImcAction);
|
||||
|
||||
Action saveStlAction = new AbstractAction() {
|
||||
public void actionPerformed(ActionEvent evt) {
|
||||
//
|
||||
setMazeName(saveName.getText());
|
||||
MazeParamsFixed p = (MazeParamsFixed) params;
|
||||
saveStl(p, model,stlsettings.createParams());
|
||||
}
|
||||
};
|
||||
final JButton saveStlButton = newSaveButton("stl", saveStlAction);
|
||||
|
||||
Action saveTextAction = new AbstractAction() {
|
||||
public void actionPerformed(ActionEvent evt) {
|
||||
//
|
||||
setMazeName(saveName.getText());
|
||||
saveText();
|
||||
}
|
||||
};
|
||||
final JButton saveTextButton = newSaveButton("txt", saveTextAction);
|
||||
|
||||
final JButton saveWorleEditButton = newSaveButton( "we",
|
||||
new AbstractAction() {
|
||||
public void actionPerformed(ActionEvent evt) {
|
||||
setMazeName(saveName.getText());
|
||||
saveWorldEdit();
|
||||
}
|
||||
});
|
||||
|
||||
stlsettings = new Maze3dSettings(new Maze3dParams());
|
||||
|
||||
JMenu saveMenu = new JMenu(MazeDefault.labels.getString("save") );
|
||||
saveMenu.add(saveName);
|
||||
saveMenu.add(saveSvgButton);
|
||||
saveMenu.add(savePngButton);
|
||||
saveMenu.add(saveButton);
|
||||
saveMenu.add(stlsettings);
|
||||
saveMenu.add(saveStlButton);
|
||||
saveMenu.add(saveImcButton);
|
||||
saveMenu.add(saveTextButton);
|
||||
saveMenu.add(saveWorleEditButton);
|
||||
|
||||
return saveMenu;
|
||||
|
||||
}
|
||||
|
||||
private JButton newActionButton(String actionName, String format, Action action) {
|
||||
final JButton saveTextButton = new JButton(MazeDefault.labels.getString(actionName) + " " + format);
|
||||
saveTextButton.addActionListener(action);
|
||||
return saveTextButton;
|
||||
}
|
||||
|
||||
private JButton newSaveButton(String format, Action action) {
|
||||
return newActionButton("save",format,action);
|
||||
}
|
||||
|
||||
private JButton newLoadButton(String format, Action action) {
|
||||
return newActionButton("load",format,action);
|
||||
}
|
||||
|
||||
private JPanel createResolveQuitBar() {
|
||||
JPanel resolveQuitBar = new JPanel(new FlowLayout());
|
||||
|
||||
JButton buttonCreate = new JButton(MazeDefault.labels.getString("create"));
|
||||
buttonCreate.addActionListener(new ActionListener() {
|
||||
public void actionPerformed(ActionEvent evt) {
|
||||
recreateModel();
|
||||
}
|
||||
});
|
||||
resolveQuitBar.add(buttonCreate);
|
||||
|
||||
JButton resolveButton = new JButton(MazeDefault.labels.getString("resolve"));
|
||||
resolveButton.addActionListener(new ActionListener() {
|
||||
public void actionPerformed(ActionEvent evt) {
|
||||
//
|
||||
addStatus("Resolving");
|
||||
resolve();
|
||||
}
|
||||
});
|
||||
|
||||
resolveQuitBar.add(resolveButton);
|
||||
|
||||
JButton reverseButton = new JButton(MazeDefault.labels.getString("reverse"));
|
||||
reverseButton.addActionListener(new ActionListener() {
|
||||
public void actionPerformed(ActionEvent evt) {
|
||||
//
|
||||
addStatus("Reversing");
|
||||
mGrow ^= reverse(mGrow);
|
||||
}
|
||||
});
|
||||
|
||||
resolveQuitBar.add(reverseButton);
|
||||
|
||||
|
||||
final JButton quitButton = new JButton(MazeDefault.labels.getString("quit"));
|
||||
Action quitAction = new AbstractAction() {
|
||||
public void actionPerformed(ActionEvent evt) {
|
||||
//
|
||||
addStatus("quit");
|
||||
System.exit(0);
|
||||
}
|
||||
};
|
||||
quitButton.addActionListener(quitAction);
|
||||
|
||||
resolveQuitBar.add(quitButton);
|
||||
|
||||
JButton buttonReset = new JButton("reset");//MazeDefault.labels.getString("reset"));
|
||||
buttonReset.addActionListener(new ActionListener() {
|
||||
public void actionPerformed(ActionEvent evt) {
|
||||
resetModel();
|
||||
}
|
||||
});
|
||||
resolveQuitBar.add(buttonReset);
|
||||
|
||||
return resolveQuitBar;
|
||||
|
||||
}
|
||||
|
||||
public MazeControler(MazeParams params) {
|
||||
// super(new BorderLayout());
|
||||
super();
|
||||
BoxLayout layout = new BoxLayout(this, BoxLayout.Y_AXIS);
|
||||
setLayout(layout);
|
||||
|
||||
JMenuBar menuBar = new JMenuBar();
|
||||
menuBar.add(createSavingMenu());
|
||||
menuBar.add(createLoadingMenu());
|
||||
add(menuBar);
|
||||
|
||||
add(createResolveQuitBar());
|
||||
|
||||
JPanel controlMovesPanel = new JPanel(new BorderLayout());
|
||||
settings = new MazeSettings(params);
|
||||
@SuppressWarnings("serial")
|
||||
Action goNorth = new AbstractAction() {
|
||||
public void actionPerformed(ActionEvent evt) {
|
||||
//
|
||||
addStatus("go North");
|
||||
goNorth();
|
||||
}
|
||||
};
|
||||
JButton north = addDirection(this, MazeDefault.labels.getString("north"), "UP", goNorth);
|
||||
|
||||
@SuppressWarnings("serial")
|
||||
Action goEast = new AbstractAction() {
|
||||
public void actionPerformed(ActionEvent evt) {
|
||||
//
|
||||
addStatus("go East");
|
||||
goEast();
|
||||
}
|
||||
};
|
||||
|
||||
JButton east = addDirection(this, MazeDefault.labels.getString("east"), "RIGHT", goEast);
|
||||
|
||||
@SuppressWarnings("serial")
|
||||
Action goWest = new AbstractAction() {
|
||||
public void actionPerformed(ActionEvent evt) {
|
||||
//
|
||||
addStatus("go West");
|
||||
goWest();
|
||||
}
|
||||
};
|
||||
JButton west = addDirection(this, MazeDefault.labels.getString("west"), "LEFT", goWest);
|
||||
|
||||
@SuppressWarnings("serial")
|
||||
Action goSouth = new AbstractAction() {
|
||||
public void actionPerformed(ActionEvent evt) {
|
||||
//
|
||||
addStatus("go South");
|
||||
goSouth();
|
||||
}
|
||||
};
|
||||
JButton south = addDirection(this, MazeDefault.labels.getString("south"), "DOWN", goSouth);
|
||||
|
||||
controlMovesPanel.add(north, BorderLayout.NORTH);
|
||||
controlMovesPanel.add(west, BorderLayout.WEST);
|
||||
controlMovesPanel.add(east, BorderLayout.EAST);
|
||||
controlMovesPanel.add(south, BorderLayout.SOUTH);
|
||||
|
||||
JPanel controlPanel = new JPanel();
|
||||
|
||||
controlPanel.add(controlMovesPanel,BorderLayout.LINE_START);
|
||||
statusField = new JTextField("",20);
|
||||
controlPanel.add(statusField, BorderLayout.CENTER);
|
||||
add(controlPanel, BorderLayout.NORTH);
|
||||
|
||||
// control display panel contains controls for display
|
||||
final JPanel controlDisplayPanel = new JPanel(new BorderLayout());
|
||||
|
||||
add(controlDisplayPanel);
|
||||
// zoom , autozoom control
|
||||
add(buildResizeControl());
|
||||
// layers control
|
||||
add(buildLayerControl());
|
||||
add(settings);
|
||||
|
||||
}
|
||||
|
||||
private JPanel buildResizeControl()
|
||||
{
|
||||
final JCheckBox showAll = new JCheckBox("show all");
|
||||
showAll.addChangeListener(new ChangeListener() {
|
||||
public void stateChanged(ChangeEvent e) {
|
||||
maze.setShowAll(showAll.isSelected());
|
||||
}
|
||||
});
|
||||
|
||||
final JSlider slider = new JSlider(2, 40);
|
||||
slider.addChangeListener(new ChangeListener() {
|
||||
public void stateChanged(ChangeEvent e) {
|
||||
setWallSize(slider.getValue());
|
||||
}
|
||||
});
|
||||
final JCheckBox autoSlide = new JCheckBox("autoslide");
|
||||
autoSlide.addChangeListener(new ChangeListener() {
|
||||
public void stateChanged(ChangeEvent e) {
|
||||
setAutoSize(autoSlide.isSelected());
|
||||
}
|
||||
});
|
||||
|
||||
JPanel resizecontrol = new JPanel(new FlowLayout());
|
||||
resizecontrol.add(showAll);
|
||||
resizecontrol.add(slider);
|
||||
resizecontrol.add(autoSlide);
|
||||
|
||||
return resizecontrol;
|
||||
|
||||
}
|
||||
|
||||
private JPanel buildLayerControl()
|
||||
{
|
||||
|
||||
int layers = 10;
|
||||
|
||||
final JTextField layersText = new JTextField("" + layers);
|
||||
|
||||
final JSlider layerSlide = new JSlider( JSlider.HORIZONTAL, 0,layers, 0);
|
||||
layerSlide.addChangeListener(new ChangeListener() {
|
||||
public void stateChanged(ChangeEvent e) {
|
||||
int r = setLayer(layerSlide.getValue());
|
||||
//layerSlide.setMaximum(r);
|
||||
}
|
||||
});
|
||||
layerSlide.setMajorTickSpacing(1);
|
||||
layerSlide.setPaintTicks(true);
|
||||
|
||||
JPanel layerControl = new JPanel(new FlowLayout());
|
||||
layerControl.add(new JLabel("layers"));
|
||||
layerControl.add(layersText);
|
||||
layerControl.add(layerSlide);
|
||||
|
||||
return layerControl;
|
||||
|
||||
}
|
||||
|
||||
private JPanel getMoveControl() {
|
||||
return this;
|
||||
}
|
||||
|
||||
private JPanel getGenerationControl() {
|
||||
return settings;
|
||||
}
|
||||
|
||||
public MazeSettings getSettings() {
|
||||
return settings;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private void loadRaw() {
|
||||
void loadRaw() {
|
||||
File infile = new File(params.getSaveDir(), params.getName() + ".raw");
|
||||
FileInputStream inputStream = null;
|
||||
try {
|
||||
@@ -743,7 +320,7 @@ implements StatusListener
|
||||
}
|
||||
}
|
||||
|
||||
private void loadOsm(boolean add, int mulx, int muly) {
|
||||
void loadOsm(boolean add, int mulx, int muly) {
|
||||
if ( maze != null ) {
|
||||
new Thread() {
|
||||
@Override
|
||||
@@ -777,7 +354,7 @@ implements StatusListener
|
||||
}
|
||||
}
|
||||
|
||||
private void loadImc(boolean add) {
|
||||
void loadImc(boolean add) {
|
||||
if ( maze != null ) {
|
||||
new Thread() {
|
||||
@Override
|
||||
@@ -811,7 +388,7 @@ implements StatusListener
|
||||
}
|
||||
}
|
||||
|
||||
private void loadDrawing(boolean add) {
|
||||
void loadDrawing(boolean add) {
|
||||
if ( maze != null ) {
|
||||
new Thread() {
|
||||
@Override
|
||||
@@ -845,7 +422,7 @@ implements StatusListener
|
||||
}
|
||||
}
|
||||
|
||||
private void loadWorldEdit(boolean add) {
|
||||
void loadWorldEdit(boolean add) {
|
||||
if ( maze != null ) {
|
||||
File infile = new File(params.getSaveDir(), params.getName() + ".we");
|
||||
FileInputStream inputStream = null;
|
||||
@@ -880,7 +457,7 @@ implements StatusListener
|
||||
}
|
||||
}
|
||||
|
||||
private JButton addDirection(final JPanel panel, final String direction, String key, Action goAction) {
|
||||
JButton addDirection(final JPanel panel, final String direction, String key, Action goAction) {
|
||||
String actionName = "go" + direction;
|
||||
JButton button = new JButton(direction);
|
||||
button.addActionListener(goAction);
|
||||
@@ -895,13 +472,13 @@ implements StatusListener
|
||||
Display display = new Display(model, W, H, params);
|
||||
}
|
||||
|
||||
private void saveWorldEdit() {
|
||||
void saveWorldEdit() {
|
||||
File outfile = getFileForExtension("we");
|
||||
if (!outfile.exists()) {
|
||||
addStatus("Saving we to " + outfile + " ...");
|
||||
try {
|
||||
FileOutputStream out = new FileOutputStream(outfile);
|
||||
new MazePersistWorldEdit(model).streamOut("we", out);
|
||||
new MazePersistWorldEdit(layers).streamOut("we", out);
|
||||
out.close();
|
||||
addStatus("... Done.");
|
||||
} catch (IOException io) {
|
||||
@@ -950,7 +527,7 @@ implements StatusListener
|
||||
}
|
||||
}
|
||||
|
||||
private int setLayer(int x)
|
||||
int setLayer(int x)
|
||||
{
|
||||
addStatus("set layer " + x);
|
||||
LabyModel layermodel = layers.getLayer(x);
|
||||
|
||||
Reference in New Issue
Block a user