[CORE] Renamed vpDisplayFactory::displayFactory() method into vpDispl…

…ayFactory::allocateDisplay()
lagadic · Jul 1, 2024 · 70591bb · 70591bb
1 parent c25547e
commit 70591bb
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 10 deletions.
diff --git a/example/particle-filter/pf-nonlinear-example.cpp b/example/particle-filter/pf-nonlinear-example.cpp
@@ -618,7 +618,7 @@ int main(const int argc, const char *argv[])
   // first video device which is available
 #ifdef VISP_HAVE_DISPLAY
   std::shared_ptr<vpDisplay> d;
-  vpImage<vpRGBa> Idisp(800, 800, vpRGBa(255));
+  vpImage<vpRGBa> Idisp(800, 800, vpRGBa(static_cast<unsigned char>(255)));
   if (args.m_useDisplay) {
     d = vpDisplayFactory::createDisplay(Idisp, 800, 50, "Projection of the markers");
   }

diff --git a/modules/gui/include/visp3/gui/vpDisplayFactory.h b/modules/gui/include/visp3/gui/vpDisplayFactory.h
@@ -60,7 +60,7 @@ namespace vpDisplayFactory
  * \return A newly allocated vpDisplay specialization
  * if a GUI library is available or nullptr otherwise.
  */
-vpDisplay *displayFactory()
+vpDisplay *allocateDisplay()
 {
 #if defined(VISP_HAVE_DISPLAY)
 #ifdef VISP_HAVE_X11

diff --git a/tutorial/grabber/tutorial-grabber-1394-writer.cpp b/tutorial/grabber/tutorial-grabber-1394-writer.cpp
@@ -12,7 +12,7 @@ int main(int argc, char **)
   using namespace VISP_NAMESPACE_NAME;
 #endif
 #ifdef VISP_HAVE_DISPLAY
-  vpDisplay *d = vpDisplayFactory::displayFactory();
+  vpDisplay *d = vpDisplayFactory::allocateDisplay();
 #else
   std::cout << "No image viewer is available..." << std::endl;
 #endif

diff --git a/tutorial/grabber/tutorial-grabber-v4l2-threaded.cpp b/tutorial/grabber/tutorial-grabber-v4l2-threaded.cpp
@@ -59,7 +59,7 @@ void displayFunction(std::mutex &mutex_capture, vpImage<unsigned char> &frame, t
 
   t_CaptureState capture_state_;
   bool display_initialized_ = false;
-  vpDisplay *d_ = vpDisplayFactory::displayFactory();
+  vpDisplay *d_ = vpDisplayFactory::allocateDisplay();
 
   do {
     mutex_capture.lock();

diff --git a/tutorial/grabber/tutorial-video-reader.cpp b/tutorial/grabber/tutorial-video-reader.cpp
@@ -47,7 +47,7 @@ int main(int argc, char **argv)
     std::cout << "Video dimension: " << I.getWidth() << " " << I.getHeight() << std::endl;
 
 #ifdef VISP_HAVE_DISPLAY
-    vpDisplay *d = vpDisplayFactory::displayFactory(I);
+    vpDisplay *d = vpDisplayFactory::allocateDisplay(I);
 #else
     std::cout << "No image viewer is available..." << std::endl;
 #endif

diff --git a/tutorial/grabber/tutorial-video-recorder.cpp b/tutorial/grabber/tutorial-video-recorder.cpp
@@ -80,7 +80,7 @@ int main(int argc, const char *argv[])
     std::cout << "Image size: " << I.getWidth() << " " << I.getHeight() << std::endl;
 
 #if defined(VISP_HAVE_DISPLAY)
-    vpDisplay *d = vpDisplayFactory::displayFactory();
+    vpDisplay *d = vpDisplayFactory::allocateDisplay();
     d->init(I, 0, 0, "Camera view");
 #endif
     vpVideoWriter writer;

diff --git a/tutorial/image/tutorial-draw-circle.cpp b/tutorial/image/tutorial-draw-circle.cpp
@@ -16,7 +16,7 @@ int main()
   try {
     {
 #if defined(VISP_HAVE_DISPLAY)
-      vpDisplay *d = vpDisplayFactory::displayFactory(I, vpDisplay::SCALE_AUTO);
+      vpDisplay *d = vpDisplayFactory::allocateDisplay(I, vpDisplay::SCALE_AUTO);
 #else
       std::cout << "No gui available to display gray level image..." << std::endl;
 #endif
@@ -64,7 +64,7 @@ int main()
       //! [Circle draw color]
 
 #if defined(VISP_HAVE_DISPLAY)
-      vpDisplay *d = vpDisplayFactory::displayFactory(I_rgb, vpDisplay::SCALE_AUTO);
+      vpDisplay *d = vpDisplayFactory::allocateDisplay(I_rgb, vpDisplay::SCALE_AUTO);
 #else
       std::cout << "No gui available to display color image..." << std::endl;
 #endif

diff --git a/tutorial/robot/mbot/raspberry/visp/mbot-apriltag-ibvs.cpp b/tutorial/robot/mbot/raspberry/visp/mbot-apriltag-ibvs.cpp
@@ -121,7 +121,7 @@ int main(int argc, const char **argv)
     vpImage<vpRGBa> O;
 #ifdef VISP_HAVE_DISPLAY
     if (display_on) {
-      d = vpDisplayFactory::displayFactory(I);
+      d = vpDisplayFactory::allocateDisplay(I);
     }
 #endif
 

diff --git a/tutorial/robot/mbot/raspberry/visp/mbot-apriltag-pbvs.cpp b/tutorial/robot/mbot/raspberry/visp/mbot-apriltag-pbvs.cpp
@@ -110,7 +110,7 @@ int main(int argc, const char **argv)
     vpImage<vpRGBa> O;
 #ifdef VISP_HAVE_DISPLAY
     if (display_on) {
-      d = vpDisplayFactory::displayFactory(I);
+      d = vpDisplayFactory::allocateDisplay(I);
     }
 #endif