From 49911c23907a323082e5eb625bd224566f2becaf Mon Sep 17 00:00:00 2001
From: Marius Stanciu <marius.adrian@gmail.com>
Date: Tue, 19 May 2020 00:13:37 +0300
Subject: [PATCH] - fixes due of recent changes

---
 AppObjects/AppObject.py     | 5 +++--
 AppObjects/FlatCAMGerber.py | 6 +++---
 CHANGELOG.md                | 1 +
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/AppObjects/AppObject.py b/AppObjects/AppObject.py
index 8dfa2113..05fcbfa0 100644
--- a/AppObjects/AppObject.py
+++ b/AppObjects/AppObject.py
@@ -48,6 +48,7 @@ class AppObject(QtCore.QObject):
     def __init__(self, app):
         super(AppObject, self).__init__()
         self.app = app
+        self.inform = app.inform
 
         # signals that are emitted when object state changes
         self.object_created.connect(self.on_object_created)
@@ -127,7 +128,7 @@ class AppObject(QtCore.QObject):
         t1 = time.time()
         log.debug("%f seconds before initialize()." % (t1 - t0))
         try:
-            return_value = initialize(obj, self)
+            return_value = initialize(obj, self.app)
         except Exception as e:
             msg = '[ERROR_NOTCL] %s' % _("An internal error has occurred. See shell.\n")
             msg += _("Object ({kind}) failed because: {error} \n\n").format(kind=kind, error=str(e))
@@ -347,7 +348,7 @@ class AppObject(QtCore.QObject):
         def task(t_obj):
             with self.app.proc_container.new(_("Plotting")):
                 if t_obj.kind == 'cncjob':
-                    t_obj.plot(kind=self.defaults["cncjob_plot_kind"])
+                    t_obj.plot(kind=self.app.defaults["cncjob_plot_kind"])
                 else:
                     t_obj.plot()
 
diff --git a/AppObjects/FlatCAMGerber.py b/AppObjects/FlatCAMGerber.py
index 1fcefb28..8758d6dc 100644
--- a/AppObjects/FlatCAMGerber.py
+++ b/AppObjects/FlatCAMGerber.py
@@ -968,7 +968,7 @@ class GerberObject(FlatCAMObj, Gerber):
                     else:
                         iso_name = outname
 
-                def iso_init(geo_obj, app_obj):
+                def iso_init(geo_obj, fc_obj):
                     # Propagate options
                     geo_obj.options["cnctooldia"] = str(self.options["isotooldia"])
                     if self.ui.tool_type_radio.get_value() == 'v':
@@ -983,7 +983,7 @@ class GerberObject(FlatCAMObj, Gerber):
                                                   nr_passes=i)
 
                     if geom == 'fail':
-                        app_obj.inform.emit('[ERROR_NOTCL] %s' % _("Isolation geometry could not be generated."))
+                        fc_obj.inform.emit('[ERROR_NOTCL] %s' % _("Isolation geometry could not be generated."))
                         return 'fail'
 
                     geo_obj.solid_geometry = geom
@@ -1060,7 +1060,7 @@ class GerberObject(FlatCAMObj, Gerber):
                     if empty_cnt == len(geo_obj.solid_geometry):
                         raise ValidationError("Empty Geometry", None)
                     else:
-                        app_obj.inform.emit('[success] %s: %s' %
+                        fc_obj.inform.emit('[success] %s: %s' %
                                             (_("Isolation geometry created"), geo_obj.options["name"]))
                     geo_obj.multigeo = False
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c73d5c5e..9dfab086 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,7 @@ CHANGELOG for FlatCAM beta
 - moved more methods out of App_Main class
 - added confirmation messages for toggle of HUD, Grid, Grid Snap, Axis
 - added icon in status bar for HUD; clicking on it will toggle the HUD (heads up display)
+- fixes due of recent changes
 
 17.05.2020