Merge branch 'bugs' into 'master' (d47a3508) · Commits · minerva / core

Commit d47a3508 authored 8 years ago by Piotr Gawron

Merge branch 'bugs' into 'master'

Bug fixes

Issues solved:
#50, #31, #41, #46,  #38, #43, #48

See merge request !2

parents ba6e311f e5c8f78f

No related branches found

No related tags found

1 merge request!2Bug fixes

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 1 addition, 0 deletions

.gitignore
CHANGELOG 12 additions, 0 deletions

CHANGELOG
annotation/src/main/java/lcsb/mapviewer/annotation/services/ChEMBLParser.java 7 additions, 2 deletions

...java/lcsb/mapviewer/annotation/services/ChEMBLParser.java
annotation/src/main/java/lcsb/mapviewer/annotation/services/PubmedParser.java 1 addition, 1 deletion

...java/lcsb/mapviewer/annotation/services/PubmedParser.java
annotation/src/test/java/lcsb/mapviewer/annotation/services/ChEMBLParserTest.java 4 additions, 6 deletions

.../lcsb/mapviewer/annotation/services/ChEMBLParserTest.java
commons/src/main/java/lcsb/mapviewer/common/geometry/ColorParser.java 59 additions, 0 deletions

...main/java/lcsb/mapviewer/common/geometry/ColorParser.java
commons/src/test/java/lcsb/mapviewer/common/geometry/ColorParserTest.java 68 additions, 0 deletions

.../java/lcsb/mapviewer/common/geometry/ColorParserTest.java
converter-graphics/pom.xml 69 additions, 62 deletions

converter-graphics/pom.xml
converter-graphics/src/main/java/lcsb/mapviewer/converter/graphics/AbstractImageGenerator.java 128 additions, 57 deletions

.../mapviewer/converter/graphics/AbstractImageGenerator.java
converter-graphics/src/main/java/lcsb/mapviewer/converter/graphics/ElementConverter.java 3 additions, 3 deletions

...a/lcsb/mapviewer/converter/graphics/ElementConverter.java
converter-graphics/src/main/java/lcsb/mapviewer/converter/graphics/ElementConverterImpl.java 192 additions, 0 deletions

...sb/mapviewer/converter/graphics/ElementConverterImpl.java
converter-graphics/src/main/java/lcsb/mapviewer/converter/graphics/ImageGenerators.java 173 additions, 172 deletions

...va/lcsb/mapviewer/converter/graphics/ImageGenerators.java
converter-graphics/src/main/java/lcsb/mapviewer/converter/graphics/compartment/BottomSquareCompartmentConverter.java 15 additions, 1 deletion

...raphics/compartment/BottomSquareCompartmentConverter.java
converter-graphics/src/main/java/lcsb/mapviewer/converter/graphics/compartment/CompartmentConverter.java 19 additions, 7 deletions

.../converter/graphics/compartment/CompartmentConverter.java
converter-graphics/src/main/java/lcsb/mapviewer/converter/graphics/compartment/LeftSquareCompartmentConverter.java 16 additions, 1 deletion

.../graphics/compartment/LeftSquareCompartmentConverter.java
converter-graphics/src/main/java/lcsb/mapviewer/converter/graphics/compartment/OvalCompartmentConverter.java 15 additions, 1 deletion

...verter/graphics/compartment/OvalCompartmentConverter.java
converter-graphics/src/main/java/lcsb/mapviewer/converter/graphics/compartment/PathwayCompartmentConverter.java 20 additions, 4 deletions

...ter/graphics/compartment/PathwayCompartmentConverter.java
converter-graphics/src/main/java/lcsb/mapviewer/converter/graphics/compartment/RightSquareCompartmentConverter.java 16 additions, 1 deletion

...graphics/compartment/RightSquareCompartmentConverter.java
converter-graphics/src/main/java/lcsb/mapviewer/converter/graphics/compartment/SquareCompartmentConverter.java 19 additions, 5 deletions

...rter/graphics/compartment/SquareCompartmentConverter.java
converter-graphics/src/main/java/lcsb/mapviewer/converter/graphics/compartment/TopSquareCompartmentConverter.java 15 additions, 1 deletion

...r/graphics/compartment/TopSquareCompartmentConverter.java

with 852 additions and 324 deletions

Please register or to comment