[Soiltexture-commits] r104 - / pkg/ternaryplot/R

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

Author: jmoeys
Date: 2014-04-17 16:31:03 +0200 (Thu, 17 Apr 2014)
New Revision: 104

Modified:
   pkg/ternaryplot/R/ternarygrid.R
   ternaryplot_ToDoList.TXT
Log:


Modified: pkg/ternaryplot/R/ternarygrid.R
===================================================================
--- pkg/ternaryplot/R/ternarygrid.R	2014-03-28 16:50:31 UTC (rev 103)
+++ pkg/ternaryplot/R/ternarygrid.R	2014-04-17 14:31:03 UTC (rev 104)
@@ -185,7 +185,7 @@
  x, 
  ... 
 ){  
-    s  <- x[["ternarySystem"]] 
+    s  <- x[[ "ternarySystem" ]] 
     x  <- x[[ "grid" ]] 
     x  <- x[ order( x[, "id"] ), ] 
     id <- x[, "id" ] 
@@ -193,6 +193,7 @@
     
     .blrNames <- blrNames( s ) 
     
+    #   Transform from Top-Left-Right to X-Y
     xy <- ternary2xy( s = s, x = x[, .blrNames ] ) 
     
     xy  <- split( x = xy, f = as.factor( id ) ) 

Modified: ternaryplot_ToDoList.TXT
===================================================================
--- ternaryplot_ToDoList.TXT	2014-03-28 16:50:31 UTC (rev 103)
+++ ternaryplot_ToDoList.TXT	2014-04-17 14:31:03 UTC (rev 104)
@@ -56,10 +56,14 @@
     ternaryGrid         ternarySystem
     
     ternaryPlot         data.frame matrix   >> make function of "ternarySystem character" (+ internal 'data' handling)
+        
         TO DO: type = "p" points, "l" lines, "b" both, "c" counts, 
                "de" density, "di" distance (contour chosen via "...")
+        
         TO DO: facet = {category}, fCol, fPch, zCol, zCex
+        
         TO DO: make axes ticks depend on axTicks()
+        
         TO DO: make arrows and arrows labels distance from the plot a function of margin size using par("plt") 
                and *backward* calculating the label position
                
@@ -71,11 +75,11 @@
                    that gives the Y-distance between the triangle frame and the axis labels
                (4) Using that distance to position the other two axis arrows and labels
     
-    ternaryLims         data.frame matrix       >> make function of "ternarySystem character" (+ internal 'data' handling)
+    ternaryLims         data.frame matrix   >> make function of "ternarySystem character" (+ internal 'data' handling)
     deg2rad             
-    ternary2xy              data.frame matrix   >> make function of "ternarySystem character" (+ internal 'data' handling)
-    ternaryClockSwitch  data.frame matrix       >> make function of "ternarySystem character" (+ internal 'data' handling)
-    ternaryText         data.frame matrix       >> make function of "ternarySystem character" (+ internal 'data' handling)
+    ternary2xy          data.frame matrix   >> make function of "ternarySystem character" (+ internal 'data' handling)
+    ternaryClockSwitch  data.frame matrix   >> make function of "ternarySystem character" (+ internal 'data' handling)
+    ternaryText         data.frame matrix   >> make function of "ternarySystem character" (+ internal 'data' handling)
     .ternaryAxisArrowsBase ternarySystem
     .ternaryAxisArrows  ternarySystem