Merge branch 'develop'

Author: dbirman

.gitignore

@@ -90,3 +90,9 @@ API/urchin-venv/*
 Examples/steinmetz_3dvol_test/testwf4.npy
 Examples/bwm_coverage/lab_clusters.csv
 Examples/lozano/channel_locations.json
+Examples/ottenheimer_hjort_bowen_2022.zip
+UnityClient/Assets/AddressableAssetsData/link.xml
+UnityClient/Assets/AddressableAssetsData/link.xml.meta
+UnityClient/UserSettings/Layouts/default-2021.dwlt
+
+API/oursin-venv/*

API/oursin.egg-info/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: oursin
-Version: 0.4.4
-Summary: Urchin - Universal Renderer for Neuroscience Python API
+Version: 0.4.5
+Summary: Urchin - Universal Renderer Creating Helpful Images for Neuroscience Python API
 Author-email: Daniel Birman <danbirman@gmail.com>
 License:                     GNU GENERAL PUBLIC LICENSE
                                Version 3, 29 June 2007
@@ -679,7 +679,7 @@ License:                     GNU GENERAL PUBLIC LICENSE
         <https://www.gnu.org/licenses/why-not-lgpl.html>.
 
 Project-URL: Homepage, https://virtualbrainlab.org/03_unity_neuro/01_urn_intro.html
-Project-URL: Bug Tracker, https://github.com/VirtualBrainLab/UnityNeuroscience/issues
+Project-URL: Bug Tracker, https://github.com/VirtualBrainLab/Urchin/issues
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent

API/oursin.egg-info/requires.txt

@@ -1,2 +1,3 @@
 python-socketio[client]
 numpy
+PIL

API/oursin/camera.py

@@ -2,6 +2,31 @@
 
 from . import client
 
+from PIL import Image
+import io
+		  
+receive_fname = ''
+receive_count = 0
+receive_data = []
+
+def receive_camera_img_meta(data):
+	global receive_count, receive_data
+	receive_count = int(data)
+	print('(Camera receive meta) ' + str(data))
+
+def receive_camera_img(data):
+  global receive_count, receive_data
+	
+  print(f'(Camera) received {str(len(data))} bytes')
+  receive_data.append(data)
+  receive_count -= 1
+
+  if (receive_count == 0):
+    data_bytes = b''.join(receive_data)
+    receive_data = []
+    Image.open(io.BytesIO(data_bytes)).save(receive_fname)
+    print('(Camera received all data)')
+
 def set_target(camera_target_coordinate):
 	"""Set the camera target coordinate in CCF space in um relative to CCF (0,0,0), without moving the camera. Coordinates can be negative or larger than the CCF space (11400,13200,8000)
 
@@ -82,4 +107,32 @@ def set_pan(pan_x, pan_y):
 	--------
 	>>> urn.set_pan(3.0, 4.0)
 	"""
-	client.sio.emit('SetCameraPan', [pan_x, pan_y])
+	client.sio.emit('SetCameraPan', [pan_x, pan_y])
+	
+def set_mode(mode):
+	"""Set camera perspective mode
+
+	Parameters
+	----------
+	mode : string
+    mode options "perspective" or "orthographic" (default)
+	
+	Examples
+	--------
+	>>> urn.set_mode('perspective')
+	"""
+	client.sio.emit('SetCameraMode', mode)
+	
+def capture_image(filename):
+	""" Capture a full screenshot and save to filename
+	
+	Note: only supports PNG filetypes, for now
+	
+	Examples
+	--------
+	>>> urn.capture_image('./image.png')
+	"""
+	global receive_fname
+	receive_fname = filename
+	client.sio.emit('RequestCameraImg')
+	

API/oursin/client.py

@@ -2,6 +2,8 @@
 import socketio
 import os
 
+from . import camera
+
 class bcolors:
     WARNING = '\033[93m'
     FAIL = '\033[91m'
@@ -32,6 +34,13 @@ def message(data):
 def message(data):
 	print('(Renderer) ' + bcolors.FAIL + data)
 
+@sio.on('ReceiveCameraImgMeta')
+def receive_camera_img_meta(data):
+	camera.receive_camera_img_meta(data)
+	
+@sio.on('ReceiveCameraImg')
+def receive_camera_img(data):
+  camera.receive_camera_img(data)
 def connected():
 	return sio.connected
 

API/oursin/primitives.py

@@ -72,4 +72,19 @@ def set_color(mesh_color):
 	>>> urn.set_color({'cube1': '#FFFFFF'})
 	
   """
-  client.sio.emit('SetColor', mesh_color)
+  client.sio.emit('SetColor', mesh_color)
+
+def set_material(mesh_material):
+  """Set the material of mesh renderer
+
+  Parameters
+  ----------
+  mesh_material : dict {string : string}
+      dictionary of object IDs and name of new material
+      
+	Examples
+	--------
+	>>> urn.set_material({'cube1': 'unlit'})
+	
+  """
+  client.sio.emit('SetMaterial', mesh_material)  

API/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "oursin"
-version = "0.4.4"
+version = "0.4.5"
 authors = [
   { name="Daniel Birman", email="danbirman@gmail.com" },
 ]
@@ -21,6 +21,7 @@ classifiers = [
 dependencies = [
   "python-socketio[client]",
   "numpy",
+  "PIL"
 ]
 
 [project.urls]