bug fix in plots + rebase

jasp-stats · Mar 11, 2019 · 70ffd74 · 70ffd74
1 parent ce0847d
commit 70ffd74
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/JASP-Engine/JASP/R/commonAnovaBayesian.R b/JASP-Engine/JASP/R/commonAnovaBayesian.R
@@ -667,7 +667,7 @@
 
   if (groupParameters) {
 
-    indices <- split(indices, plotTitles[indices])[order(unique(plotTitles))]
+    indices <- split(indices, plotTitles[indices])[order(unique(plotTitles[indices]))]
     nms <- names(indices)
 
     for (i in seq_along(indices)) {

diff --git a/Resources/Common/qml/AncovaBayesian.qml b/Resources/Common/qml/AncovaBayesian.qml
@@ -136,7 +136,7 @@ Form
 		}
 	}
 
-    ExpanderButton
+    Section
     {
         text: qsTr("Single Model Inference")
 

diff --git a/Resources/Common/qml/AnovaRepeatedMeasuresBayesian.qml b/Resources/Common/qml/AnovaRepeatedMeasuresBayesian.qml
@@ -140,7 +140,7 @@ Form
 		}
 	}
 
-    ExpanderButton
+    Section
     {
         text: qsTr("Single Model Inference")
 
@@ -161,9 +161,6 @@ Form
                 CheckBox { text: qsTr("Posterior R\u00B2") ;     name: "singleModelrsqPlot"}
             }
 
-<<<<<<< HEAD
-	Section
-=======
         }
 
         VariablesForm
@@ -178,9 +175,8 @@ Form
             }
         }
     }
-
-	ExpanderButton
->>>>>>> started on jaspResults
+
+    Section
 	{
 		title: qsTr("Post Hoc Tests")
-Original file line number
+Diff line change
@@ Expand Up / @@ -136,7 +136,7 @@ Form @@
     		}
     	}
-        ExpanderButton
+        Section
         {
             text: qsTr("Single Model Inference")
@@ Expand Down @@