Olli-Pekka Kahilakoski · Thiago Franco de Moraes · Thiago Franco de Moraes
Showing 4 changed files Show diff stats
invesalius/data/viewer_slice.py
invesalius/net/neuronavigation_api.py
requirements.txt
requirements_m1.txt
@@ -1049,7 +1049,6 @@ class Viewer(wx.Panel):
         #self.scroll.Bind(wx.EVT_SCROLL_ENDSCROLL, self.OnScrollBarRelease)
         self.interactor.Bind(wx.EVT_KEY_DOWN, self.OnKeyDown)
         self.interactor.Bind(wx.EVT_RIGHT_UP, self.OnContextMenu)
-        self.interactor.Bind(wx.EVT_SIZE, self.OnSize)
     def LoadImagedata(self, mask_dict):
         self.SetInput(mask_dict)
@@ -1433,15 +1432,6 @@ class Viewer(wx.Panel):
             self.scroll.SetThumbPosition(pos)
             self.OnScrollBar()
-    def OnSize(self, evt):
-        print("OnSize")
-        w, h = self.GetSize()
-        rwin = self.interactor.GetRenderWindow()
-        rwin.SetSize(w, h)
-        # if self.slice_data:
-        #     self.slice_data.SetSize((w, h))
-        # evt.Skip()
-
     def OnSetMIPSize(self, number_slices):
         self.number_slices = number_slices
         self.ReloadActualSlice()
@@ -28,20 +28,26 @@ class NeuronavigationApi(metaclass=Singleton):
     An API used internally in InVesalius to communicate with the
     outside world.
-    When something noteworthy happens when running InVesalius, e.g.,
-    the coil is moved during neuronavigation, an object created from
-    this class can be used to update that information.
+    When an event of one of several types happens while running InVesalius, e.g.,
+    the coil is moved during neuronavigation, this class is used to update the
+    information conveyed by the event.
     When created for the first time, takes a connection object obtained
     from outside InVesalius (see the main entrypoint in app.py).
-    If connection object is not given or it is None, skip doing the updates.
+    The owner of the connection object can update the state of InVesalius by implementing
+    functions to set callbacks, used then to communicate the new state to InVesalius (see,
+    e.g., set_callback__set_markers below).
+
+    If connection object is not given or it is None, do not do the updates.
     """
     N_VERTICES_IN_POLYGON = 3
     def __init__(self, connection=None):
         if connection is not None:
-            assert self._hasmethod(connection, 'update_coil_pose')
+            self.assert_valid(connection)
+
+            self.__set_callbacks(connection)
             self.__bind_events()
         self.connection = connection
@@ -49,9 +55,16 @@ class NeuronavigationApi(metaclass=Singleton):
     def _hasmethod(self, obj, name):
         return hasattr(obj, name) and callable(getattr(obj, name))
+    def assert_valid(self, connection):
+        assert self._hasmethod(connection, 'update_coil_pose')
+        assert self._hasmethod(connection, 'update_focus')
+        assert self._hasmethod(connection, 'set_callback__set_markers')
+
     def __bind_events(self):
         Publisher.subscribe(self.update_focus, 'Set cross focal point')
+    # Functions for InVesalius to send updates.
+
     # TODO: Not the cleanest API; for an example of a better API, see update_coil_pose
     #   below, for which position and orientation are sent separately. Changing this
     #   would require changing 'Set cross focal point' publishers and subscribers
@@ -96,3 +109,11 @@ class NeuronavigationApi(metaclass=Singleton):
                 points=points,
                 polygons=polygons,
             )
+
+    # Functions for InVesalius to receive updates via callbacks.
+
+    def __set_callbacks(self, connection):
+        connection.set_callback__set_markers(self.set_markers)
+
+    def set_markers(self, markers):
+        Publisher.sendMessage('Set markers', markers=markers)
-Cython==0.29.24
-Pillow==9.0.1
+Cython==0.29.28
+Pillow==9.1.0
 Pypubsub==4.0.3
 configparser==5.0.1
 h5py==2.10.0
 imageio==2.9.0
 nibabel==3.2.1
-numpy==1.21.2
+numpy==1.22.1
 plaidml-keras==0.7.0
 psutil==5.8.0
 pyserial==3.5
-python-gdcm==3.0.9.1
-scikit-image==0.18.3
-scipy==1.7.1
-vtk==9.0.3
+python-gdcm==3.0.12
+scikit-image==0.19.1
+scipy==1.7.3
+vtk==9.1.0
 wxPython==4.1.1
 Theano==1.0.5
-torch==1.9.1
+torch==1.11.0
 pyacvd==0.2.7
-Cython==0.29.24
-Pillow==9.0.0
+Cython==0.29.28
+Pillow==9.1.0
 Pypubsub==4.0.3
 configparser==5.0.1
 h5py==3.6.0
@@ -8,10 +8,10 @@ nibabel==3.2.1
 numpy==1.22.1
 psutil==5.8.0
 pyserial==3.5
-python-gdcm==3.0.9.1
+python-gdcm==3.0.12
 scikit-image==0.19.1
 scipy==1.7.3
-vtk==9.0.3
+vtk==9.1.0
 wxPython==4.1.1
-torch==1.10.0
+torch==1.11.0
 pyacvd==0.2.7