Showing the changes to interface/src/scripting/SelectionScriptingInterface.cpp (1 of 4 files). Show all
Unified · Split
| @@ -410,19 +410,19 @@ bool SelectionHighlightStyle::fromVariantMap(const QVariantMap& properties) { · 409 unmodified lines | |||
| 410 | } | 410 | } |
| 411 | } | 411 | } |
| 412 | 412 | ||
| 413 | auto intensityVariant = properties["outlineUnoccludedOpacity"]; | 413 | auto intensityVariant = properties["outlineUnoccludedAlpha"]; |
| 414 | if (intensityVariant.isValid()) { | 414 | if (intensityVariant.isValid()) { |
| 415 | _style._outlineUnoccluded.alpha = intensityVariant.toFloat(); | 415 | _style._outlineUnoccluded.alpha = intensityVariant.toFloat(); |
| 416 | } | 416 | } |
| 417 | intensityVariant = properties["outlineOccludedOpacity"]; | 417 | intensityVariant = properties["outlineOccludedAlpha"]; |
| 418 | if (intensityVariant.isValid()) { | 418 | if (intensityVariant.isValid()) { |
| 419 | _style._outlineOccluded.alpha = intensityVariant.toFloat(); | 419 | _style._outlineOccluded.alpha = intensityVariant.toFloat(); |
| 420 | } | 420 | } |
| 421 | intensityVariant = properties["fillUnoccludedOpacity"]; | 421 | intensityVariant = properties["fillUnoccludedAlpha"]; |
| 422 | if (intensityVariant.isValid()) { | 422 | if (intensityVariant.isValid()) { |
| 423 | _style._fillUnoccluded.alpha = intensityVariant.toFloat(); | 423 | _style._fillUnoccluded.alpha = intensityVariant.toFloat(); |
| 424 | } | 424 | } |
| 425 | intensityVariant = properties["fillOccludedOpacity"]; | 425 | intensityVariant = properties["fillOccludedAlpha"]; |
| 426 | if (intensityVariant.isValid()) { | 426 | if (intensityVariant.isValid()) { |
| 427 | _style._fillOccluded.alpha = intensityVariant.toFloat(); | 427 | _style._fillOccluded.alpha = intensityVariant.toFloat(); |
| 428 | } | 428 | } |
| @@ -447,10 +447,10 @@ QVariantMap SelectionHighlightStyle::toVariantMap() const { · 18 unmodified lines | |||
| 447 | properties["fillUnoccludedColor"] = xColorToVariant(xColorFromGlm(_style._fillUnoccluded.color)); | 447 | properties["fillUnoccludedColor"] = xColorToVariant(xColorFromGlm(_style._fillUnoccluded.color)); |
| 448 | properties["fillOccludedColor"] = xColorToVariant(xColorFromGlm(_style._fillOccluded.color)); | 448 | properties["fillOccludedColor"] = xColorToVariant(xColorFromGlm(_style._fillOccluded.color)); |
| 449 | 449 | ||
| 450 | properties["outlineUnoccludedOpacity"] = _style._outlineUnoccluded.alpha; | 450 | properties["outlineUnoccludedAlpha"] = _style._outlineUnoccluded.alpha; |
| 451 | properties["outlineOccludedOpacity"] = _style._outlineOccluded.alpha; | 451 | properties["outlineOccludedAlpha"] = _style._outlineOccluded.alpha; |
| 452 | properties["fillUnoccludedOpacity"] = _style._fillUnoccluded.alpha; | 452 | properties["fillUnoccludedAlpha"] = _style._fillUnoccluded.alpha; |
| 453 | properties["fillOccludedOpacity"] = _style._fillOccluded.alpha; | 453 | properties["fillOccludedAlpha"] = _style._fillOccluded.alpha; |
| 454 | 454 | ||
| 455 | properties["outlineWidth"] = _style._outlineWidth; | 455 | properties["outlineWidth"] = _style._outlineWidth; |
| 456 | properties["isOutlineSmooth"] = _style._isOutlineSmooth; | 456 | properties["isOutlineSmooth"] = _style._isOutlineSmooth; |