[neon/extras/labplot/Neon/release-lts] debian/patches: use patch from release/2.8 branch
Jonathan Riddell
null at kde.org
Mon Nov 9 13:28:26 GMT 2020
Git commit 7a36b95a2a59ff33aaac81f6bd5e9aac03cefde8 by Jonathan Riddell.
Committed on 09/11/2020 at 13:28.
Pushed by jriddell into branch 'Neon/release-lts'.
use patch from release/2.8 branch
M +821 -73 debian/patches/cantor-20.08.diff
https://invent.kde.org/neon/extras/labplot/commit/7a36b95a2a59ff33aaac81f6bd5e9aac03cefde8
diff --git a/debian/patches/cantor-20.08.diff b/debian/patches/cantor-20.08.diff
index 74d0a4c..f934bfa 100644
--- a/debian/patches/cantor-20.08.diff
+++ b/debian/patches/cantor-20.08.diff
@@ -1,86 +1,834 @@
-commit ad2d74e7b4fd11af119159161cbb9cb3d59000a6
-Author: Stefan Gerlach <stefan.gerlach at uni-konstanz.de>
-Date: Sun Aug 30 21:31:50 2020 +0200
-
- [cantor] Fix problem with version 20.08
-
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 90c00f7c7..b0c342c85 100644
+index 33b407046..98130a30d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -223,10 +223,6 @@ SET_PACKAGE_PROPERTIES(Cantor PROPERTIES
- IF (Cantor_FOUND)
- MESSAGE (STATUS "Found Cantor Library")
-
-- # can be removed with code using it
-- IF (NOT ${Cantor_VERSION} VERSION_GREATER "0")
-- add_definitions (-DOLD_CANTORLIBS_VERSION)
-- ENDIF ()
- IF (${Cantor_VERSION} VERSION_GREATER "19.11")
- add_definitions (-DHAVE_CANTOR_LIBS)
- set(RECENT_CANTOR TRUE)
-@@ -234,6 +230,9 @@ IF (Cantor_FOUND)
+@@ -230,7 +230,7 @@ IF (Cantor_FOUND)
ELSE ()
MESSAGE (STATUS "Cantor Library ${Cantor_VERSION} TOO OLD. Minimum usable version is 19.12")
ENDIF ()
-+ IF (${Cantor_VERSION} VERSION_GREATER "20.08")
-+ add_definitions (-DHAVE_NEW_CANTOR_LIBS)
-+ ENDIF ()
+- IF (${Cantor_VERSION} VERSION_GREATER "20.08")
++ IF (${Cantor_VERSION} VERSION_GREATER "20.08.9")
+ add_definitions (-DHAVE_NEW_CANTOR_LIBS)
+ ENDIF ()
ELSE ()
- MESSAGE (STATUS "Cantor Library NOT FOUND")
- ENDIF ()
-diff --git a/src/backend/cantorWorksheet/CantorWorksheet.cpp b/src/backend/cantorWorksheet/CantorWorksheet.cpp
-index a2fdbd11e..f2684a09d 100644
---- a/src/backend/cantorWorksheet/CantorWorksheet.cpp
-+++ b/src/backend/cantorWorksheet/CantorWorksheet.cpp
-@@ -37,7 +37,7 @@
- #include "3rdparty/cantor/cantor_part.h"
- #include <cantor/worksheetaccess.h>
+diff --git a/ChangeLog b/ChangeLog
+index 9760551c0..48ebe83fa 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,6 @@
++-----2.9 -----
++Bug fixes:
++ * Fix compiling with Cantor 20.08.X and X>0
+ -----2.8 -----
+ * Improved DateTime data support
+ * Show the size of the members in the JSON file in the import file dialog
+diff --git a/admin/README.kde_upload b/admin/README.kde_upload
+deleted file mode 100644
+index a71b0ac03..000000000
+--- a/admin/README.kde_upload
++++ /dev/null
+@@ -1,18 +0,0 @@
+-In order to get your files published on the KDE mirror network, please upload
+-the file(s) to ftp://upload.kde.org/incoming. Afterward, submit a KDE Sysadmin ticket
+-for the download.kde.org department at https://sysadmin.kde.org/tickets/
+-Please include the following:
+-
+-* SHA-1 and SHA-256 sums for the files uploaded so we can verify the files.
+-* Intended destination for the files uploaded (eg: stable/4.6.3/src/).
+-
+-Files or reports without this information will be deleted or closed.
+-
+-When linking to files on the KDE mirror network, please use urls on download.kde.org
+-to allow for people to be redirected to the geographically closest mirror.
+-(eg: http://download.kde.org/README_UPLOAD.mirrorlist or http://download.kde.org/README_UPLOAD)
+-
+-
+-Thanks,
+-KDE Sysadmin
+-P.S.: Please don't forget to use binary mode to upload.
+diff --git a/admin/README.release b/admin/README.release
+new file mode 100644
+index 000000000..048006cfc
+--- /dev/null
++++ b/admin/README.release
+@@ -0,0 +1,57 @@
++1. Tag the release
++* git tag "2.8.0" -a -m "Tagging 2.8.0"
++* git push --tags
++
++
++2. Source tarball:
++* Install https://invent.kde.org/sdk/releaseme
++* create the tarball, from the releasme folder execute tarme.rb for this:
++./tarme.rb --version 2.8.0 --origin trunk labplot
++
++tarme.rb will also calculate the checksums.
++
++
++3. Windows Installer
++* release build on binary-factory.kde.org/
++* calculate SHA-256 and SHA-1 checksums
++
++
++4. macOS dmg-image
++* create the dmg image
++* calculate SHA-256 and SHA-1 checksums
++
++
++5. Upload the files to ftp://upload.kde.org/incoming (Read readme: ftp://upload.kde.org/README)
++
++
++6. sysadmin ticket
++* File a syadmin ticket: https://go.kde.org/u/systickets to register new project versions on Bugzilla and move the files to the stable/ folder
++* Use the following example/template for the ticket (also generated by releaseme):
++
++
++###########
++Please add 2.8.0 to bugs.kde.org product LabPlot2
++
++Target: stable/labplot/2.8.0
++
++SHA-256:
++
++```
++9317f6592753de644bbb7f8502f84d080b8932b0d4176276a641f10efacd253b labplot-2.8.0.tar.xz.sig
++8957c708ea572d9b7bfd7bdd1e9627bb1e10717c4b8cb10c7687ca6ca187a705 labplot-2.8.0.tar.xz
++05c956d8136eb1cf61e1b2eea29fad0ae5a754a9a44bf4a9f025d335991ee7c0 labplot-2.8.0-64bit-setup.exe
++30a2cfd443c2f16de7ddce38d977311ac1cb0158c9ed9b6b76b151ff65204f50 labplot-2.8.0.dmg
++```
++
++SHA-1:
++
++```
++e8afdecbd79247da28278312d07a31b2bc111b15 labplot-2.8.0.tar.xz.sig
++0a316090a33db94b482f667d9cca2ce0be97e858 labplot-2.8.0.tar.xz
++433bafd45d02bf2dee8ce02ba9c9c4b64c2df0d0 labplot-2.8.0-64bit-setup.exe
++d2594f62ecdd33c177d7673c550a8e830d47a3c1 labplot-2.8.0.dmg
++```
++################
++
++
++7. Publish the release announcement on labplot.kde.org
+diff --git a/admin/SLOC.txt b/admin/SLOC.txt
+index df9783937..66b5fb755 100644
+--- a/admin/SLOC.txt
++++ b/admin/SLOC.txt
+@@ -6,6 +6,35 @@ SLOCCount comes with ABSOLUTELY NO WARRANTY, and you are welcome to
+ redistribute it under certain conditions as specified by the GNU GPL license;
+ see the documentation for details.
--#if CANTOR_VERSION > QT_VERSION_CHECK(20,8,0)
-+#ifdef HAVE_NEW_CANTOR_LIBS
- #include <cantor/panelpluginhandler.h>
- #include <cantor/panelplugin.h>
- #else
-@@ -92,18 +92,14 @@ bool CantorWorksheet::init(QByteArray* content) {
- connect(m_session, SIGNAL(statusChanged(Cantor::Session::Status)), this, SIGNAL(statusChanged(Cantor::Session::Status)));
++-----2.8-----
++SLOC Directory SLOC-by-Language (Sorted)
++62820 backend cpp=58077,ansic=4245,yacc=481,python=17
++39414 kdefrontend cpp=39414
++10549 commonfrontend cpp=10549
++549 tools cpp=549
++209 3rdparty cpp=200,ansic=9
++20 top_dir sh=20
++0 doc (none)
++
++
++Totals grouped by language (dominant language first):
++cpp: 108789 (95.80%)
++ansic: 4254 (3.75%)
++yacc: 481 (0.42%)
++sh: 20 (0.02%)
++python: 17 (0.01%)
++
++
++* Total Physical Source Lines of Code (SLOC) = 113,561
++* Development Effort Estimate, Person-Years (Person-Months) = 28.78 (345.30)
++ (Basic COCOMO model, Person-Months = 2.4 * (KSLOC**1.05))
++* Schedule Estimate, Years (Months) = 1.92 (23.04)
++ (Basic COCOMO model, Months = 2.5 * (person-months**0.38))
++* Estimated Average Number of Developers (Effort/Schedule) = 14.99
++* Total Estimated Cost to Develop = $ 3,887,159
++ (average salary = $56,286/year, overhead = 2.40).
++
++
+ -----2.7-----
+ SLOC Directory SLOC-by-Language (Sorted)
+ 59740 backend cpp=55003,ansic=4239,yacc=481,python=17
+diff --git a/data/datasets/DatasetCollections.json b/data/datasets/DatasetCollections.json
+index 58400dea2..ebe7e2ce7 100644
+--- a/data/datasets/DatasetCollections.json
++++ b/data/datasets/DatasetCollections.json
+@@ -19,10 +19,6 @@
+ "description" : "<b>OzDASL</b> is a library of data sets and associated stories. It is intended as a resource for teachers of statistics in Australia and New Zealand and elsewhere. Emphasis is given to data sets with an Australasian context, although interesting data sets from anywhere in the world are included.",
+ "url" : "http://www.statsci.org/data/"
+ },
+- {
+- "name" : "Socrata",
+- "description" : ""
+- },
+ {
+ "name" : "StatLib",
+ "description" : "<b>StatLib</b> is a datasets archive maintained by Pantelis Vlachos from Carnegie Melon University.",
+diff --git a/data/datasets/Socrata.json b/data/datasets/Socrata.json
+deleted file mode 100644
+index 25fd6241d..000000000
+--- a/data/datasets/Socrata.json
++++ /dev/null
+@@ -1,614 +0,0 @@
+-{
+- "name": "Socrata",
+- "categories": [
+- {
+- "name": "Statistics",
+- "subcategories": [
+- {
+- "datasets": [
+- {
+- "description": "Since 1995, the White House has been required to deliver a report to Congress listing the title and salary of every White House Office employee. Consistent with President Obama's commitment to transparency, this report is being publicly disclosed on our website as it is transmitted to Congress. In addition, this report also contains the title and salary details of administration officials who work at the Office of Policy Development, including the Domestic Policy Council and the National Economic Council -- along with White House Office employees.",
+- "url": "https://opendata.socrata.com/api/views/jv7a-cjdv/rows.csv?accessType=DOWNLOAD",
+- "filename": "rows",
+- "name": "2012 Annual Report to Congress on White House Staff",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- },
+- {
+- "description": "Since 1995, the White House has been required to deliver a report to Congress listing the title and salary of every White House Office employee. Consistent with President Obama's commitment to transparency, this report is being publicly disclosed on our website as it is transmitted to Congress. In addition, this report also contains the title and salary details of administration officials who work at the Office of Policy Development, including the Domestic Policy Council and the National Economic Council -- along with White House Office employees. Note: Salaries listed do not reflect salary reductions staff have taken due to furloughs and commissioned officer salary reductions.",
+- "url": "https://opendata.socrata.com/api/views/44xn-rs2p/rows.csv?accessType=DOWNLOAD",
+- "filename": "Report-Congress",
+- "name": "2013 Report to Congress on White House Staff",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- },
+- {
+- "description": "All employees of the State of South Carolina that make at least $50,000 per year. Imported from the South Carolina Budget and Control Board website.",
+- "url": "https://opendata.socrata.com/api/views/67f6-9d58/rows.csv?accessType=DOWNLOAD",
+- "filename": "State-Employee-Salary",
+- "name": "South Carolina State Employee Salary Database",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- },
+- {
+- "description": "An LNP analysis of Pennsylvania Liquor Control Board data found that nearly 700 townships and boroughs - about 27 percent of the state's 2,562 local governments - ban the sale of beer and liquor altogether or are at least dry in some form.",
+- "url": "https://opendata.socrata.com/api/views/vr4q-nrmd/rows.csv?accessType=DOWNLOAD",
+- "filename": "Dry-Municipalities",
+- "name": "Pennsylvania's Dry Municipalities",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- },
+- {
+- "description": "Six Utah counties reported more registered voters than adults in 2010.",
+- "url": "https://opendata.socrata.com/api/views/jinf-pspj/rows.csv?accessType=DOWNLOAD",
+- "filename": "County",
+- "name": "County comparison",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- },
+- {
+- "description": "EMS Incidents Projections ",
+- "url": "https://opendata.socrata.com/api/views/evnp-32vr/rows.csv?accessType=DOWNLOAD",
+- "filename": "Incidents",
+- "name": "EMS Incidents Projections ",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- },
+- {
+- "description": "WBEZ FOIA-obtained contact cards for the 19th District of the Chicago Police Department for 2012 and 2013 year to date.",
+- "url": "https://opendata.socrata.com/api/views/6gqi-4u4s/rows.csv?accessType=DOWNLOAD",
+- "filename": "Contact-Cards",
+- "name": "Chicago's 19th District Contact Cards For 2012-2013",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- },
+- {
+- "description": "Index of U.S. Government Departments and Agencies",
+- "url": "https://opendata.socrata.com/api/views/2yen-rixh/rows.csv?accessType=DOWNLOAD",
+- "filename": "Government-Departments",
+- "name": "Index of U.S. Government Departments and Agencies",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- },
+- {
+- "description": "OCCC Faculty Staff Directory",
+- "url": "https://opendata.socrata.com/api/views/bzra-p8dk/rows.csv?accessType=DOWNLOAD",
+- "filename": "Faculty-Staff-Directory",
+- "name": "OCCC Faculty Staff Directory",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- },
+- {
+- "description": "Since 1995, the White House has been required to deliver a report to Congress listing the title and salary of every White House Office employee. Consistent with President Obama's commitment to transparency, this report is being publicly disclosed on our website as it is transmitted to Congress. In addition, this report also contains the title and salary details of administration officials who work at the Office of Policy Development, including the Domestic Policy Council and the National Economic Council -- along with White House Office employees. Note: Salaries listed do not reflect salary reductions staff have taken due to furloughs and commissioned officer salary reductions.",
+- "url": "https://opendata.socrata.com/api/views/ib7r-prw9/rows.csv?accessType=DOWNLOAD",
+- "filename": "White-House-Staff",
+- "name": "Name, Salary and Position of the 2013 White House Staff ",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- },
+- {
+- "description": "Which countries have sent how many troups to Afghanistan.",
+- "url": "https://opendata.socrata.com/api/views/xjiz-z25n/rows.csv?accessType=DOWNLOAD",
+- "filename": "Troops-In-Afghanistan",
+- "name": "Troops In Afghanistan By Country",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- }
+- ],
+- "name": "Administration"
+- },
+- {
+- "datasets": [
+- {
+- "description": "Pennsylvania State System of Higher Education salaries for 2013.",
+- "url": "https://opendata.socrata.com/api/views/26jq-uk2i/rows.csv?accessType=DOWNLOAD",
+- "filename": "Salaries_",
+- "name": "2013 Salaries: Pennsylvania State System of Higher Education",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- },
+- {
+- "description": "SBA Portfolio Performance by Franchise Code - Data as of 09/30/2011 \nCombined 7(a) & 504 loan performance data based on loans approved between 10/01/2001 and 09/30/2011, which were designated with a franchise code* and \nsubsequently disbursed. This list is redacted to 10 or more disbursements per franchising brand.",
+- "url": "https://opendata.socrata.com/api/views/5qh7-7usu/rows.csv?accessType=DOWNLOAD",
+- "filename": "Failureby",
+- "name": "Franchise Failureby Brand2011",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- },
+- {
+- "description": "City Of Trenton - 2017 Certified Tax List",
+- "url": "https://opendata.socrata.com/api/views/azkq-6qqc/rows.csv?accessType=DOWNLOAD",
+- "filename": "Certified-Tax",
+- "name": "City Of Trenton - 2017 Certified Tax List",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- },
+- {
+- "description": "City Of Trenton - 2015 Certified Tax List",
+- "url": "https://opendata.socrata.com/api/views/f3qm-jqfs/rows.csv?accessType=DOWNLOAD",
+- "filename": "Trenton-Tax",
+- "name": "City Of Trenton - 2015 Certified Tax List",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- },
+- {
+- "description": "These data show salaries for public school teachers, administrators and other officials in Lancaster County for the 2012-2013 academic year. The data are published by the Pennsylvania Department of Education.",
+- "url": "https://opendata.socrata.com/api/views/mpsw-g7js/rows.csv?accessType=DOWNLOAD",
+- "filename": "School-Salaries",
+- "name": "Lancaster County School Salaries ",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- },
+- {
+- "description": "NSA Water and money",
+- "url": "https://opendata.socrata.com/api/views/3rks-twmf/rows.csv?accessType=DOWNLOAD",
+- "filename": "Water-money",
+- "name": "NSA Water Jan 2015 ",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- },
+- {
+- "description": "An export of all the employees of local governments in the Midlands area of South Carolina that make at least $50,000 per year. Scraped from the database made available thanks to The State newspaper.\n\nThe government agencies included:\n\nCounties: Kershaw, Lexington, Richland\n\nLibraries: Richland County\n\nMunicipalities: Batesburg-Leesville, Blythewood, Camden, Cayce, Columbia, Forest Acres, Irmo, Lexington, West Columbia\n\nSchool Districts: Kershaw, Lexington 1, Lexington 2, Lexington 3, Lexington 4, Lexington-Richland 5, Richland 1, Richland 2",
+- "url": "https://opendata.socrata.com/api/views/weqv-6vsn/rows.csv?accessType=DOWNLOAD",
+- "filename": "Salary-Database",
+- "name": "South Carolina Midlands Employee Salary Database",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- },
+- {
+- "description": "Personal financial disclosure statements for nearly 225 Texas elected officials, including Gov. Rick Perry, the Texas House and Senate, Supreme Court, Railroad Commission and State Board of Education. The financial statements cover calendar year 2012 and are being made available in this database because the Texas Legislature has snuffed out efforts to make them available online for the public to easily view.",
+- "url": "https://opendata.socrata.com/api/views/k2dw-gwje/rows.csv?accessType=DOWNLOAD",
+- "filename": "Financial-Statements",
+- "name": "Texas Lawmaker Personal Financial Statements For CY 2012-2",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- },
+- {
+- "description": "Car Sales from California and across the United States, 1996-Present.",
+- "url": "https://opendata.socrata.com/api/views/da8m-smts/rows.csv?accessType=DOWNLOAD",
+- "filename": "Car-Sales",
+- "name": "Car Sales Data",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- },
+- {
+- "description": "Asset-based lending deals",
+- "url": "https://opendata.socrata.com/api/views/8it9-ht43/rows.csv?accessType=DOWNLOAD",
+- "filename": "lending-deals",
+- "name": "Deal Table Live",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- },
+- {
+- "description": "All the Target store locations in the US",
+- "url": "https://opendata.socrata.com/api/views/4mte-zfws/rows.csv?accessType=DOWNLOAD",
+- "filename": "Target",
+- "name": "Target Stores in USA",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- },
+- {
+- "description": "Asset-based lending deals",
+- "url": "https://opendata.socrata.com/api/views/j4w7-jnxu/rows.csv?accessType=DOWNLOAD",
+- "filename": "TLS",
+- "name": "TSL-NewSiteDeals",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- },
+- {
+- "description": "Utah - Statewide Occupational Wages Hourly Wage Information by Occupational Title Published May, 2008 Below is a summary of the wage estimates for the state of Utah, which are based on data gathered in May of 2007. Occupations are listed alphabetically along with the occupation code, which is a unique number assigned to each occupation. Wages for occupations in education are at the end of the wage table. Wages are presented as: the Inexperienced Wage (the average of the bottom-third of all wages collected), Average Wage, Median Wage (which is the wage of the middle worker in the survey where half of the workers earned wages below the median and half above the median), and the Middle Range (which represents the wages of the middle fifty percent of workers in each occupation). Questions may be addressed to Mark Knold (801) 526-9458, Chief Economist for the Utah Department of Workforce Services.",
+- "url": "https://opendata.socrata.com/api/views/us9r-qb2p/rows.csv?accessType=DOWNLOAD",
+- "filename": "Average-Wage",
+- "name": "Utah Average Wage For Hourly Workers",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- },
+- {
+- "description": "This dataset provides summarized expenditure data for State of Iowa. The state fiscal year runs from July 1 to the following June 30 and is numbered for the calendar year in which it ends. The State of Iowa operates on a modified accrual basis which provides that encumbrances on June 30 must be paid within 60 days after year end. The expenditures are summarized by Fiscal Year, Month, Fund, Appropriation, Department, Unit, and Object Class.",
+- "url": "https://opendata.socrata.com/api/views/dqqm-s2r5/rows.csv?accessType=DOWNLOAD",
+- "filename": "Iowa-Expenditures",
+- "name": "State of Iowa Expenditures",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- },
+- {
+- "description": "An export of all Starbucks locations in the world. This dataset was scraped from the Starbucks website on Thursday, November 8th, 2013.",
+- "url": "https://opendata.socrata.com/api/views/nt5z-pju4/rows.csv?accessType=DOWNLOAD",
+- "filename": "Starbucks-Locations",
+- "name": "All Starbucks Locations in the World - Heat Map",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- },
+- {
+- "description": "Volkswagen US TDI Production Data for Non-Passat Common Rail TDIs through 11-30-2012 \nCollected from the NHTSA Defect Investigation EA11003 http://www-odi.nhtsa.dot.gov/cars/problems/defect/results.cfm?action_number=EA11003&SearchType=QuickSearch&summary=true",
+- "url": "https://opendata.socrata.com/api/views/f2gv-p6q4/rows.csv?accessType=DOWNLOAD",
+- "filename": "vijay",
+- "name": "Volkswagen US TDI Production Data",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- },
+- {
+- "description": "An export of all the employees of the City of Columbia, South Carolina, that make at least $50,000 per year. Scraped from the database made available thanks to The State newspaper.",
+- "url": "https://opendata.socrata.com/api/views/86mz-659b/rows.csv?accessType=DOWNLOAD",
+- "filename": "Employee-Salaries",
+- "name": "City of Columbia Employee Salaries ",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- },
+- {
+- "description": "Michigan Oil and Gas Wells",
+- "url": "https://opendata.socrata.com/api/views/ixt6-qcyf/rows.csv?accessType=DOWNLOAD",
+- "filename": "Gas-Wells",
+- "name": "MIOil And Gas Wells",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- },
+- {
+- "description": "NSA Water and money",
+- "url": "https://opendata.socrata.com/api/views/k72b-hbra/rows.csv?accessType=DOWNLOAD",
+- "filename": "NSAWaterBill",
+- "name": "NSAWaterBill ",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- },
+- {
+- "description": "Links to sites that offer discounts to government employees.",
+- "url": "https://opendata.socrata.com/api/views/3592-x988/rows.csv?accessType=DOWNLOAD",
+- "filename": "Govenment-Employee-Discounts",
+- "name": "Govenment Employee Discounts",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- },
+- {
+- "description": "Asset-based lending deals",
+- "url": "https://opendata.socrata.com/api/views/cbha-gzag/rows.csv?accessType=DOWNLOAD",
+- "filename": "Deal-Table-Full",
+- "name": "Deal Table Full ",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- }
+- ],
+- "name": "Economics"
+- },
+- {
+- "datasets": [
+- {
+- "description": "A list of the Guardian's \"Top 1,000 Songs to Hear Before You Die\"",
+- "url": "https://opendata.socrata.com/api/views/ed74-c6ni/rows.csv?accessType=DOWNLOAD",
+- "filename": "Top-1000",
+- "name": "Top 1,000 Songs To Hear Before You Die",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- },
+- {
+- "description": "An export of all Starbucks locations in the world. This dataset was scraped from the Starbucks website. \n\nUnfortunately it is no longer updated, the API I was using has been discontinued.",
+- "url": "https://opendata.socrata.com/api/views/xy4y-c4mk/rows.csv?accessType=DOWNLOAD",
+- "filename": "All-Starbucks",
+- "name": "All Starbucks Locations in the World",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- },
+- {
+- "description": "Should polygamy be decriminalized in Utah?",
+- "url": "https://opendata.socrata.com/api/views/yk6u-pg2n/rows.csv?accessType=DOWNLOAD",
+- "filename": "TotalMaleFemale",
+- "name": "Should polygamy be decriminalized in Utah?",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- },
+- {
+- "description": "Should polygamy be decriminalized in Utah?",
+- "url": "https://opendata.socrata.com/api/views/kxif-we5g/rows.csv?accessType=DOWNLOAD",
+- "filename": "Agebreakdown",
+- "name": "Should polygamy be decriminalized in Utah?",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- },
+- {
+- "description": "U.S. Dept. of Transportation",
+- "url": "https://opendata.socrata.com/api/views/y3ea-t8vj/rows.csv?accessType=DOWNLOAD",
+- "filename": "Bridges",
+- "name": "Washington's structurally deficient bridges",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- },
+- {
+- "description": "Sample - Superstore Subset ( Excel)",
+- "url": "https://opendata.socrata.com/api/views/2dgv-cxpb/rows.csv?accessType=DOWNLOAD",
+- "filename": "Superstore-Subset",
+- "name": "Sample - Superstore Subset ( Excel)",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- },
+- {
+- "description": "The Juvenile Justice Information Exchange has compiled five years of federal grants from the Office of Juvenile Justice and Delinquency Prevention. Search and filter the individual formula, block, and project awards awarded by the OJJDP over the last five years. \n\n(Note about the database: Because some data on specific grants was not made publicly available by OJJDP, the total amount of the grants in this database is about $113 million less than what OJJDP has reported. For example, the OJJDP website recorded giving $88 million in earmarks and $921,000 in recovery funds in 2010, but did not include the specific amounts given to each recipient of these grants).",
+- "url": "https://opendata.socrata.com/api/views/43x8-khei/rows.csv?accessType=DOWNLOAD",
+- "filename": "OJJDP-Awards",
+- "name": "OJJDP Grant Awards 2009-2013",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- },
+- {
+- "description": "This dataset includes the most significant product actions over the last five years based on the extent of distribution and the degree of health risk. In this section, you will find a listing of FDA and industry press releases regarding the product recalls. \nThe recalls on the list are mainly Class I. A record of all recalls (Class I, II, and III) can be found in the FDA Enforcement Report10. See also Definitions of Class I, II, and III recalls11.",
+- "url": "https://opendata.socrata.com/api/views/nfrv-axb5/rows.csv?accessType=DOWNLOAD",
+- "filename": "Name",
+- "name": "Name ",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- },
+- {
+- "description": "Location of graves in Hessenford Churchyard",
+- "url": "https://opendata.socrata.com/api/views/7nsh-qace/rows.csv?accessType=DOWNLOAD",
+- "filename": "Hessenford-Graveyard",
+- "name": "Hessenford Graveyard",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- },
+- {
+- "description": "A list of the Guardian's \"Top 1,000 Songs to Hear Before You Die\"",
+- "url": "https://opendata.socrata.com/api/views/479k-3ibx/rows.csv?accessType=DOWNLOAD",
+- "filename": "LoveSongs",
+- "name": "LoveSongs",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- }
+- ],
+- "name": "Other"
+- },
+- {
+- "datasets": [
+- {
+- "description": "Full history of airplane crashes throughout the world, from 1908-present.",
+- "url": "https://opendata.socrata.com/api/views/q2te-8cvq/rows.csv?accessType=DOWNLOAD",
+- "filename": "Airplane-Crashes",
+- "name": "Airplane Crashes and Fatalities Since 1908",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- }
+- ],
+- "name": "Travel"
+- },
+- {
+- "datasets": [
+- {
+- "description": "Births in Hildale, Utah, and Colorado City, Ariz., have declined over a decade, according to data from the respective state health departments.",
+- "url": "https://opendata.socrata.com/api/views/k3x5-s922/rows.csv?accessType=DOWNLOAD",
+- "filename": "Short-Creek",
+- "name": "Short Creek births 2005-2013 ",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- },
+- {
+- "description": "2012 Workplace Fatalities by State",
+- "url": "https://opendata.socrata.com/api/views/vcx3-xxtb/rows.csv?accessType=DOWNLOAD",
+- "filename": "Workplace-Fatalities",
+- "name": "2012 Workplace Fatalities by State",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- },
+- {
+- "description": "Hours-based workplace fatality rates.",
+- "url": "https://opendata.socrata.com/api/views/dq7n-btuf/rows.csv?accessType=DOWNLOAD",
+- "filename": "Fatal-Work",
+- "name": "Rate of Fatal Work Injuries per 100,000 Workers, 2006-2012 ",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- },
+- {
+- "description": "Latino Worker Fatalities, 1995-2012 ",
+- "url": "https://opendata.socrata.com/api/views/sqfx-68bm/rows.csv?accessType=DOWNLOAD",
+- "filename": "Latino-Work-Fat",
+- "name": "Latino Worker Fatalities",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- },
+- {
+- "description": "Population totals across towns and counties in Maine.",
+- "url": "https://opendata.socrata.com/api/views/ndfi-nmyu/rows.csv?accessType=DOWNLOAD",
+- "filename": "Maine-Population-By-Town",
+- "name": "Maine Population By Town",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- },
+- {
+- "description": "Estimated populations of cities for each year since the 2000 census",
+- "url": "https://opendata.socrata.com/api/views/b6q7-qg3s/rows.csv?accessType=DOWNLOAD",
+- "filename": "City-Populations",
+- "name": "City Populations",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- }
+- ],
+- "name": "Demographics"
+- },
+- {
+- "datasets": [
+- {
+- "description": "The World Health Organization (WHO)'s breakdown of per capita alcohol consumption among adults over 15.",
+- "url": "https://opendata.socrata.com/api/views/hj43-2bpj/rows.csv?accessType=DOWNLOAD",
+- "filename": "Alcohol-Cons",
+- "name": "Alcohol Consumption Per Country",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- }
+- ],
+- "name": "Population"
+- },
+- {
+- "datasets": [
+- {
+- "description": "A table of data from Sandusky area schools, listing scores for 2012-2013 state report cards.",
+- "url": "https://opendata.socrata.com/api/views/7w3m-4vn3/rows.csv?accessType=DOWNLOAD",
+- "filename": "Report-Card",
+- "name": "Local District Report Card Data Chart ",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- },
+- {
+- "description": "This data is a 'mashup' of OSSE's DC CAS: http://osse.dc.gov/release/mayor-vincent-c-gray-announces-2012-dc-cas-results, 'Scrape' of DCPS for Title 1: http://dcps.dc.gov/portal/site/DCPS/menuitem.06de50edb2b17a932c69621014f62010/?vgnextoid=253bcdb2eaf52210VgnVCM100000416f0201RCRD&vgnextchannel=464afa5c266d1210VgnVCM100000b912010aRCRD, and a compilation of Librarian headcount for DCPS schools. It has not been verified by OSSE or DCPS officials for accuracy.",
+- "url": "https://opendata.socrata.com/api/views/cugb-wvbg/rows.csv?accessType=DOWNLOAD",
+- "filename": "Overall-Proficiency",
+- "name": "By Overall Proficiency",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- },
+- {
+- "description": "DCPS with < 1% improvement",
+- "url": "https://opendata.socrata.com/api/views/iyh7-tkme/rows.csv?accessType=DOWNLOAD",
+- "filename": "DCPS-improvement",
+- "name": "DCPS with < 1% improvement",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- },
+- {
+- "description": "DCPS by 2012 Reading ",
+- "url": "https://opendata.socrata.com/api/views/a5ax-qw2c/rows.csv?accessType=DOWNLOAD",
+- "filename": "DCPS-Reading",
+- "name": "DCPS by 2012 Reading ",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- },
+- {
+- "description": "DCPS by Proficienc",
+- "url": "https://opendata.socrata.com/api/views/cvsh-34pj/rows.csv?accessType=DOWNLOAD",
+- "filename": "DCPS-Proficienc",
+- "name": " DCPS by Proficienc",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- },
+- {
+- "description": "Staff and Faculty list for Oregon Coast Community College",
+- "url": "https://opendata.socrata.com/api/views/h4zk-vnka/rows.csv?accessType=DOWNLOAD",
+- "filename": "Faculty-Staff-List",
+- "name": "Faculty Staff List",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- },
+- {
+- "description": "2014 Pennsylvania Public School Profile Scores ",
+- "url": "https://opendata.socrata.com/api/views/69zb-px69/rows.csv?accessType=DOWNLOAD",
+- "filename": "2014-Pennsylvania-Public-School-Profile-Scores",
+- "name": "2014 Pennsylvania Public School Profile Scores ",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- },
+- {
+- "description": "Avg math and reading in 2012 with and without librarians",
+- "url": "https://opendata.socrata.com/api/views/3zkh-39md/rows.csv?accessType=DOWNLOAD",
+- "filename": "Avg-math-and-reading-in-2012-with-and-without-librarians",
+- "name": "Avg math and reading in 2012 with and without librarians",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- },
+- {
+- "description": "Break out of how DCPS students spend their days, per DCPS Calendar http://dcps.dc.gov/DCPS/calendars + scheduled Paced Interim Assessment (PAIS) and DC CAS hours. Note, Lunch/Recess is counted for all days (instructional 145 + testing 37) and DCPS Budget Development Guide http://dcps.dc.gov/DCPS/Files/downloads/ABOUT%20DCPS/Budget%20-%20Finance/FINAL_DCPS%20Budget%20Development%20Guide_032813.pdf.",
+- "url": "https://opendata.socrata.com/api/views/r2yv-d4i3/rows.csv?accessType=DOWNLOAD",
+- "filename": "Percentage-of-time-DCPS-students-spend-by-activity",
+- "name": "Percentage of time DCPS students spend by activity",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- }
+- ],
+- "name": "Education"
+- },
+- {
+- "datasets": [
+- {
+- "description": "US House of Representatives--Winners Raw Vote 2012",
+- "url": "https://opendata.socrata.com/api/views/cgpm-2jt7/rows.csv?accessType=DOWNLOAD",
+- "filename": "House-of-Representative",
+- "name": "US House of Representatives--Winners Raw Vote 2012",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- },
+- {
+- "description": "9th Presidential Election in Iran (First Round)",
+- "url": "https://opendata.socrata.com/api/views/f2me-8989/rows.csv?accessType=DOWNLOAD",
+- "filename": "9th-Presidential-Election-in-Iran",
+- "name": "9th Presidential Election in Iran (First Round)",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- },
+- {
+- "description": "8th Presidential Election in Iran ",
+- "url": "https://opendata.socrata.com/api/views/b3wr-24m8/rows.csv?accessType=DOWNLOAD",
+- "filename": "8th-Presidential-Election-in-Iran",
+- "name": "8th Presidential Election in Iran ",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- },
+- {
+- "description": "5th Presidential Election in Iran",
+- "url": "https://opendata.socrata.com/api/views/aa6m-g5ha/rows.csv?accessType=DOWNLOAD",
+- "filename": "5th-Presidential-Election-in-Iran",
+- "name": "5th Presidential Election in Iran",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- }
+- ],
+- "name": "Politics"
+- },
+- {
+- "datasets": [
+- {
+- "description": "This is a database of EPA Enforcement and Compliance History Online facility violation records, as of July 10, 2014. It will be updated quarterly.",
+- "url": "https://opendata.socrata.com/api/views/r65z-8y77/rows.csv?accessType=DOWNLOAD",
+- "filename": "Mini-EPA-Violators",
+- "name": "Mini-EPA Violators Database",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- },
+- {
+- "description": "BYUpolicegraphic ",
+- "url": "https://opendata.socrata.com/api/views/g8fw-hj8p/rows.csv?accessType=DOWNLOAD",
+- "filename": "BYUpolicegraphic",
+- "name": "BYUpolicegraphic ",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- },
+- {
+- "description": "Traffic violations from the State of New Jersey. \nThese were all scraped for analysis from the now defunct peopleviolations.com. \nThe fields are: \nRow ID \nViolator First Name \nViolator Last Name \nViolator's Home City \nOffense Committed \nCity Offense Committed In \nUnix Timestamp when record was added to scraped database \nUnique hash representing this record \nThe first 3 letters of the violator's last name that were used for display \nThe Source URL this record was scraped from",
+- "url": "https://opendata.socrata.com/api/views/7f6e-xkd7/rows.csv?accessType=DOWNLOAD",
+- "filename": "New-Jersey-Traffic-Violations",
+- "name": "New Jersey Traffic Violations - Most Popular Violator Home Cities",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- }
+- ],
+- "name": "Crime"
+- },
+- {
+- "datasets": [
+- {
+- "description": "Almost 2 million (1,840,647) user profiles extracted from the Last.fm API around Christmas, 2012.",
+- "url": "https://opendata.socrata.com/api/views/5vvd-truf/rows.csv?accessType=DOWNLOAD",
+- "filename": "LastFM-Users",
+- "name": "Two Million LastFM User Profiles",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- }
+- ],
+- "name": "Technology"
+- }
+- ]
+- },
+- {
+- "name": "Medicine",
+- "subcategories": [
+- {
+- "datasets": [
+- {
+- "description": "This represents the EPA's 2002 national-scale assessment estimates across the United States plus Puerto Rico, the Virgin Islands, and the District of Columbia using 2002 national air toxics emission inventory as input to an air dispersion model (ASPEN model), and an inhalation exposure model (HAPEM5). Exposure modeling is an important step in this assessment because it takes into account that people move from one location to another, (e.g., from outside environments to inside environments). Originally from http://www.epa.gov/ttn/atw/nata2002/tables.html. All risks are per million residents.",
+- "url": "https://opendata.socrata.com/api/views/he9m-h7tf/rows.csv?accessType=DOWNLOAD",
+- "filename": "EPA-Toxic-Air-Pollutant-Cancer-Risk-by-County",
+- "name": "EPA Toxic Air Pollutant Cancer Risk by County",
+- "separator": ",",
+- "use_first_row_for_vectorname": true
+- }
+- ],
+- "name": "Oncology"
+- }
+- ]
+- }
+- ]
+-}
+diff --git a/src/backend/gsl/parser.y b/src/backend/gsl/parser.y
+index e90f9f7dc..10121a741 100644
+--- a/src/backend/gsl/parser.y
++++ b/src/backend/gsl/parser.y
+@@ -265,7 +265,7 @@ int yylex(param *p) {
+ pdebug("PARSER: yylex()\n");
+ char c;
- //variable model
--#ifndef OLD_CANTORLIBS_VERSION
- m_variableModel = m_session->variableDataModel();
--#else
-- m_variableModel = m_session->variableModel();
--#endif
- connect(m_variableModel, &QAbstractItemModel::dataChanged, this, &CantorWorksheet::dataChanged);
- connect(m_variableModel, &QAbstractItemModel::rowsInserted, this, &CantorWorksheet::rowsInserted);
- connect(m_variableModel, &QAbstractItemModel::rowsAboutToBeRemoved, this, &CantorWorksheet::rowsAboutToBeRemoved);
- connect(m_variableModel, &QAbstractItemModel::modelReset, this, &CantorWorksheet::modelReset);
+- /* skip white space */
++ /* skip white space */
+ while ((c = getcharstr(p)) == ' ' || c == '\t');
- //available plugins
--#if CANTOR_VERSION > QT_VERSION_CHECK(20,8,0)
-+#ifdef HAVE_NEW_CANTOR_LIBS
- auto* handler = new Cantor::PanelPluginHandler(this);
- handler->loadPlugins();
- m_plugins = handler->activePluginsForSession(m_session, Cantor::PanelPluginHandler::PanelStates());
-@@ -184,20 +180,13 @@ void CantorWorksheet::modelReset() {
+ /* finish if reached EOF */
+diff --git a/src/kdefrontend/dockwidgets/XYEquationCurveDock.cpp b/src/kdefrontend/dockwidgets/XYEquationCurveDock.cpp
+index 8492a63a2..45e6a0f5a 100644
+--- a/src/kdefrontend/dockwidgets/XYEquationCurveDock.cpp
++++ b/src/kdefrontend/dockwidgets/XYEquationCurveDock.cpp
+@@ -71,7 +71,7 @@ void XYEquationCurveDock::setupGeneral() {
- void CantorWorksheet::rowsAboutToBeRemoved(const QModelIndex & parent, int first, int last) {
- Q_UNUSED(parent);
--#ifndef OLD_CANTORLIBS_VERSION
-+
- for (int i = first; i <= last; ++i) {
- const QString& name = m_variableModel->data(m_variableModel->index(first, 0)).toString();
- Column* column = child<Column>(name);
- if (column)
- column->remove();
+ auto* gridLayout = dynamic_cast<QGridLayout*>(generalTab->layout());
+ if (gridLayout) {
+- gridLayout->setContentsMargins(2,2,2,2);
++ gridLayout->setContentsMargins(2, 2, 2, 2);
+ gridLayout->setHorizontalSpacing(2);
+ gridLayout->setVerticalSpacing(2);
}
--#else
-- Q_UNUSED(first);
-- Q_UNUSED(last);
-- //TODO: Old Cantor removes rows from the model even when the variable was changed only.
-- //We don't want this behaviour since this removes the columns from the datasource in the curve.
-- return;
--#endif
- }
+diff --git a/src/kdefrontend/widgets/ExpressionTextEdit.cpp b/src/kdefrontend/widgets/ExpressionTextEdit.cpp
+index f6d26152b..e08b352d9 100644
+--- a/src/kdefrontend/widgets/ExpressionTextEdit.cpp
++++ b/src/kdefrontend/widgets/ExpressionTextEdit.cpp
+@@ -114,13 +114,13 @@ void ExpressionTextEdit::setExpressionType(XYEquationCurve::EquationType type) {
+ m_expressionType = type;
+ m_variables.clear();
+ if (type == XYEquationCurve::EquationType::Cartesian)
+- m_variables<<"x";
++ m_variables << "x";
+ else if (type == XYEquationCurve::EquationType::Polar)
+- m_variables<<"phi";
++ m_variables << "phi";
+ else if (type == XYEquationCurve::EquationType::Parametric)
+- m_variables<<"t";
++ m_variables << "t";
+ else if (type == XYEquationCurve::EquationType::Implicit)
+- m_variables<<"x"<<"y";
++ m_variables << "x" << "y";
- QList<Cantor::PanelPlugin*> CantorWorksheet::getPlugins() {
+ m_highlighter->setVariables(m_variables);
+ }
More information about the Neon-commits
mailing list