Merge pull request #377 from iNZightVIT/hotfix/fix-export-window

Hotfix 4.1.4
iNZightVIT · Aug 13, 2021 · 67d2e5b · 67d2e5b
2 parents a18738a + 3d86e72
commit 67d2e5b
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 11 deletions.
diff --git a/.github/install_deps.R b/.github/install_deps.R
@@ -2,10 +2,10 @@
 github_deps <- c(
     "tmelliott/gWidgets2@patch-1",
     "iNZightVIT/gWidgets2RGtk2@inz",
-    "iNZightVIT/iNZightTools@dev",
+    "iNZightVIT/iNZightTools@1.11.4",
     "iNZightVIT/iNZightTS@1.5.4",
     "iNZightVIT/iNZightMR@2.2.5",
-    "iNZightVIT/iNZightPlots@2.12",
+    "iNZightVIT/iNZightPlots@2.13.4",
     "iNZightVIT/iNZightRegression@1.2.8",
     "iNZightVIT/iNZightModules@2.5.3"
 )

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: iNZight
 Type: Package
 Title: A GUI for Data Exploration and Visualisation
-Version: 4.1.3
-Date: 2021-07-16
+Version: 4.1.4
+Date: 2021-08-13
 Authors@R: c(person("Tom", "Elliott", role = c("aut", "cre"),
                     email = "tom.elliott@auckland.ac.nz"),
              person("Dineika", "Chandrananda", role = "ctb"),

diff --git a/NEWS.Md b/NEWS.Md
@@ -1,3 +1,8 @@
+## iNZight 4.1.4
+
+* fix bug introduced by readr 2.0 causing hang when grouping_mark is empty string
+* fix Export Data window
+
 ## iNZight 4.1.3
 
 * show code box when opening Add Inference panel

diff --git a/R/iNZImportWin.R b/R/iNZImportWin.R
@@ -57,11 +57,10 @@ iNZImportWin <- setRefClass(
                 decimalmarks = list("Period (.)" = ".", "Comma (,)" = ","),
                 decMark = ".",
                 bigmarks = list(
-                    "None" = "",
                     "Comma (,)" = ",",
                     "Period (.)" = "."
                 ),
-                bigMark = "",
+                bigMark = ",",
                 encodings = c("UTF-8", "ISO-8859-1"),
                 encoding = "UTF-8",
                 dateformats = c("%Y-%m-%d", "%d/%m/%Y"),
@@ -321,7 +320,7 @@ iNZImportWin <- setRefClass(
         }, # initialize()
         setfile = function(...) {
             svalue(filename) <<- basename(fname)
-            fext <<- tools::file_ext(fname)
+            fext <<- tolower(tools::file_ext(fname))
 
             blockHandlers(filetype)
             match <- which(

diff --git a/R/iNZSaveWin.R b/R/iNZSaveWin.R
@@ -47,8 +47,9 @@ iNZSaveWin <- setRefClass(
             )
 
             ll <- list()
-            ll["All files "] <- list(patterns = "*")
+            ll[["All files"]] <- list(patterns = "*")
             filterList <- c(ll, filterList)
+            print(filterList)
             filebrowse <- gfilebrowse(
                 text = "Specify a file",
                 action = invisible,

diff --git a/man/iNZGUI-class.Rd b/man/iNZGUI-class.Rd
diff --git a/tests/testthat/test_clipboard.R b/tests/testthat/test_clipboard.R
@@ -12,12 +12,12 @@ demo <- "x\ty\tz
 test_that("Data can be loaded from the 'clipboard'", {
     cpy <- iNZClipboard$new(ui, "paste")
     cpy$textIn$set_value(demo)
-    expect_silent(cpy$parseData())
+    cpy$parseData()
     expect_equivalent(
         cpy$dataOut$get_items(),
         iNZightTools::read_text(demo, "\t")
     )
-    expect_silent(cpy$okBtn$invoke_change_handler())
+    cpy$okBtn$invoke_change_handler()
     expect_equivalent(
         ui$getActiveData(),
         iNZightTools::read_text(demo, "\t")

diff --git a/tests/testthat/test_data_loads.R b/tests/testthat/test_data_loads.R
@@ -1,5 +1,6 @@
 context("Data is loaded into the UI")
 
+# setwd('tests/testthat'); devtools::load_all()
 wd <- getwd()
 ui <- iNZGUI$new()
 ui$initializeGui()