Histogram improvements #180
Conversation
|
Hi These look like great improvements. Currently when trying to test I get these: git pull https://github.com/etiennesky/Quantum-GIS histogram2 remote: Counting objects: 94, done. remote: Compressing objects: 100% (18/18), done. remote: Total 70 (delta 62), reused 60 (delta 52) Unpacking objects: 100% (70/70), done. From https://github.com/etiennesky/Quantum-GIS * branch histogram2 -> FETCH_HEAD Auto-merging src/ui/qgsrasterlayerpropertiesbase.ui CONFLICT (content): Merge conflict in src/ui/qgsrasterlayerpropertiesbase.ui Auto-merging src/providers/gdal/qgsgdalprovider.cpp Auto-merging src/gui/raster/qgssinglebandgrayrendererwidget.cpp Auto-merging src/gui/raster/qgsmultibandcolorrendererwidget.cpp Auto-merging src/core/raster/qgsrasterlayer.cpp Auto-merging src/app/qgsrasterlayerproperties.cpp Automatic merge failed; fix conflicts and then commit the result. Could you freshen your branch by merging with master? Thanks Tim |
|
done! (force pushed) the conflicts were due to differences in html styling - is there a way to avoid designer changing these values? <<<<<< HEAD <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif';"><br /></p></td></tr></table></body></html><p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
|
|
closing this pull request - will soon merge |
|
Can we close this now? Thanks! Tim |
|
I thought I had closed it.. |
These patches improve the histogram and fix a few issues introduced with the resampler branch
bc12ef0d fix histo tab number and Gray band name
Histogram was no longer updated, and the first band of a multi-band file (e.g. tests/testdata/landsat.tif) always appeared as "Grey"
8b9df648 add UI to pick min/max band values in histogram
This adds a number of UI elements in the histogram tab to choose the min/max values for each band, both in a linedit and also using a picker. Also a few actions that deal with loading the extent. Added access functions to QgsRasterRendererWidget to get/set min/max values and computing extents.
983591ee add histogram zoom in/out
Zooming in can be accomplished by click-dragging the desired area, and zoom reset with right click.
85150725 verify that raster has cached histogram, compute on demand
Histogram is plotted only if it is cached - this requires a new function hasCachedHistogram() for raster layer and raster provider(default returns false). Gdal provider uses existing function GDALGetDefaultHistogram, other providers (GRASS) should be adjusted if there is a way to cache the histogram.
This has been discussed at http://lists.osgeo.org/pipermail/qgis-developer/2012-May/019963.html
c85d4e8d prevent double refresh of histogram tab (#4132)