From 9112a2214ffe5875996bc8830ca2448555b57428 Mon Sep 17 00:00:00 2001 From: Tom Date: Tue, 3 Apr 2012 16:44:56 +0200 Subject: finished architecture part --- Src/PyCatcher/GUI/catcher_main.glade | 112 ++++++++++------------------------- Src/PyCatcher/src/pyCatcherModel.py | 2 +- 2 files changed, 32 insertions(+), 82 deletions(-) (limited to 'Src') 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 @@ - Bayes Filter Evaluator + Grouped Evaluator True True False @@ -371,7 +371,7 @@ False - Base Station Analysis Toolkit + IMSI Catcher Detection System 800 600 False @@ -460,6 +460,34 @@ True + + + True + False + False + Evaluation + True + utilities-system-monitor + + + False + True + + + + + True + False + False + Location + True + applications-internet + + + False + True + + True @@ -928,45 +956,6 @@ 10 - - - True - False - - - True - False - - - - False - True - 0 - - - - - Use GPS - True - True - False - False - 0 - True - - - False - True - 1 - - - - - False - True - 11 - - Local Area Database @@ -980,46 +969,7 @@ False True - 12 - - - - - True - False - - - True - False - - - - False - True - 0 - - - - - Use Learning - True - True - False - False - 0 - True - - - False - True - 1 - - - - - False - True - 13 + 11 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): -- cgit v1.2.3-55-g7522