Merge pull request #13 from darkjavi/master

Mejoras en la aplicacion movil

Author: darkjavi

Software/JarvisServer/common/gnodecomponentwidget.cpp

@@ -4,6 +4,7 @@
 #include <QHBoxLayout>
 #include "qimageselectionwidget.h"
 #include <QColorDialog>
+#include <QLabel>
 
 gNodeComponentWidget::gNodeComponentWidget(sJarvisNodeComponent* comp,QWidget *parent) :
     QGroupBox(parent), m_component(comp),
@@ -19,7 +20,8 @@ gNodeComponentWidget::gNodeComponentWidget(sJarvisNodeComponent* comp,QWidget *p
         jarvisActions action = actions[i];
         //qDebug() << QString::number(int(action));
         QToolButton* b = new QToolButton(ui->actionsBox);
-        ui->actionsBox->layout()->addWidget(b);
+        QGridLayout* l = (QGridLayout*)ui->actionsBox->layout();
+        l->addWidget(b,l->count()/2,l->count()%2);
         b->setText(QString::number(action,'f',0));
 
         if      (action == A_ENABLE){
@@ -78,48 +80,66 @@ gNodeComponentWidget::gNodeComponentWidget(sJarvisNodeComponent* comp,QWidget *p
     for(int i = 0 ; i < events.count() ; i++)
     {
         gBlinkWidget* w = new gBlinkWidget(ui->eventsBox);
-        ui->eventsBox->layout()->addWidget(w);
+        QLabel* label = new QLabel(ui->eventsBox);
+        QGridLayout* l = (QGridLayout*)ui->eventsBox->layout();
+        l->addWidget(label,i,0);
+        l->addWidget(w,i,1);
+        w->setMaximumHeight(50);
         if(events[i] == E_ACTIVATED)
         {
             connect(m_component,SIGNAL(activated()),w,SLOT(blink()));
+            label->setText("Activated");
 
         }else if(events[i] == E_DEACTIVATED)
         {
             connect(m_component,SIGNAL(deactivated()),w,SLOT(blink()));
+            label->setText("Deactivated");
 
         }else if(events[i] == E_ENABLED)
         {
             connect(m_component,SIGNAL(enabled()),w,SLOT(blink()));
+            label->setText("Enabled");
 
         }else if(events[i] == E_DISABLED)
         {
             connect(m_component,SIGNAL(disabled()),w,SLOT(blink()));
+            label->setText("Disabled");
 
         }else if(events[i] == E_RAW_READ)
         {
             connect(m_component,SIGNAL(rawRead()),w,SLOT(blink()));
             connect(m_component,SIGNAL(rawRead(QStringList)),w,SLOT(displayRead(QStringList)));
+            label->setText("Raw");
 
         }else if(events[i] == E_DATA_READ)
         {
             connect(m_component,SIGNAL(dataRead()),w,SLOT(blink()));
             connect(m_component,SIGNAL(dataRead(QStringList)),w,SLOT(displayRead(QStringList)));
+            label->setText("Data");
 
         }else if(events[i] == E_GLOBAL_POWERON)
         {
             connect(m_component,SIGNAL(globalPowerOn()),w,SLOT(blink()));
+            label->setText("PowerOn");
 
         }else if(events[i] == E_GLOBAL_SHUTDOWN)
         {
             connect(m_component,SIGNAL(globalShutDown()),w,SLOT(blink()));
+            label->setText("PowerOff");
 
         }else if(events[i] == E_COFFEE_MAKING)
         {
             connect(m_component,SIGNAL(coffeeMaking()),w,SLOT(blink()));
+            label->setText("Coffee Making");
 
         }else if(events[i] == E_COFFEE_MADE)
         {
             connect(m_component,SIGNAL(coffeeMade()),w,SLOT(blink()));
+            label->setText("Cofee Made");
+        }
+        else
+        {
+            label->setText("Unknown");
         }
         //w->setMinimumSize(32,32);
         //w->setMaximumSize(32,32);

Software/JarvisServer/common/gnodecomponentwidget.ui

@@ -6,13 +6,15 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>445</width>
-    <height>95</height>
+    <width>335</width>
+    <height>93</height>
    </rect>
   </property>
   <property name="font">
    <font>
     <pointsize>8</pointsize>
+    <weight>75</weight>
+    <bold>true</bold>
    </font>
   </property>
   <property name="windowTitle">
@@ -56,7 +58,7 @@
      <property name="title">
       <string>Actions</string>
      </property>
-     <layout class="QFormLayout" name="formLayout"/>
+     <layout class="QGridLayout" name="gridLayout_2"/>
     </widget>
    </item>
    <item>

Software/JarvisServer/common/sjarvisnode.cpp

@@ -9,6 +9,7 @@ sJarvisNode::sJarvisNode(QObject* parent) : QObject(parent)
     connect(&m_tcpClient,SIGNAL(rx()),this,SIGNAL(rx()));
     connect(&m_pingTimer,SIGNAL(timeout()),this,SLOT(ping()));
     connect(&m_initTimer,SIGNAL(timeout()),this,SLOT(initDone()));
+    connect(&m_initTimeout,SIGNAL(timeout()),this,SLOT(initTimeout()));
 //Slots del nodo tcp
     //connect(&m_tcpClient,SIGNAL(socket_rx(QByteArray)),this,SLOT(data_rx(QByteArray)));
     connect(this,SIGNAL(writeData(QByteArray)),&m_tcpClient,SLOT(socket_tx(QByteArray)));
@@ -104,6 +105,7 @@ void sJarvisNode::parsePacket(QString& packet)
 void sJarvisNode::parseComponent(QStringList args)
 {
     if(m_initDone) return;
+    m_initTimer.start(200);
     m_components.append(new sJarvisNodeComponent(this,args));
     connect(this,SIGNAL(incomingEvent(QString,jarvisEvents,QStringList)),m_components.last(),SLOT(parseEvent(QString,jarvisEvents,QStringList)));
     emit newComponent(m_components.last());
@@ -187,6 +189,8 @@ void sJarvisNode::sendGetID()
 
 void sJarvisNode::sendGetComponents()
 {
+    deleteComponents();
+    m_initDone = false;
     send(encodeNodeMsg(QStringList(QString(C_GETCOMPONENTS))));
 }
 
@@ -240,7 +244,7 @@ void sJarvisNode::initNode()
     connect(&m_tcpClient,SIGNAL(socket_rx(QByteArray)),this,SLOT(validateClient(QByteArray)));
     send(encodeNodeMsg(QStringList(QString(M_JARVIS_GREETING))));
     // le damos un segundo para que reciba de vuelta la informacion, al cumplir el segundo se llama a la funcion initDone()
-    m_initTimer.start(750);
+    m_initTimeout.start(5000);
 }
 
 
@@ -284,6 +288,7 @@ void sJarvisNode::initDone()
 {
 
     m_initTimer.stop();
+    m_initTimeout.stop();
 
     if(m_id.isEmpty() || m_components.isEmpty())
     {
@@ -302,6 +307,12 @@ void sJarvisNode::initDone()
     emit ready();
 }
 
+void sJarvisNode::initTimeout()
+{
+    closeTCP();
+    m_initTimeout.stop();
+}
+
 void sJarvisNode::socketDisconected()
 {
     disconnect(&m_tcpClient,SIGNAL(socket_rx(QByteArray)),this,SLOT(data_rx(QByteArray)));
@@ -343,3 +354,15 @@ void sJarvisNode::pollSensor(QString sen, int interval)
     else
         sendPollSensor(sen,interval);
 }
+
+void sJarvisNode::stopPollingSensors()
+{
+    sendStopPolling();
+}
+
+void sJarvisNode::resetNode()
+{
+    QStringList args;
+    args.append(C_RESET);
+    send(encodeNodeMsg(args));
+}

Software/JarvisServer/common/sjarvisnode.h

@@ -38,6 +38,7 @@ class sJarvisNode :public QObject
     QList<sJarvisNodeComponent*> m_components;
     QTimer           m_pingTimer;
     QTimer           m_initTimer;
+    QTimer           m_initTimeout;
     QTime            m_keepAliveTimer;
     bool             m_initDone;
     bool             m_valid;
@@ -76,11 +77,15 @@ protected slots:
     void ping();
     void pong();
     void initDone();
+    void initTimeout();
     void socketDisconected();
     void setUpdateInterval(int interval);
 public slots:
     void doAction(QString Component, jarvisActions action, QStringList args = QStringList());
     void pollSensor(QString sen = "ALL",int interval = -1);
+    void stopPollingSensors();
+    void resetNode();
+    void getComponents() {sendGetComponents();}
 
 };
 

Software/JarvisServer/jarvisnodetestapp.cpp

@@ -1,5 +1,6 @@
 #include "jarvisnodetestapp.h"
 #include "ui_jarvisnodetestapp.h"
+#include <QGridLayout>
 
 jarvisNodeTestApp::jarvisNodeTestApp(sJarvisNode* node, QWidget *parent) :
     QMainWindow(parent),
@@ -40,7 +41,8 @@ void jarvisNodeTestApp::connectNodeSignals(sJarvisNode* node)
     connect(node,SIGNAL(sensorReads(QVector<QString>,QVector<double>)),this,SLOT(sensorRead(QVector<QString>,QVector<double>)));
     connect(node,SIGNAL(ready()),this,SLOT(nodeConnected()));
     connect(node,SIGNAL(disconnected()),this,SLOT(nodeDisconnected()));
-    connect(ui->sliderUpdateInterval,SIGNAL(sliderMoved(int)),m_node,SLOT(setUpdateInterval(int)));
+    connect(ui->sliderUpdateInterval,SIGNAL(sliderMoved(int)),node,SLOT(setUpdateInterval(int)));
+    connect(ui->btnReset,SIGNAL(clicked()),node,SLOT(resetNode()));
 }
 
 sJarvisNode* jarvisNodeTestApp::newNode()
@@ -70,9 +72,12 @@ void jarvisNodeTestApp::nodeConnected()
     {
         sJarvisNodeComponent* ncomp = comps[i];
         gNodeComponentWidget* w = new gNodeComponentWidget(ncomp,ui->scrollComponents);
-        ui->scrollComponentsContents->layout()->addWidget(w);
+        QGridLayout* l = (QGridLayout*)ui->scrollComponentsContents->layout();
+        l->addWidget(w);
+        //l->addWidget(w,l->count()/2,l->count()%2);
         m_componentWidgets.append(w);
     }
+    m_statusLabel.setText("Node connected!");
 }
 
 void jarvisNodeTestApp::nodeDisconnected()
@@ -84,14 +89,17 @@ void jarvisNodeTestApp::nodeDisconnected()
     m_componentWidgets.clear();
     m_sensorsTimer.stop();
     ui->connectBtn->setChecked(false);
+    m_statusLabel.setText("Node disconnected!");
 }
 
 void jarvisNodeTestApp::on_connectBtn_clicked()
 {
     if(ui->connectBtn->isChecked())
     {
         int port = ui->editPort->text().toInt();
-        qDebug() << "Connecting-" << ui->editIP->text() << ":" << QString::number(port);
+        QString status;
+        status += "Connecting-" + ui->editIP->text() + ":" + QString::number(port);
+        m_statusLabel.setText(status);
         m_node->connectTCP(ui->editIP->text(),port);
     }
     else
@@ -110,6 +118,31 @@ void jarvisNodeTestApp::on_sendCmdBtn_clicked()
     m_node->send(ui->editCommand->text().toUtf8());
 }
 
+void jarvisNodeTestApp::on_stopReadBtn_clicked()
+{
+    m_node->stopPollingSensors();
+}
+
+void jarvisNodeTestApp::on_btnGetComps_clicked()
+{
+    for(int i = 0;  i < m_componentWidgets.count() ; i++)
+    {
+        m_componentWidgets[i]->deleteLater();
+    }
+    m_componentWidgets.clear();
+    m_node->getComponents();
+}
+
+void jarvisNodeTestApp::on_btnClearGraphs_clicked()
+{
+    for(int i = 0 ; i < m_graphs.count() ; i++)
+    {
+        m_graphs[i]->deleteLater();
+    }
+    m_graphInit = false;
+    m_graphs.clear();
+}
+
 void jarvisNodeTestApp::console_log(QByteArray data)
 {
     ui->editConsole->appendPlainText(data);
@@ -130,8 +163,9 @@ void jarvisNodeTestApp::eventLog(QString component, jarvisEvents event, QStringL
     ui->editEventlog->append(result);
 }
 
+
 void jarvisNodeTestApp::sensorRead(QVector<QString> fields,QVector<double> data)
-{
+{      
     if(!m_graphInit)
     {
         for(int i = 0; i < fields.count() ; i++ )
@@ -142,7 +176,6 @@ void jarvisNodeTestApp::sensorRead(QVector<QString> fields,QVector<double> data)
             QVector<double> d;
             f.append(fields[i]);
             g->setFields(f);
-            d.append(0);
             g->appendData(d);
             m_graphs.append(g);
         }

Software/JarvisServer/jarvisnodetestapp.h

@@ -46,6 +46,9 @@ public slots:
     void on_readComponentsBtn_clicked();
     void on_connectBtn_clicked();
     void on_sendCmdBtn_clicked();
+    void on_stopReadBtn_clicked();
+    void on_btnGetComps_clicked();
+    void on_btnClearGraphs_clicked();
     void console_log(QByteArray data);
     void eventLog(QString component,jarvisEvents event,QStringList args);
     void sensorRead(QVector<QString> fields,QVector<double> data);