Revision: 40859
http://brlcad.svn.sourceforge.net/brlcad/?rev=40859&view=rev
Author: davidloman
Date: 2010-09-29 18:55:59 +0000 (Wed, 29 Sep 2010)
Log Message:
-----------
Remove repoPath string from cstr, since that is locking a GeometryService
object to using a FileDataSource. Instead, provide a way to get a handle on
the DataManager and make the DataManager provide a means for adding DataSources.
Modified Paths:
--------------
rt^3/trunk/include/GeometryService.h
rt^3/trunk/src/GS/GeometryService.cxx
Modified: rt^3/trunk/include/GeometryService.h
===================================================================
--- rt^3/trunk/include/GeometryService.h 2010-09-29 18:52:48 UTC (rev
40858)
+++ rt^3/trunk/include/GeometryService.h 2010-09-29 18:55:59 UTC (rev
40859)
@@ -36,9 +36,10 @@
{
public:
- GeometryService(const QString localNodeName, const quint16
listenPort,QString fileRepoPath);
+ GeometryService(const QString localNodeName, const quint16 listenPort);
virtual ~GeometryService();
bool handleNetMsg(NetMsg* msg);
+ DataManager* getDataManager();
protected:
bool preRunHook();
@@ -49,7 +50,6 @@
Logger* log;
QString localNodeName;
quint16 listenPort;
- QString fileRepoPath;
PortalManager* pm;
DataManager* dm;
Modified: rt^3/trunk/src/GS/GeometryService.cxx
===================================================================
--- rt^3/trunk/src/GS/GeometryService.cxx 2010-09-29 18:52:48 UTC (rev
40858)
+++ rt^3/trunk/src/GS/GeometryService.cxx 2010-09-29 18:55:59 UTC (rev
40859)
@@ -27,8 +27,8 @@
#include "SessionManager.h"
#include "FileDataSource.h"
-GeometryService::GeometryService(const QString localNodeName, quint16
listenPort, QString fileRepoPath) :
-localNodeName(localNodeName), listenPort(listenPort),
fileRepoPath(fileRepoPath)
+GeometryService::GeometryService(const QString localNodeName, quint16
listenPort) :
+localNodeName(localNodeName), listenPort(listenPort)
{
this->log = Logger::getInstance();
this->log->logINFO("GeometryService", localNodeName + " is starting
up...");
@@ -37,7 +37,7 @@
this->registerMsgRoutes();
this->dm = DataManager::getInstance();
- FileDataSource* fds = new FileDataSource(fileRepoPath);
+
}
GeometryService::~GeometryService()
@@ -45,6 +45,13 @@
delete pm;
}
+DataManager*
+GeometryService::getDataManager()
+{
+ return this->dm;
+}
+
+
void
GeometryService::registerMsgRoutes()
{
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
