Skip to content

Gauge/bug fix #148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 27 commits into from
Sep 22, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
f5e2358
added tests
Karan-S-Mittal Aug 28, 2021
3f11c7a
auto-changes
Karan-S-Mittal Aug 28, 2021
0f640bf
build changes
Karan-S-Mittal Aug 28, 2021
5e7054a
changed color prop of gauge
M-Ali-D Aug 29, 2021
16d4d57
conflict resilved
M-Ali-D Aug 29, 2021
2c2ee49
color range (gauge) bug fix
M-Ali-D Aug 29, 2021
716858d
issue 123, 125 resolved only warning has to implement
M-Ali-D Aug 29, 2021
ab8b8d8
demo.py update
M-Ali-D Aug 29, 2021
2cd5cea
updated contributing section, unit-tests, sanitise wrong values and t…
Karan-S-Mittal Aug 29, 2021
2e2cd83
#123 and #125 issues tested and resolved
Karan-S-Mittal Aug 29, 2021
84e890e
scaling issue resolved
M-Ali-D Aug 30, 2021
c672e7f
conflict resolved
M-Ali-D Aug 30, 2021
962f233
issue #124 resolved, tested
Karan-S-Mittal Aug 31, 2021
f4e9005
building with github codespaces
Karan-S-Mittal Sep 1, 2021
2e0bee1
Merge branch 'master' of https://github.com/Karan-S-Mittal/dash-daq i…
M-Ali-D Sep 2, 2021
608fda3
144, 113, 64
M-Ali-D Sep 5, 2021
d002274
issues resolved #113, #144, #64
Karan-S-Mittal Sep 7, 2021
34049af
removing CI contexts
Karan-S-Mittal Sep 7, 2021
f21af29
removing CI contexts
Karan-S-Mittal Sep 7, 2021
d886fde
133 resolved
M-Ali-D Sep 8, 2021
f1c4144
BooleanSwitch resizeable, Gauge color ranges
M-Ali-D Sep 9, 2021
5322b7b
issues resolved #112, #133 and updated circle ci file
Karan-S-Mittal Sep 9, 2021
3c7c0f1
color ranges
M-Ali-D Sep 10, 2021
7eec356
color ranges changed
M-Ali-D Sep 10, 2021
90d4e5d
resolved additional issue with #112
Karan-S-Mittal Sep 11, 2021
a92ab2e
linux build R components
Karan-S-Mittal Sep 13, 2021
c52dd22
Merge branch 'master' into gauge/bug-fix
jackparmer Sep 22, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,8 @@ jobs:
command: |
python -m venv venv
. venv/bin/activate
git clone --depth 1 https://github.com/plotly/dash.git dash-main
cd dash-main && pip install -e .[dev,testing]
cd dash-renderer && npm run build && pip install -e . && cd ../..
npm run build
pip install --upgrade dash[dev,testing]


- run:
name: Run unit tests
Expand All @@ -43,5 +41,4 @@ workflows:
version: 2
build:
jobs:
- build_and_test_node:
context: dash-docker-hub
- build_and_test_node
21 changes: 21 additions & 0 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.192.0/containers/python-3/.devcontainer/base.Dockerfile

# [Choice] Python version: 3, 3.9, 3.8, 3.7, 3.6
ARG VARIANT="3.9"
FROM mcr.microsoft.com/vscode/devcontainers/python:0-${VARIANT}

# [Choice] Node.js version: none, lts/*, 16, 14, 12, 10
ARG NODE_VERSION="none"
RUN if [ "${NODE_VERSION}" != "none" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi

# [Optional] If your pip requirements rarely change, uncomment this section to add them to the image.
# COPY requirements.txt /tmp/pip-tmp/
# RUN pip3 --disable-pip-version-check --no-cache-dir install -r /tmp/pip-tmp/requirements.txt \
# && rm -rf /tmp/pip-tmp

# [Optional] Uncomment this section to install additional OS packages.
# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
# && apt-get -y install --no-install-recommends <your-package-list-here>

# [Optional] Uncomment this line to install global node packages.
# RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g <your-package-here>" 2>&1
47 changes: 47 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
// https://github.com/microsoft/vscode-dev-containers/tree/v0.192.0/containers/python-3
{
"name": "Python 3",
"build": {
"dockerfile": "Dockerfile",
"context": "..",
"args": {
// Update 'VARIANT' to pick a Python version: 3, 3.6, 3.7, 3.8, 3.9
"VARIANT": "3.7",
// Options
"NODE_VERSION": "14"
}
},

// Set *default* container specific settings.json values on container create.
"settings": {
"python.pythonPath": "/usr/local/bin/python",
"python.languageServer": "Pylance",
"python.linting.enabled": true,
"python.linting.pylintEnabled": true,
"python.formatting.autopep8Path": "/usr/local/py-utils/bin/autopep8",
"python.formatting.blackPath": "/usr/local/py-utils/bin/black",
"python.formatting.yapfPath": "/usr/local/py-utils/bin/yapf",
"python.linting.banditPath": "/usr/local/py-utils/bin/bandit",
"python.linting.flake8Path": "/usr/local/py-utils/bin/flake8",
"python.linting.mypyPath": "/usr/local/py-utils/bin/mypy",
"python.linting.pycodestylePath": "/usr/local/py-utils/bin/pycodestyle",
"python.linting.pydocstylePath": "/usr/local/py-utils/bin/pydocstyle",
"python.linting.pylintPath": "/usr/local/py-utils/bin/pylint"
},

// Add the IDs of extensions you want installed when the container is created.
"extensions": [
"ms-python.python",
"ms-python.vscode-pylance"
],

// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [],

// Use 'postCreateCommand' to run commands after the container is created.
// "postCreateCommand": "pip3 install --user -r requirements.txt",

// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
"remoteUser": "vscode"
}
6 changes: 3 additions & 3 deletions R/daqBooleanSwitch.R
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# AUTO GENERATED FILE - DO NOT EDIT

daqBooleanSwitch <- function(id=NULL, on=NULL, color=NULL, vertical=NULL, disabled=NULL, theme=NULL, label=NULL, labelPosition=NULL, className=NULL, style=NULL, persistence=NULL, persisted_props=NULL, persistence_type=NULL) {
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) {

props <- list(id=id, on=on, color=color, vertical=vertical, disabled=disabled, theme=theme, label=label, labelPosition=labelPosition, className=className, style=style, persistence=persistence, persisted_props=persisted_props, persistence_type=persistence_type)
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)
if (length(props) > 0) {
props <- props[!vapply(props, is.null, logical(1))]
}
component <- list(
props = props,
type = 'BooleanSwitch',
namespace = 'dash_daq',
propNames = c('id', 'on', 'color', 'vertical', 'disabled', 'theme', 'label', 'labelPosition', 'className', 'style', 'persistence', 'persisted_props', 'persistence_type'),
propNames = c('id', 'className', 'color', 'disabled', 'label', 'labelPosition', 'on', 'persisted_props', 'persistence', 'persistence_type', 'size', 'style', 'theme', 'vertical'),
package = 'dashDaq'
)

Expand Down
6 changes: 3 additions & 3 deletions R/daqColorPicker.R
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# AUTO GENERATED FILE - DO NOT EDIT

daqColorPicker <- function(id=NULL, value=NULL, disabled=NULL, size=NULL, theme=NULL, label=NULL, labelPosition=NULL, className=NULL, style=NULL, persistence=NULL, persisted_props=NULL, persistence_type=NULL) {
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) {

props <- list(id=id, value=value, disabled=disabled, size=size, theme=theme, label=label, labelPosition=labelPosition, className=className, style=style, persistence=persistence, persisted_props=persisted_props, persistence_type=persistence_type)
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)
if (length(props) > 0) {
props <- props[!vapply(props, is.null, logical(1))]
}
component <- list(
props = props,
type = 'ColorPicker',
namespace = 'dash_daq',
propNames = c('id', 'value', 'disabled', 'size', 'theme', 'label', 'labelPosition', 'className', 'style', 'persistence', 'persisted_props', 'persistence_type'),
propNames = c('id', 'className', 'disabled', 'label', 'labelPosition', 'persisted_props', 'persistence', 'persistence_type', 'size', 'style', 'theme', 'value'),
package = 'dashDaq'
)

Expand Down
6 changes: 3 additions & 3 deletions R/daqGauge.R
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# AUTO GENERATED FILE - DO NOT EDIT

daqGauge <- function(id=NULL, value=NULL, size=NULL, min=NULL, max=NULL, base=NULL, logarithmic=NULL, showCurrentValue=NULL, units=NULL, theme=NULL, label=NULL, labelPosition=NULL, scale=NULL, color=NULL, className=NULL, style=NULL) {
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, theme=NULL, units=NULL, value=NULL) {

props <- list(id=id, value=value, size=size, min=min, max=max, base=base, logarithmic=logarithmic, showCurrentValue=showCurrentValue, units=units, theme=theme, label=label, labelPosition=labelPosition, scale=scale, color=color, className=className, style=style)
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, theme=theme, units=units, value=value)
if (length(props) > 0) {
props <- props[!vapply(props, is.null, logical(1))]
}
component <- list(
props = props,
type = 'Gauge',
namespace = 'dash_daq',
propNames = c('id', 'value', 'size', 'min', 'max', 'base', 'logarithmic', 'showCurrentValue', 'units', 'theme', 'label', 'labelPosition', 'scale', 'color', 'className', 'style'),
propNames = c('id', 'base', 'className', 'color', 'digits', 'exceedMessage', 'label', 'labelPosition', 'lagingMessage', 'logarithmic', 'max', 'min', 'scale', 'showCurrentValue', 'size', 'style', 'theme', 'units', 'value'),
package = 'dashDaq'
)

Expand Down
6 changes: 3 additions & 3 deletions R/daqGraduatedBar.R
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# AUTO GENERATED FILE - DO NOT EDIT

daqGraduatedBar <- function(id=NULL, value=NULL, color=NULL, size=NULL, vertical=NULL, min=NULL, max=NULL, step=NULL, showCurrentValue=NULL, theme=NULL, label=NULL, labelPosition=NULL, className=NULL, style=NULL) {
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) {

props <- list(id=id, value=value, color=color, size=size, vertical=vertical, min=min, max=max, step=step, showCurrentValue=showCurrentValue, theme=theme, label=label, labelPosition=labelPosition, className=className, style=style)
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)
if (length(props) > 0) {
props <- props[!vapply(props, is.null, logical(1))]
}
component <- list(
props = props,
type = 'GraduatedBar',
namespace = 'dash_daq',
propNames = c('id', 'value', 'color', 'size', 'vertical', 'min', 'max', 'step', 'showCurrentValue', 'theme', 'label', 'labelPosition', 'className', 'style'),
propNames = c('id', 'className', 'color', 'label', 'labelPosition', 'max', 'min', 'showCurrentValue', 'size', 'step', 'style', 'theme', 'value', 'vertical'),
package = 'dashDaq'
)

Expand Down
6 changes: 3 additions & 3 deletions R/daqIndicator.R
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# AUTO GENERATED FILE - DO NOT EDIT

daqIndicator <- function(id=NULL, value=NULL, color=NULL, size=NULL, width=NULL, height=NULL, theme=NULL, label=NULL, labelPosition=NULL, className=NULL, style=NULL) {
daqIndicator <- function(id=NULL, className=NULL, color=NULL, height=NULL, label=NULL, labelPosition=NULL, size=NULL, style=NULL, theme=NULL, value=NULL, width=NULL) {

props <- list(id=id, value=value, color=color, size=size, width=width, height=height, theme=theme, label=label, labelPosition=labelPosition, className=className, style=style)
props <- list(id=id, className=className, color=color, height=height, label=label, labelPosition=labelPosition, size=size, style=style, theme=theme, value=value, width=width)
if (length(props) > 0) {
props <- props[!vapply(props, is.null, logical(1))]
}
component <- list(
props = props,
type = 'Indicator',
namespace = 'dash_daq',
propNames = c('id', 'value', 'color', 'size', 'width', 'height', 'theme', 'label', 'labelPosition', 'className', 'style'),
propNames = c('id', 'className', 'color', 'height', 'label', 'labelPosition', 'size', 'style', 'theme', 'value', 'width'),
package = 'dashDaq'
)

Expand Down
6 changes: 3 additions & 3 deletions R/daqJoystick.R
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# AUTO GENERATED FILE - DO NOT EDIT

daqJoystick <- function(id=NULL, disabled=NULL, angle=NULL, force=NULL, size=NULL, theme=NULL, label=NULL, labelPosition=NULL, className=NULL, style=NULL) {
daqJoystick <- function(id=NULL, angle=NULL, className=NULL, disabled=NULL, force=NULL, label=NULL, labelPosition=NULL, size=NULL, style=NULL, theme=NULL) {

props <- list(id=id, disabled=disabled, angle=angle, force=force, size=size, theme=theme, label=label, labelPosition=labelPosition, className=className, style=style)
props <- list(id=id, angle=angle, className=className, disabled=disabled, force=force, label=label, labelPosition=labelPosition, size=size, style=style, theme=theme)
if (length(props) > 0) {
props <- props[!vapply(props, is.null, logical(1))]
}
component <- list(
props = props,
type = 'Joystick',
namespace = 'dash_daq',
propNames = c('id', 'disabled', 'angle', 'force', 'size', 'theme', 'label', 'labelPosition', 'className', 'style'),
propNames = c('id', 'angle', 'className', 'disabled', 'force', 'label', 'labelPosition', 'size', 'style', 'theme'),
package = 'dashDaq'
)

Expand Down
6 changes: 3 additions & 3 deletions R/daqKnob.R
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# AUTO GENERATED FILE - DO NOT EDIT

daqKnob <- function(id=NULL, value=NULL, color=NULL, size=NULL, min=NULL, max=NULL, disabled=NULL, theme=NULL, label=NULL, labelPosition=NULL, scale=NULL, className=NULL, style=NULL, persistence=NULL, persisted_props=NULL, persistence_type=NULL) {
daqKnob <- function(id=NULL, className=NULL, color=NULL, disabled=NULL, label=NULL, labelPosition=NULL, max=NULL, min=NULL, persisted_props=NULL, persistence=NULL, persistence_type=NULL, scale=NULL, size=NULL, style=NULL, theme=NULL, value=NULL) {

props <- list(id=id, value=value, color=color, size=size, min=min, max=max, disabled=disabled, theme=theme, label=label, labelPosition=labelPosition, scale=scale, className=className, style=style, persistence=persistence, persisted_props=persisted_props, persistence_type=persistence_type)
props <- list(id=id, className=className, color=color, disabled=disabled, label=label, labelPosition=labelPosition, max=max, min=min, persisted_props=persisted_props, persistence=persistence, persistence_type=persistence_type, scale=scale, size=size, style=style, theme=theme, value=value)
if (length(props) > 0) {
props <- props[!vapply(props, is.null, logical(1))]
}
component <- list(
props = props,
type = 'Knob',
namespace = 'dash_daq',
propNames = c('id', 'value', 'color', 'size', 'min', 'max', 'disabled', 'theme', 'label', 'labelPosition', 'scale', 'className', 'style', 'persistence', 'persisted_props', 'persistence_type'),
propNames = c('id', 'className', 'color', 'disabled', 'label', 'labelPosition', 'max', 'min', 'persisted_props', 'persistence', 'persistence_type', 'scale', 'size', 'style', 'theme', 'value'),
package = 'dashDaq'
)

Expand Down
6 changes: 3 additions & 3 deletions R/daqLEDDisplay.R
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# AUTO GENERATED FILE - DO NOT EDIT

daqLEDDisplay <- function(id=NULL, value=NULL, color=NULL, backgroundColor=NULL, size=NULL, theme=NULL, label=NULL, labelPosition=NULL, className=NULL, style=NULL) {
daqLEDDisplay <- function(id=NULL, backgroundColor=NULL, className=NULL, color=NULL, label=NULL, labelPosition=NULL, size=NULL, style=NULL, theme=NULL, value=NULL) {

props <- list(id=id, value=value, color=color, backgroundColor=backgroundColor, size=size, theme=theme, label=label, labelPosition=labelPosition, className=className, style=style)
props <- list(id=id, backgroundColor=backgroundColor, className=className, color=color, label=label, labelPosition=labelPosition, size=size, style=style, theme=theme, value=value)
if (length(props) > 0) {
props <- props[!vapply(props, is.null, logical(1))]
}
component <- list(
props = props,
type = 'LEDDisplay',
namespace = 'dash_daq',
propNames = c('id', 'value', 'color', 'backgroundColor', 'size', 'theme', 'label', 'labelPosition', 'className', 'style'),
propNames = c('id', 'backgroundColor', 'className', 'color', 'label', 'labelPosition', 'size', 'style', 'theme', 'value'),
package = 'dashDaq'
)

Expand Down
6 changes: 3 additions & 3 deletions R/daqNumericInput.R
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# AUTO GENERATED FILE - DO NOT EDIT

daqNumericInput <- function(id=NULL, value=NULL, size=NULL, min=NULL, max=NULL, disabled=NULL, theme=NULL, label=NULL, labelPosition=NULL, className=NULL, style=NULL, persistence=NULL, persisted_props=NULL, persistence_type=NULL) {
daqNumericInput <- function(id=NULL, className=NULL, disabled=NULL, label=NULL, labelPosition=NULL, max=NULL, min=NULL, persisted_props=NULL, persistence=NULL, persistence_type=NULL, size=NULL, style=NULL, theme=NULL, value=NULL) {

props <- list(id=id, value=value, size=size, min=min, max=max, disabled=disabled, theme=theme, label=label, labelPosition=labelPosition, className=className, style=style, persistence=persistence, persisted_props=persisted_props, persistence_type=persistence_type)
props <- list(id=id, className=className, disabled=disabled, label=label, labelPosition=labelPosition, max=max, min=min, persisted_props=persisted_props, persistence=persistence, persistence_type=persistence_type, size=size, style=style, theme=theme, value=value)
if (length(props) > 0) {
props <- props[!vapply(props, is.null, logical(1))]
}
component <- list(
props = props,
type = 'NumericInput',
namespace = 'dash_daq',
propNames = c('id', 'value', 'size', 'min', 'max', 'disabled', 'theme', 'label', 'labelPosition', 'className', 'style', 'persistence', 'persisted_props', 'persistence_type'),
propNames = c('id', 'className', 'disabled', 'label', 'labelPosition', 'max', 'min', 'persisted_props', 'persistence', 'persistence_type', 'size', 'style', 'theme', 'value'),
package = 'dashDaq'
)

Expand Down
6 changes: 3 additions & 3 deletions R/daqPowerButton.R
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# AUTO GENERATED FILE - DO NOT EDIT

daqPowerButton <- function(id=NULL, on=NULL, color=NULL, size=NULL, disabled=NULL, theme=NULL, label=NULL, labelPosition=NULL, className=NULL, style=NULL, persistence=NULL, persisted_props=NULL, persistence_type=NULL) {
daqPowerButton <- 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) {

props <- list(id=id, on=on, color=color, size=size, disabled=disabled, theme=theme, label=label, labelPosition=labelPosition, className=className, style=style, persistence=persistence, persisted_props=persisted_props, persistence_type=persistence_type)
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)
if (length(props) > 0) {
props <- props[!vapply(props, is.null, logical(1))]
}
component <- list(
props = props,
type = 'PowerButton',
namespace = 'dash_daq',
propNames = c('id', 'on', 'color', 'size', 'disabled', 'theme', 'label', 'labelPosition', 'className', 'style', 'persistence', 'persisted_props', 'persistence_type'),
propNames = c('id', 'className', 'color', 'disabled', 'label', 'labelPosition', 'on', 'persisted_props', 'persistence', 'persistence_type', 'size', 'style', 'theme'),
package = 'dashDaq'
)

Expand Down
Loading