Skip to content

Commit

Permalink
Merge pull request #1 from TitouanRobert/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
TitouanRobert authored Dec 8, 2017
2 parents f3a973a + ed9eef0 commit cc35f99
Show file tree
Hide file tree
Showing 72 changed files with 3,661 additions and 2,012 deletions.
1 change: 1 addition & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ README_files
^\.travis\.yml$
^codecov\.yml$
newUI
^inst/examples
13 changes: 7 additions & 6 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
Package: manipulateWidget
Type: Package
Title: Add Even More Interactivity to Interactive Charts
Version: 0.7.0
Date: 2017-05-24
Version: 0.8.1
Date: 2017-11-27
Authors@R: c(
person("Francois", "Guillem", email = "[email protected]", role = c("aut", "cre")),
person("RTE", role = "cph"),
person("JJ", "Allaire", role = "ctb"),
person("Marion", "Praz", email="[email protected]", role = "ctb", comment = "New user interface")
person("Marion", "Praz", email="[email protected]", role = "ctb", comment = "New user interface"),
person("Benoit", "Thieurmel", role = "ctb", email = "[email protected]")
)
Description: Like package 'manipulate' does for static graphics, this package
helps to easily add controls like sliders, pickers, checkboxes, etc. that
Expand All @@ -17,16 +18,16 @@ URL: https://github.com/rte-antares-rpackage/manipulateWidget
BugReports: https://goo.gl/pV7o5c
License: GPL (>= 2) | file LICENSE
Imports:
shiny,
shiny (>= 1.0.3),
miniUI,
htmltools,
htmlwidgets,
lazyeval,
knitr,
methods,
tools,
base64enc,
grDevices
grDevices,
codetools
Suggests:
dygraphs,
leaflet,
Expand Down
8 changes: 8 additions & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
@@ -1,27 +1,35 @@
# Generated by roxygen2: do not edit by hand

S3method(summary,MWController)
export(combineWidgets)
export(combineWidgetsOutput)
export(compareOptions)
export(knit_print.MWController)
export(manipulateWidget)
export(mwCheckbox)
export(mwCheckboxGroup)
export(mwDate)
export(mwDateRange)
export(mwGroup)
export(mwModule)
export(mwModuleUI)
export(mwNumeric)
export(mwPassword)
export(mwRadio)
export(mwSelect)
export(mwSharedValue)
export(mwSlider)
export(mwText)
export(renderCombineWidgets)
export(staticImage)
export(staticPlot)
exportClasses(MWController)
importFrom(grDevices,dev.off)
importFrom(grDevices,png)
importFrom(htmlwidgets,getDependency)
importFrom(methods,is)
importFrom(methods,new)
importFrom(methods,setRefClass)
importFrom(miniUI,gadgetTitleBar)
importFrom(miniUI,miniContentPanel)
importFrom(miniUI,miniPage)
Expand Down
22 changes: 22 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,27 @@
<!-- Copyright © 2016 RTE Réseau de transport d’électricité --->

# manipulateWidget 0.8.1 (2017-11-27)

## New features
* `mwModule()` now return `controller` value, with possibility to use new `clear()` method
* add `header`, `footer` and `fluidRow` arguments to `mwModuleUI()`

# manipulateWidget 0.8.0 (2017-10-25)

## New features
* `manipulateWidget()` has a new parameter `.updateBtnInit`. In case of update button `.updateBtn`, you can decideto render graphics on init or not.
* UI has now a button to save the current chart in an HTML file (thanks to Benoit Thieurmel).`manipulateWidget`gains a new parameter ".saveBtn" to show or hide this button.
* `manipulateWidget()` has a new parameter ".runApp". If it is false, then the function returns an object of class `MWController` that can be modified using command line instructions. This is useful to write tests for UIs created with `manipulateWidget()`.
* `manipulateWidget` interfaces can now be included in shiny applications thanks to the two new functions `mwModule()` and `mwModuleUI()`.
* A new virtual input called `mwSharedValue` has been introduced. It can be used to avoid repeating the same computations when inputs and output use a common intermediary value. It can also be used when
`manipulateWidget()` is used in a shiny application to send data from the main application to the module.
* `manipulateWidget()` now only updates the dependant inputs and outputs when user changes the value of an input. This can lead to important performance improvement in complicated applications.

## Bugfixes
* When a UI contained dynamic inputs, output was sometimes updated before inputs, which could lead to some errors.
* Opening the same application in two browsers (or tabs) resulted in strange results.


# manipulateWidget 0.7.0 (2017-06-08)

## Breaking changes
Expand Down
2 changes: 1 addition & 1 deletion R/combineWidgets.R → R/combine_widgets.R
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ preRenderCombinedWidgets <- function(x) {
widgetEL <- mapply(
function(id, size) {
sprintf('<div class="cw-col" style="flex:%s;-webkit-flex:%s">
<div id="%s" class="cw-widget shiny-bound-output" style="width:100%%;height:100%%"></div>
<div id="%s" class="cw-widget" style="width:100%%;height:100%%"></div>
</div>',
size, size, id)
},
Expand Down
File renamed without changes.
Loading

0 comments on commit cc35f99

Please sign in to comment.