Merge pull request #9 from ghanteyyy/main

Re-designed UI ...

Author: nsh07

.gitignore

@@ -0,0 +1 @@
+__pycache__/

data/__pycache__/commands.cpython-38.pyc

@@ -3,7 +3,6 @@
 '''
 
 
-import collections
 from tkinter import messagebox
 import matplotlib.pyplot as plt
 
@@ -21,71 +20,65 @@ def default_state(entry_widgets, styles):
     entry_widgets[2].set(0)
 
 
-def add_command(entry_widgets, _vars, styles):
+def add_command(entry_widgets, text_widgets, styles):
     '''Store item_name, values and explode in respective variables'''
 
     entry_get = entry_widgets[0].get().strip()
     values_get = entry_widgets[1].get().strip()
     split_value_get = values_get.split('.')
     explode_get = entry_widgets[2].get()
 
-    pie_items_var, values_var, explode_var = _vars
-
     if entry_get in ['', 'Items']:
         messagebox.showerror('Invalid Name', 'Provide valid item name')
 
-    elif entry_get in _vars[0]:
+    elif entry_get in text_widgets[0].get('1.0', 'end-2c').split('\n'):
         messagebox.showerror('Exists', f'{entry_get} already exists in the register')
 
-    elif not split_value_get[0].isdigit() and not split_value_get[1].isdigit():
+    elif values_get in ['', 'Values'] or not split_value_get[0].isdigit() or (len(split_value_get) == 2 and not split_value_get[1].isdigit()):
         messagebox.showerror('Invalid Values', 'Values was expected in number')
 
     elif explode_get not in [1, 2]:
         messagebox.showerror('Invalid Explode', 'You must select Enable or Disable in Explode option')
 
     else:
-        pie_items_var.append(entry_get)
-        values_var.append(float(values_get))
+        default_state(entry_widgets, styles)
+        insert_to_text_widget(text_widgets, entry_get, values_get, explode_get)
 
-        if explode_get == 1:
-            explode_var.append(0.1)
 
-        else:
-            explode_var.append(0)
+def insert_to_text_widget(text_widgets, *values):
+    '''Inserting data from self.explode, self.pie_items and self.pie_items_values in their own text_widget'''
 
-        messagebox.showinfo('Added', 'Values are added')
-        default_state(entry_widgets, styles)
+    pie_items = text_widgets[0].get('1.0', 'end-1c') + values[0]
+    pie_values = text_widgets[1].get('1.0', 'end-1c') + values[1]
+    pie_explode = text_widgets[2].get('1.0', 'end-1c')
 
+    if values[2] == 1:
+        pie_explode += 'Enabled'
 
-def insert_to_text_widget(text_widgets, _vars):
-    '''Inserting data from self.explode, self.pie_items and self.pie_items_values in their own text_widget'''
+    else:
+        pie_explode += 'Disabled'
 
     for widget in text_widgets:
         widget.config(state='normal')
         widget.delete('1.0', 'end')
 
-    pie_items, pie_values, pie_explode = _vars
-    pie_explode = ['Enabled' if explode else 'Disabled' for explode in pie_explode]
-
-    for index, values in enumerate(zip(pie_items, pie_values, pie_explode)):
-        item, values, explode = values
-
-        text_widgets[0].insert('1.0', f'{item}\n')
-        text_widgets[1].insert('1.0', f'{values}\n')
-        text_widgets[2].insert('1.0', f'{explode}\n')
+    text_widgets[0].insert('1.0', f'{pie_items}\n')
+    text_widgets[1].insert('1.0', f'{pie_values}\n')
+    text_widgets[2].insert('1.0', f'{pie_explode}\n')
 
     for widget in text_widgets:
         widget.config(state='disabled', cursor='arrow')
 
 
-def make_chart(_vars):
+def make_chart(text_widgets):
     '''Make pie-chart as per the user's data'''
 
-    items, values, explode = _vars
-    count = len(set(collections.Counter(items).values()))  # Getting count of items and calculating its length
+    items = text_widgets[0].get('1.0', 'end-2c').split('\n')
+    values = [float(value) for value in text_widgets[1].get('1.0', 'end-2c').split('\n') if value]
+    explode = [0.1 if value == 'Enabled' else 0 for value in text_widgets[2].get('1.0', 'end-2c').split('\n')]
 
-    if count > 1:
-        messagebox.showerror('ERROR', 'Some items have same names.')
+    if len(items) != len(values) != len(explode):
+        messagebox.showerror('ERROR', 'There is incomplete values either in ITEMS or VALUES or EXPLODE')
 
     elif items:
         figure, pie_chart = plt.subplots()
@@ -103,16 +96,13 @@ def make_chart(_vars):
         messagebox.showerror('No data', 'No data were inputed to make pie-charts')
 
 
-def clear(_vars, text_widgets=None, styles=None):
+def clear(text_widgets):
     '''Clear data from the register'''
 
-    if _vars[0]:
-        if messagebox.askyesno('Clear Register?', 'Do you really want to clear REGISTER?'):
-            for _var in _vars:
-                _var.clear()
+    if messagebox.askyesno('Clear Register?', 'Do you really want to clear REGISTER?'):
+        for widget in text_widgets:
+            widget.config(state='normal')
+            widget.delete('1.0', 'end')
+            widget.config(state='disabled')
 
-            messagebox.showinfo('Cleared', 'All values are cleared from the REGISTER')
-            default_state(text_widgets, styles)
-
-    else:
-        messagebox.showinfo('Clear Register', "No items added yet. How about adding some items?")
+        messagebox.showinfo('Cleared', 'All values are cleared from the REGISTER')

data/__pycache__/include.cpython-38.pyc

@@ -18,9 +18,9 @@ def resource_path(relative_path):
         base_path = sys._MEIPASS  # PyInstaller creates a temporary directory and stores path of that directory in _MEIPASS
 
     except AttributeError:
-        base_path = os.path.abspath(".")
+        base_path = os.path.split(os.path.abspath("."))[0]
 
-    return os.path.join(base_path, relative_path)
+    return os.path.join(base_path, 'pics', relative_path)
 
 
 def initial_position(window, title):
@@ -35,7 +35,7 @@ def initial_position(window, title):
     window.geometry(f'{width}x{height}+{screen_width - width // 2}+{screen_height - height // 2}')
 
     window.resizable(0, 0)
-    window.iconbitmap(resource_path('..\\pics\\icon.ico'))
+    window.iconbitmap(resource_path('icon.ico'))
     window.title(title)
 
     window.deiconify()

data/__pycache__/link.cpython-38.pyc

@@ -0,0 +1,186 @@
+'''
+The main GUI window.
+'''
+
+import tkinter as tk
+import tkinter.ttk as ttk
+import link
+import include
+import commands
+
+
+class UI:
+    def __init__(self):
+        self.prev_widget = None
+        self.master = tk.Tk()
+        self.left_frame = tk.Frame(self.master, bg='white')
+
+        self.image_frame = tk.Frame(self.left_frame, bg='white')
+        self.image_obj = tk.PhotoImage(file=include.resource_path('PCC_Logo.png'))
+        self.image_label = tk.Label(self.image_frame, image=self.image_obj, cursor='hand2', bg='white')
+        self.image_label.bind('<Button-1>', lambda e: link.open_link(self.master))
+        self.image_label.pack()
+        self.image_frame.pack()
+
+        self.entries_frame = tk.Frame(self.left_frame, bg='white')
+        self.items_style, self.value_style = ttk.Style(), ttk.Style()
+        self.items_style.configure('I.TEntry', foreground='grey')
+        self.value_style.configure('V.TEntry', foreground='grey')
+        self.item_entry = ttk.Entry(self.entries_frame, justify=tk.CENTER, width=35, style='I.TEntry')
+        self.value_entry = ttk.Entry(self.entries_frame, justify=tk.CENTER, width=35, style='V.TEntry')
+
+        self.radio_button_style = ttk.Style()
+        self.radio_button_style.configure('R.TRadiobutton', background='white')
+        self.explode_frame = tk.LabelFrame(self.left_frame, text='Explode', bg='white')
+        self.radio_button_var = tk.IntVar()
+        self.explode_radio_button_enable = ttk.Radiobutton(self.explode_frame, text='Enable', variable=self.radio_button_var, value=1, cursor='hand2', style='R.TRadiobutton')
+        self.explode_radio_button_disable = ttk.Radiobutton(self.explode_frame, text='Disable', variable=self.radio_button_var, value=2, cursor='hand2', style='R.TRadiobutton')
+        self.explode_radio_button_enable.pack(side=tk.LEFT, ipadx=15, ipady=5)
+        self.explode_radio_button_disable.pack(side=tk.LEFT)
+
+        self.item_entry.pack(ipady=2, pady=3)
+        self.value_entry.pack(ipady=2, pady=3)
+        self.entries_frame.pack(pady=3)
+        self.explode_frame.pack(ipady=2, pady=3)
+
+        for widget, text in {self.item_entry: 'Items', self.value_entry: 'Values'}.items():
+            widget.insert(tk.END, text)
+
+        self.styles_list = {self.items_style: 'I.TEntry', self.value_style: 'V.TEntry'}
+        self.pie_entries = (self.item_entry, self.value_entry, self.radio_button_var)
+
+        self.buttons_frame = tk.Frame(self.left_frame, bg='white')
+        self.add_value_button = tk.Button(self.buttons_frame, text='Add Values', bg='white', activebackground='white', cursor='hand2', relief=tk.GROOVE, command=lambda: commands.add_command(self.pie_entries, self.text_widgets, self.styles_list))
+        self.clear_button = tk.Button(self.buttons_frame, text='Clear Register', bg='white', activebackground='white', cursor='hand2', relief=tk.GROOVE, command=lambda: commands.clear(self.text_widgets))
+        self.make_pie_chart_button = tk.Button(self.buttons_frame, text='Make Pie-Chart', bg='white', activebackground='white', cursor='hand2', relief=tk.GROOVE, command=lambda: commands.make_chart(self.text_widgets))
+
+        self.add_value_button.pack(ipadx=71, ipady=2, pady=3)
+        self.clear_button.pack(ipadx=64, ipady=2, pady=3)
+        self.make_pie_chart_button.pack(ipadx=59, ipady=2, pady=3)
+
+        self.buttons_frame.pack()
+
+        self.right_frame = tk.Frame(self.master, bg='white')
+        self.register_frame = tk.Frame(self.right_frame, bg='white')
+
+        self.items_ = Widgets(self.register_frame, 'ITEMS', 15)
+        self.values_ = Widgets(self.register_frame, 'VALUES')
+        self.explode_ = Widgets(self.register_frame, 'EXPLODE')
+
+        self.text_widgets = [self.items_.text_widget, self.values_.text_widget, self.explode_.text_widget]
+
+        self.scrollbar = tk.Scrollbar(self.explode_.text_widget_frame, orient="vertical", command=self.multiple_yview)
+        self.scrollbar.pack(side=tk.LEFT, fill='y')
+
+        for widgets in self.text_widgets:
+            widgets.config(yscrollcommand=self.scrollbar.set)
+
+        self.register_frame.pack()
+
+        self.var = tk.IntVar()
+        self.checkbutton_style = ttk.Style()
+        self.checkbutton_style.configure('CH.TCheckbutton', background='white')
+        self.button_frame = tk.Frame(self.right_frame, bg='white')
+        self.enable_editing_button = ttk.Checkbutton(self.button_frame, text='Enable Editing Mode', variable=self.var, cursor='hand2', style='CH.TCheckbutton', command=self.enable_editing_command)
+        self.enable_editing_button.pack(pady=10)
+        self.button_frame.pack()
+
+        self.master.bind('<Button-1>', self.master_bindings)
+        self.item_entry.bind('<FocusIn>', self.entry_bindings)
+        self.value_entry.bind('<FocusIn>', self.entry_bindings)
+        self.explode_radio_button_enable.bind('<FocusIn>', self.entry_bindings)
+        self.master.after(0, lambda: include.initial_position(self.master, 'Pie Chart Creator'))
+
+        # Showing url when hovered to image and removing it after 250 ms when cursor gets removed from the top of image
+        self.url_label = tk.Label(self.master, text='http://github.com/NMrocks/Pie-Chart-Creator', fg='green')
+        self.image_frame.bind('<Enter>', lambda e: self.url_label.place(relx=0, x=10, y=105, rely=0))
+        self.image_frame.bind('<Leave>', lambda e: self.master.after(250, self.url_label.place_forget()))
+
+        self.left_frame.pack(side=tk.LEFT)
+        self.right_frame.pack(padx=1, side=tk.LEFT)
+        self.master.config(bg='white')
+        self.master.mainloop()
+
+    def master_bindings(self, event=None):
+        '''When user clicks anywhere outside of entry boxes and buttons'''
+
+        widget = event.widget
+        widgets = [self.item_entry, self.value_entry]
+        entries_widgets = {self.item_entry: 'Items', self.value_entry: 'Values'}
+        entries_styles = {self.item_entry: (self.items_style, 'I.TEntry'), self.value_entry: (self.value_style, 'V.TEntry')}
+
+        for wid in entries_widgets:
+            if not wid.get().strip() and widget != self.prev_widget:
+                wid.delete(0, tk.END)
+                wid.insert(tk.END, entries_widgets[wid])
+                style, style_name = entries_styles[wid]
+                style.configure(style_name, foreground='grey')
+
+        if widget not in widgets:
+            if isinstance(widget, tk.Text) and widget.cget('state') == 'normal':
+                return
+
+            self.master.focus()
+
+    def entry_bindings(self, event=None):
+        '''When user clicks in or out of the entries widget'''
+
+        widget = event.widget
+        entries_widgets = {self.item_entry: 'Items', self.value_entry: 'Values'}
+        entries_styles = {self.item_entry: (self.items_style, 'I.TEntry'), self.value_entry: (self.value_style, 'V.TEntry')}
+
+        if widget in entries_widgets:
+            if widget.get().strip() == entries_widgets[widget]:
+                self.prev_widget = widget
+                widget.delete(0, tk.END)
+                style, style_name = entries_styles[widget]
+                style.configure(style_name, foreground='black')
+
+                entries_widgets.pop(widget)
+                entries_styles.pop(widget)
+
+        for wid in entries_widgets:
+            if not wid.get().strip():
+                wid.delete(0, tk.END)
+                wid.insert(tk.END, entries_widgets[wid])
+                style, style_name = entries_styles[wid]
+                style.configure(style_name, foreground='grey')
+
+    def enable_editing_command(self):
+        '''When user clicks the enable editing checkbutton'''
+
+        if self.var.get() == 1:
+            for widget in self.text_widgets:
+                widget.config(state='normal', cursor='xterm')
+
+        else:
+            for widget in self.text_widgets:
+                widget.config(state='disabled', cursor='arrow')
+
+    def multiple_yview(self, *args):
+        '''Creating commands of y-view for  all the TEXT widget'''
+
+        for widgets in self.text_widgets:
+            widgets.yview(*args)
+
+
+class Widgets:
+    def __init__(self, frame, value, width=12):
+        self.frame = tk.Frame(frame, bg='white')
+        self.label = tk.Label(self.frame, text=value, bg='white')
+        self.text_widget_frame = tk.Frame(self.frame, bg='white')
+
+        if not width:
+            width = 15
+
+        self.text_widget = tk.Text(self.text_widget_frame, width=width, height=19, highlightthickness=1,
+                                   highlightbackground="silver", highlightcolor="silver", cursor='arrow', state='disabled')
+
+        self.label.pack()
+        self.text_widget_frame.pack()
+        self.frame.pack(side=tk.LEFT)
+        self.text_widget.pack(side=tk.LEFT)
+
+
+if __name__ == '__main__':
+    UI()