diff --git a/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/BarChartHandler.java b/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/BarChartHandler.java index 2b5e683..addd380 100644 --- a/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/BarChartHandler.java +++ b/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/BarChartHandler.java @@ -84,7 +84,7 @@ public class BarChartHandler extends AggregateHandler { gnuplotTitle(title), // GnuplotLineType.Bar, // gnuplotXYAxis(), // - lineStyle.brighter()// + lineStyle.asGnuplotLineStyleBright()// ); } diff --git a/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/CumulativeDistributionHandler.java b/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/CumulativeDistributionHandler.java index e8d8794..d61ce77 100644 --- a/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/CumulativeDistributionHandler.java +++ b/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/CumulativeDistributionHandler.java @@ -78,7 +78,7 @@ public class CumulativeDistributionHandler extends AggregateHandler { aggregatedData.getDataFile().getAbsolutePath(), // gnuplotTitle(title), // gnuplotXYAxis(), // - lineStyle.darker()// + lineStyle.asGnuplotLineStyleBright()// ); } diff --git a/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/HistogramHandler.java b/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/HistogramHandler.java index 36637e0..0e0ac6a 100644 --- a/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/HistogramHandler.java +++ b/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/HistogramHandler.java @@ -62,7 +62,7 @@ public class HistogramHandler extends AggregateHandler { aggregatedData.getDataFile().getAbsolutePath(), // gnuplotTitle(title), // gnuplotXYAxis(), // - lineStyle.darker()// + lineStyle.asGnuplotLineStyleDark()// ); } diff --git a/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/ParallelRequestsAggregate.java b/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/ParallelRequestsAggregate.java index 3c4e8f2..a450ae7 100644 --- a/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/ParallelRequestsAggregate.java +++ b/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/ParallelRequestsAggregate.java @@ -55,7 +55,7 @@ public class ParallelRequestsAggregate extends AggregateHandler { aggregatedData.getDataFile().getAbsolutePath(), // gnuplotTitle(title), // gnuplotXYAxis(), // - lineStyle.brighter().asGnuplotLineStyle()// + lineStyle.asGnuplotLineStyleDark()// ); } diff --git a/pdb-plotting/src/main/java/org/lucares/recommind/logs/GnuplotColor.java b/pdb-plotting/src/main/java/org/lucares/recommind/logs/GnuplotColor.java index 318aa28..a4da056 100644 --- a/pdb-plotting/src/main/java/org/lucares/recommind/logs/GnuplotColor.java +++ b/pdb-plotting/src/main/java/org/lucares/recommind/logs/GnuplotColor.java @@ -1,55 +1,33 @@ package org.lucares.recommind.logs; -import java.awt.Color; - public class GnuplotColor { - private final String color; // hex: 00efcc - private GnuplotColor(String color) { - this.color = color; + private final String bright, normal, dark; // hex: 00efcc + + private GnuplotColor(final String bright, final String normal, final String dark) { + this.bright = bright; + this.normal = normal; + this.dark = dark; } - public static GnuplotColor byHex(String aHex) { - return new GnuplotColor(aHex); + public static GnuplotColor byHex(final String bright, final String normal, final String dark) { + return new GnuplotColor(bright, normal, dark); } - public static GnuplotColor byAwtColor(Color color) { - - final String hex = String.format("%02x%02x%02x", // - color.getRed(), // - color.getGreen(), // - color.getBlue()// - ); - - return new GnuplotColor(hex); + public String getBright() { + return bright; } public String getColor() { - return "rgb \"#" + color + "\""; + return normal; + } + + public String getDark() { + return dark; } @Override public String toString() { return getColor(); } - - Color toAwtColor() { - int red = Integer.parseInt(color.substring(0, 2), 16); - int green = Integer.parseInt(color.substring(2, 4), 16); - int blue = Integer.parseInt(color.substring(4, 6), 16); - return new Color(red, green, blue); - } - - public GnuplotColor brighter() { - - final Color brighterColor = toAwtColor().brighter(); - - return byAwtColor(brighterColor); - } - - public GnuplotColor darker() { - - final Color darkerColor = toAwtColor().darker(); - return byAwtColor(darkerColor); - } } diff --git a/pdb-plotting/src/main/java/org/lucares/recommind/logs/GnuplotColorPalettes.java b/pdb-plotting/src/main/java/org/lucares/recommind/logs/GnuplotColorPalettes.java index 8b7e1e7..4f263a4 100644 --- a/pdb-plotting/src/main/java/org/lucares/recommind/logs/GnuplotColorPalettes.java +++ b/pdb-plotting/src/main/java/org/lucares/recommind/logs/GnuplotColorPalettes.java @@ -24,27 +24,24 @@ public interface GnuplotColorPalettes { *