Merge remote-tracking branch 'origin/v4' into v4

UmSenhorQualquer · Apr 17, 2019 · a3e5563 · a3e5563
2 parents 2a06299 + 0dbd85f
commit a3e5563
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/pyforms_gui/__init__.py b/pyforms_gui/__init__.py
@@ -4,7 +4,7 @@
 __author__      = "Ricardo Ribeiro"
 __credits__     = ["Ricardo Ribeiro"]
 __license__     = "MIT"
-__version__     = "4.8"
+__version__     = "4.9"
 __maintainer__  = "Ricardo Ribeiro"
 __email__       = "ricardojvr@gmail.com"
 __status__      = "Development"

diff --git a/pyforms_gui/controls/control_event_timeline/graphs/graph.py b/pyforms_gui/controls/control_event_timeline/graphs/graph.py
@@ -29,7 +29,8 @@ def __unicode__(self): return self._name
 	def __str__(self):     return self._name
 
 	def __len__(self): 					 return len(self._data)
-	def __getitem__(self, index): 		 return self._data[index] if index<len(self) else None
+	def __getitem__(self, index):
+		return self._data[index] if index<len(self) else None
 	def __setitem__(self, index, value): 
 		if index >= len(self):
 			for i in range(len(self), index + 1): self._data.append(None)

diff --git a/pyforms_gui/controls/control_event_timeline/graphs/win_graph_to_event.py b/pyforms_gui/controls/control_event_timeline/graphs/win_graph_to_event.py
@@ -94,9 +94,12 @@ def __generage_events_evt(self):
 		last_value = False
 
 		try:		
-			for i in range(max_frame):			
-				value = eval(equation)
-
+			for i in range(max_frame):
+				try:
+					value = eval(equation)
+				except:
+					value = False
+
 				if not last_value and bool(value):
 					last_index = i
 					last_value = True

diff --git a/setup.py b/setup.py
@@ -41,7 +41,7 @@
         'matplotlib',
         'python-dateutil',
         'numpy',
-        'opencv-python',
+        'opencv-python==3.4.5.20',
         'confapp'
     ],
     packages=find_packages(),