Author: mdoray Date: 2012-10-30 12:45:36 +0100 (Tue, 30 Oct 2012) New Revision: 766 Url: http://forge.codelutin.com/repositories/revision/echobase/766 Log: Modified: R-EchoBase/R-echobase_functions.r Modified: R-EchoBase/R-echobase_functions.r =================================================================== --- R-EchoBase/R-echobase_functions.r 2012-10-30 11:43:24 UTC (rev 765) +++ R-EchoBase/R-echobase_functions.r 2012-10-30 11:45:36 UTC (rev 766) @@ -1,7 +1,7 @@ #This function reshape cells data from EchoBase into wide format #with proper numeric fields -cells4humans=function(df,v.names="data_value",idvar="EIcell_id", +cells4humans=function(df,v.names="data_value",idvar="EIcell_id",correcXY=FALSE, timevar="data_type",snames=c("voyage_name","esdu_name", "cell_type","cell_name","esdu_data_type",idvar)){ #Cells in wide format @@ -11,10 +11,12 @@ head(df.wide) names(df.wide)=gsub(paste(v.names,'.',sep=''),'',names(df.wide)) #Position correction - df.wide$LongitudeStart=correct.positions( - df=df.wide$LongitudeStart,xname="LongitudeStart",asNewColumn=FALSE) - df.wide$LatitudeStart=correct.positions( - df=df.wide$LatitudeStart,yname="LatitudeStart",asNewColumn=FALSE) + if (correcXY){ + df.wide$LongitudeStart=correct.positions( + df=df.wide$LongitudeStart,xname="LongitudeStart",asNewColumn=FALSE) + df.wide$LatitudeStart=correct.positions( + df=df.wide$LatitudeStart,yname="LatitudeStart",asNewColumn=FALSE) + } #Set data column format to numeric #----------------------------------------- df.wide[,!names(df.wide)%in%snames]=