Commit 631064e9 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

Merge branch...

Merge branch '1265-heterodimer-association-dissociation-operators-should-be-solid-small-dots' into 'master'

Resolve "Heterodimer association/dissociation operators should be solid small dots"

Closes #1265

See merge request !1163
parents 14b67122 0b2f7e20
Pipeline #27680 passed with stage
in 14 minutes and 25 seconds
minerva (15.0.0~beta.5) unstable; urgency=medium
* Backward incompatible: truncation/association/dissocation points are
represented as a dot in all new images/uploaded maps (#1265)
* Bug fix: export to GPML uses proper arrow types (#1262)
* Bug fix: export to GPML uses dashed lines in reactions when possible
(#1262)
......
......@@ -359,7 +359,8 @@ public class ReactionConverter extends BioEntityConverter<Reaction> {
// bigger connecting point circles in SBGN view
if (sbgnFormat) {
radius *= SBGN_RADIUS_MULTIPLIER;
} else if (operator instanceof AndOperator || operator instanceof SplitOperator) {
} else if (operator instanceof AndOperator || operator instanceof SplitOperator
|| operator instanceof DissociationOperator || operator instanceof AssociationOperator || operator instanceof TruncationOperator) {
radius = 1.5;
fillColor = operator.getLine().getColor();
}
......
......@@ -50,7 +50,7 @@ public class AssociationOperator extends NodeOperator {
@Override
public String getOperatorText() {
return "&";
return "";
}
@Override
......
......@@ -49,7 +49,7 @@ public class DissociationOperator extends NodeOperator {
@Override
public String getOperatorText() {
return "";
return "";
}
@Override
......
......@@ -34,12 +34,6 @@ public class AssociationOperatorTest extends ModelTestFunctions {
assertNotNull(operator);
}
@Test
public void testGetters() {
assertFalse("".equals(new AssociationOperator().getSBGNOperatorText()));
assertFalse("".equals(new AssociationOperator().getOperatorText()));
}
@Test
public void testCopy1() {
AssociationOperator op = new AssociationOperator();
......
......@@ -34,12 +34,6 @@ public class DissociationOperatorTest extends ModelTestFunctions {
assertNotNull(operator);
}
@Test
public void testGetters() {
assertFalse("".equals(new DissociationOperator().getSBGNOperatorText()));
assertFalse("".equals(new DissociationOperator().getOperatorText()));
}
@Test
public void testCopy1() {
DissociationOperator op = new DissociationOperator();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment