<!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][14601] </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=14601">14601</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2009-08-23 01:06:54 -0500 (Sun, 23 Aug 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Filter UUID from RealtimeStatistics and populate lists upon RealtimeStatistics activation</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcinterfacesmonitorstatemachineh">freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/monitorstatemachine.h</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginconsoletabwidgetcpp">freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.cpp</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginconsoletabwidgeth">freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.h</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginconsoletabwidgetui">freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.ui</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="freeswitchtrunkcontribjmesquitafsguisrcinterfacesmonitorstatemachineh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/monitorstatemachine.h (14600 => 14601)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/monitorstatemachine.h 2009-08-23 05:43:32 UTC (rev 14600)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/monitorstatemachine.h 2009-08-23 06:06:54 UTC (rev 14601)
</span><span class="lines">@@ -81,6 +81,9 @@
</span><span class="cx"> void delESLconnection(ESLconnection *);
</span><span class="cx"> int channelCount() { return _channels.count(); }
</span><span class="cx"> QList<Channel *> getChannels() { return _channels.values(); }
</span><ins>+ QList<Channel *> getInactiveChannels() { return _inactive_channels.values(); }
+ QList<Call *> getCalls() { return _calls.values(); }
+ QList<Call *> getInactiveCalls() { return _inactive_calls.values(); }
</ins><span class="cx"> Channel * getChannel(QString uuid) { return _channels.value(uuid, NULL); }
</span><span class="cx"> Channel * getInactiveChannel(QString uuid) { return _inactive_channels.value(uuid, NULL); }
</span><span class="cx"> Call * getCall(QString uuid) { return _calls.value(uuid, NULL); }
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginconsoletabwidgetcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.cpp (14600 => 14601)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.cpp 2009-08-23 05:43:32 UTC (rev 14600)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.cpp 2009-08-23 06:06:54 UTC (rev 14601)
</span><span class="lines">@@ -62,16 +62,6 @@
</span><span class="cx"> QObject::connect(esl, SIGNAL(receivedLogMessage(ESLevent)),
</span><span class="cx"> this, SLOT(gotEvent(ESLevent)));
</span><span class="cx">
</span><del>- /* Test SVN version to enable or disable UUID searching */
- bool ok;
- int version = QString(FSGUI_SVN_VERSION).toInt(&ok);
- if (ok) {
- if (version >= 14598)
- m_ui->filterSyntaxComboBox->addItem("UUID");
- /* User is running modified version and must be responsible */
- } else {
- m_ui->filterSyntaxComboBox->addItem("UUID");
- }
</del><span class="cx">
</span><span class="cx"> esl->connect();
</span><span class="cx">
</span><span class="lines">@@ -332,3 +322,9 @@
</span><span class="cx"> settings.endGroup();
</span><span class="cx"> settings.endGroup();
</span><span class="cx"> }
</span><ins>+
+void ConsoleTabWidget::filterLogUUID(QString uuid)
+{
+ m_ui->filterSyntaxComboBox->setCurrentIndex(3);
+ m_ui->lineFilter->setText(uuid);
+}
</ins></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginconsoletabwidgeth"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.h (14600 => 14601)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.h 2009-08-23 05:43:32 UTC (rev 14600)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.h 2009-08-23 06:06:54 UTC (rev 14601)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx"> public slots:
</span><span class="cx"> void clearConsoleContents();
</span><span class="cx"> void showRealtimeStats();
</span><ins>+ void filterLogUUID(QString);
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> void changeEvent(QEvent *e);
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginconsoletabwidgetui"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.ui (14600 => 14601)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.ui 2009-08-23 05:43:32 UTC (rev 14600)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.ui 2009-08-23 06:06:54 UTC (rev 14601)
</span><span class="lines">@@ -57,6 +57,11 @@
</span><span class="cx"> <string>Fixed String</string>
</span><span class="cx"> </property>
</span><span class="cx"> </item>
</span><ins>+ <item>
+ <property name="text">
+ <string>UUID</string>
+ </property>
+ </item>
</ins><span class="cx"> </widget>
</span><span class="cx"> </item>
</span><span class="cx"> <item>
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginrealtimestatisticsdialogcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimestatisticsdialog.cpp (14600 => 14601)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimestatisticsdialog.cpp 2009-08-23 05:43:32 UTC (rev 14600)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimestatisticsdialog.cpp 2009-08-23 06:06:54 UTC (rev 14601)
</span><span class="lines">@@ -3,6 +3,7 @@
</span><span class="cx"> #include "ui_realtimestatisticsdialog.h"
</span><span class="cx"> #include "monitorstatemachine.h"
</span><span class="cx"> #include "realtimemodels.h"
</span><ins>+#include "consoletabwidget.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">@@ -28,6 +29,8 @@
</span><span class="cx"> this, SLOT(activeChannelSelected(QModelIndex)));
</span><span class="cx"> connect(m_ui->listInactiveChannels, SIGNAL(clicked(QModelIndex)),
</span><span class="cx"> this, SLOT(inactiveChannelSelected(QModelIndex)));
</span><ins>+ connect(m_ui->btnFilterLog, SIGNAL(clicked()),
+ this, SLOT(filterLogs()));
</ins><span class="cx">
</span><span class="cx"> /* Connect call stuff */
</span><span class="cx"> connect(sm, SIGNAL(callCreated(Call*)),
</span><span class="lines">@@ -61,6 +64,7 @@
</span><span class="cx"> _inactive_event_sort_model->setSourceModel(_inactive_event_model);
</span><span class="cx"> m_ui->listInactiveEvents->setModel(_inactive_event_sort_model);
</span><span class="cx">
</span><ins>+ readModels();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RealtimeStatisticsDialog::~RealtimeStatisticsDialog()
</span><span class="lines">@@ -251,3 +255,49 @@
</span><span class="cx"> item->setData(ch->getUUID(), Qt::UserRole);
</span><span class="cx"> _event_model->appendRow(item);
</span><span class="cx"> }
</span><ins>+
+void RealtimeStatisticsDialog::filterLogs()
+{
+ ConsoleTabWidget *consoleTab = qobject_cast<ConsoleTabWidget *>(parent());
+
+ QModelIndex selectedIndex;
+ /* Get the UUID */
+ if (m_ui->tabWidget->currentIndex() == 0)
+ {
+ selectedIndex = m_ui->listActiveChannels->currentIndex();
+ }
+ else
+ {
+ selectedIndex = m_ui->listInactiveChannels->currentIndex();
+ }
+ consoleTab->filterLogUUID(selectedIndex.data(Qt::UserRole).toString());
+ this->hide();
+}
+
+void RealtimeStatisticsDialog::readModels()
+{
+ /* Active channels and calls */
+ foreach(Channel *ch, _sm->getChannels())
+ {
+ channelCreate(ch);
+ }
+ foreach(Call *c, _sm->getCalls())
+ {
+ callCreate(c);
+ }
+ /* Inactive channels and calls */
+ foreach(Channel *ch, _sm->getInactiveChannels())
+ {
+ QStandardItem *item = new QStandardItem(ch->getUUID());
+ item->setData(ch->getUUID(), Qt::UserRole);
+ _inactive_channel_model->appendRow(item);
+ }
+ foreach(Call *c, _sm->getCalls())
+ {
+ QString caller_uuid = c->getCallerUUID();
+ QString callTitle = QString("Call: %1").arg(caller_uuid);
+ QListWidgetItem *item = new QListWidgetItem(callTitle, m_ui->listActiveCalls);
+ item->setData(Qt::UserRole, c->getCallerUUID());
+ m_ui->listInactiveCalls->addItem(item);
+ }
+}
</ins></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginrealtimestatisticsdialogh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimestatisticsdialog.h (14600 => 14601)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimestatisticsdialog.h 2009-08-23 05:43:32 UTC (rev 14600)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimestatisticsdialog.h 2009-08-23 06:06:54 UTC (rev 14601)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> void changeEvent(QEvent *e);
</span><span class="cx">
</span><span class="cx"> private slots:
</span><ins>+ void filterLogs();
</ins><span class="cx"> void channelCreate(Channel *);
</span><span class="cx"> void channelDestroy(Channel *);
</span><span class="cx"> void activeChannelSelected(QModelIndex);
</span><span class="lines">@@ -51,6 +52,8 @@
</span><span class="cx"> EventSortModel *_event_sort_model;
</span><span class="cx"> QStandardItemModel *_inactive_event_model;
</span><span class="cx"> EventSortModel *_inactive_event_sort_model;
</span><ins>+
+ void readModels();
</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 (14600 => 14601)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimestatisticsdialog.ui 2009-08-23 05:43:32 UTC (rev 14600)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimestatisticsdialog.ui 2009-08-23 06:06:54 UTC (rev 14601)
</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="QHBoxLayout" name="horizontalLayout_6">
</del><ins>+ <layout class="QVBoxLayout" name="verticalLayout">
</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">@@ -202,6 +202,30 @@
</span><span class="cx"> </widget>
</span><span class="cx"> </widget>
</span><span class="cx"> </item>
</span><ins>+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_6">
+ <item>
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QPushButton" name="btnFilterLog">
+ <property name="text">
+ <string>&amp;Filter logs</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
</ins><span class="cx"> </layout>
</span><span class="cx"> </widget>
</span><span class="cx"> <resources/>
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>