- in Distance Plugin: added a new way to display the angle (angles between 181° and 359° are subtracted from 360°)

This commit is contained in:
Marius Stanciu
2022-03-30 12:43:34 +03:00
committed by Marius
parent 40ba41264e
commit f8bf9dee78
2 changed files with 23 additions and 4 deletions

View File

@@ -13,6 +13,7 @@ CHANGELOG for FlatCAM Evo beta
- fixed the OR-tools path optimization (it required now a cast to int when creating the distances' matrix) - fixed the OR-tools path optimization (it required now a cast to int when creating the distances' matrix)
- in Distance Plugin made sure that the grid snapping restore is working properly (previously it always restored it to the ON state) - in Distance Plugin made sure that the grid snapping restore is working properly (previously it always restored it to the ON state)
- the HUD display is no longer default active on new installations - the HUD display is no longer default active on new installations
- in Distance Plugin: added a new way to display the angle (angles between 181° and 359° are subtracted from 360°)
29.03.2022 29.03.2022

View File

@@ -641,6 +641,11 @@ class Distance(AppTool):
def display_angle(self, val): def display_angle(self, val):
if val is not None: if val is not None:
self.ui.angle_entry.set_value(str(self.app.dec_format(val, self.decimals))) self.ui.angle_entry.set_value(str(self.app.dec_format(val, self.decimals)))
if val > 180:
val = 360 - val
val = -val
self.ui.angle2_entry.set_value(str(self.app.dec_format(val, self.decimals)))
def display_start(self, val): def display_start(self, val):
if val: if val:
@@ -867,10 +872,23 @@ class DistanceUI:
res_grid.addWidget(self.angle_entry, 4, 1) res_grid.addWidget(self.angle_entry, 4, 1)
res_grid.addWidget(FCLabel("%s" % "°"), 4, 2) res_grid.addWidget(FCLabel("%s" % "°"), 4, 2)
# Angle 2
self.angle2_label = FCLabel('%s 2:' % _("Angle"))
self.angle2_label.setToolTip(_("This is orientation angle of the measuring line."))
self.angle2_entry = FCEntry()
self.angle2_entry.setReadOnly(True)
self.angle2_entry.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight | QtCore.Qt.AlignmentFlag.AlignVCenter)
self.angle2_entry.setToolTip(_("This is orientation angle of the measuring line."))
res_grid.addWidget(self.angle2_label, 6, 0)
res_grid.addWidget(self.angle2_entry, 6, 1)
res_grid.addWidget(FCLabel("%s" % "°"), 6, 2)
separator_line = QtWidgets.QFrame() separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine) separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken) separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
res_grid.addWidget(separator_line, 6, 0, 1, 3) res_grid.addWidget(separator_line, 8, 0, 1, 3)
# Distance # Distance
self.total_distance_label = FCLabel("<b>%s:</b>" % _('DISTANCE')) self.total_distance_label = FCLabel("<b>%s:</b>" % _('DISTANCE'))
@@ -882,9 +900,9 @@ class DistanceUI:
QtCore.Qt.AlignmentFlag.AlignVCenter) QtCore.Qt.AlignmentFlag.AlignVCenter)
self.total_distance_entry.setToolTip(_("This is the point to point Euclidian distance.")) self.total_distance_entry.setToolTip(_("This is the point to point Euclidian distance."))
res_grid.addWidget(self.total_distance_label, 8, 0) res_grid.addWidget(self.total_distance_label, 10, 0)
res_grid.addWidget(self.total_distance_entry, 8, 1) res_grid.addWidget(self.total_distance_entry, 10, 1)
res_grid.addWidget(FCLabel("%s" % self.units), 8, 2) res_grid.addWidget(FCLabel("%s" % self.units), 10, 2)
# Buttons # Buttons
self.measure_btn = FCButton(_("Measure")) self.measure_btn = FCButton(_("Measure"))