<!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][14572] </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=14572">14572</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2009-08-19 17:05:18 -0500 (Wed, 19 Aug 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>We can see call, channels and events in realtime and with filtering.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcinterfacesmonitorstatemachinecpp">freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/monitorstatemachine.cpp</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcinterfacesmonitorstatemachineh">freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/monitorstatemachine.h</a></li>
<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>
<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>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkcontribjmesquitafsguisrcinterfacesmonitorstatemachinecpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/monitorstatemachine.cpp (14571 => 14572)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/monitorstatemachine.cpp 2009-08-19 18:34:29 UTC (rev 14571)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/monitorstatemachine.cpp 2009-08-19 22:05:18 UTC (rev 14572)
</span><span class="lines">@@ -2,6 +2,10 @@
</span><span class="cx"> #include "eslconnection.h"
</span><span class="cx"> #include "esl.h"
</span><span class="cx">
</span><ins>+Event::Event(QHash<QString, QString> headers)
+ : _headers(headers)
+{}
+
</ins><span class="cx"> State::State(int state_id, QString state_name, QHash<QString, QString> variables)
</span><span class="cx"> : _state_id(state_id),
</span><span class="cx"> _state_name(state_name),
</span><span class="lines">@@ -154,4 +158,17 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ /* Append new event to uuid */
+ QString event_uuid = e._headers.value("Unique-ID");
+ if (!event_uuid.isEmpty())
+ {
+ Event *event = new Event(e._headers);
+ Channel * chan = _channels.value(event_uuid, NULL);
+ if (!chan)
+ chan = _inactive_channels.value(event_uuid, NULL);
+ if (!chan)
+ qDebug() << QString("Event %1 has no uuid.").arg(e.getType());
+ chan->addEvent(event);
+ emit newEvent(chan, event);
+ }
</ins><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcinterfacesmonitorstatemachineh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/monitorstatemachine.h (14571 => 14572)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/monitorstatemachine.h 2009-08-19 18:34:29 UTC (rev 14571)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/monitorstatemachine.h 2009-08-19 22:05:18 UTC (rev 14572)
</span><span class="lines">@@ -7,6 +7,16 @@
</span><span class="cx">
</span><span class="cx"> class ESLconnection;
</span><span class="cx">
</span><ins>+class Event
+{
+private:
+ QHash<QString, QString> _headers;
+public:
+ Event(QHash<QString, QString> headers);
+ QString getEventName() { return _headers.value("Event-Name"); }
+ QHash<QString, QString> getHeaders() { return _headers; }
+};
+
</ins><span class="cx"> class State
</span><span class="cx"> {
</span><span class="cx"> private:
</span><span class="lines">@@ -27,6 +37,7 @@
</span><span class="cx"> QString *_uuid;
</span><span class="cx"> QList <State *> _states;
</span><span class="cx"> State *_currentConfig;
</span><ins>+ QList<Event *> _events;
</ins><span class="cx"> public:
</span><span class="cx"> Channel(QString uuid, State *state);
</span><span class="cx"> QHash<QString, QString> getCurrentStateVariables() { return _currentConfig->getHeaders(); }
</span><span class="lines">@@ -35,6 +46,9 @@
</span><span class="cx"> QString getCurrentStateHeader(QString header) { return _currentConfig->getHeader(header); }
</span><span class="cx"> void stateChanged(State *state) { _states.append(state); _currentConfig = state; }
</span><span class="cx"> QList <State *> getStates() { return _states; }
</span><ins>+ void addEvent(Event * event) { _events.append(event); }
+ QList<Event *> getEvents() { return _events; }
+ Event * getEvent(int i) { return _events.at(i); }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class Call
</span><span class="lines">@@ -79,6 +93,7 @@
</span><span class="cx"> void callCreated(Call *);
</span><span class="cx"> void callDestroyed(Call *);
</span><span class="cx"> void channelDestroyed(Channel *);
</span><ins>+ void newEvent(Channel *, Event *);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #endif // MONITORSTATEMACHINE_H
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginrealtimemodelscpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimemodels.cpp (14571 => 14572)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimemodels.cpp 2009-08-19 18:34:29 UTC (rev 14571)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimemodels.cpp 2009-08-19 22:05:18 UTC (rev 14572)
</span><span class="lines">@@ -20,3 +20,23 @@
</span><span class="cx">
</span><span class="cx"> return (_uuid_list.contains(sourceModel()->data(index0, Qt::UserRole).toString()));
</span><span class="cx"> }
</span><ins>+
+EventSortModel::EventSortModel(QObject *parent) :
+ QSortFilterProxyModel(parent)
+{}
+
+void EventSortModel::setUUIDFilter(QString uuid)
+{
+ _uuid = uuid;
+ invalidateFilter();
+}
+
+bool EventSortModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const
+{
+ QModelIndex index0 = sourceModel()->index(sourceRow, 0, sourceParent);
+
+ if (_uuid.isEmpty())
+ return false;
+
+ return (sourceModel()->data(index0, Qt::UserRole).toString() == _uuid);
+}
</ins></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginrealtimemodelsh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimemodels.h (14571 => 14572)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimemodels.h 2009-08-19 18:34:29 UTC (rev 14571)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimemodels.h 2009-08-19 22:05:18 UTC (rev 14572)
</span><span class="lines">@@ -16,4 +16,17 @@
</span><span class="cx"> QList<QString> _uuid_list;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+class EventSortModel : public QSortFilterProxyModel {
+
+ Q_OBJECT
+
+public:
+ EventSortModel(QObject *parent = 0);
+ void setUUIDFilter(QString uuid);
+
+protected:
+ bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const;
+ QString _uuid;
+};
+
</ins><span class="cx"> #endif // REALTIMEMODELS_H
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginrealtimestatisticsdialogcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimestatisticsdialog.cpp (14571 => 14572)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimestatisticsdialog.cpp 2009-08-19 18:34:29 UTC (rev 14571)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimestatisticsdialog.cpp 2009-08-19 22:05:18 UTC (rev 14572)
</span><span class="lines">@@ -11,6 +11,14 @@
</span><span class="cx"> {
</span><span class="cx"> m_ui->setupUi(this);
</span><span class="cx">
</span><ins>+ /* Connect event stuff */
+ connect(sm, SIGNAL(newEvent(Channel*,Event*)),
+ this, SLOT(newEvent(Channel*,Event*)));
+ connect(m_ui->listActiveEvents, SIGNAL(clicked(QModelIndex)),
+ this, SLOT(activeEventSelected(QModelIndex)));
+ connect(m_ui->listInactiveEvents, SIGNAL(clicked(QModelIndex)),
+ this, SLOT(inactiveEventSelected(QModelIndex)));
+
</ins><span class="cx"> /* Connect channel stuff */
</span><span class="cx"> connect(sm, SIGNAL(channelCreated(Channel*)),
</span><span class="cx"> this, SLOT(channelCreate(Channel*)));
</span><span class="lines">@@ -33,6 +41,7 @@
</span><span class="cx"> connect(m_ui->listInactiveCalls, SIGNAL(itemSelectionChanged()),
</span><span class="cx"> this, SLOT(inactiveCallSelectionChanged()));
</span><span class="cx">
</span><ins>+ /* Channel models */
</ins><span class="cx"> _channel_model = new QStandardItemModel(this);
</span><span class="cx"> _channel_sort_model = new ChannelSortModel(this);
</span><span class="cx"> _channel_sort_model->setSourceModel(_channel_model);
</span><span class="lines">@@ -43,6 +52,13 @@
</span><span class="cx"> _inactive_channel_sort_model->setSourceModel(_inactive_channel_model);
</span><span class="cx"> m_ui->listInactiveChannels->setModel(_inactive_channel_sort_model);
</span><span class="cx">
</span><ins>+ /* Event models */
+ _event_model = new QStandardItemModel(this);
+ _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);
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RealtimeStatisticsDialog::~RealtimeStatisticsDialog()
</span><span class="lines">@@ -68,9 +84,9 @@
</span><span class="cx"> if (!ch)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- QStandardItem *item = new QStandardItem(QString("%1 - %2").arg(ch->getUUID(), ch->getCurrentStateHeader("Channel-State")));
</del><ins>+ QStandardItem *item = new QStandardItem(QString("%1 - %2").arg(ch->getUUID()));
</ins><span class="cx"> item->setData(ch->getUUID(), Qt::UserRole);
</span><del>- _channel_model->insertRow(0, item);
</del><ins>+ _channel_model->appendRow(item);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RealtimeStatisticsDialog::channelDestroy(Channel *ch)
</span><span class="lines">@@ -86,10 +102,13 @@
</span><span class="cx"> if (item->data(Qt::UserRole) == ch->getUUID())
</span><span class="cx"> {
</span><span class="cx"> if (selectedIndex.isValid() && selectedIndex.data(Qt::UserRole) == ch->getUUID())
</span><del>- m_ui->listActiveVariables->clear();
</del><ins>+ {
+ m_ui->listActiveHeaders->clear();
+ }
</ins><span class="cx">
</span><span class="cx"> _channel_model->takeRow(item->index().row());
</span><del>- _inactive_channel_model->insertRow(0, item);
</del><ins>+ _inactive_channel_model->appendRow(item);
+ _event_sort_model->setUUIDFilter("");
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -107,7 +126,6 @@
</span><span class="cx"> {
</span><span class="cx"> activeChannelSelected(_channel_model->indexFromItem(item));
</span><span class="cx"> }
</span><del>- item->setText(QString("%1 - %2").arg(ch->getUUID(), ch->getCurrentStateHeader("Channel-State")));
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> foreach (QStandardItem *item, _inactive_channel_model->findItems("*", Qt::MatchWildcard | Qt::MatchRecursive))
</span><span class="lines">@@ -117,38 +135,62 @@
</span><span class="cx"> {
</span><span class="cx"> inactiveChannelSelected(_inactive_channel_model->indexFromItem(item));
</span><span class="cx"> }
</span><del>- item->setText(QString("%1 - %2").arg(ch->getUUID(), ch->getCurrentStateHeader("Channel-State")));
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RealtimeStatisticsDialog::activeChannelSelected(QModelIndex index)
</span><span class="cx"> {
</span><del>- m_ui->listActiveVariables->clear();
</del><span class="cx">
</span><ins>+ m_ui->listActiveHeaders->clear();
+
</ins><span class="cx"> Channel * ch = _sm->getChannel(index.data(Qt::UserRole).toString());
</span><span class="cx"> if (!ch)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- foreach (QString key, ch->getCurrentStateVariables().keys())
- {
- m_ui->listActiveVariables->addItem(QString("%1 = %2").arg(key, ch->getCurrentStateVariables().value(key)));
- }
</del><ins>+ _event_sort_model->setUUIDFilter(ch->getUUID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RealtimeStatisticsDialog::inactiveChannelSelected(QModelIndex index)
</span><span class="cx"> {
</span><del>- m_ui->listInactiveVariables->clear();
</del><ins>+ m_ui->listActiveHeaders->clear();
</ins><span class="cx">
</span><span class="cx"> Channel * ch = _sm->getInactiveChannel(index.data(Qt::UserRole).toString());
</span><span class="cx"> if (!ch)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- foreach (QString key, ch->getCurrentStateVariables().keys())
</del><ins>+ _event_sort_model->setUUIDFilter(ch->getUUID());
+}
+
+void RealtimeStatisticsDialog::activeEventSelected(QModelIndex index)
+{
+ Channel *ch = _sm->getChannel(index.data(Qt::UserRole).toString());
+ if (!ch)
+ return;
+
+ m_ui->listActiveHeaders->clear();
+
+ Event * e = ch->getEvent(index.row());
+ foreach (QString key, e->getHeaders().keys())
</ins><span class="cx"> {
</span><del>- m_ui->listInactiveVariables->addItem(QString("%1 = %2").arg(key, ch->getCurrentStateVariables().value(key)));
</del><ins>+ m_ui->listActiveHeaders->addItem(QString("%1 = %2").arg(key, e->getHeaders().value(key)));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void RealtimeStatisticsDialog::inactiveEventSelected(QModelIndex index)
+{
+ Channel *ch = _sm->getInactiveChannel(index.data(Qt::UserRole).toString());
+ if (!ch)
+ return;
+
+ m_ui->listInactiveHeaders->clear();
+
+ Event * e = ch->getEvent(index.row());
+ foreach (QString key, e->getHeaders().keys())
+ {
+ m_ui->listInactiveHeaders->addItem(QString("%1 = %2").arg(key, e->getHeaders().value(key)));
+ }
+}
+
</ins><span class="cx"> void RealtimeStatisticsDialog::activeCallSelectionChanged()
</span><span class="cx"> {
</span><span class="cx"> QList<QListWidgetItem *> selection = m_ui->listActiveCalls->selectedItems();
</span><span class="lines">@@ -212,3 +254,13 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+void RealtimeStatisticsDialog::newEvent(Channel *ch, Event *e)
+{
+ if (!ch && !e)
+ return;
+
+ QStandardItem *item = new QStandardItem(e->getEventName());
+ item->setData(ch->getUUID(), Qt::UserRole);
+ _event_model->appendRow(item);
+}
</ins></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginrealtimestatisticsdialogh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimestatisticsdialog.h (14571 => 14572)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimestatisticsdialog.h 2009-08-19 18:34:29 UTC (rev 14571)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimestatisticsdialog.h 2009-08-19 22:05:18 UTC (rev 14572)
</span><span class="lines">@@ -8,9 +8,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> class MonitorStateMachine;
</span><ins>+class Event;
</ins><span class="cx"> class Channel;
</span><span class="cx"> class Call;
</span><span class="cx"> class ChannelSortModel;
</span><ins>+class EventSortModel;
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> class RealtimeStatisticsDialog : public QDialog {
</span><span class="lines">@@ -29,18 +31,27 @@
</span><span class="cx"> void channelStateChanged(Channel *);
</span><span class="cx"> void activeChannelSelected(QModelIndex);
</span><span class="cx"> void inactiveChannelSelected(QModelIndex);
</span><ins>+ void activeEventSelected(QModelIndex);
+ void inactiveEventSelected(QModelIndex);
</ins><span class="cx"> void activeCallSelectionChanged();
</span><span class="cx"> void inactiveCallSelectionChanged();
</span><span class="cx"> void callCreate(Call *);
</span><span class="cx"> void callDestroy(Call *);
</span><ins>+ void newEvent(Channel *, Event *);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> Ui::RealtimeStatisticsDialog *m_ui;
</span><span class="cx"> MonitorStateMachine *_sm;
</span><ins>+ /* Channel models */
</ins><span class="cx"> QStandardItemModel *_channel_model;
</span><span class="cx"> ChannelSortModel *_channel_sort_model;
</span><span class="cx"> QStandardItemModel *_inactive_channel_model;
</span><span class="cx"> ChannelSortModel *_inactive_channel_sort_model;
</span><ins>+ /* Event models */
+ QStandardItemModel *_event_model;
+ EventSortModel *_event_sort_model;
+ QStandardItemModel *_inactive_event_model;
+ EventSortModel *_inactive_event_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 (14571 => 14572)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimestatisticsdialog.ui 2009-08-19 18:34:29 UTC (rev 14571)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimestatisticsdialog.ui 2009-08-19 22:05:18 UTC (rev 14572)
</span><span class="lines">@@ -6,8 +6,8 @@
</span><span class="cx"> <rect>
</span><span class="cx"> <x>0</x>
</span><span class="cx"> <y>0</y>
</span><del>- <width>612</width>
- <height>534</height>
</del><ins>+ <width>1186</width>
+ <height>496</height>
</ins><span class="cx"> </rect>
</span><span class="cx"> </property>
</span><span class="cx"> <property name="windowTitle">
</span><span class="lines">@@ -16,7 +16,7 @@
</span><span class="cx"> <property name="sizeGripEnabled">
</span><span class="cx"> <bool>true</bool>
</span><span class="cx"> </property>
</span><del>- <layout class="QVBoxLayout" name="verticalLayout_2">
</del><ins>+ <layout class="QHBoxLayout" name="horizontalLayout_6">
</ins><span class="cx"> <item>
</span><span class="cx"> <widget class="QTabWidget" name="tabWidget">
</span><span class="cx"> <property name="currentIndex">
</span><span class="lines">@@ -28,58 +28,73 @@
</span><span class="cx"> </attribute>
</span><span class="cx"> <layout class="QHBoxLayout" name="horizontalLayout_5">
</span><span class="cx"> <item>
</span><del>- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
- <widget class="QGroupBox" name="groupBox">
- <property name="title">
- <string>Channels</string>
- </property>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <widget class="QListView" name="listActiveChannels">
- <property name="editTriggers">
- <set>QAbstractItemView::NoEditTriggers</set>
- </property>
- <property name="alternatingRowColors">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <widget class="QGroupBox" name="groupBox_3">
- <property name="title">
- <string>Calls</string>
- </property>
- <layout class="QHBoxLayout" name="horizontalLayout_3">
- <item>
- <widget class="QListWidget" name="listActiveCalls">
- <property name="editTriggers">
- <set>QAbstractItemView::NoEditTriggers</set>
- </property>
- <property name="alternatingRowColors">
- <bool>true</bool>
- </property>
- <property name="selectionMode">
- <enum>QAbstractItemView::ExtendedSelection</enum>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- </layout>
</del><ins>+ <widget class="QGroupBox" name="groupBox_3">
+ <property name="title">
+ <string>Calls</string>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <item>
+ <widget class="QListWidget" name="listActiveCalls">
+ <property name="editTriggers">
+ <set>QAbstractItemView::NoEditTriggers</set>
+ </property>
+ <property name="alternatingRowColors">
+ <bool>true</bool>
+ </property>
+ <property name="selectionMode">
+ <enum>QAbstractItemView::ExtendedSelection</enum>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
</ins><span class="cx"> </item>
</span><span class="cx"> <item>
</span><ins>+ <widget class="QGroupBox" name="groupBox">
+ <property name="title">
+ <string>Channels</string>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QListView" name="listActiveChannels">
+ <property name="editTriggers">
+ <set>QAbstractItemView::NoEditTriggers</set>
+ </property>
+ <property name="alternatingRowColors">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="groupBox_4">
+ <property name="title">
+ <string>Events</string>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout_4">
+ <item>
+ <widget class="QListView" name="listActiveEvents">
+ <property name="editTriggers">
+ <set>QAbstractItemView::NoEditTriggers</set>
+ </property>
+ <property name="alternatingRowColors">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
</ins><span class="cx"> <widget class="QGroupBox" name="groupBox_2">
</span><span class="cx"> <property name="title">
</span><del>- <string>Variables</string>
</del><ins>+ <string>Headers</string>
</ins><span class="cx"> </property>
</span><span class="cx"> <layout class="QHBoxLayout" name="horizontalLayout_2">
</span><span class="cx"> <item>
</span><del>- <widget class="QListWidget" name="listActiveVariables">
</del><ins>+ <widget class="QListWidget" name="listActiveHeaders">
</ins><span class="cx"> <property name="editTriggers">
</span><span class="cx"> <set>QAbstractItemView::NoEditTriggers</set>
</span><span class="cx"> </property>
</span><span class="lines">@@ -100,66 +115,81 @@
</span><span class="cx"> <attribute name="title">
</span><span class="cx"> <string>Inactive</string>
</span><span class="cx"> </attribute>
</span><del>- <layout class="QHBoxLayout" name="horizontalLayout_12">
</del><ins>+ <layout class="QHBoxLayout" name="horizontalLayout_11">
</ins><span class="cx"> <item>
</span><del>- <layout class="QVBoxLayout" name="verticalLayout_4">
- <item>
- <widget class="QGroupBox" name="groupBox_7">
- <property name="title">
- <string>Channels</string>
- </property>
- <layout class="QHBoxLayout" name="horizontalLayout_9">
- <item>
- <widget class="QListView" name="listInactiveChannels">
- <property name="editTriggers">
- <set>QAbstractItemView::NoEditTriggers</set>
- </property>
- <property name="alternatingRowColors">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <widget class="QGroupBox" name="groupBox_8">
- <property name="title">
- <string>Calls</string>
- </property>
- <layout class="QHBoxLayout" name="horizontalLayout_10">
- <item>
- <widget class="QListWidget" name="listInactiveCalls">
- <property name="editTriggers">
- <set>QAbstractItemView::NoEditTriggers</set>
- </property>
- <property name="alternatingRowColors">
- <bool>true</bool>
- </property>
- <property name="selectionMode">
- <enum>QAbstractItemView::ExtendedSelection</enum>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- </layout>
</del><ins>+ <widget class="QGroupBox" name="groupBox_8">
+ <property name="title">
+ <string>Calls</string>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout_10">
+ <item>
+ <widget class="QListWidget" name="listInactiveCalls">
+ <property name="editTriggers">
+ <set>QAbstractItemView::NoEditTriggers</set>
+ </property>
+ <property name="alternatingRowColors">
+ <bool>true</bool>
+ </property>
+ <property name="selectionMode">
+ <enum>QAbstractItemView::ExtendedSelection</enum>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
</ins><span class="cx"> </item>
</span><span class="cx"> <item>
</span><del>- <widget class="QGroupBox" name="groupBox_9">
</del><ins>+ <widget class="QGroupBox" name="groupBox_7">
</ins><span class="cx"> <property name="title">
</span><del>- <string>Variables</string>
</del><ins>+ <string>Channels</string>
</ins><span class="cx"> </property>
</span><del>- <layout class="QHBoxLayout" name="horizontalLayout_11">
</del><ins>+ <layout class="QHBoxLayout" name="horizontalLayout_9">
</ins><span class="cx"> <item>
</span><del>- <widget class="QListWidget" name="listInactiveVariables">
</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="cx"> <property name="alternatingRowColors">
</span><span class="cx"> <bool>true</bool>
</span><span class="cx"> </property>
</span><ins>+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="groupBox_6">
+ <property name="title">
+ <string>Events</string>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout_8">
+ <item>
+ <widget class="QListView" name="listInactiveEvents">
+ <property name="editTriggers">
+ <set>QAbstractItemView::NoEditTriggers</set>
+ </property>
+ <property name="alternatingRowColors">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="groupBox_5">
+ <property name="title">
+ <string>Headers</string>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout_7">
+ <item>
+ <widget class="QListWidget" name="listInactiveHeaders">
+ <property name="editTriggers">
+ <set>QAbstractItemView::NoEditTriggers</set>
+ </property>
+ <property name="alternatingRowColors">
+ <bool>true</bool>
+ </property>
</ins><span class="cx"> <property name="sortingEnabled">
</span><span class="cx"> <bool>false</bool>
</span><span class="cx"> </property>
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>