Move current layer tracking to pronsole and report in RPC status

printrun/pronsole.py

@@ -465,6 +465,7 @@ class pronsole(cmd.Cmd):
         self.p.errorcb = self.logError
         self.fgcode = None
         self.rpc_server = None
+        self.curlayer = 0
         self.listing = 0
         self.sdfiles = []
         self.paused = False
@@ -1484,6 +1485,9 @@ class pronsole(cmd.Cmd):
             listener(l)
 
     def layer_change_cb(self, newlayer):
+        layerz = self.fgcode.all_layers[newlayer].z
+        if layerz is not None:
+            self.curlayer = layerz
         if self.compute_eta:
             secondselapsed = int(time.time() - self.starttime + self.extra_print_time)
             self.compute_eta.update_layer(newlayer, secondselapsed)

printrun/pronterface.py

@@ -228,7 +228,6 @@ class PronterWindow(MainWindow, pronsole.pronsole):
         self.p.printsendcb = self.printsentcb
         self.p.startcb = self.startcb
         self.p.endcb = self.endcb
-        self.curlayer = 0
         self.cur_button = None
         self.predisconnect_mainqueue = None
         self.predisconnect_queueindex = None
@@ -1637,9 +1636,6 @@ Printrun. If not, see <http://www.gnu.org/licenses/>."""
     def layer_change_cb(self, newlayer):
         """Callback when the printed layer changed"""
         pronsole.pronsole.layer_change_cb(self, newlayer)
-        layerz = self.fgcode.all_layers[newlayer].z
-        if layerz is not None:
-            self.curlayer = layerz
         if self.settings.mainviz != "3D" or self.settings.trackcurrentlayer3d:
             wx.CallAfter(self.gviz.setlayer, newlayer)
 

printrun/rpc.py

@@ -39,8 +39,10 @@ class ProntRPC(object):
             temps = parse_temperature_report(self.pronsole.tempreadings)
         else:
             temps = None
+        z = self.pronsole.curlayer
         return {"filename": self.pronsole.filename,
                 "progress": progress,
                 "eta": eta,
                 "temps": temps,
+                "z": z,
                 }