get rid of some warnings
This commit is contained in:
+4
-5
@@ -124,10 +124,8 @@ int pixelarium::ui::AppGLFW::Run()
|
|||||||
|
|
||||||
if (ImGui::BeginListBox("ListBox"))
|
if (ImGui::BeginListBox("ListBox"))
|
||||||
{
|
{
|
||||||
pool_.EnumerateResources([](size_t id, const imaging::PixelariumImage& img) -> void
|
pool_.EnumerateResources([](size_t id, const imaging::PixelariumImage&) -> void
|
||||||
{
|
{ ImGui::Selectable(std::format("Image {}", id).c_str()); });
|
||||||
ImGui::Selectable(std::format("Image {}", id).c_str());
|
|
||||||
});
|
|
||||||
|
|
||||||
ImGui::EndListBox();
|
ImGui::EndListBox();
|
||||||
}
|
}
|
||||||
@@ -203,11 +201,12 @@ void pixelarium::ui::AppGLFW::MenuBar()
|
|||||||
|
|
||||||
void pixelarium::ui::AppGLFW::LoadImageProt()
|
void pixelarium::ui::AppGLFW::LoadImageProt()
|
||||||
{
|
{
|
||||||
|
size_t last_id{};
|
||||||
auto res{pfd::open_file("Load Inputs", pfd::path::home(), {"All Files", "*"}, pfd::opt::multiselect).result()};
|
auto res{pfd::open_file("Load Inputs", pfd::path::home(), {"All Files", "*"}, pfd::opt::multiselect).result()};
|
||||||
for (auto& p : res)
|
for (auto& p : res)
|
||||||
{
|
{
|
||||||
this->logger_.Debug(std::format("{}: Creating image {}", __FUNCTION__, p));
|
this->logger_.Debug(std::format("{}: Creating image {}", __FUNCTION__, p));
|
||||||
|
|
||||||
image_view_model_->AddImage(std::make_unique<PixelariumImage>(p));
|
last_id = image_view_model_->AddImage(std::make_unique<PixelariumImage>(p));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -82,9 +82,7 @@ TEST(ImageResourcePoolTest, EnumerateResources)
|
|||||||
auto id2 = pool.SetResource(std::make_unique<DummyImage>());
|
auto id2 = pool.SetResource(std::make_unique<DummyImage>());
|
||||||
std::vector<size_t> found_ids{};
|
std::vector<size_t> found_ids{};
|
||||||
|
|
||||||
std::function<void(size_t, const pixelarium::imaging::PixelariumImage&)> func =
|
pool.EnumerateResources([&found_ids](size_t id, const pixelarium::imaging::PixelariumImage&) { found_ids.push_back(id); });
|
||||||
[&found_ids](size_t id, const pixelarium::imaging::PixelariumImage&) { found_ids.push_back(id); };
|
|
||||||
pool.EnumerateResources(func);
|
|
||||||
|
|
||||||
EXPECT_EQ(found_ids.size(), 2);
|
EXPECT_EQ(found_ids.size(), 2);
|
||||||
EXPECT_NE(std::find(found_ids.begin(), found_ids.end(), id1), found_ids.end());
|
EXPECT_NE(std::find(found_ids.begin(), found_ids.end(), id1), found_ids.end());
|
||||||
@@ -98,7 +96,7 @@ TEST(ImageResourcePoolTest, TemplatedEnumerate)
|
|||||||
auto id2 = pool.SetResource(std::make_unique<DummyImage>());
|
auto id2 = pool.SetResource(std::make_unique<DummyImage>());
|
||||||
std::vector<size_t> found_ids{};
|
std::vector<size_t> found_ids{};
|
||||||
|
|
||||||
pool.Enumerate([&found_ids](size_t id, const pixelarium::imaging::PixelariumImage& img) { found_ids.push_back(id); });
|
pool.Enumerate([&found_ids](size_t id, const pixelarium::imaging::PixelariumImage&) { found_ids.push_back(id); });
|
||||||
|
|
||||||
EXPECT_EQ(found_ids.size(), 2);
|
EXPECT_EQ(found_ids.size(), 2);
|
||||||
EXPECT_NE(std::find(found_ids.begin(), found_ids.end(), id1), found_ids.end());
|
EXPECT_NE(std::find(found_ids.begin(), found_ids.end(), id1), found_ids.end());
|
||||||
|
|||||||
Reference in New Issue
Block a user