Ad5001/LogarithmPlotter
Ad5001/LogarithmPlotter
1
0
Fork 0
Code Issues 6 Pull requests Projects Releases Wiki Activity

Handling dictionaries as property values in history.

Browse source
This commit is contained in:
Adsooi 2022-01-27 23:25:08 +01:00
parent cdac8d3dc2
commit fa4eab1389
Signed by: Ad5001
GPG key ID: EF45F9C6AFE20160
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/historylib.js
View file

@ -134,16 +134,22 @@ class EditedProperty extends Action {
return [this.targetName, this.targetType, this.targetProperty, this.previousValue.toEditableString(), this.newValue.toEditableString(), true] return [this.targetName, this.targetType, this.targetProperty, this.previousValue.toEditableString(), this.newValue.toEditableString(), true]
} else if(this.previousValue instanceof Common.DrawableObject) { } else if(this.previousValue instanceof Common.DrawableObject) {
return [this.targetName, this.targetType, this.targetProperty, this.previousValue.name, this.newValue.name, true] return [this.targetName, this.targetType, this.targetProperty, this.previousValue.name, this.newValue.name, true]
} else { } else {
return [this.targetName, this.targetType, this.targetProperty, this.previousValue, this.newValue, false] return [this.targetName, this.targetType, this.targetProperty, this.previousValue, this.newValue, false]
} }
} }
getReadableString() { getReadableString() {
var prev = this.previousValue == null ? ""+this.previousValue : this.previousValue.toString() var prev = this.previousValue == null ? "null" : this.previousValue.toString()
var next = this.newValue == null ? ""+this.newValue : this.newValue.toString() var next = this.newValue == null ? "null" : this.newValue.toString()
return qsTr('%1 of %2 %3 changed from "%4" to "%5".').arg(this.targetPropertyReadable).arg(Objects.types[this.targetType].displayType()).arg(this.targetName).arg(prev).arg(next) if(prev == "[object Object]") // Oh no!
prev = JSON.stringify(this.previousValue).replace("'", "\\'").replace('"', "'")
if(next == "[object Object]") // Oh no!
next = JSON.stringify(this.previousValue).replace("'", "\\'").replace('"', "'")
return qsTr('%1 of %2 %3 changed from "%4" to "%5".')
.arg(this.targetPropertyReadable)
.arg(Objects.types[this.targetType].displayType())
.arg(this.targetName).arg(prev).arg(next)
} }
} }