Skip to content

Commit

Permalink
Merge V0.43 changes
Browse files Browse the repository at this point in the history
Version 0.43:
- Fixed problem that prevented properly sending EGV file to the laser.
  • Loading branch information
rsre committed Jan 28, 2020
1 parent 054fb99 commit e99355f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
3 changes: 3 additions & 0 deletions Change_Log.txt
Original file line number Diff line number Diff line change
Expand Up @@ -232,3 +232,6 @@ Version 0.42:
- Fixed trace boundary when X and Y scaling is used
- Limited minimum speed entries to prevent unexpected laser movements.
- Fixed trace boundary space so that it scales with units change.

Version 0.43:
- Fixed problem that prevented properly sending EGV file to the laser.
9 changes: 3 additions & 6 deletions k40_whisperer.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"""
app_name = "K40 Whisperer"
version = '0.42'
version = '0.43'
title_text = app_name+" V"+version

import sys
Expand Down Expand Up @@ -1872,7 +1872,6 @@ def menu_File_save_EGV(self,operation_type=None,default_name="out.EGV"):


def menu_File_Open_EGV(self):
self.stop[0]=False
init_dir = os.path.dirname(self.DESIGN_FILE)
if ( not os.path.isdir(init_dir) ):
init_dir = self.HOME_DIR
Expand All @@ -1883,12 +1882,9 @@ def menu_File_Open_EGV(self):
self.resetPath()
self.DESIGN_FILE = fileselect
self.EGV_Send_Window(fileselect)
self.stop[0]=True
#self.Finish_Job()

def Open_EGV(self,filemname,n_passes=1):
pass
EGV_data=[]
self.stop[0]=False
value1 = ""
value2 = ""
value3 = ""
Expand Down Expand Up @@ -1969,6 +1965,7 @@ def Open_EGV(self,filemname,n_passes=1):
dxmils = -(x_end_mils - x_start_mils)
dymils = y_end_mils - y_start_mils
self.Send_Rapid_Move(dxmils,dxmils)
self.stop[0]=True


def Open_SVG(self,filemname):
Expand Down

0 comments on commit e99355f

Please sign in to comment.