Replaced the raw_input() calls with a call into dlib since raw_input(…

…) isn't available in python3.
daben · Mar 22, 2015 · e00f6f6 · e00f6f6
1 parent e2680f0
commit e00f6f6
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 5 deletions.
diff --git a/python_examples/face_detector.py b/python_examples/face_detector.py
@@ -58,4 +58,4 @@
     win.clear_overlay()
     win.set_image(img)
     win.add_overlay(dets)
-    raw_input("Hit enter to continue")
+    dlib.hit_enter_to_continue()
diff --git a/python_examples/face_landmark_detection.py b/python_examples/face_landmark_detection.py
@@ -81,4 +81,4 @@
         win.add_overlay(shape)
 
     win.add_overlay(dets)
-    raw_input("Hit enter to continue")
+    dlib.hit_enter_to_continue()
diff --git a/python_examples/train_object_detector.py b/python_examples/train_object_detector.py
@@ -117,7 +117,7 @@
     win.clear_overlay()
     win.set_image(img)
     win.add_overlay(dets)
-    raw_input("Hit enter to continue")
+    dlib.hit_enter_to_continue()
 
 
 
@@ -150,7 +150,7 @@
 
 # Now let's look at its HOG filter!
 win_det.set_image(detector2)
-raw_input("Hit enter to continue")
+dlib.hit_enter_to_continue()
 
 # Note that you don't have to use the XML based input to
 # test_simple_object_detector().  If you have already loaded your training

diff --git a/python_examples/train_shape_predictor.py b/python_examples/train_shape_predictor.py
@@ -123,5 +123,5 @@
         win.add_overlay(shape)
 
     win.add_overlay(dets)
-    raw_input("Hit enter to continue")
+    dlib.hit_enter_to_continue()
 
diff --git a/tools/python/src/other.cpp b/tools/python/src/other.cpp
@@ -74,6 +74,14 @@ double _assignment_cost (
 
 // ----------------------------------------------------------------------------------------
 
+void hit_enter_to_continue()
+{
+    std::cout << "Hit enter to continue";
+    std::cin.get();
+}
+
+// ----------------------------------------------------------------------------------------
+
 void bind_other()
 {
     using boost::python::arg;
@@ -140,5 +148,8 @@ present in the output.   "
 ensures    \n\
     - saves the data to the given file in libsvm format   " 
     );
+
+    def("hit_enter_to_continue", hit_enter_to_continue, 
+        "Asks the user to hit enter to continue and pauses until they do so.");
 }