fix exception messages + reformat config.cpp

Author: schaumb

src/apps/weblib/interface.cpp

@@ -109,7 +109,7 @@ void Interface::setChartValue(const char *path, const char *value)
 	if (chart)
 		chart->getConfig().setParam(path, value);
 	else
-		throw std::logic_error(std::string(path) + "/" + value + ": " + "No chart exists");
+		throw std::logic_error("No chart exists");
 }
 
 void Interface::relToCanvasCoords(double rx,

src/chart/options/config.cpp

@@ -35,7 +35,8 @@ void Config::setParam(const std::string &path,
 		auto it = accessors.find(path);
 		if (it == accessors.end())
 			throw std::logic_error(
-			    "invalid config parameter: " + path);
+			    std::string(path) + "/" + value
+			    + ": invalid config parameter: " + path);
 		it->second.set(*setter, value);
 	}
 }
@@ -118,14 +119,16 @@ void Config::setChannelParam(const std::string &path,
 			    Conv::parse<OptionalChannelExtrema>(value));
 		}
 		else
-			throw std::logic_error("invalid range setting");
+			throw std::logic_error(std::string(path) + "/" + value
+			                       + ": invalid range setting");
 	}
 	else if (property == "labelLevel") {
 		setter->setLabelLevel(id, Conv::parse<uint64_t>(value));
 	}
 	else
 		throw std::logic_error(
-		    "invalid channel parameter: " + property);
+		    std::string(path) + "/" + value
+		    + ": invalid channel parameter: " + property);
 }
 
 std::string Config::getChannelParam(const std::string &path) const
@@ -136,9 +139,7 @@ std::string Config::getChannelParam(const std::string &path) const
 
 	auto &channel = setter->getOptions().getChannels().at(id);
 
-	if (property == "title") {
-		return Conv::toString(channel.title);
-	}
+	if (property == "title") { return Conv::toString(channel.title); }
 	else if (property == "axis") {
 		return Conv::toString(channel.axisLine);
 	}
@@ -236,7 +237,7 @@ Config::Accessors Config::initAccessors()
 	            [](const Options &options)
 	        {
 		        auto cs{options.polar ? CoordSystem::polar
-		                                    : CoordSystem::cartesian};
+		                              : CoordSystem::cartesian};
 		        return Conv::toString(cs);
 	        },
 	        .set =
@@ -263,8 +264,7 @@ Config::Accessors Config::initAccessors()
 	    {.get =
 	            [](const Options &options)
 	        {
-		        return Conv::toString(
-		            options.shapeType);
+		        return Conv::toString(options.shapeType);
 	        },
 	        .set =
 	            [](OptionsSetter &setter, const std::string &value)
@@ -276,9 +276,8 @@ Config::Accessors Config::initAccessors()
 	    {.get =
 	            [](const Options &options)
 	        {
-		        auto res(options.horizontal
-		                     ? Orientation::horizontal
-		                     : Orientation::vertical);
+		        auto res(options.horizontal ? Orientation::horizontal
+		                                    : Orientation::vertical);
 		        return Conv::toString(res);
 	        },
 	        .set =
@@ -293,8 +292,7 @@ Config::Accessors Config::initAccessors()
 	    {.get =
 	            [](const Options &options)
 	        {
-		        auto res(options.sorted ? Sort::byValue
-		                                      : Sort::none);
+		        auto res(options.sorted ? Sort::byValue : Sort::none);
 		        return Conv::toString(res);
 	        },
 	        .set =
@@ -308,7 +306,8 @@ Config::Accessors Config::initAccessors()
 	    {.get =
 	            [](const Options &options)
 	        {
-		        return Conv::toString(static_cast<bool>(options.reverse));
+		        return Conv::toString(
+		            static_cast<bool>(options.reverse));
 	        },
 	        .set =
 	            [](OptionsSetter &setter, const std::string &value)
@@ -325,14 +324,16 @@ Config::Accessors Config::initAccessors()
 	        .set =
 	            [](OptionsSetter &setter, const std::string &value)
 	        {
-		        setter.setAlign(Conv::parse<Base::Align::Type>(value));
+		        setter.setAlign(
+		            Conv::parse<Base::Align::Type>(value));
 	        }}});
 
 	res.insert({"split",
 	    {.get =
 	            [](const Options &options)
 	        {
-		        return Conv::toString(static_cast<bool>(options.splitted));
+		        return Conv::toString(
+		            static_cast<bool>(options.splitted));
 	        },
 	        .set =
 	            [](OptionsSetter &setter, const std::string &value)
@@ -350,7 +351,8 @@ Config::Accessors Config::initAccessors()
 	        .set =
 	            [](OptionsSetter &setter, const std::string &value)
 	        {
-				setter.showTooltip(Conv::parse<std::optional<int>>(value));
+		        setter.showTooltip(
+		            Conv::parse<std::optional<int>>(value));
 	        }}});
 
 	return res;