Update tutorials

UmSenhorQualquer · Aug 9, 2018 · ea2ee7f · ea2ee7f
1 parent 3a4a335
commit ea2ee7f
Show file tree

Hide file tree

Showing 14 changed files with 24 additions and 36 deletions.
diff --git a/README.md b/README.md
@@ -72,8 +72,8 @@ class ComputerVisionAlgorithm(BaseWidget):
         #Definition of the forms fields
         self._videofile  = ControlFile('Video')
         self._outputfile = ControlText('Results output file')
-        self._threshold  = ControlSlider('Threshold', 114, 0,255)
-        self._blobsize   = ControlSlider('Minimum blob size', 100, 100,2000)
+        self._threshold  = ControlSlider('Threshold', default=114, minimum=0, maximum=255)
+        self._blobsize   = ControlSlider('Minimum blob size', default=110, minimum=100, maximum=2000)
         self._player     = ControlPlayer('Player')
         self._runbutton  = ControlButton('Run')
 

diff --git a/tutorials/1.SimpleExamples/ComputerVisionAlgorithmExample/Example.py b/tutorials/1.SimpleExamples/ComputerVisionAlgorithmExample/Example.py
@@ -10,7 +10,15 @@
 __status__      = "Development"
 
 
-from __init__ import *
+from pyforms.basewidget import BaseWidget
+from pyforms.controls import ControlText
+from pyforms.controls import ControlButton
+from pyforms.controls import ControlSlider
+from pyforms.controls import ControlFile
+from pyforms.controls import ControlPlayer
+
+import pyforms
+
 
 class ComputerVisionAlgorithm(BaseWidget):
 
@@ -20,8 +28,8 @@ def __init__(self):
 		#Definition of the forms fields
 		self._videofile  = ControlFile('Video')
 		self._outputfile = ControlText('Results output file')
-		self._threshold  = ControlSlider('Threshold', default=114, 0,255)
-		self._blobsize 	 = ControlSlider('Minimum blob size', default=100, 100,2000)
+		self._threshold  = ControlSlider('Threshold', default=114, minimum=0, maximum=255)
+		self._blobsize 	 = ControlSlider('Minimum blob size', default=110, minimum=100, maximum=2000)
 		self._player 	 = ControlPlayer('Player')
 		self._runbutton  = ControlButton('Run')
 

diff --git a/tutorials/1.SimpleExamples/ComputerVisionAlgorithmExample/__init__.py b/tutorials/1.SimpleExamples/ComputerVisionAlgorithmExample/__init__.py
@@ -1,20 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-
-__author__      = "Ricardo Ribeiro"
-__credits__     = ["Ricardo Ribeiro"]
-__license__     = "MIT"
-__version__     = "0.0"
-__maintainer__  = "Ricardo Ribeiro"
-__email__       = "ricardojvr@gmail.com"
-__status__      = "Development"
-
-
-from pyforms.basewidget import BaseWidget
-from pyforms.controls import ControlText
-from pyforms.controls import ControlButton
-from pyforms.controls import ControlSlider
-from pyforms.controls import ControlFile
-from pyforms.controls import ControlPlayer
-
-import pyforms

diff --git a/tutorials/1.SimpleExamples/SimpleExample1/__init__.py b/tutorials/1.SimpleExamples/SimpleExample1/__init__.py
@@ -10,7 +10,7 @@
 __status__      = "Development"
 
 
-from pyforms 			import BaseWidget
+from pyforms.basewidget import BaseWidget
 from pyforms.controls 	import ControlText
 from pyforms.controls 	import ControlButton
 from pyforms.controls 	import ControlMatplotlib

diff --git a/tutorials/1.SimpleExamples/SimpleExample2/__init__.py b/tutorials/1.SimpleExamples/SimpleExample2/__init__.py
@@ -9,7 +9,7 @@
 __email__       = "ricardojvr@gmail.com"
 __status__      = "Development"
 
-from pyforms 			import BaseWidget
+from pyforms.basewidget import BaseWidget
 from pyforms.controls 	import ControlText
 from pyforms.controls import ControlButton
 

diff --git a/tutorials/1.SimpleExamples/SimpleExample3/__init__.py b/tutorials/1.SimpleExamples/SimpleExample3/__init__.py
@@ -1,5 +1,5 @@
 
-from pyforms 			import BaseWidget
+from pyforms.basewidget import BaseWidget
 from pyforms.controls 	import ControlText
 from pyforms.controls import ControlButton
 

diff --git a/tutorials/1.SimpleExamples/SimpleExample4/__init__.py b/tutorials/1.SimpleExamples/SimpleExample4/__init__.py
@@ -1,5 +1,5 @@
 
-from pyforms 			import BaseWidget
+from pyforms.basewidget import BaseWidget
 from pyforms.controls 	import ControlText
 from pyforms.controls import ControlButton
 

diff --git a/tutorials/1.SimpleExamples/SimpleExample5/__init__.py b/tutorials/1.SimpleExamples/SimpleExample5/__init__.py
@@ -1,5 +1,5 @@
 
-from pyforms 			import BaseWidget
+from pyforms.basewidget import BaseWidget
 from pyforms.controls 	import ControlText
 from pyforms.controls import ControlButton
 

diff --git a/tutorials/1.SimpleExamples/SimpleExample6/__init__.py b/tutorials/1.SimpleExamples/SimpleExample6/__init__.py
@@ -1,5 +1,5 @@
 
-from pyforms 			import BaseWidget
+from pyforms.basewidget import BaseWidget
 from pyforms.controls 	import ControlText
 from pyforms.controls 	import ControlButton
 

diff --git a/tutorials/2.ControlsExamples/__init__.py b/tutorials/2.ControlsExamples/__init__.py
@@ -9,7 +9,7 @@
 __email__       = "ricardojvr@gmail.com"
 __status__      = "Development"
 
-from pyforms 			import BaseWidget
+from pyforms.basewidget import BaseWidget
 from pyforms.controls 	import ControlBoundingSlider
 from pyforms.controls 	import ControlText
 from pyforms.controls 	import ControlButton

diff --git a/tutorials/3.CodeOrganization/PersonWindow.py b/tutorials/3.CodeOrganization/PersonWindow.py
@@ -3,7 +3,7 @@
 conf+=settings
 
 import pyforms
-from pyforms 			import BaseWidget
+from pyforms.basewidget import BaseWidget
 from pyforms.controls 	import ControlText
 from pyforms.controls 	import ControlButton
 from Person 			import Person

diff --git a/tutorials/3.CodeOrganization/__init__.py b/tutorials/3.CodeOrganization/__init__.py
@@ -10,7 +10,7 @@
 __status__      = "Development"
 
 
-from pyforms 			import BaseWidget
+from pyforms.basewidget import BaseWidget
 from pyforms.controls 	import ControlText
 from pyforms.controls 	import ControlButton
 from pyforms.controls  	import ControlList

diff --git a/tutorials/4.MdiApplication/Core/SimpleExample1.py b/tutorials/4.MdiApplication/Core/SimpleExample1.py
@@ -11,7 +11,7 @@
 
 
 
-from pyforms 			import BaseWidget
+from pyforms.basewidget import BaseWidget
 from pyforms.controls 	import ControlText
 from pyforms.controls 	import ControlButton
 

diff --git a/tutorials/Controls4Docs/__init__.py b/tutorials/Controls4Docs/__init__.py
@@ -10,6 +10,6 @@
 __status__      = "Development"
 
 
-from pyforms 			import BaseWidget
+from pyforms.basewidget import BaseWidget
 from pyforms.controls 	import *
 import pyforms