Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add option to keep input filename in imageSegmentation #1636

Merged
merged 2 commits into from
Jan 10, 2024
Merged

Add option to keep input filename in imageSegmentation #1636

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be8a855
[imageSegmentation] Add option to keep input filename.
cbentejac Jan 10, 2024
8988fad
[software] ImageSegmentation: Update version minor
cbentejac Jan 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions src/software/pipeline/main_imageSegmentation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include <OpenImageIO/imagebufalgo.h>

// IO
#include <filesystem>
#include <fstream>
#include <algorithm>
#include <memory>
Expand All @@ -34,11 +35,12 @@
// These constants define the current software version.
// They must be updated when the command line is changed.
#define ALICEVISION_SOFTWARE_VERSION_MAJOR 1
#define ALICEVISION_SOFTWARE_VERSION_MINOR 1
#define ALICEVISION_SOFTWARE_VERSION_MINOR 2

using namespace aliceVision;

namespace po = boost::program_options;
namespace fs = std::filesystem;

void imageToPlanes(std::vector<float> & output, const image::Image<image::RGBfColor>::Base & source)
{
Expand Down Expand Up @@ -91,6 +93,7 @@ int aliceVision_main(int argc, char** argv)
int rangeStart = -1;
int rangeSize = 1;
bool useGpu = true;
bool keepFilename = false;

// Description of mandatory parameters
po::options_description requiredParams("Required parameters");
Expand All @@ -107,10 +110,12 @@ int aliceVision_main(int argc, char** argv)
"Invert mask values. If selected, the pixels corresponding to the mask will be set to 0.0 instead of 1.0.")
("useGpu", po::value<bool>(&useGpu)->default_value(useGpu),
"Use GPU if available.")
("keepFilename", po::value<bool>(&keepFilename)->default_value(keepFilename),
"Keep input filename.")
("rangeStart", po::value<int>(&rangeStart)->default_value(rangeStart),
"Range start for processing views (ordered by image filepath). Set to -1 to process all images.")
"Range start for processing views (ordered by image filepath). Set to -1 to process all images.")
("rangeSize", po::value<int>(&rangeSize)->default_value(rangeSize),
"Range size for processing views (ordered by image filepath).");
"Range size for processing views (ordered by image filepath).");

CmdLine cmdline("AliceVision imageSegmentation");
cmdline.add(requiredParams);
Expand Down Expand Up @@ -215,6 +220,9 @@ int aliceVision_main(int argc, char** argv)
std::string path = view->getImage().getImagePath();
ALICEVISION_LOG_INFO("processing " << path);

const fs::path fsPath = path;
const std::string fileName = fsPath.stem().string();

image::Image<image::RGBfColor> image;
image::readImage(path, image, image::EImageColorSpace::SRGB);

Expand Down Expand Up @@ -260,7 +268,15 @@ int aliceVision_main(int argc, char** argv)

// Store image
std::stringstream ss;
ss << outputPath << "/" << view->getViewId() << ".exr";
if (keepFilename)
{
ss << outputPath << "/" << fileName << ".exr";
}
else
{
ss << outputPath << "/" << view->getViewId() << ".exr";
}

image::writeImage(ss.str(), mask, image::ImageWriteOptions());
}

Expand Down
Loading