max/pixelarium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Proper image rendering ux (#5)

Browse Source 
* can draw from selection

* add light-weight render manager to render many images simultaneously

* [debug me] currently the image close button does not do

* the unselected image can be closed now

* can close images and manually open them on demand

* cosmetic

* image view stuff in render subdirectory

* cosmetic

* generate docs

* review

windows support

some cosmetics

💅 and pin libCZI module
This commit is contained in:
m-aXimilian
2025-09-13 14:49:59 +02:00
committed by Maximilian Kueffner
parent 2990f3313d
commit bce12b0bb4
21 changed files with 436 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/resources/resource.cpp
+14 -6
View File
@@ -1,7 +1,9 @@
#include "resource.hpp"
#include <atomic>
#include <cstddef>
#include <functional>
#include <mutex>
#include <optional>
using pixelarium::imaging::PixelariumImage;
@@ -20,7 +22,7 @@ size_t GenerateId() { return id_.fetch_add(1, memory_order_relaxed); }
/// @brief Retrieves a resource from the pool.
/// @param id The ID of the resource to retrieve.
/// @return A pointer to the resource if found, otherwise an empty optional.
std::optional<const PixelariumImage*> pixelarium::resources::ImageResourcePool::GetResource(size_t id) const
std::optional<const PixelariumImage*> pixelarium::resources::ImageResourcePool::GetResource(ResourceKey id) const
{
auto search{this->resources_.find(id)};
if (search == this->resources_.end()) return std::nullopt;
@@ -34,7 +36,10 @@ std::optional<const PixelariumImage*> pixelarium::resources::ImageResourcePool::
size_t pixelarium::resources::ImageResourcePool::SetResource(unique_ptr<PixelariumImage> res)
{
auto key{::GenerateId()};
this->resources_.insert({key, std::move(res)});
{
std::lock_guard<std::mutex> guard(this->mut_);
this->resources_.insert({key, std::move(res)});
}
return key;
}
@@ -43,7 +48,8 @@ size_t pixelarium::resources::ImageResourcePool::SetResource(unique_ptr<Pixelari
/// @param id The ID of the resource to update.
/// @param res A unique pointer to the new resource.
/// @return True if the resource was updated, false otherwise.
bool pixelarium::resources::ImageResourcePool::ModifyResource(size_t id, std::unique_ptr<imaging::PixelariumImage> res)
bool pixelarium::resources::ImageResourcePool::ModifyResource(ResourceKey id,
std::unique_ptr<imaging::PixelariumImage> res)
{
auto search{this->resources_.find(id)};
if (search == this->resources_.end()) return false;
@@ -56,7 +62,7 @@ bool pixelarium::resources::ImageResourcePool::ModifyResource(size_t id, std::un
/// @brief Deletes a resource from the pool.
/// @param id The ID of the resource to delete.
/// @return True if the resource was deleted, false otherwise.
bool pixelarium::resources::ImageResourcePool::DeleteResource(size_t id)
bool pixelarium::resources::ImageResourcePool::DeleteResource(ResourceKey id)
{
auto search{this->resources_.find(id)};
if (search == this->resources_.end()) return false;
@@ -70,10 +76,12 @@ bool pixelarium::resources::ImageResourcePool::DeleteResource(size_t id)
/// @param func A function to call for each resource. The function should accept the resource ID and a const reference
/// to a PixelariumImage.
void pixelarium::resources::ImageResourcePool::EnumerateResources(
const std::function<void(size_t, const imaging::PixelariumImage&)>& func)
const std::function<void(ResourceKey, size_t, const imaging::PixelariumImage&)>& func)
{
size_t idx{0};
for (const auto& e : this->resources_)
{
func(e.first, *e.second);
func(e.first, idx, *e.second);
++idx;
}
}
lib/resources/resource.hpp
+15 -11
View File
@@ -3,6 +3,7 @@
#include <concepts>
#include <functional>
#include <memory>
#include <mutex>
#include <optional>
#include <unordered_map>
@@ -10,6 +11,7 @@
namespace pixelarium::resources
{
using ResourceKey = size_t;
struct IResource
{
virtual ~IResource() = default;
@@ -24,10 +26,10 @@ class IResourcePool
public:
virtual ~IResourcePool() = default;
virtual std::optional<const ResT*> GetResource(size_t id) const = 0;
virtual size_t SetResource(std::unique_ptr<ResT> res) = 0;
virtual bool ModifyResource(size_t id, std::unique_ptr<ResT> res) = 0;
virtual bool DeleteResource(size_t id) = 0;
virtual void EnumerateResources(const std::function<void(size_t, const ResT&)>& func) = 0;
virtual ResourceKey SetResource(std::unique_ptr<ResT> res) = 0;
virtual bool ModifyResource(ResourceKey id, std::unique_ptr<ResT> res) = 0;
virtual bool DeleteResource(ResourceKey id) = 0;
virtual void EnumerateResources(const std::function<void(ResourceKey, size_t, const imaging::PixelariumImage&)>& func) = 0;
virtual size_t GetTotalSize() const = 0;
};
@@ -46,20 +48,21 @@ class ImageResourcePool : public IResourcePool<imaging::PixelariumImage>
ImageResourcePool& operator=(ImageResourcePool&) = delete;
ImageResourcePool& operator=(ImageResourcePool&&) = delete;
std::optional<const imaging::PixelariumImage*> GetResource(size_t id) const override;
size_t SetResource(std::unique_ptr<imaging::PixelariumImage> res) override;
bool ModifyResource(size_t id, std::unique_ptr<imaging::PixelariumImage> res) override;
bool DeleteResource(size_t id) override;
std::optional<const imaging::PixelariumImage*> GetResource(ResourceKey id) const override;
ResourceKey SetResource(std::unique_ptr<imaging::PixelariumImage> res) override;
bool ModifyResource(ResourceKey id, std::unique_ptr<imaging::PixelariumImage> res) override;
bool DeleteResource(ResourceKey id) override;
void EnumerateResources(const std::function<void(size_t, const imaging::PixelariumImage&)>& func) override;
void EnumerateResources(const std::function<void(ResourceKey, size_t, const imaging::PixelariumImage&)>& func) override;
template <typename Callable>
requires std::invocable<Callable, size_t, const imaging::PixelariumImage&>
requires std::invocable<Callable, ResourceKey, size_t, const imaging::PixelariumImage&>
void Enumerate(Callable&& func) const
{
size_t idx{0};
for (const auto& e : this->resources_)
{
func(e.first, *e.second);
func(e.first, idx, *e.second);
}
}
@@ -67,5 +70,6 @@ class ImageResourcePool : public IResourcePool<imaging::PixelariumImage>
private:
std::unordered_map<size_t, std::unique_ptr<imaging::PixelariumImage>> resources_;
std::mutex mut_;
};
} // namespace pixelarium::resources