Merge branch '480-reduced-modulation-edge-transfer-to-minerva' into 'master'

Resolve "'Reduced modulation' edge transfer to Minerva"

Closes #480

See merge request !380

converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/reaction/ReactionLineData.java

@@ -98,7 +98,7 @@ public enum ReactionLineData {
   /**
    * Information about arrows/lines for {@link ReducedModulationReaction} class.
    */
-  REDUCED_MODULATION(ReducedModulationReaction.class, "REDUCED_MODULATION", LineType.SOLID, ArrowType.BLANK),
+  REDUCED_MODULATION(ReducedModulationReaction.class, "REDUCED_MODULATION", LineType.SOLID, ArrowType.DIAMOND),
 
   /**
    * Information about arrows/lines for {@link ReducedPhysicalStimulationReaction}

model/src/main/java/lcsb/mapviewer/model/map/reaction/Reaction.java

@@ -45,6 +45,7 @@ import lcsb.mapviewer.model.map.kinetics.SbmlKinetics;
 import lcsb.mapviewer.model.map.model.Model;
 import lcsb.mapviewer.model.map.model.ModelData;
 import lcsb.mapviewer.model.map.reaction.type.ReactionRect;
+import lcsb.mapviewer.model.map.reaction.type.ReducedNotation;
 import lcsb.mapviewer.model.map.reaction.type.TwoProductReactionInterface;
 import lcsb.mapviewer.model.map.reaction.type.TwoReactantReactionInterface;
 import lcsb.mapviewer.model.map.species.Element;
@@ -469,9 +470,7 @@ public class Reaction implements BioEntity {
       if (firstOperator != null) {
         startPoint = firstOperator.getLine().getPoints().get(firstOperator.getLine().getPoints().size() - 2);
       }
-    }
-
-    if (this instanceof TwoProductReactionInterface) {
+    } else if (this instanceof TwoProductReactionInterface) {
 
       NodeOperator firstOperator = null;
 
@@ -483,6 +482,9 @@ public class Reaction implements BioEntity {
       if (firstOperator != null) {
         endPoint = firstOperator.getLine().getPoints().get(firstOperator.getLine().getPoints().size() - 2);
       }
+    } else if (this instanceof ReducedNotation) {
+      startPoint = reactant.getLine().getEndPoint();
+      endPoint = product.getLine().getBeginPoint();      
     }
 
     return new Line2D.Double(startPoint, endPoint);

persist/src/main/resources/applicationContext-persist.xml

@@ -55,9 +55,13 @@
 
 				<value>lcsb.mapviewer.model.map.reaction.type.BooleanLogicGateReaction</value>
 				<value>lcsb.mapviewer.model.map.reaction.type.DissociationReaction</value>
+				<value>lcsb.mapviewer.model.map.reaction.type.CatalysisReaction</value>
 				<value>lcsb.mapviewer.model.map.reaction.type.HeterodimerAssociationReaction</value>
+				<value>lcsb.mapviewer.model.map.reaction.type.InhibitionReaction</value>
 				<value>lcsb.mapviewer.model.map.reaction.type.KnownTransitionOmittedReaction</value>
+				<value>lcsb.mapviewer.model.map.reaction.type.ModulationReaction</value>
 				<value>lcsb.mapviewer.model.map.reaction.type.NegativeInfluenceReaction</value>
+				<value>lcsb.mapviewer.model.map.reaction.type.PhysicalStimulationReaction</value>
 				<value>lcsb.mapviewer.model.map.reaction.type.PositiveInfluenceReaction</value>
 				<value>lcsb.mapviewer.model.map.reaction.type.ReducedModulationReaction</value>
 				<value>lcsb.mapviewer.model.map.reaction.type.ReducedPhysicalStimulationReaction</value>
@@ -66,7 +70,10 @@
 				<value>lcsb.mapviewer.model.map.reaction.type.TranscriptionReaction</value>
 				<value>lcsb.mapviewer.model.map.reaction.type.TranslationReaction</value>
 				<value>lcsb.mapviewer.model.map.reaction.type.TransportReaction</value>
+				<value>lcsb.mapviewer.model.map.reaction.type.TriggerReaction</value>
 				<value>lcsb.mapviewer.model.map.reaction.type.TruncationReaction</value>
+				<value>lcsb.mapviewer.model.map.reaction.type.UnknownCatalysisReaction</value>
+				<value>lcsb.mapviewer.model.map.reaction.type.UnknownInhibitionReaction</value>
 				<value>lcsb.mapviewer.model.map.reaction.type.UnknownNegativeInfluenceReaction</value>
 				<value>lcsb.mapviewer.model.map.reaction.type.UnknownPositiveInfluenceReaction</value>
 				<value>lcsb.mapviewer.model.map.reaction.type.UnknownReducedModulationReaction</value>