[Robast-commits] r1169 - branches/robast-1.2/pkg/RobAStBase/R

[noreply at r-forge.r-project.org]

Author: ruckdeschel
Date: 2019-02-26 09:37:19 +0100 (Tue, 26 Feb 2019)
New Revision: 1169

Modified:
   branches/robast-1.2/pkg/RobAStBase/R/internalGridHelpers.R
Log:
[RobAStBase] branch 1.2: fixed bugs detected by Matthias:
- lapply was called in the wrong order
- grids can now also be drawn if with.automatic.grid == TRUE if neither scaleX nor scaleY is TRUe

Modified: branches/robast-1.2/pkg/RobAStBase/R/internalGridHelpers.R
===================================================================
--- branches/robast-1.2/pkg/RobAStBase/R/internalGridHelpers.R	2019-02-25 17:36:37 UTC (rev 1168)
+++ branches/robast-1.2/pkg/RobAStBase/R/internalGridHelpers.R	2019-02-26 08:37:19 UTC (rev 1169)
@@ -308,7 +308,7 @@
                 #stop("Argument 'inner' must either be 'logical' or a 'list'")
                 if(!is.list(inner))
                     inner <- as.list(inner)
-                inner <- lapply(.mpresubs,inner)
+                inner <- lapply(inner,.mpresubs)
                 innerT <- .fillList(inner,(type=="info")+dims)
                 inf1 <- 0
                 if(type=="info"){ if(1 %in% to.draw) inf1 <- 1}
@@ -377,8 +377,8 @@
                         scaleX[i] <- scaleX[i] & !grepl("x",logArg[i])
                         scaleY[i] <- scaleY[i] & !grepl("y",logArg[i])
                      }
-                     if(with.automatic.grid[i]&&
-                        (scaleX[i]||scaleY[i])
+                     if(with.automatic.grid[i] # &&
+                       # (scaleX[i]||scaleY[i])
                      ){
                         pF[[i]] <-  .producePanelFirstSn(
                              pF.L[[i]],