From bb888f2d4ce7cc6d7f271d48fb562851013602cd Mon Sep 17 00:00:00 2001
From: Sam Gateau <samuel.gateau@gmail.com>
Date: Sun, 10 Dec 2017 23:07:06 -0800
Subject: [PATCH] Replace the name opacity for alpha

---
 .../scripting/SelectionScriptingInterface.cpp    | 16 ++++++++--------
 .../src/scripting/SelectionScriptingInterface.h  |  8 ++++----
 .../developer/utilities/render/debugHighlight.js |  8 ++++----
 .../render/highlight/HighlightStyle.qml          |  8 ++++----
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/interface/src/scripting/SelectionScriptingInterface.cpp b/interface/src/scripting/SelectionScriptingInterface.cpp
index a02d2c75f3..f534894145 100644
--- a/interface/src/scripting/SelectionScriptingInterface.cpp
+++ b/interface/src/scripting/SelectionScriptingInterface.cpp
@@ -410,19 +410,19 @@ bool SelectionHighlightStyle::fromVariantMap(const QVariantMap& properties) {
         }
     }
 
-    auto intensityVariant = properties["outlineUnoccludedOpacity"];
+    auto intensityVariant = properties["outlineUnoccludedAlpha"];
     if (intensityVariant.isValid()) {
         _style._outlineUnoccluded.alpha = intensityVariant.toFloat();
     }
-    intensityVariant = properties["outlineOccludedOpacity"];
+    intensityVariant = properties["outlineOccludedAlpha"];
     if (intensityVariant.isValid()) {
         _style._outlineOccluded.alpha = intensityVariant.toFloat();
     }
-    intensityVariant = properties["fillUnoccludedOpacity"];
+    intensityVariant = properties["fillUnoccludedAlpha"];
     if (intensityVariant.isValid()) {
         _style._fillUnoccluded.alpha = intensityVariant.toFloat();
     }
-    intensityVariant = properties["fillOccludedOpacity"];
+    intensityVariant = properties["fillOccludedAlpha"];
     if (intensityVariant.isValid()) {
         _style._fillOccluded.alpha = intensityVariant.toFloat();
     }
@@ -447,10 +447,10 @@ QVariantMap SelectionHighlightStyle::toVariantMap() const {
     properties["fillUnoccludedColor"] = xColorToVariant(xColorFromGlm(_style._fillUnoccluded.color));
     properties["fillOccludedColor"] = xColorToVariant(xColorFromGlm(_style._fillOccluded.color));
 
-    properties["outlineUnoccludedOpacity"] = _style._outlineUnoccluded.alpha;
-    properties["outlineOccludedOpacity"] = _style._outlineOccluded.alpha;
-    properties["fillUnoccludedOpacity"] = _style._fillUnoccluded.alpha;
-    properties["fillOccludedOpacity"] = _style._fillOccluded.alpha;
+    properties["outlineUnoccludedAlpha"] = _style._outlineUnoccluded.alpha;
+    properties["outlineOccludedAlpha"] = _style._outlineOccluded.alpha;
+    properties["fillUnoccludedAlpha"] = _style._fillUnoccluded.alpha;
+    properties["fillOccludedAlpha"] = _style._fillOccluded.alpha;
 
     properties["outlineWidth"] = _style._outlineWidth;
     properties["isOutlineSmooth"] = _style._isOutlineSmooth;
diff --git a/interface/src/scripting/SelectionScriptingInterface.h b/interface/src/scripting/SelectionScriptingInterface.h
index 5c2bf2789f..8295375870 100644
--- a/interface/src/scripting/SelectionScriptingInterface.h
+++ b/interface/src/scripting/SelectionScriptingInterface.h
@@ -185,10 +185,10 @@ public:
     * - fillUnoccludedColor: {xColor} "
     * - fillOccludedColor: {xColor} "
     *
-    * - outlineUnoccludedOpacity: {float} Opacity value ranging from 0.0 (not visible) to 1.0 (fully opaque) for the specified highlight region
-    * - outlineOccludedOpacity: {float} "
-    * - fillUnoccludedOpacity: {float} "
-    * - fillOccludedOpacity: {float} "
+    * - outlineUnoccludedAlpha: {float} Alpha value ranging from 0.0 (not visible) to 1.0 (fully opaque) for the specified highlight region
+    * - outlineOccludedAlpha: {float} "
+    * - fillUnoccludedAlpha: {float} "
+    * - fillOccludedAlpha: {float} "
     *
     * - outlineWidth: {float} width of the outline expressed in pixels
     * - isOutlineSmooth: {bool} true to enable oultine smooth falloff
diff --git a/scripts/developer/utilities/render/debugHighlight.js b/scripts/developer/utilities/render/debugHighlight.js
index 22fa54b9d2..e70565cec2 100644
--- a/scripts/developer/utilities/render/debugHighlight.js
+++ b/scripts/developer/utilities/render/debugHighlight.js
@@ -109,13 +109,13 @@
         isOutlineSmooth: true,
         outlineWidth: 5,
         outlineUnoccludedColor: {red: 255, green: 128, blue: 128}, 
-        outlineUnoccludedIntensity: 0.88,
+        outlineUnoccludedAlpha: 0.88,
         outlineOccludedColor: {red: 255, green: 128, blue: 128},
-        outlineOccludedIntensity:0.5,
+        outlineOccludedAlpha:0.5,
         fillUnoccludedColor: {red: 26, green: 0, blue: 0},
-        fillUnoccludedIntensity: 0.0,
+        fillUnoccludedAlpha: 0.0,
         fillOccludedColor: {red: 26, green: 0, blue: 0},
-        fillOccludedIntensity: 0.0
+        fillOccludedAlpha: 0.0
     }
     Selection.enableListHighlight(HoveringList, hoveringStyle)
     
diff --git a/scripts/developer/utilities/render/highlight/HighlightStyle.qml b/scripts/developer/utilities/render/highlight/HighlightStyle.qml
index 456c9bd7b6..371b7e81f7 100644
--- a/scripts/developer/utilities/render/highlight/HighlightStyle.qml
+++ b/scripts/developer/utilities/render/highlight/HighlightStyle.qml
@@ -64,10 +64,10 @@ Item {
         
         Repeater {
             model: [
-                "Outline Unoccluded:outlineUnoccludedColor:outlineUnoccludedOpacity",
-                "Outline Occluded:outlineOccludedColor:outlineOccludedOpacity",
-                "Fill Unoccluded:fillUnoccludedColor:fillUnoccludedOpacity",
-                "Fill Occluded:fillOccludedColor:fillOccludedOpacity"]
+                "Outline Unoccluded:outlineUnoccludedColor:outlineUnoccludedAlpha",
+                "Outline Occluded:outlineOccludedColor:outlineOccludedAlpha",
+                "Fill Unoccluded:fillUnoccludedColor:fillUnoccludedAlpha",
+                "Fill Occluded:fillOccludedColor:fillOccludedAlpha"]
             Column {
                     anchors.left: parent.left
                     anchors.right: parent.right