Skip to content
This repository was archived by the owner on Feb 10, 2025. It is now read-only.

Add objects #41

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 10 additions & 4 deletions dash_canvas/DashCanvas.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,20 @@ class DashCanvas(Component):
annotations. Use utils.parse_json.parse_jsonstring to parse
this string.
- hide_buttons (list of strings; optional): Names of buttons to hide. Names are "zoom", "pan", "line", "pencil",
"rectangle", "undo", "select"."""
"rectangle", "undo", "select".
- json_objects (string; default ''): Like json_data,add objects like paths or images
Use utils.parse_json.parse_jsonstring to parse
this string.
- add_only (boolean; default False): Like json_data,add objects like paths or images
Use utils.parse_json.parse_jsonstring to parse
this string."""
@_explicitize_args
def __init__(self, id=Component.UNDEFINED, image_content=Component.UNDEFINED, zoom=Component.UNDEFINED, width=Component.UNDEFINED, height=Component.UNDEFINED, scale=Component.UNDEFINED, tool=Component.UNDEFINED, lineWidth=Component.UNDEFINED, lineColor=Component.UNDEFINED, goButtonTitle=Component.UNDEFINED, filename=Component.UNDEFINED, trigger=Component.UNDEFINED, json_data=Component.UNDEFINED, hide_buttons=Component.UNDEFINED, **kwargs):
self._prop_names = ['id', 'image_content', 'zoom', 'width', 'height', 'scale', 'tool', 'lineWidth', 'lineColor', 'goButtonTitle', 'filename', 'trigger', 'json_data', 'hide_buttons']
def __init__(self, id=Component.UNDEFINED, image_content=Component.UNDEFINED, zoom=Component.UNDEFINED, width=Component.UNDEFINED, height=Component.UNDEFINED, scale=Component.UNDEFINED, tool=Component.UNDEFINED, lineWidth=Component.UNDEFINED, lineColor=Component.UNDEFINED, goButtonTitle=Component.UNDEFINED, filename=Component.UNDEFINED, trigger=Component.UNDEFINED, json_data=Component.UNDEFINED, hide_buttons=Component.UNDEFINED, json_objects=Component.UNDEFINED, add_only=Component.UNDEFINED, **kwargs):
self._prop_names = ['id', 'image_content', 'zoom', 'width', 'height', 'scale', 'tool', 'lineWidth', 'lineColor', 'goButtonTitle', 'filename', 'trigger', 'json_data', 'hide_buttons', 'json_objects', 'add_only']
self._type = 'DashCanvas'
self._namespace = 'dash_canvas'
self._valid_wildcard_attributes = []
self.available_properties = ['id', 'image_content', 'zoom', 'width', 'height', 'scale', 'tool', 'lineWidth', 'lineColor', 'goButtonTitle', 'filename', 'trigger', 'json_data', 'hide_buttons']
self.available_properties = ['id', 'image_content', 'zoom', 'width', 'height', 'scale', 'tool', 'lineWidth', 'lineColor', 'goButtonTitle', 'filename', 'trigger', 'json_data', 'hide_buttons', 'json_objects', 'add_only']
self.available_wildcard_properties = []

_explicit_args = kwargs.pop('_explicit_args')
Expand Down
2 changes: 1 addition & 1 deletion dash_canvas/async~canvas.dev.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dash_canvas/async~canvas.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dash_canvas/dash_canvas.dev.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dash_canvas/dash_canvas.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 22 additions & 0 deletions dash_canvas/metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,28 @@
"computed": false
}
},
"json_objects": {
"type": {
"name": "string"
},
"required": false,
"description": "Like json_data,add objects like paths or images\nUse utils.parse_json.parse_jsonstring to parse\nthis string.",
"defaultValue": {
"value": "''",
"computed": false
}
},
"add_only": {
"type": {
"name": "bool"
},
"required": false,
"description": "Like json_data,add objects like paths or images\nUse utils.parse_json.parse_jsonstring to parse\nthis string.",
"defaultValue": {
"value": "false",
"computed": false
}
},
"setProps": {
"type": {
"name": "func"
Expand Down
21 changes: 19 additions & 2 deletions src/lib/components/DashCanvas.react.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ DashCanvas.defaultProps = {
json_data: '', image_content: '', trigger: 0,
width: 500, height: 500, scale: 1, lineWidth: 10,
lineColor: 'red', tool: "pencil", zoom: 1,
goButtonTitle: 'Save', hide_buttons: []
goButtonTitle: 'Save', hide_buttons: [],json_objects: '',
add_only:false
};

DashCanvas.propTypes = {
Expand Down Expand Up @@ -108,11 +109,27 @@ DashCanvas.propTypes = {
*/
hide_buttons: PropTypes.arrayOf(PropTypes.string),

/**
* Like json_data,add objects like paths or images
* Use utils.parse_json.parse_jsonstring to parse
* this string.
*/
json_objects: PropTypes.string,

/**
* Like json_data,add objects like paths or images
* Use utils.parse_json.parse_jsonstring to parse
* this string.
*/
add_only: PropTypes.bool,

/**
* Dash-assigned callback that should be called whenever any of the
* properties change
*/
setProps: PropTypes.func
setProps: PropTypes.func,


};

export const propTypes = DashCanvas.propTypes;
Expand Down
15 changes: 14 additions & 1 deletion src/lib/fragments/DashCanvas.react.js
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,20 @@ export default class DashCanvas extends Component {

sketch._fc.setZoom(this.props.zoom);
};

if ((this.props.json_objects !== prevProps.json_objects)) {
if (this.props.add_only){
this._sketch.fromJSON(
{
'objects':sketch.toJSON().objects.concat(JSON.parse(this.props.json_objects))
});
} else {
this._sketch.fromJSON(
this.props.json_objects);
};
};


};


Expand All @@ -128,7 +142,6 @@ export default class DashCanvas extends Component {
};
_redo() {
this._sketch.redo();
console.log(this._sketch);
this.setState({
canUndo: this._sketch.canUndo(),
canRedo: this._sketch.canRedo()
Expand Down