← Back to branch summary

~ubuntu-branches/ubuntu/raring/latticeextra/raring

« back to all changes in this revision

Viewing changes to R/marginal.plot.R

  • Committer: Bazaar Package Importer
  • Author(s): Dirk Eddelbuettel
  • Date: 2009-10-27 13:56:10 UTC
  • mfrom: (1.3.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20091027135610-wu555mfso3wgww9f
Tags: 0.6-3-1
* New upstream release

* debian/control: Set (Build-)Depends: to current R version
* debian/control: Set Standards-Version: to current version 

Show diffs side-by-side

added added

removed removed

Lines of Context:
R/marginal.plot.R
13
13
             groups = NULL,
14
14
             reorder = !is.table(x),
15
15
             plot.points = FALSE,
16
 
             ref = TRUE,
 
16
             ref = TRUE, cut = 1,
17
17
             origin = 0,
18
18
             xlab = NULL, ylab = NULL,
19
19
             type = c("p", if (is.null(groups)) "h"),
26
26
               abbreviate = TRUE, minlength = 5,
27
27
               rot = 30, cex = 0.75, tick.number = 3,
28
28
               y = list(draw = FALSE)),
 
29
             layout = NULL,
29
30
             lattice.options = list(
30
31
               layout.heights = list(
31
32
                 axis.xlab.padding = list(x = 0),
115
116
               })
116
117
        ## merge the list of trellis objects into one
117
118
        catobj <- do.call("c", dotobjs)
 
119
        catobj$layout <- layout
118
120
        catobj$call <- match.call()
119
121
        if (all(iscat)) return(catobj)
120
122
    }
131
133
                        subscripts = TRUE,
132
134
                        groups = groups,
133
135
                        ...,
134
 
                        plot.points = plot.points, ref = ref,
 
136
                        plot.points = plot.points,
 
137
                        ref = ref, cut = cut,
135
138
                        as.table = as.table,
136
139
                        default.scales = default.scales,
137
140
                        lattice.options = lattice.options,
140
143
        if (prod(dim(numobj)) == 1)
141
144
            rownames(numobj) <- names(x)[!iscat]
142
145
        numobj$call <- match.call()
 
146
        numobj$layout <- layout
143
147
        if (all(!iscat)) return(numobj)
144
148
    }
145
149
    ## if there are both categoricals and numerics,
146
150
    ## merge the trellis objects; keep original var order
147
151
    reIndex <- order(c(which(iscat), which(!iscat)))
148
 
    obj <- update(c(catobj, numobj), index.cond = list(reIndex))
 
152
    obj <- update(c(catobj, numobj),
 
153
                  index.cond = list(reIndex), layout = layout)
149
154
    ## force strips when only one panel in each object
150
155
    if (identical(obj$strip, FALSE))
151
156
        obj$strip <- "strip.default"