[brlcad-commits] SF.net SVN: brlcad:[38738]

[<dav...@us...>]

Revision: 38738
          http://brlcad.svn.sourceforge.net/brlcad/?rev=38738&view=rev
Author:   davidloman
Date:     2010-04-22 17:38:48 +0000 (Thu, 22 Apr 2010)

Log Message:
-----------
A bit of work on getting the GeometryService launchable again.

Modified Paths:
--------------
    rt^3/trunk/include/GS/GeometryService.h
    rt^3/trunk/src/GS/GeometryService.cxx
    rt^3/trunk/src/GS/gsmain.cxx
    rt^3/trunk/src/iBME/CMakeLists.txt

Modified: rt^3/trunk/include/GS/GeometryService.h
===================================================================
--- rt^3/trunk/include/GS/GeometryService.h	2010-04-22 17:30:29 UTC (rev 38737)
+++ rt^3/trunk/include/GS/GeometryService.h	2010-04-22 17:38:48 UTC (rev 38738)
@@ -48,12 +48,11 @@
 	int exec();
 
 protected slots:
-	void handleEventsFromPortal(NetPortal* nsp);
+	void handleNewPortal(NetPortal* nsp);
 
 private:
 	QString localHostname;
 	NetPortalManager* portalMan;
-
 };
 
 #endif

Modified: rt^3/trunk/src/GS/GeometryService.cxx
===================================================================
--- rt^3/trunk/src/GS/GeometryService.cxx	2010-04-22 17:30:29 UTC (rev 38737)
+++ rt^3/trunk/src/GS/GeometryService.cxx	2010-04-22 17:38:48 UTC (rev 38738)
@@ -28,13 +28,11 @@
 GeometryService::GeometryService(int& argc, char* argv[], QString hostname) :
     BaseApp(argc, argv), localHostname(hostname)
 {
-    this->log = Logger::getInstance();
-
+    this->log->logINFO("GeometryService:", hostname + " is starting up...");
     this->portalMan = new NetPortalManager(hostname);
 
-    //
-QObject::connect(portalMan, SIGNAL(newIncomingConnection(NetPortal*)),
-	this, SLOT(handleEventsFromPortal(NetPortal*)));
+    QObject::connect(portalMan, SIGNAL(newIncomingConnection(NetPortal*)),
+	this, SLOT(handleNewPortal(NetPortal*)));
 }
 
 GeometryService::~GeometryService()
@@ -47,9 +45,10 @@
     this->portalMan->listen(addy, port);
 }
 
-void GeometryService::handleEventsFromPortal(NetPortal* nsp)
+void GeometryService::handleNewPortal(NetPortal* nsp)
 {
-
+    this->log->logINFO("GeometryService",
+	    "New portal received from NetPortalManager");
 }
 
 int GeometryService::exec()

Modified: rt^3/trunk/src/GS/gsmain.cxx
===================================================================
--- rt^3/trunk/src/GS/gsmain.cxx	2010-04-22 17:30:29 UTC (rev 38737)
+++ rt^3/trunk/src/GS/gsmain.cxx	2010-04-22 17:38:48 UTC (rev 38738)
@@ -23,10 +23,18 @@
  *
  */
 
+#include "GS/GeometryService.h"
+#include "alf/BaseApp.h"
 #include <iostream>
 
 int main(int argc, char* argv[])
 {
-	std::cout << "Hello World!!!";
-	return 0;
+
+    //TODO Configure system loads stuff here
+
+
+
+    GeometryService gs(argc, argv, "ToBeDeterminedName");
+
+    return gs.exec();
 }

Modified: rt^3/trunk/src/iBME/CMakeLists.txt
===================================================================
--- rt^3/trunk/src/iBME/CMakeLists.txt	2010-04-22 17:30:29 UTC (rev 38737)
+++ rt^3/trunk/src/iBME/CMakeLists.txt	2010-04-22 17:38:48 UTC (rev 38738)
@@ -33,7 +33,8 @@
 INCLUDE_DIRECTORIES (${PROJ_INCLUDE_DIRS})
 
 SET(PROJ_LINK_LIBS
-
+    gs
+    ${QT_LIBRARIES}
 )
 
 #Print


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.