Merge pull request #499 from vizzuhq/add_chart_tests

Add Chart::Events testsuite

Author: schaumb

src/apps/qutils/canvas.cpp

@@ -135,15 +135,6 @@ void BaseCanvas::endPolygon()
 	polygon = QPainterPath();
 }
 
-Geom::Rect BaseCanvas::getClipRect() const
-{
-	if (painter.hasClipping())
-		return fromQRectF(painter.clipBoundingRect());
-	return {Geom::Point(),
-	    Geom::Size{static_cast<double>(painter.device()->width()),
-	        static_cast<double>(painter.device()->height())}};
-}
-
 void BaseCanvas::setClipRect(const Geom::Rect &rect)
 {
 	painter.setClipping(true);

src/apps/qutils/canvas.h

@@ -19,7 +19,6 @@ class BaseCanvas : public Gfx::ICanvas, public Vizzu::Draw::Painter
 
 	Gfx::ICanvas &getCanvas() override { return *this; }
 
-	[[nodiscard]] Geom::Rect getClipRect() const override;
 	void setClipRect(const Geom::Rect &rect) override;
 	void setClipCircle(const Geom::Circle &circle) override;
 	void setClipPolygon() override;

src/apps/weblib/jscriptcanvas.cpp

@@ -6,11 +6,6 @@
 namespace Vizzu::Main
 {
 
-Geom::Rect JScriptCanvas::getClipRect() const
-{
-	return clipRect ? *clipRect : Geom::Rect::CenteredMax();
-}
-
 void JScriptCanvas::setClipRect(const Geom::Rect &rect)
 {
 	if (!clipRect || *clipRect != rect) {

src/apps/weblib/jscriptcanvas.h

@@ -16,7 +16,6 @@ class JScriptCanvas : public Gfx::ICanvas, public Draw::Painter
 	JScriptCanvas() = default;
 	~JScriptCanvas() override = default;
 
-	[[nodiscard]] Geom::Rect getClipRect() const override;
 	void setClipRect(const Geom::Rect &rect) override;
 	void setClipCircle(const Geom::Circle &circle) override;
 	void setClipPolygon() override;

src/base/gfx/canvas.h

@@ -23,7 +23,6 @@ struct ICanvas
 {
 	virtual ~ICanvas() = default;
 
-	[[nodiscard]] virtual Geom::Rect getClipRect() const = 0;
 	virtual void setClipRect(const Geom::Rect &rect) = 0;
 	virtual void setClipCircle(const Geom::Circle &circle) = 0;
 	virtual void setClipPolygon() = 0;

src/chart/main/chart.h

@@ -30,6 +30,7 @@ class Chart
 	Event onChanged;
 
 	Chart();
+	Chart(Chart &&) noexcept = delete;
 	void draw(Gfx::ICanvas &canvas);
 	void setBoundRect(const Geom::Rect &rect);
 
@@ -46,7 +47,7 @@ class Chart
 		actStyles = styles;
 		actStyles.setup();
 	}
-	Gen::Options getOptions() { return *nextOptions; }
+	Gen::Options &getOptions() { return *nextOptions; }
 	void setOptions(const Gen::Options &options)
 	{
 		*nextOptions = options;

src/chart/ui/chart.h

@@ -14,7 +14,7 @@ namespace Vizzu::UI
 class ChartWidget : public GUI::Widget
 {
 public:
-	std::function<void(void)> doChange;
+	std::function<void()> doChange;
 	std::function<void(const std::string &)> openUrl;
 
 	explicit ChartWidget();

src/data/table/datatable.cpp

@@ -95,7 +95,7 @@ DataTableOld::DataIndex DataTableOld::addColumn(
 
 DataTableOld::DataIndex DataTableOld::addColumn(
     const std::string &name,
-    const std::span<const char *> &categories,
+    const std::span<const char *const> &categories,
     const std::span<const std::uint32_t> &values)
 {
 	std::vector<const char *> realValues(values.size());

src/data/table/datatable.h

@@ -50,7 +50,7 @@ class DataTableOld : public Table<double>
 	    const std::string &unit,
 	    const std::span<const double> &values);
 	DataIndex addColumn(const std::string &name,
-	    const std::span<const char *> &categories,
+	    const std::span<const char *const> &categories,
 	    const std::span<const std::uint32_t> &values);
 
 	void pushRow(const std::span<const char *> &cells);