updated viewer; added gui subchapter to report

diff --git a/report/gui.tex b/report/gui.tex
new file mode 100644 (file)
index 0000000..955f8a1
--- /dev/null
+++ b/report/gui.tex
@@ -0,0 +1,20 @@
+Once we have collected all the logging and verbose data from the experiment, the next step will be to analyse it. Our infrastructure provides a graphical analyzer tool for viewing peer behaviour. 
+
+The graphical analyzer is implemented in python with the help of two libraries: \textit{matplotlib} for ploting graphs and \textit{TraitsUi} for handling the widgets. 
+
+The graphical analyzer offers several important plotting options:
+  \begin{itemize}
+   \item download/upload speed during the experiement
+   \item acceleration 
+   \item statistics
+  \end{itemize}
+
+The graphical analyzer can be used in two modes:
+\begin{enumerate}
+ \item Single Client Mode
+ \item Client Comparison Mode
+\end{enumerate}
+
+In ``Single Client Mode'' the developer can observe how a peer behaved during the streaming experiment. A simple example can be seen in . The developer starts by selecting the database file of the experiment he wishes to view and a peer id. The next step is to choose the plotting options.
+
+In ``Client Comparisson Mode'' the developer can compare the behaviour of two peers from the experiment. 
\ No newline at end of file

diff --git a/report/logarch.tex b/report/logarch.tex
index 6baad8d855fb0eb4ee98abf861e0eb5c48347f70..f3830180cdf6db6f8a69282e4eb333cb43055a24 100644 (file)
--- a/report/logarch.tex
+++ b/report/logarch.tex
@@ -19,4 +19,5 @@
 \input{logarch/parser.tex}
 
 \subsection{Database}\label{database}
-\subsection{GUI}
\ No newline at end of file
+\subsection{GUI}
+\input{gui.tex}

diff --git a/viewer/p2p-nexteditor.py b/viewer/p2p-nexteditor.py
index e9f6e78e99212c55cd787fb6981469f2181c014b..b440ded56e97ba8fba80b28e6f9abcbffb884638 100644 (file)
--- a/viewer/p2p-nexteditor.py
+++ b/viewer/p2p-nexteditor.py
@@ -211,12 +211,12 @@ class ControlPanel(HasTraits):
                                                        Item('10'),
                                                        Item('cs_os', label='OS'),
                                                        Item('cs_os_vs', label='OS Version'),
-                                                       Item('cs_os_cpu', label='System CPU'),
-                                                       Item('cs_os_ram', label='System RAM'),
-                                                       Item('cs_public_ip', label='Public IP'),
-                                                       Item('cs_public_port', label='Public PORT'),
-                                                       Item('cs_ds_limit', label='Download LMT'),
-                                                       Item('cs_us_limit', label='Upload LMT'),
+                                                       Item('cs_os_cpu', label='CPU (MHz)'),
+                                                       Item('cs_os_ram', label='RAM (MB)'),
+                                                       Item('cs_public_ip', label='IP'),
+                                                       Item('cs_public_port', label='PORT'),
+                                                       Item('cs_ds_limit', label='Dld LMT(Kb/s)'),
+                                                       Item('cs_us_limit', label='Uld LMT(Kb/s)'),
                                                        Item('cs_start_time', label='Start Time'),
                                                        show_border=True, label='Client Session', style='readonly'),
                                                Group(
@@ -267,8 +267,8 @@ class ControlPanel(HasTraits):
                                                Item('acceleration'),
                                                show_border=True, label='Plotting Options'),
                                                Item('10'),
-                                               Item('plot2', show_label=False, height=100),
-                                       label='Comparison', dock="tab"),
+                                               Item('plot2', label='Plot', show_label=False),
+                                       label='Comparison', dock="tab", style='simple'),
                                Item('help', style='readonly', show_label=False, dock="tab"),
                                layout='tabbed')
                                )