update

Author: electrocoder

MQTTClient.py

@@ -21,7 +21,6 @@
 import about as about
 import new_connect as new_connect
 import open_connect as open_connect
-import search as search
 import subscriber
 from config_file import ConfigFile
 from main_window_frame_ui import MainWindowFrameUI
@@ -63,8 +62,7 @@ def button_connect(self):
                     "state"] = tk.NORMAL
                 self.main_window_frame_ui.button_publich_topic[
                     "state"] = tk.NORMAL
-                self.main_window_frame_ui.button_search[
-                    "state"] = tk.NORMAL
+
         else:
             messagebox.showerror("showerror", "Please select broker.")
 
@@ -84,10 +82,10 @@ def button_subscribe_topic(self):
         print("button_subscribe_topic")
         self.subscriber.subscribe_start(
             self.main_window_frame_ui.entry_subscribe_topic_text.get())
-
-    def search(self):
-        print("search")
-        search.SearchWindow(self.master, self.text_font, self.subscriber)
+        self.main_window_frame_ui.button_filter_add[
+            "state"] = tk.NORMAL
+        self.main_window_frame_ui.button_filter_remove[
+            "state"] = tk.DISABLED
 
     def button_publish_topic(self):
         print("button_publish_topic")
@@ -110,6 +108,20 @@ def new_connect_window(self):
     def open_connect_window(self):
         open_connect.OpenConnect(self.main_window_frame_ui, self.text_font)
 
+    def add_filter(self):
+        self.main_window_frame_ui.msg_filter = True
+        self.main_window_frame_ui.button_filter_add[
+            "state"] = tk.DISABLED
+        self.main_window_frame_ui.button_filter_remove[
+            "state"] = tk.NORMAL
+
+    def remove_filter(self):
+        self.main_window_frame_ui.msg_filter = False
+        self.main_window_frame_ui.button_filter_add[
+            "state"] = tk.NORMAL
+        self.main_window_frame_ui.button_filter_remove[
+            "state"] = tk.DISABLED
+
 
 if __name__ == "__main__":
     app = App()

main_window_frame_ui.py

@@ -22,6 +22,8 @@ def __init__(self, main_window_frame, main_window_self, font_size, *args,
         self.main_window_frame = main_window_frame
         self.main_window_self = main_window_self
 
+        self.msg_filter = False
+
         row = 0
         column = 0
 
@@ -106,26 +108,44 @@ def __init__(self, main_window_frame, main_window_self, font_size, *args,
                                                 command=main_window_self.button_subscribe_topic)
         self.button_subscribe_topic.grid(row=row, column=column)
 
+        # filter msg
+        row += 1
+        column = 0
+
+        self.label_msg_filter = tk.Label(self, text="Filter Message",
+                                         font=font_size)
+        self.label_msg_filter.grid(row=row, column=column, sticky=tk.W)
+        self.label_msg_filter.grid(row=row, column=column, sticky=tk.W)
+
         column += 1
-        self.button_search = tk.Button(self,
-                                       text="Search", font=font_size,
-                                       state=tk.DISABLED,
-                                       command=main_window_self.search)
-        self.button_search.grid(row=row, column=column)
+
+        self.entry_msg_filter_text = tk.StringVar(self)
+        self.entry_msg_filter = tk.Entry(self,
+                                         textvariable=self.entry_msg_filter_text,
+                                         font=font_size)
+        self.entry_msg_filter.grid(row=row, column=column)
+        column += 1
+
+        self.button_filter_add = tk.Button(self,
+                                           text="Add Filter", font=font_size,
+                                           state=tk.DISABLED,
+                                           command=main_window_self.add_filter)
+        self.button_filter_add.grid(row=row, column=column)
+        column += 1
+
+        self.button_filter_remove = tk.Button(self,
+                                              text="Remove Filter",
+                                              font=font_size,
+                                              state=tk.DISABLED,
+                                              command=main_window_self.remove_filter)
+        self.button_filter_remove.grid(row=row, column=column)
 
         row += 1
         column = 0
 
         # subscribe list
-        # self.listbox_message_scrollbar = tk.Scrollbar(self, orient=tk.VERTICAL)
-        self.listbox_message = tk.Text(self, font=font_size, height=15)
-        # self.listbox_message.config(
-        #     yscrollcommand=self.listbox_message_scrollbar.set)
+        self.listbox_message = tk.Text(self, font=font_size, height=12)
         self.listbox_message.grid(row=row, column=column, columnspan=6)
-        # self.listbox_message_scrollbar.config(
-        #     command=self.listbox_message.yview)
-        # self.listbox_message_scrollbar.grid(row=row, column=column + 4,
-        #                                     ipady=70)
 
         # menu
         menubar = tk.Menu(main_window_self)

search.py

@@ -42,17 +42,27 @@ def on_disconnect(self, client, userdata, rc):
     def on_message(self, client, userdata, msg):
         self.topic = msg.topic
         self.message = msg.payload.decode('utf8')
-        self.main_window_frame_ui.listbox_message.insert(tk.END,
-                                                         ">{} {} {}\n".format(
-                                                             self.on_message_count,
-                                                             self.topic,
-                                                             self.message))
-        self.main_window_frame_ui.listbox_message.see("end")
-        self.on_message_count += 1
+        if self.main_window_frame_ui.msg_filter:
+            if self.main_window_frame_ui.entry_msg_filter_text.get() in self.message:
+                self.main_window_frame_ui.listbox_message.insert(tk.END,
+                                                                 ">{} {} {}\n".format(
+                                                                     self.on_message_count,
+                                                                     self.topic,
+                                                                     self.message))
+                self.main_window_frame_ui.listbox_message.see("end")
+                self.on_message_count += 1
+        else:
+            self.main_window_frame_ui.listbox_message.insert(tk.END,
+                                                             ">{} {} {}\n".format(
+                                                                 self.on_message_count,
+                                                                 self.topic,
+                                                                 self.message))
+            self.main_window_frame_ui.listbox_message.see("end")
+            self.on_message_count += 1
+
         self.main_window_frame_ui.connect_status_text.set(
             "Connected | Message: %s | Publish: %s" % (
                 self.on_message_count, self.publish_message_count))
-        self.get_message()
 
     def connect_start(self, broker, port, username, password):
         self.client.username_pw_set(username, password)
@@ -70,6 +80,3 @@ def subscribe_start(self, topic):
     def publish_start(self, topic, msg):
         self.client.publish(topic, msg)
         self.publish_message_count += 1
-
-    def get_message(self):
-        return self.topic, self.message