Mirrors/VILLASweb
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/web/ synced 2025-03-09 00:00:01 +01:00
Code Issues Releases Wiki Activity

Fix lock aspect for image widgets

Browse source
This commit is contained in:
Markus Grigull 2017-07-29 11:50:02 +02:00
parent 33742326f6
commit 70b76c539f
3 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/components/dialog/edit-widget-aspect-control.js
View file

@ -23,12 +23,24 @@ import React from 'react';
import { FormGroup, Checkbox } from 'react-bootstrap';
class EditWidgetAspectControl extends React.Component {
render() {
console.log(this.props.lockAspect);
constructor(props) {
super(props);
this.state = {
widget: {
lockAspect: true
}
};
}
componentWillReceiveProps(nextProps) {
this.setState({ widget: nextProps.widget });
}
render() {
return (
<FormGroup>
<Checkbox id="lockAspect" checked={this.props.lockAspect} onChange={e => this.props.handleChange(e)}>Lock Aspect</Checkbox>
<Checkbox id="lockAspect" checked={this.state.widget.lockAspect} onChange={e => this.props.handleChange(e)}>Lock Aspect</Checkbox>
</FormGroup>
);
}

2
src/components/dialog/edit-widget-control-creator.js
View file

@ -65,7 +65,7 @@ export default function createControls(widgetType = null, widget = null, session
case 'Image': {
dialogControls.push(
<EditImageWidgetControl key={1} sessionToken={sessionToken} widget={widget} files={files} validate={(id) => validateForm(id)} simulation={simulation} handleChange={(e) => handleChange(e)} />,
<EditWidgetAspectControl key={2} lockAspect={widget.lockAspect} handleChange={e => handleChange(e)} />);
<EditWidgetAspectControl key={2} widget={widget} handleChange={e => handleChange(e)} />);
}
break;
case 'Gauge': {

4
src/components/dialog/edit-widget.js
View file

@ -73,13 +73,15 @@ class EditWidgetDialog extends Component {
let changeObject = {};
if (e.target.id === 'simulator') {
changeObject[e.target.id] = JSON.parse(e.target.value);
} else if (e.target.id === 'lockAspect') {
changeObject[e.target.id] = e.target.checked;
} else if (e.target.id === 'file') {
changeObject[e.target.id] = e.target.value;
// get file and update size
let file = this.props.files.find(element => element._id === e.target.value);
// set default size
// set default size
changeObject.width = file.dimensions.width;
changeObject.height = file.dimensions.height;
} else {