← Back to branch summary

~ubuntu-branches/ubuntu/quantal/cairo-dock-plug-ins/quantal-201208191523

« back to all changes in this revision

Viewing changes to System-Monitor/src/applet-monitor.c

  • Committer: Bazaar Package Importer
  • Author(s): Matthieu Baerts (matttbe)
  • Date: 2011-04-20 20:46:51 UTC
  • mfrom: (1.1.9 upstream)
  • Revision ID: james.westby@ubuntu.com-20110420204651-ftnpzesj6uc7qeul
Tags: 2.3.0~1-0ubuntu1
https://launchpad.net/bugs/723995
* New Upstream Version (LP: #723995)
* Upstream short ChangeLog (since 2.3.0~0rc1):
 - Updated translations
 - Updated the integration of the new versions of kwin and compiz
    (Switcher, ShowDesktop, etc.)
 - Removed a lot of useless g_print
 - Updated a few plug-ins to fit with the new version of the API (gldit)
 - Fixed a few bugs
 - Updated MeMenu, MessagingMenu and Status-Notifier to works
    with the latest version of dbusmenu, etc.
* Switch to dpkg-source 3.0 (quilt) format
* debian/cairo-dock-plug-ins.install:
 - Added new files (interfaces for python, ruby, vala and mono)
* debian/control:
 - Added new dependences for new applets (sensors and zeitgeist)
    and new interfaces (python, valac, ruby and mono)
 - Updated the version of cairo-dock build-dependences
* debian/rules:
 - Added a new CMake flag to install python interface in debian/tmp
* Updated debian/watch

Show diffs side-by-side

added added

removed removed

Lines of Context:
System-Monitor/src/applet-monitor.c
30
30
#include "applet-cpusage.h"
31
31
#include "applet-rame.h"
32
32
#include "applet-nvidia.h"
 
33
#ifdef HAVE_SENSORS
 
34
#include "applet-sensors.h"
 
35
#endif
33
36
#include "applet-monitor.h"
34
37
 
35
38
 
47
50
        }
48
51
        if (myConfig.bShowNvidia)
49
52
        {
50
 
                if ((myData.iTimerCount % 3) == 0)  // la temperature ne varie pas tres vite et le script nvidia-settings est lours, on decide donc de ne mettre a jour qu'une fois sur 3.
 
53
                if ((myData.iTimerCount % 3) == 0)  // la temperature ne varie pas tres vite et le script nvidia-settings est lourd, on decide donc de ne mettre a jour qu'une fois sur 3.
51
54
                        cd_sysmonitor_get_nvidia_data (myApplet);
52
55
        }
 
56
#ifdef HAVE_SENSORS
 
57
        if (myConfig.bShowCpuTemp || myConfig.bShowFanSpeed)
 
58
        {
 
59
                cd_sysmonitor_get_sensors_data (myApplet);
 
60
        }
 
61
#endif
53
62
        
54
63
        if (! myData.bInitialized)
55
64
        {
56
 
                cd_sysmonitor_get_cpu_info (myApplet);
57
65
                myData.bInitialized = TRUE;
58
66
        }
59
67
        myData.iTimerCount ++;
119
127
                                                myData.iGPUTemp,
120
128
                                                (bOneLine ? " - " : "\n"));
121
129
                                }
 
130
                                if (myConfig.bShowCpuTemp)
 
131
                                {
 
132
                                        g_string_append_printf (sInfo, "%s%d°C%s",
 
133
                                                (myDesklet ? "CPU:" : ""),
 
134
                                                myData.iCPUTemp,
 
135
                                                (bOneLine ? " - " : "\n"));
 
136
                                }
 
137
                                if (myConfig.bShowFanSpeed)
 
138
                                {
 
139
                                        g_string_append_printf (sInfo, "%s%drpm%s",
 
140
                                                (myDesklet ? "FAN:" : ""),
 
141
                                                myData.iFanSpeed,
 
142
                                                (bOneLine ? " - " : "\n"));
 
143
                                }
122
144
                                sInfo->str[sInfo->len-(bOneLine?3:1)] = '\0';
123
145
                                if (bOneLine)
124
146
                                        CD_APPLET_SET_NAME_FOR_MY_ICON (sInfo->str);
151
173
                                        if (!myData.bAlerted && myData.iGPUTemp >= myConfig.iAlertLimit)
152
174
                                                cd_nvidia_alert (myApplet);
153
175
                                }
 
176
#ifdef HAVE_SENSORS
 
177
                                if (myConfig.bShowCpuTemp)
 
178
                                {
 
179
                                        s_fValues[i++] = myData.fCpuTempPercent / 100.;
 
180
                                        if (myData.bCPUAlerted && !myData.bCpuTempAlarm)
 
181
                                                myData.bCPUAlerted = FALSE; //On reinitialise l'alerte quand la temperature descend en dessous de la limite.
 
182
                                        
 
183
                                        if (!myData.bCPUAlerted && myData.bCpuTempAlarm)
 
184
                                                cd_cpu_alert (myApplet);
 
185
                                }
 
186
                                if (myConfig.bShowFanSpeed)
 
187
                                {
 
188
                                        s_fValues[i++] = myData.fFanSpeedPercent / 100.;
 
189
                                        if (myData.bFanAlerted && !myData.bFanAlarm)
 
190
                                                myData.bFanAlerted = FALSE; //On reinitialise l'alerte quand la temperature descend en dessous de la limite.
 
191
                                        
 
192
                                        if (!myData.bFanAlerted && myData.bFanAlarm)
 
193
                                                cd_fan_alert (myApplet);
 
194
                                }
 
195
#endif
154
196
                                CD_APPLET_RENDER_NEW_DATA_ON_MY_ICON (s_fValues);
155
197
                        }
156
198
                }
197
239
                if (i == iNumValue)
198
240
                {
199
241
                        double fTemp = myConfig.iLowerLimit + fValue * (myConfig.iUpperLimit - myConfig.iLowerLimit);
200
 
                        snprintf (cFormatBuffer, iBufferLength, fTemp < 100. ? " %.0f�" : "%.0f�", fTemp);
201
 
                        return ;
202
 
                }
203
 
        }
204
 
        snprintf (cFormatBuffer, iBufferLength, fValue < .0995 ? "%.1f" : (fValue < 1 ? " %.0f" : "%.0f"), fValue * 100.);
 
242
                        snprintf (cFormatBuffer, iBufferLength, fTemp < 100. ? " %.0f°" : "%.0f°", fTemp);
 
243
                        return ;
 
244
                }
 
245
        }
 
246
        if (myConfig.bShowCpuTemp)
 
247
        {
 
248
                i ++;
 
249
                if (i == iNumValue)
 
250
                {
 
251
                        double fTemp = 0 + fValue * (100 - 0);
 
252
                        snprintf (cFormatBuffer, iBufferLength, fTemp < 100. ? " %.0f°" : "%.0f°", fTemp);
 
253
                        return ;
 
254
                }
 
255
        }
 
256
        if (myConfig.bShowFanSpeed)
 
257
        {
 
258
                i ++;
 
259
                if (i == iNumValue)
 
260
                {
 
261
                        double fSpeed = fValue * myData.fMaxFanSpeed;
 
262
                        snprintf (cFormatBuffer, iBufferLength, fSpeed < 100. ? " %.0f" : "%.0f", fSpeed);  // 'rpm' est trop long a ecrire.
 
263
                        return ;
 
264
                }
 
265
        }
 
266
        snprintf (cFormatBuffer, iBufferLength, fValue < .0995 ? "%.1f" : (fValue < 1 ? " %.0f" : "%.0f"), fValue * 100.);  // on ne devrait jamais pouvoir arriver la.
205
267
}