Skip to content

Commit

Permalink
fix little upgrade errors
Browse files Browse the repository at this point in the history
  • Loading branch information
@Kucharssim
Kucharssim committed Oct 25, 2023
1 parent 3914fa4 commit d4f8284
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 10 deletions.
4 changes: 2 additions & 2 deletions R/msaGaugeRR.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -938,9 +938,9 @@ msaGaugeRR <- function(jaspResults, dataset, options, ...) {
if (options[["reportTrafficLightCHart"]]) {
valuesVec <- .gaugeANOVA(dataset = dataset, measurements = measurements, parts = parts, operators = operators,
options = options, ready = TRUE, returnTrafficValues = TRUE, Type3 = Type3)
plots <- .trafficplot(StudyVar = valuesVec$study, ToleranceUsed = options$gaugeToleranceEnabled,
plots <- .trafficplot(StudyVar = valuesVec$study, ToleranceUsed = options$tolerance,
ToleranceVar = valuesVec$tol, options = options, ready = TRUE, ggPlot = TRUE)
if (options[["gaugeToleranceEnabled"]]) {
if (options[["tolerance"]]) {
indexCounter <- indexCounter + 1
plotList[[indexCounter]] <- plots$p1
indexCounter <- indexCounter + 1
Expand Down
2 changes: 1 addition & 1 deletion R/processCapabilityStudies.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1490,7 +1490,7 @@ processCapabilityStudies <- function(jaspResults, dataset, options) {
}
if (options[["reportProcessStability"]]) {
# X-bar and R Chart OR ImR Chart
if(options$xbarR){
if(options$xBarAndRChart){
indexCounter <- indexCounter + 1
plotList[[indexCounter]] <- .Xbarchart(dataset = dataset[measurements], options = options, manualXaxis = splitFactor, warningLimits = FALSE, Wide = wideFormat, manualTicks = options[["manualTicksXAxis"]])$p
indexCounter <- indexCounter + 1
Expand Down
34 changes: 34 additions & 0 deletions inst/Upgrades.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ Upgrades
switch(options["histogramBinWidthType"])
{
case "fd": return "freedmanDiaconis";
default: return options["histogramBinWidthType"];
}
}
}
Expand Down Expand Up @@ -133,6 +134,7 @@ Upgrades
{
case "gaugeRRlongFormat": return "longFormat";
case "gaugeRRwideFormat": return "wideFormat";
default: return options["dataFormat"];
}
}
}
Expand All @@ -153,6 +155,7 @@ Upgrades
{
case "studyStandardDeviation": return "studySd";
case "historicalStandardDeviation": return "historicalSd";
default: return options["processVariationReference"];
}
}
}
Expand All @@ -172,6 +175,7 @@ Upgrades
{
case "FixedEffects": return "fixedEffect";
case "RandomEffects": return "randomEffect";
default: return options["anovaModelType"];
}
}
}
Expand All @@ -188,6 +192,7 @@ Upgrades
{
case "svmSD": return "sd";
case "svmPercent": return "percent";
default: return options["studyVarianceMultiplierType"];
}
}
}
Expand Down Expand Up @@ -236,6 +241,7 @@ Upgrades
{
case "gaugeRRNonRepLongFormat": return "longFormat";
case "gaugeRRNonRepWideFormat": return "wideFormat";
default: return options["dataFormat"];
}
}
}
Expand All @@ -254,6 +260,7 @@ Upgrades
{
case "studyStandardDeviation": return "studySd";
case "historicalStandardDeviation": return "historicalSd";
default: return options["processVariationReference"];
}
}
}
Expand All @@ -273,6 +280,7 @@ Upgrades
{
case "svmSD": return "sd";
case "svmPercent": return "percent";
default: return options["studyVarianceMultiplierType"];
}
}
}
Expand Down Expand Up @@ -316,6 +324,7 @@ Upgrades
{
case "AAAlongFormat": return "longFormat";
case "AAAwideFormat": return "wideFormat";
default: return options["dataFormat"];
}
}
}
Expand Down Expand Up @@ -350,6 +359,7 @@ Upgrades
{
case "testRetestLongFormat": return "longFormat";
case "testRetestWideFormat": return "wideFormat";
default: return options["dataFormat"];
}
}
}
Expand Down Expand Up @@ -393,6 +403,7 @@ Upgrades
{
case "CClongFormat": return "longFormat";
case "CCwideFormat": return "wideFormat";
default: return options["dataFormat"];
}
}
}
Expand All @@ -412,6 +423,7 @@ Upgrades
{
case "Xbarchart": return "xBarAndR";
case "Schart": return "xBarAndS";
default: return options["chartType"];
}
}
}
Expand Down Expand Up @@ -486,6 +498,7 @@ Upgrades
case "Defectives": return "defectives";
case "Defects": return "defects";
case "ImR": return "xmr";
default: return options["attributesChart"];
}
}
}
Expand All @@ -502,6 +515,7 @@ Upgrades
case "npchart": return "npChart";
case "pchart": return "pChart";
case "Laneyprimechart": return "laneyPPrimeChart";
default: return options["attributesChartDefectivesChartType"];
}
}
}
Expand All @@ -518,6 +532,7 @@ Upgrades
case "cchart": return "cChart";
case "uchart": return "uChart";
case "Laneychart": return "laneyUPrimeChart";
default: return options["attributesChartDefectsChartType"];
}
}
}
Expand Down Expand Up @@ -577,6 +592,7 @@ Upgrades
{
case "PClongFormat": return "longFormat";
case "PCwideFormat": return "wideFormat";
default: return options["dataFormat"];
}
}
}
Expand All @@ -594,6 +610,7 @@ Upgrades
switch(options["capabilityStudyType"])
{
case "nonnormalCapabilityAnalysis": return "nonNormalCapabilityAnalysis";
default: return options["capabilityStudyType"];
}
}
}
Expand All @@ -611,6 +628,7 @@ Upgrades
case "Lognormal": return "lognormal";
case "3lognormal": return "3ParameterLognormal";
case "3weibull": return "3ParameterWeibull";
default: return options["nonNormalDistribution"];
}
}
}
Expand All @@ -623,6 +641,7 @@ Upgrades
switch(options["nonNormalMethod"])
{
case "nonconformance": return "nonConformance";
default: return options["nonNormalMethod"];
}
}
}
Expand Down Expand Up @@ -666,6 +685,7 @@ Upgrades
case "Herd-Johnson": return "herdJohnson";
case "Kaplan-Meier": return "kaplanMeier";
case "Hazen": return "hazen";
default: return options["probabilityPlotRankMethod"];
}
}
}
Expand All @@ -684,6 +704,7 @@ Upgrades
case "Normal": return "normal";
case "Weibull": return "weibull";
case "Lognormal": return "lognormal";
default: return options["nullDistribution"];
}
}
}
Expand All @@ -707,6 +728,7 @@ Upgrades
{
case "dataCoded": return "coded";
case "dataUncoded": return "uncoded";
default: return options["unitDisplay"];
}
}
}
Expand All @@ -720,6 +742,7 @@ Upgrades
{
case "runOrderRandom": return "random";
case "runOrderStandard": return "standard";
default: return options["runOrder"];
}
}
}
Expand All @@ -737,6 +760,7 @@ Upgrades
case "factorialTypeDefault": return "defaultGenerator";
case "factorialTypeSpecify": return "customGenerator";
case "factorialTypeSplit": return "splitPlot";
default: return options["factorialDesignType"];
}
}
}
Expand All @@ -755,6 +779,7 @@ Upgrades
case "designByRuns": return "numberOfRuns";
case "designByResolution": return "resolution";
case "designByFraction": return "fraction";
default: return options["designOptionsType"];
}
}
}
Expand Down Expand Up @@ -791,6 +816,7 @@ Upgrades
{
case "runOrderStandardPlot": return "standard";
case "runOrderRandomPlot": return "run";
default: return options["residualsAgainstOrderPlotType"];
}
}
}
Expand All @@ -816,6 +842,7 @@ Upgrades
{
case "runOrderRandom": return "random";
case "runOrderStandard": return "standard";
default: return options["runOrder"];
}
}
}
Expand Down Expand Up @@ -843,6 +870,7 @@ Upgrades
{
case "cube": return "cubePoints";
case "star": return "axialPoints";
default: return options["designType"];
}
}
}
Expand All @@ -864,6 +892,7 @@ Upgrades
case "Rotatable": return "rotatable";
case "Spherical": return "spherical";
case "Faces": return "faces";
default: return options["alphaType"];
}
}
}
Expand All @@ -877,6 +906,7 @@ Upgrades
{
case "runOrderRandom": return "random";
case "runOrderStandard": return "standard";
default: return options["runOrder"];
}
}
}
Expand Down Expand Up @@ -920,6 +950,7 @@ Upgrades
{
case "dataCoded": return "coded";
case "dataUncoded": return "uncoded";
default: return options["unitDisplay"];
}
}
}
Expand All @@ -935,6 +966,7 @@ Upgrades
{
case "runOrderRandom": return "random";
case "runOrderStandard": return "standard";
default: return options["displayedRunOrder"];
}
}
}
Expand All @@ -951,6 +983,7 @@ Upgrades
case "byRuns": return "numberOfRuns";
case "byResolution": return "resolution";
case "byFraction": return "fraction";
default: return options["designOptionsType"];
}
}
}
Expand Down Expand Up @@ -989,6 +1022,7 @@ Upgrades
{
case "data-based": return "dataBased";
case "data + model-based": return "dataAndModelBased";
default: return options["xAxisTicksType"];
}
}
}
Expand Down
7 changes: 0 additions & 7 deletions inst/qml/variablesChartsSubgroups.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,11 +166,6 @@ Form
name: "knownParameters"
label: qsTr("Known parameters")

Group
{

columns: 2

DoubleField
{
name: "knownParametersMean"
Expand All @@ -190,8 +185,6 @@ Form
decimals: 10
}

}

}

CheckBox
Expand Down

0 comments on commit d4f8284

Please sign in to comment.