From facd8301edd72270d2a005145fc6a79e6d822f87 Mon Sep 17 00:00:00 2001
From: camellan
Date: Sat, 8 Jun 2019 23:30:57 +0400
Subject: [PATCH] solve the conflicts
---
FlatCAMApp.py | 49 ----------------------------------------
flatcamGUI/FlatCAMGUI.py | 11 +++------
2 files changed, 3 insertions(+), 57 deletions(-)
diff --git a/FlatCAMApp.py b/FlatCAMApp.py
index a21478f9..060d350b 100644
--- a/FlatCAMApp.py
+++ b/FlatCAMApp.py
@@ -8335,54 +8335,6 @@ The normal flow when working in FlatCAM is the following:
self.enable_plots(self.collection.get_list())
self.inform.emit(_("[success] All plots enabled."))
-<<<<<<< HEAD
- # TODO: FIX THIS
- '''
- By default this is not threaded
- If threaded the app give warnings like this:
-
- QObject::connect: Cannot queue arguments of type 'QVector'
- (Make sure 'QVector' is registered using qRegisterMetaType().
- '''
- def enable_plots(self, objects, threaded=True):
- if threaded is True:
- def worker_task(app_obj):
- # percentage = 0.1
- # try:
- # delta = 0.9 / len(objects)
- # except ZeroDivisionError:
- # self.progress.emit(0)
- # return
- for obj in objects:
- obj.options['plot'] = True
- # percentage += delta
- # self.progress.emit(int(percentage*100))
-
- # self.progress.emit(0)
- self.plots_updated.emit()
- # self.collection.update_view()
-
- # Send to worker
- # self.worker.add_task(worker_task, [self])
- self.worker_task.emit({'fcn': worker_task, 'params': [self]})
- else:
- for obj in objects:
- obj.options['plot'] = True
- # self.progress.emit(0)
- self.plots_updated.emit()
- # self.collection.update_view()
-
- # TODO: FIX THIS
- '''
- By default this is not threaded
- If threaded the app give warnings like this:
-
- QObject::connect: Cannot queue arguments of type 'QVector'
- (Make sure 'QVector' is registered using qRegisterMetaType().
- '''
- def disable_plots(self, objects, threaded=True):
- # TODO: This method is very similar to replot_all. Try to merge.
-=======
def on_enable_sel_plots(self):
log.debug("App.on_enable_sel_plot()")
object_list = self.collection.get_selected()
@@ -8398,7 +8350,6 @@ The normal flow when working in FlatCAM is the following:
self.inform.emit(_("[success] Selected plots disabled..."))
def enable_plots(self, objects):
->>>>>>> remotes/jpcgt/flatcam/Beta
"""
Disables plots
:param objects: list of Objects to be enabled
diff --git a/flatcamGUI/FlatCAMGUI.py b/flatcamGUI/FlatCAMGUI.py
index 7043f3a9..fd2eef86 100644
--- a/flatcamGUI/FlatCAMGUI.py
+++ b/flatcamGUI/FlatCAMGUI.py
@@ -1250,7 +1250,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
-
+
'''
)
@@ -1265,7 +1265,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
'''Editor Shortcut list
GEOMETRY EDITOR
-
+
@@ -4073,13 +4073,8 @@ class GerberOptPrefGroupUI(OptionsGroupUI):
overlabel = QtWidgets.QLabel(_('Pass overlap:'))
overlabel.setToolTip(
_("How much (fraction) of the tool width to overlap each tool pass.\n"
-<<<<<<< HEAD
- "Example:\n"
- "A value here of 0.25 means an overlap of 25% from the tool diameter found above.")
-=======
"Example:\n"
- "A value here of 0.25 means an overlap of 25%% from the tool diameter found above.")
->>>>>>> remotes/jpcgt/flatcam/Beta
+ "A value here of 0.25 means an overlap of 25% from the tool diameter found above.")
)
grid0.addWidget(overlabel, 2, 0)
self.iso_overlap_entry = FloatEntry()