- remade the layout in 2Sided Tool
- work in progress for translation in Romanian - 91%
This commit is contained in:
parent
011f684b38
commit
fe6fa826ce
|
@ -91,7 +91,7 @@ class App(QtCore.QObject):
|
||||||
|
|
||||||
# Version
|
# Version
|
||||||
version = 8.912
|
version = 8.912
|
||||||
version_date = "2019/03/16"
|
version_date = "2019/03/17"
|
||||||
beta = True
|
beta = True
|
||||||
|
|
||||||
# current date now
|
# current date now
|
||||||
|
|
|
@ -9,6 +9,11 @@ CAD program, and create G-Code for Isolation routing.
|
||||||
|
|
||||||
=================================================
|
=================================================
|
||||||
|
|
||||||
|
17.03.2019
|
||||||
|
|
||||||
|
- remade the layout in 2Sided Tool
|
||||||
|
- work in progress for translation in Romanian - 91%
|
||||||
|
|
||||||
16.03.2019
|
16.03.2019
|
||||||
|
|
||||||
- fixed bug in Paint Tool - Single Poly: no geometry was generated
|
- fixed bug in Paint Tool - Single Poly: no geometry was generated
|
||||||
|
|
|
@ -23,6 +23,7 @@ import builtins
|
||||||
if '_' not in builtins.__dict__:
|
if '_' not in builtins.__dict__:
|
||||||
_ = gettext.gettext
|
_ = gettext.gettext
|
||||||
|
|
||||||
|
|
||||||
class ObjectUI(QtWidgets.QWidget):
|
class ObjectUI(QtWidgets.QWidget):
|
||||||
"""
|
"""
|
||||||
Base class for the UI of FlatCAM objects. Deriving classes should
|
Base class for the UI of FlatCAM objects. Deriving classes should
|
||||||
|
@ -100,7 +101,7 @@ class ObjectUI(QtWidgets.QWidget):
|
||||||
self.scale_button.setToolTip(
|
self.scale_button.setToolTip(
|
||||||
_("Perform scaling operation.")
|
_("Perform scaling operation.")
|
||||||
)
|
)
|
||||||
self.scale_button.setFixedWidth(40)
|
self.scale_button.setFixedWidth(50)
|
||||||
self.scale_grid.addWidget(self.scale_button, 0, 2)
|
self.scale_grid.addWidget(self.scale_button, 0, 2)
|
||||||
|
|
||||||
#### Offset ####
|
#### Offset ####
|
||||||
|
@ -127,7 +128,7 @@ class ObjectUI(QtWidgets.QWidget):
|
||||||
self.offset_button.setToolTip(
|
self.offset_button.setToolTip(
|
||||||
_("Perform the offset operation.")
|
_("Perform the offset operation.")
|
||||||
)
|
)
|
||||||
self.offset_button.setFixedWidth(40)
|
self.offset_button.setFixedWidth(50)
|
||||||
self.offset_grid.addWidget(self.offset_button, 0, 2)
|
self.offset_grid.addWidget(self.offset_button, 0, 2)
|
||||||
|
|
||||||
layout.addStretch()
|
layout.addStretch()
|
||||||
|
|
|
@ -59,8 +59,8 @@ class DblSidedTool(FlatCAMTool):
|
||||||
|
|
||||||
# grid_lay.addRow("Bottom Layer:", self.object_combo)
|
# grid_lay.addRow("Bottom Layer:", self.object_combo)
|
||||||
grid_lay.addWidget(self.botlay_label, 0, 0)
|
grid_lay.addWidget(self.botlay_label, 0, 0)
|
||||||
grid_lay.addWidget(self.gerber_object_combo, 1, 0, 1, 2)
|
grid_lay.addWidget(self.gerber_object_combo, 1, 0)
|
||||||
grid_lay.addWidget(self.mirror_gerber_button, 1, 3)
|
grid_lay.addWidget(self.mirror_gerber_button, 1, 1)
|
||||||
|
|
||||||
## Excellon Object to mirror
|
## Excellon Object to mirror
|
||||||
self.exc_object_combo = QtWidgets.QComboBox()
|
self.exc_object_combo = QtWidgets.QComboBox()
|
||||||
|
@ -83,8 +83,8 @@ class DblSidedTool(FlatCAMTool):
|
||||||
|
|
||||||
# grid_lay.addRow("Bottom Layer:", self.object_combo)
|
# grid_lay.addRow("Bottom Layer:", self.object_combo)
|
||||||
grid_lay.addWidget(self.excobj_label, 2, 0)
|
grid_lay.addWidget(self.excobj_label, 2, 0)
|
||||||
grid_lay.addWidget(self.exc_object_combo, 3, 0, 1, 2)
|
grid_lay.addWidget(self.exc_object_combo, 3, 0)
|
||||||
grid_lay.addWidget(self.mirror_exc_button, 3, 3)
|
grid_lay.addWidget(self.mirror_exc_button, 3, 1)
|
||||||
|
|
||||||
## Geometry Object to mirror
|
## Geometry Object to mirror
|
||||||
self.geo_object_combo = QtWidgets.QComboBox()
|
self.geo_object_combo = QtWidgets.QComboBox()
|
||||||
|
@ -107,8 +107,12 @@ class DblSidedTool(FlatCAMTool):
|
||||||
|
|
||||||
# grid_lay.addRow("Bottom Layer:", self.object_combo)
|
# grid_lay.addRow("Bottom Layer:", self.object_combo)
|
||||||
grid_lay.addWidget(self.geoobj_label, 4, 0)
|
grid_lay.addWidget(self.geoobj_label, 4, 0)
|
||||||
grid_lay.addWidget(self.geo_object_combo, 5, 0, 1, 2)
|
grid_lay.addWidget(self.geo_object_combo, 5, 0)
|
||||||
grid_lay.addWidget(self.mirror_geo_button, 5, 3)
|
grid_lay.addWidget(self.mirror_geo_button, 5, 1)
|
||||||
|
|
||||||
|
## Grid Layout
|
||||||
|
grid_lay1 = QtWidgets.QGridLayout()
|
||||||
|
self.layout.addLayout(grid_lay1)
|
||||||
|
|
||||||
## Axis
|
## Axis
|
||||||
self.mirror_axis = RadioSet([{'label': 'X', 'value': 'X'},
|
self.mirror_axis = RadioSet([{'label': 'X', 'value': 'X'},
|
||||||
|
@ -119,9 +123,9 @@ class DblSidedTool(FlatCAMTool):
|
||||||
)
|
)
|
||||||
# grid_lay.addRow("Mirror Axis:", self.mirror_axis)
|
# grid_lay.addRow("Mirror Axis:", self.mirror_axis)
|
||||||
self.empty_lb1 = QtWidgets.QLabel("")
|
self.empty_lb1 = QtWidgets.QLabel("")
|
||||||
grid_lay.addWidget(self.empty_lb1, 6, 0)
|
grid_lay1.addWidget(self.empty_lb1, 6, 0)
|
||||||
grid_lay.addWidget(self.mirax_label, 7, 0)
|
grid_lay1.addWidget(self.mirax_label, 7, 0)
|
||||||
grid_lay.addWidget(self.mirror_axis, 7, 1)
|
grid_lay1.addWidget(self.mirror_axis, 7, 1)
|
||||||
|
|
||||||
## Axis Location
|
## Axis Location
|
||||||
self.axis_location = RadioSet([{'label': 'Point', 'value': 'point'},
|
self.axis_location = RadioSet([{'label': 'Point', 'value': 'point'},
|
||||||
|
@ -133,11 +137,15 @@ class DblSidedTool(FlatCAMTool):
|
||||||
"the center.")
|
"the center.")
|
||||||
)
|
)
|
||||||
# grid_lay.addRow("Axis Location:", self.axis_location)
|
# grid_lay.addRow("Axis Location:", self.axis_location)
|
||||||
grid_lay.addWidget(self.axloc_label, 8, 0)
|
grid_lay1.addWidget(self.axloc_label, 8, 0)
|
||||||
grid_lay.addWidget(self.axis_location, 8, 1)
|
grid_lay1.addWidget(self.axis_location, 8, 1)
|
||||||
|
|
||||||
self.empty_lb2 = QtWidgets.QLabel("")
|
self.empty_lb2 = QtWidgets.QLabel("")
|
||||||
grid_lay.addWidget(self.empty_lb2, 9, 0)
|
grid_lay1.addWidget(self.empty_lb2, 9, 0)
|
||||||
|
|
||||||
|
## Grid Layout
|
||||||
|
grid_lay2 = QtWidgets.QGridLayout()
|
||||||
|
self.layout.addLayout(grid_lay2)
|
||||||
|
|
||||||
## Point/Box
|
## Point/Box
|
||||||
self.point_box_container = QtWidgets.QVBoxLayout()
|
self.point_box_container = QtWidgets.QVBoxLayout()
|
||||||
|
@ -158,9 +166,9 @@ class DblSidedTool(FlatCAMTool):
|
||||||
)
|
)
|
||||||
self.add_point_button.setFixedWidth(60)
|
self.add_point_button.setFixedWidth(60)
|
||||||
|
|
||||||
grid_lay.addWidget(self.pb_label, 10, 0)
|
grid_lay2.addWidget(self.pb_label, 10, 0)
|
||||||
grid_lay.addLayout(self.point_box_container, 11, 0, 1, 3)
|
grid_lay2.addLayout(self.point_box_container, 11, 0)
|
||||||
grid_lay.addWidget(self.add_point_button, 11, 3)
|
grid_lay2.addWidget(self.add_point_button, 11, 1)
|
||||||
|
|
||||||
self.point_entry = EvalEntry()
|
self.point_entry = EvalEntry()
|
||||||
|
|
||||||
|
@ -192,8 +200,8 @@ class DblSidedTool(FlatCAMTool):
|
||||||
)
|
)
|
||||||
self.layout.addWidget(self.ah_label)
|
self.layout.addWidget(self.ah_label)
|
||||||
|
|
||||||
grid_lay1 = QtWidgets.QGridLayout()
|
grid_lay3 = QtWidgets.QGridLayout()
|
||||||
self.layout.addLayout(grid_lay1)
|
self.layout.addLayout(grid_lay3)
|
||||||
|
|
||||||
self.alignment_holes = EvalEntry()
|
self.alignment_holes = EvalEntry()
|
||||||
|
|
||||||
|
@ -209,8 +217,8 @@ class DblSidedTool(FlatCAMTool):
|
||||||
)
|
)
|
||||||
self.add_drill_point_button.setFixedWidth(60)
|
self.add_drill_point_button.setFixedWidth(60)
|
||||||
|
|
||||||
grid_lay1.addWidget(self.alignment_holes, 0, 0, 1, 2)
|
grid_lay3.addWidget(self.alignment_holes, 0, 0)
|
||||||
grid_lay1.addWidget(self.add_drill_point_button, 0, 3)
|
grid_lay3.addWidget(self.add_drill_point_button, 0, 1)
|
||||||
|
|
||||||
## Drill diameter for alignment holes
|
## Drill diameter for alignment holes
|
||||||
self.dt_label = QtWidgets.QLabel("<b>%s</b>:" % _('Alignment Drill Diameter'))
|
self.dt_label = QtWidgets.QLabel("<b>%s</b>:" % _('Alignment Drill Diameter'))
|
||||||
|
@ -220,8 +228,8 @@ class DblSidedTool(FlatCAMTool):
|
||||||
)
|
)
|
||||||
self.layout.addWidget(self.dt_label)
|
self.layout.addWidget(self.dt_label)
|
||||||
|
|
||||||
grid_lay2 = QtWidgets.QGridLayout()
|
hlay = QtWidgets.QHBoxLayout()
|
||||||
self.layout.addLayout(grid_lay2)
|
self.layout.addLayout(hlay)
|
||||||
|
|
||||||
self.drill_dia = FCEntry()
|
self.drill_dia = FCEntry()
|
||||||
self.dd_label = QtWidgets.QLabel(_("Drill diam.:"))
|
self.dd_label = QtWidgets.QLabel(_("Drill diam.:"))
|
||||||
|
@ -229,8 +237,11 @@ class DblSidedTool(FlatCAMTool):
|
||||||
_("Diameter of the drill for the "
|
_("Diameter of the drill for the "
|
||||||
"alignment holes.")
|
"alignment holes.")
|
||||||
)
|
)
|
||||||
grid_lay2.addWidget(self.dd_label, 0, 0)
|
hlay.addWidget(self.dd_label)
|
||||||
grid_lay2.addWidget(self.drill_dia, 0, 1)
|
hlay.addWidget(self.drill_dia)
|
||||||
|
|
||||||
|
hlay2 = QtWidgets.QHBoxLayout()
|
||||||
|
self.layout.addLayout(hlay2)
|
||||||
|
|
||||||
## Buttons
|
## Buttons
|
||||||
self.create_alignment_hole_button = QtWidgets.QPushButton(_("Create Excellon Object"))
|
self.create_alignment_hole_button = QtWidgets.QPushButton(_("Create Excellon Object"))
|
||||||
|
@ -239,15 +250,14 @@ class DblSidedTool(FlatCAMTool):
|
||||||
"specified alignment holes and their mirror\n"
|
"specified alignment holes and their mirror\n"
|
||||||
"images.")
|
"images.")
|
||||||
)
|
)
|
||||||
# self.create_alignment_hole_button.setFixedWidth(60)
|
hlay2.addWidget(self.create_alignment_hole_button)
|
||||||
grid_lay2.addWidget(self.create_alignment_hole_button, 1,0, 1, 2)
|
|
||||||
|
|
||||||
self.reset_button = QtWidgets.QPushButton(_("Reset"))
|
self.reset_button = QtWidgets.QPushButton(_("Reset"))
|
||||||
self.reset_button.setToolTip(
|
self.reset_button.setToolTip(
|
||||||
_("Resets all the fields.")
|
_("Resets all the fields.")
|
||||||
)
|
)
|
||||||
self.reset_button.setFixedWidth(60)
|
self.reset_button.setFixedWidth(60)
|
||||||
grid_lay2.addWidget(self.reset_button, 1, 2)
|
hlay2.addWidget(self.reset_button)
|
||||||
|
|
||||||
self.layout.addStretch()
|
self.layout.addStretch()
|
||||||
|
|
||||||
|
|
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue