use standard constructor for grid units from C++

wilkelab · Feb 21, 2020 · 1fe736a · 1fe736a
1 parent 5cc4b40
commit 1fe736a
Showing 1 changed file with 14 additions and 10 deletions.
diff --git a/src/grid.cpp b/src/grid.cpp
@@ -1,21 +1,25 @@
 #include "grid.h"
 
 NumericVector unit_pt(NumericVector x) {
-  NumericVector out(x);
-  out.attr("class") = "unit";
-  out.attr("valid.unit") = IntegerVector(1, 8);
-  out.attr("unit") = "pt";
-
-  return out;
+  //NumericVector out(x);
+  //out.attr("class") = "unit";
+  //out.attr("valid.unit") = IntegerVector(1, 8);
+  //out.attr("unit") = "pt";
+
+  // create unit vector by calling back to R
+  Environment env = Environment::namespace_env("grid");
+  Function unit = env["unit"];
+  return unit(x, "pt");
 }
 
 NumericVector unit_pt(Length x) {
   NumericVector out(1, x);
-  out.attr("class") = "unit";
-  out.attr("valid.unit") = IntegerVector(1, 8);
-  out.attr("unit") = "pt";
+  //out.attr("class") = "unit";
+  //out.attr("valid.unit") = IntegerVector(1, 8);
+  //out.attr("unit") = "pt";
+  //return out;
 
-  return out;
+  return unit_pt(out);
 }
 
 List gpar_empty() {