Merge branch 'problem-with-exporting-to-celldesigner' into 'master' (7bd74c87) · Commits · minerva / core

Commit 7bd74c87 authored 6 years ago by Piotr Gawron

Merge branch 'problem-with-exporting-to-celldesigner' into 'master'

Problem with exporting to celldesigner and parsing from celldesigner

See merge request !442

parents 188f8d47 74a1b4a0

No related branches found

No related tags found

Checking pipeline status

Hide whitespace changes

Inline Side-by-side

Showing

commons/src/main/java/lcsb/mapviewer/common/geometry/LineTransformation.java 2 additions, 2 deletions

...va/lcsb/mapviewer/common/geometry/LineTransformation.java
converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/annotation/RestAnnotationParser.java 746 additions, 736 deletions

...r/model/celldesigner/annotation/RestAnnotationParser.java
converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/geometry/AbstractCellDesignerAliasConverter.java 41 additions, 25 deletions

...designer/geometry/AbstractCellDesignerAliasConverter.java
converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/geometry/GeneCellDesignerAliasConverter.java 4 additions, 4 deletions

...celldesigner/geometry/GeneCellDesignerAliasConverter.java
converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/geometry/helper/PolylineDataFactory.java 69 additions, 41 deletions

...del/celldesigner/geometry/helper/PolylineDataFactory.java
converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/reaction/ReactionFromXml.java 149 additions, 154 deletions

...onverter/model/celldesigner/reaction/ReactionFromXml.java
converter-CellDesigner/src/test/java/lcsb/mapviewer/converter/model/celldesigner/annotation/RestAnnotationParserTest.java 22 additions, 0 deletions

...del/celldesigner/annotation/RestAnnotationParserTest.java
converter-CellDesigner/src/test/java/lcsb/mapviewer/converter/model/celldesigner/geometry/AbstractCellDesignerAliasConverterTest.java 5 additions, 27 deletions

...gner/geometry/AbstractCellDesignerAliasConverterTest.java
converter-CellDesigner/src/test/java/lcsb/mapviewer/converter/model/celldesigner/geometry/GeneCellDesignerAliasConverterTest.java 20 additions, 15 deletions

...designer/geometry/GeneCellDesignerAliasConverterTest.java
converter-CellDesigner/src/test/java/lcsb/mapviewer/converter/model/celldesigner/geometry/ProteinCellDesignerAliasConverterTest.java 48 additions, 42 deletions

...igner/geometry/ProteinCellDesignerAliasConverterTest.java
converter-CellDesigner/src/test/java/lcsb/mapviewer/converter/model/celldesigner/geometry/helper/PolylineDataFactoryTest.java 63 additions, 25 deletions

...celldesigner/geometry/helper/PolylineDataFactoryTest.java
converter-sbml/src/main/java/lcsb/mapviewer/converter/model/sbml/reaction/SbmlReactionParser.java 18 additions, 9 deletions

...wer/converter/model/sbml/reaction/SbmlReactionParser.java
converter-sbml/src/test/java/lcsb/mapviewer/converter/model/sbml/SbmlParserTest.java 5 additions, 0 deletions

...a/lcsb/mapviewer/converter/model/sbml/SbmlParserTest.java
converter-sbml/testFiles/invalidReaction/reaction_with_missing_part_of_layout.xml 265 additions, 0 deletions

.../invalidReaction/reaction_with_missing_part_of_layout.xml
model/src/main/java/lcsb/mapviewer/model/map/reaction/Product.java 2 additions, 1 deletion

.../main/java/lcsb/mapviewer/model/map/reaction/Product.java
model/src/main/java/lcsb/mapviewer/model/map/reaction/Reactant.java 2 additions, 1 deletion

...main/java/lcsb/mapviewer/model/map/reaction/Reactant.java
model/src/main/java/lcsb/mapviewer/model/map/species/GeneComparator.java 2 additions, 2 deletions

...java/lcsb/mapviewer/model/map/species/GeneComparator.java
pathvisio/src/main/java/lcsb/mapviewer/wikipathway/XML/ModelContructor.java 2 additions, 2 deletions

.../java/lcsb/mapviewer/wikipathway/XML/ModelContructor.java
rest-api/src/main/java/lcsb/mapviewer/api/convert/ConvertController.java 4 additions, 3 deletions

...in/java/lcsb/mapviewer/api/convert/ConvertController.java
rest-api/src/main/java/lcsb/mapviewer/api/convert/ConvertRestImpl.java 43 additions, 9 deletions

...main/java/lcsb/mapviewer/api/convert/ConvertRestImpl.java

with 1512 additions and 1098 deletions

Please register or to comment