some fixes
This commit is contained in:
parent
af2e2fcda8
commit
5a32fe57de
@ -158,7 +158,7 @@ void JsonRpcClient::sendRequest(const QVariantMap &request)
|
|||||||
{
|
{
|
||||||
QVariantMap newRequest = request;
|
QVariantMap newRequest = request;
|
||||||
newRequest.insert("token", m_token);
|
newRequest.insert("token", m_token);
|
||||||
qDebug() << "Sending request" << QJsonDocument::fromVariant(newRequest).toJson();
|
// qDebug() << "Sending request" << QJsonDocument::fromVariant(newRequest).toJson();
|
||||||
m_connection->sendData(QJsonDocument::fromVariant(newRequest).toJson());
|
m_connection->sendData(QJsonDocument::fromVariant(newRequest).toJson());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -123,7 +123,7 @@ void ValueLogsProxyModel::logsReply(const QVariantMap &data)
|
|||||||
if (m_maximumValue.isNull() || entry->value() > m_maximumValue) {
|
if (m_maximumValue.isNull() || entry->value() > m_maximumValue) {
|
||||||
m_maximumValue = qRound(entry->value().toDouble());
|
m_maximumValue = qRound(entry->value().toDouble());
|
||||||
}
|
}
|
||||||
qDebug() << "filling slot" << i << "average:" << avg << entry->timestamp().toString() << "min:" << m_minimumValue << "max:" << m_maximumValue;
|
// qDebug() << "filling slot" << i << "average:" << avg << entry->timestamp().toString() << "min:" << m_minimumValue << "max:" << m_maximumValue;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -44,7 +44,6 @@ Item {
|
|||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
print("upper", upper, "lower", lower)
|
|
||||||
while ((upper - lower) % 10 != 0) {
|
while ((upper - lower) % 10 != 0) {
|
||||||
lower -= 1;
|
lower -= 1;
|
||||||
if ((upper - lower) % 10 != 0) {
|
if ((upper - lower) % 10 != 0) {
|
||||||
@ -91,10 +90,6 @@ Item {
|
|||||||
property real pps: contentHeight / sections;
|
property real pps: contentHeight / sections;
|
||||||
|
|
||||||
onPaint: {
|
onPaint: {
|
||||||
|
|
||||||
print("painting canvas", totalSections, sections)
|
|
||||||
var minTemp
|
|
||||||
|
|
||||||
var ctx = canvas.getContext('2d');
|
var ctx = canvas.getContext('2d');
|
||||||
ctx.save();
|
ctx.save();
|
||||||
|
|
||||||
|
|||||||
@ -41,13 +41,11 @@ CustomViewBase {
|
|||||||
horizontalAlignment: Text.AlignHCenter
|
horizontalAlignment: Text.AlignHCenter
|
||||||
}
|
}
|
||||||
|
|
||||||
Image {
|
ColorIcon {
|
||||||
id: mainImage
|
id: mainImage
|
||||||
// h : w = ss.h : ss.w
|
Layout.preferredWidth: app.largeFont * 4
|
||||||
Layout.preferredWidth: height * implicitWidth / implicitHeight
|
|
||||||
Layout.preferredHeight: app.largeFont * 4
|
Layout.preferredHeight: app.largeFont * 4
|
||||||
source: weatherConditionState ? "../images/weathericons/weather-" + weatherConditionState.value + ".svg" : ""
|
name: weatherConditionState ? "../images/weathericons/weather-" + weatherConditionState.value + ".svg" : ""
|
||||||
sourceSize.height: height
|
|
||||||
}
|
}
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
|
|||||||
@ -31,7 +31,6 @@ Page {
|
|||||||
function enterPage(index, replace) {
|
function enterPage(index, replace) {
|
||||||
var device = devicesProxy.get(index);
|
var device = devicesProxy.get(index);
|
||||||
var deviceClass = Engine.deviceManager.deviceClasses.getDeviceClass(device.deviceClassId);
|
var deviceClass = Engine.deviceManager.deviceClasses.getDeviceClass(device.deviceClassId);
|
||||||
print("clicked", deviceClass.interfaces)
|
|
||||||
var page;
|
var page;
|
||||||
/* if (deviceClass.interfaces.indexOf("media") >= 0) {
|
/* if (deviceClass.interfaces.indexOf("media") >= 0) {
|
||||||
page = "MediaDevicePage.qml";
|
page = "MediaDevicePage.qml";
|
||||||
|
|||||||
Reference in New Issue
Block a user