Clear evaluation environment when manager is cleared.

kovacsv · kovacsv · commit ce151fca0696 · 2020-08-30T13:39:07.000+02:00
diff --git a/Sources/NodeEngine/NE_EvaluationEnv.cpp b/Sources/NodeEngine/NE_EvaluationEnv.cpp
@@ -24,6 +24,13 @@ EvaluationEnv::~EvaluationEnv ()
 
 }
 
+void EvaluationEnv::Clear ()
+{
+	if (data != nullptr) {
+		data->Clear ();
+	}
+}
+
 EvaluationEnv EmptyEvaluationEnv (nullptr);
 
 }
diff --git a/Sources/NodeEngine/NE_EvaluationEnv.hpp b/Sources/NodeEngine/NE_EvaluationEnv.hpp
@@ -11,6 +11,8 @@ class EvaluationData
 public:
 	EvaluationData ();
 	virtual ~EvaluationData ();
+
+	virtual void Clear () = 0;
 };
 
 using EvaluationDataPtr = std::shared_ptr<EvaluationData>;
@@ -28,6 +30,8 @@ class EvaluationEnv
 	template <typename T>
 	std::shared_ptr<T> GetData ();
 
+	void Clear ();
+
 private:
 	EvaluationDataPtr data;
 };
diff --git a/Sources/NodeEngineTest/ArithmeticNodesTest.cpp b/Sources/NodeEngineTest/ArithmeticNodesTest.cpp
@@ -13,7 +13,7 @@ namespace ArithmeticNodesTest
 
 TEST (TestAllArithmeticNodes)
 {
-	TestDrawingEnvironment env;
+	TestUIEnvironment env;
 	NodeUIManager uiManager (env);
 
 	UINodePtr val1 = uiManager.AddNode (UINodePtr (new DoubleUpDownNode (LocString (L"Value1"), Point (0, 0), 1.0, 1.0)), EmptyEvaluationEnv);
diff --git a/Sources/NodeEngineTest/DispatcherOutputSlotTest.cpp b/Sources/NodeEngineTest/DispatcherOutputSlotTest.cpp
@@ -96,7 +96,7 @@ class TestCalcEnvironment : public NodeUICalculationEnvironment
 
 TEST (DispatcherOutputSlotEvaluationTest)
 {
-	TestDrawingEnvironment env;
+	TestUIEnvironment env;
 	NodeUIManager uiManager (env);
 
 	UINodePtr dispatcherNode (new DispatcherNode (LocString (L"Node"), Point (0.0, 0.0)));
diff --git a/Sources/NodeEngineTest/EnableDisableFeatureTest.cpp b/Sources/NodeEngineTest/EnableDisableFeatureTest.cpp
@@ -23,6 +23,11 @@ namespace EnableDisableFeatureTest
 class CalculatedCollector : public EvaluationData
 {
 public:
+	virtual void Clear () override
+	{
+		values.clear ();
+	}
+
 	std::unordered_map<NodeId, int> values;
 };
 
@@ -155,7 +160,7 @@ DYNAMIC_SERIALIZATION_INFO (TestNode, 1, "{747EB91C-99ED-401A-98DF-A5BBA8FA4CE6}
 
 TEST (EnableDisableTest)
 {
-	TestDrawingEnvironment env;
+	TestUIEnvironment env;
 	NodeUIManager uiManager (env);
 	TestCalcEnvironment calcEnv;
 
diff --git a/Sources/NodeEngineTest/InputNodesTest.cpp b/Sources/NodeEngineTest/InputNodesTest.cpp
@@ -12,7 +12,7 @@ namespace InputNodesTest
 
 TEST (TestListBuilderNode)
 {
-	TestDrawingEnvironment env;
+	TestUIEnvironment env;
 	NodeUIManager uiManager (env);
 
 	UINodePtr intNode = uiManager.AddNode (UINodePtr (new IntegerUpDownNode (LocString (L"Value1"), Point (0, 0), 1, 1)), EmptyEvaluationEnv);
diff --git a/Sources/NodeEngineTest/NodeTest.cpp b/Sources/NodeEngineTest/NodeTest.cpp
@@ -62,6 +62,11 @@ class DummyEvaluationData : public EvaluationData
 
 	}
 
+	virtual void Clear () override
+	{
+
+	}
+
 	int x;
 };
 
diff --git a/Sources/NodeEngineTest/NodeValueCacheTest.cpp b/Sources/NodeEngineTest/NodeValueCacheTest.cpp
@@ -73,6 +73,11 @@ class InputOutputNode : public SerializableTestNode
 class DummyEvaluationData : public NE::EvaluationData
 {
 public:
+	virtual void Clear () override
+	{
+
+	}
+
 	int x = 5;
 };
 
@@ -317,7 +322,6 @@ TEST (EvaluationEnvTest)
 {
 	NodeManager manager;
 
-
 	std::shared_ptr<DummyEvaluationData> evalData (new DummyEvaluationData ());
 	ASSERT (evalData->x == 5);
 
diff --git a/Sources/NodeEngineTest/TestUtils.cpp b/Sources/NodeEngineTest/TestUtils.cpp
@@ -3,23 +3,77 @@
 #include "NUIE_SkinParams.hpp"
 #include "NUIE_DrawingContext.hpp"
 
-const NE::StringConverter& TestDrawingEnvironment::GetStringConverter ()
+TestUIEnvironment::TestUIEnvironment () :
+	TestUIEnvironment (nullptr)
+{
+
+}
+
+TestUIEnvironment::TestUIEnvironment (const EvaluationDataPtr& data) :
+	evalEnv (data),
+	eventHandler (),
+	clipboardHandler ()
+{
+
+}
+
+const NE::StringConverter& TestUIEnvironment::GetStringConverter ()
 {
 	return GetDefaultStringConverter ();
 }
 
-const SkinParams& TestDrawingEnvironment::GetSkinParams ()
+const SkinParams& TestUIEnvironment::GetSkinParams ()
 {
 	return GetDefaultSkinParams ();
 }
 
-DrawingContext& TestDrawingEnvironment::GetDrawingContext ()
+DrawingContext& TestUIEnvironment::GetDrawingContext ()
 {
 	static NullDrawingContext context;
 	return context;
 }
 
-double TestDrawingEnvironment::GetWindowScale ()
+double TestUIEnvironment::GetWindowScale ()
 {
 	return 1.0;
 }
+
+NE::EvaluationEnv& TestUIEnvironment::GetEvaluationEnv ()
+{
+	return evalEnv;
+}
+
+void TestUIEnvironment::OnEvaluationBegin ()
+{
+
+}
+
+void TestUIEnvironment::OnEvaluationEnd ()
+{
+
+}
+
+void TestUIEnvironment::OnValuesRecalculated ()
+{
+
+}
+
+void TestUIEnvironment::OnRedrawRequested ()
+{
+
+}
+
+NUIE::EventHandler& TestUIEnvironment::GetEventHandler ()
+{
+	return eventHandler;
+}
+
+NUIE::ClipboardHandler& TestUIEnvironment::GetClipboardHandler ()
+{
+	return clipboardHandler;
+}
+
+double TestUIEnvironment::GetMouseMoveMinOffset ()
+{
+	return 2.0;
+}
diff --git a/Sources/NodeEngineTest/TestUtils.hpp b/Sources/NodeEngineTest/TestUtils.hpp
@@ -1,18 +1,38 @@
 #ifndef TESTUTILS_HPP
 #define TESTUTILS_HPP
 
+#include "NUIE_EventHandler.hpp"
+#include "NUIE_ClipboardHandler.hpp"
 #include "NUIE_NodeUIEnvironment.hpp"
 
 using namespace NE;
 using namespace NUIE;
 
-class TestDrawingEnvironment : public NodeUIDrawingEnvironment
+class TestUIEnvironment : public NodeUIEnvironment
 {
 public:
+	TestUIEnvironment ();
+	TestUIEnvironment (const EvaluationDataPtr& data);
+
 	virtual const NE::StringConverter&	GetStringConverter () override;
 	virtual const SkinParams&			GetSkinParams () override;
 	virtual DrawingContext&				GetDrawingContext () override;
 	virtual double						GetWindowScale () override;
+
+	virtual NE::EvaluationEnv&			GetEvaluationEnv () override;
+	virtual void						OnEvaluationBegin () override;
+	virtual void						OnEvaluationEnd () override;
+	virtual void						OnValuesRecalculated () override;
+	virtual void						OnRedrawRequested () override;
+
+	virtual EventHandler&				GetEventHandler () override;
+	virtual ClipboardHandler&			GetClipboardHandler () override;
+	virtual double						GetMouseMoveMinOffset () override;
+
+private:
+	NE::EvaluationEnv					evalEnv;
+	NUIE::NullEventHandler				eventHandler;
+	NUIE::MemoryClipboardHandler		clipboardHandler;
 };
 
 #endif
diff --git a/Sources/NodeEngineTest/UIEngineTest.cpp b/Sources/NodeEngineTest/UIEngineTest.cpp
@@ -16,6 +16,17 @@ using namespace NUIE;
 namespace NodeUIEngineTest
 {
 
+class ClearCalculatorEvalData : public EvaluationData
+{
+public:
+	virtual void Clear () override
+	{
+		clearCount++;
+	}
+
+	int clearCount = 0;
+};
+
 class TestInputSlot : public UIInputSlot
 {
 public:
@@ -36,7 +47,6 @@ class TestOutputSlot : public UIOutputSlot
 	}
 };
 
-
 class TestNode : public SerializableTestUINode
 {
 public:
@@ -66,7 +76,7 @@ class TestNode : public SerializableTestUINode
 
 TEST (UIManagerBaseTest)
 {
-	TestDrawingEnvironment env;
+	TestUIEnvironment env;
 	NodeUIManager uiManager (env);
 
 	UINodePtr node1 (new TestNode (Point (0.0, 0.0)));
@@ -201,4 +211,17 @@ TEST (ViewBoxFitTest)
 	}
 }
 
+TEST (EvaluationEnvClearTest)
+{
+	std::shared_ptr<ClearCalculatorEvalData> evalData (new ClearCalculatorEvalData ());
+	TestUIEnvironment env (evalData);
+	ASSERT (evalData->clearCount == 0);
+
+	NodeUIManager uiManager (env);
+	ASSERT (evalData->clearCount == 1);
+
+	uiManager.New (env);
+	ASSERT (evalData->clearCount == 2);
+}
+
 }
diff --git a/Sources/NodeEngineTest/UINodeTest.cpp b/Sources/NodeEngineTest/UINodeTest.cpp
@@ -200,7 +200,7 @@ class EnumerationParamTestNode : public SerializableTestUINode
 
 TEST (NodeParametersTest)
 {
-	TestDrawingEnvironment env;
+	TestUIEnvironment env;
 	NodeUIManager uiManager (env);
 	UINodePtr node (new TestNode (LocString (L"TestNode"), Point (0, 0)));
 
@@ -234,7 +234,7 @@ TEST (NodeParametersTest)
 
 TEST (NodeParametersTest2)
 {
-	TestDrawingEnvironment env;
+	TestUIEnvironment env;
 	NodeUIManager uiManager (env);
 
 	UINodePtr node (new TestNode (LocString (L"TestNode"), Point (0, 0)));
@@ -277,7 +277,7 @@ TEST (NodeParametersTest2)
 
 TEST (NodeParametersTest3)
 {
-	TestDrawingEnvironment env;
+	TestUIEnvironment env;
 	NodeUIManager uiManager (env);
 
 	UINodePtr node (new TestNode (LocString (L"TestNode"), Point (0, 0)));
@@ -303,7 +303,7 @@ TEST (NodeParametersTest3)
 
 TEST (NodeParametersTest4)
 {
-	TestDrawingEnvironment env;
+	TestUIEnvironment env;
 	NodeUIManager uiManager (env);
 
 	std::shared_ptr<EnumerationParamTestNode> node (new EnumerationParamTestNode (LocString (L"TestNode"), Point (0, 0)));
@@ -330,10 +330,9 @@ TEST (NodeParametersTest4)
 	}
 }
 
-
 TEST (DuplicateNodeTest)
 {
-	TestDrawingEnvironment env;
+	TestUIEnvironment env;
 	NodeUIManager uiManager (env);
 
 	UINodePtr node1 = uiManager.AddNode (UINodePtr (new TestNode (LocString (L"TestNode"), Point (0, 0))), NE::EmptyEvaluationEnv);
diff --git a/Sources/NodeUIEngine/NUIE_NodeUIManager.cpp b/Sources/NodeUIEngine/NUIE_NodeUIManager.cpp
@@ -146,11 +146,11 @@ void NodeUIManagerNodeInvalidator::RequestRedraw ()
 	uiManager.RequestRedraw ();
 }
 
-NodeUIManager::NodeUIManager (NodeUIDrawingEnvironment& env) :
+NodeUIManager::NodeUIManager (NodeUIEnvironment& env) :
 	nodeManager (),
 	selectedNodes (),
 	undoHandler (),
-	viewBox (Point (0.0, 0.0), env.GetWindowScale ()),
+	viewBox (),
 	status ()
 {
 	New (env);
@@ -577,13 +577,13 @@ void NodeUIManager::SetUpdateMode (UpdateMode newUpdateMode)
 	}
 }
 
-void NodeUIManager::New (NodeUIDrawingEnvironment& env)
+void NodeUIManager::New (NodeUIEnvironment& env)
 {
 	Clear (env);
 	RequestRecalculateAndRedraw ();
 }
 
-bool NodeUIManager::Open (NodeUIDrawingEnvironment& env, NE::InputStream& inputStream)
+bool NodeUIManager::Open (NodeUIEnvironment& env, NE::InputStream& inputStream)
 {
 	Clear (env);
 	Read (inputStream);
@@ -721,12 +721,18 @@ void NodeUIManager::ExecuteCommand (NodeUIManagerCommandPtr& command)
 	ExecuteCommand (*command);
 }
 
-void NodeUIManager::Clear (NodeUIDrawingEnvironment& env)
+void NodeUIManager::Clear (NodeUIEnvironment& env)
 {
+	NE::EvaluationEnv& evalEnv = env.GetEvaluationEnv ();
+	double windowScale = env.GetWindowScale ();
+
 	selectedNodes.Clear ();
 	undoHandler.Clear ();
 	nodeManager.Clear ();
-	viewBox = ViewBox (Point (0.0, 0.0), env.GetWindowScale ());
+
+	evalEnv.Clear ();
+	viewBox.Set (Point (0.0, 0.0), windowScale);
+
 	status.Reset ();
 }
 
diff --git a/Sources/NodeUIEngine/NUIE_NodeUIManager.hpp b/Sources/NodeUIEngine/NUIE_NodeUIManager.hpp
diff --git a/Sources/NodeUIEngine/NUIE_ViewBox.cpp b/Sources/NodeUIEngine/NUIE_ViewBox.cpp
diff --git a/Sources/NodeUIEngine/NUIE_ViewBox.hpp b/Sources/NodeUIEngine/NUIE_ViewBox.hpp

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,13 @@ EvaluationEnv::~EvaluationEnv ()`
`24`	`24`
`25`	`25`	`}`
`26`	`26`
	`27`	`+void EvaluationEnv::Clear ()`
	`28`	`+{`
	`29`	`+ if (data != nullptr) {`
	`30`	`+ data->Clear ();`
	`31`	`+ }`
	`32`	`+}`
	`33`	`+`
`27`	`34`	`EvaluationEnv EmptyEvaluationEnv (nullptr);`
`28`	`35`
`29`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ namespace ArithmeticNodesTest`
`13`	`13`
`14`	`14`	`TEST (TestAllArithmeticNodes)`
`15`	`15`	`{`
`16`		`- TestDrawingEnvironment env;`
	`16`	`+ TestUIEnvironment env;`
`17`	`17`	`NodeUIManager uiManager (env);`
`18`	`18`
`19`	`19`	`UINodePtr val1 = uiManager.AddNode (UINodePtr (new DoubleUpDownNode (LocString (L"Value1"), Point (0, 0), 1.0, 1.0)), EmptyEvaluationEnv);`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ class TestCalcEnvironment : public NodeUICalculationEnvironment`
`96`	`96`
`97`	`97`	`TEST (DispatcherOutputSlotEvaluationTest)`
`98`	`98`	`{`
`99`		`- TestDrawingEnvironment env;`
	`99`	`+ TestUIEnvironment env;`
`100`	`100`	`NodeUIManager uiManager (env);`
`101`	`101`
`102`	`102`	`UINodePtr dispatcherNode (new DispatcherNode (LocString (L"Node"), Point (0.0, 0.0)));`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ namespace InputNodesTest`
`12`	`12`
`13`	`13`	`TEST (TestListBuilderNode)`
`14`	`14`	`{`
`15`		`- TestDrawingEnvironment env;`
	`15`	`+ TestUIEnvironment env;`
`16`	`16`	`NodeUIManager uiManager (env);`
`17`	`17`
`18`	`18`	`UINodePtr intNode = uiManager.AddNode (UINodePtr (new IntegerUpDownNode (LocString (L"Value1"), Point (0, 0), 1, 1)), EmptyEvaluationEnv);`
Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,11 @@ class DummyEvaluationData : public EvaluationData`
`62`	`62`
`63`	`63`	`}`
`64`	`64`
	`65`	`+ virtual void Clear () override`
	`66`	`+ {`
	`67`	`+`
	`68`	`+ }`
	`69`	`+`
`65`	`70`	`int x;`
`66`	`71`	`};`
`67`	`72`