Skip to content

Commit

Permalink
Update to F-Engrave 1.55 sources
Browse files Browse the repository at this point in the history
  • Loading branch information
@stephenhouser
stephenhouser committed Jan 7, 2016
1 parent bdb1050 commit 01cb416
Show file tree
Hide file tree
Showing 4 changed files with 17,371 additions and 35 deletions.
64 changes: 32 additions & 32 deletions f-engrave-154.py
100755 → 100644
View file
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,6 @@

if VERSION == 3:
from tkinter import *
from tkinter.ttk import *
from tkinter.filedialog import *
import tkinter.messagebox
else:
Expand Down Expand Up @@ -1649,8 +1648,6 @@ def __init__(self, master):
# fmessage("Python Imaging Library (PIL) was not found...Bummer")
# fmessage(" PIL enables more image file formats.")

os.environ["PATH"] += os.pathsep + "." + os.pathsep + "/usr/local/bin"

cmd = ["ttf2cxf_stream","TEST","STDOUT"]
try:
p = Popen(cmd, stdout=PIPE, stderr=PIPE)
Expand Down Expand Up @@ -5162,7 +5159,7 @@ def Master_Configure(self, event, update=0):
self.Checkbutton_useIMGsize.place_forget()

# Left Column #
w_label=120 #90
w_label=90
w_entry=60
w_units=35

Expand Down Expand Up @@ -5321,15 +5318,15 @@ def Master_Configure(self, event, update=0):
self.Recalculate.place(x=12, y=Ybut, width=95, height=30)

Ybut=self.h-60
self.V_Carve_Calc.place(x=x_label_R, y=Ybut, height=30)
self.V_Carve_Calc.place(x=x_label_R, y=Ybut, width=100, height=30)

Ybut=self.h-105
self.Radio_Cut_E.place(x=x_label_R, y=Ybut, width=185, height=23)
Ybut=self.h-85
self.Radio_Cut_V.place(x=x_label_R, y=Ybut, width=185, height=23)

self.PreviewCanvas.configure( width = self.w-485, height = self.h-160 )
self.PreviewCanvas_frame.place(x=250, y=10)
self.PreviewCanvas.configure( width = self.w-455, height = self.h-160 )
self.PreviewCanvas_frame.place(x=220, y=10)
self.Input_Label.place(x=222, y=self.h-130, width=112, height=21, anchor=W)
self.Input_frame.place(x=222, y=self.h-110, width=self.w-455, height=75)

Expand All @@ -5347,7 +5344,7 @@ def Master_Configure(self, event, update=0):
self.Label_Yscale_u = Label(self.master,textvariable=self.units, anchor=W)

# Left Column #
w_label=120 #90
w_label=90
w_entry=60
w_units=35

Expand Down Expand Up @@ -5488,15 +5485,15 @@ def Master_Configure(self, event, update=0):
self.Recalculate.place(x=12, y=Ybut, width=95, height=30)

Ybut=self.h-60
self.V_Carve_Calc.place(x=x_label_R+offset_R, y=Ybut, height=30)
self.V_Carve_Calc.place(x=x_label_R+offset_R, y=Ybut, width=100, height=30)

Ybut=self.h-105
self.Radio_Cut_E.place(x=x_label_R+offset_R, y=Ybut, width=w_label, height=23)
Ybut=self.h-85
self.Radio_Cut_V.place(x=x_label_R+offset_R, y=Ybut, width=w_label, height=23)

self.PreviewCanvas.configure( width = self.w-270, height = self.h-45 )
self.PreviewCanvas_frame.place(x=260, y=10)
self.PreviewCanvas.configure( width = self.w-240, height = self.h-45 )
self.PreviewCanvas_frame.place(x=230, y=10)
self.Input_Label.place_forget()
self.Input_frame.place_forget()

Expand Down Expand Up @@ -8159,18 +8156,18 @@ def GEN_Settings_Window(self):

D_Yloc=D_Yloc+D_dY
self.Label_arcfit = Label(gen_settings,text="Arc Fitting")
self.Label_arcfit.place(x=xd_label_L, y=D_Yloc, width=w_label, height=23)
self.Label_arcfit.place(x=xd_label_L, y=D_Yloc, width=w_label, height=21)
self.Radio_arcfit_none = Radiobutton(gen_settings,text="None", \
value="none", width="60", anchor=W)
self.Radio_arcfit_none.place(x=w_label+22, y=D_Yloc, width=60, height=23)
value="none", width="110", anchor=W)
self.Radio_arcfit_none.place(x=w_label+22, y=D_Yloc, width=90, height=23)
self.Radio_arcfit_none.configure(variable=self.arc_fit )
self.Radio_arcfit_radius = Radiobutton(gen_settings,text="Radius Format", \
value="radius", width="130", anchor=W)
self.Radio_arcfit_radius.place(x=w_label+22+65, y=D_Yloc, width=120, height=23)
value="radius", width="110", anchor=W)
self.Radio_arcfit_radius.place(x=w_label+22+65, y=D_Yloc, width=100, height=23)
self.Radio_arcfit_radius.configure(variable=self.arc_fit )
self.Radio_arcfit_center = Radiobutton(gen_settings,text="Center Format", \
value="center", width="130", anchor=W)
self.Radio_arcfit_center.place(x=w_label+22+65+125, y=D_Yloc, width=120, height=23)
value="center", width="110", anchor=W)
self.Radio_arcfit_center.place(x=w_label+22+65+115, y=D_Yloc, width=100, height=23)
self.Radio_arcfit_center.configure(variable=self.arc_fit )

D_Yloc=D_Yloc+D_dY
Expand Down Expand Up @@ -8212,7 +8209,7 @@ def GEN_Settings_Window(self):

D_Yloc=D_Yloc+D_dY
self.Label_Hcalc = Label(gen_settings,text="Height Calculation")
self.Label_Hcalc.place(x=xd_label_L, y=D_Yloc, height=21)
self.Label_Hcalc.place(x=xd_label_L, y=D_Yloc, width=113, height=21)
self.Radio_Hcalc_ALL = Radiobutton(gen_settings,text="Max All", \
value="max_all", width="110", anchor=W)
self.Radio_Hcalc_ALL.place(x=w_label+110, y=D_Yloc, width=90, height=23)
Expand Down Expand Up @@ -8313,18 +8310,21 @@ def VCARVE_Settings_Window(self):
self.Label_cutter_type = Label(vcarve_settings,text="Cutter Type")
self.Label_cutter_type.place(x=xd_label_L, y=D_Yloc, width=w_label, height=21)

self.Radio_Type_VBIT = Radiobutton(vcarve_settings,text="V-Bit", value="VBIT", anchor=W)
self.Radio_Type_VBIT.place(x=xd_entry_L, y=D_Yloc, height=21)
self.Radio_Type_VBIT = Radiobutton(vcarve_settings,text="V-Bit", value="VBIT",
width="100", anchor=W)
self.Radio_Type_VBIT.place(x=xd_entry_L, y=D_Yloc, width=w_label, height=21)
self.Radio_Type_VBIT.configure(variable=self.bit_shape)

D_Yloc=D_Yloc+24
self.Radio_Type_BALL = Radiobutton(vcarve_settings,text="Ball Nose", value="BALL", anchor=W)
self.Radio_Type_BALL.place(x=xd_entry_L, y=D_Yloc, height=21)
self.Radio_Type_BALL = Radiobutton(vcarve_settings,text="Ball Nose", value="BALL",
width="100", anchor=W)
self.Radio_Type_BALL.place(x=xd_entry_L, y=D_Yloc, width=w_label, height=21)
self.Radio_Type_BALL.configure(variable=self.bit_shape)

D_Yloc=D_Yloc+24
self.Radio_Type_STRAIGHT = Radiobutton(vcarve_settings,text="Straight", value="FLAT", anchor=W)
self.Radio_Type_STRAIGHT.place(x=xd_entry_L, y=D_Yloc, height=21)
self.Radio_Type_STRAIGHT = Radiobutton(vcarve_settings,text="Straight", value="FLAT",
width="100", anchor=W)
self.Radio_Type_STRAIGHT.place(x=xd_entry_L, y=D_Yloc, width=w_label, height=21)
self.Radio_Type_STRAIGHT.configure(variable=self.bit_shape)

self.bit_shape.trace_variable("w", self.Entry_Bit_Shape_var_Callback)
Expand Down Expand Up @@ -8545,13 +8545,13 @@ def VCARVE_Settings_Window(self):

self.Checkbutton_clean_P = Checkbutton(vcarve_settings,text="P", anchor=W)
self.Checkbutton_clean_P.configure(variable=self.clean_P)
self.Checkbutton_clean_P.place(x=xd_entry_L, y=D_Yloc, width=40, height=23)
self.Checkbutton_clean_P.place(x=xd_entry_L, y=D_Yloc, width=w_entry+40, height=23)
self.Checkbutton_clean_X = Checkbutton(vcarve_settings,text="X", anchor=W)
self.Checkbutton_clean_X.configure(variable=self.clean_X)
self.Checkbutton_clean_X.place(x=xd_entry_L+check_delta, y=D_Yloc, width=40, height=23)
self.Checkbutton_clean_X.place(x=xd_entry_L+check_delta, y=D_Yloc, width=w_entry+40, height=23)
self.Checkbutton_clean_Y = Checkbutton(vcarve_settings,text="Y", anchor=W)
self.Checkbutton_clean_Y.configure(variable=self.clean_Y)
self.Checkbutton_clean_Y.place(x=xd_entry_L+check_delta*2, y=D_Yloc, width=40, height=23)
self.Checkbutton_clean_Y.place(x=xd_entry_L+check_delta*2, y=D_Yloc, width=w_entry+40, height=23)

D_Yloc=D_Yloc+12

Expand All @@ -8575,13 +8575,13 @@ def VCARVE_Settings_Window(self):

self.Checkbutton_v_clean_P = Checkbutton(vcarve_settings,text="P", anchor=W)
self.Checkbutton_v_clean_P.configure(variable=self.v_clean_P)
self.Checkbutton_v_clean_P.place(x=xd_entry_L, y=D_Yloc, width=40, height=23)
self.Checkbutton_v_clean_P.place(x=xd_entry_L, y=D_Yloc, width=w_entry+40, height=23)
self.Checkbutton_v_clean_X = Checkbutton(vcarve_settings,text="X", anchor=W)
self.Checkbutton_v_clean_X.configure(variable=self.v_clean_X)
self.Checkbutton_v_clean_X.place(x=xd_entry_L+check_delta, y=D_Yloc, width=40, height=23)
self.Checkbutton_v_clean_X.place(x=xd_entry_L+check_delta, y=D_Yloc, width=w_entry+40, height=23)
self.Checkbutton_v_clean_Y = Checkbutton(vcarve_settings,text="Y", anchor=W)
self.Checkbutton_v_clean_Y.configure(variable=self.v_clean_Y)
self.Checkbutton_v_clean_Y.place(x=xd_entry_L+check_delta*2, y=D_Yloc, width=40, height=23)
self.Checkbutton_v_clean_Y.place(x=xd_entry_L+check_delta*2, y=D_Yloc, width=w_entry+40, height=23)

## V-Bit Picture ##
self.PHOTO = PhotoImage(format='gif',data=
Expand Down Expand Up @@ -8611,7 +8611,7 @@ def VCARVE_Settings_Window(self):
Xbut=int(vcarve_settings.winfo_width()/2)

self.VCARVE_Recalculate = Button(vcarve_settings,text="Calculate V-Carve", command=self.VCARVE_Recalculate_Click)
self.VCARVE_Recalculate.place(x=Xbut, y=Ybut, height=30, anchor="e")
self.VCARVE_Recalculate.place(x=Xbut, y=Ybut, width=130, height=30, anchor="e")


if self.cut_type.get() == "v-carve":
Expand Down
Loading

0 comments on commit 01cb416

Please sign in to comment.