Merge pull request #39 from sisl/colors-compat

remove alpha channels
sisl · Jan 13, 2020 · 4c30e79 · 4c30e79
2 parents 9118e70 + 08f15cc
commit 4c30e79
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 24 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -19,6 +19,7 @@ script:
   - git clone https://github.com/JuliaRegistries/General  $(julia -e 'import Pkg; println(joinpath(Pkg.depots1(), "registries", "General"))')  
   - git clone https://github.com/SISL/Registry  $(julia -e 'import Pkg; println(joinpath(Pkg.depots1(), "registries", "SISL"))')  
   - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
+  - julia --project -e 'using Pkg; Pkg.add(PackageSpec(name="JSExpr", version="0.5"))'
   - julia --project --color=yes --check-bounds=yes -e 'import Pkg; Pkg.build(); Pkg.test("AutoViz"; coverage=true)'  
 after_success:
   - julia --project -e 'import Pkg; Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'

diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "AutoViz"
 uuid = "82aa6e0c-a491-5edf-8d4b-c16b98e4ea17"
 repo = "https://github.com/sisl/AutoViz.jl.git"
-version = "0.7.9"
+version = "0.7.10"
 
 [deps]
 AutomotiveDrivingModels = "99497e54-f3d6-53d3-a3a9-fa9315a7f1ba"
@@ -18,9 +18,6 @@ Rsvg = "c4c386cf-5103-5370-be45-f3a111cca3b8"
 StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 Vec = "44eeaf0b-fee4-471f-9310-ed6585cb3142"
 
-[compat]
-Colors = "0.7,0.9"
-
 [extras]
 Interact = "c601a237-2ae4-5e1e-952c-7a85b0c7eef1"
 NBInclude = "0db19996-df87-5ea3-a455-e3a50d440464"

diff --git a/docs/make.jl b/docs/make.jl
@@ -1,9 +1,9 @@
 using Documenter, AutoViz
 
 makedocs(modules = [AutoViz],
-         format = :html,
+         format = Documenter.HTML(),
          sitename="AutoViz.jl")
 
 deploydocs(
     repo = "github.com/sisl/AutoViz.jl.git"
-)
+)
diff --git a/src/colorscheme.jl b/src/colorscheme.jl
@@ -1,27 +1,27 @@
 const MONOKAY = Dict(
-            "COLOR_ASPHALT"              => colorant"0x708090FF",
-            "COLOR_LANE_MARKINGS_WHITE"  => colorant"0xDFDFDFFF",
-            "COLOR_LANE_MARKINGS_YELLOW" => colorant"0xFFEF00FF",
-            "COLOR_CAR_EGO"              => colorant"0x00FFFFFF",
-            "COLOR_CAR_OTHER"            => colorant"0xFF007FFF", 
+            "COLOR_ASPHALT"              => colorant"0x708090",
+            "COLOR_LANE_MARKINGS_WHITE"  => colorant"0xDFDFDF",
+            "COLOR_LANE_MARKINGS_YELLOW" => colorant"0xFFEF00",
+            "COLOR_CAR_EGO"              => colorant"0x00FFFF",
+            "COLOR_CAR_OTHER"            => colorant"0xFF007F", 
             "COLOR_ROAD_BOUNDARIES"      => colorant"white",
-            "foreground" => colorant"0xCFBFADFF",
+            "foreground" => colorant"0xCFBFAD",
             "background" => colorant"black",
-            "color1"     => colorant"0x52E3F6FF", # light blue
-            "color2"     => colorant"0xA7EC21FF", # light green
-            "color3"     => colorant"0xFF007FFF", # red
-            "color4"     => colorant"0xF9971FFF", # orange
-            "color5"     => colorant"0x79ABFFFF", # cobalt
+            "color1"     => colorant"0x52E3F6", # light blue
+            "color2"     => colorant"0xA7EC21", # light green
+            "color3"     => colorant"0xFF007F", # red
+            "color4"     => colorant"0xF9971F", # orange
+            "color5"     => colorant"0x79ABFF", # cobalt
     )
 
 const OFFICETHEME = Dict(
-            "COLOR_ASPHALT"              => colorant"0x708090FF",
-            "COLOR_LANE_MARKINGS_WHITE"  => colorant"0xDFDFDFFF",
-            "COLOR_LANE_MARKINGS_YELLOW" => colorant"0xFFEF00FF",
+            "COLOR_ASPHALT"              => colorant"0x708090",
+            "COLOR_LANE_MARKINGS_WHITE"  => colorant"0xDFDFDF",
+            "COLOR_LANE_MARKINGS_YELLOW" => colorant"0xFFEF00",
             "COLOR_CAR_EGO"              => colorant"#0090bc",
             "COLOR_CAR_OTHER"            => colorant"#ce0300" ,
             "COLOR_ROAD_BOUNDARIES"      => colorant"white",
-            "foreground" => colorant"0xCFBFADFF",
+            "foreground" => colorant"0xCFBFAD",
             "background" => colorant"transparent",
             "color1"     => colorant"#0090bc", # light blue
             "color2"     => colorant"#00a321", # light green
@@ -32,11 +32,11 @@ const OFFICETHEME = Dict(
 const LIGHTTHEME = Dict(
             "COLOR_ASPHALT"              => colorant"transparent",
             "COLOR_LANE_MARKINGS_WHITE"  => colorant"black",
-            "COLOR_LANE_MARKINGS_YELLOW" => colorant"0xFFEF00FF",
+            "COLOR_LANE_MARKINGS_YELLOW" => colorant"0xFFEF00",
             "COLOR_CAR_EGO"              => colorant"#0090bc",
             "COLOR_CAR_OTHER"            => colorant"#ce0300" ,
             "COLOR_ROAD_BOUNDARIES"      => colorant"white",
-            "foreground" => colorant"0xCFBFADFF",
+            "foreground" => colorant"0xCFBFAD",
             "background" => colorant"transparent",
             "color1"     => colorant"#0090bc", # light blue
             "color2"     => colorant"#00a321", # light green

diff --git a/src/overlays.jl b/src/overlays.jl
@@ -226,7 +226,7 @@ fields:
     on::Bool = false 
     right::Bool = true
     veh::Vehicle = Vehicle(VehicleState(), VehicleDef(), 0)
-    color::Colorant = colorant"0xFFEF00FF" # yellow 
+    color::Colorant = colorant"0xFFEF00" # yellow 
     size::Float64 = 0.3
 end