summaryrefslogtreecommitdiffstats
path: root/Src
diff options
context:
space:
mode:
authorTom2012-04-03 16:44:56 +0200
committerTom2012-04-03 16:44:56 +0200
commit9112a2214ffe5875996bc8830ca2448555b57428 (patch)
tree845f07ae4ef44255bd9f0db40589fd582ab3407a /Src
parentframework part finished (diff)
downloadimsi-catcher-detection-9112a2214ffe5875996bc8830ca2448555b57428.tar.gz
imsi-catcher-detection-9112a2214ffe5875996bc8830ca2448555b57428.tar.xz
imsi-catcher-detection-9112a2214ffe5875996bc8830ca2448555b57428.zip
finished architecture part
Diffstat (limited to 'Src')
-rw-r--r--Src/PyCatcher/GUI/catcher_main.glade112
-rw-r--r--Src/PyCatcher/src/pyCatcherModel.py2
2 files changed, 32 insertions, 82 deletions
diff --git a/Src/PyCatcher/GUI/catcher_main.glade b/Src/PyCatcher/GUI/catcher_main.glade
index 68f17cd..bb38205 100644
--- a/Src/PyCatcher/GUI/catcher_main.glade
+++ b/Src/PyCatcher/GUI/catcher_main.glade
@@ -102,7 +102,7 @@
</child>
<child>
<object class="GtkRadioButton" id="rb_bayes_evaluator">
- <property name="label" translatable="yes">Bayes Filter Evaluator</property>
+ <property name="label" translatable="yes">Grouped Evaluator</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -371,7 +371,7 @@
</object>
<object class="GtkWindow" id="main_window">
<property name="can_focus">False</property>
- <property name="title" translatable="yes">Base Station Analysis Toolkit</property>
+ <property name="title" translatable="yes">IMSI Catcher Detection System</property>
<property name="default_width">800</property>
<property name="default_height">600</property>
<property name="has_resize_grip">False</property>
@@ -461,6 +461,34 @@
</packing>
</child>
<child>
+ <object class="GtkToolButton" id="btn_evaluation">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="label" translatable="yes">Evaluation</property>
+ <property name="use_underline">True</property>
+ <property name="icon_name">utilities-system-monitor</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="btn_location">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="label" translatable="yes">Location</property>
+ <property name="use_underline">True</property>
+ <property name="icon_name">applications-internet</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkToolButton" id="btn_save_project">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -929,45 +957,6 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="box3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"> </property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="cb_use_gps">
- <property name="label" translatable="yes">Use GPS</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">11</property>
- </packing>
- </child>
- <child>
<object class="GtkCheckButton" id="cb_local_area_database">
<property name="label" translatable="yes">Local Area Database</property>
<property name="visible">True</property>
@@ -980,46 +969,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">12</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="box4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="label5">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"> </property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="cb_use_learning">
- <property name="label" translatable="yes">Use Learning</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">13</property>
+ <property name="position">11</property>
</packing>
</child>
</object>
diff --git a/Src/PyCatcher/src/pyCatcherModel.py b/Src/PyCatcher/src/pyCatcherModel.py
index bf4be14..37a311d 100644
--- a/Src/PyCatcher/src/pyCatcherModel.py
+++ b/Src/PyCatcher/src/pyCatcherModel.py
@@ -116,7 +116,7 @@ class BaseStationInformationList:
for neighbour in station.get_neighbour_arfcn():
code += str(station.arfcn) + r' -> ' + str(neighbour) + r'; '
#TODO: make printing the source a fixed option
- #print preamble + code + postamble
+ print preamble + code + postamble
return preamble + code + postamble
def refill_store(self, store, band_filter, filters=None):