in setup.py use version from ev3dev2simulator/version.py

added version [1.0.4] - 2020-02-28

 ### Added
 - improved Options menu by adding label  "Warning: to use the simulated bluetooth in the simulator make sure you have PyBluez uninstalled!!"
 - improved Options menu for windows we only have option "show simulator
   fullscreen on second screen" because on windows for none fullscreen mode the
   simulator is always opened on the default screen.
 - improved Options menu for macos where we  only have two options "show simulator
   fullscreen" and "show simulator on second screen". Latter option is added because
   when dragging window to other screen sometimes messes up the resolution of
   the window. By drawing the window already at startup at the second screen
   prevents this problem.
 - improved Options menu by adding caption which explains the rpyc timeout you can configure under advanced options.

 ### Fixed
 - fixed cleanup of files on EV3 by switching to new ev3devcmd library

Author: harcokuppens

CHANGELOG.md

@@ -7,6 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.3.2] - 2020-02-28
+
+### Added 
+  - added simulated bluetooth.py to ev3dev2simulator package. 
+  - Warning: to use the simulated bluetooth in the simulator make sure you have PyBluez uninstalled!!
+  
+### Fixed
+  - fullscreen switch when dragged: drag window to screen where you want it fullscreen, and then press F
+  - key T toggles fullscreen view between the two screens (if not at fullscreen, nothing happens)
+
+
 ## [1.3.1] - 2020-02-07
 
  ### Added

ev3dev2simulator/Simulator.py

@@ -11,9 +11,6 @@
 import arcade
 from pymunk import Space
 
-# HACK: https://gamedev.stackexchange.com/questions/16024/secondary-monitor-freezes-game-window
-#from pyglet.gl import *
-
 # HACK: need to change dir to Simulator script's directory because resources are loaded relative from this directory
 script_dir = os.path.dirname(os.path.realpath(__file__))
 os.chdir(script_dir)
@@ -109,6 +106,12 @@ def __init__(self, robot_state: RobotState, robot_pos: Tuple[int, int, int], sho
 
         self.check_for_activation()
 
+
+    def get_screens(self):
+        display = pyglet.canvas.get_display()
+        screens= display.get_screens()
+        return screens
+
     def set_screen_to_display_simulator_at_startup(self,use_second_screen_to_show_simulator):
         """ Set screen to use to display the simulator at startup. For windows this works only in fullscreen mode.
 
@@ -123,8 +126,7 @@ def set_screen_to_display_simulator_at_startup(self,use_second_screen_to_show_si
         current_screen_index=0
         if use_second_screen_to_show_simulator == True:
             current_screen_index=1
-        display = pyglet.canvas.get_display()
-        screens= display.get_screens()
+        screens= self.get_screens()
         for screen in screens: print(screen)
         num_screens=len(screens)
         if  num_screens== 1:
@@ -138,6 +140,8 @@ def set_screen_to_display_simulator_at_startup(self,use_second_screen_to_show_si
         def get_default_screen():
             """Get the default screen as specified by the user's operating system preferences."""
             return screens[self.current_screen_index]
+
+        display = pyglet.canvas.get_display()
         display.get_default_screen=get_default_screen
 
         # note:
@@ -303,7 +307,7 @@ def on_key_press(self, key, modifiers):
         # Toggle fullscreen between screens (only works at fullscreen mode)
         if key == arcade.key.T:
             # User hits T. When at fullscreen, then switch screen used for fullscreen.
-            if self.fullscreen:
+            if self.fullscreen and len(self.get_screens()) > 1:
                 # to switch screen when in fullscreen we first have to back to normal window, and do fullscreen again
                 self.set_fullscreen(False)
                 # switch which screen is used for fullscreen ; Toggle between first and second screen (other screens are ignored)
@@ -327,26 +331,21 @@ def on_key_press(self, key, modifiers):
     #toggle screen for fullscreen
     # BUG: doesn't work on macos => see explaination in set_screen_to_display_simulator_at_startup() method
     def toggleScreenUsedForFullscreen(self):
-        display = pyglet.canvas.get_display()
-        screens= display.get_screens()
-        num_screens=len(screens)
-        if num_screens== 1:
-            return
+
         # toggle only between screen 0 and 1 (other screens are ignored)
         self.current_screen_index=(self.current_screen_index+1)%2
 
         # override hidden screen parameter in window
+        screens= self.get_screens()
         self._screen=screens[self.current_screen_index]
 
     def updateCurrentScreen(self):
         """ using the windows position and size we determine on which screen it is currently displayed and make that
             current screen for displaying in fullscreen!!
         """
 
-        display = pyglet.canvas.get_display()
-        screens= display.get_screens()
-        num_screens=len(screens)
-        if num_screens== 1:
+        screens= self.get_screens()
+        if len(screens)== 1:
             return
 
         location=self.get_location()
@@ -430,12 +429,6 @@ def on_draw(self):
 
         arcade.start_render()
 
-        # HACK: https://gamedev.stackexchange.com/questions/16024/secondary-monitor-freezes-game-window
-        # glEnable(GL_BLEND)
-        # glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA)
-        # glEnable(GL_LINE_SMOOTH)
-        # glHint(GL_LINE_SMOOTH_HINT, GL_DONT_CARE)
-
         self.obstacle_elements.draw()
         self.robot_elements.draw()
 

ev3dev2simulator/version.py

@@ -1 +1 @@
-__version__ = '1.3.1'
+__version__ = '1.3.2'

setup.py

@@ -3,9 +3,11 @@
 import sys
 
 
+from ev3dev2simulator.version import __version__ as simversion
+
 setup(
       name="ev3dev2simulator",
-      version="1.3.1",
+      version=simversion,
       description="EV3 simulator for the ev3dev2 library",
       long_description="""
 Simulator for an EV3 robot; a program using the ev3dev2 API can run both on the rover and on the simulator without any modifications to the code.