Merge pull request #58 from CHOP-CGTInformatics/redev

ggswim Redevelopment

DESCRIPTION

@@ -18,19 +18,18 @@ BugReports: https://github.com/CHOP-CGTInformatics/ggswim/issues
 Encoding: UTF-8
 LazyData: true
 Imports: 
-    checkmate,
     cli,
     dplyr,
-    ggnewscale,
     ggplot2,
     grid,
     purrr,
     rlang,
     stringr,
     tibble,
     tidyr,
-    tidyselect
-RoxygenNote: 7.3.1
+    tidyselect,
+    vctrs
+RoxygenNote: 7.3.2
 Roxygen: list(markdown = TRUE)
 Suggests: 
     knitr,

NAMESPACE

@@ -1,83 +1,63 @@
 # Generated by roxygen2: do not edit by hand
 
-S3method(ggplot_add,swim_arrow)
-S3method(ggplot_add,swim_label)
-S3method(ggplot_add,swim_lane)
-S3method(ggplot_add,swim_point)
-S3method(grid.draw,ggswim_obj)
-S3method(print,ggswim_obj)
 export("%+%")
+export(.default_colours)
+export(.default_glyphs)
 export(GeomSwimArrow)
-export(GeomSwimLabel)
 export(GeomSwimLane)
-export(GeomSwimPoint)
+export(GeomSwimMarker)
 export(aes)
-export(build_ggswim)
 export(geom_swim_arrow)
-export(geom_swim_label)
 export(geom_swim_lane)
-export(geom_swim_point)
-export(ggplot_add)
+export(geom_swim_marker)
 export(ggsave)
 export(grid.draw)
-export(new_scale_color)
-export(new_scale_colour)
+export(scale_marker_discrete)
 export(theme_ggswim)
-importFrom(checkmate,check_character)
-importFrom(checkmate,check_data_frame)
-importFrom(checkmate,check_integerish)
-importFrom(checkmate,check_list)
-importFrom(checkmate,check_logical)
 importFrom(cli,cli_abort)
 importFrom(cli,cli_vec)
 importFrom(cli,cli_warn)
 importFrom(dplyr,any_of)
 importFrom(dplyr,arrange)
 importFrom(dplyr,bind_rows)
 importFrom(dplyr,case_when)
+importFrom(dplyr,distinct)
 importFrom(dplyr,filter)
 importFrom(dplyr,if_else)
 importFrom(dplyr,left_join)
 importFrom(dplyr,mutate)
 importFrom(dplyr,pull)
 importFrom(dplyr,select)
-importFrom(ggnewscale,new_scale_color)
-importFrom(ggnewscale,new_scale_colour)
 importFrom(ggplot2,"%+%")
 importFrom(ggplot2,"%+replace%")
 importFrom(ggplot2,Geom)
-importFrom(ggplot2,GeomLabel)
-importFrom(ggplot2,GeomPoint)
 importFrom(ggplot2,GeomSegment)
+importFrom(ggplot2,GeomText)
 importFrom(ggplot2,aes)
 importFrom(ggplot2,arrow)
+importFrom(ggplot2,discrete_scale)
+importFrom(ggplot2,draw_key_text)
 importFrom(ggplot2,element_blank)
 importFrom(ggplot2,element_line)
 importFrom(ggplot2,element_rect)
 importFrom(ggplot2,element_text)
-importFrom(ggplot2,geom_col)
-importFrom(ggplot2,geom_label)
-importFrom(ggplot2,geom_point)
 importFrom(ggplot2,geom_segment)
-importFrom(ggplot2,get_guide_data)
 importFrom(ggplot2,ggplot)
-importFrom(ggplot2,ggplot_add)
-importFrom(ggplot2,ggplot_build)
 importFrom(ggplot2,ggproto)
 importFrom(ggplot2,ggsave)
-importFrom(ggplot2,guide_legend)
-importFrom(ggplot2,guides)
 importFrom(ggplot2,layer)
 importFrom(ggplot2,layer_data)
 importFrom(ggplot2,margin)
 importFrom(ggplot2,scale_color_manual)
+importFrom(ggplot2,scale_colour_manual)
 importFrom(ggplot2,theme)
 importFrom(ggplot2,theme_minimal)
 importFrom(ggplot2,unit)
 importFrom(grid,grid.draw)
 importFrom(purrr,discard)
 importFrom(purrr,map_lgl)
 importFrom(purrr,walk)
+importFrom(rlang,"%||%")
 importFrom(rlang,":=")
 importFrom(rlang,.data)
 importFrom(rlang,as_label)
@@ -99,4 +79,3 @@ importFrom(tibble,tibble)
 importFrom(tibble,tribble)
 importFrom(tidyr,pivot_longer)
 importFrom(tidyselect,all_of)
-importFrom(utils,modifyList)