Contour plot switch to ggplot#484
Closed
juliuspfadt wants to merge 22 commits into
Closed
Conversation
Fix CI: renv 1.1.7 has install-ordering bug with R 4.5.3 causing tseries/rvg/forecast to fail. Staying on 1.2.1 avoids the downgrade. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
renv.lock pinned stale jaspBase/jaspTTests/jaspDescriptives SHAs; upstream repos advanced, so unpinned Remotes conflicted with old pins and renv::restore() couldn't solve. Repin to current HEADs. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Tiny (~1e-4) control-limit drift from the jaspBase pin bump shifted the t-chart y-values sub-pixel (one label digit-flip 51.07->51.06). Refresh the 11 affected structural .rds + visual .svg references. Verified locally: FAIL 0. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
report23, reportW18 and t-chart11 (all skip_on_os mac) fail on Linux: the jaspBase pin bump shifted Weibull/control-limit numerics ~1e-4, which the 1e-6 structural fallback rejects. Pass tolerance=1e-3 to those plot checks (comfortably above the drift, still catches real regressions). Also regen t-chart11's reference so its rounded labels match current output. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Contributor
|
👋 Friendly reminder: It looks like If your changes include bug fixes, new features, or UI tweaks, please consider adding a quick note to the |
Contributor
There was a problem hiding this comment.
Pull request overview
Switches DOE contour plotting from base graphics to a ggplot2-based plot so it renders properly in interactive (plotly) mode, and updates related tests/docs/UI help text across the Quality Control module.
Changes:
- DOE Analysis: render contour plots via ggplot2 (instead of base
rsm::image.lm), add a new contour-plot snapshot test. - Process capability / control chart snapshots & tests: accept small numeric drift (tolerance tweak) and update expected SVG snapshots.
- UI/help modernization: add
info/infoBottomtext to many QML forms and remove several legacyinst/help/*.mdhelp pages; add an upgrade mapping for consolidated process capability x-axis options.
Reviewed changes
Copilot reviewed 43 out of 102 changed files in this pull request and generated 6 comments.
Show a summary per file
| File | Description |
|---|---|
| tests/testthat/test-rareEventCharts.R | Loosens plot snapshot tolerance for a rare-event chart to reduce cross-platform numeric flakiness. |
| tests/testthat/test-doeAnalysis.R | Adds a snapshot test covering DOE contour plot output. |
| tests/testthat/_snaps/processCapabilityStudies/histogramw5-subplot-1.svg | Snapshot update from minor numeric drift. |
| tests/testthat/_snaps/processCapabilityStudies/histogramw3-subplot-1.svg | Snapshot update from minor numeric drift. |
| tests/testthat/_snaps/processCapabilityStudies/histogram7-subplot-2.svg | Snapshot update from minor numeric drift. |
| tests/testthat/_snaps/processCapabilityStudies/histogram7-subplot-1.svg | Snapshot update from minor numeric drift. |
| tests/testthat/_snaps/processCapabilityStudies/histogram5-subplot-2.svg | Snapshot update from minor numeric drift. |
| tests/testthat/_snaps/processCapabilityStudies/histogram5-subplot-1.svg | Snapshot update from minor numeric drift. |
| tests/testthat/_snaps/processCapabilityStudies/capability-of-the-processw3-subplot-1.svg | Snapshot update from minor numeric drift. |
| tests/testthat/_snaps/processCapabilityStudies/capability-of-the-processl44-subplot-1.svg | Snapshot update from minor numeric drift. |
| tests/testthat/_snaps/processCapabilityStudies/capability-of-the-processl40-subplot-1.svg | Snapshot update from minor numeric drift. |
| tests/testthat/_snaps/processCapabilityStudies/capability-of-the-processl37-subplot-1.svg | Snapshot update from minor numeric drift. |
| tests/testthat/_snaps/processCapabilityStudies/capability-of-the-process5-subplot-2.svg | Snapshot update from minor numeric drift. |
| tests/testthat/_snaps/processCapabilityStudies/capability-of-the-process5-subplot-1.svg | Snapshot update from minor numeric drift. |
| R/doeAnalysis.R | Implements ggplot2-based contour plotting; adjusts plot sizing. |
| R/commonQualityControl.R | Simplifies fitdistrplus::fitdist() control params; adds an observed var-cov helper. |
| NEWS.md | Documents the DOE contour-plot rendering change. |
| inst/Upgrades.qml | Adds upgrade mapping for process capability x-axis option consolidation. |
| inst/qml/variablesChartsIndividuals.qml | Adds info / infoBottom help text for the Individuals control-chart UI. |
| inst/qml/probabilityOfDetection.qml | Adds info text and per-control info help text for POD UI. |
| inst/qml/msaType1Gauge.qml | Adds info / infoBottom help text and per-control info for Type 1 Gauge UI. |
| inst/qml/msaTestRetest.qml | Adds info / infoBottom help text and per-control info for Test–retest UI. |
| inst/qml/msaGaugeLinearity.qml | Adds info / infoBottom help text and per-control info for Gauge Linearity UI. |
| inst/qml/msaAttribute.qml | Adds info / infoBottom help text and per-control info for Attribute Agreement UI. |
| inst/qml/doeScreening.qml | Adds info text and per-control info for DOE screening design UI. |
| inst/qml/doeResponseSurfaceMethodology.qml | Adds info / infoBottom text and richer per-control info for RSM design UI. |
| inst/qml/doeModifyDesign.qml | Adds info text and per-control info for DOE modify-design UI. |
| inst/qml/doeFull.qml | Adds info text and per-control info for full-factorial worksheet UI. |
| inst/qml/doeFactorial.qml | Adds info text and per-control info for factorial worksheet UI. |
| inst/qml/definitiveScreeningAnalysis.qml | Adds info text and per-control info for definitive screening analysis UI. |
| inst/qml/common/ShowAndExportDesign.qml | Adds info text for common design display/export controls. |
| inst/qml/common/ControlChartTests.qml | Adds info text describing control-chart test sets and individual tests. |
| inst/qml/attributesCharts.qml | Adds info / infoBottom help text and per-control info for attributes charts UI. |
| inst/help/variablesChartsSubgroups.md | Removes legacy markdown help page (content moved into QML help text). |
| inst/help/variablesChartsIndividuals.md | Removes legacy markdown help page (content moved into QML help text). |
| inst/help/timeWeightedCharts.md | Removes legacy markdown help page (content moved into QML help text). |
| inst/help/rareEventCharts.md | Removes legacy markdown help page (content moved into QML help text). |
| inst/help/msaType1Gauge.md | Removes legacy markdown help page (content moved into QML help text). |
| inst/help/msaTestRetest.md | Removes legacy markdown help page (content moved into QML help text). |
| inst/help/msaGaugeRRnonrep.md | Removes legacy markdown help page (content moved into QML help text). |
| inst/help/msaGaugeRR.md | Removes legacy markdown help page (content moved into QML help text). |
| inst/help/msaGaugeLinearity.md | Removes legacy markdown help page (content moved into QML help text). |
| inst/help/msaAttribute.md | Removes legacy markdown help page (content moved into QML help text). |
| inst/help/doeResponseSurfaceMethodology.md | Removes legacy markdown help page (content moved into QML help text). |
| inst/help/doeFactorial.md | Removes legacy markdown help page (content moved into QML help text). |
| inst/help/doeAnalysis.md | Removes legacy markdown help page (content moved into QML help text). |
| inst/help/attributesCharts.md | Removes legacy markdown help page (content moved into QML help text). |
| DESCRIPTION | Bumps package version/date. |
| .gitignore | Ignores testthat snapshot failure artifacts (*.new.svg, *.new.rds). |
Comment on lines
+1936
to
+1939
| df <- expand.grid(x = plotData$x, y = plotData$y) | ||
| df$z <- as.vector(plotData$z) | ||
| zBreaks <- seq(min(df$z), max(df$z), length.out = nResponsePartitions + 1) | ||
| df$zBin <- cut(df$z, breaks = zBreaks, include.lowest = TRUE) |
| { | ||
| columns: 1 | ||
|
|
||
| info: qsTr("Probability of Detection (POD) models the probability that an inspection detects a flaw as a function of a covariate such as flaw size. A binary detection outcome is regressed on the covariate using a logistic or probit link, producing a detection curve from which detection thresholds (e.g. the size detected with 90%% probability) can be read.") |
Comment on lines
+28
to
+31
| + "- " + qsTr("Within appraisers: agreement between the inspected items and operators, with a 95%% confidence interval.") + "\n" | ||
| + "- " + qsTr("Each appraiser vs standard: agreement between the known standard and inspected items per operator, with a 95%% confidence interval.") + "\n" | ||
| + "- " + qsTr("Between appraisers: agreement between the different operators, with a 95%% confidence interval.") + "\n" | ||
| + "- " + qsTr("All appraisers vs standard: agreement between all operators and the known standard, with a 95%% confidence interval.") + "\n" |
Comment on lines
+1834
to
+1835
| if (p != l) | ||
| stop("The arguments 'parms' and 'mle' must have the same size") |
Comment on lines
+1855
to
+1857
| if (any(eigen(-obs)$values < 0)) | ||
| stop("The final Hessian matrix has at least one negative eigenvalue") | ||
| else return(list(mle = mle, varcov = solve(-obs))) |
Comment on lines
+1828
to
+1833
| # Inlined from archived CRAN package mle.tools (observed.varcov) | ||
| # Computes observed variance-covariance matrix from log-density expression. | ||
| .qcObservedVarcov <- function(logdensity, X, parms, mle) { | ||
| p <- length(parms) | ||
| l <- length(mle) | ||
| n <- length(X) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
makes it interactive and editable.
fixes https://github.com/jasp-stats/INTERNAL-jasp/issues/3266
fixes https://github.com/jasp-stats/INTERNAL-jasp/issues/3262
makes sense to only merge this after the process capability plot stuff in here: #453