xavi
/
speed-dreams
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

trackeditor: fix pasting graphic objects 

git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@9244 30fe4595-0a0c-4342-8851-515496e4dcbd
This commit is contained in:
iobyte 2024-01-13 21:59:02 +00:00
parent 3b40c6c2f4
commit 4a1a13eef1
2 changed files with 41 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/tools/trackeditor/gui/view/CircuitView.java
View File

@ -3407,25 +3407,51 @@ public class CircuitView extends JComponent implements KeyListener, MouseListene
}
}
if (me.isControlDown() && editorFrame.getCurrentObjectMap() != -1 && editorFrame.getCurrentObjectColor() != 0)
if (me.isControlDown() && editorFrame.getCurrentObjectColor() != 0)
{
ObjectMap objectMap = editorFrame.getObjectMaps().get(editorFrame.getCurrentObjectMap());
Point2D.Double real = new Point2D.Double();
screenToReal(me, real);
int imageXY[] = { 0, 0 };
realToImage(real, objectMap.getImageWidth(), objectMap.getImageHeight(), imageXY);
ObjShapeObject object = new ObjShapeObject(editorFrame.getObjectColorName(editorFrame.getCurrentObjectColor()), editorFrame.getCurrentObjectColor(), imageXY[0], imageXY[1]);
objectMap.addObject(object);
Undo.add(new UndoAddObject(objectMap, object));
editorFrame.setCurrentObjectColor(object.getRGB());
editorFrame.documentIsModified = true;
redrawCircuit();
return;
if (editorFrame.isCurrentObjectGraphic())
{
// TODO fix name
String name = editorFrame.getObjectColorName(editorFrame.getCurrentObjectColor()); // this is wrong
for (GraphicObject object : editorFrame.getGraphicObjects())
{
if (object.getName().equals(name))
{
name = new String(name + "-" + editorFrame.getGraphicObjects().size());
break;
}
}
GraphicObject object = new GraphicObject(name, editorFrame.getCurrentObjectColor(), real);
editorFrame.getGraphicObjects().add(object);
Undo.add(new UndoAddGraphicObject(editorFrame.getGraphicObjects(), object));
editorFrame.setCurrentObjectColor(object.getColor());
editorFrame.documentIsModified = true;
redrawCircuit();
return;
}
else if (editorFrame.getCurrentObjectMap() != -1)
{
ObjectMap objectMap = editorFrame.getObjectMaps().get(editorFrame.getCurrentObjectMap());
int imageXY[] = { 0, 0 };
realToImage(real, objectMap.getImageWidth(), objectMap.getImageHeight(), imageXY);
ObjShapeObject object = new ObjShapeObject(editorFrame.getObjectColorName(editorFrame.getCurrentObjectColor()), editorFrame.getCurrentObjectColor(), imageXY[0], imageXY[1]);
objectMap.addObject(object);
Undo.add(new UndoAddObject(objectMap, object));
editorFrame.setCurrentObjectColor(object.getRGB());
editorFrame.documentIsModified = true;
redrawCircuit();
return;
}
}
PasteAction pasteAction = new PasteAction("Paste Object", null, "Paste object.");
JPopupMenu menu = new JPopupMenu();

2
src/tools/trackeditor/utils/Properties.java
View File

@ -34,7 +34,7 @@ public class Properties
private static Properties instance = new Properties();
private Vector<ActionListener> propertiesListeners = new Vector<ActionListener>();
public final String title = "sd2-trackeditor";
public final String version = "1.3.35";
public final String version = "1.3.36";
private String path;
private double imageScale = 1;