Merge pull request #403 from RoboticsURJC/3DViewer

#401 #378 Fixed name 3DViewer issues
JdeRobot · Mar 31, 2016 · c9c6d7d · c9c6d7d
2 parents 514a0f5 + 80cd5db
commit c9c6d7d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/src/stable/components/3DViewer/3DViewer.cfg b/src/stable/components/3DViewer/3DViewer.cfg
@@ -1,7 +1,7 @@
 
 #Visualization Config
-Visualization.Endpoints=default -h 0.0.0.0 -p 9957
-Visualization.Name=viewer
+3DViewer.Endpoints=default -h 0.0.0.0 -p 9957
+3DViewer.Name=viewer
 
-NamingService.Enabled=0
-NamingService.Proxy=NamingServiceJdeRobot:default -h 0.0.0.0 -p 10000
+3DViewer.Enabled=0
+3DViewer.Proxy=NamingServiceJdeRobot:default -h 0.0.0.0 -p 10000
diff --git a/src/stable/components/3DViewer/CMakeLists.txt b/src/stable/components/3DViewer/CMakeLists.txt
@@ -15,9 +15,9 @@ IF (with_pcl)
 			${easyiceconfig_LIBRARY_DIRS}
 	)
 
-	add_executable (jdeViewer ${SOURCE_FILES})
+	add_executable (3DViewer ${SOURCE_FILES})
 
-	TARGET_LINK_LIBRARIES(jdeViewer
+	TARGET_LINK_LIBRARIES(3DViewer
 			jderobotutil
 			${OpenCV_LIBRARIES}
 			${OpenCVGUI_LIBRARIES}

diff --git a/src/stable/components/3DViewer/main.cpp b/src/stable/components/3DViewer/main.cpp
@@ -133,7 +133,7 @@ int main(int argc, char** argv)
         ic = EasyIce::initialize(argc, argv);
 
         Ice::PropertiesPtr prop = ic->getProperties();
-        std::string Endpoints = prop->getProperty("Visualization.Endpoints");
+        std::string Endpoints = prop->getProperty("3DViewer.Endpoints");
 
         // Naming Service
         int nsActive = prop->getPropertyAsIntWithDefault("NamingService.Enabled", 0);
@@ -152,8 +152,8 @@ int main(int argc, char** argv)
             }
         }
 
-        Ice::ObjectAdapterPtr adapter =ic->createObjectAdapterWithEndpoints("Visualization", Endpoints);
-        std::string objPrefix("Visualization.");
+        Ice::ObjectAdapterPtr adapter =ic->createObjectAdapterWithEndpoints("3DViewer", Endpoints);
+        std::string objPrefix("3DViewer.");
         std::string viewerName = prop->getProperty(objPrefix + "Name");
         Ice::ObjectPtr object = new visualization::VisualizationI(objPrefix, ic);
 

diff --git a/src/stable/libs/jderobotViewer/JderobotViewer.cpp b/src/stable/libs/jderobotViewer/JderobotViewer.cpp
@@ -77,13 +77,13 @@ void JderobotViewer::refresh_thread(){
 	while (!viewer->wasStopped() || this->exitSinal)
    {
 		this->new_data_mutex.lock();
-		viewer->spinOnce (100);
+		viewer->spinOnce ();
 		if (this->signalSave){
 			this->viewer->saveScreenshot(name2save);
 			this->signalSave=false;
 		}
 		this->new_data_mutex.unlock();
-		boost::this_thread::sleep (boost::posix_time::microseconds (100000));
+		boost::this_thread::sleep (boost::posix_time::microseconds (10000));
    }
 }