Do not clear evaluation environment from new and open, because it can cause issues on the client side.

Author: kovacsv

Sources/NodeEngine/NE_EvaluationEnv.cpp

@@ -24,13 +24,6 @@ EvaluationEnv::~EvaluationEnv ()
 
 }
 
-void EvaluationEnv::Clear ()
-{
-	if (data != nullptr) {
-		data->Clear ();
-	}
-}
-
 EvaluationEnv EmptyEvaluationEnv (nullptr);
 
 }

Sources/NodeEngine/NE_EvaluationEnv.hpp

@@ -11,8 +11,6 @@ class EvaluationData
 public:
 	EvaluationData ();
 	virtual ~EvaluationData ();
-
-	virtual void Clear () = 0;
 };
 
 using EvaluationDataPtr = std::shared_ptr<EvaluationData>;
@@ -30,8 +28,6 @@ class EvaluationEnv
 	template <typename T>
 	std::shared_ptr<T> GetData ();
 
-	void Clear ();
-
 private:
 	EvaluationDataPtr data;
 };

Sources/NodeEngineTest/EnableDisableFeatureTest.cpp

@@ -23,11 +23,6 @@ namespace EnableDisableFeatureTest
 class CalculatedCollector : public EvaluationData
 {
 public:
-	virtual void Clear () override
-	{
-		values.clear ();
-	}
-
 	std::unordered_map<NodeId, int> values;
 };
 

Sources/NodeEngineTest/NodeTest.cpp

@@ -62,11 +62,6 @@ class DummyEvaluationData : public EvaluationData
 
 	}
 
-	virtual void Clear () override
-	{
-
-	}
-
 	int x;
 };
 

Sources/NodeEngineTest/NodeValueCacheTest.cpp

@@ -73,11 +73,6 @@ class InputOutputNode : public SerializableTestNode
 class DummyEvaluationData : public NE::EvaluationData
 {
 public:
-	virtual void Clear () override
-	{
-
-	}
-
 	int x = 5;
 };
 

Sources/NodeEngineTest/UIEngineTest.cpp

@@ -16,17 +16,6 @@ using namespace NUIE;
 namespace NodeUIEngineTest
 {
 
-class ClearCalculatorEvalData : public EvaluationData
-{
-public:
-	virtual void Clear () override
-	{
-		clearCount++;
-	}
-
-	int clearCount = 0;
-};
-
 class TestInputSlot : public UIInputSlot
 {
 public:
@@ -211,17 +200,4 @@ 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);
-}
-
 }

Sources/NodeUIEngine/NUIE_NodeUIManager.cpp

@@ -723,16 +723,13 @@ void NodeUIManager::ExecuteCommand (NodeUIManagerCommandPtr& command)
 
 void NodeUIManager::Clear (NodeUIEnvironment& env)
 {
-	NE::EvaluationEnv& evalEnv = env.GetEvaluationEnv ();
 	double windowScale = env.GetWindowScale ();
 
 	selectedNodes.Clear ();
 	undoHandler.Clear ();
 	nodeManager.Clear ();
 
-	evalEnv.Clear ();
 	viewBox.Set (Point (0.0, 0.0), windowScale);
-
 	status.Reset ();
 }