[Yuima-commits] r555 - in pkg/yuimaGUI: . R inst/yuimaGUI man

[noreply at r-forge.r-project.org]

Author: phoenix844
Date: 2017-01-10 07:10:05 +0100 (Tue, 10 Jan 2017)
New Revision: 555

Modified:
   pkg/yuimaGUI/DESCRIPTION
   pkg/yuimaGUI/R/sourceCodeYuimaGUI.R
   pkg/yuimaGUI/inst/yuimaGUI/ui.R
   pkg/yuimaGUI/man/yuimaGUI.Rd
Log:
white theme now available

Modified: pkg/yuimaGUI/DESCRIPTION
===================================================================
--- pkg/yuimaGUI/DESCRIPTION	2017-01-08 01:35:24 UTC (rev 554)
+++ pkg/yuimaGUI/DESCRIPTION	2017-01-10 06:10:05 UTC (rev 555)
@@ -1,7 +1,7 @@
 Package: yuimaGUI
 Type: Package
 Title: A Graphical User Interface for the 'yuima' Package
-Version: 0.9.6
+Version: 0.10.0
 Author: YUIMA Project Team
 Maintainer: Emanuele Guidotti <emanuele.guidotti at studenti.unimi.it>
 Description: Provides a graphical user interface for the 'yuima' package.

Modified: pkg/yuimaGUI/R/sourceCodeYuimaGUI.R
===================================================================
--- pkg/yuimaGUI/R/sourceCodeYuimaGUI.R	2017-01-08 01:35:24 UTC (rev 554)
+++ pkg/yuimaGUI/R/sourceCodeYuimaGUI.R	2017-01-10 06:10:05 UTC (rev 555)
@@ -1,16 +1,17 @@
-yuimaGUI <- function(theme = "last") {
+yuimaGUI <- function(theme = NULL) {
 
   print("Please wait while loading...")
   addr <- system.file("yuimaGUI", package = "yuimaGUI")
   
-  if(theme!="last"){
+  if(!is.null(theme)){
     addr_from <- paste(addr, "/www/", theme, ".css", sep = "")
     addr_to <- paste(addr, "/www/custom.css", sep = "")
     if(file.exists(addr_from))
       file.copy(from = addr_from, to = addr_to, overwrite = TRUE)
-    else print("Theme not supported.")
+    else print("Theme not supported. Using default.")
   }
   
+  
   utils::capture.output(
     suppressWarnings(
       shiny::runApp(addr)

Modified: pkg/yuimaGUI/inst/yuimaGUI/ui.R
===================================================================
--- pkg/yuimaGUI/inst/yuimaGUI/ui.R	2017-01-08 01:35:24 UTC (rev 554)
+++ pkg/yuimaGUI/inst/yuimaGUI/ui.R	2017-01-10 06:10:05 UTC (rev 555)
@@ -840,6 +840,7 @@
           div(align="center",
             selectInput("llag_type", label = "Type of analysis", choices = c("Lead-Lag"="llag", "Correlation"="corr"), selected = "llag"),
             numericInput("llag_maxLag", label = "Max Lag", value = 20, min = 1, step = 1),
+            bsTooltip("llag_maxLag", title = "Max Lag is expressed in days if you are using time series, or in the same unit of measure of time if you are using numerical time index", placement = "top"),
             shinyjs::hidden(selectInput("llag_corr_method", label = "Method", choices = c("Pearson"="pearson", "Kendall"="kendall", "Spearman"="spearman", "Hayashi-Yoshida"="HY", "Pre-averaged Hayashi-Yoshida"="PHY", "Modulated Realized Covariance"="MRC", "Two Scales realized CoVariance"="TSCV", "Generalized Multiscale Estimator"="GME", "Realized Kernel"="RK", "Quasi Maximum Likelihood Estimator"="QMLE", "Separating Information Maximum Likelihood"="SIML", "Truncated Hayashi-Yoshida"="THY", "Pre-averaged Truncated Hayashi-Yoshida"="PTHY", "Subsampled Realized Covariance"="SRC", "Subsampled realized BiPower Covariation"="SBPC"), selected = "HY")),
             dateRangeInput("llag_range_date", label = "Range", start = Sys.Date()-365, end = Sys.Date()),
             shinyjs::hidden(div(id="llag_range_numeric",

Modified: pkg/yuimaGUI/man/yuimaGUI.Rd
===================================================================
--- pkg/yuimaGUI/man/yuimaGUI.Rd	2017-01-08 01:35:24 UTC (rev 554)
+++ pkg/yuimaGUI/man/yuimaGUI.Rd	2017-01-10 06:10:05 UTC (rev 555)
@@ -8,11 +8,11 @@
 Runs yuima Graphical User Interface
 }
 \usage{
-yuimaGUI(theme = "last")
+yuimaGUI(theme = NULL)
 }
 
 \arguments{
-  \item{theme}{GUI theme: black or white. By default the last one you used is chosen.}
+  \item{theme}{GUI theme: "black" or "white". By default the last one you used is chosen.}
 }
 
 \value{