v1.73

stephenhouser · stephenhouser · commit 34ab843dc540 · 2021-01-10T18:01:26.000-05:00
diff --git a/f-engrave.py b/f-engrave.py
@@ -279,11 +279,18 @@
     Version 1.71 - Changed Potrace version that is distributed with F-Engrave from 1.10 to 1.16
                  - Fixed problem with cleanup cutting wrong area for some cases
     
+    Version 1.72 - Fixed a bug that resulted in bad cleanup tool paths in some situations
+                 - Explicitly set the font for the GUI
+
+    Version 1.73 - Made importing png images with clear backgrounds work better
+                 - Added PNG and TIF to the image file types that show up by default
+    
     """
 
-version = '1.71'
+version = '1.73'
 #Setting QUIET to True will stop almost all console messages
 QUIET = False
+DEBUG = False
 
 import sys
 VERSION = sys.version_info[0]
@@ -423,6 +430,19 @@ def message_ask_ok_cancel(title, mess):
         result=tkMessageBox.askokcancel(title, mess)
     return result
 
+################################################################################
+#                         Debug Message Box                                    #
+################################################################################
+def debug_message(message):
+    global DEBUG
+    title = "Debug Message"
+    if DEBUG:
+        if VERSION == 3:
+            tkinter.messagebox.showinfo(title,message)
+        else:
+            tkMessageBox.showinfo(title,message)
+            pass
+
 ############################################################################
 # routine takes an x and a y coords and does a coordinate transformation   #
 # to a new coordinate system at angle from the initial coordinate system   #
@@ -2549,7 +2569,7 @@ def createWidgets(self):
                          command = self.menu_File_Open_G_Code_File)
         top_File.add_separator()
         if self.POTRACE_AVAIL == TRUE:
-            top_File.add("command", label = "Open DXF/Bitmap", \
+            top_File.add("command", label = "Open DXF/Image", \
                              command = self.menu_File_Open_DXF_File)
         else:
             top_File.add("command", label = "Open DXF", \
@@ -4822,7 +4842,7 @@ def menu_File_Open_DXF_File(self):
 
         if self.POTRACE_AVAIL == TRUE:
             if PIL:
-                fileselect = askopenfilename(filetypes=[("DXF/Bitmap Files", ("*.dxf","*.bmp","*.pbm","*.ppm","*.pgm","*.pnm")),
+                fileselect = askopenfilename(filetypes=[("DXF/Image Files", ("*.dxf","*.png","*.bmp","*.tif")),
                                                     ("DXF Files","*.dxf"),\
                                                     ("Bitmap Files",("*.bmp","*.pbm","*.ppm","*.pgm","*.pnm")),\
                                                     ("Slower Image Files",("*.jpg","*.png","*.gif","*.tif")),\
@@ -6073,6 +6093,12 @@ def Read_image_file(self):
             if PIL:
                 try:
                     PIL_im = Image.open(file_full)
+                    mode = PIL_im.mode
+                    if len(mode)>3:
+                        blank = Image.new("RGB", PIL_im.size, (255,255,255))
+                        blank.paste( PIL_im, (0, 0), PIL_im ) 
+                        PIL_im = blank
+                    
                     PIL_im = PIL_im.convert("1")
                     file_full_tmp=self.HOME_DIR + "/fengrave_tmp.bmp"
                     PIL_im.save(file_full_tmp,"bmp")
@@ -7315,12 +7341,12 @@ def V_Carve_It(self,clean_flag=0,DXF_FLAG = False):
                     if calc_flag != 0:
                         CUR_LENGTH = CUR_LENGTH + Lseg
                     else:
-                        #theta = phi         #V1.62
-                        #x0=x2               #V1.62
-                        #y0=y2               #V1.62
-                        #seg_sin0=seg_sin    #V1.62
-                        #seg_cos0=seg_cos    #V1.62
-                        #char_num0=char_num  #V1.62
+                        theta = phi         #commented out in V1.62 brought back in V1.72
+                        x0=x2               #commented out in V1.62 brought back in V1.72
+                        y0=y2               #commented out in V1.62 brought back in V1.72
+                        seg_sin0=seg_sin    #commented out in V1.62 brought back in V1.72
+                        seg_cos0=seg_cos    #commented out in V1.62 brought back in V1.72
+                        char_num0=char_num  #commented out in V1.62 brought back in V1.72
                         continue
 
 
@@ -9682,7 +9708,21 @@ def temp_icon(icon_file_name):
 app.master.title("F-Engrave V"+version)
 app.master.iconname("F-Engrave")
 app.master.minsize(780,540)
+try:
+    try:
+        import tkFont
+        default_font = tkFont.nametofont("TkDefaultFont")
+    except:
+        import tkinter.font
+        default_font = tkinter.font.nametofont("TkDefaultFont")
 
+    default_font.configure(size=9)
+    default_font.configure(family='arial')
+    #print(default_font.cget("size"))
+    #print(default_font.cget("family"))
+except:
+    debug_message("Font Set Failed.")
+    
 try:
     try:
         app.master.iconbitmap(r'emblem')
diff --git a/f-engrave.spec b/f-engrave.spec
@@ -49,6 +49,6 @@ app = BUNDLE(exe,
 				'CFBundleIdentifier': 'com.scorchworks.f-engrave',
 				'CFBundleName': 'F-Engrave',
 				'CFBundleDisplayName': 'F-Engrave',
-				'CFBundleShortVersionString': '1.71'
+				'CFBundleShortVersionString': '1.73'
 				}
 			)
diff --git a/macOS.patch b/macOS.patch
@@ -1,6 +1,6 @@
---- F-Engrave-1.71_src/f-engrave.py	2020-02-26 19:03:38.000000000 -0500
-+++ f-engrave.py	2020-04-25 10:53:24.000000000 -0400
-@@ -340,6 +340,54 @@
+--- F-Engrave-1.73_src/f-engrave.py	2020-07-06 21:57:22.000000000 -0700
++++ f-engrave.py	2021-01-10 14:47:56.000000000 -0800
+@@ -347,6 +347,54 @@
  Zero       = 0.00001
  STOP_CALC = 0
  
@@ -55,7 +55,7 @@
  #raw_input("PAUSED: Press ENTER to continue")
  ################################################################################
  #             Function for outputting messages to different locations          #
-@@ -1805,7 +1853,7 @@
+@@ -1825,7 +1873,7 @@
          #    fmessage("Python Imaging Library (PIL) was not found...Bummer")
          #    fmessage("    PIL enables more image file formats.")
  
@@ -64,7 +64,7 @@
          try:
              p = Popen(cmd, stdout=PIPE, stderr=PIPE)
              stdout, stderr = p.communicate()
-@@ -1820,7 +1868,7 @@
+@@ -1840,7 +1888,7 @@
              fmessage("ttf2cxf_stream executable is not present/working...Bummer")
              self.TTF_AVAIL = FALSE
  
@@ -73,7 +73,7 @@
          try:
              p = Popen(cmd, stdout=PIPE, stderr=PIPE)
              stdout, stderr = p.communicate()
-@@ -2422,8 +2470,14 @@
+@@ -2442,8 +2490,14 @@
          self.Listbox_1.bind("<Down>", self.Listbox_Key_Down)
  
          try:
@@ -90,7 +90,7 @@
          except:
              font_files=" "
          for name in font_files:
-@@ -5364,7 +5418,7 @@
+@@ -5384,7 +5438,7 @@
                  self.Checkbutton_useIMGsize.place_forget()
  
                  # Left Column #
@@ -99,7 +99,7 @@
                  w_entry=60
                  w_units=35
  
-@@ -5518,15 +5572,15 @@
+@@ -5538,15 +5592,15 @@
                  self.Recalculate.place(x=12, y=Ybut, width=95, height=30)
  
                  Ybut=self.h-60
@@ -118,7 +118,7 @@
                  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)
  
-@@ -5539,7 +5593,7 @@
+@@ -5559,7 +5613,7 @@
                  self.Label_flip.configure(text="Flip Image")
                  self.Label_mirror.configure(text="Mirror Image")
                  # Left Column #
@@ -127,7 +127,7 @@
                  w_entry=60
                  w_units=35
  
-@@ -5685,15 +5739,15 @@
+@@ -5705,15 +5759,15 @@
                  self.Recalculate.place(x=12, y=Ybut, width=95, height=30)
  
                  Ybut=self.h-60
@@ -146,7 +146,7 @@
                  self.Input_Label.place_forget()
                  self.Input_frame.place_forget()
  
-@@ -5918,7 +5972,7 @@
+@@ -5938,7 +5992,7 @@
                  option = option + "-e"
              else:
                  option = ""
@@ -155,7 +155,7 @@
                     option,
                     "-s",self.segarc.get(),
                     file_full,"STDOUT"]
-@@ -5987,14 +6041,14 @@
+@@ -6007,14 +6061,14 @@
              try:
                  #cmd = ["potrace","-b","dxf",file_full,"-o","-"]
                  if self.bmp_longcurve.get() == 1:
@@ -172,7 +172,7 @@
                         "-z", self.bmp_turnpol.get(),
                         "-t", self.bmp_turdsize.get(),
                         "-a",self.bmp_alphamax.get(),
-@@ -6025,14 +6079,14 @@
+@@ -6051,14 +6105,14 @@
                  
                      #cmd = ["potrace","-b","dxf",file_full,"-o","-"]
                      if self.bmp_longcurve.get() == 1:
@@ -189,7 +189,7 @@
                             "-z", self.bmp_turnpol.get(),
                             "-t", self.bmp_turdsize.get(),
                             "-a",self.bmp_alphamax.get(),
-@@ -8499,6 +8553,10 @@
+@@ -8525,6 +8579,10 @@
                  os.remove("f_engrave_icon")
              except:
                  pass
@@ -200,7 +200,7 @@
  ################################################################################
  #                         General Settings Window                              #
  ################################################################################
-@@ -8600,18 +8658,18 @@
+@@ -8626,18 +8684,18 @@
  
          D_Yloc=D_Yloc+D_dY
          self.Label_arcfit = Label(gen_settings,text="Arc Fitting")
@@ -226,7 +226,7 @@
          self.Radio_arcfit_center.configure(variable=self.arc_fit )
  
          D_Yloc=D_Yloc+D_dY
-@@ -8643,28 +8701,25 @@
+@@ -8669,28 +8727,25 @@
          self.Checkbutton_var_dis.configure(variable=self.var_dis)
  
          D_Yloc=D_Yloc+D_dY
@@ -262,7 +262,7 @@
  
          if self.input_type.get() != "text":
                  self.Entry_Fontdir.configure(state="disabled")
-@@ -8725,6 +8780,9 @@
+@@ -8751,6 +8806,9 @@
          self.GEN_Close.place(x=Xbut+65, y=Ybut, width=130, height=30, anchor="w")
          self.GEN_Close.bind("<ButtonRelease-1>", self.Close_Current_Window_Click)
  
@@ -272,7 +272,7 @@
      ################################################################################
      #                         V-Carve Settings window                              #
      ################################################################################
-@@ -8761,21 +8819,18 @@
+@@ -8787,21 +8845,18 @@
          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)
  
@@ -300,7 +300,7 @@
          self.Radio_Type_STRAIGHT.configure(variable=self.bit_shape)
  
          self.bit_shape.trace_variable("w", self.Entry_Bit_Shape_var_Callback)
-@@ -8869,7 +8924,7 @@
+@@ -8895,7 +8950,7 @@
          self.Label_BoxGap_u.place(x=w_label+x_radio_offset+175, y=D_Yloc, width=100, height=21)
  
          self.GEN_Reload = Button(vcarve_settings,text="Recalculate")
@@ -309,7 +309,7 @@
          self.GEN_Reload.bind("<ButtonRelease-1>", self.Recalculate_Click)
          
          D_Yloc=D_Yloc+D_dY+12
-@@ -8976,8 +9031,8 @@
+@@ -9002,8 +9057,8 @@
          self.Label_clean = Label(vcarve_settings,text="Cleanup Operations")
          self.Label_clean.place(x=center_loc, y=D_Yloc, width=w_label, height=21,anchor=CENTER)
  
@@ -320,7 +320,7 @@
  
          D_Yloc=D_Yloc+D_dY
          self.Label_CLEAN_DIA = Label(vcarve_settings,text="Cleanup Cut Diameter")
-@@ -9006,18 +9061,18 @@
+@@ -9032,18 +9087,18 @@
          self.Label_clean_P = Label(vcarve_settings,text="Cleanup Cut Directions")
          self.Label_clean_P.place(x=xd_label_L, y=D_Yloc, width=w_label, height=21)
  
@@ -344,7 +344,7 @@
  
          D_Yloc=D_Yloc+12
  
-@@ -9036,18 +9091,18 @@
+@@ -9062,18 +9117,18 @@
          self.Label_v_clean_P = Label(vcarve_settings,text="V-Bit Cut Directions")
          self.Label_v_clean_P.place(x=xd_label_L, y=D_Yloc, width=w_label, height=21)
  
@@ -368,7 +368,7 @@
  
          ## V-Bit Picture ##
          self.PHOTO = PhotoImage(format='gif',data=
-@@ -9077,7 +9132,7 @@
+@@ -9103,7 +9158,7 @@
          Xbut=int(vcarve_settings.winfo_width()/2)
  
          self.VCARVE_Recalculate = Button(vcarve_settings,text="Calculate V-Carve", command=self.VCARVE_Recalculate_Click)
@@ -377,7 +377,7 @@
  
  
          if self.cut_type.get() == "v-carve":
-@@ -9089,6 +9144,9 @@
+@@ -9115,6 +9170,9 @@
          self.VCARVE_Close.place(x=Xbut, y=Ybut, width=130, height=30, anchor="w")
          self.VCARVE_Close.bind("<ButtonRelease-1>", self.Close_Current_Window_Click)
  
@@ -387,7 +387,7 @@
  ####################################
  # Gcode class for creating G-Code
  ####################################
-@@ -9639,5 +9697,9 @@
+@@ -9679,5 +9737,9 @@
          fmessage("Unable to create temporary icon file.")
  
  app.f_engrave_init()
@@ -397,8 +397,8 @@
 +macOS_button_fix(root)
  root.mainloop()
  
---- F-Engrave-1.71_src/TTF2CXF_STREAM/Makefile	2013-07-21 22:03:00.000000000 -0400
-+++ TTF2CXF_STREAM/Makefile	2020-04-25 09:12:34.000000000 -0400
+--- F-Engrave-1.73_src/TTF2CXF_STREAM/Makefile	2013-07-21 23:03:00.000000000 -0700
++++ TTF2CXF_STREAM/Makefile	2021-01-10 14:47:56.000000000 -0800
 @@ -2,9 +2,22 @@
  # Makefile for TTF2CXF_STREAM
  # Date: 6/28/2013
diff --git a/setup.py b/setup.py
@@ -11,7 +11,7 @@
 from setuptools import setup
 
 mainscript = 'f-engrave.py'
-version = "1.71"
+version = "1.73"
 url = "https://github.com/stephenhouser/f-engrave"
 
 if sys.platform == 'darwin':

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,6 @@ app = BUNDLE(exe,`
`49`	`49`	`'CFBundleIdentifier': 'com.scorchworks.f-engrave',`
`50`	`50`	`'CFBundleName': 'F-Engrave',`
`51`	`51`	`'CFBundleDisplayName': 'F-Engrave',`
`52`		`- 'CFBundleShortVersionString': '1.71'`
	`52`	`+ 'CFBundleShortVersionString': '1.73'`
`53`	`53`	`}`
`54`	`54`	`)`