corrected minor issues

circstat · Jun 19, 2019 · 2b2450f · 2b2450f
1 parent b557453
commit 2b2450f
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 12 deletions.
diff --git a/CircularStatistics/inst/description.json b/CircularStatistics/inst/description.json
@@ -3,16 +3,16 @@
 	{
 		"title"          : "Circular Statistics",
 		"description"    : "This module offers basic methods for directional data.",
-		"version"        : "1.0.0",
-		"author"         : "Aaron Bahde (Berens Lab, University of Tuebingen)",
+		"version"        : "0.1.0",
+		"author"         : "Aaron Bahde, Philipp Berens (Berens Lab, University of Tuebingen)",
 		"maintainer"     : "JASP Team <[email protected]>",
 		"website"        : "jasp-stats.org",
 		"license"        : "GPL (>= 2)",
 		"icon"			 : "analysis-circstats-descriptives.svg"
 	},
 
-	"requiredPackages":	["circular"],
-		//[
+	"requiredPackages":	["circular", "ggplot2"],
+	//"requiredPackages"	[
 		//	{ 
 		//		"package": "circular", 
 		//		"version": "0.4-93" 

diff --git a/CircularStatistics/inst/qml/CircularStatisticsDescriptives.qml b/CircularStatistics/inst/qml/CircularStatisticsDescriptives.qml
@@ -30,7 +30,7 @@ Form
 	{
         AvailableVariablesList { name: "allVariablesList" }
         AssignedVariablesList { name: "variables";	title: qsTr("Variables"); allowedColumns: ["scale"] }
-		AssignedVariablesList { name: "splitby";	title: qsTr("Split"); singleVariable: true; allowedColumns: ["ordinal", "nominal"] }
+        AssignedVariablesList { name: "splitby";	title: qsTr("Split"); singleVariable: true; suggestedColumns: ["ordinal", "nominal"] }
 	}
 
     RadioButtonGroup

diff --git a/CircularStatistics/inst/qml/CircularStatisticsMultipleSampleTests.qml b/CircularStatistics/inst/qml/CircularStatisticsMultipleSampleTests.qml
@@ -30,7 +30,7 @@ Form
     {
         AvailableVariablesList { name: "allVariablesList" }
         AssignedVariablesList { name: "dependent";		title: qsTr("Dependent Variable");	allowedColumns: ["scale"]; singleVariable: true }
-        AssignedVariablesList { name: "fixedFactors";	title: qsTr("Fixed Factors");		allowedColumns: ["ordinal", "nominal"]; id: fixedFactorsList		}
+        AssignedVariablesList { name: "fixedFactors";	title: qsTr("Fixed Factors");		suggestedColumns: ["ordinal", "nominal"]; id: fixedFactorsList		}
 	}
 
     ColumnLayout

diff --git a/CircularStatistics/inst/qml/CircularStatisticsOneSampleTests.qml b/CircularStatistics/inst/qml/CircularStatisticsOneSampleTests.qml
@@ -30,7 +30,7 @@ Form
 	{
         AvailableVariablesList { name: "allVariablesList" }
         AssignedVariablesList { name: "variables";	title: qsTr("Variables"); allowedColumns: ["scale"] }
-		AssignedVariablesList { name: "splitby";	title: qsTr("Split"); singleVariable: true; allowedColumns: ["ordinal", "nominal"] }
+        AssignedVariablesList { name: "splitby";	title: qsTr("Split"); singleVariable: true; suggestedColumns: ["ordinal", "nominal"] }
 	}
 
     ColumnLayout
@@ -62,7 +62,7 @@ Form
                     radioButtonsOnSameRow: true
                     RadioButton { value: "0.01";	label: qsTr("α = 0.01")	}
                     RadioButton { value: "0.05";	label: qsTr("α = 0.05")	}
-                    RadioButton { value: "0.1";	label: qsTr("α = 0.1")	}
+                    RadioButton { value: "0.1";     label: qsTr("α = 0.1")	}
                 }
             }
             CheckBox { name: "rayleigh";			label: qsTr("Rayleigh")}
@@ -71,7 +71,7 @@ Form
                 name: "modifiedRayleigh";			label: qsTr("V (modified Rayleigh)")
                 DoubleField
                 {
-                 name: "testValue"; label: qsTr("Test value:"); fieldWidth: 70; max: 999999; min: 0.00001
+                 name: "testValue"; label: qsTr("Test value:"); fieldWidth: 70; max: 999999; min: 0.00001; defaultValue: 180.00
                 }
             }
         }

diff --git a/zipToModule.sh b/zipToModule.sh