Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge Qt charts branch #18

Merged
merged 36 commits into from
Feb 15, 2016
Merged

Merge Qt charts branch #18

merged 36 commits into from
Feb 15, 2016

Conversation

zcobell
Copy link
Owner

@zcobell zcobell commented Feb 15, 2016

This branch accomplishes the following:

  1. Remove HighCharts, add QtCharts. closes Remove HighCharts javascript, Add QtCharts #15
  2. Remove QtWebkit and replace with QtWebEngine. closes Remove QtWebkit #14

Note that DLLs have been added for QtCharts which are not part of the default Qt 5.5 binary distribution and must be compiled manually.

MinGW32 is no longer an option for Windows compilers as QtWebEngine is not compatible. MSVC 2013+ must be used in order to satisfy this on Windows. No changes necessary for Linux distributions.

Finally, Codeship does not have QtWebEngine or QtCharts, so it cannot be tested there.

Zach Cobell added 30 commits January 29, 2016 11:46
Adding set/get routines and setting all variables to private.
Also, very little now happens outside of the class by passing
pointers into the class to the GUI elements.
Also, removing individual class folders and placing everything back
into src
Also adding reference to GMT in x-label for noaa
and usgs plots.
Removing files that are no longer needed
Organizing HWM data into a class
Removing method that was implemented in this code
Plotting still doesn't work, however other functions do. Need
to investigate more
Zach Cobell added 6 commits February 14, 2016 02:11
Removing Callout.cpp and Callout.h since it doesn't look
as nice as it probably should. Mouse tracking provides
a nice working chart. Also, renaming some of the derrived
classes to be consistent.
Detail:
(1) Fixing bug where y-axis was not attached for noaa
(2) Simplifiying to a single widget for mouseover actions
(3) Adding save actions for HWMs
(4) Adding regression information to HWM regression
@zcobell zcobell self-assigned this Feb 15, 2016
@zcobell zcobell added this to the v2.5.0 milestone Feb 15, 2016
zcobell added a commit that referenced this pull request Feb 15, 2016
@zcobell zcobell merged commit 595e54e into v2.5 Feb 15, 2016
@zcobell zcobell deleted the QtCharts branch February 15, 2016 07:29
@zcobell zcobell changed the title Qt charts Merge Qt charts branch Feb 16, 2016
zcobell added a commit that referenced this pull request May 12, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant