From a174ec21ad92b6f613263f168c8668a727480698 Mon Sep 17 00:00:00 2001
From: Andreas Huber <bitbucket@lucares.de>
Date: Mon, 26 Aug 2019 20:38:57 +0200
Subject: [PATCH] increase contrast between scatter and cumulative distribution

---
 .../api/CumulativeDistributionHandler.java    |  4 +-
 .../recommind/logs/GnuplotColorPalettes.java  | 55 ++++++++++---------
 2 files changed, 31 insertions(+), 28 deletions(-)

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 9d7b9bb..5f23872 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
@@ -4,6 +4,7 @@ import java.nio.file.Path;
 import java.util.Collection;
 
 import org.lucares.recommind.logs.DataSeries;
+import org.lucares.recommind.logs.LineStyle;
 
 public class CumulativeDistributionHandler implements AggregateHandler {
 
@@ -37,9 +38,10 @@ public class CumulativeDistributionHandler implements AggregateHandler {
 		for (final DataSeries dataSerie : dataSeries) {
 			final AggregatedData aggregatedData = dataSerie.getAggregatedData();
 			if (aggregatedData != null) {
+				final LineStyle lineStyle = dataSerie.getStyle();
 				appendfln(result, "'%s' using 1:2 notitle with lines axes x2y1 lw 2 %s, \\", //
 						aggregatedData.getDataFile().getAbsolutePath(), //
-						dataSerie.getStyle()//
+						lineStyle.darker()//
 				);
 			}
 		}
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 f375427..2dcee22 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
@@ -4,33 +4,34 @@ import java.util.Arrays;
 import java.util.List;
 
 public interface GnuplotColorPalettes {
-	
+
 	/**
-	 * 
-<div style="background-color: #9400D3; display:inline;">#9400D3</div>
-<div style="background-color: #009e73; display:inline;">#009e73</div>
-<div style="background-color: #56b4e9; display:inline;">#56b4e9</div>
-<div style="background-color: #e69f00; display:inline;">#e69f00</div>
-<div style="background-color: #f0e442; display:inline;">#f0e442</div>
-<div style="background-color: #0072b2; display:inline;">#0072b2</div>
-<div style="background-color: #e51e10; display:inline;">#e51e10</div>
-<div style="background-color: blue; display:inline;">blue</div>
-<div style="background-color: #FF69B4; display:inline;">#FF69B4</div>
-<div style="background-color: #00BFFF; display:inline;">#00BFFF</div>        
-<div style="background-color: black; display:inline;">black</div>  
+	 *
+	 * <div style="background-color: #9400D3; display:inline; padding:
+	 * 8px;">#9400D3</div>
+	 * <div style="background-color: #009e73; display:inline; padding:
+	 * 8px;">#009e73</div>
+	 * <div style="background-color: #56b4e9; display:inline; padding:
+	 * 8px;">#56b4e9</div>
+	 * <div style="background-color: #e69f00; display:inline; padding:
+	 * 8px;">#e69f00</div>
+	 * <div style="background-color: #f0e442; display:inline; padding:
+	 * 8px;">#f0e442</div>
+	 * <div style="background-color: #0072b2; display:inline; padding:
+	 * 8px;">#0072b2</div>
+	 * <div style="background-color: #e51e10; display:inline; padding:
+	 * 8px;">#e51e10</div>
+	 * <div style="background-color: #FF69B4; display:inline; padding:
+	 * 8px;">#FF69B4</div>
 	 */
-	
-	List<GnuplotColor> DEFAULT = Arrays.asList(
-			GnuplotColor.byHex("9400D3"),//
-			GnuplotColor.byHex("009e73"),//
-			GnuplotColor.byHex("56b4e9"),//
-			GnuplotColor.byHex("e69f00"),//
-			GnuplotColor.byHex("f0e442"),//
-			GnuplotColor.byHex("0072b2"),//
-			GnuplotColor.byHex("e51e10"),//
-			GnuplotColor.byHex("0000FF"),//
-			GnuplotColor.byHex("FF69B4"),//
-			GnuplotColor.byHex("00BFFF"),//
-			GnuplotColor.byHex("000000")//
-			); 
+
+	List<GnuplotColor> DEFAULT = Arrays.asList(GnuplotColor.byHex("9400D3"), //
+			GnuplotColor.byHex("009e73"), //
+			GnuplotColor.byHex("56b4e9"), //
+			GnuplotColor.byHex("e69f00"), //
+			GnuplotColor.byHex("f0e442"), //
+			GnuplotColor.byHex("0072b2"), //
+			GnuplotColor.byHex("e51e10"), //
+			GnuplotColor.byHex("FF69B4")//
+	);
 }