Revision

14583

Author

jmesquita

Date

2009-08-21 01:24:56 -0500 (Fri, 21 Aug 2009)

Log Message

Final fix to realtime statistics.

Modified Paths

• freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.cpp
• freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.h
• freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimestatisticsdialog.cpp

Diff

--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.cpp	2009-08-21 05:41:14 UTC (rev 14582)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.cpp	2009-08-21 06:24:56 UTC (rev 14583)
@@ -33,6 +33,24 @@
 
 ConsolePlugin::~ConsolePlugin(){}
 
+void ConsolePlugin::closeEvent(QCloseEvent *event)
+ {
+    QSettings settings;
+    settings.beginGroup("Console");
+    settings.setValue("WindowGeometry", this->saveGeometry());
+    settings.endGroup();
+    QWidget::closeEvent(event);
+ }
+
+void ConsolePlugin::showEvent ( QShowEvent * event )
+{
+    QSettings settings;
+    settings.beginGroup("Console");
+    this->restoreGeometry(settings.value("WindowGeometry").toByteArray());
+    settings.endGroup();
+    QWidget::showEvent(event);
+}
+
 QObject * ConsolePlugin::getMonitorInterfaceObject()
 {
     return this;

--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.h	2009-08-21 05:41:14 UTC (rev 14582)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.h	2009-08-21 06:24:56 UTC (rev 14583)
@@ -28,6 +28,10 @@
     void newInstance();
     void setServerManager(ServerManager *manager);
 
+protected:
+    void closeEvent(QCloseEvent *event);
+    void showEvent ( QShowEvent * event );
+
 private slots:
     void connectionStateChanged();
     void connect();

--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimestatisticsdialog.cpp	2009-08-21 05:41:14 UTC (rev 14582)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimestatisticsdialog.cpp	2009-08-21 06:24:56 UTC (rev 14583)
@@ -55,8 +55,12 @@
     _event_sort_model = new EventSortModel(this);
     _event_sort_model->setSourceModel(_event_model);
     m_ui->listActiveEvents->setModel(_event_sort_model);
-    m_ui->listInactiveEvents->setModel(_event_sort_model);
 
+    _inactive_event_model = new QStandardItemModel(this);
+    _inactive_event_sort_model = new EventSortModel(this);
+    _inactive_event_sort_model->setSourceModel(_inactive_event_model);
+    m_ui->listInactiveEvents->setModel(_inactive_event_sort_model);
+
 }
 
 RealtimeStatisticsDialog::~RealtimeStatisticsDialog()
@@ -97,16 +101,26 @@
 
     foreach (QStandardItem *item, _channel_model->findItems("*", Qt::MatchWildcard | Qt::MatchRecursive))
     {
+
+        if (selectedIndex.isValid() && selectedIndex.data(Qt::UserRole) == ch->getUUID())
+        {
+            m_ui->listActiveHeaders->clear();
+            _event_sort_model->setUUIDFilter("");
+        }
+
         if (item->data(Qt::UserRole) == ch->getUUID())
         {
-            if (selectedIndex.isValid() && selectedIndex.data(Qt::UserRole) == ch->getUUID())
+            _channel_model->takeRow(item->index().row());
+            _inactive_channel_model->appendRow(item);
+
+            foreach (QStandardItem *item, _event_model->findItems("*", Qt::MatchWildcard | Qt::MatchRecursive))
             {
-                m_ui->listActiveHeaders->clear();
+                if (item->data(Qt::UserRole) == ch->getUUID())
+                {
+                    _event_model->takeRow(item->index().row());
+                    _inactive_event_model->appendRow(item);
+                }
             }
-
-            _channel_model->takeRow(item->index().row());
-            _inactive_channel_model->appendRow(item);
-            _event_sort_model->setUUIDFilter("");
         }
     }
 }
@@ -131,7 +145,7 @@
     if (!ch)
         return;
 
-    _event_sort_model->setUUIDFilter(ch->getUUID());
+    _inactive_event_sort_model->setUUIDFilter(ch->getUUID());
 }
 
 void RealtimeStatisticsDialog::activeEventSelected(QModelIndex index)