<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][14549] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=14549">14549</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2009-08-18 00:19:23 -0500 (Tue, 18 Aug 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Realtime Statistics is now know to be working. Bugs should be reporting. Now we are able to filter channels by making selection to calls.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcinterfacesmonitorstatemachineh">freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/monitorstatemachine.h</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginconsolepluginpro">freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.pro</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginrealtimestatisticsdialogcpp">freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimestatisticsdialog.cpp</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginrealtimestatisticsdialogh">freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimestatisticsdialog.h</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginrealtimestatisticsdialogui">freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimestatisticsdialog.ui</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginrealtimemodelscpp">freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimemodels.cpp</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginrealtimemodelsh">freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimemodels.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkcontribjmesquitafsguisrcinterfacesmonitorstatemachineh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/monitorstatemachine.h (14548 => 14549)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/monitorstatemachine.h 2009-08-17 23:03:49 UTC (rev 14548)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/monitorstatemachine.h 2009-08-18 05:19:23 UTC (rev 14549)
</span><span class="lines">@@ -56,6 +56,9 @@
</span><span class="cx"> int channelCount() { return _channels.count(); }
</span><span class="cx"> QList<Channel *> getChannels() { return _channels.values(); }
</span><span class="cx"> Channel * getChannel(QString uuid) { return _channels.value(uuid, NULL); }
</span><ins>+ Channel * getInactiveChannel(QString uuid) { return _inactive_channels.value(uuid, NULL); }
+ Call * getCall(QString uuid) { return _calls.value(uuid, NULL); }
+ Call * getInactiveCall(QString uuid) { return _inactive_calls.value(uuid, NULL); }
</ins><span class="cx"> private slots:
</span><span class="cx"> void processEvent(ESLevent);
</span><span class="cx"> signals:
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginconsolepluginpro"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.pro (14548 => 14549)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.pro 2009-08-17 23:03:49 UTC (rev 14548)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.pro 2009-08-18 05:19:23 UTC (rev 14549)
</span><span class="lines">@@ -29,11 +29,13 @@
</span><span class="cx"> HEADERS = consoleplugin.h \
</span><span class="cx"> sortfilterproxymodel.h \
</span><span class="cx"> consoletabwidget.h \
</span><del>- realtimestatisticsdialog.h
</del><ins>+ realtimestatisticsdialog.h \
+ realtimemodels.h
</ins><span class="cx"> SOURCES = consoleplugin.cpp \
</span><span class="cx"> sortfilterproxymodel.cpp \
</span><span class="cx"> consoletabwidget.cpp \
</span><del>- realtimestatisticsdialog.cpp
</del><ins>+ realtimestatisticsdialog.cpp \
+ realtimemodels.cpp
</ins><span class="cx"> FORMS += centralWidget.ui \
</span><span class="cx"> console_settings.ui \
</span><span class="cx"> consoletabwidget.ui \
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginrealtimemodelscpp"></a>
<div class="addfile"><h4>Added: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimemodels.cpp (0 => 14549)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimemodels.cpp (rev 0)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimemodels.cpp 2009-08-18 05:19:23 UTC (rev 14549)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+#include <QtGui>
+#include "realtimemodels.h"
+
+ChannelSortModel::ChannelSortModel(QObject *parent) :
+ QSortFilterProxyModel(parent)
+{}
+
+void ChannelSortModel::setUUIDFilter(QList<QString> uuid_list)
+{
+ _uuid_list = uuid_list;
+ invalidateFilter();
+}
+
+bool ChannelSortModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const
+{
+ QModelIndex index0 = sourceModel()->index(sourceRow, 0, sourceParent);
+
+ if (_uuid_list.isEmpty())
+ return true;
+
+ return (_uuid_list.contains(sourceModel()->data(index0, Qt::UserRole).toString()));
+}
</ins></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginrealtimemodelsh"></a>
<div class="addfile"><h4>Added: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimemodels.h (0 => 14549)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimemodels.h (rev 0)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimemodels.h 2009-08-18 05:19:23 UTC (rev 14549)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+#ifndef REALTIMEMODELS_H
+#define REALTIMEMODELS_H
+
+#include <QSortFilterProxyModel>
+
+class ChannelSortModel : public QSortFilterProxyModel {
+
+ Q_OBJECT
+
+public:
+ ChannelSortModel(QObject *parent = 0);
+ void setUUIDFilter(QList<QString> uuid);
+
+protected:
+ bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const;
+ QList<QString> _uuid_list;
+};
+
+#endif // REALTIMEMODELS_H
</ins></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginrealtimestatisticsdialogcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimestatisticsdialog.cpp (14548 => 14549)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimestatisticsdialog.cpp 2009-08-17 23:03:49 UTC (rev 14548)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimestatisticsdialog.cpp 2009-08-18 05:19:23 UTC (rev 14549)
</span><span class="lines">@@ -2,6 +2,7 @@
</span><span class="cx"> #include "realtimestatisticsdialog.h"
</span><span class="cx"> #include "ui_realtimestatisticsdialog.h"
</span><span class="cx"> #include "monitorstatemachine.h"
</span><ins>+#include "realtimemodels.h"
</ins><span class="cx">
</span><span class="cx"> RealtimeStatisticsDialog::RealtimeStatisticsDialog(QWidget *parent, MonitorStateMachine *sm) :
</span><span class="cx"> QDialog(parent),
</span><span class="lines">@@ -17,16 +18,31 @@
</span><span class="cx"> this, SLOT(channelDestroy(Channel*)));
</span><span class="cx"> connect(sm, SIGNAL(channelStateChanged(Channel*)),
</span><span class="cx"> this, SLOT(channelStateChanged(Channel*)));
</span><del>- connect(m_ui->listActiveChannels, SIGNAL(itemClicked(QListWidgetItem*)),
- this, SLOT(channelSelected(QListWidgetItem*)));
</del><ins>+ connect(m_ui->listActiveChannels, SIGNAL(clicked(QModelIndex)),
+ this, SLOT(activeChannelSelected(QModelIndex)));
+ connect(m_ui->listInactiveChannels, SIGNAL(clicked(QModelIndex)),
+ this, SLOT(inactiveChannelSelected(QModelIndex)));
</ins><span class="cx">
</span><span class="cx"> /* Connect call stuff */
</span><span class="cx"> connect(sm, SIGNAL(callCreated(Call*)),
</span><span class="cx"> this, SLOT(callCreate(Call*)));
</span><span class="cx"> connect(sm, SIGNAL(callDestroyed(Call*)),
</span><span class="cx"> this, SLOT(callDestroy(Call*)));
</span><ins>+ connect(m_ui->listActiveCalls, SIGNAL(itemSelectionChanged()),
+ this, SLOT(activeCallSelectionChanged()));
+ connect(m_ui->listInactiveCalls, SIGNAL(itemSelectionChanged()),
+ this, SLOT(inactiveCallSelectionChanged()));
</ins><span class="cx">
</span><del>- delete m_ui->tab_2;
</del><ins>+ _channel_model = new QStandardItemModel(this);
+ _channel_sort_model = new ChannelSortModel(this);
+ _channel_sort_model->setSourceModel(_channel_model);
+ m_ui->listActiveChannels->setModel(_channel_sort_model);
+
+ _inactive_channel_model = new QStandardItemModel(this);
+ _inactive_channel_sort_model = new ChannelSortModel(this);
+ _inactive_channel_sort_model->setSourceModel(_inactive_channel_model);
+ m_ui->listInactiveChannels->setModel(_inactive_channel_sort_model);
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RealtimeStatisticsDialog::~RealtimeStatisticsDialog()
</span><span class="lines">@@ -52,9 +68,9 @@
</span><span class="cx"> if (!ch)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- QListWidgetItem *item = new QListWidgetItem(QString("%1 - %2").arg(ch->getUUID(), ch->getHeader("Channel-State")),
- m_ui->listActiveChannels);
- item->setData(Qt::UserRole, ch->getUUID());
</del><ins>+ QStandardItem *item = new QStandardItem(QString("%1 - %2").arg(ch->getUUID(), ch->getHeader("Channel-State")));
+ item->setData(ch->getUUID(), Qt::UserRole);
+ _channel_model->insertRow(0, item);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RealtimeStatisticsDialog::channelDestroy(Channel *ch)
</span><span class="lines">@@ -63,14 +79,17 @@
</span><span class="cx"> if (!ch)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- for (int i = 0; i < m_ui->listActiveChannels->count(); i++)
</del><ins>+ QModelIndex selectedIndex = m_ui->listActiveChannels->currentIndex();
+
+ foreach (QStandardItem *item, _channel_model->findItems("*", Qt::MatchWildcard | Qt::MatchRecursive))
</ins><span class="cx"> {
</span><del>- if (m_ui->listActiveChannels->item(i)->data(Qt::UserRole) == ch->getUUID())
</del><ins>+ if (item->data(Qt::UserRole) == ch->getUUID())
</ins><span class="cx"> {
</span><del>- if (m_ui->listActiveChannels->currentItem() == m_ui->listActiveChannels->item(i))
</del><ins>+ if (selectedIndex.isValid() && selectedIndex.data(Qt::UserRole) == ch->getUUID())
</ins><span class="cx"> m_ui->listActiveVariables->clear();
</span><span class="cx">
</span><del>- delete m_ui->listActiveChannels->item(i);
</del><ins>+ _channel_model->takeRow(item->index().row());
+ _inactive_channel_model->insertRow(0, item);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -81,22 +100,22 @@
</span><span class="cx"> if (!ch)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- for (int i = 0; i < m_ui->listActiveChannels->count(); i++)
</del><ins>+ foreach (QStandardItem *item, _channel_model->findItems("*", Qt::MatchWildcard | Qt::MatchRecursive))
</ins><span class="cx"> {
</span><del>- if (m_ui->listActiveChannels->item(i)->data(Qt::UserRole).toString() == ch->getUUID())
- if (m_ui->listActiveChannels->currentItem() == m_ui->listActiveChannels->item(i))
</del><ins>+ if (item->data(Qt::UserRole) == ch->getUUID())
+ if (_channel_model->itemFromIndex(m_ui->listActiveChannels->currentIndex()) == item)
</ins><span class="cx"> {
</span><del>- channelSelected(m_ui->listActiveChannels->item(i));
</del><ins>+ activeChannelSelected(_channel_model->indexFromItem(item));
</ins><span class="cx"> }
</span><del>- m_ui->listActiveChannels->item(i)->setText(QString("%1 - %2").arg(ch->getUUID(), ch->getHeader("Channel-State")));
</del><ins>+ item->setText(QString("%1 - %2").arg(ch->getUUID(), ch->getHeader("Channel-State")));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RealtimeStatisticsDialog::channelSelected(QListWidgetItem *item)
</del><ins>+void RealtimeStatisticsDialog::activeChannelSelected(QModelIndex index)
</ins><span class="cx"> {
</span><span class="cx"> m_ui->listActiveVariables->clear();
</span><span class="cx">
</span><del>- Channel * ch = _sm->getChannel(item->data(Qt::UserRole).toString());
</del><ins>+ Channel * ch = _sm->getChannel(index.data(Qt::UserRole).toString());
</ins><span class="cx"> if (!ch)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -106,6 +125,54 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void RealtimeStatisticsDialog::inactiveChannelSelected(QModelIndex index)
+{
+ m_ui->listInactiveVariables->clear();
+
+ Channel * ch = _sm->getInactiveChannel(index.data(Qt::UserRole).toString());
+ if (!ch)
+ return;
+
+ foreach (QString key, ch->getVariables().keys())
+ {
+ m_ui->listInactiveVariables->addItem(QString("%1 = %2").arg(key, ch->getVariables().value(key)));
+ }
+}
+
+void RealtimeStatisticsDialog::activeCallSelectionChanged()
+{
+ QList<QListWidgetItem *> selection = m_ui->listActiveCalls->selectedItems();
+ QList<QString> uuids;
+
+ foreach(QListWidgetItem *item, selection)
+ {
+ Call * call = _sm->getCall(item->data(Qt::UserRole).toString());
+ if (call)
+ {
+ uuids.append(call->getCallerUUID());
+ uuids.append(call->getOriginateeUUID());
+ }
+ }
+ _channel_sort_model->setUUIDFilter(uuids);
+}
+
+void RealtimeStatisticsDialog::inactiveCallSelectionChanged()
+{
+ QList<QListWidgetItem *> selection = m_ui->listInactiveCalls->selectedItems();
+ QList<QString> uuids;
+
+ foreach(QListWidgetItem *item, selection)
+ {
+ Call * call = _sm->getInactiveCall(item->data(Qt::UserRole).toString());
+ if (call)
+ {
+ uuids.append(call->getCallerUUID());
+ uuids.append(call->getOriginateeUUID());
+ }
+ }
+ _inactive_channel_sort_model->setUUIDFilter(uuids);
+}
+
</ins><span class="cx"> void RealtimeStatisticsDialog::callCreate(Call *c)
</span><span class="cx"> {
</span><span class="cx"> /* Sanity checking */
</span><span class="lines">@@ -114,9 +181,9 @@
</span><span class="cx"> QString caller_cidnum = c->getCallerChannel()->getHeader("Caller-Caller-ID-Number");
</span><span class="cx"> QString caller_cidname = c->getCallerChannel()->getHeader("variable_effective_caller_id_name");
</span><span class="cx"> QString orig_cidnum = c->getCallerChannel()->getHeader("Caller-Destination-Number");
</span><del>- QListWidgetItem *item = new QListWidgetItem(QString("%1(%2) <-> %3").arg(caller_cidnum,
- caller_cidname,
- orig_cidnum), m_ui->listActiveCalls);
</del><ins>+ QString caller_uuid = c->getCallerUUID();
+ QString callTitle = QString("%1(%2) <-> %3 (Caller UUID: %4)").arg(caller_cidnum, caller_cidname, orig_cidnum, caller_uuid);
+ QListWidgetItem *item = new QListWidgetItem(callTitle, m_ui->listActiveCalls);
</ins><span class="cx"> item->setData(Qt::UserRole, c->getCallerUUID());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -129,6 +196,9 @@
</span><span class="cx"> for (int i = 0; i < m_ui->listActiveCalls->count(); i++)
</span><span class="cx"> {
</span><span class="cx"> if (m_ui->listActiveCalls->item(i)->data(Qt::UserRole) == c->getCallerUUID())
</span><del>- delete m_ui->listActiveCalls->item(i);
</del><ins>+ {
+ QListWidgetItem *item = m_ui->listActiveCalls->takeItem(i);
+ m_ui->listInactiveCalls->addItem(item);
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginrealtimestatisticsdialogh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimestatisticsdialog.h (14548 => 14549)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimestatisticsdialog.h 2009-08-17 23:03:49 UTC (rev 14548)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimestatisticsdialog.h 2009-08-18 05:19:23 UTC (rev 14549)
</span><span class="lines">@@ -1,17 +1,18 @@
</span><span class="cx"> #ifndef REALTIMESTATISTICSDIALOG_H
</span><span class="cx"> #define REALTIMESTATISTICSDIALOG_H
</span><span class="cx">
</span><del>-#include <QtGui/QDialog>
</del><ins>+#include <QtGui>
</ins><span class="cx">
</span><span class="cx"> namespace Ui {
</span><span class="cx"> class RealtimeStatisticsDialog;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-class QListWidgetItem;
</del><span class="cx"> class MonitorStateMachine;
</span><span class="cx"> class Channel;
</span><span class="cx"> class Call;
</span><ins>+class ChannelSortModel;
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> class RealtimeStatisticsDialog : public QDialog {
</span><span class="cx"> Q_OBJECT
</span><span class="cx"> public:
</span><span class="lines">@@ -26,13 +27,20 @@
</span><span class="cx"> void channelCreate(Channel *);
</span><span class="cx"> void channelDestroy(Channel *);
</span><span class="cx"> void channelStateChanged(Channel *);
</span><del>- void channelSelected(QListWidgetItem *);
</del><ins>+ void activeChannelSelected(QModelIndex);
+ void inactiveChannelSelected(QModelIndex);
+ void activeCallSelectionChanged();
+ void inactiveCallSelectionChanged();
</ins><span class="cx"> void callCreate(Call *);
</span><span class="cx"> void callDestroy(Call *);
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> Ui::RealtimeStatisticsDialog *m_ui;
</span><span class="cx"> MonitorStateMachine *_sm;
</span><ins>+ QStandardItemModel *_channel_model;
+ ChannelSortModel *_channel_sort_model;
+ QStandardItemModel *_inactive_channel_model;
+ ChannelSortModel *_inactive_channel_sort_model;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #endif // REALTIMESTATISTICSDIALOG_H
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginrealtimestatisticsdialogui"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimestatisticsdialog.ui (14548 => 14549)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimestatisticsdialog.ui 2009-08-17 23:03:49 UTC (rev 14548)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimestatisticsdialog.ui 2009-08-18 05:19:23 UTC (rev 14549)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> </property>
</span><span class="cx"> <layout class="QHBoxLayout" name="horizontalLayout">
</span><span class="cx"> <item>
</span><del>- <widget class="QListWidget" name="listActiveChannels">
</del><ins>+ <widget class="QListView" name="listActiveChannels">
</ins><span class="cx"> <property name="editTriggers">
</span><span class="cx"> <set>QAbstractItemView::NoEditTriggers</set>
</span><span class="cx"> </property>
</span><span class="lines">@@ -62,6 +62,9 @@
</span><span class="cx"> <property name="alternatingRowColors">
</span><span class="cx"> <bool>true</bool>
</span><span class="cx"> </property>
</span><ins>+ <property name="selectionMode">
+ <enum>QAbstractItemView::ExtendedSelection</enum>
+ </property>
</ins><span class="cx"> </widget>
</span><span class="cx"> </item>
</span><span class="cx"> </layout>
</span><span class="lines">@@ -107,7 +110,7 @@
</span><span class="cx"> </property>
</span><span class="cx"> <layout class="QHBoxLayout" name="horizontalLayout_9">
</span><span class="cx"> <item>
</span><del>- <widget class="QListWidget" name="listInactiveChannels">
</del><ins>+ <widget class="QListView" name="listInactiveChannels">
</ins><span class="cx"> <property name="editTriggers">
</span><span class="cx"> <set>QAbstractItemView::NoEditTriggers</set>
</span><span class="cx"> </property>
</span><span class="lines">@@ -133,6 +136,9 @@
</span><span class="cx"> <property name="alternatingRowColors">
</span><span class="cx"> <bool>true</bool>
</span><span class="cx"> </property>
</span><ins>+ <property name="selectionMode">
+ <enum>QAbstractItemView::ExtendedSelection</enum>
+ </property>
</ins><span class="cx"> </widget>
</span><span class="cx"> </item>
</span><span class="cx"> </layout>
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>