jepler/linuxcnc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

qtplasmac: add CLEAR button and allow .tap files to load automatically

Browse source
This commit is contained in:
Greg Carl 2021-11-20 18:32:03 -05:00
parent a2b87d299a
commit 37130e980d
11 changed files with 306 additions and 134 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
docs/src/plasma/images/qtplasmac_16x9.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 199 KiB

After

Width:  |  Height:  |  Size: 148 KiB

BIN
docs/src/plasma/images/qtplasmac_4x3.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 199 KiB

After

Width:  |  Height:  |  Size: 215 KiB

BIN
docs/src/plasma/images/qtplasmac_9x16.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 163 KiB

After

Width:  |  Height:  |  Size: 140 KiB

BIN
docs/src/plasma/images/qtplasmac_camview.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 592 KiB

After

Width:  |  Height:  |  Size: 439 KiB

2
docs/src/plasma/qtplasmac.adoc
View file

@ -934,6 +934,8 @@ This value displayed below MOVE represents the Kerf Width of the currently selec
[width="100%",cols="4,16"]
|===
|*Name*|*Description*
|CLEAR|This button will clear the currently opened program. +
The torch (T0) will be selected if it was not the active tool.
|OPEN|This button will open a FILE OPEN panel over the PREVIEW WINDOW.
|RELOAD|This button will reload the currently loaded G-Code File.
|===

28
share/qtvcp/screens/qtplasmac/qtplasmac.style
View file

@ -218,7 +218,7 @@ QPushButton:checked:pressed, QToolButton:checked:pressed {
color: backgnd;
background: frames;
border: none;
border-top-left-radius: 2px;
border-top-left-radius: 0px;
border-top-right-radius: 0px;
border-bottom-left-radius: 0px;
border-bottom-right-radius: 0px }
@ -226,6 +226,10 @@ QPushButton:checked:pressed, QToolButton:checked:pressed {
#file_open:disabled {
background: inactive }
#file_open:pressed {
color: frames;
background: backgnd }
/****** RELOAD BUTTON<<<<<<<<<<<<*/
#file_reload {
color: backgnd;
@ -239,6 +243,27 @@ QPushButton:checked:pressed, QToolButton:checked:pressed {
#file_reload:disabled {
background: inactive }
#file_reload:pressed {
color: frames;
background: backgnd }
/****** CLEAR BUTTON<<<<<<<<<<<<*/
#file_clear {
color: backgnd;
background: frames;
border: none;
border-top-left-radius: 2px;
border-top-right-radius: 0px;
border-bottom-left-radius: 0px;
border-bottom-right-radius: 0px }
#file_clear:disabled {
background: inactive }
#file_clear:pressed {
color: frames;
background: backgnd }
/****** DRO DISPLAY<<<<<<<<<<<<*/
DROLabel {
color: foregnd;
@ -710,7 +735,6 @@ EditorBase {
qproperty-styleFont5: 'Lato,11,-1,0,60,0,0,0,0,0';
qproperty-styleFont6: 'Lato,11,-1,0,60,0,0,0,0,0';
qproperty-styleFont7: 'Lato,11,-1,0,60,0,0,0,0,0';
qproperty-styleFontMargin: 'Lato,11,-1,0,20,00,0,0,0,0';
qproperty-styleColorSelectionText: backgnd;
qproperty-styleColorSelectionBackground: foregnd }

34
share/qtvcp/screens/qtplasmac/qtplasmac.ui
View file

@ -6382,6 +6382,40 @@ EDGE</string>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="PushButton" name="file_clear">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>60</width>
<height>16</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>60</width>
<height>16</height>
</size>
</property>
<property name="text">
<string>CLEAR</string>
</property>
<property name="python_command_option" stdset="0">
<bool>false</bool>
</property>
<property name="true_python_cmd_string" stdset="0">
<string/>
</property>
<property name="false_python_cmd_string" stdset="0">
<string/>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="file_open">
<property name="sizePolicy">

101
share/qtvcp/screens/qtplasmac/qtplasmac_handler.py
View file

@ -1,4 +1,4 @@
VERSION = '1.217.123'
VERSION = '1.217.124'
'''
qtplasmac_handler.py
@ -197,7 +197,7 @@ class HandlerClass:
self.jogSlow = False
self.lastLoadedProgram = 'None'
self.estopOnList = []
self.idleList = ['file_open', 'file_reload', 'file_edit']
self.idleList = ['file_clear', 'file_open', 'file_reload', 'file_edit']
self.idleOnList = ['home_x', 'home_y', 'home_z', 'home_a', 'home_all']
self.idleHomedList = ['touch_x', 'touch_y', 'touch_z', 'touch_a', 'touch_b', 'touch_xy', \
'mdi_show', 'height_lower', 'height_raise', 'wcs_button']
@ -255,6 +255,7 @@ class HandlerClass:
self.old_ovr_counts = 0
self.startLine = 0
self.preRflFile = ''
self.preClearFile = ''
self.rflActive = False
self.jogInhibit = ''
self.isJogging = {0:False, 1:False, 2:False, 3:False}
@ -398,12 +399,12 @@ class HandlerClass:
saved = ACTION.SAVE_PROGRAM(self.w.gcode_editor.editor.text(), filename)
if saved is not None:
self.w.gcode_editor.editor.setModified(False)
if saved[-3:] in ['ngc', '.nc', '.tap']:
if saved[-3:] in ['ngc', '.nc', 'tap']:
ACTION.OPEN_PROGRAM(saved)
# open a non gcode file and don't load it into linuxcnc
def new_openReturn(self, filename):
if filename[-3:] in ['ngc', '.nc', '.tap']:
if filename[-3:] in ['ngc', '.nc', 'tap']:
ACTION.OPEN_PROGRAM(filename)
else:
self.w.gcode_editor.editor.load_text(filename)
@ -417,9 +418,9 @@ class HandlerClass:
msg1 = _translate('HandlerClass', 'Do you want to exit')
if not self.dialog_show_yesno(QMessageBox.Question, head, '{}\n\n{}?\n'.format(msg0, msg1)):
return
if self.fileOpened == True:
if self.fileOpened == True and self.w.gcode_editor.editor.isModified():
self.file_reload_clicked()
else:
elif self.fileOpened == False:
self.w.gcode_editor.editor.new_text()
self.w.gcode_editor.editor.setModified(False)
self.w.gcode_editor.editMode()
@ -527,9 +528,8 @@ class HandlerClass:
ACTION.CALL_MDI(intext + '\n')
try:
fp = os.path.expanduser(INFO.MDI_HISTORY_PATH)
fp = open(fp, 'a')
with open(fp, 'w') as fp:
fp.write(intext + '\n')
fp.close()
except:
pass
STATUS.emit('mdi-history-changed')
@ -843,6 +843,7 @@ class HandlerClass:
self.torchPulse = False
self.rflSelected = False
self.fileOpened = False
self.fileClear = False
self.laserButtonState = 'laser'
self.camButtonState = 'markedge'
@ -1097,8 +1098,11 @@ class HandlerClass:
hal.set_p('plasmac.consumable-change', '0')
if self.single_cut_request:
self.single_cut_request = False
if self.oldFile:
if self.oldFile and self.fileOpened:
ACTION.OPEN_PROGRAM(self.oldFile)
else:
self.fileOpened = True
self.file_clear_clicked()
self.w[self.scButton].setEnabled(True)
if self.g91:
ACTION.CALL_MDI_WAIT('G91')
@ -1133,7 +1137,7 @@ class HandlerClass:
def set_run_button_state(self):
if STATUS.machine_is_on() and STATUS.is_all_homed() and \
STATUS.is_interp_idle() and not self.offsetsActivePin.get() and \
self.plasmacStatePin.get() == 0 and not self.boundsError['loaded']:
self.plasmacStatePin.get() == 0 and not self.boundsError['loaded'] and not self.fileClear:
if int(self.w.materials_box.currentText().split(': ', 1)[0]) >= 1000000:
self.w.materials_box.setCurrentIndex(0)
if self.w.gcode_display.lines() > 1:
@ -1250,6 +1254,7 @@ class HandlerClass:
if self.w.chk_overlay.isChecked():
self.overlay.show()
self.w.file_open.setText(os.path.basename(filename))
if not self.single_cut_request:
self.fileOpened = True
text = _translate('HandlerClass', 'EDIT')
self.w.edit_label.setText('{}: {}'.format(text, filename))
@ -1285,6 +1290,18 @@ class HandlerClass:
if self.single_cut_request:
ACTION.RUN()
self.set_run_button_state()
if self.fileClear:
self.fileClear = False
self.fileOpened = False
text = _translate('HandlerClass', 'OPEN')
self.w.file_open.setText(text)
text = _translate('HandlerClass', 'EDIT')
self.w.edit_label.setText('{}'.format(text))
self.w.gcode_editor.editor.new_text()
self.w.gcode_editor.editor.setModified(False)
self.w.gcode_display.new_text()
self.w.gcode_display.set_margin_width(3)
self.w.gcode_editor.set_margin_width(3)
ACTION.SET_MANUAL_MODE()
self.w.gcodegraphics.load(filename)
if self.w.main_tab_widget.currentIndex():
@ -1569,6 +1586,31 @@ class HandlerClass:
self.w.gcode_display.set_margin_width(gcodeLines)
self.w.gcode_editor.set_margin_width(gcodeLines)
def file_clear_clicked(self):
if self.fileOpened:
self.fileClear = True
self.startLine = 0
self.rflSelected = False
self.rflActive = False
self.startLine = 0
self.preRflFile = ''
clearFile = '{}qtplasmac_program_clear.ngc'.format(self.tmpPath)
with open(clearFile, 'w') as outFile:
outFile.write('m2')
if 'single_cut' in ACTION.prefilter_path:
self.preClearFile = self.oldFile
else:
if ACTION.prefilter_path or self.lastLoadedProgram != 'None':
self.preClearFile = ACTION.prefilter_path or self.lastLoadedProgram
ACTION.OPEN_PROGRAM(clearFile)
ACTION.prefilter_path = self.preClearFile
self.w.material_selector.setCurrentIndex(0)
self.w.conv_material.setCurrentIndex(0)
if self.w.lbl_tool.text() != 'Tool: TORCH' and STATUS.is_on_and_idle() and STATUS.is_all_homed():
ACTION.CALL_MDI_WAIT('T0 M6')
ACTION.CALL_MDI_WAIT('G43 H0')
ACTION.SET_MANUAL_MODE()
def file_open_clicked(self):
self.w.preview_stack.setCurrentIndex(1)
self.vkb_hide()
@ -1922,6 +1964,7 @@ class HandlerClass:
self.w.cone_size.valueChanged.connect(self.cone_size_changed)
self.w.grid_size.valueChanged.connect(self.grid_size_changed)
self.w.gcode_display.linesChanged.connect(self.gcode_display_loaded)
self.w.file_clear.clicked.connect(self.file_clear_clicked)
self.w.file_open.clicked.connect(self.file_open_clicked)
self.w.file_edit.clicked.connect(self.file_edit_clicked)
self.w.mdi_show.clicked.connect(self.mdi_show_clicked)
@ -2748,15 +2791,17 @@ class HandlerClass:
text0 = _translate('HandlerClass', 'EDIT')
text1 = _translate('HandlerClass', 'CLOSE')
self.w.file_edit.setText('{}\n{}'.format(text0, text1))
self.w.file_reload.setEnabled(False)
self.w.file_clear.setEnabled(False)
self.w.file_open.setEnabled(False)
self.w.file_reload.setEnabled(False)
self.autorepeat_keys(True)
self.w.jog_frame.setEnabled(False)
else:
self.button_normal(self.w.file_edit.objectName())
self.w.file_edit.setText(_translate('HandlerClass', 'EDIT'))
self.w.file_reload.setEnabled(True)
self.w.file_clear.setEnabled(True)
self.w.file_open.setEnabled(True)
self.w.file_reload.setEnabled(True)
if self.w.gcode_stack.currentIndex() != 1:
self.autorepeat_keys(False)
self.w.jog_frame.setEnabled(True)
@ -3820,8 +3865,8 @@ class HandlerClass:
material = self.w.materials_box.currentText().split(': ', 1)[0].lstrip('0')
material = int(material) if material else 0
COPY(self.materialFile, self.tmpMaterialFile)
inFile = open(self.tmpMaterialFile, 'r')
outFile = open('{}'.format(self.materialFile), 'w')
with open(self.tmpMaterialFile, 'r') as inFile:
with open(self.materialFile, 'w') as outFile:
written = False
while 1:
line = inFile.readline()
@ -3829,7 +3874,7 @@ class HandlerClass:
if not line or \
(line.startswith('[MATERIAL_NUMBER_') and \
num < int(line.strip().split('NUMBER_')[1].rstrip(']'))):
outFile.write('[MATERIAL_NUMBER_{}] \n'.format(num))
outFile.write('[MATERIAL_NUMBER_{}]\n'.format(num))
outFile.write('NAME = {}\n'.format(nam))
outFile.write('KERF_WIDTH = {}\n'.format(self.materialFileDict[material][1]))
outFile.write('PIERCE_HEIGHT = {}\n'.format(self.materialFileDict[material][2]))
@ -3853,8 +3898,6 @@ class HandlerClass:
break
else:
outFile.write(line)
inFile.close()
outFile.close()
self.materialUpdate = True
self.materialFileDict = {}
self.materialNumList = []
@ -3897,8 +3940,8 @@ class HandlerClass:
if not self.dialog_show_yesno(QMessageBox.Question, '{}'.format(head), '{} #{}?\n'.format(msg0, num)):
return
COPY(self.materialFile, self.tmpMaterialFile)
inFile = open(self.tmpMaterialFile, 'r')
outFile = open('{}'.format(self.materialFile), 'w')
with open(self.tmpMaterialFile, 'r') as inFile:
with open(self.materialFile, 'w') as outFile:
while 1:
line = inFile.readline()
if not line: break
@ -3918,7 +3961,6 @@ class HandlerClass:
if not line: break
else:
outFile.write(line)
outFile.close()
self.materialUpdate = True
self.materialFileDict = {}
self.materialNumList = []
@ -4075,8 +4117,8 @@ class HandlerClass:
def save_material_file(self, material, index):
COPY(self.materialFile, self.tmpMaterialFile)
inFile = open(self.tmpMaterialFile, 'r')
outFile = open('{}'.format(self.materialFile), 'w')
with open(self.tmpMaterialFile, 'r') as inFile:
with open(self.materialFile, 'w') as outFile:
while 1:
line = inFile.readline()
if not line: break
@ -4124,8 +4166,6 @@ class HandlerClass:
line = inFile.readline()
if not line: break
outFile.write(line)
inFile.close()
outFile.close()
self.materialUpdate = True
self.materialFileDict = {}
self.load_materials()
@ -4286,7 +4326,7 @@ class HandlerClass:
'# example only, may be deleted\n'\
'# items marked * are mandatory\n'\
'# other items are optional and will default to 0\n'\
'#[MATERIAL_NUMBER_1] \n'\
'#[MATERIAL_NUMBER_1]\n'\
'#NAME = \n'\
'#KERF_WIDTH = \n'\
'#PIERCE_HEIGHT = *\n'\
@ -5094,7 +5134,7 @@ class HandlerClass:
self.w.conv_save.setEnabled(False)
self.w.conv_send.setEnabled(False)
self.w.conv_settings.setEnabled(True)
if ACTION.prefilter_path:
if ACTION.prefilter_path and self.fileOpened:
# try:
if ACTION.prefilter_path != self.fNgc:
COPY(ACTION.prefilter_path, self.fNgc)
@ -5136,9 +5176,8 @@ class HandlerClass:
CONVLINE.set_arc_2_points_radius(self, self.w, False)
elif self.lAlias == 'ALAR':
CONVLINE.set_arc_by_angle_radius(self, self.w, False)
outNgc = open(self.fNgc, 'w')
with open(self.fNgc, 'w') as outFile:
outNgc.write('(new conversational file)\nM2\n')
outNgc.close()
COPY(self.fNgc, self.fTmp)
COPY(self.fNgc, self.fNgcBkp)
self.w.conv_preview.load(self.fNgc)
@ -5150,7 +5189,7 @@ class HandlerClass:
def conv_save_pressed(self):
head = _translate('HandlerClass', 'Save Error')
with open(self.fNgc) as inFile:
with open(self.fNgc, 'r') as inFile:
for line in inFile:
if '(new conversational file)' in line:
msg0 = _translate('HandlerClass', 'An empty file cannot be saved')
@ -5204,7 +5243,6 @@ class HandlerClass:
if '(new conversational file)' in line:
msg0 = _translate('HandlerClass', 'An empty file cannot be arrayed, rotated, or scaled')
self.dialog_show_ok(QMessageBox.Warning, '{}'.format(head), '{}\n'.format(msg0))
inFile.close()
return
# see if we can do something about NURBS blocks down the track
# elif 'g5.2' in line.lower() or 'g5.3' in line.lower():
@ -5353,9 +5391,8 @@ class HandlerClass:
if ACTION.prefilter_path:
COPY(ACTION.prefilter_path, self.fNgcBkp)
else:
outNgc = open(self.fNgcBkp, 'w')
with open(self.fNgcBkp, 'w') as outNgc:
outNgc.write('(new conversational file)\nM2\n')
outNgc.close()
self.validShape = False
self.w.preview.setEnabled(True)
self.w.undo.setEnabled(False)

7
share/qtvcp/screens/qtplasmac/versions.html
View file

@ -31,6 +31,13 @@
<br>
<!--- ****** ADD NEXT VERSION BELOW THIS LINE ****** --->
<br><b><u>v1.217.124 2021 Nov 20</u></b>
<ul style="margin:0;">
<li>add CLEAR button to clear currently loaded program</li>
<li>allow a saved .tap file to be loaded automatically after modifying in editor</li>
</ul>
<i>Changes submitted by snowgoer540 (Greg Carl)</i><br>
<br><b><u>v1.217.123 2021 Nov 18</u></b>
<ul style="margin:0;">
<li>change motion.requested-velocity to motion.feed-upm</li>

34
share/qtvcp/screens/qtplasmac_4x3/qtplasmac_4x3.ui
View file

@ -374,6 +374,40 @@
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="PushButton" name="file_clear">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>60</width>
<height>16</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>60</width>
<height>16</height>
</size>
</property>
<property name="text">
<string>CLEAR</string>
</property>
<property name="python_command_option" stdset="0">
<bool>false</bool>
</property>
<property name="true_python_cmd_string" stdset="0">
<string/>
</property>
<property name="false_python_cmd_string" stdset="0">
<string/>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="file_open">
<property name="sizePolicy">

34
share/qtvcp/screens/qtplasmac_9x16/qtplasmac_9x16.ui
View file

@ -4565,6 +4565,40 @@ HOME</string>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="PushButton" name="file_clear">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>60</width>
<height>16</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>60</width>
<height>16</height>
</size>
</property>
<property name="text">
<string>CLEAR</string>
</property>
<property name="python_command_option" stdset="0">
<bool>false</bool>
</property>
<property name="true_python_cmd_string" stdset="0">
<string/>
</property>
<property name="false_python_cmd_string" stdset="0">
<string/>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="file_open">
<property name="sizePolicy">