cleanup

Author: finger563

components/gui/include/graph_window.hpp

@@ -18,6 +18,14 @@ class GraphWindow : public Window {
   void add_data(const std::string &plot_name, int new_data);
   void remove_plot(const std::string &plot_name);
 
+  lv_obj_t *get_lv_obj(void) { return wrapper_; }
+
+  void invalidate() {
+    if (wrapper_) {
+      lv_obj_invalidate(wrapper_);
+    }
+  }
+
 protected:
   lv_chart_series_t *create_plot(const std::string &plotName);
   lv_chart_series_t *get_plot(const std::string &plotName);

components/gui/include/text_window.hpp

@@ -14,6 +14,14 @@ class TextWindow : public Window {
   void clear_logs(void);
   void add_log(const std::string &log_text);
 
+  lv_obj_t *get_lv_obj(void) { return log_container_; }
+
+  void invalidate() {
+    if (log_container_) {
+      lv_obj_invalidate(log_container_);
+    }
+  }
+
 private:
   std::string log_text_{""};
   lv_obj_t *log_container_{nullptr};

components/gui/src/graph_window.cpp

@@ -118,6 +118,8 @@ void GraphWindow::clear_plots(void) {
   while (lv_spangroup_get_child(legend_, 0)) {
     lv_spangroup_delete_span(legend_, lv_spangroup_get_child(legend_, 0));
   }
+  // invalidate
+  invalidate();
 }
 
 void GraphWindow::add_data(const std::string &plotName, int newData) {

components/gui/src/gui.cpp

@@ -60,22 +60,16 @@ std::string Gui::pop_data() {
 void Gui::clear_info() {
   std::lock_guard<std::recursive_mutex> lk{mutex_};
   info_window_.clear_logs();
-  // refresh the display
-  lv_obj_invalidate(tabview_);
 }
 
 void Gui::clear_plots() {
   std::lock_guard<std::recursive_mutex> lk{mutex_};
   plot_window_.clear_plots();
-  // refresh the display
-  lv_obj_invalidate(tabview_);
 }
 
 void Gui::clear_logs() {
   std::lock_guard<std::recursive_mutex> lk{mutex_};
   log_window_.clear_logs();
-  // refresh the display
-  lv_obj_invalidate(tabview_);
 }
 
 void Gui::add_info(const std::string &info) {

components/gui/src/text_window.cpp

@@ -14,10 +14,12 @@ void TextWindow::init(lv_obj_t *parent, size_t width, size_t height) {
 }
 
 void TextWindow::clear_logs(void) {
-  // clear all the logs off the page
-  lv_obj_clean(log_container_);
+  // set the string to the display
+  lv_label_set_text(log_container_, "");
   // now empty the string
   log_text_.clear();
+  // invalidate
+  invalidate();
 }
 
 void TextWindow::add_log(const std::string &log_text) {