Merge pull request #44 from Kitware/ui-improvements

Ui improvements
Kitware · Nov 1, 2017 · f0a76b3 · f0a76b3
2 parents 3b35a9b + d02bede
commit f0a76b3
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 20 deletions.
diff --git a/dist/Visualizer.js b/dist/Visualizer.js
diff --git a/package.json b/package.json
@@ -27,7 +27,7 @@
     "reselect": "2.5.3",
     "kw-web-suite": "2.2.1",
     "kw-doc": "1.0.15",
-    "paraviewweb": "2.5.10",
+    "paraviewweb": "2.5.13",
     "vtk.js": "5.3.0",
     "wslink": "0.1.3"
   },

diff --git a/src/panels/ControlPanel/PipelineBrowser/index.js b/src/panels/ControlPanel/PipelineBrowser/index.js
@@ -33,6 +33,7 @@ export const PipelineBrowser = React.createClass({
     lutRange: React.PropTypes.object,
     playing: React.PropTypes.bool,
     opacityPoints: React.PropTypes.array,
+    gaussians: React.PropTypes.array,
 
     // actions:
     deleteProxy: React.PropTypes.func,
@@ -161,6 +162,7 @@ export const PipelineBrowser = React.createClass({
                 opacityEditorSize={[250, 90]}
                 hidePointControl
                 useGaussian
+                gaussians={this.props.gaussians}
               />
             </ProxyEditorWidget>
           </div>)

diff --git a/src/redux/ducks/colors.js b/src/redux/ducks/colors.js
@@ -274,7 +274,7 @@ export function applyOpacityPoints(arrayName, points) {
     const netRequest = externalActions.network.createRequest('Apply piecewise opacity function');
     network.getClient()
       .ColorManager
-      .setOpacityFunctionPoints(arrayName, points)
+      .setOpacityFunctionPoints(arrayName, points, true)
       .then(
         (nothing) => {
           dispatch(externalActions.network.success(netRequest.id));

diff --git a/style/MainView.mcss b/style/MainView.mcss
@@ -199,3 +199,7 @@
   animation-delay: 0.2s;
   fill: #aaaaaa;
 }
+
+input:focus {
+  outline-color: rgb(29, 147, 249);
+}