Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
establish that Qwt 6.1 is not currently supported with internal QwtPo…
- Loading branch information
|
|
@@ -1,10 +1,10 @@ |
|
|
Quantum GIS (QGIS) |
|
|
Building QGIS from source - step by step |
|
|
Tuesday April 02, 2013 |
|
|
Saturday April 06, 2013 |
|
|
|
|
|
|
|
|
Last Updated: Tuesday April 02, 2013 |
|
|
Last Change : Saturday December 08, 2012 |
|
|
Last Updated: Saturday April 06, 2013 |
|
|
Last Change : Saturday April 06, 2013 |
|
|
|
|
|
|
|
|
1. Introduction |
|
@@ -103,7 +103,7 @@ Required build deps: |
|
|
- GEOS >= 3.0 |
|
|
- Sqlite3 >= 3.0.0 |
|
|
- GDAL/OGR >= 1.4.x |
|
|
- Qwt >= 5.0 |
|
|
- Qwt >= 5.0 & < 6.1 |
|
|
- expat >= 1.95 |
|
|
|
|
|
Optional dependencies: |
|
|
|
@@ -5,7 +5,7 @@ |
|
|
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1"> |
|
|
<TITLE>Quantum GIS (QGIS)</TITLE> |
|
|
|
|
|
<!-- Included style.css --> |
|
|
<!-- Included doc/style.css --> |
|
|
<STYLE TYPE="text/css"> |
|
|
body{ background: white; |
|
|
color: black; |
|
@@ -77,13 +77,13 @@ |
|
|
<DIV CLASS="header" ID="header"> |
|
|
<H1>Quantum GIS (QGIS)</H1> |
|
|
<H2>Building QGIS from source - step by step</H2> |
|
|
<H3>Tuesday April 02, 2013</H3> |
|
|
<H3>Saturday April 06, 2013</H3> |
|
|
</DIV> |
|
|
|
|
|
<DIV CLASS="body" ID="body"> |
|
|
<P> |
|
|
Last Updated: Tuesday April 02, 2013 |
|
|
Last Change : Saturday December 08, 2012 |
|
|
Last Updated: Saturday April 06, 2013 |
|
|
Last Change : Saturday April 06, 2013 |
|
|
</P> |
|
|
<DIV CLASS="toc"> |
|
|
|
|
@@ -210,7 +210,7 @@ <H1>2. Overview</H1> |
|
|
<LI>GEOS >= 3.0 |
|
|
<LI>Sqlite3 >= 3.0.0 |
|
|
<LI>GDAL/OGR >= 1.4.x |
|
|
<LI>Qwt >= 5.0 |
|
|
<LI>Qwt >= 5.0 & < 6.1 |
|
|
<LI>expat >= 1.95 |
|
|
</UL> |
|
|
|
|
@@ -3234,5 +3234,5 @@ <H1>9. Authors and Acknowledgments</H1> |
|
|
|
|
|
</DIV> |
|
|
<!-- html code generated by txt2tags 2.6 (http://txt2tags.org) --> |
|
|
<!-- cmdline: txt2tags -t html -o INSTALL.html INSTALL.t2t --> |
|
|
<!-- cmdline: txt2tags -o doc/INSTALL.html -t html doc/INSTALL.t2t --> |
|
|
</BODY></HTML> |
|
@@ -380,3 +380,4 @@ copy contents of pgsql directory from the archive to ``c:\msys\local`` |
|
|
|
|
|
We're done with preparation of MSYS environment. Now you can delete all stuff in ``c:\msys\local\src`` - it takes quite a lot |
|
|
of space and it's not necessary at all. |
|
|
|
|
|
@@ -1,4 +1,5 @@ |
|
|
|
|
|
|
|
|
= Building on MacOS X = |
|
|
|
|
|
In this approach I will try to avoid as much as possible building dependencies |
|
|
|
@@ -20,7 +20,7 @@ Required build deps: |
|
|
- GEOS >= 3.0 |
|
|
- Sqlite3 >= 3.0.0 |
|
|
- GDAL/OGR >= 1.4.x |
|
|
- Qwt >= 5.0 |
|
|
- Qwt >= 5.0 & (< 6.1 with internal QwtPolar) |
|
|
- expat >= 1.95 |
|
|
- |
|
|
|
|
|
|
@@ -320,6 +320,10 @@ IF(WITH_INTERNAL_QWTPOLAR) |
|
|
|
|
|
SET(QWTPOLAR_INCLUDE_DIR gps/qwtpolar-0.1) |
|
|
ELSE(QWT_VERSION_STR VERSION_LESS "6.0.0") |
|
|
IF(NOT QWT_VERSION_STR VERSION_LESS "6.1.0") |
|
|
MESSAGE(FATAL_ERROR "Internal QwtPolar does not support Qwt 6.1 and above") |
|
|
ENDIF(NOT QWT_VERSION_STR VERSION_LESS "6.1.0") |
|
|
|
|
|
SET(QGIS_APP_SRCS |
|
|
${QGIS_APP_SRCS} |
|
|
gps/qwtpolar-1.0/qwt_polar_canvas.cpp |
|
|
|
@@ -841,9 +841,9 @@ void QgsRasterHistogramWidget::on_btnHistoMax_toggled() |
|
|
|
|
|
// local function used by histoPickerSelected(), to get a rounded picked value |
|
|
// this is sensitive and may not always be correct, needs more testing |
|
|
QString findClosestTickVal( double target, QwtScaleDiv * scale, int div = 100 ) |
|
|
QString findClosestTickVal( double target, const QwtScaleDiv * scale, int div = 100 ) |
|
|
{ |
|
|
if ( scale == NULL ) return ""; |
|
|
if ( !scale ) return ""; |
|
|
|
|
|
QList< double > minorTicks = scale->ticks( QwtScaleDiv::MinorTick ); |
|
|
QList< double > majorTicks = scale->ticks( QwtScaleDiv::MajorTick ); |
|
@@ -875,17 +875,26 @@ QString findClosestTickVal( double target, QwtScaleDiv * scale, int div = 100 ) |
|
|
|
|
|
void QgsRasterHistogramWidget::histoPickerSelected( const QPointF & pos ) |
|
|
{ |
|
|
if ( btnHistoMin->isChecked() ) |
|
|
if ( btnHistoMin->isChecked() || btnHistoMax->isChecked() ) |
|
|
{ |
|
|
leHistoMin->setText( findClosestTickVal( pos.x(), mpPlot->axisScaleDiv( QwtPlot::xBottom ) ) ); |
|
|
applyHistoMin(); |
|
|
btnHistoMin->setChecked( false ); |
|
|
} |
|
|
else if ( btnHistoMax->isChecked() ) |
|
|
{ |
|
|
leHistoMax->setText( findClosestTickVal( pos.x(), mpPlot->axisScaleDiv( QwtPlot::xBottom ) ) ); |
|
|
applyHistoMax(); |
|
|
btnHistoMax->setChecked( false ); |
|
|
#if defined(QWT_VERSION) && QWT_VERSION>=0x060100 |
|
|
const QwtScaleDiv * scale = &mpPlot->axisScaleDiv( QwtPlot::xBottom ); |
|
|
#else |
|
|
const QwtScaleDiv * scale = mpPlot->axisScaleDiv( QwtPlot::xBottom ); |
|
|
#endif |
|
|
|
|
|
if ( btnHistoMin->isChecked() ) |
|
|
{ |
|
|
leHistoMin->setText( findClosestTickVal( pos.x(), scale ) ); |
|
|
applyHistoMin(); |
|
|
btnHistoMin->setChecked( false ); |
|
|
} |
|
|
else if ( btnHistoMax->isChecked() ) |
|
|
{ |
|
|
leHistoMax->setText( findClosestTickVal( pos.x(), scale ) ); |
|
|
applyHistoMax(); |
|
|
btnHistoMax->setChecked( false ); |
|
|
} |
|
|
} |
|
|
if ( QApplication::overrideCursor() ) |
|
|
QApplication::restoreOverrideCursor(); |
|
|