Commit Graph

16 Commits

Author SHA1 Message Date
Gerald Combs 86bf0357fe Remove old Qt code.
Our minimum version has been 4.7 for a while. Remove dead
QT_VERSION_CHECK code.

Change-Id: Ia003c1aa4275eefdda707975774d886643ff1538
Reviewed-on: https://code.wireshark.org/review/16888
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-06 07:29:55 +00:00
Zdeněk Žamberský b84b3f9f1d Qt ui code: fix qreal type problems on ARM platform
fixing problems in qt ui code comming from the fact that qreal type is float on
ARM platform and double on other platforms, which causes build errors on ARM
(not all casts are probably strictly necessary)

Bug: 12483
Change-Id: Ife5e6d3649a7ee1ad4e7eadffe9f4484ff2718de
Reviewed-on: https://code.wireshark.org/review/15723
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-05 01:59:04 +00:00
Gerald Combs 0af5ef3fce QCP: Fix retina label calculations.
The retina fixes in gb10bad1 and gb3f3d66 were incomplete and caused
rendering problems in our axis labels. Handle the device pixel ratio in
a couple of more places so that our axis rects are correctly sized.

Add a switch (WS_ENABLE_DP_RATIO) to make it easy to turn scaling on and
off.

Change-Id: I633d94d633e0743be2a607c9a4cbb3409e9eed62
Ping-Bug: 11710
Reviewed-on: https://code.wireshark.org/review/13834
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-02-08 23:26:28 +00:00
Jim Young 0fa13371d1 Qt io_graph: Use Interval value when generating Y-axis label or legend
The I/O Graph allows the user to choose from several different Y-axis units.
Three of the selectable Y-axis units unconditionally imply a per-second
time unit (/s) regardless of the actual I/O Graph Interval value selected.
In addition the Y-axis label includes the “/s” as a suffix regardless of the
current Interval value.

This patch removes "/s" suffix from the Y-axis pick-list units.  This patch
also dynamically adds the selected Interval value to the Y-Axis label or
alternatively as the first line of the legend box that is displayed if the
various enabled graphs have differing Y-axis values.  For readability the
pick-list values for sub-second Interval values are changed to 1 ms, 10 ms
and 100 ms from the original pick-list values of 0.001 sec, 0.01 sec and
0.1 sec respectively.

To support adding a “Title” to the legend, the QCustomPlot widget is
augmented with “Legend Title” source authored by “David” as posted at:

  http://www.qcustomplot.com/index.php/support/forum/443

Note: This patch changes the valid Y-axis unit values stored within the
io_graphs preferences files.  Any io_graphs files having entries with the
now obsolete Y-Axis values of “Packets/s”, “Bytes/s” or “Bits/s“ will be
silently upgraded to “Packets”, "Bytes" and "Bits" respectively when
saved.

Bug: 11855
Change-Id: I503ff6dc20b09d90f087342084fb0db6e0080c7f
Reviewed-on: https://code.wireshark.org/review/12219
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-24 00:13:42 +00:00
Dario Lombardo 862625f430 qt: add init values to make clang happy.
Found by clang analyzer.

Change-Id: I04598e8e9fcb716b373d4b2f707de8f263ff36b0
Reviewed-on: https://code.wireshark.org/review/11029
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-15 08:57:40 +00:00
Dario Lombardo 1a383f8a82 qt: remove leak
Found by clang analyzer.

Change-Id: If8bc72e1de276ae778ee3ac3e0dfc9dffa384c29
Reviewed-on: https://code.wireshark.org/review/11028
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-22 12:30:52 +00:00
Alexis La Goutte a3666e5e39 QCustomPlot: fix division(or modulo) by zero found by Clang and Coverity (CID 1159170 & 1159171)
Try 2

Change-Id: I10c439ccd4b8e5ac24275332e35fb35ad95b8d1b
Reviewed-on: https://code.wireshark.org/review/8447
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-05-13 17:38:04 +00:00
Alexis La Goutte 0310c72377 Revert "QCustomPlot: fix division(or modulo) by zero found by Clang and Coverity (CID 1159170 & 1159171)"
This reverts commit b394aa5f1e.

The patch don't fix this issue...

Change-Id: I654933ec4ebebdef840f24ba20162f1f1a5321cc
Reviewed-on: https://code.wireshark.org/review/8332
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-05-07 12:16:27 +00:00
Alexis La Goutte b394aa5f1e QCustomPlot: fix division(or modulo) by zero found by Clang and Coverity (CID 1159170 & 1159171)
Change-Id: Iba9317436983bb4b3730be8b80e7b9c107ffc3a9
Reviewed-on: https://code.wireshark.org/review/8112
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-19 05:56:09 +00:00
Gerald Combs b3f3d669e5 Update Qt version checks.
It looks like QPaintDevice::devicePixelRatio() was added in 5.1.

Back out some debugging code.

Change-Id: I40f19c0d7901ce95f587531983e5c6644daf64f4
Reviewed-on: https://code.wireshark.org/review/7226
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-18 02:14:59 +00:00
Gerald Combs b10bad126a Fix QCustmPlot retina problems.
Make sure our intermediate pixmaps have the same number of pixels as the
screen.

A merge request with the same changes has been made upstream.

Change-Id: I19950181d52f347e3aa7f5abb6e9ad33a4097abf
Reviewed-on: https://code.wireshark.org/review/7224
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-18 01:19:46 +00:00
Alexis La Goutte c411029a3c Update to QCustomPlot 1.3.0
Reapply remove trailing whitespace and some spelling fixes
Fix also a not ASCII caracter in qcustomplot.h

Change-Id: Ibd5433015dd117f4d028c842a4add53041adbd11
Reviewed-on: https://code.wireshark.org/review/6275
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-05 10:28:04 +00:00
Alexis La Goutte 864304c870 Update to QCustomPlot 1.2.0
Reapply remove trailing whitespace and some spelling fixes
MSCV warning are already fixed
Fix also a not ASCII caracter in qcustomplot.h

Change-Id: Ied6b0a4ad7397caea6b75fa56f4f2d6ea91d0472
Reviewed-on: https://code.wireshark.org/review/787
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-23 07:54:09 +00:00
Bill Meier 8ab9c55618 From Ville Skyttä: Spelling Fixes
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9591


svn path=/trunk/; revision=54387
2013-12-23 15:53:13 +00:00
Jörg Mayer dbd9c134fa - Fix lots of "C:\wireshark\trunk\ui\qt\qcustomplot.cpp(16589) :
warning C4305: 'argument' : truncation from 'double' to 'float'"
- Remove trailing whitespace


svn path=/trunk/; revision=53768
2013-12-03 21:49:28 +00:00
Gerald Combs 6d731a3e79 Add TCP sequence number (Stevens-style) graphs.
Add the QCustomPlot widget. Thanks to Emanuel Eichhammer for granting a
license change. Move some common code from ui/gtk/tcp_graph.c to
ui/tap-tcp-stream.[ch]. Get rid of tcp_graph_selected_packet_enabled().
It was only used in the menu code and didn't match what we were doing
elsewhere.

Still quite a bit of work to do but it's a promising start.

svn path=/trunk/; revision=51538
2013-08-27 18:13:20 +00:00