Skip to content
Snippets Groups Projects

Implementation of the raster output for Zonalstatistics

Merged Jordi Inglada requested to merge jinglada/otb:zonalstatistics into zonalstatistics

Also added some tests and 2 baselines in otb-data

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • There is a lot of changes unrelated to !222 (merged), maybe it's better if there is two separate MR? Just asking before clicking on the big green button

  • I don't understand what are the things not related to zonal stats. The changes only deal with the implementation of the raster output. All tests pass.

  • When I click on the "Changes" tab, there is a lot of changes in other classes

    merge_request_templates/request_for_changes.md 
    Modules/Applications/AppClassification/app/otbTrainImagesClassifier.cxx
    Modules/Applications/AppClassification/app/otbTrainVectorClassifier.cxx 
    Modules/Applications/AppClassification/include/otbLearningApplicationBase.hxx 
    Modules/Core/ImageBase/include/otbImageIOBase.h 
    Modules/Core/ImageBase/src/otbImageIOBase.cxx 
    Modules/Detection/ObjectDetection/include/otbDescriptorsListSampleGenerator.h 
    Modules/Detection/ObjectDetection/include/otbObjectDetectionClassifier.h 
    Modules/Feature/Descriptors/include/otbImageToSIFTKeyPointSetFilter.hxx 
    Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerSupervizedDistanceImageFilter.hxx
    Modules/Filtering/Path/include/otbCompacityPathFunction.hxx
    Modules/Filtering/Path/include/otbOrientationPathFunction.hxx
    Modules/IO/IOGDAL/src/otbGDALImageIO.cxx
    Modules/IO/IOONERA/src/otbONERAImageIO.cxx
    Modules/IO/IORAD/src/otbRADImageIO.cxx
    Modules/IO/ImageIO/include/otbImageFileReader.hxx
    Modules/OBIA/RCC8/include/otbRCC8GraphFileWriter.h
    Modules/OBIA/RCC8/include/otbRCC8GraphFileWriter.hxx
    Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapFilter.hxx
    ...

    Is it related to some sync you did with develop?

  • A git rebase develop might fix that.

  • @lnicola can I merge it safely from gitlab?

  • @remicres it might make the history look worse because of the merge commits, but assuming it works.. it should work.

    git rebase is to have a nicer history and make review easier.

  • merged

  • Rémi Cresson mentioned in commit c5845896

    mentioned in commit c5845896

  • I did a git rebase but not sure I did this the right way :face_palm:

  • I still see a lot of commits, so you might be right. But it's too late now :sweat_smile:.

  • Yes, sorry, I merged develop without rebasing!

  • added feature label

  • Cédric Traizet changed milestone to %7.0.0

    changed milestone to %7.0.0

Please register or sign in to reply
Loading