[gnome-system-monitor/wip-charts] Remove cpu_graph references



commit 30695f82cc8bc2027864bc0112390222886d2c28
Author: Robert Roth <robert roth off gmail com>
Date:   Sun Nov 8 02:07:50 2020 +0200

    Remove cpu_graph references

 src/application.cpp | 15 ++++++++-------
 src/application.h   |  2 +-
 src/interface.cpp   |  3 ++-
 3 files changed, 11 insertions(+), 9 deletions(-)
---
diff --git a/src/application.cpp b/src/application.cpp
index 41fcf5dd..29954789 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -35,18 +35,18 @@ static void
 cb_draw_stacked_changed (Gio::Settings& settings, Glib::ustring key, GsmApplication* app)
 {
     app->config.draw_stacked = settings.get_boolean(key);
-    app->cpu_graph->clear_background();
-    load_graph_reset(app->cpu_graph);
+    // app->cpu_graph->clear_background();
+    // load_graph_reset(app->cpu_graph);
 }
 
 static void
 cb_draw_smooth_changed (Gio::Settings& settings, Glib::ustring key, GsmApplication* app)
 {
     app->config.draw_smooth = settings.get_boolean(key);
-    app->cpu_graph->clear_background();
+//    app->cpu_graph->clear_background();
     app->mem_graph->clear_background();
     app->net_graph->clear_background();
-    load_graph_reset(app->cpu_graph);
+    //load_graph_reset(app->cpu_graph);
     load_graph_reset(app->mem_graph);
     load_graph_reset(app->net_graph);
 }
@@ -71,8 +71,8 @@ cb_timeouts_changed (Gio::Settings& settings, Glib::ustring key, GsmApplication*
         }
     } else if (key == GSM_SETTING_GRAPH_UPDATE_INTERVAL) {
         app->config.graph_update_interval = settings.get_int (key);
-        load_graph_change_speed(app->cpu_graph,
-                                app->config.graph_update_interval);
+        //load_graph_change_speed(app->cpu_graph,
+        //                        app->config.graph_update_interval);
         load_graph_change_speed(app->mem_graph,
                                 app->config.graph_update_interval);
         load_graph_change_speed(app->net_graph,
@@ -87,7 +87,8 @@ static void
 cb_data_points_changed(Gio::Settings& settings, Glib::ustring key, GsmApplication* app) {
        app->config.graph_data_points = settings.get_int (key);
        unsigned points = app->config.graph_data_points + 2;
-       load_graph_change_num_points(app->cpu_graph, points);
+       // load_graph_change_num_points(app->cpu_graph, points);
+       g_object_set (G_OBJECT (app->cpu_graph), "max_samples", points, "timespan", G_TIME_SPAN_MINUTE, NULL);
        load_graph_change_num_points(app->mem_graph, points);
        load_graph_change_num_points(app->net_graph, points);
 }
diff --git a/src/application.h b/src/application.h
index dbaf8d29..edd9eafc 100644
--- a/src/application.h
+++ b/src/application.h
@@ -213,7 +213,7 @@ public:
     GtkSearchEntry   *search_entry;
     GtkSearchBar     *search_bar;
     ProcConfig        config;
-    LoadGraph        *cpu_graph;
+    GtkWidget        *cpu_graph;
     LoadGraph        *mem_graph;
     LoadGraph        *net_graph;
     gint              cpu_label_fixed_width;
diff --git a/src/interface.cpp b/src/interface.cpp
index d5c7856d..d948429a 100644
--- a/src/interface.cpp
+++ b/src/interface.cpp
@@ -236,7 +236,8 @@ create_sys_view (GsmApplication *app, GtkBuilder * builder)
     g_object_bind_property (cpu_expander, "expanded", cpu_expander, "vexpand", G_BINDING_DEFAULT);
 
     dzl_graph = GTK_WIDGET(g_object_new (DZL_TYPE_CPU_GRAPH, "timespan", G_TIME_SPAN_MINUTE,
-                                                             "max-samples", 60, NULL));
+                                                             "max-samples", app->config.graph_data_points + 
2, NULL));
+    app->cpu_graph = dzl_graph;
     gtk_widget_set_size_request (GTK_WIDGET(dzl_graph), -1, 70);
     gtk_widget_show (dzl_graph);
     gtk_box_pack_start (cpu_graph_box,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]