Skip to content
Permalink
Browse files
Merge pull request #4425 from nyalldawson/qwt 
Remove old code for handling QWT < 6.1
  • Loading branch information
@nyalldawson
nyalldawson committed Apr 27, 2017
2 parents f1d4ac3 + 348b65b commit 06743617a6ba2227f490a8c869463da4d8131673
Showing with 30 additions and 15,753 deletions.
  1. +1 −1 cmake/FindQwt.cmake
  2. +29 −88 src/app/CMakeLists.txt
  3. +0 −24 src/app/gps/qgsgpsinformationwidget.cpp
  4. +0 −70 src/app/gps/qwtpolar-0.1/qwt_polar.h
  5. +0 −263 src/app/gps/qwtpolar-0.1/qwt_polar_canvas.cpp
  6. +0 −74 src/app/gps/qwtpolar-0.1/qwt_polar_canvas.h
  7. +0 −513 src/app/gps/qwtpolar-0.1/qwt_polar_curve.cpp
  8. +0 −159 src/app/gps/qwtpolar-0.1/qwt_polar_curve.h
  9. +0 −111 src/app/gps/qwtpolar-0.1/qwt_polar_fitter.cpp
  10. +0 −45 src/app/gps/qwtpolar-0.1/qwt_polar_fitter.h
  11. +0 −46 src/app/gps/qwtpolar-0.1/qwt_polar_global.h
  12. +0 −1,172 src/app/gps/qwtpolar-0.1/qwt_polar_grid.cpp
  13. +0 −168 src/app/gps/qwtpolar-0.1/qwt_polar_grid.h
  14. +0 −429 src/app/gps/qwtpolar-0.1/qwt_polar_item.cpp
  15. +0 −157 src/app/gps/qwtpolar-0.1/qwt_polar_item.h
  16. +0 −186 src/app/gps/qwtpolar-0.1/qwt_polar_itemdict.cpp
  17. +0 −64 src/app/gps/qwtpolar-0.1/qwt_polar_itemdict.h
  18. +0 −477 src/app/gps/qwtpolar-0.1/qwt_polar_layout.cpp
  19. +0 −82 src/app/gps/qwtpolar-0.1/qwt_polar_layout.h
  20. +0 −175 src/app/gps/qwtpolar-0.1/qwt_polar_magnifier.cpp
  21. +0 −58 src/app/gps/qwtpolar-0.1/qwt_polar_magnifier.h
  22. +0 −247 src/app/gps/qwtpolar-0.1/qwt_polar_marker.cpp
  23. +0 −75 src/app/gps/qwtpolar-0.1/qwt_polar_marker.h
  24. +0 −117 src/app/gps/qwtpolar-0.1/qwt_polar_panner.cpp
  25. +0 −52 src/app/gps/qwtpolar-0.1/qwt_polar_panner.h
  26. +0 −1,511 src/app/gps/qwtpolar-0.1/qwt_polar_plot.cpp
  27. +0 −233 src/app/gps/qwtpolar-0.1/qwt_polar_plot.h
  28. +0 −99 src/app/gps/qwtpolar-0.1/qwt_polar_point.cpp
  29. +0 −135 src/app/gps/qwtpolar-0.1/qwt_polar_point.h
  30. +0 −349 src/app/gps/qwtpolar-0.1/qwt_polar_spectrogram.cpp
  31. +0 −59 src/app/gps/qwtpolar-0.1/qwt_polar_spectrogram.h
  32. +0 −84 src/app/gps/qwtpolar-1.0/qwt_polar.h
  33. +0 −298 src/app/gps/qwtpolar-1.0/qwt_polar_canvas.cpp
  34. +0 −79 src/app/gps/qwtpolar-1.0/qwt_polar_canvas.h
  35. +0 −637 src/app/gps/qwtpolar-1.0/qwt_polar_curve.cpp
  36. +0 −163 src/app/gps/qwtpolar-1.0/qwt_polar_curve.h
  37. +0 −100 src/app/gps/qwtpolar-1.0/qwt_polar_fitter.cpp
  38. +0 −40 src/app/gps/qwtpolar-1.0/qwt_polar_fitter.h
  39. +0 −43 src/app/gps/qwtpolar-1.0/qwt_polar_global.h
  40. +0 −1,129 src/app/gps/qwtpolar-1.0/qwt_polar_grid.cpp
  41. +0 −187 src/app/gps/qwtpolar-1.0/qwt_polar_grid.h
  42. +0 −445 src/app/gps/qwtpolar-1.0/qwt_polar_item.cpp
  43. +0 −176 src/app/gps/qwtpolar-1.0/qwt_polar_item.h
  44. +0 −169 src/app/gps/qwtpolar-1.0/qwt_polar_itemdict.cpp
  45. +0 −56 src/app/gps/qwtpolar-1.0/qwt_polar_itemdict.h
  46. +0 −444 src/app/gps/qwtpolar-1.0/qwt_polar_layout.cpp
  47. +0 −80 src/app/gps/qwtpolar-1.0/qwt_polar_layout.h
  48. +0 −167 src/app/gps/qwtpolar-1.0/qwt_polar_magnifier.cpp
  49. +0 −58 src/app/gps/qwtpolar-1.0/qwt_polar_magnifier.h
  50. +0 −235 src/app/gps/qwtpolar-1.0/qwt_polar_marker.cpp
  51. +0 −70 src/app/gps/qwtpolar-1.0/qwt_polar_marker.h
  52. +0 −118 src/app/gps/qwtpolar-1.0/qwt_polar_panner.cpp
  53. +0 −52 src/app/gps/qwtpolar-1.0/qwt_polar_panner.h
  54. +0 −245 src/app/gps/qwtpolar-1.0/qwt_polar_picker.cpp
  55. +0 −98 src/app/gps/qwtpolar-1.0/qwt_polar_picker.h
  56. +0 −1,269 src/app/gps/qwtpolar-1.0/qwt_polar_plot.cpp
  57. +0 −219 src/app/gps/qwtpolar-1.0/qwt_polar_plot.h
  58. +0 −421 src/app/gps/qwtpolar-1.0/qwt_polar_renderer.cpp
  59. +0 −71 src/app/gps/qwtpolar-1.0/qwt_polar_renderer.h
  60. +0 −530 src/app/gps/qwtpolar-1.0/qwt_polar_spectrogram.cpp
  61. +0 −95 src/app/gps/qwtpolar-1.0/qwt_polar_spectrogram.h
  62. +0 −20 src/app/qgsidentifyresultsdialog.cpp
  63. +0 −1 src/gui/CMakeLists.txt
  64. +0 −57 src/gui/qgscurveeditorwidget.cpp
  65. +0 −10 src/gui/qgscurveeditorwidget.h
  66. +0 −15 src/gui/qgsgradientcolorrampdialog.cpp
  67. +0 −61 src/gui/qgshistogramwidget.cpp
  68. +0 −7 src/gui/qgshistogramwidget.h
  69. +0 −84 src/gui/raster/qgsrasterhistogramwidget.cpp
  70. +0 −2 src/gui/raster/qgsrasterhistogramwidget.h
  71. +0 −364 src/gui/raster/qwt5_histogram_item.cpp
  72. +0 −99 src/gui/raster/qwt5_histogram_item.h
  73. +0 −8 src/gui/symbology-ng/qgsgraduatedhistogramwidget.cpp
  74. +0 −4 src/gui/symbology-ng/qgsgraduatedhistogramwidget.h
  75. +0 −4 tests/src/gui/testqgsrasterhistogram.cpp
2 cmake/FindQwt.cmake
View file
@@ -34,7 +34,7 @@ FIND_PATH(QWT_INCLUDE_DIR NAMES qwt.h PATHS
/usr/local/include
"$ENV{LIB_DIR}/include"
"$ENV{INCLUDE}"
PATH_SUFFIXES qwt-qt5 qwt qwt5 qwt6
PATH_SUFFIXES qwt-qt5 qwt qwt6
)

IF (QWT_INCLUDE_DIR AND QWT_LIBRARY)
117 src/app/CMakeLists.txt
View file
@@ -372,94 +372,35 @@ IF (WITH_QWTPOLAR)
SET (WITH_INTERNAL_QWTPOLAR DEFAULT_WITH_INTERNAL_QWTPOLAR CACHE BOOL "Use internal build of QwtPolar")

IF(WITH_INTERNAL_QWTPOLAR)
IF(QWT_VERSION_STR VERSION_LESS "6.0.0")
SET(QGIS_APP_SRCS
${QGIS_APP_SRCS}
gps/qwtpolar-0.1/qwt_polar_canvas.cpp
gps/qwtpolar-0.1/qwt_polar_curve.cpp
gps/qwtpolar-0.1/qwt_polar_fitter.cpp
gps/qwtpolar-0.1/qwt_polar_grid.cpp
gps/qwtpolar-0.1/qwt_polar_itemdict.cpp
gps/qwtpolar-0.1/qwt_polar_item.cpp
gps/qwtpolar-0.1/qwt_polar_layout.cpp
gps/qwtpolar-0.1/qwt_polar_magnifier.cpp
gps/qwtpolar-0.1/qwt_polar_marker.cpp
gps/qwtpolar-0.1/qwt_polar_panner.cpp
gps/qwtpolar-0.1/qwt_polar_plot.cpp
gps/qwtpolar-0.1/qwt_polar_point.cpp
gps/qwtpolar-0.1/qwt_polar_spectrogram.cpp
)

SET (QGIS_APP_MOC_HDRS
${QGIS_APP_MOC_HDRS}
gps/qwtpolar-0.1/qwt_polar_canvas.h
gps/qwtpolar-0.1/qwt_polar_magnifier.h
gps/qwtpolar-0.1/qwt_polar_panner.h
gps/qwtpolar-0.1/qwt_polar_plot.h
)

SET(QWTPOLAR_INCLUDE_DIR gps/qwtpolar-0.1)
ELSEIF(QWT_VERSION_STR VERSION_LESS "6.1.0")
SET(QGIS_APP_SRCS
${QGIS_APP_SRCS}
gps/qwtpolar-1.0/qwt_polar_canvas.cpp
gps/qwtpolar-1.0/qwt_polar_curve.cpp
gps/qwtpolar-1.0/qwt_polar_fitter.cpp
gps/qwtpolar-1.0/qwt_polar_grid.cpp
gps/qwtpolar-1.0/qwt_polar_item.cpp
gps/qwtpolar-1.0/qwt_polar_itemdict.cpp
gps/qwtpolar-1.0/qwt_polar_layout.cpp
gps/qwtpolar-1.0/qwt_polar_magnifier.cpp
gps/qwtpolar-1.0/qwt_polar_marker.cpp
gps/qwtpolar-1.0/qwt_polar_panner.cpp
gps/qwtpolar-1.0/qwt_polar_picker.cpp
gps/qwtpolar-1.0/qwt_polar_plot.cpp
gps/qwtpolar-1.0/qwt_polar_renderer.cpp
gps/qwtpolar-1.0/qwt_polar_spectrogram.cpp
)

SET (QGIS_APP_MOC_HDRS
${QGIS_APP_MOC_HDRS}
gps/qwtpolar-1.0/qwt_polar_canvas.h
gps/qwtpolar-1.0/qwt_polar_magnifier.h
gps/qwtpolar-1.0/qwt_polar_panner.h
gps/qwtpolar-1.0/qwt_polar_picker.h
gps/qwtpolar-1.0/qwt_polar_plot.h
gps/qwtpolar-1.0/qwt_polar_renderer.h
)

SET(QWTPOLAR_INCLUDE_DIR gps/qwtpolar-1.0)
ELSE(QWT_VERSION_STR VERSION_LESS "6.1.0")
SET(QGIS_APP_SRCS
${QGIS_APP_SRCS}
gps/qwtpolar-1.1.1/qwt_polar_canvas.cpp
gps/qwtpolar-1.1.1/qwt_polar_curve.cpp
gps/qwtpolar-1.1.1/qwt_polar_fitter.cpp
gps/qwtpolar-1.1.1/qwt_polar_grid.cpp
gps/qwtpolar-1.1.1/qwt_polar_item.cpp
gps/qwtpolar-1.1.1/qwt_polar_itemdict.cpp
gps/qwtpolar-1.1.1/qwt_polar_layout.cpp
gps/qwtpolar-1.1.1/qwt_polar_magnifier.cpp
gps/qwtpolar-1.1.1/qwt_polar_marker.cpp
gps/qwtpolar-1.1.1/qwt_polar_panner.cpp
gps/qwtpolar-1.1.1/qwt_polar_picker.cpp
gps/qwtpolar-1.1.1/qwt_polar_plot.cpp
gps/qwtpolar-1.1.1/qwt_polar_renderer.cpp
gps/qwtpolar-1.1.1/qwt_polar_spectrogram.cpp
)

SET (QGIS_APP_MOC_HDRS
${QGIS_APP_MOC_HDRS}
gps/qwtpolar-1.1.1/qwt_polar_canvas.h
gps/qwtpolar-1.1.1/qwt_polar_magnifier.h
gps/qwtpolar-1.1.1/qwt_polar_panner.h
gps/qwtpolar-1.1.1/qwt_polar_picker.h
gps/qwtpolar-1.1.1/qwt_polar_plot.h
gps/qwtpolar-1.1.1/qwt_polar_renderer.h
)

SET(QWTPOLAR_INCLUDE_DIR gps/qwtpolar-1.1.1)
ENDIF(QWT_VERSION_STR VERSION_LESS "6.0.0")
SET(QGIS_APP_SRCS
${QGIS_APP_SRCS}
gps/qwtpolar-1.1.1/qwt_polar_canvas.cpp
gps/qwtpolar-1.1.1/qwt_polar_curve.cpp
gps/qwtpolar-1.1.1/qwt_polar_fitter.cpp
gps/qwtpolar-1.1.1/qwt_polar_grid.cpp
gps/qwtpolar-1.1.1/qwt_polar_item.cpp
gps/qwtpolar-1.1.1/qwt_polar_itemdict.cpp
gps/qwtpolar-1.1.1/qwt_polar_layout.cpp
gps/qwtpolar-1.1.1/qwt_polar_magnifier.cpp
gps/qwtpolar-1.1.1/qwt_polar_marker.cpp
gps/qwtpolar-1.1.1/qwt_polar_panner.cpp
gps/qwtpolar-1.1.1/qwt_polar_picker.cpp
gps/qwtpolar-1.1.1/qwt_polar_plot.cpp
gps/qwtpolar-1.1.1/qwt_polar_renderer.cpp
gps/qwtpolar-1.1.1/qwt_polar_spectrogram.cpp
)

SET (QGIS_APP_MOC_HDRS
${QGIS_APP_MOC_HDRS}
gps/qwtpolar-1.1.1/qwt_polar_canvas.h
gps/qwtpolar-1.1.1/qwt_polar_magnifier.h
gps/qwtpolar-1.1.1/qwt_polar_panner.h
gps/qwtpolar-1.1.1/qwt_polar_picker.h
gps/qwtpolar-1.1.1/qwt_polar_plot.h
gps/qwtpolar-1.1.1/qwt_polar_renderer.h
)

SET(QWTPOLAR_INCLUDE_DIR gps/qwtpolar-1.1.1)

SET(QWTPOLAR_LIBRARY "")
ENDIF(WITH_INTERNAL_QWTPOLAR)
24 src/app/gps/qgsgpsinformationwidget.cpp
View file
@@ -40,10 +40,6 @@
// QWT Charting widget

#include <qwt_global.h>
#if (QWT_VERSION<0x060000)
#include <qwt_array.h>
#include <qwt_data.h>
#endif
#include <qwt_legend.h>
#include <qwt_plot.h>
#include <qwt_plot_grid.h>
@@ -502,12 +498,7 @@ void QgsGPSInformationWidget::disconnectGps()

void QgsGPSInformationWidget::displayGPSInformation( const QgsGPSInformation &info )
{
#if QWT_VERSION<0x060000
QwtArray<double> myXData;//qwtarray is just a wrapped qvector
QwtArray<double> mySignalData;//qwtarray is just a wrapped qvector
#else
QVector<QPointF> data;
#endif

// set validity flag and status from GPS data
// based on GGA, GSA and RMC sentences - the logic does not require all
@@ -563,21 +554,10 @@ void QgsGPSInformationWidget::displayGPSInformation( const QgsGPSInformation &in

if ( mStackedWidget->currentIndex() == 1 && info.satInfoComplete ) //signal
{
#if QWT_VERSION<0x060000
myXData.append( i );
mySignalData.append( 0 );
myXData.append( i );
mySignalData.append( currentInfo.signal );
myXData.append( i + 1 );
mySignalData.append( currentInfo.signal );
myXData.append( i + 1 );
mySignalData.append( 0 );
#else
data << QPointF( i, 0 );
data << QPointF( i, currentInfo.signal );
data << QPointF( i + 1, currentInfo.signal );
data << QPointF( i + 1, 0 );
#endif
} //signal

if ( mStackedWidget->currentIndex() == 2 && info.satInfoComplete ) //satellites
@@ -631,11 +611,7 @@ void QgsGPSInformationWidget::displayGPSInformation( const QgsGPSInformation &in

if ( mStackedWidget->currentIndex() == 1 && info.satInfoComplete ) //signal
{
#if (QWT_VERSION<0x060000)
mpCurve->setData( myXData, mySignalData );
#else
mpCurve->setSamples( data );
#endif
mpPlot->replot();
} //signal
#ifdef WITH_QWTPOLAR
70 src/app/gps/qwtpolar-0.1/qwt_polar.h
View file

This file was deleted.

Loading

0 comments on commit 0674361

Please sign in to comment.