From 6d2a187d605d0eeb39105e55c7283faabaef278c Mon Sep 17 00:00:00 2001 From: Godzil Date: Sun, 25 Feb 2018 20:33:29 +0000 Subject: [PATCH] Reorganising the window design --- main.py | 83 ++++++++++++++++++++++++++++++++------------------------- 1 file changed, 47 insertions(+), 36 deletions(-) diff --git a/main.py b/main.py index 179cfba..876d126 100644 --- a/main.py +++ b/main.py @@ -33,69 +33,80 @@ class WOWFileViewer: self.layer = wowfile.get_layer(self.currentLayer) - self.label = tk.Label(master, text="Layer: {num} / {tot}".format(num=self.layer.number, tot=self.layer_count)) - self.label.grid(row=1, columnspan=4) + # Configure columns and row + self.master.columnconfigure(1, weight=1) + self.master.columnconfigure(4, weight=1) + self.master.rowconfigure(2, weight=1) + # Row 1 + self.label = tk.Label(master, text="Layer: {num} / {tot}".format(num=self.layer.number, tot=self.layer_count)) + self.label.grid(row=1, columnspan=6) + + self.layern_var = tk.StringVar() + self.layern_var.set(str(self.layer.number)) + self.layern_ent = tk.Entry(master, textvariable=self.layern_var, width=6) + self.layern_ent.grid(row=1, column=7, sticky=tk.E+tk.W) + self.layern_btn = tk.Button(master, text=" Change ", command=self.layerManualSet) + self.layern_btn.grid(row=1, column=8, sticky=tk.E+tk.W+tk.N+tk.S) + + # Row 2 self.img = ImageTk.PhotoImage(self.layer.image) self.layer_img = tk.Label(master, image=self.img) - self.layer_img.grid(row=2, column=1, columnspan=3) + self.layer_img.grid(row=2, column=1, columnspan=7) tickinterval = self.layer_count/10 self.layer_select = tk.Scale(master, from_=1, to=self.layer_count, command=self.sliderUpdate, orient=tk.VERTICAL, resolution=-1, length=400, tickinterval=tickinterval, takefocus=1) - self.layer_select.grid(row=2, column=4) - - self.layern_var = tk.StringVar() - self.layern_var.set(str(self.layer.number)) - self.layern_ent = tk.Entry(master, textvariable=self.layern_var) - self.layern_ent.grid(row=1, column=3, sticky=tk.E) - self.layern_btn = tk.Button(master, text=" Change ", command=self.layerManualSet) - self.layern_btn.grid(row=1, column=4) + self.layer_select.grid(row=2, column=8, sticky=tk.E+tk.W+tk.N+tk.S) + # Row 3 self.thick_var = tk.StringVar() self.thick_var.set(str(self.layer.thickness * 1000)) self.thick_lbl = tk.Label(master, text="Layer thickness (µm): ") self.thick_lbl.grid(row=3, column=1, sticky=tk.E) - self.thick_ent = tk.Entry(master, textvariable=self.thick_var) - self.thick_ent.grid(row=3, column=2, sticky=tk.W) - - self.exp_var = tk.StringVar() - self.exp_var.set(str(self.layer.exposition)) - self.exp_lbl = tk.Label(master, text="Layer exposure level (0-255): ") - self.exp_lbl.grid(row=4, column=1, sticky=tk.E) - self.exp_ent = tk.Entry(master, textvariable=self.exp_var) - self.exp_ent.grid(row=4, column=2, sticky=tk.W) + self.thick_ent = tk.Entry(master, textvariable=self.thick_var, width=10) + self.thick_ent.grid(row=3, column=2, sticky=tk.E + tk.W) self.spdu_var = tk.StringVar() self.spdu_var.set(str(self.layer.speed_up)) self.spdu_lbl = tk.Label(master, text="Speed up (mm/min): ") - self.spdu_lbl.grid(row=3, column=3, sticky=tk.E) - self.spdu_ent = tk.Entry(master, textvariable=self.spdu_var) - self.spdu_ent.grid(row=3, column=4, sticky=tk.W) + self.spdu_lbl.grid(row=3, column=4, sticky=tk.E) + self.spdu_ent = tk.Entry(master, textvariable=self.spdu_var, width=10) + self.spdu_ent.grid(row=3, column=5, sticky=tk.E + tk.W) + + # Row 4 + self.exp_var = tk.StringVar() + self.exp_var.set(str(self.layer.exposition)) + self.exp_lbl = tk.Label(master, text="Layer exposure level (0-255): ") + self.exp_lbl.grid(row=4, column=1, sticky=tk.E) + self.exp_ent = tk.Entry(master, textvariable=self.exp_var, width=10) + self.exp_ent.grid(row=4, column=2, sticky=tk.E+tk.W) self.spdd_var = tk.StringVar() self.spdd_var.set(str(self.layer.speed_down)) self.spdd_lbl = tk.Label(master, text="Speed down (mm/min): ") - self.spdd_lbl.grid(row=4, column=3, sticky=tk.E) - self.spdd_ent = tk.Entry(master, textvariable=self.spdd_var) - self.spdd_ent.grid(row=4, column=4, sticky=tk.W) - - self.updist_var = tk.StringVar() - self.updist_var.set(str(self.layer.up_distance)) - self.updist_lbl = tk.Label(master, text="Up mvmt distance (mm): ") - self.updist_lbl.grid(row=5, column=3, sticky=tk.E) - self.updist_ent = tk.Entry(master, textvariable=self.updist_var) - self.updist_ent.grid(row=5, column=4, sticky=tk.W) + self.spdd_lbl.grid(row=4, column=4, sticky=tk.E) + self.spdd_ent = tk.Entry(master, textvariable=self.spdd_var, width=10) + self.spdd_ent.grid(row=4, column=5, sticky=tk.E+tk.W) + # Row 5 self.expt_var = tk.StringVar() self.expt_var.set(str(self.layer.exposition_time)) self.expt_lbl = tk.Label(master, text="Layer exposure time (in sec): ") self.expt_lbl.grid(row=5, column=1, sticky=tk.E) - self.expt_ent = tk.Entry(master, textvariable=self.expt_var) - self.expt_ent.grid(row=5, column=2, sticky=tk.W) + self.expt_ent = tk.Entry(master, textvariable=self.expt_var, width=10) + self.expt_ent.grid(row=5, column=2, sticky=tk.E+tk.W) + self.updist_var = tk.StringVar() + self.updist_var.set(str(self.layer.up_distance)) + self.updist_lbl = tk.Label(master, text="Up mvmt distance (mm): ") + self.updist_lbl.grid(row=5, column=4, sticky=tk.E) + self.updist_ent = tk.Entry(master, textvariable=self.updist_var, width=10) + self.updist_ent.grid(row=5, column=5, sticky=tk.E + tk.W) + + # Row 6 self.printtime_var = tk.StringVar() self.printtime_var.set(str(wowfile.get_printtime(human_readable=True))) self.printtime_lbl = tk.Label(master, text="Estimated print time: ") @@ -104,7 +115,7 @@ class WOWFileViewer: self.printtime_ent.grid(row=6, column=2, sticky=tk.W) self.close_button2 = tk.Button(master, text=" Exit ", command=master.quit) - self.close_button2.grid(row=6, column=4) + self.close_button2.grid(row=6, column=8, sticky=tk.E+tk.W+tk.N+tk.S) self.layer_select.focus_force()