[G15daemon-commits] SF.net SVN: g15daemon:[519] trunk/g15daemon-clients/g15stats

[<cza...@us...>]

Revision: 519
          http://g15daemon.svn.sourceforge.net/g15daemon/?rev=519&view=rev
Author:   czarnyckm
Date:     2009-07-16 22:11:49 +0000 (Thu, 16 Jul 2009)

Log Message:
-----------
- Change default mode for Freq and Summary Screen
- Improve Summary Screen for cpus with more then 7 cores

Modified Paths:
--------------
    trunk/g15daemon-clients/g15stats/ChangeLog
    trunk/g15daemon-clients/g15stats/configure.in
    trunk/g15daemon-clients/g15stats/g15stats.c

Modified: trunk/g15daemon-clients/g15stats/ChangeLog
===================================================================
--- trunk/g15daemon-clients/g15stats/ChangeLog	2009-07-14 19:32:16 UTC (rev 518)
+++ trunk/g15daemon-clients/g15stats/ChangeLog	2009-07-16 22:11:49 UTC (rev 519)
@@ -44,13 +44,16 @@
                     (the id should point to sysfs path /sys/class/hwmon/hwmon../device/temp[id]_input)
 - On the Fan / Temp Screen  Current sensor is controlled with the L4 key (on systems with more then one sensor only).
 - Every Screen has his own mode now (except Swap, Memory and Battery Screen)
-SVN 515:
+SVN 515 (1.90):
 - Fixed temperature / fan sensor lost
 - Fixed screen cycle
 SVN 516:
 - Refactored temperature and fan speed - share the logic
 SVN 517:
 - Improve Bat Screen deactivation logic (now is it similar to SVN 515: Fixed temperature / fan sensor lost)
-SVN 518:
+SVN 518 (1.91):
 - Fix Summary, Freq and CPU Screens for some variants of the cpu cores number
 - Improve Summary Screen
+SVN 519
+- Change default mode for Freq and Summary Screen
+- Improve Summary Screen for cpus with more then 7 cores

Modified: trunk/g15daemon-clients/g15stats/configure.in
===================================================================
--- trunk/g15daemon-clients/g15stats/configure.in	2009-07-14 19:32:16 UTC (rev 518)
+++ trunk/g15daemon-clients/g15stats/configure.in	2009-07-16 22:11:49 UTC (rev 519)
@@ -1,7 +1,7 @@
 AC_INIT(g15stats,[1.1], [mla...@us...])
 
 PACKAGE=g15stats
-VERSION=1.91
+VERSION=1.92
 AC_PREFIX_DEFAULT(/usr)
 AC_CONFIG_AUX_DIR(config)
 AM_INIT_AUTOMAKE($PACKAGE, $VERSION)

Modified: trunk/g15daemon-clients/g15stats/g15stats.c
===================================================================
--- trunk/g15daemon-clients/g15stats/g15stats.c	2009-07-14 19:32:16 UTC (rev 518)
+++ trunk/g15daemon-clients/g15stats/g15stats.c	2009-07-16 22:11:49 UTC (rev 519)
@@ -658,7 +658,7 @@
 
     int cur_shift = shift * id;
 
-    if (mode[SCREEN_SUMMARY]){
+    if (summary_rows > 4){
         if (shift > 7) {
             y2=4;
             shift=6;
@@ -789,7 +789,7 @@
 
         sprintf(tmpstr,"CPU %3.f%%",((float)(b_total-b_idle)/(float)b_total)*100);
         print_label(canvas, tmpstr, 0);
-    } else if ((cycle == SCREEN_FREQ) && (!mode[SCREEN_FREQ]) && (have_freq)) {
+    } else if ((cycle == SCREEN_FREQ) && (mode[SCREEN_FREQ]) && (have_freq)) {
         print_vert_label(canvas, "FREQ");
     } else {
         print_vert_label(canvas, "Idle");
@@ -865,28 +865,20 @@
             break;
         case    SCREEN_SUMMARY :
             spacer = 0;
-            if (mode[SCREEN_SUMMARY]) {
+            if (!mode[SCREEN_SUMMARY]) {
                 summary_rows = 5;
                 switch (ncpu) {
                     case 1  :
                     case 2  :
                     case 3  :
                     case 5  :
+                    case 7  :
                         move    = 1;
                         height  = 6;
-                        shift   = 7;
-                        shift2  = (2 * shift);
                         break;
-                    case 4  :
+                    default :
                         height  = 8;
-                        shift   = 9;
-                        shift2  = (2 * shift);
                         break;
-                    default :
-                        height  = 7;
-                        shift   = height;
-                        shift2  = (2 * shift)-1;
-                        break;
                 }
             } else {
                 summary_rows = 4;
@@ -895,14 +887,12 @@
                     case 5  :
                         move    = 1;
                         break;
-                    default :
-                        break;
                 }
                 height  = 8;
-                shift   = 9;
-                shift2  = (2 * shift);
             }
 
+            shift   = height + 1;
+            shift2  = (2 * shift);
             ncpumax = height;
             break;
     }
@@ -945,7 +935,7 @@
 
         switch (cycle) {
             case SCREEN_FREQ:
-                if ((!mode[SCREEN_FREQ]) && (have_freq)) {
+                if ((mode[SCREEN_FREQ]) && (have_freq)) {
                     freq_cur = get_cpu_freq_cur(core);
                     if (core < 6) {
                         result = ((float) (b_total - b_idle) / (float) b_total)*100;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.