blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-30 16:40:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Grid width and grid height

Browse source
This commit is contained in:
Dan Paulat 2021-11-18 22:00:31 -06:00
parent 1db9b40394
commit 2f47f0c229
6 changed files with 144 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

60
scwx-qt/source/scwx/qt/util/json.cpp
View file

@ -27,20 +27,74 @@ static void PrettyPrintJson(std::ostream& os,
boost::json::value const& jv,
std::string* indent = nullptr);
bool FromJsonInt64(const boost::json::object& json,
const std::string& key,
int64_t& value,
const int64_t defaultValue,
std::optional<int64_t> minValue,
std::optional<int64_t> maxValue)
{
const boost::json::value* jv = json.if_contains(key);
bool dirty = true;
if (jv != nullptr)
{
if (jv->is_int64())
{
value = boost::json::value_to<int64_t>(*jv);
if (minValue.has_value() && value < *minValue)
{
BOOST_LOG_TRIVIAL(warning)
<< logPrefix_ << key << " less than minimum (" << value << " < "
<< *minValue << "), setting to: " << *minValue;
value = *minValue;
}
else if (maxValue.has_value() && value > *maxValue)
{
BOOST_LOG_TRIVIAL(warning)
<< logPrefix_ << key << " greater than maximum (" << value
<< " > " << *maxValue << "), setting to: " << *maxValue;
value = *maxValue;
}
else
{
dirty = false;
}
}
else
{
BOOST_LOG_TRIVIAL(warning)
<< logPrefix_ << key << " is not an int64 (" << jv->kind()
<< "), setting to default:" << defaultValue;
value = defaultValue;
}
}
else
{
BOOST_LOG_TRIVIAL(debug)
<< logPrefix_ << key
<< " is not present, setting to default: " << defaultValue;
value = defaultValue;
}
return !dirty;
}
bool FromJsonString(const boost::json::object& json,
const std::string& key,
std::string& value,
const std::string& defaultValue)
{
const boost::json::value* jv = json.if_contains(key);
bool found = false;
bool dirty = true;
if (jv != nullptr)
{
if (jv->is_string())
{
value = boost::json::value_to<std::string>(*jv);
found = true;
dirty = false;
}
else
{
@ -58,7 +112,7 @@ bool FromJsonString(const boost::json::object& json,
value = defaultValue;
}
return found;
return !dirty;
}
boost::json::value ReadJsonFile(const std::string& path)

8
scwx-qt/source/scwx/qt/util/json.hpp
View file

@ -1,5 +1,7 @@
#pragma once
#include <optional>
#include <boost/json.hpp>
namespace scwx
@ -11,6 +13,12 @@ namespace util
namespace json
{
bool FromJsonInt64(const boost::json::object& json,
const std::string& key,
int64_t& value,
const int64_t defaultValue,
std::optional<int64_t> minValue,
std::optional<int64_t> maxValue);
bool FromJsonString(const boost::json::object& json,
const std::string& key,
std::string& value,