From 40a6d78dc58f895cad98bf406b5daedaad1239d1 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sat, 30 Apr 2016 20:56:49 -0400 Subject: [PATCH] libshared: Updated to 899975acd75ff96cce80c35cc2eecf61ea9d4871 --- src/CMakeLists.txt | 2 +- src/Palette.cpp | 82 ---------------------------------------------- src/Palette.h | 51 ---------------------------- src/libshared | 2 +- 4 files changed, 2 insertions(+), 135 deletions(-) delete mode 100644 src/Palette.cpp delete mode 100644 src/Palette.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4dd12c8c..74bfcd9c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -12,7 +12,6 @@ set (timew_SRCS CLI.cpp CLI.h Extensions.cpp Extensions.h Interval.cpp Interval.h Lexer.cpp Lexer.h - Palette.cpp Palette.h Range.cpp Range.h Rules.cpp Rules.h data.cpp @@ -29,6 +28,7 @@ set (libshared_SRCS libshared/src/Args.cpp libshared/src/Args.h libshared/src/FS.cpp libshared/src/FS.h libshared/src/JSON.cpp libshared/src/JSON.h libshared/src/Msg.cpp libshared/src/Msg.h + libshared/src/Palette.cpp libshared/src/Palette.h libshared/src/Pig.cpp libshared/src/Pig.h libshared/src/RX.cpp libshared/src/RX.h libshared/src/Table.cpp libshared/src/Table.h diff --git a/src/Palette.cpp b/src/Palette.cpp deleted file mode 100644 index 5d77ba6e..00000000 --- a/src/Palette.cpp +++ /dev/null @@ -1,82 +0,0 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// Copyright 2015 - 2016, Paul Beckingham, Federico Hernandez. -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included -// in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -// SOFTWARE. -// -// http://www.opensource.org/licenses/mit-license.php -// -//////////////////////////////////////////////////////////////////////////////// - -#include -#include - -//////////////////////////////////////////////////////////////////////////////// -// Use a default palette, which is overwritten in ::initialize. -Palette::Palette () -{ - _colors = { - Color ("white on red"), - Color ("white on blue"), - Color ("black on green"), - Color ("black on magenta"), - Color ("black on cyan"), - Color ("black on yellow"), - Color ("black on white"), - Color ("white on bright red"), - Color ("white on bright blue"), - Color ("black on bright green"), - Color ("black on bright magenta"), - Color ("black on bright cyan"), - Color ("black on bright yellow"), - }; - - _current = 0; -} - -//////////////////////////////////////////////////////////////////////////////// -void Palette::add (Color c) -{ - _colors.push_back (c); -} - -//////////////////////////////////////////////////////////////////////////////// -// Return the next color in the list. Cycle to the beginning if necessary. -Color Palette::next () -{ - if (enabled) - return _colors[_current++ % _colors.size ()]; - - return Color (); -} - -//////////////////////////////////////////////////////////////////////////////// -int Palette::size () const -{ - return static_cast (_colors.size ()); -} - -//////////////////////////////////////////////////////////////////////////////// -void Palette::clear () -{ - _colors.clear (); - _current = 0; -} - -//////////////////////////////////////////////////////////////////////////////// diff --git a/src/Palette.h b/src/Palette.h deleted file mode 100644 index 1ebdc937..00000000 --- a/src/Palette.h +++ /dev/null @@ -1,51 +0,0 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// Copyright 2015 - 2016, Paul Beckingham, Federico Hernandez. -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included -// in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -// SOFTWARE. -// -// http://www.opensource.org/licenses/mit-license.php -// -//////////////////////////////////////////////////////////////////////////////// - -#ifndef INCLUDED_PALETTE -#define INCLUDED_PALETTE - -#include -#include -#include - -class Palette -{ -public: - Palette (); - void add (Color); - Color next (); - int size () const; - void clear (); - -public: - bool enabled {true}; - -private: - std::vector _colors {}; - int _current {0}; -}; - -#endif diff --git a/src/libshared b/src/libshared index 0efc1434..899975ac 160000 --- a/src/libshared +++ b/src/libshared @@ -1 +1 @@ -Subproject commit 0efc143498fceb4a80fb79af6198125aed0d9bc4 +Subproject commit 899975acd75ff96cce80c35cc2eecf61ea9d4871