Changed colors from string to uint32.
This commit is contained in:
parent
85c47a45fd
commit
aaece0eabc
|
@ -27,7 +27,7 @@ int main(int argc, char *argv[])
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
Identiconpp identicon(5, 5, "ffffffff", {"000000ff", "000000"});
|
Identiconpp identicon(5, 5, 0xffffffff, { 0x000000ff, 0x000000 });
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,26 +20,12 @@
|
||||||
#include "debug.hpp"
|
#include "debug.hpp"
|
||||||
|
|
||||||
Identiconpp::Identiconpp(const uint8_t rows, const uint8_t columns,
|
Identiconpp::Identiconpp(const uint8_t rows, const uint8_t columns,
|
||||||
const string &background,
|
const uint32_t background,
|
||||||
const vector<string> &foreground)
|
const vector<uint32_t> &foreground)
|
||||||
: _rows(rows)
|
: _rows(rows)
|
||||||
, _columns(columns)
|
, _columns(columns)
|
||||||
, _background(background)
|
, _background(background)
|
||||||
, _foreground(foreground)
|
, _foreground(foreground)
|
||||||
{
|
{
|
||||||
// TODO: Check rows and columns
|
|
||||||
if (_background.size() != 8)
|
|
||||||
{
|
|
||||||
throw std::invalid_argument("Background color has the wrong format: " +
|
|
||||||
_background);
|
|
||||||
}
|
|
||||||
for (const string &color : _foreground)
|
|
||||||
{
|
|
||||||
if (color.size() != 8)
|
|
||||||
{
|
|
||||||
throw std::invalid_argument("Foreground color has the wrong format: " +
|
|
||||||
color);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -19,6 +19,7 @@
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
using std::uint8_t;
|
using std::uint8_t;
|
||||||
|
using std::uint32_t;
|
||||||
using std::string;
|
using std::string;
|
||||||
using std::vector;
|
using std::vector;
|
||||||
|
|
||||||
|
@ -43,12 +44,12 @@ public:
|
||||||
* @param foreground vector of foreground colors
|
* @param foreground vector of foreground colors
|
||||||
*/
|
*/
|
||||||
explicit Identiconpp(const uint8_t rows, const uint8_t columns,
|
explicit Identiconpp(const uint8_t rows, const uint8_t columns,
|
||||||
const string &background = "ffffffff",
|
const uint32_t background = 0xffffffff,
|
||||||
const vector<string> &foreground = { "000000ff" } );
|
const vector<uint32_t> &foreground = { 0x000000ff } );
|
||||||
|
|
||||||
private:
|
private:
|
||||||
const uint8_t _rows;
|
const uint8_t _rows;
|
||||||
const uint8_t _columns;
|
const uint8_t _columns;
|
||||||
const string _background;
|
const uint32_t _background;
|
||||||
const vector<string> _foreground;
|
const vector<uint32_t> _foreground;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue