lauchmelder/ComplexPlotting
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Added PlotWindow exceptions

Browse source
This commit is contained in:
Robert 2020-08-28 14:31:36 +02:00
parent c9ec50f097
commit 39c93db9c2
4 changed files with 44 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ComplexPlotting/CMakeLists.txt
View file

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

15
ComplexPlotting/PlotWindow.cpp
View file

@ -1,4 +1,5 @@
#include "PlotWindow.hpp" #include "PlotWindow.hpp"
#include "PlotWindowException.hpp"
#include <iostream> #include <iostream>
@ -43,8 +44,9 @@ PlotWindow::PlotWindow(Uint32 id, std::string title) :
UnitVector2i * SDL_WINDOWPOS_UNDEFINED, UnitVector2i * SDL_WINDOWPOS_UNDEFINED,
"Plot " + std::to_string(id) + " [" + title + "]", "Plot " + std::to_string(id) + " [" + title + "]",
NULL), NULL),
id(id) id(id), texture(nullptr)
{ {
} }
void PlotWindow::SetCallback(CmplxFunc callback) void PlotWindow::SetCallback(CmplxFunc callback)
@ -52,6 +54,17 @@ void PlotWindow::SetCallback(CmplxFunc callback)
this->callback = 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) bool PlotWindow::OnEvent(const SDL_Event& e)
{ {
if (e.window.windowID != m_uWindowID) if (e.window.windowID != m_uWindowID)

3
ComplexPlotting/PlotWindow.hpp
View file

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

35
ComplexPlotting/PlotWindowManager.hpp
View file

@ -1,5 +1,7 @@
#include "PlotWindow.hpp" #include "PlotWindow.hpp"
#include "PlotWindowException.hpp"
#include <map> #include <map>
#include <thread> #include <thread>
#include <future> #include <future>
@ -13,9 +15,18 @@ public:
static PlotWindow* MakeNew(std::string title) static PlotWindow* MakeNew(std::string title)
{ {
PlotWindow* plt = new PlotWindow(PlotWindowCount, 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 }); PlotWindows.insert({ PlotWindowCount, plt });
PlotWindowCount++; PlotWindowCount++;
plt->Open();
return plt; return plt;
} }
@ -46,16 +57,22 @@ public:
std::string title = InputFuture.get(); std::string title = InputFuture.get();
if (title != "") if (title != "")
{ {
PlotWindow* newWindow = MakeNew(title); try
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)
{ {
return std::complex<float>{ a, b }; PlotWindow* newWindow = MakeNew(title);
}, PrintThreadSafe("-- Success\n");
std::placeholders::_1)); }
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>(); InputPromise = std::promise<std::string>();