diff -Nru labplot-2.10.1+git202404180303~ubuntu22.04.1/debian/changelog labplot-2.10.1+git202404190303~ubuntu22.04.1/debian/changelog --- labplot-2.10.1+git202404180303~ubuntu22.04.1/debian/changelog 2024-04-18 03:03:59.000000000 +0000 +++ labplot-2.10.1+git202404190303~ubuntu22.04.1/debian/changelog 2024-04-19 03:03:46.000000000 +0000 @@ -1,8 +1,8 @@ -labplot (2.10.1+git202404180303~ubuntu22.04.1) jammy; urgency=low +labplot (2.10.1+git202404190303~ubuntu22.04.1) jammy; urgency=low * Auto build. - -- Rik Mills Thu, 18 Apr 2024 03:03:59 +0000 + -- Rik Mills Fri, 19 Apr 2024 03:03:46 +0000 labplot (2.10.1-1) unstable; urgency=medium diff -Nru labplot-2.10.1+git202404180303~ubuntu22.04.1/debian/git-build-recipe.manifest labplot-2.10.1+git202404190303~ubuntu22.04.1/debian/git-build-recipe.manifest --- labplot-2.10.1+git202404180303~ubuntu22.04.1/debian/git-build-recipe.manifest 2024-04-18 03:03:59.000000000 +0000 +++ labplot-2.10.1+git202404190303~ubuntu22.04.1/debian/git-build-recipe.manifest 2024-04-19 03:03:46.000000000 +0000 @@ -1,4 +1,4 @@ -# git-build-recipe format 0.4 deb-version {debupstream}+git202404180303 -lp:~rikmills/+git/labplot-upstream git-commit:1a04a45628f8f45e8757ffe20acbe1a3945d5619 +# git-build-recipe format 0.4 deb-version {debupstream}+git202404190303 +lp:~rikmills/+git/labplot-upstream git-commit:6cabc1e4908f7f0d5bc6d0cfa1efee426de6d78a merge packaging lp:~kubuntu-packagers/kubuntu-packaging/+git/labplot git-commit:e31f36e084ba477b8fcd5199076d2fd8be435a50 merge daily lp:~kubuntu-packagers/kubuntu-packaging/+git/labplot git-commit:8e46dc6a4202e7d3e258b0fa5d1c1cd01dc32746 diff -Nru labplot-2.10.1+git202404180303~ubuntu22.04.1/src/backend/nsl/nsl_baseline.cpp labplot-2.10.1+git202404190303~ubuntu22.04.1/src/backend/nsl/nsl_baseline.cpp --- labplot-2.10.1+git202404180303~ubuntu22.04.1/src/backend/nsl/nsl_baseline.cpp 2024-04-18 03:03:22.000000000 +0000 +++ labplot-2.10.1+git202404190303~ubuntu22.04.1/src/backend/nsl/nsl_baseline.cpp 2024-04-19 03:03:12.000000000 +0000 @@ -15,6 +15,11 @@ #include #include +// macOS builds on gitlab CI complain about missing Eigen/Sparse while having Eigen3 -> disable EIGEN3 on macOS for the moment +#if defined(Q_OS_MACOS) +#undef HAVE_EIGEN3 +#endif + #ifdef HAVE_EIGEN3 #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant" diff -Nru labplot-2.10.1+git202404180303~ubuntu22.04.1/src/backend/worksheet/WorksheetElement.cpp labplot-2.10.1+git202404190303~ubuntu22.04.1/src/backend/worksheet/WorksheetElement.cpp --- labplot-2.10.1+git202404180303~ubuntu22.04.1/src/backend/worksheet/WorksheetElement.cpp 2024-04-18 03:03:22.000000000 +0000 +++ labplot-2.10.1+git202404190303~ubuntu22.04.1/src/backend/worksheet/WorksheetElement.cpp 2024-04-19 03:03:12.000000000 +0000 @@ -939,6 +939,8 @@ // to decide if the element move was started or not. So, we check the pressed buttong here. if (event->button() == Qt::LeftButton) m_leftButtonPressed = true; + + QGraphicsItem::mousePressEvent(event); } void WorksheetElementPrivate::mouseMoveEvent(QGraphicsSceneMouseEvent* event) { diff -Nru labplot-2.10.1+git202404180303~ubuntu22.04.1/src/kdefrontend/dockwidgets/StatisticsSpreadsheetDock.cpp labplot-2.10.1+git202404190303~ubuntu22.04.1/src/kdefrontend/dockwidgets/StatisticsSpreadsheetDock.cpp --- labplot-2.10.1+git202404180303~ubuntu22.04.1/src/kdefrontend/dockwidgets/StatisticsSpreadsheetDock.cpp 2024-04-18 03:03:22.000000000 +0000 +++ labplot-2.10.1+git202404190303~ubuntu22.04.1/src/kdefrontend/dockwidgets/StatisticsSpreadsheetDock.cpp 2024-04-19 03:03:12.000000000 +0000 @@ -50,6 +50,9 @@ m_mappingComboBoxMetric[ui.cbKurtosis] = StatisticsSpreadsheet::Metric::Kurtosis; m_mappingComboBoxMetric[ui.cbEntropy] = StatisticsSpreadsheet::Metric::Entropy; + ui.bSelectAll->setIcon(QIcon::fromTheme(QLatin1String("edit-select-symbolic"))); + ui.bSelectNone->setIcon(QIcon::fromTheme(QLatin1String("edit-none-symbolic"))); + connect(ui.cbCount, &QCheckBox::toggled, this, &StatisticsSpreadsheetDock::metricChanged); connect(ui.cbMinimum, &QCheckBox::toggled, this, &StatisticsSpreadsheetDock::metricChanged); connect(ui.cbMaximum, &QCheckBox::toggled, this, &StatisticsSpreadsheetDock::metricChanged); @@ -73,6 +76,9 @@ connect(ui.cbKurtosis, &QCheckBox::toggled, this, &StatisticsSpreadsheetDock::metricChanged); connect(ui.cbEntropy, &QCheckBox::toggled, this, &StatisticsSpreadsheetDock::metricChanged); + connect(ui.bSelectAll, &QPushButton::clicked, this, &StatisticsSpreadsheetDock::selectAll); + connect(ui.bSelectNone, &QPushButton::clicked, this, &StatisticsSpreadsheetDock::selectNone); + // templates auto* templateHandler = new TemplateHandler(this, QLatin1String("StatisticsSpreadsheet")); ui.verticalLayout->addWidget(templateHandler); @@ -104,6 +110,28 @@ spreadsheet->setMetrics(metrics); } +void StatisticsSpreadsheetDock::selectAll() { + StatisticsSpreadsheet::Metrics metrics; + for (const auto& metric : m_mappingComboBoxMetric) + metrics.setFlag(metric, true); + + for (auto* spreadsheet : m_spreadsheets) + spreadsheet->setMetrics(metrics); + + load(); +} + +void StatisticsSpreadsheetDock::selectNone() { + StatisticsSpreadsheet::Metrics metrics; + for (const auto& metric : m_mappingComboBoxMetric) + metrics.setFlag(metric, false); + + for (auto* spreadsheet : m_spreadsheets) + spreadsheet->setMetrics(metrics); + + load(); +} + //************************************************************* //******************** SETTINGS ******************************* //************************************************************* diff -Nru labplot-2.10.1+git202404180303~ubuntu22.04.1/src/kdefrontend/dockwidgets/StatisticsSpreadsheetDock.h labplot-2.10.1+git202404190303~ubuntu22.04.1/src/kdefrontend/dockwidgets/StatisticsSpreadsheetDock.h --- labplot-2.10.1+git202404180303~ubuntu22.04.1/src/kdefrontend/dockwidgets/StatisticsSpreadsheetDock.h 2024-04-18 03:03:22.000000000 +0000 +++ labplot-2.10.1+git202404190303~ubuntu22.04.1/src/kdefrontend/dockwidgets/StatisticsSpreadsheetDock.h 2024-04-19 03:03:12.000000000 +0000 @@ -34,6 +34,8 @@ private Q_SLOTS: void metricChanged(bool); + void selectAll(); + void selectNone(); // save/load template void loadConfigFromTemplate(KConfig&); diff -Nru labplot-2.10.1+git202404180303~ubuntu22.04.1/src/kdefrontend/ui/dockwidgets/statisticsspreadsheetdock.ui labplot-2.10.1+git202404190303~ubuntu22.04.1/src/kdefrontend/ui/dockwidgets/statisticsspreadsheetdock.ui --- labplot-2.10.1+git202404180303~ubuntu22.04.1/src/kdefrontend/ui/dockwidgets/statisticsspreadsheetdock.ui 2024-04-18 03:03:22.000000000 +0000 +++ labplot-2.10.1+git202404190303~ubuntu22.04.1/src/kdefrontend/ui/dockwidgets/statisticsspreadsheetdock.ui 2024-04-19 03:03:12.000000000 +0000 @@ -7,7 +7,7 @@ 0 0 343 - 775 + 875 @@ -258,6 +258,61 @@ + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 20 + + + + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + Select All + + + + + + + Select None + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Qt::Vertical @@ -270,6 +325,13 @@ + + + + Qt::Horizontal + + + diff -Nru labplot-2.10.1+git202404180303~ubuntu22.04.1/src/kdefrontend/ui/worksheet/exportworksheetwidget.ui labplot-2.10.1+git202404190303~ubuntu22.04.1/src/kdefrontend/ui/worksheet/exportworksheetwidget.ui --- labplot-2.10.1+git202404180303~ubuntu22.04.1/src/kdefrontend/ui/worksheet/exportworksheetwidget.ui 2024-04-18 03:03:22.000000000 +0000 +++ labplot-2.10.1+git202404190303~ubuntu22.04.1/src/kdefrontend/ui/worksheet/exportworksheetwidget.ui 2024-04-19 03:03:12.000000000 +0000 @@ -60,9 +60,9 @@ - Specify the name of the file to import. + Specify the name of the file to export. - + true diff -Nru labplot-2.10.1+git202404180303~ubuntu22.04.1/tests/notebook/NotebookTest.cpp labplot-2.10.1+git202404190303~ubuntu22.04.1/tests/notebook/NotebookTest.cpp --- labplot-2.10.1+git202404180303~ubuntu22.04.1/tests/notebook/NotebookTest.cpp 2024-04-18 03:03:22.000000000 +0000 +++ labplot-2.10.1+git202404190303~ubuntu22.04.1/tests/notebook/NotebookTest.cpp 2024-04-19 03:03:12.000000000 +0000 @@ -230,7 +230,9 @@ void NotebookTest::testParserDateTime64ns() { // Testing datetime day // example output taken from a column in panda's dataframe, contains line breaks after every second value - QString input = QStringLiteral("array(['2009-01-01T00:10:00.000000000', '2009-01-01T00:20:00.000000000',\n '2009-01-01T00:30:00.000000000', '2009-01-01T00:40:00.000000000'],\n dtype='datetime64[ns]')"); + QString input = QStringLiteral( + "array(['2009-01-01T00:10:00.000000000', '2009-01-01T00:20:00.000000000',\n '2009-01-01T00:30:00.000000000', '2009-01-01T00:40:00.000000000'],\n " + " dtype='datetime64[ns]')"); VariableParser parser(QStringLiteral("python"), input); QTEST_ASSERT(parser.dataType() == AbstractColumn::ColumnMode::DateTime);