Merge branch '1357-sbgn-view-state-variables-are-not-stadium-shape' into 'master'

Resolve "SBGN view: state variables are not stadium shape"

Closes #1357

See merge request !1240

CHANGELOG

@@ -8,8 +8,10 @@ minerva (15.1.0~beta.1) unstable; urgency=medium
   * Bug fix: miriam urls in new format
    (like: https://identifiers.org/kegg.compound:197020) are parsed properly for
     all know identifier types (#1359)
+  * Bug fix: in SBGN-like view protein state should be drawn as stadium-shape
+    (#1357)
 
- -- Piotr Gawron <piotr.gawron@uni.lu>  Mon, 17 Aug 2020 16:00:00 +0200
+ -- Piotr Gawron <piotr.gawron@uni.lu>  Tue, 18 Aug 2020 15:00:00 +0200
 
 minerva (15.1.0~beta.0) unstable; urgency=medium
   * Small improvement: annotations are exported in SBGN extension that can be

converter-graphics/src/main/java/lcsb/mapviewer/converter/graphics/bioEntity/element/species/ComplexSbgnConverter.java

@@ -71,8 +71,9 @@ public class ComplexSbgnConverter extends ComplexConverter {
 
   @Override
   Shape getStructuralStateShape(StructuralState state) {
+    double arcSize = Math.min(state.getWidth(), state.getHeight()) ;
     return new RoundRectangle2D.Double(state.getPosition().getX(), state.getPosition().getY(), state.getWidth(),
-        state.getHeight(), 15, 15);
+        state.getHeight(), arcSize, arcSize);
   }
 
 }

converter-graphics/src/main/java/lcsb/mapviewer/converter/graphics/bioEntity/element/species/ProteinSbgnConverter.java

@@ -85,8 +85,9 @@ public class ProteinSbgnConverter extends ProteinConverter {
 
   @Override
   Shape getStructuralStateShape(StructuralState state) {
+    double arcSize = Math.min(state.getWidth(), state.getHeight());
     return new RoundRectangle2D.Double(state.getPosition().getX(), state.getPosition().getY(), state.getWidth(),
-        state.getHeight(), 15, 15);
+        state.getHeight(), arcSize, arcSize);
   }
 
 }