ggplot in r interface

DESCRIPTION

@@ -1,11 +1,11 @@
 Package: gamlj
 Type: Package
 Title: GAMLj suite for jamovi
-Version: 1.0.2
+Version: 1.0.3
 Author: Marcello Gallucci
 Maintainer: Marcello Gallucci <mcfanda@gmail.com>
-Description: A suite for estimation of linear model, such as the general linear model, linear mixed models,
-             generalized linear models. For ech family, models can be estimated
+Description: A suite for estimation of linear models, such as the general linear model, linear mixed models,
+             and generalized linear models. For ech family, models can be estimated
              with categorical and/or continuous variables, with options to facilitate estimation of 
              interactions, simple slopes, simple effects, post-hoc tests, contrast analysis and visualization of the results.
 License: GPL

R/gamljglm.b.R

@@ -409,8 +409,7 @@ gamljGLMClass <- R6::R6Class(
   } else {
     p<-gplots.oneWayPlot(image,ggtheme,depName,groupName,errorType)
   }       
-  print(p)
-  TRUE
+  return(p)
 },
 
 .modelFormula=function() {

R/gamljgzlm.b.R

@@ -486,8 +486,7 @@ gamljGzlmClass <- R6::R6Class(
   } else {
     p<-gplots.linesMultiPlot(image,ggtheme,depName,groupName,linesName,plotsName,errorType)
   }
-  print(p)
-  TRUE
+  return(p)
 },
 
 .fixedFormula=function() {

R/gamljmixed.b.R

@@ -468,7 +468,7 @@ gamljMixedClass <- R6::R6Class(
     rawData<-NULL
   ### this is specific of mixed model #####
   cluster<-self$options$cluster[[1]]
-  preds<-c.real(cluster,groupName,linesName,plotsName)
+  preds<-c(cluster,groupName,linesName,plotsName)
   preds64<-jmvcore::toB64(preds)
 
   if (self$options$plotRandomEffects) {
@@ -554,8 +554,7 @@ gamljMixedClass <- R6::R6Class(
   } else {
     p<-gplots.oneWayPlot(image,ggtheme,depName,groupName,errorType)
   }       
-  print(p)
-  TRUE
+  return(p)
 },
 
 .fixedFormula=function() {

R/rinterface.R

@@ -64,37 +64,18 @@ gamlj_plot<-function(gobj,haxis,sepLines=NULL,sepPlots=NULL,...) {
 #' This function returns the plot as a ggplot object
 
 #' @param gobj a gamlj results object of the class GAMLj*#'
-#' @param theme a theme for the ggplot plot. Default is the jamovi default theme
-#' @param ... any other options accepted by the gamlj_* function  
-#' @return an object of class GAMLj* as the input object
+#' @return an object of ggplot
 #' @author Marcello Gallucci
 #' @export
 
-gamlj_ggplot<-function(gobj,...) {
-  options<-list(...)
-  if ("theme" %in% options)
-     theme<-options$theme
-  else
-     theme<-jmvcore::theme_default()
-
-    dep<-gobj$analysis$options$dep
-    haxis<-gobj$options$plotHAxis
-    sepLines<-gobj$options$plotSepLines
-    sepPlots<-gobj$options$plotSepPlots
-    errorType <- gobj$options$plotError
-    ciWidth   <- gobj$options$ciWidth
-    image<-gobj$descPlot
-
-    if (errorType=="ci")
-      errorType<-paste0(ciWidth,"% ",toupper(errorType))
-
-    if ( ! is.null(sepLines)) {
-      p<-gplots.twoWaysPlot(image,theme,dep,sepLines,sepPlots,errorType)
-    } else {
-      p<-gplots.oneWayPlot(image,theme,dep,sepLines,errorType)
-    }       
-    p
-
+gamlj_ggplot<-function(gobj) {
+
+  if (length(gobj$descPlots)==0) {
+    gobj$descPlot$plot
+  } else {
+    gobj$descPlots
+  }
+
 }
 
 #' Update a GAMLj results by passing new simple effects directives
@@ -128,7 +109,6 @@ gamlj_simpleEffects<-function(gobj,variable=NULL,moderator=NULL,threeway=NULL,..
 #' @author Marcello Gallucci
 #' @export
 
-
 gamlj_drop<-function(gobj,analysis) {
   if (analysis=="simpleEffects") {
     args<-list(simpleVariable=NULL,simpleModerator=NULL,simple3way=NULL)