diff --git a/.Rproj.user/958DB0DB/pcs/source-pane.pper b/.Rproj.user/958DB0DB/pcs/source-pane.pper index be19143..965e284 100644 --- a/.Rproj.user/958DB0DB/pcs/source-pane.pper +++ b/.Rproj.user/958DB0DB/pcs/source-pane.pper @@ -1,4 +1,4 @@ { - "activeTab": 0, + "activeTab": 1, "activeTabSourceWindow0": 0 } \ No newline at end of file diff --git a/.Rproj.user/958DB0DB/sources/prop/2E9C3B7F b/.Rproj.user/958DB0DB/sources/prop/2E9C3B7F index 494d3b2..2b91120 100644 --- a/.Rproj.user/958DB0DB/sources/prop/2E9C3B7F +++ b/.Rproj.user/958DB0DB/sources/prop/2E9C3B7F @@ -1,6 +1,6 @@ { "source_window_id": "", "Source": "Source", - "cursorPosition": "16,9", + "cursorPosition": "8,16", "scrollLine": "0" } \ No newline at end of file diff --git a/DESCRIPTION b/DESCRIPTION index 6416910..ea6c08c 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -6,7 +6,7 @@ Description: An open-source R package to deploys reproducible and flexible label The 'huito' package is part of the 'inkaverse' project for developing different procedures and tools used in plant science and experimental designs. Learn more about the 'inkaverse' project at . -Date: 2022-06-25 +Date: 2022-07-08 Authors@R: c( person("Flavio", "Lozano-Isla", email = "flavjack@gmail.com", role = c("aut", "cre") , comment = c(ORCID = "0000-0002-0714-669X")), diff --git a/NEWS.md b/NEWS.md index 90301a8..e1caf19 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,6 +1,7 @@ # huito 0.2.1 - Change package title +- logo update # huito 0.2.0 diff --git a/docs/articles/etiquetas.pdf b/docs/articles/etiquetas.pdf index 15189b0..df02939 100644 Binary files a/docs/articles/etiquetas.pdf and b/docs/articles/etiquetas.pdf differ diff --git a/docs/articles/germinar.html b/docs/articles/germinar.html index c767169..67b8fb0 100644 --- a/docs/articles/germinar.html +++ b/docs/articles/germinar.html @@ -137,39 +137,39 @@

More information from GerminaR project: https://germinar.inkaverse.com/

-library(huito)
-
-font <- c("Paytone One", "Permanent Marker")
-
-huito_fonts(font)
-
-label <- label_layout(size = c(5.08, 5.08)
-                      , border_width = 0
-                      , background = "#b1d842"
-                      ) %>% 
-  include_image(value = "https://germinar.inkaverse.com/img/seed_germination.png"
-                , size = c(5.5, 5.5)
-                , position = c(2.55, 1.26)
-                , opts = 'image_transparent("white")*image_modulate(brightness = 0)'
-                ) %>%
-  include_shape(size = 5.08
-                , border_width = 0
-                , position = c(2.54, 2.54)
-                , panel_color = "blue"
-                ) %>%
-  include_text(value = "GerminaR"
-               , font[1]
-               , size = 23
-               , position = c(2.54, 3.55)
-               , color = "#a64d79"
-               ) %>%
-  include_text(value = "inkaverse.com"
-               , font[2]
-               , size = 6
-               , position = c(3.9, 0.96)
-               , angle = 30
-               , color = "white"
-               )
+library(huito) + +font <- c("Paytone One", "Permanent Marker") + +huito_fonts(font) + +label <- label_layout(size = c(5.08, 5.08) + , border_width = 0 + , background = "#b1d842" + ) %>% + include_image(value = "https://germinar.inkaverse.com/img/seed_germination.png" + , size = c(5.5, 5.5) + , position = c(2.55, 1.26) + , opts = 'image_transparent("white")*image_modulate(brightness = 0)' + ) %>% + include_shape(size = 5.08 + , border_width = 0 + , position = c(2.54, 2.54) + , panel_color = "blue" + ) %>% + include_text(value = "GerminaR" + , font[1] + , size = 23 + , position = c(2.54, 3.55) + , color = "#a64d79" + ) %>% + include_text(value = "inkaverse.com" + , font[2] + , size = 6 + , position = c(3.9, 0.96) + , angle = 30 + , color = "white" + )

You can add more image option via magick R package functions include_image(opts) https://CRAN.R-project.org/package=magick.

Select at panel_color() different from the colors in @@ -178,20 +178,20 @@

Preview mode 

-label %>% 
-  label_print(mode = "preview")
+label %>% + label_print(mode = "preview")

Complete mode 

-sticker <- label %>%
-  label_print(filename = "GerminaR"
-              , margin = 0
-              , paper = c(5.5, 5.5)
-              , mode = "complete"
-              )
+sticker <- label %>% + label_print(filename = "GerminaR" + , margin = 0 + , paper = c(5.5, 5.5) + , mode = "complete" + )
@@ -200,12 +200,12 @@

Final sticker result

diff --git a/docs/articles/labels.html b/docs/articles/labels.html index c566c37..5933702 100644 --- a/docs/articles/labels.html +++ b/docs/articles/labels.html @@ -146,22 +146,22 @@

Create fieldbookThe fieldbook experimental design was deployed with inti package https://inkaverse.com/articles/apps.html

-library(inti)
-
-treats <- data.frame(condition = c("irrigated", "drought")
-                     , genotypes = c("choclito", "salcedo", "pandela", "puno"))
-
-design <- tarpuy_design(data = treats
-                        , nfactors = 2
-                        , type = "rcbd"
-                        , rep = 3
-                        , barcode = "HUITO") 
-
-fb <- design$fieldbook
-
-fb %>% web_table()
-
- +library(inti) + +treats <- data.frame(condition = c("irrigated", "drought") + , genotypes = c("choclito", "salcedo", "pandela", "puno")) + +design <- tarpuy_design(data = treats + , nfactors = 2 + , type = "rcbd" + , rep = 3 + , barcode = "HUITO") + +fb <- design$fieldbook + +fb %>% web_table()

+
+

Label design @@ -171,55 +171,55 @@

Label design
-library(huito)
-
-font <- c('Ceviche One', "Permanent Marker")
-
-huito_fonts(font)
-
-label <- fb %>% 
-  mutate(color = case_when(
-    condition %in% "irrigated" ~ "blue"
-    , condition %in% "drought" ~ "red"
-  )) %>% 
-  label_layout(size = c(10, 2.5)
-               , border_color = "blue"
-               ) %>%
-  include_image(
-    value = "https://flavjack.github.io/inti/img/inkaverse.png"
-    , size = c(2.4, 2.4)
-    , position = c(1.2, 1.25)
-    , opts = "image_scale(200)"
-    ) %>%
-  include_barcode(
-     value = "barcode"
-     , size = c(2.5, 2.5)
-     , position = c(8.2, 1.25)
-     ) %>%
-  include_text(value = "plots"
-               , position = c(9.7, 1.25)
-               , angle = 90
-               , size = 15
-               , color = "red"
-               ) %>%
-  include_text(value = "Inkaverse"
-               , position = c(4.6, 2)
-               , size = 30
-               , color = "brown"
-               , font[1]
-               ) %>%
-  include_text(value = "condition"
-               , position = c(4.6, 1.2)
-               , size = 13
-               , color = "color" # dynamic column
-               , font[2]
-               ) %>%
-  include_text(value = "genotypes"
-               , position = c(4.6, 0.5)
-               , size = 13
-               , color = "#009966"
-               , font[2]
-               )

+library(huito) + +font <- c('Ceviche One', "Permanent Marker") + +huito_fonts(font) + +label <- fb %>% + mutate(color = case_when( + condition %in% "irrigated" ~ "blue" + , condition %in% "drought" ~ "red" + )) %>% + label_layout(size = c(10, 2.5) + , border_color = "blue" + ) %>% + include_image( + value = "https://flavjack.github.io/inti/img/inkaverse.png" + , size = c(2.4, 2.4) + , position = c(1.2, 1.25) + , opts = "image_scale(200)" + ) %>% + include_barcode( + value = "barcode" + , size = c(2.5, 2.5) + , position = c(8.2, 1.25) + ) %>% + include_text(value = "plots" + , position = c(9.7, 1.25) + , angle = 90 + , size = 15 + , color = "red" + ) %>% + include_text(value = "Inkaverse" + , position = c(4.6, 2) + , size = 30 + , color = "brown" + , font[1] + ) %>% + include_text(value = "condition" + , position = c(4.6, 1.2) + , size = 13 + , color = "color" # dynamic column + , font[2] + ) %>% + include_text(value = "genotypes" + , position = c(4.6, 0.5) + , size = 13 + , color = "#009966" + , font[2] + )

After running the chunk the first time. You should comment huito_fonts() as we already imported the fonts.

@@ -228,8 +228,8 @@

Preview mode generate a example of the label design from a random row of the data set.

-label %>% 
-  label_print(mode = "preview")
+label %>% + label_print(mode = "preview")

@@ -238,8 +238,8 @@

Complete mode.

-label %>% 
-  label_print(mode = "complete", filename = "etiquetas", nlabels = 10)
+label %>% + label_print(mode = "complete", filename = "etiquetas", nlabels = 10)

diff --git a/docs/articles/labels_files/figure-html/unnamed-chunk-3-1.png b/docs/articles/labels_files/figure-html/unnamed-chunk-3-1.png index 16f7077..c5d8f6c 100644 Binary files a/docs/articles/labels_files/figure-html/unnamed-chunk-3-1.png and b/docs/articles/labels_files/figure-html/unnamed-chunk-3-1.png differ diff --git a/docs/articles/stickers.html b/docs/articles/stickers.html index abd23a9..701279a 100644 --- a/docs/articles/stickers.html +++ b/docs/articles/stickers.html @@ -138,61 +138,61 @@

More information and examples for a sticker you can find in the following link: http://hexb.in/

-library(huito)
-
-font <- "Permanent Marker"
-
-huito_fonts(font)
-
-label <- label_layout(size = c(5.08, 5.08)
-                      , border_width = 0
-                      ) %>% 
-  include_image(value = "https://flavjack.github.io/huito/img/shipibo.png"
-                , size = c(7, 7)
-                , position = c(2.55, 2.52)
-                , opts = "image_scale(600)"
-                ) %>%
-  include_text(value = "H", size = 45 , position = c(1.15, 2.7), color = "#00a85a", font) %>%
-  include_text(value = "u", size = 45 , position = c(2.07, 2.7), color = "#f58735", font) %>%
-  include_text(value = "i", size = 45 , position = c(2.73, 2.7), color = "#4774b8", font) %>%
-  include_image(value = "https://flavjack.github.io/huito/img/huito_fruit.png"
-                , size = c(1.3, 1.3) 
-                , position = c(4.06, 2.6)
-                ) %>%
-  include_text(value = "t", size = 45 , position = c(3.33, 2.7), color = "#a9518b", font) %>%
-  include_shape(size = 5.08
-                , border_width = 3
-                , border_color = "black"
-                , position = c(2.54, 2.54)
-                , panel_color = "blue"
-                ) %>%
-  include_text(value = "inkaverse.com"
-               , size = 6
-               , position = c(3.6, 0.75)
-               , angle = 30
-               , color = "white"
-               , font
-               )
+library(huito) + +font <- "Permanent Marker" + +huito_fonts(font) + +label <- label_layout(size = c(5.08, 5.08) + , border_width = 0 + ) %>% + include_image(value = "https://flavjack.github.io/huito/img/shipibo.png" + , size = c(7, 7) + , position = c(2.55, 2.52) + , opts = "image_scale(600)" + ) %>% + include_text(value = "H", size = 45 , position = c(1.15, 2.7), color = "#00a85a", font) %>% + include_text(value = "u", size = 45 , position = c(2.07, 2.7), color = "#f58735", font) %>% + include_text(value = "i", size = 45 , position = c(2.73, 2.7), color = "#4774b8", font) %>% + include_image(value = "https://flavjack.github.io/huito/img/huito_fruit.png" + , size = c(1.3, 1.3) + , position = c(4.06, 2.6) + ) %>% + include_text(value = "t", size = 45 , position = c(3.33, 2.7), color = "#a9518b", font) %>% + include_shape(size = 5.08 + , border_width = 3 + , border_color = "black" + , position = c(2.54, 2.54) + , panel_color = "blue" + ) %>% + include_text(value = "inkaverse.com" + , size = 6 + , position = c(3.6, 0.75) + , angle = 30 + , color = "white" + , font + )

Select at panel_color() different from the colors in your stickers background.

Preview mode 

-label %>% 
-  label_print(mode = "preview")
+label %>% + label_print(mode = "preview")

Complete mode 

-sticker <- label %>% 
-  label_print(filename = "huito"
-              , margin = 0
-              , paper = c(5.5, 5.5)
-              , mode = "complete"
-              )
+sticker <- label %>% + label_print(filename = "huito" + , margin = 0 + , paper = c(5.5, 5.5) + , mode = "complete" + )
@@ -201,13 +201,13 @@

Final sticker result

diff --git a/docs/img/huito.png b/docs/img/huito.png index 762a1df..4c825e4 100644 Binary files a/docs/img/huito.png and b/docs/img/huito.png differ diff --git a/docs/index.html b/docs/index.html index 77f7271..5942c48 100644 --- a/docs/index.html +++ b/docs/index.html @@ -134,12 +134,12 @@

InstallationCRAN with:

+install.packages("huito")

And the development version from GitHub with:

-if (!require("remotes"))
-  install.packages("remotes")
-remotes::install_github("Flavjack/huito")
+if (!require("remotes")) + install.packages("remotes") +remotes::install_github("Flavjack/huito")