Skip to content

shape.properties output string fix #5932

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bubblobill wants to merge 11 commits into
base: develop
Choose a base branch
from
Open

shape.properties output string fix #5932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
93586d0
added toJson options to ShapeDrawable and AbstractDrawing
bubblobill Jan 20, 2026
5aeed4a
Fix "antiAliasing" toString value
bubblobill Mar 17, 2026
206e737
Fix "shapeType" toString value
bubblobill Mar 17, 2026
fba202c
Merge branch 'develop' into shape_function_output_fix
bubblobill Mar 17, 2026
9b76a21
Merge branch 'develop' into shape_function_output_fix
bubblobill Mar 17, 2026
c5ef739
null check for name added to JSON Object construction.
bubblobill Mar 20, 2026
0723282
Merge remote-tracking branch 'bb/shape_function_output_fix' into shap…
bubblobill Mar 20, 2026
5c8a4a6
Changed function exceptions to correct type.
bubblobill Mar 20, 2026
89986e3
Compromise - added back old bounds string prop to toString
bubblobill Mar 20, 2026
dde9987
Merge branch 'develop' into shape_function_output_fix
bubblobill Apr 3, 2026
c15ede8
Merge branch 'RPTools:develop' into shape_function_output_fix
bubblobill May 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 40 additions & 30 deletions src/main/java/net/rptools/maptool/client/functions/ShapeFunctions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,13 @@
// @formatter:off

import com.google.common.primitives.Floats;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.*;
import java.awt.*;
import java.awt.geom.*;
import java.util.*;
import java.util.List;
import java.util.function.BiFunction;
import net.rptools.maptool.client.MapTool;
import net.rptools.maptool.client.functions.json.JSONMacroFunctions;
import net.rptools.maptool.language.I18N;
import net.rptools.maptool.model.GUID;
import net.rptools.maptool.model.Zone;
Expand Down Expand Up @@ -78,22 +75,23 @@ public class ShapeFunctions extends AbstractFunction {
public static final Map<String, String> SOURCE_LINKS =
Map.of(
"arc",
"https://docs.oracle.com/javase/8/docs/api/java/awt/geom/Arc2D.Double.html#Double-double-double-double-double-double-double-int-",
"https://docs.oracle.com/javase/8/docs/api/java/awt/geom/Arc2D.Double.html#Double-double-double-double-double-double-double-int-",
"cubicCurve",
"https://docs.oracle.com/javase/8/docs/api/java/awt/geom/CubicCurve2D.Double.html#Double-double-double-double-double-double-double-double-double-",
"https://docs.oracle.com/javase/8/docs/api/java/awt/geom/CubicCurve2D.Double.html#Double-double-double-double-double-double-double-double-double-",
"ellipse",
"https://docs.oracle.com/javase/8/docs/api/java/awt/geom/Ellipse2D.Double.html#Double-double-double-double-double-",
"https://docs.oracle.com/javase/8/docs/api/java/awt/geom/Ellipse2D.Double.html#Double-double-double-double-double-",
"line",
"https://docs.oracle.com/javase/8/docs/api/java/awt/geom/Line2D.Double.html#Double-double-double-double-double-",
"https://docs.oracle.com/javase/8/docs/api/java/awt/geom/Line2D.Double.html#Double-double-double-double-double-",
"polygon",
"https://xmlgraphics.apache.org/batik/javadoc/org/apache/batik/ext/awt/geom/Polygon2D.html#Polygon2D-float:A-float:A-int-",
"https://xmlgraphics.apache.org/batik/javadoc/org/apache/batik/ext/awt/geom/Polygon2D.html#Polygon2D-float:A-float:A-int-",
"quadCurve",
"https://docs.oracle.com/javase/8/docs/api/java/awt/geom/QuadCurve2D.Double.html#Double-double-double-double-double-double-double-",
"https://docs.oracle.com/javase/8/docs/api/java/awt/geom/QuadCurve2D.Double.html#Double-double-double-double-double-double-double-",
"rectangle",
"https://docs.oracle.com/javase/8/docs/api/java/awt/geom/Rectangle2D.Double.html#Double-double-double-double-double-",
"https://docs.oracle.com/javase/8/docs/api/java/awt/geom/Rectangle2D.Double.html#Double-double-double-double-double-",
"roundRectangle",
"https://docs.oracle.com/javase/8/docs/api/java/awt/geom/RoundRectangle2D.Double.html#Double-double-double-double-double-double-double-",
"svgPath", "https://developer.mozilla.org/en-US/docs/Web/SVG/Tutorial/Paths");
"https://docs.oracle.com/javase/8/docs/api/java/awt/geom/RoundRectangle2D.Double.html#Double-double-double-double-double-double-double-",
"svgPath",
"https://developer.mozilla.org/en-US/docs/Web/SVG/Tutorial/Paths");
public static final String[] SHAPE_TYPES =
new String[] {
"arc",
Expand Down Expand Up @@ -592,12 +590,30 @@ private Object drawShape(
private Object getProperties(
Parser parser, VariableResolver resolver, String functionName, List<Object> parameters)
throws ParserException {
/* name, delimiter */
/* name, delimiter, nested delimiter */
String name = FunctionUtil.paramAsString(functionName, parameters, 0, false);
String delimiter =
String delimiter1 =
parameters.size() < 2
? ";"
: FunctionUtil.paramAsString(functionName, parameters, 1, false);
String delimiter2 =
parameters.size() < 3
? ","
: FunctionUtil.paramAsString(functionName, parameters, 2, false);
String delimiter3 =
parameters.size() < 4
? ":"
: FunctionUtil.paramAsString(functionName, parameters, 3, false);
if (delimiter1.equals(delimiter2)) {
throw new ParserException(
I18N.getText("macro.function.general.argumentTypeB", functionName, 3, 2));
} else if (delimiter2.equals(delimiter3)) {
throw new ParserException(
I18N.getText("macro.function.general.argumentTypeB", functionName, 4, 3));
} else if (delimiter3.equals(delimiter1)) {
throw new ParserException(
I18N.getText("macro.function.general.argumentTypeB", functionName, 4, 2));
}
Comment thread
bubblobill marked this conversation as resolved.
if (!CACHED_SHAPES.containsKey(name)) {
return false;
}
Expand All @@ -614,23 +630,17 @@ private Object getProperties(
seg, coords[0], coords[1], coords[2], coords[3], coords[4], coords[5], coords[6]));
pi.next();
}
StringBuilder stringBuilder = new StringBuilder(sd.toNonLocalisedString());
stringBuilder.append("segments=").append(String.join(",", segments)).append(";");

if (delimiter.equalsIgnoreCase("json")) {
JsonObject jsonObject =
JSONMacroFunctions.getInstance()
.getJsonObjectFunctions()
.fromStrProp(stringBuilder.toString(), ";");
jsonObject.add(
"segments",
JSONMacroFunctions.getInstance()
.getJsonArrayFunctions()
.fromStringList(String.join("##", segments), "##"));

if (delimiter1.equalsIgnoreCase("json")) {
JsonObject jsonObject = sd.toJson();
jsonObject.add("segments", new Gson().toJsonTree(segments));
return jsonObject;
} else {
stringBuilder.append("segments=\"").append(String.join("\",\"", segments)).append("\";");
return stringBuilder.toString();
return sd.toNonLocalisedString().replaceAll(";", delimiter1)
+ delimiter1
+ "segments="
+ String.join(
delimiter2, segments.stream().map(s -> s.replaceAll(",", delimiter3)).toList());
}
}

Expand Down
11 changes: 11 additions & 0 deletions src/main/java/net/rptools/maptool/model/drawing/AbstractDrawing.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
package net.rptools.maptool.model.drawing;

import com.google.common.annotations.VisibleForTesting;
import com.google.gson.JsonObject;
import com.google.gson.JsonPrimitive;
import java.awt.*;
import java.awt.image.ImageObserver;
import net.rptools.maptool.client.MapTool;
Expand Down Expand Up @@ -152,6 +154,15 @@ public String toNonLocalisedString() {
return "name=" + getName() + ";" + "layer=" + getLayer().name() + ";" + "id=" + getId() + ";";
}

public JsonObject toJson() {
JsonObject jo = new JsonObject();
String nm = getName();
jo.add("name", new JsonPrimitive(nm == null ? "" : nm));
jo.add("layer", new JsonPrimitive(getLayer().name()));
jo.add("id", new JsonPrimitive(getId().toString()));
return jo;
}

////
// IMAGE OBSERVER
public boolean imageUpdate(Image img, int infoflags, int x, int y, int width, int height) {
Expand Down
42 changes: 40 additions & 2 deletions src/main/java/net/rptools/maptool/model/drawing/ShapeDrawable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
*/
package net.rptools.maptool.model.drawing;

import com.google.gson.JsonObject;
import com.google.gson.JsonPrimitive;
import com.google.protobuf.StringValue;
import java.awt.*;
import java.awt.Rectangle;
Expand Down Expand Up @@ -185,6 +187,18 @@ public String toString() {
+ "shapeType="
+ getShapeTypeName()
+ ";"
+ "x="
+ getBounds().x
+ ";"
+ "y="
+ getBounds().y
+ ";"
+ "width="
+ getBounds().width
+ ";"
+ "height="
+ getBounds().height
+ ";"
+ "bounds=\""
+ "x="
+ getBounds().x
Expand All @@ -197,7 +211,7 @@ public String toString() {
+ ";"
+ "height="
+ getBounds().height
+ "\";";
Comment thread
bubblobill marked this conversation as resolved.
+ "\"";
}

public String toNonLocalisedString() {
Expand All @@ -208,6 +222,18 @@ public String toNonLocalisedString() {
+ "shapeType="
+ getShapeTypeName()
+ ";"
+ "x="
+ getBounds().x
+ ";"
+ "y="
+ getBounds().y
+ ";"
+ "width="
+ getBounds().width
+ ";"
+ "height="
+ getBounds().height
+ ";"
+ "bounds=\""
+ "x="
+ getBounds().x
Expand All @@ -220,7 +246,19 @@ public String toNonLocalisedString() {
+ ";"
+ "height="
+ getBounds().height
+ "\";";
+ "\"";
}

@Override
public JsonObject toJson() {
JsonObject jo = super.toJson();
jo.add("antiAliasing", new JsonPrimitive(getUseAntiAliasing()));
jo.add("shapeType", new JsonPrimitive(getShapeTypeName()));
jo.add("x", new JsonPrimitive(getBounds().x));
jo.add("y", new JsonPrimitive(getBounds().y));
jo.add("width", new JsonPrimitive(getBounds().width));
jo.add("height", new JsonPrimitive(getBounds().height));
return jo;
}

private void restoreAA(Graphics2D g, Object oldAA) {
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/net/rptools/maptool/language/i18n.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2084,6 +2084,7 @@ macro.function.general.argumentKeyTypeD = Argument key "{1}" to funct
macro.function.general.argumentKeyTypeG = Argument key "{1}" to function "{0}" must be a GUID.
macro.function.general.argumentKeyTypeI = Argument key "{1}" to function "{0}" must be an integer.
macro.function.general.argumentTypeA = Argument number {1} to function "{0}" must be a JSON Array.
macro.function.general.argumentTypeB = Argument number {1} to function "{0}" cannot be the same as argument number {2}.
macro.function.general.argumentTypeI = Argument number {1} "{2}" to function "{0}" must be an integer.
macro.function.general.argumentTypeInvalid = Argument number {1} invalid argument type for function "{0}".
macro.function.general.argumentTypeJ = Argument number {1} to function "{0}" must be a JSON Array or Object.
Expand Down
Loading