jeena/telldus
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Continuing bar updated with dim values

Browse source
This commit is contained in:
Stefan Persson 2011-02-02 09:38:38 +00:00
parent 6c5f8af5ed
commit f9c9e17c39
3 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
telldus-gui/Plugins/SchedulerGUISimple/ActionPoint.qml
View file

@ -61,6 +61,10 @@ Rectangle{
dialog.absoluteHour = parentPointAbsoluteHour; dialog.absoluteHour = parentPointAbsoluteHour;
} }
onDimvalueChanged: {
updateBars();
}
MouseArea { MouseArea {
id: pointRectMouseArea id: pointRectMouseArea
acceptedButtons: Qt.LeftButton | Qt.RightButton acceptedButtons: Qt.LeftButton | Qt.RightButton

9
telldus-gui/Plugins/SchedulerGUISimple/main.qml
View file

@ -296,15 +296,6 @@ import "schedulerscripts.js" as Scripts
state: "continuing" state: "continuing"
} }
Item{
//TODO eller ska detta VARA början-rektanglen?
id: previousDay
states: State{
name: "isFirst"; when: daydate > getPreviousDayDate()
PropertyChanges{ target: dayListView; endsWith: "NÅGOT" }
}
}
ListView.onAdd: SequentialAnimation { ListView.onAdd: SequentialAnimation {
PropertyAction { target: mainRow; property: "height"; value: 0 } PropertyAction { target: mainRow; property: "height"; value: 0 }
NumberAnimation { target: mainRow; property: "height"; to: 50; duration: 250; easing.type: Easing.InOutQuad } NumberAnimation { target: mainRow; property: "height"; to: 50; duration: 250; easing.type: Easing.InOutQuad }

14
telldus-gui/Plugins/SchedulerGUISimple/schedulerscripts.js
View file

@ -218,7 +218,8 @@ function updateEndsWith(){
*/ */
if(deviceRow.hasPoints()){ if(deviceRow.hasPoints()){
print("HAS POINTS .........."); print("Dayindex " + dayIndex + " HAS POINTS ..........");
print("Current day index: " + currentDayIndex);
startIndex = dayIndex; startIndex = dayIndex;
break; break;
} }
@ -239,6 +240,7 @@ function updateEndsWith(){
if(i == days.length-1){ if(i == days.length-1){
//last one, bind the first one too then //last one, bind the first one too then
deviceRow = days[startIndex].children[0].children[parseInt(deviceIndex[device])]; deviceRow = days[startIndex].children[0].children[parseInt(deviceIndex[device])];
print("In last one");
assignContinuingBarProperties(deviceRow, previousEndPoint, dayIndex, false); assignContinuingBarProperties(deviceRow, previousEndPoint, dayIndex, false);
} }
} }
@ -253,8 +255,16 @@ function assignContinuingBarProperties(deviceRow, previousEndPoint, dayIndex, fi
deviceRow.continuingBar.prevDayWidth = 0; deviceRow.continuingBar.prevDayWidth = 0;
} }
else{ else{
print("Color: " + previousEndPoint.actionTypeColor);
print("Opacity: " + previousEndPoint.actionTypeOpacity);
deviceRow.continuingBar.prevDayColor = previousEndPoint.actionTypeColor; deviceRow.continuingBar.prevDayColor = previousEndPoint.actionTypeColor;
deviceRow.continuingBar.prevDayOpacity = previousEndPoint.actionTypeOpacity; if(previousEndPoint.state == "dim"){
deviceRow.continuingBar.prevDayOpacity = previousEndPoint.dimvalue/100;
}
else{
deviceRow.continuingBar.prevDayOpacity = previousEndPoint.actionTypeOpacity;
}
} }
if(deviceRow.hasPoints()){ if(deviceRow.hasPoints()){