rename to Hue-QT, menu update optimization

vchlum · Nov 16, 2021 · 4ab05f0 · 4ab05f0
1 parent 5467605
commit 4ab05f0
Show file tree

Hide file tree

Showing 37 changed files with 713 additions and 382 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,9 +1,9 @@
 cmake_minimum_required(VERSION 3.20)
 
 project(
- Hue-Lights-2
+ hue-qt
  VERSION 0.1
- DESCRIPTION "Hue Lights 2"
+ DESCRIPTION "Hue-QT"
  LANGUAGES CXX
 )
 

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# hue-lights-2
+# hue-qt
 
 ## Notice - the work is in progress
 This is work in progress project for controlling Philips Hue Bridge and Philips Hue HDMI Syncbox. The application uses the QT framework and it targets Linux. The possibility to use it on Windows is open. Stay tuned.

diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
@@ -1,17 +1,17 @@
 find_package(Qt6 COMPONENTS Widgets REQUIRED)
 
-qt_add_executable(hue-lights-2
+qt_add_executable(hue-qt
  ${CMAKE_SOURCE_DIR}/resources/resources.qrc
  ${CMAKE_SOURCE_DIR}/src/mainmenu.h
  ${CMAKE_SOURCE_DIR}/src/mainmenu.cpp
  ${CMAKE_SOURCE_DIR}/src/mainmenubridge.h
  ${CMAKE_SOURCE_DIR}/src/mainmenubridge.cpp
  ${CMAKE_SOURCE_DIR}/src/mainmenubridgeutils.h
  ${CMAKE_SOURCE_DIR}/src/mainmenubridgeutils.cpp
- hue-lights-2.cpp)
+ hue-qt.cpp)
 
-target_include_directories(hue-lights-2 PUBLIC ${CMAKE_SOURCE_DIR}/src/)
+target_include_directories(hue-qt PUBLIC ${CMAKE_SOURCE_DIR}/src/)
 
-target_link_libraries(hue-lights-2 PRIVATE Qt6::Widgets)
-target_link_libraries(hue-lights-2 PRIVATE hue)
-target_link_libraries(hue-lights-2 PRIVATE menu)
+target_link_libraries(hue-qt PRIVATE Qt6::Widgets)
+target_link_libraries(hue-qt PRIVATE hue)
+target_link_libraries(hue-qt PRIVATE menu)
diff --git a/apps/hue-lights-2.cpp → apps/hue-qt.cpp b/apps/hue-lights-2.cpp → apps/hue-qt.cpp
@@ -1,4 +1,4 @@
-/* Hue Lights 2 - Application for controlling Philips Hue Bridge and HDMI Syncbox
+/* Hue-QT - Application for controlling Philips Hue Bridge and HDMI Syncbox
  * Copyright (C) 2021 Václav Chlumský
  *
  * This program is free software: you can redistribute it and/or modify

diff --git a/include/hue/huebridge.h b/include/hue/huebridge.h
@@ -1,4 +1,4 @@
-/* Hue Lights 2 - Application for controlling Philips Hue Bridge and HDMI Syncbox
+/* Hue-QT - Application for controlling Philips Hue Bridge and HDMI Syncbox
  * Copyright (C) 2021 Václav Chlumský
  *
  * This program is free software: you can redistribute it and/or modify
@@ -29,8 +29,8 @@ enum HueBridgeRequestTypes {
  req_discovery_bridges,
  req_discovery_bridge,
  req_create_user,
- req_bridge_status,
- req_bridge_config,
+ req_bridge_status_v1,
+ req_bridge_config_v1,
  req_bridge_status_v2
 };
 
@@ -68,9 +68,9 @@ class HueBridge : public HueDevice
  bool updateBridgeInfo(QJsonObject data);
  QJsonObject dumpBridge();
  void createUser();
+ void getStatus1();
+ void getConfig1();
  void getStatus();
- void getConfig();
- void getStatus2();
 
  private:
  QString url_api_v1 = "http://%1/api";
@@ -81,21 +81,22 @@ class HueBridge : public HueDevice
  QString client_key = "";
  bool events_running = false;
  QNetworkAccessManager *event_manager;
+ int event_retries = 0;
 
  void readCreateUser(QString ret);
- void runEvent();
+ void runEventStream();
 
  signals:
- void event(QJsonObject json);
+ void events(QJsonArray &json_array);
  void userCreationFailed();
  void userCreationSucceed();
  void infoUpdated();
  void statusV2(QJsonObject json);
 
  private slots:
  void bridgeRequestFinished(const QVariant type, const QString ret);
- void startEvent();
- void stopEvent();
+ void startEventStream();
+ void stopEventStream();
  void eventRequestFinished(QNetworkReply *reply);
 };
 #endif // HUEBRIDGE_H
diff --git a/include/hue/huebridgelist.h b/include/hue/huebridgelist.h
@@ -1,4 +1,4 @@
-/* Hue Lights 2 - Application for controlling Philips Hue Bridge and HDMI Syncbox
+/* Hue-QT - Application for controlling Philips Hue Bridge and HDMI Syncbox
  * Copyright (C) 2021 Václav Chlumský
  *
  * This program is free software: you can redistribute it and/or modify

diff --git a/include/hue/huedevice.h b/include/hue/huedevice.h
@@ -1,4 +1,4 @@
-/* Hue Lights 2 - Application for controlling Philips Hue Bridge and HDMI Syncbox
+/* Hue-QT - Application for controlling Philips Hue Bridge and HDMI Syncbox
  * Copyright (C) 2021 Václav Chlumský
  *
  * This program is free software: you can redistribute it and/or modify

diff --git a/include/hue/huelist.h b/include/hue/huelist.h
@@ -1,4 +1,4 @@
-/* Hue Lights 2 - Application for controlling Philips Hue Bridge and HDMI Syncbox
+/* Hue-QT - Application for controlling Philips Hue Bridge and HDMI Syncbox
  * Copyright (C) 2021 Václav Chlumský
  *
  * This program is free software: you can redistribute it and/or modify

diff --git a/include/hue/huesyncbox.h b/include/hue/huesyncbox.h
@@ -1,4 +1,4 @@
-/* Hue Lights 2 - Application for controlling Philips Hue Bridge and HDMI Syncbox
+/* Hue-QT - Application for controlling Philips Hue Bridge and HDMI Syncbox
  * Copyright (C) 2021 Václav Chlumský
  *
  * This program is free software: you can redistribute it and/or modify

diff --git a/include/hue/huesyncboxlist.h b/include/hue/huesyncboxlist.h
@@ -1,4 +1,4 @@
-/* Hue Lights 2 - Application for controlling Philips Hue Bridge and HDMI Syncbox
+/* Hue-QT - Application for controlling Philips Hue Bridge and HDMI Syncbox
  * Copyright (C) 2021 Václav Chlumský
  *
  * This program is free software: you can redistribute it and/or modify

diff --git a/include/hue/hueutils.h b/include/hue/hueutils.h
@@ -1,4 +1,4 @@
-/* Hue Lights 2 - Application for controlling Philips Hue Bridge and HDMI Syncbox
+/* Hue-QT - Application for controlling Philips Hue Bridge and HDMI Syncbox
  * Copyright (C) 2021 Václav Chlumský
  *
  * This program is free software: you can redistribute it and/or modify

diff --git a/include/menu/menubutton.h b/include/menu/menubutton.h
@@ -1,4 +1,4 @@
-/* Hue Lights 2 - Application for controlling Philips Hue Bridge and HDMI Syncbox
+/* Hue-QT - Application for controlling Philips Hue Bridge and HDMI Syncbox
  * Copyright (C) 2021 Václav Chlumský
  *
  * This program is free software: you can redistribute it and/or modify
@@ -33,27 +33,43 @@ class MenuButton : public QPushButton
  QString identifier;
  bool has_slider;
  bool has_switch;
- bool all_items = false;
  QLabel *label;
  QLabel *icon;
  MenuSlider *slider;
  MenuSwitch *button_switch;
+ bool combined_state;
 
  public slots:
 
  signals:
  void buttonRemoved(QString s);
+ void goBack();
  public:
- explicit MenuButton(QString item_id, bool use_slider, bool use_switch, QWidget *parent = 0);
+ explicit MenuButton(QString item_id, bool use_slider, int points, bool use_back, bool use_switch, QWidget *parent = 0);
  ~MenuButton() { emit buttonRemoved(id()); }
  QString id();
  void setText(QString text);
  void setIcon(QString icon_name);
  void setColor(QColor color);
  void setSwitch(bool on);
  void setSlider(int value);
- void setAllItems(bool all);
- bool allItems();
+ void setCombined(bool all);
+ bool combined();
+};
+
+class ClickableLabel : public QLabel
+{
+ Q_OBJECT
+
+ public:
+ explicit ClickableLabel(QWidget* parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags());
+ ~ClickableLabel();
+
+ signals:
+ void clicked();
+
+ protected:
+ void mousePressEvent(QMouseEvent* event);
 };
 
 #endif // MENUBUTTON_H
diff --git a/include/menu/menucolorpicker.h b/include/menu/menucolorpicker.h
@@ -63,6 +63,7 @@ class ColorPicker : public QWidget
  Q_OBJECT
  public:
  explicit ColorPicker(QWidget *parent = 0);
+ QSize sizeHint() const override;
 
  signals:
 

diff --git a/include/menu/menuexpendable.h b/include/menu/menuexpendable.h
@@ -1,4 +1,4 @@
-/* Hue Lights 2 - Application for controlling Philips Hue Bridge and HDMI Syncbox
+/* Hue-QT - Application for controlling Philips Hue Bridge and HDMI Syncbox
  * Copyright (C) 2021 Václav Chlumský
  *
  * This program is free software: you can redistribute it and/or modify

diff --git a/include/menu/menuslider.h b/include/menu/menuslider.h
@@ -1,4 +1,4 @@
-/* Hue Lights 2 - Application for controlling Philips Hue Bridge and HDMI Syncbox
+/* Hue-QT - Application for controlling Philips Hue Bridge and HDMI Syncbox
  * Copyright (C) 2021 Václav Chlumský
  *
  * This program is free software: you can redistribute it and/or modify

diff --git a/include/menu/menuswitch.h b/include/menu/menuswitch.h
@@ -1,4 +1,4 @@
-/* Hue Lights 2 - Application for controlling Philips Hue Bridge and HDMI Syncbox
+/* Hue-QT - Application for controlling Philips Hue Bridge and HDMI Syncbox
  * Copyright (C) 2021 Václav Chlumský
  *
  * This program is free software: you can redistribute it and/or modify

diff --git a/resources/images/HueIcons/settingsSoftwareUpdate.svg b/resources/images/HueIcons/settingsSoftwareUpdate.svg
diff --git a/resources/menu_resources.qrc b/resources/menu_resources.qrc
@@ -2,5 +2,7 @@
  <qresource prefix="/">
  <file>images/arrowdown.svg</file>
  <file>images/arrowright.svg</file>
+
+ <file>images/HueIcons/settingsSoftwareUpdate.svg</file>
  </qresource>
 </RCC>
diff --git a/src/huebridge.cpp b/src/huebridge.cpp
@@ -1,4 +1,4 @@
-/* Hue Lights 2 - Application for controlling Philips Hue Bridge and HDMI Syncbox
+/* Hue-QT - Application for controlling Philips Hue Bridge and HDMI Syncbox
  * Copyright (C) 2021 Václav Chlumský
  *
  * This program is free software: you can redistribute it and/or modify
@@ -32,8 +32,8 @@ HueBridge::HueBridge(QString ip, HueDevice *parent): HueDevice(ip, parent)
 
  connect(this, SIGNAL(requestDeviceFinished(const QVariant, const QString)), this, SLOT(bridgeRequestFinished(const QVariant, const QString)));
 
- connect(this, SIGNAL(connected()), this, SLOT(startEvent()));
- connect(this, SIGNAL(disconnected()), this, SLOT(stopEvent()));
+ connect(this, SIGNAL(connected()), this, SLOT(startEventStream()));
+ connect(this, SIGNAL(disconnected()), this, SLOT(stopEventStream()));
 }
 
 void HueBridge::setUserName(QString s)
@@ -105,7 +105,7 @@ QJsonObject HueBridge::dumpBridge()
 
 void HueBridge::createUser()
 {
- QString user = "hue-lights-2#";
+ QString user = "hue-qt#";
  user += QHostInfo::localHostName().left(15);
 
  QJsonObject json;
@@ -120,7 +120,7 @@ void HueBridge::createUser()
  sendRequestPOST(url, (QNetworkRequest::Attribute) req_create_user, bytes);
 }
 
-void HueBridge::runEvent()
+void HueBridge::runEventStream()
 {
  if (!events_running) {
  return;
@@ -130,6 +130,8 @@ void HueBridge::runEvent()
 
  QNetworkRequest request;
  request.setUrl(QUrl(url));
+ request.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::AlwaysNetwork); // Events shouldn't be cached
+
  foreach (const QStringList &header, request_headers) {
  if (header.isEmpty()) {
  break;
@@ -142,38 +144,42 @@ void HueBridge::runEvent()
 }
 
 
-void HueBridge::startEvent()
+void HueBridge::startEventStream()
 {
  events_running = true;
- runEvent();
+ event_retries = 0;
+ runEventStream();
 }
 
-void HueBridge::stopEvent()
+void HueBridge::stopEventStream()
 {
  events_running = false;
 }
 
 void HueBridge::eventRequestFinished(QNetworkReply *reply)
 {
  if (reply->error()) {
- qWarning() << "request reply on event stream error: " + reply->errorString();
-
- runEvent();
- return;
+ if(event_retries < 10) {
+ qWarning() << "request reply on event stream error: " + reply->errorString();
+ event_retries++;
+ runEventStream();
+ return;
+ } else {
+ qCritical() << "Unable to reconnect event stream, max retries reached";
+ return;
+ }
  }
 
  QString ret = reply->readAll();
 
  QJsonArray json_array = QString2QJsonArray(ret);
 
  if (json_array.size() > 0) {
- for (int i = 0; i < json_array.size(); ++i) {
- QJsonObject json = json_array[i].toObject();
- emit event(json);
- }
+ emit events(json_array);
  }
 
- runEvent();
+ event_retries = 0;
+ runEventStream();
 }
 
 void HueBridge::bridgeRequestFinished(const QVariant type, const QString ret)
@@ -187,7 +193,7 @@ void HueBridge::bridgeRequestFinished(const QVariant type, const QString ret)
  break;
  }
 
- case req_bridge_status:
+ case req_bridge_status_v1:
  {
  break;
  }
@@ -200,7 +206,7 @@ void HueBridge::bridgeRequestFinished(const QVariant type, const QString ret)
  break;
  }
 
- case req_bridge_config:
+ case req_bridge_config_v1:
  {
  QString device_config = ret;
  QJsonObject json = QString2QJsonObject(device_config);
@@ -245,19 +251,19 @@ void HueBridge::readCreateUser(QString ret)
  }
 }
 
-void HueBridge::getStatus()
+void HueBridge::getStatus1()
 {
  QString url = url_api_v1_user.arg(ip(), user_name, "");
- sendRequestGET(url, (QNetworkRequest::Attribute) req_bridge_status);
+ sendRequestGET(url, (QNetworkRequest::Attribute) req_bridge_status_v1);
 }
 
-void HueBridge::getConfig()
+void HueBridge::getConfig1()
 {
  QString url = url_api_v1_user.arg(ip(), user_name, "config");
- sendRequestGET(url, (QNetworkRequest::Attribute) req_bridge_config);
+ sendRequestGET(url, (QNetworkRequest::Attribute) req_bridge_config_v1);
 }
 
-void HueBridge::getStatus2()
+void HueBridge::getStatus()
 {
  QString url = url_api_v2.arg(ip());
  sendRequestGET(url, (QNetworkRequest::Attribute) req_bridge_status_v2);

diff --git a/src/huebridgediscovery.cpp b/src/huebridgediscovery.cpp
@@ -1,4 +1,4 @@
-/* Hue Lights 2 - Application for controlling Philips Hue Bridge and HDMI Syncbox
+/* Hue-QT - Application for controlling Philips Hue Bridge and HDMI Syncbox
  * Copyright (C) 2021 Václav Chlumský
  *
  * This program is free software: you can redistribute it and/or modify

diff --git a/src/huebridgelist.cpp b/src/huebridgelist.cpp
@@ -1,4 +1,4 @@
-/* Hue Lights 2 - Application for controlling Philips Hue Bridge and HDMI Syncbox
+/* Hue-QT - Application for controlling Philips Hue Bridge and HDMI Syncbox
  * Copyright (C) 2021 Václav Chlumský
  *
  * This program is free software: you can redistribute it and/or modify