Skip to content

Adaptation au nouveau style Terrainrgb #14

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
Dolite merged 1 commit into from
Mar 12, 2026
Merged

Adaptation au nouveau style Terrainrgb #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 9 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,27 @@
# Changelog

Tous les changements sont consignés dans ce fichier.

Le format est basé sur [Keep a Changelog](https://keepachangelog.com/) et ce projet respecte le [Semantic Versioning](https://semver.org/).

## [Unreleased]

### Added

- Possibilité de définir un timeout via la variable d'environnement `ROK4_NETWORK_TIMEOUT` (valeur à fournir en seconde) pour les intéraction avec le stockage Swift ou S3
- Ajout de diagrammes pour comprendre l'usage des classes Image dans les différents outils
- Amélioration de la documentation Doxygen
- `mergeNtiff` : Ajout du cas du style terrainrgb lors des applications des styles

### Changed

- Refonte du CHANGELOG au format [Keep a Changelog](https://keepachangelog.com/)
- Changement des imports de Cache aux imports spécifiques des classes suite à la séparation du fichier Cache dans core-cpp.
- Merge4tiff utilise désormais les classes Image, dont la nouvelle SubsampledImage, pour faire le calcul raster
- `mergeNtiff` :
- Vérification de l'existance d'une palette avant d'accéder aux éléments de palette.
- Changement de la manière de faire le traitement de style pour utiliser la classe StyledImage de la lib core-cpp.

### Deprecated
### Removed
### Fixed
Expand Down
84 changes: 10 additions & 74 deletions src/mergeNtiff.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,7 @@ namespace keywords = boost::log::keywords;
#include "config.h"

#include <rok4/style/Style.h>
#include <rok4/image/PaletteImage.h>
#include <rok4/image/EstompageImage.h>
#include <rok4/image/PenteImage.h>
#include <rok4/image/AspectImage.h>
#include <rok4/image/StyledImage.h>

// Paramètres de la ligne de commande déclarés en global
/** \~french Chemin du fichier de configuration des images */
Expand Down Expand Up @@ -778,29 +775,8 @@ bool resample_images(FileImage* output_image, ExtendedCompoundImage* input_image
// Reechantillonnage
Image* input_to_resample = input_images;
if (style_provided) {
Image* styled_image = NULL;

if (style->estompage_defined()) {
styled_image = new EstompageImage (input_images, style->get_estompage());
}
else if (style->pente_defined()) {
styled_image = new PenteImage (input_images, style->get_pente());
}
else if (style->aspect_defined()) {
styled_image = new AspectImage (input_images, style->get_aspect()) ;
}

if ( input_to_resample->get_channels() == 1 && ! ( style->get_palette()->is_empty() ) ) {
if (styled_image != NULL) {
input_to_resample = new PaletteImage ( styled_image , style->get_palette() );
} else {
input_to_resample = new PaletteImage ( input_images , style->get_palette() );
}
} else {
if (styled_image != NULL) {
input_to_resample = styled_image;
}
}
StyledImage* s_image = StyledImage::create(input_images,style);
input_to_resample=s_image;
}

*resampled_image = new ResampledImage(input_to_resample, width_dst, height_dst, resx_dst, resy_dst, bbox_dst, interpolation, input_images->use_masks());
Expand All @@ -809,7 +785,7 @@ bool resample_images(FileImage* output_image, ExtendedCompoundImage* input_image
BOOST_LOG_TRIVIAL(error) << "Cannot add mask to the ResampledImage";
return false;
}

return true;
}

Expand Down Expand Up @@ -938,30 +914,9 @@ bool reproject_images(FileImage* output_image, ExtendedCompoundImage* input_imag
/********************** Application du style **********************/
Image* input_to_reproject = input_images;
if (style_provided) {
Image* styled_image = NULL;

if (style->estompage_defined()) {
styled_image = new EstompageImage (input_images, style->get_estompage());
}
else if (style->pente_defined()) {
styled_image = new PenteImage (input_images, style->get_pente());
}
else if (style->aspect_defined()) {
styled_image = new AspectImage (input_images, style->get_aspect()) ;
}

if ( input_to_reproject->get_channels() == 1 && ! ( style->get_palette()->is_empty() ) ) {
if (styled_image != NULL) {
input_to_reproject = new PaletteImage ( styled_image , style->get_palette() );
} else {
input_to_reproject = new PaletteImage ( input_images , style->get_palette() );
}
} else {
if (styled_image != NULL) {
input_to_reproject = styled_image;
}
}

StyledImage* s_image = StyledImage::create(input_images,style);

input_to_reproject = s_image;
input_to_reproject->set_crs(input_images->get_crs());
}

Expand All @@ -978,7 +933,7 @@ bool reproject_images(FileImage* output_image, ExtendedCompoundImage* input_imag

*reprojected_image = new ReprojectedImage(input_to_reproject, bbox_dst, resx_dst, resy_dst, grid, interpolation, input_images->use_masks());
(*reprojected_image)->set_crs(output_image->get_crs());

if (!(*reprojected_image)->set_mask(reprojected_mask)) {
BOOST_LOG_TRIVIAL(error) << "Cannot add mask to the ReprojectedImage";
return false;
Expand Down Expand Up @@ -1049,27 +1004,8 @@ int merge_images(FileImage *output_image, // Sortie
* on n'aura donc pas besoin de reechantillonnage.*/
if (style_provided && ! (i == 0 && background_provided)) {
// Un style est fourni et nous ne sommes pas dans le cas de la première entrée qui est une image de fond
Image* styled_image = NULL;

if (style->estompage_defined()) {
styled_image = new EstompageImage (stackable_image, style->get_estompage());
}
else if (style->pente_defined()) {
styled_image = new PenteImage (stackable_image, style->get_pente());
}
else if (style->aspect_defined()) {
styled_image = new AspectImage (stackable_image, style->get_aspect()) ;
}

if ( stackable_image->get_channels() == 1 && ! ( style->get_palette()->is_empty() ) ) {
if (styled_image != NULL) {
stackable_images.push_back(new PaletteImage ( styled_image , style->get_palette() ));
} else {
stackable_images.push_back(new PaletteImage ( stackable_image , style->get_palette() ));
}
} else {
stackable_images.push_back(styled_image);
}
StyledImage* s_image = StyledImage::create(stackable_image,style);
stackable_images.push_back(s_image);
} else {
stackable_images.push_back(stackable_image);
}
Expand Down
Loading