Browse Source

wip, params

Alexander Rose 6 years ago
parent
commit
0156c2c9ef
2 changed files with 7 additions and 5 deletions
  1. 5 4
      src/mol-plugin/ui/controls/parameters.tsx
  2. 2 1
      src/mol-util/param-definition.ts

+ 5 - 4
src/mol-plugin/ui/controls/parameters.tsx

@@ -216,7 +216,7 @@ export class GroupControl extends React.PureComponent<GroupWrapperProps> {
 
 type MappedWrapperProps = { name: string, value: PD.Mapped<any>['defaultValue'], param: PD.Mapped<any>, onChange: ParamOnChange, onEnter?: () => void, isEnabled?: boolean }
 export class MappedControl extends React.PureComponent<MappedWrapperProps> {
-    change(value: PD.Mapped<any>['defaultValue'] ) {
+    change(value: PD.Mapped<any>['defaultValue']) {
         this.props.onChange({ name: this.props.name, param: this.props.param, value });
     }
 
@@ -239,9 +239,10 @@ export class MappedControl extends React.PureComponent<MappedWrapperProps> {
                 name={'name'} value={value.name} />
             <div style={{ borderLeft: '5px solid #777', paddingLeft: '5px' }}>
                 {param.type === 'group'
-                ? <GroupControl param={param} value={value} name='param' onChange={this.onChangeParam} onEnter={this.props.onEnter} isEnabled={this.props.isEnabled} />
-                : param.type === 'mapped' || param.type === 'value' ? null
-                : <ParamWrapper control={controlFor(param)} param={param} onChange={this.onChangeParam} onEnter={this.props.onEnter} isEnabled={this.props.isEnabled} name={'value'} value={value} />}
+                    ? <GroupControl param={param} value={value} name='param' onChange={this.onChangeParam} onEnter={this.props.onEnter} isEnabled={this.props.isEnabled} />
+                    : param.type === 'mapped' || param.type === 'value'
+                        ? null
+                        : <ParamWrapper control={controlFor(param)} param={param} onChange={this.onChangeParam} onEnter={this.props.onEnter} isEnabled={this.props.isEnabled} name={'value'} value={value} />}
             </div>
         </div>
     }

+ 2 - 1
src/mol-util/param-definition.ts

@@ -8,6 +8,7 @@
 import { Color as ColorData } from './color';
 import { shallowClone, shallowEqual } from 'mol-util';
 import { Vec2 } from 'mol-math/linear-algebra';
+import { deepClone } from './object';
 
 export namespace ParamDefinition {
     export interface Info {
@@ -142,7 +143,7 @@ export namespace ParamDefinition {
     }
 
     export function clone<P extends Params>(params: P): P {
-        return shallowClone(params)
+        return deepClone(params)
     }
 
     /**