History

Fix the linux build and correct the name of the property Intensity to Opacity

Sam Gateau committed 8 years ago

Commit eec4e961 parent 429d54d3 files · +14 −12Browse files

Showing the changes to interface/src/scripting/SelectionScriptingInterface.cpp (1 of 3 files). Show all

Unified · Split

interface/src/scripting/SelectionScriptingInterface.cpp+8−8
@@ -410,19 +410,19 @@ bool SelectionHighlightStyle::fromVariantMap(const QVariantMap& properties) { · 409 unmodified lines
410410 }
411411 }
412412
413− auto intensityVariant = properties["outlineUnoccludedIntensity"];
413+ auto intensityVariant = properties["outlineUnoccludedOpacity"];
414414 if (intensityVariant.isValid()) {
415415 _style._outlineUnoccluded.alpha = intensityVariant.toFloat();
416416 }
417− intensityVariant = properties["outlineOccludedIntensity"];
417+ intensityVariant = properties["outlineOccludedOpacity"];
418418 if (intensityVariant.isValid()) {
419419 _style._outlineOccluded.alpha = intensityVariant.toFloat();
420420 }
421− intensityVariant = properties["fillUnoccludedIntensity"];
421+ intensityVariant = properties["fillUnoccludedOpacity"];
422422 if (intensityVariant.isValid()) {
423423 _style._fillUnoccluded.alpha = intensityVariant.toFloat();
424424 }
425− intensityVariant = properties["fillOccludedIntensity"];
425+ intensityVariant = properties["fillOccludedOpacity"];
426426 if (intensityVariant.isValid()) {
427427 _style._fillOccluded.alpha = intensityVariant.toFloat();
428428 }
@@ -447,10 +447,10 @@ QVariantMap SelectionHighlightStyle::toVariantMap() const { · 18 unmodified lines
447447 properties["fillUnoccludedColor"] = xColorToVariant(xColorFromGlm(_style._fillUnoccluded.color));
448448 properties["fillOccludedColor"] = xColorToVariant(xColorFromGlm(_style._fillOccluded.color));
449449
450− properties["outlineUnoccludedIntensity"] = _style._outlineUnoccluded.alpha;
451− properties["outlineOccludedIntensity"] = _style._outlineOccluded.alpha;
452− properties["fillUnoccludedIntensity"] = _style._fillUnoccluded.alpha;
453− properties["fillOccludedIntensity"] = _style._fillOccluded.alpha;
450+ properties["outlineUnoccludedOpacity"] = _style._outlineUnoccluded.alpha;
451+ properties["outlineOccludedOpacity"] = _style._outlineOccluded.alpha;
452+ properties["fillUnoccludedOpacity"] = _style._fillUnoccluded.alpha;
453+ properties["fillOccludedOpacity"] = _style._fillOccluded.alpha;
454454
455455 properties["outlineWidth"] = _style._outlineWidth;
456456 properties["isOutlineSmooth"] = _style._isOutlineSmooth;