fix metaclass conflict; add general and chapter-specific requirements…

….txt
mbeyeler · Nov 30, 2016 · f7fe25f · f7fe25f · AlmitraB · May 13, 2019
1 parent 16c183d
commit f7fe25f
Show file tree

Hide file tree

Showing 13 changed files with 39 additions and 17 deletions.
diff --git a/chapter1/gui.py b/chapter1/gui.py
@@ -13,7 +13,11 @@
 __license__ = "GNU GPL 3.0 or later"
 
 
-class BaseLayout(wx.Frame):
+class Meta1(wx.Frame):
+    pass
+
+
+class BaseLayout(Meta1):
     """Abstract base class for all layouts
 
         A custom layout needs to implement at least three methods:
@@ -81,13 +85,12 @@ def _init_base_layout(self):
         """
         # set up periodic screen capture
         self.timer = wx.Timer(self)
-        self.timer.Start(1000./self.fps)
+        self.timer.Start(1000. / self.fps)
         self.Bind(wx.EVT_TIMER, self._on_next_frame)
 
         # allow for custom modifications
         self._init_custom_layout()
 
-
     def _create_base_layout(self):
         """Create generic layout
 
@@ -117,7 +120,6 @@ def _create_base_layout(self):
         self.SetSizer(self.panels_vertical)
         self.Centre()
 
-
     def _on_next_frame(self, event):
         """
             This method captures a new frame from the camera (or capture

diff --git a/chapter1/requirements.txt b/chapter1/requirements.txt
@@ -0,0 +1,2 @@
+wx
+scipy
diff --git a/chapter2/gui.py b/chapter2/gui.py
@@ -13,7 +13,11 @@
 __license__ = "GNU GPL 3.0 or later"
 
 
-class BaseLayout(wx.Frame):
+class Meta1(wx.Frame):
+    pass
+
+
+class BaseLayout(Meta1):
     """Abstract base class for all layouts
 
         A custom layout needs to implement at least three methods:
@@ -81,13 +85,12 @@ def _init_base_layout(self):
         """
         # set up periodic screen capture
         self.timer = wx.Timer(self)
-        self.timer.Start(1000./self.fps)
+        self.timer.Start(1000. / self.fps)
         self.Bind(wx.EVT_TIMER, self._on_next_frame)
 
         # allow for custom modifications
         self._init_custom_layout()
 
-
     def _create_base_layout(self):
         """Create generic layout
 
@@ -117,7 +120,6 @@ def _create_base_layout(self):
         self.SetSizer(self.panels_vertical)
         self.Centre()
 
-
     def _on_next_frame(self, event):
         """
             This method captures a new frame from the camera (or capture

diff --git a/chapter2/requirements.txt b/chapter2/requirements.txt
@@ -0,0 +1,2 @@
+wx
+freenect
diff --git a/chapter3/gui.py b/chapter3/gui.py
@@ -12,8 +12,10 @@
 __author__ = "Michael Beyeler"
 __license__ = "GNU GPL 3.0 or later"
 
+class Meta1(wx.Frame):
+    pass
 
-class BaseLayout(wx.Frame):
+class BaseLayout(Meta1):
     """Abstract base class for all layouts
 
         A custom layout needs to implement at least three methods:

diff --git a/chapter3/requirements.txt b/chapter3/requirements.txt
@@ -0,0 +1 @@
+wx
diff --git a/chapter4/gui.py b/chapter4/gui.py
@@ -13,7 +13,11 @@
 __license__ = "GNU GPL 3.0 or later"
 
 
-class BaseLayout(wx.Frame):
+class Meta1(wx.Frame):
+    pass
+
+
+class BaseLayout(Meta1):
     """Abstract base class for all layouts
 
         A custom layout needs to implement at least three methods:
@@ -81,13 +85,12 @@ def _init_base_layout(self):
         """
         # set up periodic screen capture
         self.timer = wx.Timer(self)
-        self.timer.Start(1000./self.fps)
+        self.timer.Start(1000. / self.fps)
         self.Bind(wx.EVT_TIMER, self._on_next_frame)
 
         # allow for custom modifications
         self._init_custom_layout()
 
-
     def _create_base_layout(self):
         """Create generic layout
 
@@ -117,7 +120,6 @@ def _create_base_layout(self):
         self.SetSizer(self.panels_vertical)
         self.Centre()
 
-
     def _on_next_frame(self, event):
         """
             This method captures a new frame from the camera (or capture

diff --git a/chapter4/requirements.txt b/chapter4/requirements.txt
@@ -0,0 +1,2 @@
+wx
+matplotlib
diff --git a/chapter5/requirements.txt b/chapter5/requirements.txt
@@ -0,0 +1 @@
+matplotlib
diff --git a/chapter6/requirements.txt b/chapter6/requirements.txt
@@ -0,0 +1 @@
+matplotlib
diff --git a/chapter7/gui.py b/chapter7/gui.py
@@ -13,7 +13,11 @@
 __license__ = "GNU GPL 3.0 or later"
 
 
-class BaseLayout(wx.Frame):
+class Meta1(wx.Frame):
+    pass
+
+
+class BaseLayout(Meta1):
     """Abstract base class for all layouts
 
         A custom layout needs to implement at least three methods:
@@ -81,13 +85,12 @@ def _init_base_layout(self):
         """
         # set up periodic screen capture
         self.timer = wx.Timer(self)
-        self.timer.Start(1000./self.fps)
+        self.timer.Start(1000. / self.fps)
         self.Bind(wx.EVT_TIMER, self._on_next_frame)
 
         # allow for custom modifications
         self._init_custom_layout()
 
-
     def _create_base_layout(self):
         """Create generic layout
 
@@ -117,7 +120,6 @@ def _create_base_layout(self):
         self.SetSizer(self.panels_vertical)
         self.Centre()
 
-
     def _on_next_frame(self, event):
         """
             This method captures a new frame from the camera (or capture

diff --git a/chapter7/requirements.txt b/chapter7/requirements.txt
@@ -0,0 +1 @@
+wx
diff --git a/requirements.txt b/requirements.txt
@@ -0,0 +1,2 @@
+cv2
+numpy