Skip to content

Add PCAFusion Pan-Sharpening #44

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

Merged
birkholz-cubert merged 4 commits into from
Dec 15, 2025
Merged

Add PCAFusion Pan-Sharpening #44

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0cdfd24
update for pansharpening changes
manke-cubert Nov 10, 2025
3aa33fd
simplify settings for viewer
manke-cubert Nov 12, 2025
5def443
Add new pansharpening settings
manke-cubert Dec 12, 2025
b0996f8
Add DPC functions
manke-cubert Dec 12, 2025
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
137 changes: 95 additions & 42 deletions interface/cuvis.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ namespace cuvis

struct ProcessingArgs;

struct PanSharpeningArgs;
struct SaveArgs;
struct TiffArgs;
struct EnviArgs;
Expand Down Expand Up @@ -256,20 +257,17 @@ namespace cuvis
std::shared_ptr<CUVIS_VIEW> _ref;
};

/** @brief Export Settings common to all exporters
/** @brief Settings defining Pansharpening and channel selection for all exporters
*
* The options of this structure can be set for any @ref Exporter. However, not all options are respected by the @ref Exporter.
* */
struct GeneralExportArgs
struct PanSharpeningArgs
{
/** Constructor to create default parameters */
GeneralExportArgs();
PanSharpeningArgs();

/** convert to C - SDK settings structure */
operator cuvis_export_general_settings_t() const;

/** The directory where the files should be exported to (default: ".") */
std::filesystem::path export_dir;
operator cuvis_pansharpening_settings_t() const;

/** @brief The selection of spectral channels to be exproted. (default : "all")
*
Expand Down Expand Up @@ -301,28 +299,47 @@ namespace cuvis
* */
pan_sharpening_algorithm_t pan_algorithm;

/**
* @copydoc cuvis_viewer_settings_t.blend_opacity
*/
double blend_opacity;
/**
* @copydoc cuvis_viewer_settings_t.pre_pan_sharpen_cube
*/
bool pre_pan_sharpen_cube;

/** @brief Add the pan image to the output (default: @ref false)
*
* @copydoc cuvis_export_general_settings_t.add_pan
* */
bool add_pan;
};

/** @brief Export Settings common to all exporters
*
* The options of this structure can be set for any @ref Exporter. However, not all options are respected by the @ref Exporter.
* */
struct GeneralExportArgs
{
/** Constructor to create default parameters */
GeneralExportArgs();

/** convert to C - SDK settings structure */
operator cuvis_export_general_settings_t() const;

/** The directory where the files should be exported to (default: ".") */
std::filesystem::path export_dir;

/** @brief Add a full-resolution pan image to the export (default: @ref false)
*
* @copydoc cuvis_export_general_settings_t.add_fullscale_pan
* */
bool add_fullscale_pan;

/** @brief Set @ref Expor ter to permisive mode (default: @ref false)
/** @brief Set @ref Exporter to permisive mode (default: @ref false)
*
* @copydoc cuvis_export_general_settings_t.permissive
* */
bool permissive;

/** @brief Settings to define Pansharpening and channel selection */
struct PanSharpeningArgs pansharpening_settings;
};

/** @brief Options for saving cu3s/cu3 files
Expand Down Expand Up @@ -456,21 +473,17 @@ namespace cuvis
*/
std::string userplugin;

/**
* @copydoc cuvis_viewer_settings_t.pre_pan_sharpen_cube
*/
bool pre_pan_sharpen_cube;

/**
* @copydoc cuvis_viewer_settings_t.complete
*/
/**
* @copydoc cuvis_viewer_settings_t.complete
*/
bool complete;

/**
* @copydoc cuvis_viewer_settings_t.pan_failback
*/
bool pan_failback;
};

/** @brief processing arguments */
struct ProcessingArgs
{
Expand Down Expand Up @@ -1249,6 +1262,12 @@ namespace cuvis
void register_state_change_callback(state_callback_t callback, bool output_initial_state = true);
void reset_state_change_callback();

bool get_dead_pixel_correction_available() const;

bool get_dead_pixel_correction_enabled() const;

void set_dead_pixel_correction_enabled(bool enable);

#define ACQ_STUB_0a(funname, sdkname, type_ifcae, type_wrapped) \
type_wrapped get_##funname() const \
{ \
Expand Down Expand Up @@ -2449,6 +2468,24 @@ namespace cuvis
}
}


inline bool AcquisitionContext::get_dead_pixel_correction_available() const {
CUVIS_INT available;
chk(cuvis_acq_cont_dead_pixel_correction_available_get(*_acqCont, &available));
return available != 0;
}

inline bool AcquisitionContext::get_dead_pixel_correction_enabled() const {
CUVIS_INT enabled;
chk(cuvis_acq_cont_dead_pixel_correction_enabled_get(*_acqCont, &enabled));
return enabled != 0;
}
inline void AcquisitionContext::set_dead_pixel_correction_enabled(bool enable)
{
CUVIS_INT value = enable ? 1 : 0;
chk(cuvis_acq_cont_dead_pixel_correction_enabled_set(*_acqCont, value));
}

inline Measurement const& Exporter::apply(Measurement const& mesu) const
{
chk(cuvis_exporter_apply(*_exporter, *mesu._mesu));
Expand Down Expand Up @@ -2885,35 +2922,48 @@ namespace cuvis
return _data[((y)*_width + (x)) * _channels + (z)];
}

inline GeneralExportArgs::GeneralExportArgs()
: export_dir("."),
channel_selection("all"),
inline PanSharpeningArgs::PanSharpeningArgs()
: channel_selection("all"),
spectra_multiplier(1),
pan_scale(0.0),
pan_interpolation_type(pan_sharpening_interpolation_type_Linear),
pan_algorithm(pan_sharpening_algorithm_CubertMacroPixel),
add_pan(false),
add_fullscale_pan(false),
permissive(false),
blend_opacity(0.0)
pre_pan_sharpen_cube(true)
{}

inline GeneralExportArgs::GeneralExportArgs() : export_dir("."), add_fullscale_pan(false), permissive(false), pansharpening_settings({})
{}

inline GeneralExportArgs::operator cuvis_export_general_settings_t() const
{
cuvis_export_general_settings_t ges({});
std::strncpy(ges.pansharpening_settings.channel_selection, pansharpening_settings.channel_selection.c_str(), CUVIS_MAXBUF);
Copy link
Contributor

@birkholz-cubert birkholz-cubert Dec 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why not call the pansharpening settings operator?

ges.pansharpening_settings.spectra_multiplier = pansharpening_settings.spectra_multiplier;
ges.pansharpening_settings.pan_scale = pansharpening_settings.pan_scale;
ges.pansharpening_settings.pan_interpolation_type = pansharpening_settings.pan_interpolation_type;
ges.pansharpening_settings.pan_algorithm = pansharpening_settings.pan_algorithm;
ges.pansharpening_settings.pre_pan_sharpen_cube = pansharpening_settings.pre_pan_sharpen_cube ? 1 : 0;
ges.pansharpening_settings.add_pan = pansharpening_settings.add_pan ? 1 : 0;
std::strncpy(ges.export_dir, export_dir.string().c_str(), CUVIS_MAXBUF);
std::strncpy(ges.channel_selection, channel_selection.c_str(), CUVIS_MAXBUF);
ges.spectra_multiplier = spectra_multiplier;
ges.pan_scale = pan_scale;
ges.pan_interpolation_type = pan_interpolation_type;
ges.pan_algorithm = pan_algorithm;
ges.add_pan = static_cast<int_t>(add_pan);
ges.add_fullscale_pan = static_cast<int_t>(add_fullscale_pan);
ges.permissive = static_cast<int_t>(permissive);
ges.blend_opacity = blend_opacity;
ges.add_fullscale_pan = add_fullscale_pan ? 1 : 0;
ges.permissive = permissive ? 1 : 0;
return ges;
}

inline PanSharpeningArgs::operator cuvis_pansharpening_settings_t() const
{
cuvis_pansharpening_settings_t pss({});
std::strncpy(pss.channel_selection, channel_selection.c_str(), CUVIS_MAXBUF);
pss.spectra_multiplier = spectra_multiplier;
pss.pan_scale = pan_scale;
pss.pan_interpolation_type = pan_interpolation_type;
pss.pan_algorithm = pan_algorithm;
pss.pre_pan_sharpen_cube = static_cast<int_t>(pre_pan_sharpen_cube);
pss.add_pan = static_cast<int_t>(add_pan);
return pss;
}

inline SaveArgs::SaveArgs()
: merge_mode(session_merge_mode_t::session_merge_mode_Default),
allow_overwrite(false),
Expand Down Expand Up @@ -2953,28 +3003,31 @@ namespace cuvis
return proc_args;
}

inline ViewArgs::ViewArgs() : userplugin(), complete(false), pre_pan_sharpen_cube(false), pan_failback(true) {}
inline ViewArgs::ViewArgs() : userplugin(), complete(false), pan_failback(true) {}

inline ViewArgs::operator cuvis_viewer_settings_t() const
{
cuvis_viewer_settings_t args;
args.userplugin = userplugin.c_str();
args.pan_scale = pan_scale;
args.pan_interpolation_type = pan_interpolation_type;
args.pan_algorithm = pan_algorithm;
args.pre_pan_sharpen_cube = pre_pan_sharpen_cube;
args.complete = complete;
args.blend_opacity = blend_opacity;
args.pan_failback = pan_failback ? 1 : 0;
std::strncpy(args.pansharpening_settings.channel_selection, pansharpening_settings.channel_selection.c_str(), CUVIS_MAXBUF);
Copy link
Contributor

@birkholz-cubert birkholz-cubert Dec 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not call the pansharpening_settings operator?

args.pansharpening_settings.spectra_multiplier = pansharpening_settings.spectra_multiplier;
args.pansharpening_settings.pan_scale = pansharpening_settings.pan_scale;
args.pansharpening_settings.pan_interpolation_type = pansharpening_settings.pan_interpolation_type;
args.pansharpening_settings.pan_algorithm = pansharpening_settings.pan_algorithm;
args.pansharpening_settings.pre_pan_sharpen_cube = pansharpening_settings.pre_pan_sharpen_cube ? 1 : 0;
args.pansharpening_settings.add_pan = pansharpening_settings.add_pan ? 1 : 0;

return args;
}
inline ViewArgs::operator cuvis_export_view_settings_t() const
{
cuvis_export_view_settings_t args;
args.userplugin = userplugin.c_str();
args.complete = complete ? 1 : 0;
args.pan_failback = pan_failback ? 1 : 0;

return args;
}

Expand Down