Drawingcontext Style,Events renamed.

Author: simzer

src/chart/rendering/drawaxes.cpp

@@ -59,7 +59,7 @@ void drawAxes::drawAxis(Gen::ChannelId axisIndex)
 	const char *element =
 	    axisIndex == Gen::ChannelId::x ? "plot.xAxis" : "plot.yAxis";
 
-	auto lineBaseColor = *style.plot.getAxis(axisIndex).color
+	auto lineBaseColor = *rootStyle.plot.getAxis(axisIndex).color
 	                   * static_cast<double>(plot.anyAxisSet);
 
 	if (lineBaseColor.alpha <= 0) return;
@@ -73,7 +73,7 @@ void drawAxes::drawAxis(Gen::ChannelId axisIndex)
 		canvas.setLineColor(lineColor);
 		canvas.setLineWidth(1.0);
 
-		if (events.plot.axis.base->invoke(
+		if (rootEvents.plot.axis.base->invoke(
 		        Events::OnLineDrawParam(element, line))) {
 			painter.drawLine(line);
 		}
@@ -86,7 +86,7 @@ Geom::Point drawAxes::getTitleBasePos(Gen::ChannelId axisIndex,
 	typedef Styles::AxisTitle::Position Pos;
 	typedef Styles::AxisTitle::VPosition VPos;
 
-	const auto &titleStyle = style.plot.getAxis(axisIndex).title;
+	const auto &titleStyle = rootStyle.plot.getAxis(axisIndex).title;
 
 	double orthogonal;
 
@@ -117,7 +117,7 @@ Geom::Point drawAxes::getTitleOffset(Gen::ChannelId axisIndex,
     int index,
     bool fades) const
 {
-	const auto &titleStyle = style.plot.getAxis(axisIndex).title;
+	const auto &titleStyle = rootStyle.plot.getAxis(axisIndex).title;
 
 	auto calcSide = [](int, auto side)
 	{
@@ -161,7 +161,7 @@ void drawAxes::drawTitle(Gen::ChannelId axisIndex)
 	                        ? "plot.xAxis.title"
 	                        : "plot.yAxis.title";
 
-	const auto &titleStyle = style.plot.getAxis(axisIndex).title;
+	const auto &titleStyle = rootStyle.plot.getAxis(axisIndex).title;
 
 	auto fades = titleStyle.position->interpolates()
 	          || titleStyle.vposition->interpolates()
@@ -240,7 +240,7 @@ void drawAxes::drawTitle(Gen::ChannelId axisIndex)
 			drawLabel(Geom::Rect(Geom::Point(), size),
 			    title.value,
 			    titleStyle,
-			    events.plot.axis.title,
+			    rootEvents.plot.axis.title,
 			    std::move(param),
 			    canvas,
 			    drawLabel::Options(false, 1.0, upsideDown));
@@ -254,7 +254,7 @@ void drawAxes::drawDimensionLabels(bool horizontal)
 {
 	auto axisIndex = horizontal ? Gen::ChannelId::x : Gen::ChannelId::y;
 
-	const auto &labelStyle = style.plot.getAxis(axisIndex).label;
+	const auto &labelStyle = rootStyle.plot.getAxis(axisIndex).label;
 
 	auto textColor = *labelStyle.color;
 	if (textColor.alpha == 0.0) return;
@@ -281,7 +281,7 @@ void drawAxes::drawDimensionLabel(bool horizontal,
 	    horizontal ? "plot.xAxis.label" : "plot.yAxis.label";
 	auto &enabled = horizontal ? plot.guides.x : plot.guides.y;
 	auto axisIndex = horizontal ? Gen::ChannelId::x : Gen::ChannelId::y;
-	const auto &labelStyle = style.plot.getAxis(axisIndex).label;
+	const auto &labelStyle = rootStyle.plot.getAxis(axisIndex).label;
 	auto textColor = *labelStyle.color;
 
 	auto text = it->second.label;
@@ -331,7 +331,7 @@ void drawAxes::drawDimensionLabel(bool horizontal,
 		        text,
 		        posDir,
 		        labelStyle,
-		        events.plot.axis.label,
+		        rootEvents.plot.axis.label,
 		        std::move(Events::Events::OnTextDrawParam(element)),
 		        0,
 		        textColor * weight * position.weight,

src/chart/rendering/drawguides.cpp

@@ -17,7 +17,7 @@ void drawGuides::draw(bool horizontal)
 {
 	auto axisId = horizontal ? Gen::ChannelId::x : Gen::ChannelId::y;
 
-	const auto &guideStyle = style.plot.getAxis(axisId).guides;
+	const auto &guideStyle = rootStyle.plot.getAxis(axisId).guides;
 
 	auto baseColor = *guideStyle.color;
 	if (baseColor.alpha == 0) return;
@@ -61,7 +61,7 @@ void drawGuides::drawGuide(bool horizontal,
 
 	canvas.setLineColor(color);
 	Geom::Line line(relMax, relMax + normal);
-	if (events.plot.axis.guide->invoke(
+	if (rootEvents.plot.axis.guide->invoke(
 	        Events::OnLineDrawParam(element, line)))
 		painter.drawLine(line);
 }

src/chart/rendering/drawingcontext.h

@@ -26,12 +26,12 @@ class DrawingContext
 	    canvas(canvas),
 	    painter(*static_cast<Painter *>(canvas.getPainter())),
 	    options(*plot.getOptions()),
-	    style(plot.getStyle()),
-	    events(events),
-		layout(layout)
+	    rootStyle(plot.getStyle()),
+	    rootEvents(events),
+	    layout(layout)
 	{
-		auto plotArea = style.plot.contentRect
-			(layout.plot, style.calculatedSize());
+		auto plotArea = rootStyle.plot.contentRect
+			(layout.plot, rootStyle.calculatedSize());
 
 		coordSys = CoordinateSystem(
 		    plotArea,
@@ -48,8 +48,8 @@ class DrawingContext
 	Gfx::ICanvas &canvas;
 	Painter &painter;
 	const Gen::Options &options;
-	const Styles::Chart &style;
-	const Events::Draw &events;
+	const Styles::Chart &rootStyle;
+	const Events::Draw &rootEvents;
 	const Layout &layout;
 };
 

src/chart/rendering/drawinterlacing.cpp

@@ -24,7 +24,7 @@ void drawInterlacing::draw(bool horizontal, bool text)
 	auto axisIndex = horizontal ? Gen::ChannelId::y : Gen::ChannelId::x;
 
 	auto interlacingColor =
-	    *style.plot.getAxis(axisIndex).interlacing.color;
+	    *rootStyle.plot.getAxis(axisIndex).interlacing.color;
 
 	if (!text && interlacingColor.alpha <= 0.0) return;
 
@@ -93,7 +93,7 @@ void drawInterlacing::draw(
 
 	auto axisIndex = horizontal ? Gen::ChannelId::y : Gen::ChannelId::x;
 
-	auto &axisStyle = style.plot.getAxis(axisIndex);
+	auto &axisStyle = rootStyle.plot.getAxis(axisIndex);
 
 	const auto &axis = plot.axises.at(axisIndex);
 
@@ -208,7 +208,7 @@ void drawInterlacing::draw(
 					    horizontal ? "plot.yAxis.interlacing"
 					               : "plot.xAxis.interlacing";
 
-					if (events.plot.axis.interlacing->invoke(
+					if (rootEvents.plot.axis.interlacing->invoke(
 					        Events::OnRectDrawParam(element, rect))) {
 						painter.drawPolygon(points);
 					}
@@ -229,7 +229,7 @@ void drawInterlacing::drawDataLabel(
 	const char *element =
 	    horizontal ? "plot.yAxis.label" : "plot.xAxis.label";
 	auto axisIndex = horizontal ? Gen::ChannelId::y : Gen::ChannelId::x;
-	auto &labelStyle = style.plot.getAxis(axisIndex).label;
+	auto &labelStyle = rootStyle.plot.getAxis(axisIndex).label;
 
 	auto str = Text::SmartString::fromNumber(value,
 	    *labelStyle.numberFormat,
@@ -279,7 +279,7 @@ void drawInterlacing::drawDataLabel(
 		        str,
 		        posDir,
 		        labelStyle,
-		        events.plot.axis.label,
+		        rootEvents.plot.axis.label,
 		        std::move(Events::Events::OnTextDrawParam(element)),
 		        0,
 		        textColor * position.weight,
@@ -294,7 +294,7 @@ void drawInterlacing::drawSticks(double tickIntensity,
 	const char *element =
 	    horizontal ? "plot.yAxis.tick" : "plot.xAxis.tick";
 	auto axisIndex = horizontal ? Gen::ChannelId::y : Gen::ChannelId::x;
-	auto &axisStyle = style.plot.getAxis(axisIndex);
+	auto &axisStyle = rootStyle.plot.getAxis(axisIndex);
 	const auto &tickStyle = axisStyle.ticks;
 
 	auto tickLength = tickStyle.length->get(
@@ -333,7 +333,7 @@ void drawInterlacing::drawSticks(double tickIntensity,
 		    }
 	    });
 
-	if (events.plot.axis.tick->invoke(
+	if (rootEvents.plot.axis.tick->invoke(
 	        Events::OnLineDrawParam(element, tickLine))) {
 		canvas.line(tickLine);
 	}

src/chart/rendering/drawitem.cpp

@@ -42,7 +42,7 @@ void drawItem::drawLines(const Styles::Guide &style,
 			canvas.setLineColor(lineColor);
 			auto axisPoint = blended.center.xComp() + origo.yComp();
 			Geom::Line line(axisPoint, blended.center);
-			if (events.plot.marker.guide->invoke(
+			if (rootEvents.plot.marker.guide->invoke(
 			        Events::OnLineDrawParam("plot.marker.guide.x",
 			            line,
 			            marker.idx))) {
@@ -58,7 +58,7 @@ void drawItem::drawLines(const Styles::Guide &style,
 			canvas.setLineColor(lineColor);
 			auto axisPoint = blended.center.yComp() + origo.xComp();
 			Geom::Line line(blended.center, axisPoint);
-			if (events.plot.marker.guide->invoke(
+			if (rootEvents.plot.marker.guide->invoke(
 			        Events::OnLineDrawParam("plot.marker.guide.y",
 			            line,
 			            marker.idx))) {
@@ -181,7 +181,7 @@ void drawItem::draw(const DrawItem &drawItem,
 	auto colors = getColor(drawItem, factor);
 
 	canvas.setLineColor(colors.first);
-	canvas.setLineWidth(*style.plot.marker.borderWidth);
+	canvas.setLineWidth(*rootStyle.plot.marker.borderWidth);
 	canvas.setBrushColor(colors.second);
 
 	auto boundary = drawItem.getBoundary();
@@ -196,7 +196,7 @@ void drawItem::draw(const DrawItem &drawItem,
 		auto p0 = coordSys.convert(line.begin);
 		auto p1 = coordSys.convert(line.end);
 
-		if (events.plot.marker.base->invoke(
+		if (rootEvents.plot.marker.base->invoke(
 		        Events::OnLineDrawParam("plot.marker",
 		            Geom::Line(p0, p1),
 		            drawItem.marker.idx))) {
@@ -208,7 +208,7 @@ void drawItem::draw(const DrawItem &drawItem,
 		}
 	}
 	else {
-		if (events.plot.marker.base->invoke(
+		if (rootEvents.plot.marker.base->invoke(
 		        Events::OnRectDrawParam("plot.marker",
 		            rect,
 		            drawItem.marker.idx))) {
@@ -230,7 +230,7 @@ void drawItem::drawLabel(const DrawItem &drawItem, size_t index)
 	auto text = getLabelText(index);
 	if (text.empty()) return;
 
-	auto &labelStyle = style.plot.marker.label;
+	auto &labelStyle = rootStyle.plot.marker.label;
 
 	auto labelPos = labelStyle.position->combine<Geom::Line>(
 	    [&](int, const auto &position)
@@ -250,7 +250,7 @@ void drawItem::drawLabel(const DrawItem &drawItem, size_t index)
 	    text,
 	    labelPos,
 	    labelStyle,
-	    events.plot.marker.label,
+	    rootEvents.plot.marker.label,
 	    std::move(param),
 	    centered,
 	    textColor,
@@ -259,7 +259,7 @@ void drawItem::drawLabel(const DrawItem &drawItem, size_t index)
 
 std::string drawItem::getLabelText(size_t index) const
 {
-	auto &labelStyle = style.plot.marker.label;
+	auto &labelStyle = rootStyle.plot.marker.label;
 	auto &values = marker.label.values;
 
 	auto needsInterpolation = marker.label.count == 2
@@ -318,14 +318,14 @@ std::pair<Gfx::Color, Gfx::Color> drawItem::getColor(
 {
 	auto selectedColor = getSelectedColor();
 
-	auto borderAlpha = *style.plot.marker.borderOpacity;
-	auto fillAlpha = *style.plot.marker.fillOpacity;
+	auto borderAlpha = *rootStyle.plot.marker.borderOpacity;
+	auto fillAlpha = *rootStyle.plot.marker.fillOpacity;
 
 	auto fakeBgColor =
-	    (*style.backgroundColor + *style.plot.backgroundColor)
+	    (*rootStyle.backgroundColor + *rootStyle.plot.backgroundColor)
 	        .transparent(1.0);
 
-	auto borderColor = style.plot.marker.borderOpacityMode->combine<
+	auto borderColor = rootStyle.plot.marker.borderOpacityMode->combine<
 	    Gfx::Color>(
 	    [&](int, const auto &mode)
 	    {

src/chart/rendering/drawlegend.cpp

@@ -12,14 +12,14 @@ drawLegend::drawLegend(const DrawingContext &context,
     Gen::ChannelId channelType,
     double weight) :
     DrawingContext(context),
-    events(context.events.legend),
-    style(context.style.legend),
+    events(context.rootEvents.legend),
+    style(context.rootStyle.legend),
     type(channelType),
     weight(weight)
 {
 	contentRect =
 	    style.contentRect(layout.legend, 
-	    context.style.calculatedSize());
+	    context.rootStyle.calculatedSize());
 	itemHeight = drawLabel::getHeight(style.label, canvas);
 	titleHeight = drawLabel::getHeight(style.title, canvas);
 

src/chart/rendering/drawplot.cpp

@@ -17,14 +17,14 @@ drawPlot::drawPlot(const DrawingContext &context) :
 {
 	drawBackground(layout.plot,
 	    canvas,
-	    style.plot,
-	    events.plot.background,
+	    rootStyle.plot,
+	    rootEvents.plot.background,
 	    Events::OnRectDrawParam("plot"));
 
 	drawArea(false);
 	drawAxes(*this).drawBase();
 
-	auto clip = style.plot.overflow == Styles::Overflow::hidden;
+	auto clip = rootStyle.plot.overflow == Styles::Overflow::hidden;
 
 	if (clip) clipPlotArea();
 
@@ -64,18 +64,18 @@ void drawPlot::drawArea(bool clip)
 
 		Events::OnRectDrawParam eventObj("plot.area", rect);
 
-		if (!style.plot.areaColor->isTransparent()) {
-			canvas.setBrushColor(*style.plot.areaColor);
-			canvas.setLineColor(*style.plot.areaColor);
+		if (!rootStyle.plot.areaColor->isTransparent()) {
+			canvas.setBrushColor(*rootStyle.plot.areaColor);
+			canvas.setLineColor(*rootStyle.plot.areaColor);
 			canvas.setLineWidth(0);
-			if (!events.plot.area
-			    || events.plot.area->invoke(std::move(eventObj))) {
+			if (!rootEvents.plot.area
+			    || rootEvents.plot.area->invoke(std::move(eventObj))) {
 				painter.drawPolygon(points, false);
 			}
 			canvas.setLineWidth(0);
 		}
-		else if (events.plot.area)
-			events.plot.area->invoke(std::move(eventObj));
+		else if (rootEvents.plot.area)
+			rootEvents.plot.area->invoke(std::move(eventObj));
 	}
 }