added athe format diapay dashboard tab

Author: smwoodman

NAMESPACE

@@ -6,6 +6,8 @@ export(cruzTickStart)
 export(cruzTickUpdate)
 export(cruz_box)
 export(cruzplot_gui)
+export(mod_display_format_server)
+export(mod_display_format_ui)
 export(mod_map_color_server)
 export(mod_map_color_ui)
 export(mod_map_elements_server)
@@ -31,6 +33,7 @@ importFrom(graphics,abline)
 importFrom(graphics,axis)
 importFrom(graphics,lines)
 importFrom(graphics,par)
+importFrom(graphics,points)
 importFrom(graphics,rect)
 importFrom(graphics,text)
 importFrom(graphics,title)

NEWS.md

@@ -1,8 +1,8 @@
 # CruzPlot 2.0.0 (dev)
 
-* Provide a more information error message when CruzPlot cannot load a DAS file (#6)
+* CruzPlot now provides a more information error message when it cannot load a DAS file (#6)
 
-* Modularize CruzPlot shiny app (in progress) (#7)
+* Modularized the CruzPlot shiny app (in progress) (#7)
 
 
 # CruzPlot 1.4.9

R/CruzPlot-package.R

@@ -12,7 +12,7 @@
 #' @import shiny
 #' @importFrom dplyr between case_when if_else
 #' @importFrom geosphere destPoint
-#' @importFrom graphics abline axis par lines rect text title
+#' @importFrom graphics abline axis par points lines rect text title
 #' @importFrom grDevices gray palette dev.off jpeg pdf png
 #' @importFrom maps map
 #' @importFrom shinydashboard box dashboardBody tabItems tabItem dashboardHeader

R/cruzplot_gui.R

@@ -39,9 +39,9 @@ cruzplot_gui <- function(...) {
         # menuItem("App State", tabName = "appstate", icon = icon("th", lib = "font-awesome")),
         # menuItem("Plot DAS Data", tabName = "DASplot", icon = icon("th")),
         # menuItem("Plot Non-DAS Data", tabName = "nonDASplot", icon = icon("th")),
-        # menuItem(HTML(paste0("Color and Formatting", "<br/>", "Options")), tabName = "dispColor", icon = icon("th")),
-        # menuItem("Species Information", tabName = "dispSp", icon = icon("th")),
-        # menuItem("CruzPlot Manual", tabName = "dispManual", icon = icon("th")),
+        menuItem(HTML(paste0("Color and Formatting", "<br/>", "Options")), tabName = "dispColor", icon = icon("th")),
+        menuItem("Species Information", tabName = "dispSp", icon = icon("th")),
+        menuItem("CruzPlot Manual", tabName = "dispManual", icon = icon("th")),
         tags$br(),
         fileInput("load_app_envir_file", "Load workspace"),
         column(
@@ -51,18 +51,12 @@ cruzplot_gui <- function(...) {
         ),
         tags$br(), tags$br(), #tags$br(),
         numericInput("plot_height", "Map height (pixels)", value = 600, min = 0, step = 100),
-        
-        # cruz_box(
-        #   title = "Color style", width = 6,
-        #   helpText("This color style selection will affect the palette options for all color selections in CruzPlot"),
-        #   tags$br(),
         selectInput(
           "color_style", 
           "App-wide color style", 
           choices = list("Color" = 1, "Gray scale" = 2),
           selected = 1
         ), 
-        # ),
         tags$br(),
         actionButton("stop", "Close CruzPlot"),
         column(12, tags$h5(paste0("CruzPlot v", packageVersion("CruzPlot"))))
@@ -96,12 +90,6 @@ cruzplot_gui <- function(...) {
                                 });
                             ')),
       tabItems(
-        # tabItem(
-        #   tabName = "appstate",
-        #   h3("Current App State"),
-        #   p("This panel shows the values stored in the central 'app_state' object."),
-        #   verbatimTextOutput("current_state_display")
-        # ),
         tabItem(
           tabName = "createmap",
           fluidRow(
@@ -118,7 +106,8 @@ cruzplot_gui <- function(...) {
               mod_map_color_ui("map_color")
             )
           )
-        )
+        ), 
+        mod_display_format_ui("display_format")
       )
     )
   )
@@ -196,6 +185,10 @@ cruzplot_gui <- function(...) {
     map_elements <- mod_map_elements_server("map_elements", load_state_map_elements, map_range)
     map_color <- mod_map_color_server("map_color", load_state_map_color, map_range)
 
+    #----------------------------------------------------------------------------
+    ### Display tabs
+    mod_display_format_server("display_format")
+    
     #----------------------------------------------------------------------------
     ### Plots
     # plot_height <- reactive(input$plot_height)

R/mod_display_format.R

@@ -0,0 +1,109 @@
+#' Display format module
+#'
+#' Shiny module for displaying format and color options
+#'
+#' @name mod_display_format
+#'
+#' @inheritParams mod_plot
+#'
+#' @details
+#' This module displays the app color and format options, including: 
+#' color palette options, line types, line widths, symbols, and fonts
+#'
+#' @returns The UI function returns a [shinydashboard::tabItem()] object
+#' 
+#' The server function returns nothing
+#'
+#' @export
+mod_display_format_ui <- function(id) {
+  ns <- NS(id)
+
+  tabItem(
+    tabName = "dispColor",
+    fluidRow(
+      box(
+        title = "Color/Format Options", status = "primary", solidHeader = TRUE,  width = 12,
+        plotOutput(ns("plot_display_format"))
+      ),
+      column(12, actionButton(ns("display_redraw"), "Redraw display"))
+    )
+  )
+}
+
+
+#' @name mod_display_format
+#' @export
+mod_display_format_server  <- function(id) {
+  moduleServer(id, function(input, output, session) {
+    cruzDisplaySymbolProp <- reactive({
+      input$display_redraw
+
+      plot.max <- length(symbol.col) + length(symbol.col.gray) + 3
+      plot.h1 <- plot.max - 1.5 + 1
+      plot.h2 <- plot.max - 1.75 + 1
+      plot.h3 <- plot.max - 1.85 + 1
+      plot.h4 <- plot.max - 2 + 1
+      plot.h5 <- plot.max - 3 + 1
+      plot.h6 <- plot.max - 14 + 1
+
+      plot.gs <- plot.h3 - 1.15 - length(symbol.col)
+
+      oldpar <- par(mar = rep(1, 4), family = "sans")
+      plot(c(0, 1), c(0, plot.max), type = "n", axes = FALSE, bty = "n")
+
+      # Top labels
+      text(c(0.05, 0.32, 0.7, 0.95), rep(plot.h1, 4), c("Symbols", "Colors", "Line Types", "Widths"), cex = 1.4)
+      #text(c(0.05,0.3,0.7,0.95),rep(26.5,4),c("(pch= )","(col= )","(lty= )","(lwd= )"),cex=1.3)
+
+      # Symbols
+      for(i in 0:20) {
+        text(0.02, plot.h5 - (i * 1.25), i, cex = 1)
+        points(.08, plot.h5 - (i * 1.25), pch = i, cex = 1.8)
+      }
+
+      # Colors used in CruzPlot
+      for(i in 1:length(symbol.col)) {
+        text(0.33, plot.h3 - (i + .25), symbol.col[i], cex = 1, pos = 2)
+        points(.35, plot.h2 - (i + .25), pch = 15, cex = 2.1, col = symbol.col.code[i])
+      }
+      points(0.35, (plot.h2 - (length(symbol.col) + .25)), pch = 0, cex = 2.0) #puts box around white
+      text(0.24, plot.max-13, "Color", srt = 90, cex = 1.2, pos = 4)
+
+      # Greyscale palette
+      palette(gray((0:5) / 5))
+      for(i in 1:6) {
+        text(0.33, plot.gs - i, symbol.col.gray[i], cex = 1, pos = 2)
+        points(0.35, plot.gs - i + 0.1, pch = 15, cex = 2.1, col = symbol.col.code.gray[i])
+      }
+      points(0.35, plot.gs - 6 + 0.11, pch = 0, cex = 2.0) #puts box around white
+      text(0.24, 0.1, "Gray Scale", srt = 90, cex = 1.2, pos = 4)
+
+      # Line types
+      for(i in 1:6) {
+        text(0.55, plot.h5 - i, i, cex = 1.1)
+        lines(c(0.6, 0.7, 0.85), c(plot.h5 - i, plot.h4 - i, plot.h4 - i), lty = i)}
+      # line widths
+      for(i in 1:6) {
+        lines(c(0.9, 1), c(plot.h4 - i, plot.h4 - i), lwd = i)
+      }
+
+      # Typefaces
+      text(0.75, plot.h6, "Fonts", cex = 1.4)
+      plot.h6b <- plot.h6 + 0.5
+      for(i in 1:3) {
+        i.m <- i * 1.5
+        text(0.75, plot.h6b - 0.0 - (i.m * 2.3), names(font.family)[i], cex = 1.2, adj = 0.5, family = font.family.vals[i])
+        text(0.75, plot.h6b - 0.9 - (i.m * 2.3), paste(LETTERS, collapse = ""), cex = 1, adj = 0.5, family = font.family.vals[i])
+        text(0.75, plot.h6b - 1.8 - (i.m * 2.3), paste(c(letters, " ", 0:9), collapse = ""), cex = 1, adj = 0.5, family = font.family.vals[i])
+      }
+
+      palette("default")
+      par(oldpar)
+    })
+
+
+    output$plot_display_format <- renderPlot({
+      cruzDisplaySymbolProp()
+    })
+  })
+}