[rkward-cvs] rkward/rkward/plugins/02plots/scatterplot code.php,1.3,1.4

[Thomas Friedrichsmeier]

Update of /cvsroot/rkward/rkward/rkward/plugins/02plots/scatterplot
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16559/scatterplot

Modified Files:
	code.php 
Log Message:
Fix scatterplot (the real problem were the line-breaks, not the assignments)

Index: code.php
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/plugins/02plots/scatterplot/code.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** code.php	12 Apr 2006 17:49:44 -0000	1.3
--- code.php	20 Apr 2006 10:30:56 -0000	1.4
***************
*** 27,33 ****
  
  <? # verification (chiant mais doit être fait)?>
! rk.plugin.ok = TRUE ;
  if (length(rk.plugin.Xvar) != length(rk.plugin.Yvar) ) { 
! 	rk.plugin.ok = FALSE ;
  	stop("'X' is of length ",length(rk.plugin.Xvar)," and 'Y' of length ",length(rk.plugin.Yvar) )
  }
--- 27,33 ----
  
  <? # verification (chiant mais doit être fait)?>
! rk.plugin.ok <- TRUE
  if (length(rk.plugin.Xvar) != length(rk.plugin.Yvar) ) { 
! 	rk.plugin.ok <- FALSE ;
  	stop("'X' is of length ",length(rk.plugin.Xvar)," and 'Y' of length ",length(rk.plugin.Yvar) )
  }
***************
*** 35,39 ****
  if (getRK_val ("color") == "each") { ?>
  if (length( <? echo ($col); ?>) != length(rk.plugin.Xvar)) {
! 	rk.plugin.ok = FALSE ;
  	stop('only ', length( <? echo ($col); ?>) ,' color(s) is(are) displayed') ;
  }
--- 35,39 ----
  if (getRK_val ("color") == "each") { ?>
  if (length( <? echo ($col); ?>) != length(rk.plugin.Xvar)) {
! 	rk.plugin.ok <- FALSE
  	stop('only ', length( <? echo ($col); ?>) ,' color(s) is(are) displayed') ;
  }
***************
*** 41,45 ****
  if (getRK_val ("isPch") == "each") { ?>
  if (length( <? echo ($pch); ?>) != length(rk.plugin.Xvar)) {
! 	rk.plugin.ok = FALSE ;
  	stop('only ', length( <? echo ($pch); ?>) ,' symbol(s) is(are) displayed') ;
  }
--- 41,45 ----
  if (getRK_val ("isPch") == "each") { ?>
  if (length( <? echo ($pch); ?>) != length(rk.plugin.Xvar)) {
! 	rk.plugin.ok <- FALSE
  	stop('only ', length( <? echo ($pch); ?>) ,' symbol(s) is(are) displayed') ;
  }
***************
*** 47,51 ****
  if (getRK_val ("isCe") == "each") { ?>
  if (length( <? echo ($cex); ?>) != length(rk.plugin.Xvar)) {
! 	rk.plugin.ok = FALSE ;
  	stop('only ', length( <? echo ($cex); ?>) ,' size(s) is(are) displayed') ;
  }
--- 47,51 ----
  if (getRK_val ("isCe") == "each") { ?>
  if (length( <? echo ($cex); ?>) != length(rk.plugin.Xvar)) {
! 	rk.plugin.ok <- FALSE
  	stop('only ', length( <? echo ($cex); ?>) ,' size(s) is(are) displayed') ;
  }
***************
*** 53,57 ****
  if ($type == "custoType") { ?>
  if (length( <? echo ($typeCusto); ?>) != length(rk.plugin.Xvar)) {
! 	rk.plugin.ok = FALSE ;
  	stop('only ', length( <? echo ($typeCusto); ?>) ,' type(s) is(are) displayed') ;
  }
--- 53,57 ----
  if ($type == "custoType") { ?>
  if (length( <? echo ($typeCusto); ?>) != length(rk.plugin.Xvar)) {
! 	rk.plugin.ok <- FALSE
  	stop('only ', length( <? echo ($typeCusto); ?>) ,' type(s) is(are) displayed') ;
  }
***************
*** 61,75 ****
  
  <? #finding min and max for default plotin  ; ?>
! rk.plugin.Xdef = c(min(rk.plugin.Xval,na.rm=TRUE) , max(rk.plugin.Xval,na.rm=TRUE))
! rk.plugin.Ydef = c(min(rk.plugin.Yval,na.rm=TRUE) , max(rk.plugin.Yval,na.rm=TRUE))
  
  <? # names ?>
! rk.plugin.Xname = '<? echo ($Xname); ?>'
! rk.plugin.Yname = '<? echo ($Yname); ?>'
! rk.plugin.title = '<? echo ($main); ?>'
! rk.plugin.sub = '<? echo ($sub); ?>'
  
  <? # type ?>
! rk.plugin.tc = data.frame(
  type = rep(NA,length(rk.plugin.Xvar)),
  col = rep(NA,length(rk.plugin.Xvar)),
--- 61,75 ----
  
  <? #finding min and max for default plotin  ; ?>
! rk.plugin.Xdef <- c(min(rk.plugin.Xval,na.rm=TRUE) , max(rk.plugin.Xval,na.rm=TRUE))
! rk.plugin.Ydef <- c(min(rk.plugin.Yval,na.rm=TRUE) , max(rk.plugin.Yval,na.rm=TRUE))
  
  <? # names ?>
! rk.plugin.Xname <- '<? echo ($Xname); ?>'
! rk.plugin.Yname <- '<? echo ($Yname); ?>'
! rk.plugin.title <- '<? echo ($main); ?>'
! rk.plugin.sub <- '<? echo ($sub); ?>'
  
  <? # type ?>
! rk.plugin.tc <- data.frame(
  type = rep(NA,length(rk.plugin.Xvar)),
  col = rep(NA,length(rk.plugin.Xvar)),
***************
*** 77,85 ****
  cex = rep(NA,length(rk.plugin.Xvar)))
  
! <? if  ($type != "custoType" ) echo ( $type . " ->  rk.plugin.tc[[1]]" ) ;
! else echo( $typeCusto . " ->  rk.plugin.type.tc[[1]]"  ) ?>
! rk.plugin.tc[[2]] = <? echo ($col); ?>
! rk.plugin.tc[[3]] = <? echo ($cex); ?>
! rk.plugin.tc[[4]] = <? echo ($pch); ?>
  
  <? # avant après ?>
--- 77,85 ----
  cex = rep(NA,length(rk.plugin.Xvar)))
  
! <? if  ($type != "custoType" ) echo ( $type . " ->  rk.plugin.tc[[1]]\n" ) ;
! else echo( $typeCusto . " ->  rk.plugin.type.tc[[1]]\n"  ) ?>
! rk.plugin.tc[[2]] <- <? echo ($col . "\n"); ?>
! rk.plugin.tc[[3]] <- <? echo ($cex . "\n"); ?>
! rk.plugin.tc[[4]] <- <? echo ($pch . "\n"); ?>
  
  <? # avant après ?>