Revision: 38952
http://brlcad.svn.sourceforge.net/brlcad/?rev=38952&view=rev
Author: davidloman
Date: 2010-05-04 17:21:15 +0000 (Tue, 04 May 2010)
Log Message:
-----------
Add a thread wrapper for GeometryService objects. Made GeometryService.h and
GeometryServiceDaemon.h public headers.
Modified Paths:
--------------
rt^3/trunk/src/GS/CMakeLists.txt
Added Paths:
-----------
rt^3/trunk/include/GeometryService.h
rt^3/trunk/include/GeometryServiceDaemon.h
rt^3/trunk/src/GS/GeometryServiceDaemon.cxx
Removed Paths:
-------------
rt^3/trunk/src/GS/GeometryService.h
Property Changed:
----------------
rt^3/trunk/src/GS/
Copied: rt^3/trunk/include/GeometryService.h (from rev 38949,
rt^3/trunk/src/GS/GeometryService.h)
===================================================================
--- rt^3/trunk/include/GeometryService.h (rev 0)
+++ rt^3/trunk/include/GeometryService.h 2010-05-04 17:21:15 UTC (rev
38952)
@@ -0,0 +1,66 @@
+/* G E O M E T R Y S E R V I C E . H
+ * BRL-CAD
+ *
+ * Copyright (c) 2010 United States Government as represented by
+ * the U.S. Army Research Laboratory.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this file; see the file named COPYING for more
+ * information.
+ */
+/** @file GeometryService.h
+ *
+ * Brief description
+ *
+ */
+
+#ifndef __GEOMETRYSERVICE_H__
+#define __GEOMETRYSERVICE_H__
+
+#include "BaseApp.h"
+#include "network.h"
+
+#include <QTcpSocket>
+#include <QString>
+#include <QStringList>
+#include <QCoreApplication>
+
+class GeometryService : public BaseApp, public INetMsgHandler
+{
+ Q_OBJECT
+
+public:
+ GeometryService(int& argc, char* argv[], QString localGSHostname);
+ virtual ~GeometryService();
+ void startListening(const QHostAddress& addy, quint16 port);
+ int exec();
+
+protected slots:
+ void handleNewPortal(NetPortal*);
+ void handleMsgReady();
+
+private:
+ QString localGSHostname;
+ NetPortalManager* portalMan;
+
+ void handleNetMsg(NetMsg* msg, NetPortal* origin);
+};
+
+#endif
+
+// Local Variables: ***
+// mode: C++ ***
+// tab-width: 8 ***
+// c-basic-offset: 2 ***
+// indent-tabs-mode: t ***
+// End: ***
+// ex: shiftwidth=2 tabstop=8
Added: rt^3/trunk/include/GeometryServiceDaemon.h
===================================================================
--- rt^3/trunk/include/GeometryServiceDaemon.h (rev 0)
+++ rt^3/trunk/include/GeometryServiceDaemon.h 2010-05-04 17:21:15 UTC (rev
38952)
@@ -0,0 +1,55 @@
+/* G E O M E T R Y S E R V I C E D A E M O N . H
+ * BRLCAD
+ *
+ * Copyright (c) 2010 United States Government as represented by
+ * the U.S. Army Research Laboratory.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this file; see the file named COPYING for more
+ * information.
+ */
+/** @file GeometryServiceDaemon.h
+ *
+ * Brief description
+ *
+ */
+
+
+#ifndef __GEOMETRYSERVICEDAEMON_H__
+#define __GEOMETRYSERVICEDAEMON_H__
+
+#include "GeometryService.h"
+
+#include <QThread>
+
+class GeometryServiceDaemon : public QThread
+{
+ Q_OBJECT
+
+public:
+ GeometryServiceDaemon(GeometryService* gs);
+ virtual ~GeometryServiceDaemon(){};
+protected:
+ void run();
+private:
+ GeometryService* gs;
+};
+
+#endif
+
+// Local Variables: ***
+// mode: C++ ***
+// tab-width: 8 ***
+// c-basic-offset: 2 ***
+// indent-tabs-mode: t ***
+// End: ***
+// ex: shiftwidth=2 tabstop=8
Property changes on: rt^3/trunk/include/GeometryServiceDaemon.h
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Revision Date Author
Added: svn:eol-style
+ native
Property changes on: rt^3/trunk/src/GS
___________________________________________________________________
Modified: svn:ignore
- autom4te.cache
install.*.log
aclocal.m4
.deps
Makefile
Makefile.in
config.*
configure
libtool
ltmain.sh
.cproject
.project
cmake_install.cmake
CMakeCache.txt
CMakeFiles
*.txt~
*.so
*.a
.libs
__
*.dll
geoserv
*.exe
moc_GeometryService.cxx
gs.h
moc_*
+ autom4te.cache
install.*.log
aclocal.m4
.deps
Makefile
Makefile.in
config.*
configure
libtool
ltmain.sh
.cproject
.project
cmake_install.cmake
CMakeCache.txt
CMakeFiles
*.txt~
*.so
*.a
.libs
__
*.dll
geoserv
*.exe
moc_GeometryService.cxx
gs.h
moc_*
*.backup
Modified: rt^3/trunk/src/GS/CMakeLists.txt
===================================================================
--- rt^3/trunk/src/GS/CMakeLists.txt 2010-05-04 16:29:38 UTC (rev 38951)
+++ rt^3/trunk/src/GS/CMakeLists.txt 2010-05-04 17:21:15 UTC (rev 38952)
@@ -44,6 +44,7 @@
#set Source files
RT3_PROJECT_ADD_SOURCES (
GeometryService.cxx
+ GeometryServiceDaemon.cxx
DataManager.cxx
DbObjectManifest.cxx
GeometryProcessor.cxx
@@ -69,13 +70,14 @@
)
#Set QT INST headers
-RT3_PROJECT_ADD_QT_INST_HEADERS()
-
-#Set QT NOINST headers
-RT3_PROJECT_ADD_QT_NOINST_HEADERS(
+RT3_PROJECT_ADD_QT_INST_HEADERS(
GeometryService.h
+ GeometryServiceDaemon.h
)
+#Set QT NOINST headers
+RT3_PROJECT_ADD_QT_NOINST_HEADERS()
+
#Build the project
RT3_PROJECT_BUILD_LIB()
Deleted: rt^3/trunk/src/GS/GeometryService.h
===================================================================
--- rt^3/trunk/src/GS/GeometryService.h 2010-05-04 16:29:38 UTC (rev 38951)
+++ rt^3/trunk/src/GS/GeometryService.h 2010-05-04 17:21:15 UTC (rev 38952)
@@ -1,66 +0,0 @@
-/* G E O M E T R Y S E R V I C E . H
- * BRL-CAD
- *
- * Copyright (c) 2010 United States Government as represented by
- * the U.S. Army Research Laboratory.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this file; see the file named COPYING for more
- * information.
- */
-/** @file GeometryService.h
- *
- * Brief description
- *
- */
-
-#ifndef __GEOMETRYSERVICE_H__
-#define __GEOMETRYSERVICE_H__
-
-#include "BaseApp.h"
-#include "network.h"
-
-#include <QTcpSocket>
-#include <QString>
-#include <QStringList>
-#include <QCoreApplication>
-
-class GeometryService : public BaseApp, public INetMsgHandler
-{
- Q_OBJECT
-
-public:
- GeometryService(int& argc, char* argv[], QString localGSHostname);
- virtual ~GeometryService();
- void startListening(const QHostAddress& addy, quint16 port);
- int exec();
-
-protected slots:
- void handleNewPortal(NetPortal*);
- void handleMsgReady();
-
-private:
- QString localGSHostname;
- NetPortalManager* portalMan;
-
- void handleNetMsg(NetMsg* msg, NetPortal* origin);
-};
-
-#endif
-
-// Local Variables: ***
-// mode: C++ ***
-// tab-width: 8 ***
-// c-basic-offset: 2 ***
-// indent-tabs-mode: t ***
-// End: ***
-// ex: shiftwidth=2 tabstop=8
Added: rt^3/trunk/src/GS/GeometryServiceDaemon.cxx
===================================================================
--- rt^3/trunk/src/GS/GeometryServiceDaemon.cxx (rev 0)
+++ rt^3/trunk/src/GS/GeometryServiceDaemon.cxx 2010-05-04 17:21:15 UTC (rev
38952)
@@ -0,0 +1,44 @@
+/* G E O M E T R Y S E R V I C E D A E M O N . C X X
+ * BRLCAD
+ *
+ * Copyright (c) 2010 United States Government as represented by
+ * the U.S. Army Research Laboratory.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this file; see the file named COPYING for more
+ * information.
+ */
+/** @file GeometryServiceDaemon.cxx
+ *
+ * Brief description
+ *
+ */
+
+#include "GeometryServiceDaemon.h"
+
+GeometryServiceDaemon::GeometryServiceDaemon(GeometryService* gs) : gs(gs)
+{
+}
+
+void GeometryServiceDaemon::run()
+{
+ int retVal = this->gs->exec();
+}
+
+
+// Local Variables: ***
+// mode: C++ ***
+// tab-width: 8 ***
+// c-basic-offset: 2 ***
+// indent-tabs-mode: t ***
+// End: ***
+// ex: shiftwidth=2 tabstop=8
Property changes on: rt^3/trunk/src/GS/GeometryServiceDaemon.cxx
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Revision Date Author
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
