Skip to content
Snippets Groups Projects

Resolve "Simple upload"

Merged Piotr Gawron requested to merge 159-simple-upload into master
26 files
+ 142
37
Compare changes
  • Side-by-side
  • Inline
Files
26
@@ -17,6 +17,7 @@ import org.apache.log4j.Logger;
import lcsb.mapviewer.commands.ColorExtractor;
import lcsb.mapviewer.commands.SemanticZoomLevelMatcher;
import lcsb.mapviewer.common.MimeType;
import lcsb.mapviewer.converter.graphics.AbstractImageGenerator.Params;
import lcsb.mapviewer.converter.graphics.bioEntity.BioEntityConverterImpl;
import lcsb.mapviewer.converter.graphics.layer.LayerConverter;
import lcsb.mapviewer.model.map.compartment.Compartment;
@@ -68,7 +69,7 @@ import lcsb.mapviewer.modelutils.map.ElementUtils;
*
*/
public abstract class AbstractImageGenerator {
/**
* Class that allows to check if element is visible (or transparent) when
* drawing. It's used to filter out invisible elements when drawing
@@ -205,6 +206,8 @@ public abstract class AbstractImageGenerator {
*/
private Color maxColor = Color.BLACK;
private Color simpleColor = Color.BLACK;
/**
* @param scale
* scale to set
@@ -533,6 +536,10 @@ public abstract class AbstractImageGenerator {
return maxColor;
}
public Color getSimpleColor() {
return simpleColor;
}
/**
* Returns {@link Color} that should be used for drawing overlays with
* minimum value.
@@ -567,6 +574,17 @@ public abstract class AbstractImageGenerator {
}
/**
* @param simpleColor
* simpleColor to set
* @return object with all parameters
* @see #simpleColor
*/
public Params simpleColor(Color simpleColor) {
this.simpleColor = simpleColor;
return this;
}
/**
* @return the sbgn
* @see #sbgn
*/
@@ -585,6 +603,12 @@ public abstract class AbstractImageGenerator {
return this;
}
public Params colorExtractor(ColorExtractor colorExtractor) {
return minColor(colorExtractor.getMinColor()).//
maxColor(colorExtractor.getMaxColor()).//
simpleColor(colorExtractor.getSimpleColor());
}
}
/**
@@ -653,7 +677,7 @@ public abstract class AbstractImageGenerator {
this.level = params.getLevel();
this.scale = params.getScale();
colorExtractor = new ColorExtractor(params.getMinColor(), params.getMaxColor());
colorExtractor = new ColorExtractor(params.getMinColor(), params.getMaxColor(), params.getSimpleColor());
// set border frame extended by a margin
border = new Rectangle2D.Double(
Loading