Merge branch '487-custom-images-as-overlay-levels-or-background' into 'master' (3fb09925) · Commits · minerva / core

Commit 3fb09925 authored 5 years ago by Piotr Gawron

Merge branch '487-custom-images-as-overlay-levels-or-background' into 'master'

Resolve "Custom images as overlay levels  or background"

Closes #487

See merge request !768

parents 4c305a38 cd1ab9fd

No related branches found

No related tags found

Checking pipeline status

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG 5 additions, 0 deletions

CHANGELOG
commons/src/main/java/lcsb/mapviewer/common/Comparator.java 4 additions, 1 deletion

commons/src/main/java/lcsb/mapviewer/common/Comparator.java
commons/src/main/java/lcsb/mapviewer/common/comparator/IntegerComparator.java 13 additions, 13 deletions

...a/lcsb/mapviewer/common/comparator/IntegerComparator.java
converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/CellDesignerXmlParser.java 13 additions, 3 deletions

...r/converter/model/celldesigner/CellDesignerXmlParser.java
converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/InvalidGroupException.java 2 additions, 2 deletions

...r/converter/model/celldesigner/InvalidGroupException.java
converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/LayerXmlParser.java 2 additions, 0 deletions

...apviewer/converter/model/celldesigner/LayerXmlParser.java
converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/annotation/ImportOnly.java 13 additions, 0 deletions

...r/converter/model/celldesigner/annotation/ImportOnly.java
converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/annotation/NoteField.java 193 additions, 190 deletions

...er/converter/model/celldesigner/annotation/NoteField.java
converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/annotation/RestAnnotationParser.java 58 additions, 31 deletions

...r/model/celldesigner/annotation/RestAnnotationParser.java
converter-CellDesigner/src/test/java/lcsb/mapviewer/converter/model/celldesigner/CellDesignerTestFunctions.java 21 additions, 4 deletions

...nverter/model/celldesigner/CellDesignerTestFunctions.java
converter-CellDesigner/src/test/java/lcsb/mapviewer/converter/model/celldesigner/CellDesignerXmlParserTest.java 17 additions, 10 deletions

...nverter/model/celldesigner/CellDesignerXmlParserTest.java
converter-CellDesigner/src/test/java/lcsb/mapviewer/converter/model/celldesigner/ComplexParserTests.java 2 additions, 20 deletions

...ewer/converter/model/celldesigner/ComplexParserTests.java
converter-CellDesigner/src/test/java/lcsb/mapviewer/converter/model/celldesigner/LayerXmlParserTest.java 13 additions, 0 deletions

...ewer/converter/model/celldesigner/LayerXmlParserTest.java
converter-CellDesigner/src/test/java/lcsb/mapviewer/converter/model/celldesigner/annotation/RestAnnotationParserTest.java 4 additions, 2 deletions

...del/celldesigner/annotation/RestAnnotationParserTest.java
converter-CellDesigner/testFiles/xmlNodeTestExamples/layer_text_with_z_index.xml 9 additions, 0 deletions

...testFiles/xmlNodeTestExamples/layer_text_with_z_index.xml
converter-SBGNML/src/main/java/lcsb/mapviewer/converter/model/sbgnml/SbgnmlXmlParser.java 3 additions, 0 deletions

...csb/mapviewer/converter/model/sbgnml/SbgnmlXmlParser.java
converter-SBGNML/src/test/java/lcsb/mapviewer/converter/model/sbgnml/SbgnmlXmlParserTest2.java 27 additions, 10 deletions

...apviewer/converter/model/sbgnml/SbgnmlXmlParserTest2.java
converter-graphics/src/main/java/lcsb/mapviewer/converter/graphics/AbstractImageGenerator.java 50 additions, 79 deletions

.../mapviewer/converter/graphics/AbstractImageGenerator.java
converter-graphics/src/main/java/lcsb/mapviewer/converter/graphics/bioEntity/BioEntityConverter.java 226 additions, 211 deletions

...ewer/converter/graphics/bioEntity/BioEntityConverter.java
converter-graphics/src/main/java/lcsb/mapviewer/converter/graphics/bioEntity/BioEntityConverterImpl.java 6 additions, 0 deletions

.../converter/graphics/bioEntity/BioEntityConverterImpl.java

with 681 additions and 576 deletions

Please register or to comment