Better interactive things. Now magimageRGB is working!

Author: asgr

DESCRIPTION

@@ -9,5 +9,5 @@ Authors@R: person(given = "Aaron",
                       email = "aaron.robotham@uwa.edu.au")
 Description: Functions to make useful (and pretty) plots for scientific plotting. Additional plotting features are added for base plotting, with particular emphasis on making attractive log axis plots.
 License: GPL-3
-Suggests: imager, fst, plotly
+Suggests: imager, fst, plotly, abind
 Imports: grDevices, graphics, stats, celestial (>= 1.4.1), MASS, plotrix, sm, mapproj, RANN

R/magerr.R

@@ -48,20 +48,25 @@ magerr = function(x, y, xlo, ylo, xhi=xlo, yhi=ylo, corxy, length=0.02, col='bla
     if(!missing(ylo) | !missing(yhi)){yhidraw=y+abs(yhi);doyhi=TRUE}else{yhidraw=0;doyhi=FALSE}
 
     if(doxlo & par()$xlog){
-    	sel=which(xlodraw<=0)
-    	xlodraw[sel]=1e-300
+      sel = which(xlodraw <= 0)
+      xlodraw[sel] = 1e-300
     }
-    if(doxhi & par()$xlog){
-      sel=which(xhidraw>0 & x<=0)
-      x[sel]=1e-300
+    if (doxhi & par()$xlog){
+      sel = which(xhidraw > 0 & x <= 0)
+      x[sel] = 1e-300
+      sel = which(xhidraw < 0)
+      xhidraw[sel] = 1e-300
     }
-    if(doylo & par()$ylog){
-    	sel=which(ylodraw<=0)
-    	ylodraw[sel]=1e-300
+    if (doylo & par()$ylog){
+      sel = which(ylodraw <= 0)
+      ylodraw[sel] = 1e-300
     }
-    if(doyhi & par()$ylog){
-      sel=which(yhidraw>0 & y<=0)
-      y[sel]=1e-300
+    if (doyhi & par()$ylog){
+      sel = which(yhidraw > 0 & y <= 0)
+      y[sel] = 1e-300
+      sel = which(yhidraw < 0)
+      yhidraw[sel] = 1e-300
+      #Fix this!
     }
 
     xarrow=x[errbarsel]

R/magimageRGB.R

@@ -2,7 +2,7 @@ magimageRGB<-function(x, y, R, G, B, saturation=1, zlim, xlim, ylim, add = FALSE
                       useRaster=TRUE, asp=1, magmap=TRUE, locut=0.4, hicut=0.995,
                       flip=FALSE, range=c(0,1), type = "quan", stretch="asinh",
                       stretchscale='auto', bad=range[1], clip="", axes=TRUE, frame.plot=TRUE,
-                      sparse='auto', ...){
+                      sparse='auto', interact=FALSE, ...){
   dots=list(...)
   dotskeepimage=c('xaxs', 'yaxs', 'breaks', 'oldstyle')
   if(length(dots)>0){
@@ -88,25 +88,28 @@ magimageRGB<-function(x, y, R, G, B, saturation=1, zlim, xlim, ylim, add = FALSE
     rm(Ba)
   }
 
+  if(interact){
+    if(!requireNamespace("plotly", quietly = TRUE)){
+      stop('The plotly package is needed for this function to work. Please install it from CRAN.', call. = FALSE)
+    }
+    if(!requireNamespace("abind", quietly = TRUE)){
+      stop('The abind package is needed for this function to work. Please install it from CRAN.', call. = FALSE)
+    }
+    fig = plotly::plot_ly(z=abind::abind(t(R*256), t(G*256), t(B*256), along=3), type = "image")
+    
+    fig = plotly::layout(
+      p = fig,
+      xaxis = list(range = xlim, scaleanchor = "y"),  # Set x-axis limits and anchor to y-axis
+      yaxis = list(range = ylim)   # Set y-axis limits
+    )
+    
+    print(fig)
+    return(invisible(NULL))
+  }
+  
   z = matrix(1:length(R),dim(R)[1])
   col = rgb(R,G,B)
 
-  # if(interact){
-  #   if(!requireNamespace("plotly", quietly = TRUE)){
-  #     stop('The plotly package is needed for this function to work. Please install it from CRAN.', call. = FALSE)
-  #   }
-  #   fig = plotly::plot_ly(x=x, y=y, z=z, type = "heatmap", colors = col, transpose=TRUE)
-  #   
-  #   fig = plotly::layout(
-  #     p = fig,
-  #     xaxis = list(range = xlim, scaleanchor = "y"),  # Set x-axis limits and anchor to y-axis
-  #     yaxis = list(range = ylim)   # Set y-axis limits
-  #   )
-  #   
-  #   print(fig)
-  #   return(invisible(NULL))
-  # }
-  
   do.call('image',c(list(x=x, y=y, z=z, zlim=zlim, xlim=xlim, ylim=ylim, col=col, add=add, useRaster=useRaster, axes=FALSE, asp=asp, xlab='', ylab='', main=''), dotsimage))
   if(add==FALSE){
     if(axes){

README.Rmd

@@ -1,6 +1,3 @@
-
-<!-- README.md is generated from README.Rmd. Please edit that file -->
-
 # magicaxis
 
 <!-- badges: start -->

README.md

@@ -18,7 +18,8 @@ magimage(x, y, z, zlim, xlim, ylim, col = grey((0:1000)/1000), add = FALSE,
 magimageRGB(x, y, R, G, B, saturation = 1, zlim, xlim, ylim, add = FALSE,
   useRaster = TRUE, asp = 1, magmap = TRUE, locut = 0.4, hicut = 0.995, flip = FALSE,
   range = c(0, 1), type = "quan", stretch = "asinh", stretchscale = "auto",
-  bad = range[1], clip = "", axes = TRUE, frame.plot = TRUE, sparse = 'auto', ...) 
+  bad = range[1], clip = "", axes = TRUE, frame.plot = TRUE, sparse = 'auto',
+  interact = FALSE, ...) 
 }
 %- maybe also 'usage' for other objects documented here.
 \arguments{