pcp
[Top] [All Lists]

pcp updates: Qt5 & Qwt6.1 support

To: pcp developers <pcp@xxxxxxxxxxx>
Subject: pcp updates: Qt5 & Qwt6.1 support
From: Nathan Scott <nathans@xxxxxxxxxx>
Date: Mon, 3 Oct 2016 02:38:12 -0400 (EDT)
Delivered-to: pcp@xxxxxxxxxxx
In-reply-to: <956294180.23780.1475476614348.JavaMail.zimbra@xxxxxxxxxx>
Reply-to: Nathan Scott <nathans@xxxxxxxxxx>
Thread-index: XHC5+lbQXpJXNuUatFSCNJSH6UrudA==
Thread-topic: pcp updates: Qt5 & Qwt6.1 support
Changes committed to git://git.pcp.io/pcp.git master

Nathan Scott (6):
      qt tools: enable use of Qt5 toolchain, headers and libraries
      pmchart: fix minor compilation warning
      pmchart: rewrite legend rendering for qwt 6.x support
      pmtime: fix rendering of the time sliders, no scale text
      pmchart: fix rendering of the time axis by hiding the canvas
      pmchart: resolve y-axis scaling issue for util charts


 .gitignore                                     |    1 
 configure                                      |    4 
 configure.ac                                   |    3 
 qa/qt/qmc_context/qmc_context.cpp              |    4 
 qa/qt/qmc_group/qmc_group.cpp                  |    8 
 qa/qt/qmc_indom/qmc_indom.cpp                  |    2 
 qa/qt/qmc_source/qmc_source.cpp                |   10 
 src/libpcp_qwt/src/libpcp_qwt.pro              |   38 
 src/libpcp_qwt/src/qwt.h                       |    2 
 src/libpcp_qwt/src/qwt_abstract_legend.cpp     |   38 
 src/libpcp_qwt/src/qwt_abstract_legend.h       |   71 +
 src/libpcp_qwt/src/qwt_abstract_scale.cpp      |  331 +++++---
 src/libpcp_qwt/src/qwt_abstract_scale.h        |   57 +
 src/libpcp_qwt/src/qwt_abstract_scale_draw.cpp |   42 -
 src/libpcp_qwt/src/qwt_abstract_scale_draw.h   |   16 
 src/libpcp_qwt/src/qwt_abstract_slider.cpp     |  971 ++++++++++++++----------
 src/libpcp_qwt/src/qwt_abstract_slider.h       |  201 ++--
 src/libpcp_qwt/src/qwt_analog_clock.cpp        |   96 +-
 src/libpcp_qwt/src/qwt_analog_clock.h          |   19 
 src/libpcp_qwt/src/qwt_arrow_button.cpp        |   13 
 src/libpcp_qwt/src/qwt_clipper.cpp             |   46 -
 src/libpcp_qwt/src/qwt_clipper.h               |    5 
 src/libpcp_qwt/src/qwt_color_map.cpp           |  175 ++--
 src/libpcp_qwt/src/qwt_color_map.h             |   12 
 src/libpcp_qwt/src/qwt_column_symbol.cpp       |    8 
 src/libpcp_qwt/src/qwt_column_symbol.h         |    2 
 src/libpcp_qwt/src/qwt_compass.cpp             |  198 ++--
 src/libpcp_qwt/src/qwt_compass.h               |   34 
 src/libpcp_qwt/src/qwt_compass_rose.cpp        |    8 
 src/libpcp_qwt/src/qwt_counter.cpp             |  660 ++++++++++------
 src/libpcp_qwt/src/qwt_counter.h               |   75 +
 src/libpcp_qwt/src/qwt_curve_fitter.cpp        |   94 +-
 src/libpcp_qwt/src/qwt_curve_fitter.h          |   11 
 src/libpcp_qwt/src/qwt_dial.cpp                | 1009 ++++++++-----------------
 src/libpcp_qwt/src/qwt_dial.h                  |  117 --
 src/libpcp_qwt/src/qwt_dial_needle.cpp         |    1 
 src/libpcp_qwt/src/qwt_dial_needle.h           |    5 
 src/libpcp_qwt/src/qwt_dyngrid_layout.cpp      |  206 ++---
 src/libpcp_qwt/src/qwt_dyngrid_layout.h        |    8 
 src/libpcp_qwt/src/qwt_event_pattern.cpp       |   97 +-
 src/libpcp_qwt/src/qwt_event_pattern.h         |  185 ++--
 src/libpcp_qwt/src/qwt_global.h                |    8 
 src/libpcp_qwt/src/qwt_graphic.cpp             | 1009 +++++++++++++++++++++++++
 src/libpcp_qwt/src/qwt_graphic.h               |  176 ++++
 src/libpcp_qwt/src/qwt_interval.cpp            |   86 +-
 src/libpcp_qwt/src/qwt_interval.h              |   40 
 src/libpcp_qwt/src/qwt_interval_symbol.cpp     |   19 
 src/libpcp_qwt/src/qwt_interval_symbol.h       |    1 
 src/libpcp_qwt/src/qwt_knob.cpp                |  578 +++++++++-----
 src/libpcp_qwt/src/qwt_knob.h                  |   77 +
 src/libpcp_qwt/src/qwt_legend.cpp              |  786 +++++++++++++------
 src/libpcp_qwt/src/qwt_legend.h                |  106 +-
 src/libpcp_qwt/src/qwt_legend_data.cpp         |  129 +++
 src/libpcp_qwt/src/qwt_legend_data.h           |   87 ++
 src/libpcp_qwt/src/qwt_legend_item.cpp         |  407 ----------
 src/libpcp_qwt/src/qwt_legend_item.h           |   78 -
 src/libpcp_qwt/src/qwt_legend_itemmanager.h    |   66 -
 src/libpcp_qwt/src/qwt_legend_label.cpp        |  421 ++++++++++
 src/libpcp_qwt/src/qwt_legend_label.h          |   80 +
 src/libpcp_qwt/src/qwt_magnifier.cpp           |  127 +--
 src/libpcp_qwt/src/qwt_magnifier.h             |   16 
 src/libpcp_qwt/src/qwt_math.cpp                |   29 
 src/libpcp_qwt/src/qwt_math.h                  |  127 +--
 src/libpcp_qwt/src/qwt_matrix_raster_data.cpp  |   56 +
 src/libpcp_qwt/src/qwt_matrix_raster_data.h    |   11 
 src/libpcp_qwt/src/qwt_null_paintdevice.cpp    |  327 ++++++--
 src/libpcp_qwt/src/qwt_null_paintdevice.h      |   57 +
 src/libpcp_qwt/src/qwt_painter.cpp             |  672 ++++++++++++++--
 src/libpcp_qwt/src/qwt_painter.h               |   58 +
 src/libpcp_qwt/src/qwt_painter_command.cpp     |  237 +++++
 src/libpcp_qwt/src/qwt_painter_command.h       |  173 ++++
 src/libpcp_qwt/src/qwt_panner.cpp              |   99 +-
 src/libpcp_qwt/src/qwt_panner.h                |   11 
 src/libpcp_qwt/src/qwt_picker.cpp              |  557 ++++++++-----
 src/libpcp_qwt/src/qwt_picker.h                |   38 
 src/libpcp_qwt/src/qwt_picker_machine.cpp      |  194 +++-
 src/libpcp_qwt/src/qwt_picker_machine.h        |   24 
 src/libpcp_qwt/src/qwt_pixel_matrix.cpp        |   51 +
 src/libpcp_qwt/src/qwt_pixel_matrix.h          |   98 ++
 src/libpcp_qwt/src/qwt_plot.cpp                |  779 ++++++++++++++-----
 src/libpcp_qwt/src/qwt_plot.h                  |  126 +--
 src/libpcp_qwt/src/qwt_plot_axis.cpp           |  253 +++---
 src/libpcp_qwt/src/qwt_plot_canvas.cpp         |  216 ++---
 src/libpcp_qwt/src/qwt_plot_canvas.h           |   30 
 src/libpcp_qwt/src/qwt_plot_curve.cpp          |  600 ++++++++------
 src/libpcp_qwt/src/qwt_plot_curve.h            |   56 -
 src/libpcp_qwt/src/qwt_plot_dict.cpp           |   39 
 src/libpcp_qwt/src/qwt_plot_dict.h             |    8 
 src/libpcp_qwt/src/qwt_plot_directpainter.cpp  |   78 +
 src/libpcp_qwt/src/qwt_plot_directpainter.h    |    8 
 src/libpcp_qwt/src/qwt_plot_grid.cpp           |  193 +++-
 src/libpcp_qwt/src/qwt_plot_grid.h             |   15 
 src/libpcp_qwt/src/qwt_plot_histogram.cpp      |  113 +-
 src/libpcp_qwt/src/qwt_plot_histogram.h        |    9 
 src/libpcp_qwt/src/qwt_plot_intervalcurve.cpp  |  125 ++-
 src/libpcp_qwt/src/qwt_plot_intervalcurve.h    |   12 
 src/libpcp_qwt/src/qwt_plot_item.cpp           |  414 +++++++---
 src/libpcp_qwt/src/qwt_plot_item.h             |  123 ++-
 src/libpcp_qwt/src/qwt_plot_layout.cpp         |  541 +++++++++----
 src/libpcp_qwt/src/qwt_plot_layout.h           |   35 
 src/libpcp_qwt/src/qwt_plot_magnifier.cpp      |   60 +
 src/libpcp_qwt/src/qwt_plot_magnifier.h        |    7 
 src/libpcp_qwt/src/qwt_plot_marker.cpp         |  138 +--
 src/libpcp_qwt/src/qwt_plot_marker.h           |   14 
 src/libpcp_qwt/src/qwt_plot_panner.cpp         |  136 ++-
 src/libpcp_qwt/src/qwt_plot_panner.h           |   10 
 src/libpcp_qwt/src/qwt_plot_picker.cpp         |   57 -
 src/libpcp_qwt/src/qwt_plot_picker.h           |   20 
 src/libpcp_qwt/src/qwt_plot_rasteritem.cpp     |  137 ++-
 src/libpcp_qwt/src/qwt_plot_rasteritem.h       |   24 
 src/libpcp_qwt/src/qwt_plot_renderer.cpp       |  485 +++++++-----
 src/libpcp_qwt/src/qwt_plot_renderer.h         |   38 
 src/libpcp_qwt/src/qwt_plot_rescaler.cpp       |   83 +-
 src/libpcp_qwt/src/qwt_plot_rescaler.h         |   11 
 src/libpcp_qwt/src/qwt_plot_scaleitem.cpp      |   87 +-
 src/libpcp_qwt/src/qwt_plot_seriesitem.cpp     |   38 
 src/libpcp_qwt/src/qwt_plot_seriesitem.h       |  170 ----
 src/libpcp_qwt/src/qwt_plot_spectrocurve.cpp   |   45 -
 src/libpcp_qwt/src/qwt_plot_spectrocurve.h     |    5 
 src/libpcp_qwt/src/qwt_plot_spectrogram.cpp    |   99 +-
 src/libpcp_qwt/src/qwt_plot_spectrogram.h      |   13 
 src/libpcp_qwt/src/qwt_plot_svgitem.cpp        |   19 
 src/libpcp_qwt/src/qwt_plot_xml.cpp            |    1 
 src/libpcp_qwt/src/qwt_plot_zoomer.cpp         |  127 ++-
 src/libpcp_qwt/src/qwt_plot_zoomer.h           |   68 +
 src/libpcp_qwt/src/qwt_point_3d.h              |   20 
 src/libpcp_qwt/src/qwt_point_data.cpp          |  307 +++++++
 src/libpcp_qwt/src/qwt_point_data.h            |  146 +++
 src/libpcp_qwt/src/qwt_point_mapper.cpp        |  717 +++++++++++++++++
 src/libpcp_qwt/src/qwt_point_mapper.h          |   89 ++
 src/libpcp_qwt/src/qwt_point_polar.cpp         |   11 
 src/libpcp_qwt/src/qwt_point_polar.h           |    8 
 src/libpcp_qwt/src/qwt_raster_data.cpp         |   20 
 src/libpcp_qwt/src/qwt_raster_data.h           |    2 
 src/libpcp_qwt/src/qwt_round_scale_draw.cpp    |   69 -
 src/libpcp_qwt/src/qwt_round_scale_draw.h      |   16 
 src/libpcp_qwt/src/qwt_samples.h               |  239 +++++
 src/libpcp_qwt/src/qwt_sampling_thread.h       |    6 
 src/libpcp_qwt/src/qwt_scale_div.cpp           |  244 ++++--
 src/libpcp_qwt/src/qwt_scale_div.h             |  100 --
 src/libpcp_qwt/src/qwt_scale_draw.cpp          |   53 -
 src/libpcp_qwt/src/qwt_scale_draw.h            |    5 
 src/libpcp_qwt/src/qwt_scale_engine.cpp        |  633 +++++++++------
 src/libpcp_qwt/src/qwt_scale_engine.h          |   57 -
 src/libpcp_qwt/src/qwt_scale_map.cpp           |  182 +---
 src/libpcp_qwt/src/qwt_scale_map.h             |   86 --
 src/libpcp_qwt/src/qwt_scale_widget.cpp        |   82 +-
 src/libpcp_qwt/src/qwt_scale_widget.h          |    7 
 src/libpcp_qwt/src/qwt_series_data.cpp         |  343 +-------
 src/libpcp_qwt/src/qwt_series_data.h           |  349 +++-----
 src/libpcp_qwt/src/qwt_series_store.h          |  199 ++++
 src/libpcp_qwt/src/qwt_slider.cpp              |  967 ++++++++++++++---------
 src/libpcp_qwt/src/qwt_slider.h                |  110 +-
 src/libpcp_qwt/src/qwt_spline.cpp              |   10 
 src/libpcp_qwt/src/qwt_symbol.cpp              |  848 +++++++++++++++++++--
 src/libpcp_qwt/src/qwt_symbol.h                |  118 ++
 src/libpcp_qwt/src/qwt_system_clock.cpp        |   72 +
 src/libpcp_qwt/src/qwt_system_clock.h          |    2 
 src/libpcp_qwt/src/qwt_text.cpp                |   99 +-
 src/libpcp_qwt/src/qwt_text.h                  |   21 
 src/libpcp_qwt/src/qwt_text_engine.cpp         |   21 
 src/libpcp_qwt/src/qwt_text_engine.h           |   10 
 src/libpcp_qwt/src/qwt_text_label.cpp          |   42 -
 src/libpcp_qwt/src/qwt_text_label.h            |    7 
 src/libpcp_qwt/src/qwt_thermo.cpp              |  645 +++++++--------
 src/libpcp_qwt/src/qwt_thermo.h                |  124 +--
 src/libpcp_qwt/src/qwt_transform.cpp           |  177 ++++
 src/libpcp_qwt/src/qwt_transform.h             |  142 +++
 src/libpcp_qwt/src/qwt_wheel.cpp               |  975 +++++++++++++++++++++---
 src/libpcp_qwt/src/qwt_wheel.h                 |  139 ++-
 src/libpcp_qwt/src/qwt_widget_overlay.cpp      |  376 +++++++++
 src/libpcp_qwt/src/qwt_widget_overlay.h        |  148 +++
 src/pmchart/chart.cpp                          |   67 +
 src/pmchart/chart.h                            |   20 
 src/pmchart/sampling.cpp                       |   22 
 src/pmchart/timeaxis.cpp                       |    5 
 src/pmchart/tracing.cpp                        |    4 
 src/pmtime/pmtimearch.cpp                      |   43 -
 src/pmtime/pmtimearch.h                        |    2 
 src/pmtime/pmtimearch.ui                       |   10 
 src/pmtime/showboundsdialog.cpp                |    4 
 src/pmtime/showboundsdialog.ui                 |   20 
 182 files changed, 18576 insertions(+), 8328 deletions(-)


commit 0234127882e190fdd3798592b1ee0e037f6ce9b0
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date:   Mon Oct 3 17:20:10 2016 +1100

    pmchart: resolve y-axis scaling issue for util charts
    
    Issue arrived with the Qt5/Qwt6.1 update, where auto-scaling
    was being circumvented due to presence of qNaN values in the
    dataset.  QwtPlot::updateAxes() in particular was affected by
    these, ultimately traversing inValid axis code paths where it
    should not have.

commit c4679479e95724a88ca52526d4cb8e64848a1b96
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date:   Fri Sep 16 15:14:51 2016 +1000

    pmchart: fix rendering of the time axis by hiding the canvas

commit 26c62e67b9f2f4aab5fc0449d699a0b636c86b75
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date:   Fri Sep 16 14:22:06 2016 +1000

    pmtime: fix rendering of the time sliders, no scale text

commit 853202aef9b0427b6d553bc2b58542a56ac70b92
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date:   Wed Sep 14 17:32:09 2016 +1000

    pmchart: rewrite legend rendering for qwt 6.x support

commit 99f0d02d5f139a51fa4c42c6e14b008630b28c34
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date:   Tue Sep 13 11:11:09 2016 +1000

    pmchart: fix minor compilation warning
    
    Switch from deprecated dark() QColor API to darker().

commit db025b177fe5acc079f014be37238667b904366f
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date:   Mon Sep 12 17:33:03 2016 +1000

    qt tools: enable use of Qt5 toolchain, headers and libraries
    
    Move forward with support for Qt5 for all Qt tools and libs
    in PCP, and also latest Qwt 6.1.4 (also needed for Qt5).
    
    Many API and ABI changes here.  A bit of fine-tuning remains
    to reach some of the UI neatness from Qt4, but it's a clean
    build for the first time at least, and the tools run.
    
    (Qt5 required for PCP GUI tools under MacOSX El Capitan.)

<Prev in Thread] Current Thread [Next in Thread>
  • pcp updates: Qt5 & Qwt6.1 support, Nathan Scott <=