clear counters control working

Author: andrew-bibb

code/control_box/controlbox.cpp

@@ -138,6 +138,9 @@ ControlBox::ControlBox(const QCommandLineParser& parser, QWidget *parent)
 	if (! parser.isSet("disable-counters"))
 		connect(counter, SIGNAL(usageUpdated(QDBusObjectPath, QString, QString)), this, SLOT(counterUpdated(QDBusObjectPath, QString, QString)));
 
+	// restore GUI settings
+	this->readSettings();  
+  
   // setup the dbus interface to connman.manager
 	if (! QDBusConnection::systemBus().isConnected() ) logErrors(CMST::Err_No_DBus);
   else {	
@@ -166,6 +169,10 @@ ControlBox::ControlBox(const QCommandLineParser& parser, QWidget *parent)
 			QDBusConnection::systemBus().connect(DBUS_SERVICE, DBUS_PATH, DBUS_MANAGER, "ServicesChanged", this, SLOT(dbsServicesChanged(QMap<QString, QVariant>, QList<QDBusObjectPath>, QDBusMessage)));
 			QDBusConnection::systemBus().connect(DBUS_SERVICE, DBUS_PATH, DBUS_MANAGER, "TechnologyAdded", this, SLOT(dbsTechnologyAdded(QDBusObjectPath, QVariantMap)));
 			QDBusConnection::systemBus().connect(DBUS_SERVICE, DBUS_PATH, DBUS_MANAGER, "TechnologyRemoved", this, SLOT(dbsTechnologyRemoved(QDBusObjectPath)));
+		
+		// clear the counters if selected
+		this->clearCounters();
+		
 		}	// else have valid connection
 	}	// else have connected systemBus
 
@@ -241,10 +248,7 @@ ControlBox::ControlBox(const QCommandLineParser& parser, QWidget *parent)
 
 	// start the timer
 	wifi_timer->start();
-	
-	// restore GUI settings
-	this->readSettings();
-	
+		
 	// set up and fill in the display widgets
 	this->updateDisplayWidgets();				
 }  
@@ -624,14 +628,8 @@ void ControlBox::dbsServicesChanged(QMap<QString, QVariant> vmap, QList<QDBusObj
 			}	// for
 		}	// if we needed to remove something
 
-////////////////WORKING NOT CORRECT YET
-	// reset the counters if we chose to
-	//if (ui.checkBox_resetcounters->isChecked() ) {		
-		//QDBusInterface* iface_serv = new QDBusInterface(DBUS_SERVICE, serviceOnline().path(), "net.connman.Service", QDBusConnection::systemBus(), this);	
-		//iface_serv->call(QDBus::NoBlock, "ResetCounters");
-		//iface_serv->deleteLater();
-	//}
-
+	// clear the counters (if selected) and update the widgets'
+	clearCounters();
 	updateDisplayWidgets();
 
 	return;
@@ -1698,3 +1696,17 @@ QDBusObjectPath ControlBox::serviceOnline()
 
 	return service_online;
 }
+
+//
+// Function to clear the counters if selected in the ui.  Called from the constructor
+// and from dbsServicesChanged
+void ControlBox::clearCounters()
+{	
+	if (ui.checkBox_resetcounters->isChecked() ) {			
+		QDBusInterface* iface_serv = new QDBusInterface(DBUS_SERVICE, serviceOnline().path(), "net.connman.Service", QDBusConnection::systemBus(), this);	
+		iface_serv->call(QDBus::NoBlock, "ResetCounters");
+		iface_serv->deleteLater();
+	}	
+	
+	return;
+}

code/control_box/controlbox.h

@@ -159,7 +159,8 @@ class ControlBox : public QDialog
 		bool extractMapData(QMap<QString,QVariant>&,const QVariant&);
 		void logErrors(const quint8&);
 		QString readResourceText(const char*);
-		QDBusObjectPath serviceOnline();  
+		QDBusObjectPath serviceOnline();
+		void clearCounters();  
 
   private slots:
   	void	updateDisplayWidgets();

code/control_box/ui/controlbox.ui

@@ -650,8 +650,8 @@
               <rect>
                <x>0</x>
                <y>0</y>
-               <width>98</width>
-               <height>46</height>
+               <width>636</width>
+               <height>137</height>
               </rect>
              </property>
              <layout class="QVBoxLayout" name="verticalLayout_9">
@@ -709,8 +709,8 @@
               <rect>
                <x>0</x>
                <y>0</y>
-               <width>98</width>
-               <height>46</height>
+               <width>636</width>
+               <height>136</height>
               </rect>
              </property>
              <layout class="QVBoxLayout" name="verticalLayout_10">
@@ -820,13 +820,13 @@
           <item>
            <widget class="QCheckBox" name="checkBox_resetcounters">
             <property name="enabled">
-             <bool>false</bool>
+             <bool>true</bool>
             </property>
             <property name="toolTip">
              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Reset counters when a new service is selected&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
             </property>
             <property name="whatsThis">
-             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Normally counters are cummulative and will retain the counts between boots.  When this box is checked the counters will reset to zero every time a Connman service is started. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Normally counters are cummulative and will retain the connect time and the TX and RX counts between boots. &lt;/p&gt;&lt;p&gt;When this box is checked the counters will reset to zero every time CMST is started, and if CMST is running everytime a Connman service is started. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
             </property>
             <property name="text">
              <string>Reset C&amp;ounters</string>
@@ -1013,8 +1013,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>104</width>
-            <height>1922</height>
+            <width>536</width>
+            <height>550</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_8">

code/resource.h

@@ -34,7 +34,7 @@ DEALINGS IN THE SOFTWARE.
 
 ///////////////////////////////// Program Values ///////////////////////
 // Program Info 
-#define VERSION "14.06.28-1"
+#define VERSION "14.06.29-1"
 #define RELEASE_DATE "14 June 2014"
 #define COPYRIGHT_DATE "2013-2014"