Revision: 40854
http://brlcad.svn.sourceforge.net/brlcad/?rev=40854&view=rev
Author: davidloman
Date: 2010-09-29 18:30:24 +0000 (Wed, 29 Sep 2010)
Log Message:
-----------
Make GeometryService have a DataManager as a field.
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:29:55 UTC (rev
40853)
+++ rt^3/trunk/include/GeometryService.h 2010-09-29 18:30:24 UTC (rev
40854)
@@ -28,6 +28,7 @@
#include "libutility.h"
#include "libnet.h"
+#include "DataManager.h"
#include <QtCore/QString>
@@ -35,7 +36,7 @@
{
public:
- GeometryService(const QString localNodeName, const quint16 listenPort);
+ GeometryService(const QString localNodeName, const quint16
listenPort,QString fileRepoPath);
virtual ~GeometryService();
bool handleNetMsg(NetMsg* msg);
@@ -48,7 +49,11 @@
Logger* log;
QString localNodeName;
quint16 listenPort;
+ QString fileRepoPath;
+
PortalManager* pm;
+ DataManager* dm;
+
void registerMsgRoutes();
};
Modified: rt^3/trunk/src/GS/GeometryService.cxx
===================================================================
--- rt^3/trunk/src/GS/GeometryService.cxx 2010-09-29 18:29:55 UTC (rev
40853)
+++ rt^3/trunk/src/GS/GeometryService.cxx 2010-09-29 18:30:24 UTC (rev
40854)
@@ -25,17 +25,19 @@
#include "GeometryService.h"
#include "SessionManager.h"
+#include "FileDataSource.h"
-GeometryService::GeometryService(const QString localNodeName, quint16
listenPort) :
-localNodeName(localNodeName), listenPort(listenPort)
+GeometryService::GeometryService(const QString localNodeName, quint16
listenPort, QString fileRepoPath) :
+localNodeName(localNodeName), listenPort(listenPort),
fileRepoPath(fileRepoPath)
{
this->log = Logger::getInstance();
this->log->logINFO("GeometryService", localNodeName + " is starting
up...");
this->pm = new PortalManager(listenPort);
-
this->registerMsgRoutes();
+ this->dm = DataManager::getInstance();
+ FileDataSource* fds = new FileDataSource(fileRepoPath);
}
GeometryService::~GeometryService()
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