Skip to content

Commit 0a7f175

Browse files
committed
working tick elements, including when updating map range
1 parent b115986 commit 0a7f175

3 files changed

Lines changed: 11 additions & 12 deletions

File tree

R/cruzplot_gui.R

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,8 @@ cruzplot_gui <- function(...) {
173173
content = function(file) {
174174
withProgress(message = "Saving app data", value = 0.3, {
175175
# cruz.list.save <- list() #reactiveValuesToList(cruz.list)
176+
177+
# browser()
176178
app_state_save <- reactiveValuesToList(app_state)
177179
incProgress(0.7)
178180
save(app_state_save, file = file)
@@ -218,7 +220,6 @@ cruzplot_gui <- function(...) {
218220
# map.range.update[[i]] <- cruz.map.range.save[[i]]
219221
}
220222
incProgress(0.35)
221-
browser()
222223

223224
# Update widgets on the main page, not in a module
224225
updateNumericInput(session, "plot_height", value = app_state$plot_height)

R/mod_map_elements.R

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,7 @@ mod_map_elements_server <- function(id, app_state, map_range) {
171171
app_state$tick_style <- input$tick_style
172172
app_state$tick_top <- input$tick_top
173173
app_state$tick_top_lab <- input$tick_top_lab
174-
})
175-
# })
174+
}, priority = 10)
176175

177176
# When app_state changes, aka env loaded, update widgets
178177
observeEvent(reactiveValuesToList(app_state), {
@@ -199,6 +198,7 @@ mod_map_elements_server <- function(id, app_state, map_range) {
199198
# browser()
200199
updateCheckboxInput(session, i, value = app_state[[i]])
201200
} else if (i %in% input.numeric) {
201+
# if (i == "tick_interval_major") browser()
202202
updateNumericInput(session, i, value = app_state[[i]])
203203
} else if (i %in% input.select) {
204204
updateSelectInput(session, i, selected = app_state[[i]])
@@ -244,7 +244,6 @@ mod_map_elements_server <- function(id, app_state, map_range) {
244244
lon.start <- ifelse(lon.start < 0, lon.start + 360, lon.start)
245245
}
246246

247-
# browser()
248247
validate(
249248
need(lon.start <= lon.range[2], "Invalid tick lon start 2"),
250249
need(lon.start >= lon.range[1], "Invalid tick lon start 1")
@@ -283,8 +282,6 @@ mod_map_elements_server <- function(id, app_state, map_range) {
283282
# Update reactiveValues cruz.tick at start (cruz.tick's = NULL) and
284283
# if inputs change and are different from cruz.tick
285284
observeEvent(input$tick_interval_major, {
286-
print("here")
287-
print(input$tick_interval_major)
288285
if (req(cruz.tick$tick.interval.major) != input$tick_interval_major){
289286
cruz.tick$tick.interval.major <- input$tick_interval_major
290287
}
@@ -310,35 +307,34 @@ mod_map_elements_server <- function(id, app_state, map_range) {
310307
lon.range <- req(map_range()$lon.range)
311308
lat.range <- req(map_range()$lat.range)
312309
tick.val <- cruzTickUpdate(lon.range, lat.range)
313-
print("Tick major interval")
314-
print(tick.val)
315310

316311
updateNumericInput(session, "tick_interval_major", value = tick.val)
312+
app_state$tick_interval_major <- tick.val
317313
cruz.tick$tick.interval.major <- tick.val
318314
}, priority = 2)
319315

320316
# Tick label longitude start
321317
observe({
322-
print("Tick label longitude start")
323318
b <- req(cruz.tick$tick.interval.major)
324319
if (b != 0 && !is.na(b)) {
325320
lon.range <- req(map_range()$lon.range)
326321
lon.start <- cruzTickStart(lon.range, b)
327322

328-
updateTextInput(session, "label_lon_start", value = paste(lon.start))
323+
updateNumericInput(session, "label_lon_start", value = lon.start)
324+
app_state$label_lon_start <- lon.start
329325
cruz.tick$label.lon.start <- lon.start
330326
}
331327
}, priority = 1)
332328

333329
# Tick label latitude start
334330
observe({
335-
print("Tick label latitude start")
336331
b <- req(cruz.tick$tick.interval.major)
337332
if (b != 0 && !is.na(b)) {
338333
lat.range <- req(map_range()$lat.range)
339334
lat.start <- cruzTickStart(lat.range, b)
340335

341-
updateTextInput(session, "label_lat_start", value = paste(lat.start))
336+
updateNumericInput(session, "label_lat_start", value = lat.start)
337+
app_state$label_lat_start <- lat.start
342338
cruz.tick$label.lat.start <- lat.start
343339
}
344340
}, priority = 1)
@@ -657,6 +653,7 @@ mod_map_elements_server <- function(id, app_state, map_range) {
657653
#--------------------------------------------------------------------------
658654
### Return values
659655
list(
656+
# input = input,
660657
tick_list = list(
661658
tick = reactive(input$tick),
662659
cruzMapTickLonBool = cruzMapTickLonBool,

R/mod_map_range.R

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,7 @@ mod_map_range_server <- function(id, app_state, brush = NULL) {
373373

374374
### Return values
375375
list(
376+
# input = input,
376377
map_range = cruzMapRange
377378
)
378379
})

0 commit comments

Comments
 (0)