rename custom riskset to manual riskset

juliuspfadt · juliuspfadt · commit 4e8c27bcc32e · 2024-09-27T10:39:43.000+02:00
diff --git a/R/relationalEventModeling.R b/R/relationalEventModeling.R
@@ -1840,8 +1840,10 @@ relationalEventModeling <- function(jaspResults, dataset, options) {
   regTable$addColumnInfo(name = "shrunk.mean", title = gettext("Shrunk mean"), type = "number")
   regTable$addColumnInfo(name = "shrunk.median", title = gettext("Shrunk median"), type = "number")
   regTable$addColumnInfo(name = "shrunk.mode", title = gettext("Shrunk mode"), type = "number")
-  regTable$addColumnInfo(name = "shrunk.lower", title = gettextf("Lower shrunk %s%% CI", ci), type = "number")
-  regTable$addColumnInfo(name = "shrunk.upper", title = gettextf("Upper shrunk %s%% CI", ci), type = "number")
+  regTable$addColumnInfo(name = "shrunk.lower", title = gettext("Lower"),
+                         type = "number", overtitle = gettextf("Shrunk %s%% CI", ci))
+  regTable$addColumnInfo(name = "shrunk.upper", title = gettext("Upper"),
+                         type = "number", overtitle = gettextf("Shrunk %s%% CI", ci))
   regTable$addColumnInfo(name = "nonzero", title = gettext("≠0"), type = "string")
 
   return(regTable)
diff --git a/inst/qml/RelationalEventModeling.qml b/inst/qml/RelationalEventModeling.qml
@@ -180,11 +180,11 @@ Form
 			}
 			RadioButton
 			{
-				value: "custom"
-				label: qsTr("Custom")
+				value: "manual"
+				label: qsTr("Manual")
 				ComponentsList
 				{
-					visible: riskset.value == "custom"
+					visible: riskset.value == "manual"
 					name: "dyadExcludeList"
 					title: qsTr("Upload dyads to exclude from the riskset")
 					implicitHeight: 90 * preferencesModel.uiScale // about 3 rows

Original file line number	Diff line number	Diff line change
`@@ -180,11 +180,11 @@ Form`
`180`	`180`	`}`
`181`	`181`	`RadioButton`
`182`	`182`	`{`
`183`		`- value: "custom"`
`184`		`- label: qsTr("Custom")`
	`183`	`+ value: "manual"`
	`184`	`+ label: qsTr("Manual")`
`185`	`185`	`ComponentsList`
`186`	`186`	`{`
`187`		`- visible: riskset.value == "custom"`
	`187`	`+ visible: riskset.value == "manual"`
`188`	`188`	`name: "dyadExcludeList"`
`189`	`189`	`title: qsTr("Upload dyads to exclude from the riskset")`
`190`	`190`	`implicitHeight: 90 * preferencesModel.uiScale // about 3 rows`