From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 12 Dec 2020 09:13:51 +0000 (+0100)
Subject: Introduce bearing node type.
X-Git-Tag: argeo-suite-2.1.16~4
X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=c2178a226cbb378311523527a8970651998ab770

Introduce bearing node type.
---

diff --git a/org.argeo.entity.api/src/org/argeo/entity/EntityNames.java b/org.argeo.entity.api/src/org/argeo/entity/EntityNames.java
index 8e2f1b8..0750431 100644
--- a/org.argeo.entity.api/src/org/argeo/entity/EntityNames.java
+++ b/org.argeo.entity.api/src/org/argeo/entity/EntityNames.java
@@ -18,8 +18,8 @@ public interface EntityNames {
 	final String ADM = "adm";
 
 	final String ENTITY_TYPE = "entity:type";
-	//final String ENTITY_UID = "entity:uid";
-	//final String ENTITY_NAME = "entity:name";
+	// final String ENTITY_UID = "entity:uid";
+	// final String ENTITY_NAME = "entity:name";
 
 	// GENERIC CONCEPTS
 	/** The language which is relevant. */
@@ -50,4 +50,8 @@ public interface EntityNames {
 	// SVG
 	final String SVG_WIDTH = "svg:width";
 	final String SVG_HEIGHT = "svg:height";
+	final String SVG_LENGTH = "svg:length";
+	final String SVG_UNIT = "svg:unit";
+	final String SVG_DUR = "svg:dur";
+	final String SVG_DIRECTION = "svg:direction";
 }
diff --git a/org.argeo.entity.api/src/org/argeo/entity/EntityType.java b/org.argeo.entity.api/src/org/argeo/entity/EntityType.java
index f208a99..ecd6330 100644
--- a/org.argeo.entity.api/src/org/argeo/entity/EntityType.java
+++ b/org.argeo.entity.api/src/org/argeo/entity/EntityType.java
@@ -11,7 +11,7 @@ public enum EntityType implements JcrName {
 	// graphics
 	box,
 	// geography
-	geopoint,
+	geopoint, bearing,
 	// ldap
 	person, user;
 
diff --git a/org.argeo.entity.api/src/org/argeo/entity/entity.cnd b/org.argeo.entity.api/src/org/argeo/entity/entity.cnd
index 0b3127b..b30657d 100644
--- a/org.argeo.entity.api/src/org/argeo/entity/entity.cnd
+++ b/org.argeo.entity.api/src/org/argeo/entity/entity.cnd
@@ -94,3 +94,6 @@ mixin
 - geo:lat (DOUBLE)
 - geo:alt (DOUBLE)
 
+[entity:bearing]
+mixin
+- svg:direction (DOUBLE)
diff --git a/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteUiUtils.java b/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteUiUtils.java
index c98e6d6..085dd4f 100644
--- a/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteUiUtils.java
+++ b/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteUiUtils.java
@@ -244,8 +244,12 @@ public class SuiteUiUtils {
 		Label img = new Label(parent, SWT.NONE);
 		CmsUiUtils.markup(img);
 		img.setText(CmsUiUtils.img(fileNode, width.toString(), height.toString()));
-		if (parent.getLayout() instanceof GridLayout)
-			img.setLayoutData(new GridData(SWT.CENTER, SWT.CENTER, false, false));
+		if (parent.getLayout() instanceof GridLayout) {
+			GridData gd = new GridData(SWT.CENTER, SWT.CENTER, false, false);
+			gd.widthHint = width.intValue();
+			gd.heightHint = height.intValue();
+			img.setLayoutData(gd);
+		}
 		img.addMouseListener(new MouseListener() {
 
 			@Override
@@ -268,7 +272,7 @@ public class SuiteUiUtils {
 						scroll.setLayout(CmsUiUtils.noSpaceGridLayout());
 						scroll.setExpandHorizontal(true);
 						scroll.setExpandVertical(true);
-						//scroll.setAlwaysShowScrollBars(true);
+						// scroll.setAlwaysShowScrollBars(true);
 
 						Composite c = new Composite(scroll, SWT.NONE);
 						scroll.setContent(c);