main merge

Author: dyuri

CHANGELOG.md

@@ -2,11 +2,18 @@
 
 ## [Unreleased]
 
+### Added
+
 - animate() method returns an animation control object, 
   animation control methods are chainable.
 - CSS properties can be used to style vizzu charts
   E.g. `--vizzu-plot-marker-colorPalette: whatever` for `{style: {plot: {marker: {colorPalette: "whatever"}}}}`
 
+### Fixed
+
+- Marker label fade-in/fade-out fixed, values are interpolated only if measure 
+  is not changed on label channel.
+
 ## [0.3.3] - 2021-10-17
 
 ### Fixed

ci/docker/vizzu-test-cloudbuild

@@ -15,4 +15,4 @@ RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key
 ADD . /workspace/
 WORKDIR /workspace/test/integration
 RUN npm install
-RUN node vizzutest.js -r DISABLED -u /example/lib/vizzu.min.js
+RUN node test.js --vizzu /example/lib/vizzu.min.js --images DISABLED --hashes DISABLED --nologs

src/apps/weblib/js-api/vizzu.js

@@ -225,8 +225,9 @@ export default class Vizzu {
     return this.anim;
   }
 
-  animStep(obj, animOptions) {
-    if (obj) {
+  animStep(animTarget, animOptions) {
+    if (animTarget) {
+      let obj = Object.assign({}, animTarget);
       if (obj.id) {
         this.restore(obj);
       } else {
@@ -243,7 +244,7 @@ export default class Vizzu {
           this._propPrefix
         );
         this.setStyle(propsToObject(props, style, this._propPrefix));
-        this.setConfig(obj.config);
+        this.setConfig(Object.assign({}, obj.config));
       }
     }
 
@@ -270,6 +271,7 @@ export default class Vizzu {
       }
 
       if (typeof animOptions === "object") {
+        animOptions = Object.assign({}, animOptions);
         this.iterateObject(animOptions, (path, value) => {
           this.call(this.module._anim_setValue)(path, value);
         });

src/chart/generator/marker.cpp

@@ -248,7 +248,7 @@ void Marker::setSizeBy(bool horizontal, const Math::Range<double> range)
 Marker::Label::Label(const Data::MultiDim::SubSliceIndex &index,
 						  const Data::DataCube &data,
 						  const Data::DataTable &table)
-	: hasValue(false), value(0.0)
+	: value(0.0), continousId(-1)
 {
 	indexStr = getIndexString(index, data, table);
 }
@@ -257,15 +257,16 @@ Marker::Label::Label(double value,
 						  const Data::SeriesIndex &continous,
 						  const Data::MultiDim::SubSliceIndex &index,
 						  const Data::DataCube &data,
-						  const Data::DataTable &table)
-	: hasValue(true), value(value)
+						  const Data::DataTable &table) :
+	value(value),
+	continousId(continous.getColIndex())
 {
-	unit = table.getInfo(continous.getColIndex()).getUnit();
+	unit = table.getInfo(continousId).getUnit();
 	indexStr = getIndexString(index, data, table);
 }
 
 bool Marker::Label::operator==(const Marker::Label &other) const {
-	return hasValue == other.hasValue
+	return continousId == other.continousId
 			&& value == other.value
 			&& unit == other.unit
 			&& indexStr == other.indexStr;

src/chart/generator/marker.h

@@ -44,11 +44,11 @@ class Marker
 	CellInfo cellInfo;
 
 	struct Label {
-		bool hasValue;
 		double value;
+		Data::ColumnIndex continousId;
 		std::string unit;
 		std::string indexStr;
-		Label() : hasValue(false), value(0.0) {}
+		Label() : value(0.0), continousId(-1) {}
 		Label(const Data::MultiDim::SubSliceIndex &index,
 			  const Data::DataCube &data,
 			  const Data::DataTable &table);
@@ -57,6 +57,7 @@ class Marker
 			  const Data::DataCube &data,
 			  const Data::DataTable &table);
 		bool operator==(const Label& other) const;
+		bool hasValue() const { return continousId != (uint64_t)-1; }
 		std::string getIndexString(const Data::MultiDim::SubSliceIndex &index,
 								   const Data::DataCube &data,
 								   const Data::DataTable &table) const;

src/chart/rendering/drawitem.cpp

@@ -134,14 +134,15 @@ void drawItem::drawLabel()
 {
 	if ((double)marker.enabled == 0) return;
 
-	BlendedDrawItem blended0(marker,
+	BlendedDrawItem blended(marker,
 	    options,
 	    diagram.getStyle(),
 		coordSys,
 	    diagram.getMarkers(),
 	    0);
 
-	drawLabel(blended0);
+	drawLabel(blended, 0);
+	drawLabel(blended, 1);
 }
 
 bool drawItem::shouldDraw()
@@ -201,16 +202,16 @@ void drawItem::draw(
 	}
 }
 
-void drawItem::drawLabel(const DrawItem &drawItem)
+void drawItem::drawLabel(const DrawItem &drawItem, size_t index)
 {
 	if ((double)drawItem.labelEnabled == 0) return;
 
-	auto color = getColor(drawItem, 1, true).second;
-
-	auto weight = marker.label.factor();
+	auto weight = marker.label.values[index].weight;
 	if (weight == 0.0) return;
 
-	auto text = getLabelText();
+	auto color = getColor(drawItem, 1, true).second;
+
+	auto text = getLabelText(index);
 	if (text.empty()) return;
 
 	auto &labelStyle = style.plot.marker.label;
@@ -231,52 +232,62 @@ void drawItem::drawLabel(const DrawItem &drawItem)
 		centered, textColor, bgColor);
 }
 
-std::string drawItem::getLabelText()
+std::string drawItem::getLabelText(size_t index) const
 {
 	auto &labelStyle = style.plot.marker.label;
+	auto &values = marker.label.values;
 
-	const auto &val0 = marker.label.values[0];
-	const auto &val1 = marker.label.values[1];
+	auto needsInterpolation = marker.label.count == 2
+		&& (values[0].value.continousId 
+		 == values[1].value.continousId);
 
-	auto value = marker.label.count == 1 ? val0.value.value :
-				 val0.value.value * val0.weight
-				+ val1.value.value * val1.weight;
+	auto value = needsInterpolation
+		? marker.label.combine<double>(
+			[&](const auto &value){ return value.value; })
+		: values[index].value.value;
 
-	auto text = Text::SmartString::fromNumber(value,
-	    *labelStyle.numberFormat);
+	std::string valueStr;
+	if (values[index].value.hasValue())
+	{
+		valueStr = Text::SmartString::fromNumber(value,
+		    *labelStyle.numberFormat);
 
-	if (val0.value.hasValue 
-		&& !val0.value.unit.empty()
-		&& *labelStyle.numberFormat != Text::NumberFormat::prefixed)
-		text += " ";
+		if(!values[index].value.unit.empty())
+		{
+			if (*labelStyle.numberFormat != Text::NumberFormat::prefixed)
+				valueStr += " ";
+		
+			valueStr += values[index].value.unit;
+		}
+	}
 
-	auto text0 = val0.value.hasValue ? text + val0.value.unit : std::string();
-	auto idx0 = val0.value.indexStr;
+	auto indexStr = values[index].value.indexStr;
 
 	// todo: interpolate Format
 	typedef Styles::MarkerLabel::Format Format;
 	switch((Format)*labelStyle.format)
 	{
 	default:
-	case Format::measureFirst:
-		if (!idx0.empty())
+	case Format::measureFirst: {
+		auto text = valueStr;
+		if (!indexStr.empty())
 		{
-			if (!text0.empty()) text0 += ", ";
-			text0 += idx0;
+			if (!text.empty()) text += ", ";
+			text += indexStr;
 		}
-		text = text0;
-		break;
+		return text;
+	}
 
-	case Format::dimensionsFirst:
-		if (!text0.empty())
+	case Format::dimensionsFirst: {
+		auto text = indexStr;
+		if (!valueStr.empty())
 		{
-			if (!idx0.empty()) idx0 += ", ";
-			idx0 += text0;
+			if (!text.empty()) text += ", ";
+			text += valueStr;
 		}
-		text = idx0;
-		break;
+		return text;
+	}
 	}
-	return text;
 }
 
 std::pair<Gfx::Color, Gfx::Color> drawItem::getColor(

src/chart/rendering/drawitem.h

@@ -33,10 +33,10 @@ class drawItem : private DrawingContext
 	void draw(const DrawItem &drawItem,
 	    double factor,
 	    bool line);
-	void drawLabel(const DrawItem &drawItem);
+	void drawLabel(const DrawItem &drawItem, size_t index);
 
 	Gfx::Color getSelectedColor();
-	std::string getLabelText();
+	std::string getLabelText(size_t index) const;
 };
 
 }

test/integration/man.js

@@ -0,0 +1,35 @@
+const yargs = require("yargs");
+
+const Manual = require("./modules/manual/manual.js");
+
+
+try {
+    var argv = yargs
+        .usage("Usage: [options]")
+
+        .help("h")
+        .alias("h", "help")
+        .version(false)
+
+        .alias("p", "port")
+        .describe("p", "Change workspace host's port")
+        .nargs("p", 1)
+        .default("p", "8080")
+
+        .array("c")
+        .alias("c", "configs")
+        .nargs("c", 1)
+        .describe("c",
+            "Change the list of config file's path of the test cases" +
+            "\n(relative or absolute path where the repo folder is the root)" +
+            "\n")
+        .default("c",
+            ["/test/integration/test_cases/test_cases.json"])
+        .argv;
+
+    let manual = new Manual(argv.configs, argv.port);
+    manual.run();
+} catch (err) {
+    process.exitCode = 1;
+    console.error(err);
+}