Czi rendering (#10)
* add dimension selector sliders to czi view * version doc & version bump * cosmetic * fix build? * multi-dimension selection enabled in czi view * remove the parameterized reset function of the renderer it is not and is conceptually questionable doc updates & some minor improvements auto-update CZI-view when sliders are moved set initial window size fix windows build and msvc build For reasons I don not comprehend, on Windows, we must include =opencv2/core/mat.hpp= as the very last header in the =CvMatRender.hpp=. If this is at any other position building on Windows, compilation will break w/ all kinds of cryptic errors regarding OpenCV. When building w/ msvc =__PRETTY_FUNCTION__= is not defined. =ILog.hpp= now defines it. This should be revised to only be set when the compiler is msvc. For the time being, it is considered sufficient though.
This commit is contained in:
committed by
Maximilian Kueffner
parent
e60203b57d
commit
1ea83d9d11
@@ -9,19 +9,33 @@
|
||||
|
||||
namespace pixelarium::application
|
||||
{
|
||||
/// @brief Base class providing scaffolding with GLFW and some default
|
||||
/// implementations that can be extended and/or overridden by consumers
|
||||
class AppGLFW
|
||||
{
|
||||
public:
|
||||
explicit AppGLFW(const utils::log::ILog& log) : logger_(log) { this->InitMainWindow(); }
|
||||
|
||||
/// @brief Start the main render loop
|
||||
void Start() { this->RunLoop(); }
|
||||
|
||||
protected:
|
||||
/// @brief Function implementing the first column of the menu bar (e.g. "Menu")
|
||||
virtual void MenuBarOptionsColumn1() {}
|
||||
|
||||
/// @brief Function implementing the second column of the menu bar (e.g. "File")
|
||||
virtual void MenuBarOptionsColumn2() {}
|
||||
|
||||
/// @brief Function implementing the third column of the menu bar (e.g. "Options")
|
||||
virtual void MenuBarOptionsColumn3() {}
|
||||
|
||||
/// @brief Function implementing the fourth column of the menu bar (e.g. "More")
|
||||
virtual void MenuBarOptionsColumn4() {}
|
||||
|
||||
/// @brief Function implementing the first column of the menu bar (e.g. "Help")
|
||||
virtual void MenuBarOptionsColumn5() {}
|
||||
|
||||
/// @brief Main function that gets called within the render loop.
|
||||
virtual void Run() {}
|
||||
|
||||
const utils::log::ILog& logger_;
|
||||
|
||||
@@ -128,7 +128,7 @@ void pixelarium::ui::DefaultApp::LoadImage()
|
||||
|
||||
try
|
||||
{
|
||||
pool_.SetResource(PixelariumImageFactory::CreateImage(p));
|
||||
pool_.SetResource(PixelariumImageFactory::CreateImage(p, logger_));
|
||||
}
|
||||
catch (pixelarium::resources::empty_resource_exception& e)
|
||||
{
|
||||
|
||||
@@ -11,6 +11,9 @@
|
||||
|
||||
namespace pixelarium::ui
|
||||
{
|
||||
/// @brief Default implementation of AppGLFW.
|
||||
/// This can either be used as is, as an example or as a base class
|
||||
/// providing some defaults for a more custom implementation.
|
||||
class DefaultApp : public application::AppGLFW
|
||||
{
|
||||
public:
|
||||
|
||||
Reference in New Issue
Block a user