Compare commits
4 Commits
fix/issue-
...
nix-flake
| Author | SHA1 | Date | |
|---|---|---|---|
| b95f90b7ec | |||
| c55d862e14 | |||
| df29d4f1c3 | |||
| 25e086b62e |
54
README.md
Normal file
54
README.md
Normal file
@@ -0,0 +1,54 @@
|
|||||||
|
# new-shapes
|
||||||
|
|
||||||
|
A shape editor desktop application built with Java Swing. Supports rectangles, circles, triangles, text, shape collections, resize handles, and export to HTML/SVG.
|
||||||
|
|
||||||
|
## Prerequisites
|
||||||
|
|
||||||
|
- JDK >= 16 (project targets Java 16)
|
||||||
|
- A graphical display (X11/Wayland) since this is a Swing GUI application
|
||||||
|
|
||||||
|
## Bootstrap
|
||||||
|
|
||||||
|
### With Nix (recommended)
|
||||||
|
|
||||||
|
If you have [direnv](https://direnv.net/) installed, the environment activates automatically:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
direnv allow # one-time, then auto-activates on cd
|
||||||
|
```
|
||||||
|
|
||||||
|
Otherwise, enter the dev shell manually:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
nix develop
|
||||||
|
```
|
||||||
|
|
||||||
|
Both provide JDK 17 and Maven 3.9.x preconfigured. No other setup needed.
|
||||||
|
|
||||||
|
### Without Nix
|
||||||
|
|
||||||
|
Install JDK 16+ and use the bundled Maven wrapper — no separate Maven installation required:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
./mvnw --version # downloads Maven 3.9.12 on first run
|
||||||
|
```
|
||||||
|
|
||||||
|
## Run the application
|
||||||
|
|
||||||
|
```sh
|
||||||
|
./mvnw compile exec:java -Dexec.mainClass="ovh.gasser.newshapes.App"
|
||||||
|
```
|
||||||
|
|
||||||
|
## Run tests
|
||||||
|
|
||||||
|
```sh
|
||||||
|
./mvnw test
|
||||||
|
```
|
||||||
|
|
||||||
|
To run the full verification pipeline (compile, test, JaCoCo coverage check with 50% minimum line coverage):
|
||||||
|
|
||||||
|
```sh
|
||||||
|
./mvnw verify
|
||||||
|
```
|
||||||
|
|
||||||
|
Coverage reports are generated in `target/site/jacoco/`.
|
||||||
2
TODO.md
2
TODO.md
@@ -1,6 +1,6 @@
|
|||||||
# TODO
|
# TODO
|
||||||
|
|
||||||
- [X] Box selection (drag to select multiple shapes)
|
- [ ] Box selection (drag to select multiple shapes)
|
||||||
- [ ] Undo/redo stack
|
- [ ] Undo/redo stack
|
||||||
- [ ] Copy/paste functionality
|
- [ ] Copy/paste functionality
|
||||||
- [ ] Group/Ungroup shapes
|
- [ ] Group/Ungroup shapes
|
||||||
|
|||||||
27
flake.lock
generated
Normal file
27
flake.lock
generated
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
{
|
||||||
|
"nodes": {
|
||||||
|
"nixpkgs": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1774386573,
|
||||||
|
"narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=",
|
||||||
|
"owner": "nixos",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nixos",
|
||||||
|
"ref": "nixos-unstable",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"root": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": "nixpkgs"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"root": "root",
|
||||||
|
"version": 7
|
||||||
|
}
|
||||||
48
flake.nix
Normal file
48
flake.nix
Normal file
@@ -0,0 +1,48 @@
|
|||||||
|
{
|
||||||
|
description = "new-shapes - Java Swing shape editor";
|
||||||
|
|
||||||
|
inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||||
|
|
||||||
|
outputs = { self, nixpkgs }:
|
||||||
|
let
|
||||||
|
# JDK 16 (project target) is non-LTS and unavailable in nixpkgs.
|
||||||
|
# JDK 17 (LTS) is fully backward-compatible with --source 16 --target 16.
|
||||||
|
javaVersion = 17;
|
||||||
|
|
||||||
|
supportedSystems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
|
||||||
|
|
||||||
|
forEachSystem = f:
|
||||||
|
nixpkgs.lib.genAttrs supportedSystems (system: f {
|
||||||
|
pkgs = import nixpkgs {
|
||||||
|
inherit system;
|
||||||
|
overlays = [ self.overlays.default ];
|
||||||
|
};
|
||||||
|
});
|
||||||
|
in
|
||||||
|
{
|
||||||
|
overlays.default = final: prev:
|
||||||
|
let
|
||||||
|
jdk = prev."jdk${toString javaVersion}";
|
||||||
|
in
|
||||||
|
{
|
||||||
|
inherit jdk;
|
||||||
|
# Override Maven to use the same JDK version
|
||||||
|
maven = prev.maven.override { jdk_headless = jdk; };
|
||||||
|
};
|
||||||
|
|
||||||
|
devShells = forEachSystem ({ pkgs }: {
|
||||||
|
default = pkgs.mkShell {
|
||||||
|
packages = with pkgs; [
|
||||||
|
jdk
|
||||||
|
maven
|
||||||
|
];
|
||||||
|
|
||||||
|
shellHook = ''
|
||||||
|
echo "new-shapes dev shell"
|
||||||
|
echo " Java: $(java -version 2>&1 | head -1)"
|
||||||
|
echo " Maven: $(mvn -version 2>&1 | head -1)"
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
});
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -77,14 +77,6 @@ public abstract class AbstractShape implements Shape {
|
|||||||
return new Rectangle(this.bounds);
|
return new Rectangle(this.bounds);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setBounds(Rectangle newBounds) {
|
|
||||||
this.bounds.setBounds(newBounds);
|
|
||||||
onBoundsChanged();
|
|
||||||
}
|
|
||||||
|
|
||||||
protected void onBoundsChanged() {
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return String.format("x=%d, y=%d, width=%d, height=%d", bounds.x, bounds.y, bounds.width, bounds.height);
|
return String.format("x=%d, y=%d, width=%d, height=%d", bounds.x, bounds.y, bounds.width, bounds.height);
|
||||||
|
|||||||
@@ -53,14 +53,6 @@ public class SCircle extends AbstractShape {
|
|||||||
return radius;
|
return radius;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onBoundsChanged() {
|
|
||||||
int diameter = Math.max(bounds.width, bounds.height);
|
|
||||||
bounds.width = diameter;
|
|
||||||
bounds.height = diameter;
|
|
||||||
this.radius = diameter / 2;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static SCircle create(int x, int y, int radius) {
|
public static SCircle create(int x, int y, int radius) {
|
||||||
return create(x, y, radius, Color.BLACK);
|
return create(x, y, radius, Color.BLACK);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ import ovh.gasser.newshapes.attributes.ColorAttributes;
|
|||||||
import ovh.gasser.newshapes.attributes.SelectionAttributes;
|
import ovh.gasser.newshapes.attributes.SelectionAttributes;
|
||||||
import ovh.gasser.newshapes.util.Streamable;
|
import ovh.gasser.newshapes.util.Streamable;
|
||||||
|
|
||||||
|
import javax.swing.text.html.Option;
|
||||||
import java.awt.*;
|
import java.awt.*;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@@ -18,7 +19,6 @@ public class SCollection extends AbstractShape implements Streamable<Shape> {
|
|||||||
private final List<Shape> children;
|
private final List<Shape> children;
|
||||||
|
|
||||||
private SCollection(Shape... shapes) {
|
private SCollection(Shape... shapes) {
|
||||||
super(new Rectangle());
|
|
||||||
this.children = new ArrayList<>(List.of(shapes));
|
this.children = new ArrayList<>(List.of(shapes));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -57,29 +57,6 @@ public class SCollection extends AbstractShape implements Streamable<Shape> {
|
|||||||
children.forEach(s -> s.translate(dx, dy));
|
children.forEach(s -> s.translate(dx, dy));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void resize(ResizeHandle handle, int dx, int dy) {
|
|
||||||
if (children.isEmpty()) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
Rectangle currentBounds = getBounds();
|
|
||||||
Rectangle resizedBounds = resizeBounds(currentBounds, handle, dx, dy);
|
|
||||||
double scaleX = resizedBounds.width / (double) currentBounds.width;
|
|
||||||
double scaleY = resizedBounds.height / (double) currentBounds.height;
|
|
||||||
|
|
||||||
for (Shape child : children) {
|
|
||||||
Rectangle childBounds = child.getBounds();
|
|
||||||
Rectangle targetChildBounds = new Rectangle(
|
|
||||||
resizedBounds.x + (int) Math.round((childBounds.x - currentBounds.x) * scaleX),
|
|
||||||
resizedBounds.y + (int) Math.round((childBounds.y - currentBounds.y) * scaleY),
|
|
||||||
Math.max(1, (int) Math.round(childBounds.width * scaleX)),
|
|
||||||
Math.max(1, (int) Math.round(childBounds.height * scaleY))
|
|
||||||
);
|
|
||||||
resizeChild(child, targetChildBounds);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Iterator<Shape> iterator() {
|
public Iterator<Shape> iterator() {
|
||||||
return children.iterator();
|
return children.iterator();
|
||||||
@@ -94,45 +71,12 @@ public class SCollection extends AbstractShape implements Streamable<Shape> {
|
|||||||
children.add(s);
|
children.add(s);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void clear() {
|
|
||||||
children.clear();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void replaceWith(SCollection other) {
|
|
||||||
if (other == this) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
clear();
|
|
||||||
other.stream().forEach(children::add);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void add(int index, Shape s) {
|
|
||||||
children.add(index, s);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void insert(int index, Shape s) {
|
|
||||||
children.add(Math.max(0, Math.min(index, children.size())), s);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void remove(Shape s) {
|
public void remove(Shape s) {
|
||||||
if (!children.remove(s)) {
|
if (!children.remove(s)) {
|
||||||
logger.error("Unable to delete shape: {}", s);
|
logger.error("Unable to delete shape: {}", s);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public int indexOf(Shape s) {
|
|
||||||
return children.indexOf(s);
|
|
||||||
}
|
|
||||||
|
|
||||||
public int size() {
|
|
||||||
return children.size();
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean contains(Shape s) {
|
|
||||||
return children.contains(s);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Attributes getAttributes(String key) {
|
public Attributes getAttributes(String key) {
|
||||||
if (key.equals(ColorAttributes.ID)) {
|
if (key.equals(ColorAttributes.ID)) {
|
||||||
@@ -166,69 +110,4 @@ public class SCollection extends AbstractShape implements Streamable<Shape> {
|
|||||||
collection.addAttributes(new SelectionAttributes());
|
collection.addAttributes(new SelectionAttributes());
|
||||||
return collection;
|
return collection;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static Rectangle resizeBounds(Rectangle bounds, ResizeHandle handle, int dx, int dy) {
|
|
||||||
Rectangle resizedBounds = new Rectangle(bounds);
|
|
||||||
|
|
||||||
switch (handle) {
|
|
||||||
case E -> resizedBounds.width += dx;
|
|
||||||
case W -> {
|
|
||||||
resizedBounds.x += dx;
|
|
||||||
resizedBounds.width -= dx;
|
|
||||||
}
|
|
||||||
case S -> resizedBounds.height += dy;
|
|
||||||
case N -> {
|
|
||||||
resizedBounds.y += dy;
|
|
||||||
resizedBounds.height -= dy;
|
|
||||||
}
|
|
||||||
case SE -> {
|
|
||||||
resizedBounds.width += dx;
|
|
||||||
resizedBounds.height += dy;
|
|
||||||
}
|
|
||||||
case SW -> {
|
|
||||||
resizedBounds.x += dx;
|
|
||||||
resizedBounds.width -= dx;
|
|
||||||
resizedBounds.height += dy;
|
|
||||||
}
|
|
||||||
case NE -> {
|
|
||||||
resizedBounds.width += dx;
|
|
||||||
resizedBounds.y += dy;
|
|
||||||
resizedBounds.height -= dy;
|
|
||||||
}
|
|
||||||
case NW -> {
|
|
||||||
resizedBounds.x += dx;
|
|
||||||
resizedBounds.width -= dx;
|
|
||||||
resizedBounds.y += dy;
|
|
||||||
resizedBounds.height -= dy;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (resizedBounds.width < 1) {
|
|
||||||
resizedBounds.width = 1;
|
|
||||||
}
|
|
||||||
if (resizedBounds.height < 1) {
|
|
||||||
resizedBounds.height = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
return resizedBounds;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void resizeChild(Shape child, Rectangle targetChildBounds) {
|
|
||||||
if (child instanceof SCollection collection) {
|
|
||||||
Rectangle currentBounds = collection.getBounds();
|
|
||||||
collection.translate(targetChildBounds.x - currentBounds.x, targetChildBounds.y - currentBounds.y);
|
|
||||||
|
|
||||||
Rectangle translatedBounds = collection.getBounds();
|
|
||||||
collection.resize(
|
|
||||||
ResizeHandle.SE,
|
|
||||||
targetChildBounds.width - translatedBounds.width,
|
|
||||||
targetChildBounds.height - translatedBounds.height
|
|
||||||
);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (child instanceof AbstractShape abstractShape) {
|
|
||||||
abstractShape.setBounds(targetChildBounds);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -114,51 +114,6 @@ class SCollectionTest {
|
|||||||
assertEquals(30, bounds.y);
|
assertEquals(30, bounds.y);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
|
||||||
void testResizeEmptyCollectionIsNoOp() {
|
|
||||||
SCollection collection = SCollection.of();
|
|
||||||
|
|
||||||
assertDoesNotThrow(() -> collection.resize(ResizeHandle.SE, 25, 25));
|
|
||||||
assertEquals(new Rectangle(App.WIN_SIZE), collection.getBounds());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
void testResizeSingleChildResizesChildAndCollection() {
|
|
||||||
SRectangle rect = SRectangle.create(10, 20, 100, 50);
|
|
||||||
SCollection collection = SCollection.of(rect);
|
|
||||||
|
|
||||||
collection.resize(ResizeHandle.E, 20, 0);
|
|
||||||
|
|
||||||
assertEquals(new Rectangle(10, 20, 120, 50), rect.getBounds());
|
|
||||||
assertEquals(new Rectangle(10, 20, 120, 50), collection.getBounds());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
void testResizeMultipleChildrenScalesChildrenProportionally() {
|
|
||||||
SRectangle rect1 = SRectangle.create(0, 0, 10, 10);
|
|
||||||
SRectangle rect2 = SRectangle.create(20, 10, 20, 10);
|
|
||||||
SCollection collection = SCollection.of(rect1, rect2);
|
|
||||||
|
|
||||||
collection.resize(ResizeHandle.SE, 20, 10);
|
|
||||||
|
|
||||||
assertEquals(new Rectangle(0, 0, 15, 15), rect1.getBounds());
|
|
||||||
assertEquals(new Rectangle(30, 15, 30, 15), rect2.getBounds());
|
|
||||||
assertEquals(new Rectangle(0, 0, 60, 30), collection.getBounds());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
void testResizeFromNorthWestRepositionsAndScalesChildren() {
|
|
||||||
SRectangle rect1 = SRectangle.create(0, 0, 10, 10);
|
|
||||||
SRectangle rect2 = SRectangle.create(10, 10, 10, 10);
|
|
||||||
SCollection collection = SCollection.of(rect1, rect2);
|
|
||||||
|
|
||||||
collection.resize(ResizeHandle.NW, 10, 10);
|
|
||||||
|
|
||||||
assertEquals(new Rectangle(10, 10, 5, 5), rect1.getBounds());
|
|
||||||
assertEquals(new Rectangle(15, 15, 5, 5), rect2.getBounds());
|
|
||||||
assertEquals(new Rectangle(10, 10, 10, 10), collection.getBounds());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void testClone() {
|
void testClone() {
|
||||||
SRectangle rect = SRectangle.create(10, 20, 100, 50);
|
SRectangle rect = SRectangle.create(10, 20, 100, 50);
|
||||||
|
|||||||
Reference in New Issue
Block a user