Animation options object added, can be set from JS API.

(not used in animation for now)

Author: simzer

project/cmake/weblib/emcc.txt

@@ -25,7 +25,8 @@ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} \
 '_removeEventListener',\
 '_event_preventDefault',\
 '_chart_animate',\
-'_anim_control'] \
+'_anim_control',\
+'_anim_setValue'] \
  -s ALLOW_TABLE_GROWTH \
  --js-library ${CMAKE_CURRENT_LIST_DIR}/../../../src/apps/weblib/interface.js \
  -s EXTRA_EXPORTED_RUNTIME_METHODS=[\

src/apps/weblib/cinterface.cpp

@@ -107,3 +107,8 @@ void anim_control(const char *command, const char *param)
 {
 	Interface::instance.animControl(command, param);
 }
+
+void anim_setValue(const char *path, const char *value)
+{
+	Interface::instance.setAnimValue(path, value);
+}

src/apps/weblib/cinterface.h

@@ -25,6 +25,7 @@ extern int addEventListener(const char *name);
 extern void removeEventListener(const char *name, int id);
 extern void event_preventDefault();
 extern void anim_control(const char *command, const char *param);
+extern void anim_setValue(const char *path, const char *value);
 
 }
 

src/apps/weblib/interface.cpp

@@ -136,6 +136,13 @@ void Interface::animControl(const char *command, const char *param)
 	}
 }
 
+void Interface::setAnimValue(const char *path, const char *value)
+{
+	if (chart) {
+		chart->getChart().getAnimOptions().set(path, value);
+	}
+}
+
 void Interface::addCategories(const char *name,
     const char **categories,
     int count)

src/apps/weblib/interface.h

@@ -33,6 +33,7 @@ class Interface
 	void preventDefaultEvent();
 	void animate(void (*callback)());
 	void animControl(const char *command, const char *param);
+	void setAnimValue(const char *path, const char *value);
 
 	static const void *
 	getRecordValue(void *record, const char *column, bool discrete);

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

@@ -86,7 +86,7 @@ export default class Vizzu
 		this.events.remove(eventName, handler);
 	}
 
-	animate(obj)
+	animate(obj, animOptions)
 	{
 		if (obj !== null && obj !== undefined && typeof obj === 'object')
 		{
@@ -95,6 +95,14 @@ export default class Vizzu
 			this.setDescriptor(obj.descriptor);
 		}
 
+		if (animOptions !== null && animOptions !== undefined 
+			&& typeof animOptions === 'object')
+		{
+			this.iterateObject(animOptions, (path, value) => {
+				this.call(this.module._anim_setValue)(path, value);
+			});
+		}
+
 		return new Promise((resolve, reject) => {
 			let callbackPtr = this.module.addFunction(() => {
 				resolve(this);

src/chart/animator/animator.cpp

@@ -28,6 +28,7 @@ void Animator::init(Diag::DiagramPtr diagram)
 }
 
 void Animator::animate(const Diag::DiagramPtr &diagram,
+    Options &&/*options*/,
     OnComplete onThisCompletes)
 {
 	if (isRunning()) throw std::logic_error("animation already in progress");

src/chart/animator/animator.h

@@ -7,6 +7,7 @@
 #include "chart/generator/diagram.h"
 
 #include "planner.h"
+#include "options.h"
 
 namespace Vizzu
 {
@@ -26,6 +27,7 @@ class Animator :
 
 	void init(Diag::DiagramPtr diagram);
 	void animate(const Diag::DiagramPtr &diagram,
+	    Options &&options = Options(),
 	    OnComplete onThisCompletes = OnComplete());
 
 	OnDraw onDraw;

src/chart/animator/options.cpp

@@ -0,0 +1,28 @@
+#include "options.h"
+
+#include "base/conv/parse.h"
+#include "base/text/smartstring.h"
+
+using namespace Vizzu;
+using namespace Vizzu::Anim;
+
+void Options::set(const std::string &path,
+	const std::string &value)
+{
+	auto parts = Text::SmartString::split(path, '.');
+
+	if (parts.size() != 2) 
+		throw std::logic_error("invalid animation option: " + path);
+
+	auto sectionId = SectionId(parts[0]);
+	auto &section = sections.at((int)sectionId);
+
+	auto option = parts[1];
+	if (option == "easing")
+		section.easing = ::Anim::Easing(value);
+	else if (option == "delay")
+		section.delay = ::Anim::Duration(value);
+	else if (option == "duration")
+		section.duration = ::Anim::Duration(value);
+	else throw std::logic_error("invalid animation option: " + option);
+}

src/chart/animator/options.h

@@ -0,0 +1,35 @@
+#ifndef CHART_ANIM_OPTIONS
+#define CHART_ANIM_OPTIONS
+
+#include <array>
+#include <optional>
+
+#include "base/anim/options.h"
+#include "base/refl/enum.h"
+
+namespace Vizzu
+{
+namespace Anim
+{
+
+class Enum(SectionId)
+	(style,title,enable,color,coordsys,shape,vertical,horizontal);
+
+class Options
+{
+public:
+	struct Section {
+		std::optional<::Anim::Easing> easing;
+		std::optional<::Anim::Duration> delay;
+		std::optional<::Anim::Duration> duration;
+	};
+
+	std::array<Section, SectionId::EnumInfo::count()> sections;
+
+	void set(const std::string &path, const std::string &value);
+};
+
+}
+}
+
+#endif