From 212e2af210837fe0f322275b3a9a164c6b100a75 Mon Sep 17 00:00:00 2001
From: Joseph Lenox <lenox.joseph@gmail.com>
Date: Sun, 13 May 2018 13:55:53 -0500
Subject: [PATCH] Convert colors to base-255

---
 src/GUI/ColorScheme/Default.hpp   | 26 ++++++++++++-------------
 src/GUI/ColorScheme/Solarized.hpp | 32 +++++++++++++++----------------
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/GUI/ColorScheme/Default.hpp b/src/GUI/ColorScheme/Default.hpp
index 47fd951e6..69b7e0a98 100644
--- a/src/GUI/ColorScheme/Default.hpp
+++ b/src/GUI/ColorScheme/Default.hpp
@@ -8,17 +8,17 @@ public:
     const std::string name() const { return "Default"; }
     const bool SOLID_BACKGROUNDCOLOR() const { return false; };
     const wxColour SELECTED_COLOR() const { return wxColour(0, 1, 0); };
-    const wxColour HOVER_COLOR() const { return wxColour(0.4, 0.9, 0); };            //<Hover over Model
-    const wxColour TOP_COLOR() const { return wxColour(10/255,98/255,144/255); };    //<TOP Backgroud color
+    const wxColour HOVER_COLOR() const { return wxColour(255*0.4, 255*0.9, 0); };            //<Hover over Model
+    const wxColour TOP_COLOR() const { return wxColour(10,98,144); };    //<TOP Backgroud color
     const wxColour BOTTOM_COLOR() const { return wxColour(0,0,0); };                 //<BOTTOM Backgroud color
     const wxColour BACKGROUND_COLOR() const {return TOP_COLOR();}                      //< SOLID background color
-    const wxColour GRID_COLOR() const { return wxColour(0.2, 0.2, 0.2, 0.4); };      //<Grid color
-    const wxColour GROUND_COLOR() const { return wxColour(0.8, 0.6, 0.5, 0.4); };    //<Ground or Plate color
-    const wxColour COLOR_CUTPLANE() const { return wxColour(.8, .8, .8, 0.5); };
-    const wxColour COLOR_PARTS() const { return wxColour(1, 0.95, 0.2, 1); };        //<Perimeter color
-    const wxColour COLOR_INFILL() const { return wxColour(1, 0.45, 0.45, 1); };
-    const wxColour COLOR_SUPPORT() const { return wxColour(0.5, 1, 0.5, 1); };
-    const wxColour COLOR_UNKNOWN() const { return wxColour(0.5, 0.5, 1, 1); };
+    const wxColour GRID_COLOR() const { return wxColour(255*0.2, 255*0.2, 255*0.2, 255*0.4); };      //<Grid color
+    const wxColour GROUND_COLOR() const { return wxColour(255*0.8, 255*0.6, 255*0.5, 255*0.4); };    //<Ground or Plate color
+    const wxColour COLOR_CUTPLANE() const { return wxColour(255*0.8, 255*0.8, 255*0.8, 255*0.5); };
+    const wxColour COLOR_PARTS() const { return wxColour(1, 255*0.95, 255*0.2, 1); };        //<Perimeter color
+    const wxColour COLOR_INFILL() const { return wxColour(1, 255*0.45, 255*0.45, 1); };
+    const wxColour COLOR_SUPPORT() const { return wxColour(255*0.5, 1, 255*0.5, 1); };
+    const wxColour COLOR_UNKNOWN() const { return wxColour(255*0.5, 255*0.5, 1, 1); };
     const wxColour BED_COLOR() const { return wxColour(255, 255, 255); };
     const wxColour BED_GRID() const { return wxColour(230, 230, 230); };
     const wxColour BED_SELECTED() const { return wxColour(255, 166, 128); };
@@ -31,10 +31,10 @@ public:
     const wxColour BACKGROUND255() const { return wxColour(255, 255, 255); };
     const wxColour TOOL_DARK() const { return wxColour(0, 0, 0); };
     const wxColour TOOL_SUPPORT() const { return wxColour(0, 0, 0); };
-    const wxColour TOOL_INFILL() const { return wxColour(0, 0, 0.7); };
-    const wxColour TOOL_STEPPERIM() const { return wxColour(0.7, 0, 0); };
-    const wxColour TOOL_SHADE() const { return wxColour(0.95, 0.95, 0.95); };
-    const wxColour TOOL_COLOR() const { return wxColour(0.9, 0.9, 0.9); };
+    const wxColour TOOL_INFILL() const { return wxColour(0, 0, 255*0.7); };
+    const wxColour TOOL_STEPPERIM() const { return wxColour(255*0.7, 0, 0); };
+    const wxColour TOOL_SHADE() const { return wxColour(255*0.95, 255*0.95, 255*0.95); };
+    const wxColour TOOL_COLOR() const { return wxColour(255*0.9, 255*0.9, 255*0.9); };
     const wxColour SPLINE_L_PEN() const { return wxColour(50, 50, 50); };
     const wxColour SPLINE_O_PEN() const { return wxColour(200, 200, 200); };
     const wxColour SPLINE_I_PEN() const { return wxColour(255, 0, 0); };
diff --git a/src/GUI/ColorScheme/Solarized.hpp b/src/GUI/ColorScheme/Solarized.hpp
index 275b5560e..1cc224ce4 100644
--- a/src/GUI/ColorScheme/Solarized.hpp
+++ b/src/GUI/ColorScheme/Solarized.hpp
@@ -20,22 +20,22 @@ public:
 
 
 private:
-    const wxColour COLOR_BASE0    {wxColour(0.51373,0.58039,0.58824)};
-    const wxColour COLOR_BASE00   {wxColour(0.39608,0.48235,0.51373)};
-    const wxColour COLOR_BASE01   {wxColour(0.34510,0.43137,0.45882)};
-    const wxColour COLOR_BASE02   {wxColour(0.02745,0.21176,0.25882)};
-    const wxColour COLOR_BASE03   {wxColour(0.00000,0.16863,0.21176)};
-    const wxColour COLOR_BASE1    {wxColour(0.57647,0.63137,0.63137)};
-    const wxColour COLOR_BASE2    {wxColour(0.93333,0.90980,0.83529)};
-    const wxColour COLOR_BASE3    {wxColour(0.99216,0.96471,0.89020)};
-    const wxColour COLOR_BLUE     {wxColour(0.14902,0.54510,0.82353)};
-    const wxColour COLOR_CYAN     {wxColour(0.16471,0.63137,0.59608)};
-    const wxColour COLOR_GREEN    {wxColour(0.52157,0.60000,0.00000)};
-    const wxColour COLOR_MAGENTA  {wxColour(0.82745,0.21176,0.50980)};
-    const wxColour COLOR_ORANGE   {wxColour(0.79608,0.29412,0.08627)};
-    const wxColour COLOR_RED      {wxColour(0.86275,0.19608,0.18431)};
-    const wxColour COLOR_VIOLET   {wxColour(0.42353,0.44314,0.76863)};
-    const wxColour COLOR_YELLOW   {wxColour(0.70980,0.53725,0.00000)};
+    const wxColour COLOR_BASE0    {wxColour(255*0.51373,255*0.58039,255*0.58824)};
+    const wxColour COLOR_BASE00   {wxColour(255*0.39608,255*0.48235,255*0.51373)};
+    const wxColour COLOR_BASE01   {wxColour(255*0.34510,255*0.43137,255*0.45882)};
+    const wxColour COLOR_BASE02   {wxColour(255*0.02745,255*0.21176,255*0.25882)};
+    const wxColour COLOR_BASE03   {wxColour(255*0.00000,255*0.16863,255*0.21176)};
+    const wxColour COLOR_BASE1    {wxColour(255*0.57647,255*0.63137,255*0.63137)};
+    const wxColour COLOR_BASE2    {wxColour(255*0.93333,255*0.90980,255*0.83529)};
+    const wxColour COLOR_BASE3    {wxColour(255*0.99216,255*0.96471,255*0.89020)};
+    const wxColour COLOR_BLUE     {wxColour(255*0.14902,255*0.54510,255*0.82353)};
+    const wxColour COLOR_CYAN     {wxColour(255*0.16471,255*0.63137,255*0.59608)};
+    const wxColour COLOR_GREEN    {wxColour(255*0.52157,255*0.60000,255*0.00000)};
+    const wxColour COLOR_MAGENTA  {wxColour(255*0.82745,255*0.21176,255*0.50980)};
+    const wxColour COLOR_ORANGE   {wxColour(255*0.79608,255*0.29412,255*0.08627)};
+    const wxColour COLOR_RED      {wxColour(255*0.86275,255*0.19608,255*0.18431)};
+    const wxColour COLOR_VIOLET   {wxColour(255*0.42353,255*0.44314,255*0.76863)};
+    const wxColour COLOR_YELLOW   {wxColour(255*0.70980,255*0.53725,255*0.00000)};
 
 };
 }} // namespace Slic3r::GUI