Commit c77c4626 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

always draw name

parent f56a13cf
Pipeline #51810 passed with stage
in 16 minutes and 7 seconds
......@@ -129,6 +129,8 @@ minerva (16.1.0~alpha.0) stable; urgency=medium
* Bug fix: API does not allow to create plugin with wrong md5 hash (#1074)
* Bug fix: when exporting to CellDesigner make sure that layer id is numeric
(#16)
* Bug fix: Pathway name was not drawn when there was element with the same
name inside Pathway (#1613)
-- Piotr Gawron <piotr.gawron@uni.lu> Thu, 9 Sep 2021 13:00:00 +0200
......
......@@ -5,9 +5,6 @@ import java.awt.geom.Area;
import java.awt.geom.Line2D;
import java.awt.geom.Rectangle2D;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import lcsb.mapviewer.commands.ColorExtractor;
import lcsb.mapviewer.model.map.compartment.BottomSquareCompartment;
import lcsb.mapviewer.model.map.species.Species;
......@@ -21,18 +18,12 @@ import lcsb.mapviewer.model.overlay.DataOverlayEntry;
*/
public class BottomSquareCompartmentConverter extends CompartmentConverter<BottomSquareCompartment> {
/**
* Default class logger.
*/
@SuppressWarnings("unused")
private static Logger logger = LogManager.getLogger();
/**
* Default constructor.
*
* @param colorExtractor
* Object that helps to convert {@link DataOverlayEntry} values into colors
* when drawing {@link Species}
* Object that helps to convert {@link DataOverlayEntry} values into
* colors when drawing {@link Species}
*/
public BottomSquareCompartmentConverter(final ColorExtractor colorExtractor) {
super(colorExtractor);
......
......@@ -52,8 +52,7 @@ public abstract class CompartmentConverter<T extends Compartment> extends Elemen
/**
* Default class logger.
*/
@SuppressWarnings("unused")
private static Logger logger = LogManager.getLogger();
protected static Logger logger = LogManager.getLogger();
/**
* Default alpha level for transparent compartments.
*/
......
......@@ -5,9 +5,6 @@ import java.awt.geom.Area;
import java.awt.geom.Line2D;
import java.awt.geom.Rectangle2D;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import lcsb.mapviewer.commands.ColorExtractor;
import lcsb.mapviewer.model.map.compartment.LeftSquareCompartment;
......@@ -19,18 +16,12 @@ import lcsb.mapviewer.model.map.compartment.LeftSquareCompartment;
*/
public class LeftSquareCompartmentConverter extends CompartmentConverter<LeftSquareCompartment> {
/**
* Default class logger.
*/
@SuppressWarnings("unused")
private static Logger logger = LogManager.getLogger();
/**
* Default constructor.
*
* @param colorExtractor
* Object that helps to convert {@link ColorSchema} values into colors
* when drawing elements
* Object that helps to convert {@link ColorSchema} values into
* colors when drawing elements
*
*/
public LeftSquareCompartmentConverter(final ColorExtractor colorExtractor) {
......
......@@ -26,8 +26,8 @@ public class PathwayCompartmentConverter extends CompartmentConverter<PathwayCom
* Default constructor.
*
* @param colorExtractor
* Object that helps to convert {@link ColorSchema} values into colors
* when drawing {@link Species}
* Object that helps to convert {@link ColorSchema} values into
* colors when drawing {@link Species}
*/
public PathwayCompartmentConverter(final ColorExtractor colorExtractor) {
super(colorExtractor);
......@@ -67,9 +67,7 @@ public class PathwayCompartmentConverter extends CompartmentConverter<PathwayCom
drawText(compartment, graphics, params);
compartment.setNameBorder(tmpBorder);
} else {
if (!compartment.containsIdenticalSpecies()) {
drawText(compartment, graphics, params);
}
drawText(compartment, graphics, params);
}
// restore old color and line type
......
......@@ -5,9 +5,6 @@ import java.awt.geom.Area;
import java.awt.geom.Line2D;
import java.awt.geom.Rectangle2D;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import lcsb.mapviewer.commands.ColorExtractor;
import lcsb.mapviewer.model.map.compartment.RightSquareCompartment;
import lcsb.mapviewer.model.map.species.Species;
......@@ -20,18 +17,12 @@ import lcsb.mapviewer.model.map.species.Species;
*/
public class RightSquareCompartmentConverter extends CompartmentConverter<RightSquareCompartment> {
/**
* Default class logger.
*/
@SuppressWarnings("unused")
private static Logger logger = LogManager.getLogger();
/**
* Default constructor.
*
* @param colorExtractor
* Object that helps to convert {@link ColorSchema} values into colors
* when drawing {@link Species}
* Object that helps to convert {@link ColorSchema} values into
* colors when drawing {@link Species}
*/
public RightSquareCompartmentConverter(final ColorExtractor colorExtractor) {
super(colorExtractor);
......
......@@ -4,9 +4,6 @@ import java.awt.Graphics2D;
import java.awt.Shape;
import java.awt.geom.RoundRectangle2D;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import lcsb.mapviewer.commands.ColorExtractor;
import lcsb.mapviewer.model.map.compartment.Compartment;
import lcsb.mapviewer.model.map.compartment.SquareCompartment;
......@@ -24,18 +21,13 @@ public class SquareCompartmentConverter extends CompartmentConverter<SquareCompa
* compartment.
*/
private static final int RECTANGLE_CORNER_ARC_SIZE = 20;
/**
* Default class logger.
*/
@SuppressWarnings("unused")
private static Logger logger = LogManager.getLogger();
/**
* Default constructor.
*
* @param colorExtractor
* Object that helps to convert {@link ColorSchema} values into colors
* when drawing {@link Species}
* Object that helps to convert {@link ColorSchema} values into
* colors when drawing {@link Species}
*/
public SquareCompartmentConverter(final ColorExtractor colorExtractor) {
super(colorExtractor);
......
......@@ -6,9 +6,6 @@ import java.awt.geom.Area;
import java.awt.geom.Line2D;
import java.awt.geom.Rectangle2D;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import lcsb.mapviewer.commands.ColorExtractor;
import lcsb.mapviewer.model.map.compartment.TopSquareCompartment;
import lcsb.mapviewer.model.map.species.Species;
......@@ -21,18 +18,12 @@ import lcsb.mapviewer.model.map.species.Species;
*/
public class TopSquareCompartmentConverter extends CompartmentConverter<TopSquareCompartment> {
/**
* Default class logger.
*/
@SuppressWarnings("unused")
private static Logger logger = LogManager.getLogger();
/**
* Default constructor.
*
* @param colorExtractor
* Object that helps to convert {@link ColorSchema} values into colors
* when drawing {@link Species}
* Object that helps to convert {@link ColorSchema} values into
* colors when drawing {@link Species}
*/
public TopSquareCompartmentConverter(final ColorExtractor colorExtractor) {
super(colorExtractor);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment