- added a text in the Selected Tab which is showed whenever the Selected Tab is selected but without having an object selected to display it's properties
This commit is contained in:
parent
3714203c95
commit
bd3cb3aba3
|
@ -6319,9 +6319,49 @@ class App(QtCore.QObject):
|
|||
self.log.debug("Recent items list has been populated.")
|
||||
|
||||
def setup_component_editor(self):
|
||||
label = QtWidgets.QLabel("Choose an item from Project")
|
||||
# label = QtWidgets.QLabel("Choose an item from Project")
|
||||
# label.setAlignment(QtCore.Qt.AlignHCenter | QtCore.Qt.AlignVCenter)
|
||||
|
||||
self.sel_title = QtWidgets.QTextEdit(
|
||||
'<b>Shortcut Key List</b>')
|
||||
self.sel_title.setTextInteractionFlags(QtCore.Qt.NoTextInteraction)
|
||||
self.sel_title.setFrameStyle(QtWidgets.QFrame.NoFrame)
|
||||
# font = self.sel_title.font()
|
||||
# font.setPointSize(12)
|
||||
# self.sel_title.setFont(font)
|
||||
|
||||
self.selected_text = '''
|
||||
<p><span style="font-size:14px"><strong>Selected Tab - Choose an Item from Project Tab</strong></span></p>
|
||||
|
||||
<p><span style="font-size:10px"><strong>Details</strong>:<br />
|
||||
The normal flow when working in FlatCAM is the following:</span></p>
|
||||
|
||||
<ol>
|
||||
<li><span style="font-size:10px">Loat/Import a Gerber, Excellon, Gcode, DXF, Raster Image or SVG file into FlatCAM using either the menu's, toolbars or key shortcuts.<br />
|
||||
<br />
|
||||
You can also load a <strong>FlatCAM project</strong> by double clicking on the project file, drag & drop of the file into the FLATCAM GUI or through the menu/toolbar links offered within the app.</span><br />
|
||||
</li>
|
||||
<li><span style="font-size:10px">Once an object is available in the Project Tab, by selecting it and then selecting <strong>SELECTED TAB </strong>(more simpler is to double click the object name in the Project Tab), <strong>SELECTED TAB </strong>will be updated with the object properties according to it's kind: Gerber, Excellon or Geometry object.<br />
|
||||
<br />
|
||||
If the selection of the object is done on the canvas by single click instead, and the <strong>SELECTED TAB</strong> is in focus, again the object properties will be displayed into the Selected Tab. Alternatively, double clicking on the object on the canvas will bring the <strong>SELECTED TAB</strong> and populate it even if it was out of focus.<br />
|
||||
<br />
|
||||
You can change the parameters in this screen and the flow direction is like this:<br />
|
||||
<br />
|
||||
<strong>Gerber/Excellon Object</strong> -> Change Param -> Generate Geometry -><strong> Geometry Object </strong>-> Add tools (change param in Selected Tab) -> Generate CNCJob -><strong> CNCJob Object </strong>-> Verify GCode (through Edit CNC Code) and/or append/prepend to GCode (again, done in <strong>SELECTED TAB) </strong>-> Save GCode</span></li>
|
||||
</ol>
|
||||
|
||||
<p><span style="font-size:10px">A list of key shortcuts is available through an menu entry in <strong>Help -> Shortcuts List</strong> or through it's own key shortcut: '`' (key left to 1).</span></p>
|
||||
|
||||
'''
|
||||
|
||||
self.sel_title.setText(self.selected_text)
|
||||
self.sel_title.setSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding)
|
||||
|
||||
self.ui.selected_scroll_area.setWidget(self.sel_title)
|
||||
|
||||
label = QtWidgets.QLabel("Choose a Tool from Tool Menu")
|
||||
label.setAlignment(QtCore.Qt.AlignHCenter | QtCore.Qt.AlignVCenter)
|
||||
self.ui.selected_scroll_area.setWidget(label)
|
||||
self.ui.tool_scroll_area.setWidget(label)
|
||||
|
||||
def setup_obj_classes(self):
|
||||
"""
|
||||
|
|
|
@ -9,6 +9,10 @@ CAD program, and create G-Code for Isolation routing.
|
|||
|
||||
=================================================
|
||||
|
||||
5.02.3019
|
||||
|
||||
- added a text in the Selected Tab which is showed whenever the Selected Tab is selected but without having an object selected to display it's properties
|
||||
|
||||
4.02.2019
|
||||
|
||||
- modified the Toolchange_Probe_general postprocessor file to remove any Z moves before the actual toolchange event
|
||||
|
|
|
@ -412,7 +412,6 @@ class NonCopperClear(FlatCAMTool, Gerber):
|
|||
self.tools_table.setMinimumHeight(self.tools_table.getHeight())
|
||||
self.tools_table.setMaximumHeight(self.tools_table.getHeight())
|
||||
|
||||
self.app.report_usage("gerber_on_ncc_button")
|
||||
self.ui_connect()
|
||||
|
||||
def ui_connect(self):
|
||||
|
|
Loading…
Reference in New Issue