Added PlotWindow exceptions

ComplexPlotting/CMakeLists.txt

@@ -14,7 +14,7 @@ endif()
 # Add source to this project's executable.
 add_executable (ComplexPlotting  
 	"main.cpp"
- "PlotWindow.hpp" "PlotWindow.cpp" "PlotWindowManager.hpp")
+ "PlotWindow.hpp" "PlotWindow.cpp" "PlotWindowManager.hpp" "PlotWindowException.hpp")
 
 target_include_directories(ComplexPlotting PRIVATE
 	${SDL2_INCLUDES}

ComplexPlotting/PlotWindow.cpp

@@ -1,4 +1,5 @@
 #include "PlotWindow.hpp"
+#include "PlotWindowException.hpp"
 
 #include <iostream>
 
@@ -43,8 +44,9 @@ PlotWindow::PlotWindow(Uint32 id, std::string title) :
 		UnitVector2i * SDL_WINDOWPOS_UNDEFINED,
 		"Plot " + std::to_string(id) + " [" + title + "]",
 		NULL),
-	id(id)
+	id(id), texture(nullptr)
 {
+
 }
 
 void PlotWindow::SetCallback(CmplxFunc callback)
@@ -52,6 +54,17 @@ void PlotWindow::SetCallback(CmplxFunc callback)
 	this->callback = callback;
 }
 
+bool PlotWindow::OnCreate()
+{
+	int w = 0, h = 0;
+	SDL_GetWindowSize(m_pWindow, &w, &h);
+	texture = SDL_CreateTexture(m_pRenderer, SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_TARGET, w, h);
+	if (texture != nullptr)
+		throw PlotWindowException("Failed to create SDL_Texture.", this);
+
+	return true;
+}
+
 bool PlotWindow::OnEvent(const SDL_Event& e)
 {
 	if (e.window.windowID != m_uWindowID)

ComplexPlotting/PlotWindow.hpp

@@ -19,6 +19,7 @@ public:
 
 	void SetCallback(CmplxFunc callback);
 
+	bool OnCreate() override;
 	bool OnEvent(const SDL_Event& e) override;
 	bool OnUpdate(double frametime = 0) override;
 	void OnRender(SDL_Renderer* renderer = nullptr) override;
@@ -26,4 +27,6 @@ public:
 private:
 	Uint32 id;
 	CmplxFunc callback;
+
+	SDL_Texture* texture;
 };

ComplexPlotting/PlotWindowManager.hpp

@@ -1,5 +1,7 @@
 #include "PlotWindow.hpp"
 
+#include "PlotWindowException.hpp"
+
 #include <map>
 #include <thread>
 #include <future>
@@ -13,9 +15,18 @@ public:
 	static PlotWindow* MakeNew(std::string title)
 	{
 		PlotWindow* plt = new PlotWindow(PlotWindowCount, title);
+		plt->Open();
+
+		float a = (float)(rand() % 200 - 100) / 100.f;
+		float b = (float)(rand() % 200 - 100) / 100.f;
+		plt->SetCallback(std::bind([a, b](std::complex<float> c)
+			{
+				return std::complex<float>{ a, b };
+			},
+			std::placeholders::_1));
+
 		PlotWindows.insert({ PlotWindowCount, plt });
 		PlotWindowCount++;
-		plt->Open();
 
 		return plt;
 	}
@@ -46,16 +57,22 @@ public:
 			std::string title = InputFuture.get();
 			if (title != "")
 			{
-				PlotWindow* newWindow = MakeNew(title);
-				float a = (float)(rand() % 200 - 100) / 100.f;
-				float b = (float)(rand() % 200 - 100) / 100.f;
-				newWindow->SetCallback(std::bind([a, b](std::complex<float> c)
+				try
 				{
-					return std::complex<float>{ a, b };
-				}, 
-				std::placeholders::_1));
+					PlotWindow* newWindow = MakeNew(title);
+					PrintThreadSafe("-- Success\n");
+				}
+				catch (PlotWindowException e)
+				{
+					PrintThreadSafe(e.what());
+					PrintThreadSafe("\n");
+					PrintThreadSafe("-- Failed.\n");
 
-				PrintThreadSafe("-- Success\n");
+					PlotWindow* src = e.where();
+					src->Stop();
+					delete src;
+					src = nullptr;
+				}
 			}
 
 			InputPromise = std::promise<std::string>();