Feature: Start Adding Node Commands - RefreshNodeInfo

ozwadmin-main/controllercommands.cpp

@@ -13,8 +13,7 @@ ControllerCommands::ControllerCommands(QMainWindow *parent) :
 
 
 void ControllerCommands::addNode() {
-
-
+
     this->m_command = ControllerCommands::Command_addNode;
     QMessageBox::StandardButton ret = QMessageBox::question(qobject_cast<QMainWindow*>(this->parent()), "Include Secure?", "Do you wish to include the new device with encryption?", QMessageBox::Yes|QMessageBox::No|QMessageBox::Cancel);
     if (ret == QMessageBox::Cancel) {
@@ -334,6 +333,14 @@ void ControllerCommands::controllerCommandNotification(quint8 node, Notification
                 }
             }            
         }
+    }
+}
 
+void ControllerCommands::refreshNodeInfo(quint8 node)
+{
+    QMessageBox::StandardButton ret = QMessageBox::question(qobject_cast<QMainWindow*>(this->parent()), "Refresh Node?", "Refreshing the Node?", QMessageBox::Yes|QMessageBox::No);
+    if (ret == QMessageBox::No) {
+        return;
     }
+    OZWCore::get()->getQTOZWManager()->refreshNodeInfo(node);    
 }

ozwadmin-main/controllercommands.h

@@ -14,13 +14,14 @@ class ControllerCommands : public QObject
     explicit ControllerCommands(QMainWindow *parent = nullptr);
     enum Command {Command_addNode, Command_delNode, Command_healNetwork, Command_cancel, Command_none};
     Q_ENUM(Command);
+
 public slots:
     void addNode();
     void delNode();
     void healNetwork();
     void cancelCommand();
-
     void controllerCommandNotification(quint8 node, NotificationTypes::QTOZW_Notification_Controller_Cmd command, NotificationTypes::QTOZW_Notification_Controller_State state, NotificationTypes::QTOZW_Notification_Controller_Error error);
+    void refreshNodeInfo(quint8 node);
 private:
     QMessageBox m_msgBox;
     Command m_command;

ozwadmin-main/eventwindow.ui

@@ -21,8 +21,8 @@
      </property>
      <property name="icon">
       <iconset resource="ozwadmin-main.qrc">
-       <normaloff>:/res/buttonIcons/play.svg</normaloff>
-       <normalon>:/res/buttonIcons/pause.svg</normalon>:/res/buttonIcons/play.svg</iconset>
+       <normaloff>:/res/buttonIcons/pause.svg</normaloff>
+       <normalon>:/res/buttonIcons/play.svg</normalon>:/res/buttonIcons/pause.svg</iconset>
      </property>
      <property name="iconSize">
       <size>

ozwadmin-main/mainwindow.cpp

@@ -145,6 +145,7 @@ void MainWindow::openDefaultWindows() {
 	connect(this->ntw, &nodeTableWidget::currentRowChanged, this, &MainWindow::NodeSelected);
 	connect(this->ntw, &nodeTableWidget::currentRowChanged, di, &DeviceInfo::NodeSelected);
 	connect(this->ntw, &nodeTableWidget::currentRowChanged, ni, &NodeStatus::NodeSelected);
+	connect(this->ntw, &nodeTableWidget::refreshNodeInfo, this->m_controllerCommands, &ControllerCommands::refreshNodeInfo);
 	connect(this->sbMsg, &statusBarMessages::newMessage, ew, &EventWindow::newEvent);
 	connect(di, &DeviceInfo::openMetaDataWindow, this, &MainWindow::openMetaDataWindow);
 

ozwadmin-main/nodetablewidget.cpp

@@ -15,6 +15,8 @@ nodeTableWidget::nodeTableWidget(QWidget *parent) :
     ui(new Ui::nodeTableWidget)
 {
     this->ui->setupUi(this);
+	this->ui->verticalLayout->insertWidget(0, &this->tb);
+
 	Node_Delegate *nodeflagdelegate = new Node_Delegate(this);
 
 	this->ui->nodeList->setItemDelegateForColumn(QTOZW_Nodes::NodeColumns::NodeFlags, nodeflagdelegate);
@@ -27,6 +29,10 @@ nodeTableWidget::nodeTableWidget(QWidget *parent) :
 
 	this->ui->nodeList->setContextMenuPolicy(Qt::CustomContextMenu);
 	connect(this->ui->nodeList, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(rightClickMenu(QPoint)));
+
+	this->tb.insertAction(nullptr, this->ui->actionRefresh_Node_Info);
+	connect(this->ui->actionRefresh_Node_Info, &QAction::triggered, this, &nodeTableWidget::refreshNodeInfoTriggered);
+
 }
 
 nodeTableWidget::~nodeTableWidget()
@@ -51,6 +57,7 @@ void nodeTableWidget::setModel(QAbstractItemModel *model)
 		}
 	}
 	connect(ui->nodeList->selectionModel(), &QItemSelectionModel::currentRowChanged, this, &nodeTableWidget::currentRowChanged);
+	connect(ui->nodeList->selectionModel(), &QItemSelectionModel::currentRowChanged, this, &nodeTableWidget::updateSelectedNode);
 	connect(proxyNodeList, &QTOZW_proxyNodeModel::rowsInserted, this, &nodeTableWidget::resizeContents);
 	connect(proxyNodeList, &QTOZW_proxyNodeModel::rowsRemoved, this, &nodeTableWidget::resizeContents);
 	QTimer::singleShot(500, this, &nodeTableWidget::resizeContents);
@@ -67,15 +74,26 @@ QItemSelectionModel *nodeTableWidget::selectionModel()
 
 void nodeTableWidget::rightClickMenu(QPoint pos) 
 {
-    //QModelIndex index=this->ui->nodeList->indexAt(pos);
-
     QMenu *menu=new QMenu(this);
-    menu->addAction(new QAction("Action 1", this));
-    menu->addAction(new QAction("Action 2", this));
-    menu->addAction(new QAction("Action 3", this));
+    menu->addAction(this->ui->actionRefresh_Node_Info);
     menu->popup(this->ui->nodeList->viewport()->mapToGlobal(pos));
 }
 
+void nodeTableWidget::updateSelectedNode(const QModelIndex &current, const QModelIndex &previous) 
+{
+	Q_UNUSED(previous);
+	this->ui->actionRefresh_Node_Info->setData(current.model()->data(current.model()->index(current.row(), QTOZW_Nodes::NodeID)).toInt());
+	this->ui->actionRefresh_Node_Info->setToolTip(QString("Refresh Node Info for Node %1").arg(current.model()->data(current.model()->index(current.row(), QTOZW_Nodes::NodeID)).toInt()));
+}
+
+void nodeTableWidget::refreshNodeInfoTriggered() {
+	quint8 node = this->ui->actionRefresh_Node_Info->data().toInt();
+	emit this->refreshNodeInfo(node);
+}
+
+
+
+
 void nodeTableWidget::resizeContents() {
 	this->ui->nodeList->resizeColumnsToContents();
 	if (!this->ui->nodeList->selectionModel()->hasSelection()) {

ozwadmin-main/nodetablewidget.h

@@ -5,6 +5,7 @@
 #include <QPoint>
 #include <qabstractitemmodel.h>
 #include <qitemselectionmodel.h>
+#include <QToolBar>
 
 
 namespace Ui {
@@ -23,13 +24,17 @@ class nodeTableWidget : public QWidget
 	QItemSelectionModel *selectionModel();
 Q_SIGNALS:
 	void currentRowChanged(const QModelIndex &current, const QModelIndex &previous);
+    void refreshNodeInfo(const quint8 node);
 public Q_SLOTS:
     void rightClickMenu(QPoint pos);
 private slots:
 	void resizeContents();
+    void updateSelectedNode(const QModelIndex &current, const QModelIndex &previous);
+    void refreshNodeInfoTriggered();
 
 private:
     Ui::nodeTableWidget *ui;
+    QToolBar tb;
 };
 
 #endif // NODETABLEWIDGET_H

ozwadmin-main/nodetablewidget.ui

@@ -13,7 +13,10 @@
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout">
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="spacing">
+    <number>0</number>
+   </property>
    <property name="leftMargin">
     <number>0</number>
    </property>
@@ -26,18 +29,26 @@
    <property name="bottomMargin">
     <number>0</number>
    </property>
-   <property name="spacing">
-    <number>0</number>
-   </property>
-   <item row="0" column="0">
+   <item>
     <widget class="QTableView" name="nodeList">
      <attribute name="horizontalHeaderStretchLastSection">
       <bool>true</bool>
      </attribute>
     </widget>
    </item>
   </layout>
+  <action name="actionRefresh_Node_Info">
+   <property name="icon">
+    <iconset resource="ozwadmin-main.qrc">
+     <normaloff>:/res/buttonIcons/refresh.svg</normaloff>:/res/buttonIcons/refresh.svg</iconset>
+   </property>
+   <property name="text">
+    <string>Refresh Node Info</string>
+   </property>
+  </action>
  </widget>
- <resources/>
+ <resources>
+  <include location="ozwadmin-main.qrc"/>
+ </resources>
  <connections/>
 </ui>

ozwadmin-main/ozwadmin-main.qrc

@@ -14,5 +14,6 @@
         <file>res/start.svg</file>
         <file>res/buttonIcons/pause.svg</file>
         <file>res/buttonIcons/play.svg</file>
+        <file>res/buttonIcons/refresh.svg</file>
     </qresource>
 </RCC>