Skip to content

Commit 3c8eac4

Browse files
jackparmerjackparmer
authored
Merge pull request #156 from Karan-S-Mittal/bug-fix
Resolved Issues #89, #127, #126 and added options to add multiple colors as in issue #111
2 parents ea30af0 + 7e94b21 commit 3c8eac4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+25764
-3312
lines changed

‎.devcontainer/Dockerfile‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎.devcontainer/devcontainer.json‎

Lines changed: 0 additions & 47 deletions
This file was deleted.

‎NAMESPACE‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
# AUTO GENERATED FILE - DO NOT EDIT
22

3-
export('daq'BooleanSwitch)
4-
export('daq'ColorPicker)
5-
export('daq'DarkThemeProvider)
6-
export('daq'Gauge)
7-
export('daq'GraduatedBar)
8-
export('daq'Indicator)
9-
export('daq'Joystick)
10-
export('daq'Knob)
11-
export('daq'LEDDisplay)
12-
export('daq'NumericInput)
13-
export('daq'PowerButton)
14-
export('daq'PrecisionInput)
15-
export('daq'Slider)
16-
export('daq'StopButton)
17-
export('daq'Tank)
18-
export('daq'Thermometer)
19-
export('daq'ToggleSwitch)
3+
export(daqBooleanSwitch)
4+
export(daqColorPicker)
5+
export(daqDarkThemeProvider)
6+
export(daqGauge)
7+
export(daqGraduatedBar)
8+
export(daqIndicator)
9+
export(daqJoystick)
10+
export(daqKnob)
11+
export(daqLEDDisplay)
12+
export(daqNumericInput)
13+
export(daqPowerButton)
14+
export(daqPrecisionInput)
15+
export(daqSlider)
16+
export(daqStopButton)
17+
export(daqTank)
18+
export(daqThermometer)
19+
export(daqToggleSwitch)

‎R/daqBooleanSwitch.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# AUTO GENERATED FILE - DO NOT EDIT
22

3-
'daq'BooleanSwitch <- function(id=NULL, className=NULL, color=NULL, disabled=NULL, label=NULL, labelPosition=NULL, on=NULL, persisted_props=NULL, persistence=NULL, persistence_type=NULL, size=NULL, style=NULL, theme=NULL, vertical=NULL) {
3+
daqBooleanSwitch <- function(id=NULL, className=NULL, color=NULL, disabled=NULL, label=NULL, labelPosition=NULL, on=NULL, persisted_props=NULL, persistence=NULL, persistence_type=NULL, size=NULL, style=NULL, theme=NULL, vertical=NULL) {
44

55
props <- list(id=id, className=className, color=color, disabled=disabled, label=label, labelPosition=labelPosition, on=on, persisted_props=persisted_props, persistence=persistence, persistence_type=persistence_type, size=size, style=style, theme=theme, vertical=vertical)
66
if (length(props) > 0) {

‎R/daqColorPicker.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# AUTO GENERATED FILE - DO NOT EDIT
22

3-
'daq'ColorPicker <- function(id=NULL, className=NULL, disabled=NULL, label=NULL, labelPosition=NULL, persisted_props=NULL, persistence=NULL, persistence_type=NULL, size=NULL, style=NULL, theme=NULL, value=NULL) {
3+
daqColorPicker <- function(id=NULL, className=NULL, disabled=NULL, label=NULL, labelPosition=NULL, persisted_props=NULL, persistence=NULL, persistence_type=NULL, size=NULL, style=NULL, theme=NULL, value=NULL) {
44

55
props <- list(id=id, className=className, disabled=disabled, label=label, labelPosition=labelPosition, persisted_props=persisted_props, persistence=persistence, persistence_type=persistence_type, size=size, style=style, theme=theme, value=value)
66
if (length(props) > 0) {

‎R/daqDarkThemeProvider.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# AUTO GENERATED FILE - DO NOT EDIT
22

3-
'daq'DarkThemeProvider <- function(children=NULL, theme=NULL) {
3+
daqDarkThemeProvider <- function(children=NULL, theme=NULL) {
44

55
props <- list(children=children, theme=theme)
66
if (length(props) > 0) {

‎R/daqGauge.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# AUTO GENERATED FILE - DO NOT EDIT
22

3-
'daq'Gauge <- function(id=NULL, base=NULL, className=NULL, color=NULL, digits=NULL, exceedMessage=NULL, label=NULL, labelPosition=NULL, lagingMessage=NULL, logarithmic=NULL, max=NULL, min=NULL, scale=NULL, showCurrentValue=NULL, size=NULL, style=NULL, textColor=NULL, theme=NULL, units=NULL, value=NULL) {
3+
daqGauge <- function(id=NULL, base=NULL, className=NULL, color=NULL, digits=NULL, exceedMessage=NULL, label=NULL, labelPosition=NULL, lagingMessage=NULL, logarithmic=NULL, max=NULL, min=NULL, scale=NULL, showCurrentValue=NULL, size=NULL, style=NULL, textColor=NULL, theme=NULL, units=NULL, value=NULL) {
44

55
props <- list(id=id, base=base, className=className, color=color, digits=digits, exceedMessage=exceedMessage, label=label, labelPosition=labelPosition, lagingMessage=lagingMessage, logarithmic=logarithmic, max=max, min=min, scale=scale, showCurrentValue=showCurrentValue, size=size, style=style, textColor=textColor, theme=theme, units=units, value=value)
66
if (length(props) > 0) {

‎R/daqGraduatedBar.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# AUTO GENERATED FILE - DO NOT EDIT
22

3-
'daq'GraduatedBar <- function(id=NULL, className=NULL, color=NULL, label=NULL, labelPosition=NULL, max=NULL, min=NULL, showCurrentValue=NULL, size=NULL, step=NULL, style=NULL, theme=NULL, value=NULL, vertical=NULL) {
3+
daqGraduatedBar <- function(id=NULL, className=NULL, color=NULL, label=NULL, labelPosition=NULL, max=NULL, min=NULL, showCurrentValue=NULL, size=NULL, step=NULL, style=NULL, theme=NULL, value=NULL, vertical=NULL) {
44

55
props <- list(id=id, className=className, color=color, label=label, labelPosition=labelPosition, max=max, min=min, showCurrentValue=showCurrentValue, size=size, step=step, style=style, theme=theme, value=value, vertical=vertical)
66
if (length(props) > 0) {

‎R/daqIndicator.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# AUTO GENERATED FILE - DO NOT EDIT
22

3-
'daq'Indicator <- function(id=NULL, className=NULL, color=NULL, height=NULL, label=NULL, labelPosition=NULL, size=NULL, style=NULL, theme=NULL, value=NULL, width=NULL) {
3+
daqIndicator <- function(id=NULL, className=NULL, color=NULL, height=NULL, label=NULL, labelPosition=NULL, size=NULL, style=NULL, theme=NULL, value=NULL, width=NULL) {
44

55
props <- list(id=id, className=className, color=color, height=height, label=label, labelPosition=labelPosition, size=size, style=style, theme=theme, value=value, width=width)
66
if (length(props) > 0) {

‎R/daqJoystick.R‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
# AUTO GENERATED FILE - DO NOT EDIT
22

3-
'daq'Joystick <- function(id=NULL, angle=NULL, className=NULL, disabled=NULL, force=NULL, label=NULL, labelPosition=NULL, size=NULL, style=NULL, theme=NULL) {
3+
daqJoystick <- function(id=NULL, angle=NULL, className=NULL, force=NULL, label=NULL, labelPosition=NULL, size=NULL, style=NULL, theme=NULL) {
44

5-
props <- list(id=id, angle=angle, className=className, disabled=disabled, force=force, label=label, labelPosition=labelPosition, size=size, style=style, theme=theme)
5+
props <- list(id=id, angle=angle, className=className, force=force, label=label, labelPosition=labelPosition, size=size, style=style, theme=theme)
66
if (length(props) > 0) {
77
props <- props[!vapply(props, is.null, logical(1))]
88
}
99
component <- list(
1010
props = props,
1111
type = 'Joystick',
1212
namespace = 'dash_daq',
13-
propNames = c('id', 'angle', 'className', 'disabled', 'force', 'label', 'labelPosition', 'size', 'style', 'theme'),
13+
propNames = c('id', 'angle', 'className', 'force', 'label', 'labelPosition', 'size', 'style', 'theme'),
1414
package = 'dashDaq'
1515
)
1616

0 commit comments

Comments
 (0)