- Update to 3.0.2

This commit is contained in:
Pietro Cerutti 2008-07-18 14:20:29 +00:00
parent 3086d2b6e3
commit 658f6d2c05
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=217045
47 changed files with 464 additions and 1455 deletions

View File

@ -7,69 +7,56 @@
#
PORTNAME= tulip
PORTVERSION= 1.2.5
PORTREVISION= 4
PORTVERSION= 3.0.2
CATEGORIES= graphics
MASTER_SITES= http://dept-info.labri.fr/~auber/projects/tulip/download/%SUBDIR%/
MASTER_SITE_SUBDIR= ${PORTNAME}-${PORTVERSION}
MASTER_SITES= SF/auber:src \
http://tulip.labri.fr/userHandbook/:doc
DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:src\
userManual.pdf:doc
EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
MAINTAINER= gahr@FreeBSD.org
COMMENT= A system dedicated to the visualization of huge graphs
LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut
LIB_DEPENDS= GLEW.1:${PORTSDIR}/graphics/glew \
freetype.9:${PORTSDIR}/print/freetype2
USE_BZIP2= yes
USE_QT_VER= 3
QT_NONSTANDARD= yes
USE_QT_VER= 4
QT_COMPONENTS= corelib moc uic rcc gui opengl xml network \
designer
USE_GL= glut
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_GNOME= libxml2
USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= MOC="${MOC}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" GLDIR="${LOCALBASE}"
CONFIGURE_ARGS= --with-qt-includes=${QT_PREFIX}/include \
--with-qt-libraries=${QT_PREFIX}/lib \
--with-extra-libs=${LOCALBASE}/lib
# libOSMesa, installed by the xorg-libraries-6.9.0 port is causing
# /usr/X11R6/lib/libOSMesa.so: undefined reference to `driDispatchRemapTable'
# during the configure step which results in tlprender not being build.
# So we remove it from pkg-plist and disable it here to make sure it does not
# get build somehow, causing plist problems
CONFIGURE_ARGS+= --disable-tlprender
USE_LDCONFIG= yes
CPPFLAGS= -I${LOCALBASE}/include -I${PREFIX}/include \
-I${QT_PREFIX}/include -DHAVE_DECL_GETOPT ${PTHREAD_CFLAGS}
LDFLAGS= -Wl,-export-dynamic -L${LOCALBASE}/lib \
-ljpeg -L${QT_PREFIX}/lib -lcompat ${PTHREAD_LIBS}
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
.include <bsd.port.pre.mk>
.if ${ARCH} == "amd64" || ${ARCH} == "ia64"
CFLAGS+= -fPIC
.endif
.if ${OSVERSION} >= 700042
BROKEN= tries to link libcompat.a
.endif
.endif
PORTDOCS= userManual.pdf
post-extract:
@${FIND} ${WRKSRC} -name "moc_*" -delete
pre-configure:
@if [ -z "`pkg-config --variable qt_config qt-mt | ${GREP} opengl`" ]; then \
echo "Please reinstall x11-toolkits/qt33 with OpenGL supportsd"; \
exit 1; \
fi
post-patch:
@${REINPLACE_CMD} -e 's| -O2 -pipe||g; \
s|echo aout|echo elf|g' ${WRKSRC}/configure ${WRKSRC}/thirdparty/gle/configure
@${GREP} -lR "malloc\.h" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
's|malloc\.h|stdlib.h|g'
@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
's|-ldl||g ; \
s|-lpthread||g ; \
s|-release @TULIP_VERSION@|| ; \
s|LDFLAGS = -module|LDFLAGS = @LDFLAGS@ -module|g'
@${REINPLACE_CMD} -e '/#include <qvariant.h>/d' \
${WRKSRC}/library/tulip-qt/include/tulip/LayerManagerWidgetData.h
@${REINPLACE_CMD} -e 's|<qdir.h>|<QtCore/qdir.h>|' \
${WRKSRC}/software/tulip/src/Application.cpp
@${REINPLACE_CMD} -e 's|<qtimer.h>|<QtCore/qtimer.h>|' \
${WRKSRC}/software/tulip/src/main.cpp
@${REINPLACE_CMD} -e 's|docs||g' ${WRKSRC}/Makefile.am ${WRKSRC}/Makefile.in
.if !defined(NOPORTDOCS)
post-install:
${INSTALL} -d ${DOCSDIR}
${INSTALL_DATA} ${DISTDIR}/userManual.pdf ${DOCSDIR}
.endif
.include <bsd.port.post.mk>

View File

@ -1,3 +1,6 @@
MD5 (tulip-1.2.5.tar.bz2) = d232a035b04958b79bd5f51e39046ca8
SHA256 (tulip-1.2.5.tar.bz2) = 2c50abba57ff25a6ab9985fa9d0c82b02fbd4dd59f6133cfccca4d53e96e42bd
SIZE (tulip-1.2.5.tar.bz2) = 1791052
MD5 (tulip-3.0.2.tar.bz2) = b09aeb099c76d023ee61f10ba891e12c
SHA256 (tulip-3.0.2.tar.bz2) = 311e0b47333a98ec3532ff4570cb1192e4f495cce00f06be5362c6d307b71cbf
SIZE (tulip-3.0.2.tar.bz2) = 12937811
MD5 (userManual.pdf) = 45fc65571700e585bc4bf3ad5727ddfb
SHA256 (userManual.pdf) = d2bd7b5ebee73d9d60bb0618be5e97745d5b38fafb8248df909b4a57f04fed14
SIZE (userManual.pdf) = 4113691

View File

@ -1,19 +0,0 @@
--- plugins/import/CirculantGraph.cpp.orig Thu Apr 3 04:49:37 2003
+++ plugins/import/CirculantGraph.cpp Mon May 26 08:01:03 2003
@@ -1,5 +1,6 @@
+#include <sys/types.h>
#include <sys/timeb.h>
-#include<qinputdialog.h>
+#include <qinputdialog.h>
#include <tulip/TulipPlugin.h>
using namespace std;
@@ -9,7 +10,7 @@
};
namespace std {
- struct less<edgeS>
+ template <> struct less<edgeS>
{
bool operator()(const edgeS &c,const edgeS &d) const
{

View File

@ -1,7 +0,0 @@
--- plugins/import/CompleteGraph.cpp.orig Fri Jan 10 13:01:54 2003
+++ plugins/import/CompleteGraph.cpp Fri Jan 10 13:02:03 2003
@@ -1,3 +1,4 @@
+#include <sys/types.h>
#include <sys/timeb.h>
#include<qinputdialog.h>
#include "TulipPlugin.h"

View File

@ -1,11 +0,0 @@
--- plugins/clustering/EqualValueClustering.cpp.orig Wed Apr 2 15:57:11 2003
+++ plugins/clustering/EqualValueClustering.cpp Fri Oct 29 14:14:16 2004
@@ -19,7 +19,7 @@
{}
namespace STL_EXT_NS {
- struct hash<double> {
+ template <> struct hash<double> {
size_t operator()(const double s) const { return (size_t)s; }
};
};

View File

@ -1,12 +0,0 @@
--- plugins/import/FileSystem.cpp.orig Sat Dec 7 00:39:53 2002
+++ plugins/import/FileSystem.cpp Mon May 26 01:24:45 2003
@@ -1,8 +1,8 @@
+#include <sys/types.h>
#include <sys/timeb.h>
#include <qfiledialog.h>
#include <tulip/TulipPlugin.h>
#include <sys/stat.h>
-#include <sys/types.h>
#include <dirent.h>
using namespace std;

View File

@ -1,54 +0,0 @@
--- plugins/layout/GEM.h.orig Wed Apr 2 01:33:06 2003
+++ plugins/layout/GEM.h Fri Oct 29 14:14:13 2004
@@ -153,30 +153,30 @@
* GEM Defualt Parameter Values
*/
- static const float IMAXTEMPDEF = (float)1.0;
- static const float ISTARTTEMPDEF = (float)0.3;
- static const float IFINALTEMPDEF = (float)0.05;
+ static const float IMAXTEMPDEF = 1.0;
+ static const float ISTARTTEMPDEF = 0.3;
+ static const float IFINALTEMPDEF = 0.05;
static const int IMAXITERDEF = 10;
- static const float IGRAVITYDEF = (float)0.05;
- static const float IOSCILLATIONDEF = (float)0.4;
- static const float IROTATIONDEF = (float)0.5;
- static const float ISHAKEDEF = (float)0.2;
- static const float AMAXTEMPDEF = (float)1.5;
- static const float ASTARTTEMPDEF = (float)1.0;
- static const float AFINALTEMPDEF = (float)0.02;
+ static const float IGRAVITYDEF = 0.05;
+ static const float IOSCILLATIONDEF = 0.4;
+ static const float IROTATIONDEF = 0.5;
+ static const float ISHAKEDEF = 0.2;
+ static const float AMAXTEMPDEF = 1.5;
+ static const float ASTARTTEMPDEF = 1.0;
+ static const float AFINALTEMPDEF = 0.02;
static const int AMAXITERDEF = 3;
- static const float AGRAVITYDEF = (float)0.1;
- static const float AOSCILLATIONDEF = (float)0.4;
- static const float AROTATIONDEF = (float)0.9;
- static const float ASHAKEDEF = (float)0.3;
- static const float OMAXTEMPDEF = (float)0.25;
- static const float OSTARTTEMPDEF = (float)1.0;
- static const float OFINALTEMPDEF = (float)1.0;
+ static const float AGRAVITYDEF = 0.1;
+ static const float AOSCILLATIONDEF = 0.4;
+ static const float AROTATIONDEF = 0.9;
+ static const float ASHAKEDEF = 0.3;
+ static const float OMAXTEMPDEF = 0.25;
+ static const float OSTARTTEMPDEF = 1.0;
+ static const float OFINALTEMPDEF = 1.0;
static const int OMAXITERDEF = 3;
- static const float OGRAVITYDEF = (float)0.1;
- static const float OOSCILLATIONDEF = (float)0.4;
- static const float OROTATIONDEF = (float)0.9;
- static const float OSHAKEDEF = (float)0.3;
+ static const float OGRAVITYDEF = 0.1;
+ static const float OOSCILLATIONDEF = 0.4;
+ static const float OROTATIONDEF = 0.9;
+ static const float OSHAKEDEF = 0.3;
/*
* Following parameters can be initialised in the original GEM

View File

@ -1,54 +0,0 @@
--- plugins/layout/GEM3D.h.orig Thu Feb 27 00:15:42 2003
+++ plugins/layout/GEM3D.h Fri Oct 29 14:14:13 2004
@@ -153,30 +153,30 @@
* GEM3D Defualt Parameter Values
*/
- static const float IMAXTEMPDEF = (float)1.0;
- static const float ISTARTTEMPDEF = (float)0.3;
- static const float IFINALTEMPDEF = (float)0.05;
+ static const float IMAXTEMPDEF = 1.0;
+ static const float ISTARTTEMPDEF = 0.3;
+ static const float IFINALTEMPDEF = 0.05;
static const int IMAXITERDEF = 10;
- static const float IGRAVITYDEF = (float)0.05;
- static const float IOSCILLATIONDEF = (float)0.4;
- static const float IROTATIONDEF = (float)0.5;
- static const float ISHAKEDEF = (float)0.2;
- static const float AMAXTEMPDEF = (float)1.5;
- static const float ASTARTTEMPDEF = (float)1.0;
- static const float AFINALTEMPDEF = (float)0.02;
+ static const float IGRAVITYDEF = 0.05;
+ static const float IOSCILLATIONDEF = 0.4;
+ static const float IROTATIONDEF = 0.5;
+ static const float ISHAKEDEF = 0.2;
+ static const float AMAXTEMPDEF = 1.5;
+ static const float ASTARTTEMPDEF = 1.0;
+ static const float AFINALTEMPDEF = 0.02;
static const int AMAXITERDEF = 3;
- static const float AGRAVITYDEF = (float)0.1;
- static const float AOSCILLATIONDEF = (float)0.4;
- static const float AROTATIONDEF = (float)0.9;
- static const float ASHAKEDEF = (float)0.3;
- static const float OMAXTEMPDEF = (float)0.25;
- static const float OSTARTTEMPDEF = (float)1.0;
- static const float OFINALTEMPDEF = (float)1.0;
+ static const float AGRAVITYDEF = 0.1;
+ static const float AOSCILLATIONDEF = 0.4;
+ static const float AROTATIONDEF = 0.9;
+ static const float ASHAKEDEF = 0.3;
+ static const float OMAXTEMPDEF = 0.25;
+ static const float OSTARTTEMPDEF = 1.0;
+ static const float OFINALTEMPDEF = 1.0;
static const int OMAXITERDEF = 3;
- static const float OGRAVITYDEF = (float)0.1;
- static const float OOSCILLATIONDEF = (float)0.4;
- static const float OROTATIONDEF = (float)0.9;
- static const float OSHAKEDEF = (float)0.3;
+ static const float OGRAVITYDEF = 0.1;
+ static const float OOSCILLATIONDEF = 0.4;
+ static const float OROTATIONDEF = 0.9;
+ static const float OSHAKEDEF = 0.3;
/*
* Following parameters can be initialised in the original GEM3D

View File

@ -1,10 +0,0 @@
--- library/tulip-ogl/src/GlGraph.cpp.orig Wed Nov 13 22:36:00 2002
+++ library/tulip-ogl/src/GlGraph.cpp Sat Apr 19 23:45:11 2003
@@ -39,6 +39,7 @@
//test
+#include <sys/types.h>
#include <sys/timeb.h>
TemplateFactory<GlyphFactory,Glyph,GlyphContext *> GlGraph::glyphFactory;

View File

@ -1,12 +0,0 @@
--- library/tulip-ogl/src/Glyph.cpp.orig Tue Jan 28 16:44:37 2003
+++ library/tulip-ogl/src/Glyph.cpp Fri Oct 29 14:14:08 2004
@@ -16,7 +16,8 @@
LOD=gc->LOD;
}
else {
- (void *)superGraph = (void *)glGraph = (void *)NULL;
+ superGraph = NULL;
+ glGraph = NULL;
LOD=LOF=0;
}
}

View File

@ -1,19 +0,0 @@
--- library/tulip/include/tulip/GraphIterator.h.orig Mon Jan 20 04:19:54 2003
+++ library/tulip/include/tulip/GraphIterator.h Fri Oct 29 14:14:08 2004
@@ -11,6 +11,7 @@
#ifndef TULIP_GGRAPHITERATOR_H
#define TULIP_GGRAPHITERATOR_H
#include "Iterator.h"
+#include "SubGraph.h"
#include "SuperGraph.h"
#include "SuperGraphImpl.h"
@@ -26,7 +27,7 @@
//typedef STL_EXT_NS::hash_map<node,std::pair< std::vector<edge> , std::vector<edge> > > nodesStruct;
class SelectionProxy;
-class SubGraph;
+//class SubGraph;
//template<class C>class Iterator;
//===========================================================

View File

@ -1,9 +0,0 @@
--- plugins/string/IdLabels.cpp.orig Thu Apr 10 21:57:47 2003
+++ plugins/string/IdLabels.cpp Mon May 26 10:27:11 2003
@@ -1,5 +1,6 @@
//-*-c++-*-
#include <tulip/TulipPlugin.h>
+#include <cstdio>
#include <string>
using namespace std;

View File

@ -1,11 +0,0 @@
--- plugins/selection/MultipleEdgeSelection.cpp.orig Wed Apr 2 01:39:52 2003
+++ plugins/selection/MultipleEdgeSelection.cpp Fri Oct 29 14:14:19 2004
@@ -29,7 +29,7 @@
};
namespace std {
- struct less<edgeS> {
+ template <> struct less<edgeS> {
bool operator()(const edgeS &c,const edgeS &d) const {
if (c.source.id<d.source.id) return true;
if (c.source.id>d.source.id) return false;

View File

@ -1,15 +0,0 @@
--- library/tulip/include/tulip/Property.h.orig Mon Jan 20 23:40:43 2003
+++ library/tulip/include/tulip/Property.h Fri Oct 29 14:14:08 2004
@@ -46,8 +46,10 @@
dataSet= context->dataSet;
}
else
- (void *)dataSet=(void *)superGraph = (void *)propertyProxy = (void *)pluginProgress = (void *)NULL;
-
+ dataSet = NULL;
+ superGraph = NULL;
+ propertyProxy = NULL;
+ pluginProgress = NULL;
}
///
virtual ~Property(){}

View File

@ -1,20 +0,0 @@
--- plugins/clustering/QuotientClustering.cpp.orig Wed Apr 2 01:33:06 2003
+++ plugins/clustering/QuotientClustering.cpp Fri Oct 29 14:14:16 2004
@@ -20,7 +20,7 @@
};
namespace std {
- struct less<edgeS> {
+ template <> struct less<edgeS> {
bool operator()(const edgeS &c,const edgeS &d) const {
if (c.source<d.source) return true;
if (c.source>d.source) return false;
@@ -36,7 +36,7 @@
QuotientClustering::~QuotientClustering(){}
namespace STL_EXT_NS {
- struct hash<double> {
+ template <> struct hash<double> {
size_t operator()(const double s) const { return (size_t)s; }
};
};

View File

@ -1,16 +0,0 @@
--- plugins/import/RandomGraph.cpp.orig Fri Jan 10 12:57:54 2003
+++ plugins/import/RandomGraph.cpp Fri Jan 10 12:58:04 2003
@@ -1,3 +1,4 @@
+#include <sys/types.h>
#include <sys/timeb.h>
#include<qinputdialog.h>
#include <tulip/TulipPlugin.h>
@@ -9,7 +10,7 @@
};
namespace std {
- struct less<edgeS>
+ template <> struct less<edgeS>
{
bool operator()(const edgeS &c,const edgeS &d) const
{

View File

@ -1,16 +0,0 @@
--- plugins/import/RandomSimpleGraph.cpp.orig Fri Jan 10 12:59:47 2003
+++ plugins/import/RandomSimpleGraph.cpp Fri Jan 10 12:59:59 2003
@@ -1,3 +1,4 @@
+#include <sys/types.h>
#include <sys/timeb.h>
#include<qinputdialog.h>
#include <tulip/TulipPlugin.h>
@@ -9,7 +10,7 @@
};
namespace std {
- struct less<edgeS> {
+ template <> struct less<edgeS> {
bool operator()(const edgeS &c,const edgeS &d) const {
int cs,ct,ds,dt;
if (c.source<=c.target) {

View File

@ -1,7 +0,0 @@
--- plugins/import/RandomTree.cpp.orig Fri Jan 10 13:04:39 2003
+++ plugins/import/RandomTree.cpp Fri Jan 10 13:04:46 2003
@@ -1,3 +1,4 @@
+#include <sys/types.h>
#include <sys/timeb.h>
#include<qinputdialog.h>
#include "TulipPlugin.h"

View File

@ -1,7 +0,0 @@
--- plugins/import/RandomTreeGeneral.cpp.orig Fri Jan 10 13:05:27 2003
+++ plugins/import/RandomTreeGeneral.cpp Fri Jan 10 13:05:35 2003
@@ -1,3 +1,4 @@
+#include <sys/types.h>
#include <sys/timeb.h>
#include <qinputdialog.h>
#include "TulipPlugin.h"

View File

@ -1,11 +0,0 @@
--- library/tulip/include/tulip/cxx/Reflect.cxx.orig Fri Dec 6 21:39:53 2002
+++ library/tulip/include/tulip/cxx/Reflect.cxx Fri Oct 29 14:14:08 2004
@@ -29,7 +29,7 @@
template<typename T> bool DataSet::getAndFree(const std::string &str,T& value) {
if (get(str,value)) {
delete ((T*)(data[str].value));
- data.remove(str);
+ data.erase(str);
return true;
}
else

View File

@ -1,15 +0,0 @@
--- software/tlprender/src/Shape.h.orig Thu Dec 26 20:32:07 2002
+++ software/tlprender/src/Shape.h Fri Oct 29 14:14:20 2004
@@ -63,10 +63,10 @@
} //namespace tlprender
namespace std {
- struct less<tlprender::Shape *> {
+ template <> struct less<tlprender::Shape *> {
bool operator()(tlprender::Shape *&p1, tlprender::Shape *&p2);
};
- struct less<tlprender::Shape> {
+ template <> struct less<tlprender::Shape> {
bool operator()(const tlprender::Shape &p1, const tlprender::Shape &p2);
};
}

View File

@ -1,11 +0,0 @@
--- library/tulip/include/tulip/SimpleVector.h.orig Sat Nov 30 21:35:57 2002
+++ library/tulip/include/tulip/SimpleVector.h Fri Oct 29 14:14:08 2004
@@ -24,7 +24,7 @@
explicit SimpleVector(size_t s) { begin=0; resize(s); }
void resize(size_t s) {
middleP=beginP+s;
- if (middle>endP || size()<capacity()/2)
+ if (this->middle>endP || size()<capacity()/2)
doRealloc(size());
}
iterator begin() { return beginP; }

View File

@ -1,7 +0,0 @@
--- plugins/import/SmallWorldGraph.cpp.orig Fri Jan 10 13:06:05 2003
+++ plugins/import/SmallWorldGraph.cpp Fri Jan 10 13:06:13 2003
@@ -1,3 +1,4 @@
+#include <sys/types.h>
#include <sys/timeb.h>
#include<qinputdialog.h>
#include "TulipPlugin.h"

View File

@ -1,20 +0,0 @@
--- plugins/metric/StrahlerAllMetric.cpp.orig Fri Dec 6 21:39:55 2002
+++ plugins/metric/StrahlerAllMetric.cpp Fri Oct 29 14:14:17 2004
@@ -18,7 +18,7 @@
}
};
- struct equal_to<couple>
+ template <> struct equal_to<couple>
{
bool operator()(const couple &c,const couple &d)
{
@@ -27,7 +27,7 @@
}
};
- struct less<couple>
+ template <> struct less<couple>
{
bool operator()(const couple &c,const couple &d)
{

View File

@ -1,20 +0,0 @@
--- plugins/metric/StrahlerMetric.cpp.orig Fri Dec 6 21:39:55 2002
+++ plugins/metric/StrahlerMetric.cpp Fri Oct 29 14:14:17 2004
@@ -27,7 +27,7 @@
}
};
- struct equal_to<couple> {
+ template <> struct equal_to<couple> {
bool operator()(const couple &c,const couple &d)
{
if ((c.r==d.r) && (c.p==d.p)) return true;
@@ -35,7 +35,7 @@
}
};
- struct less<couple>
+ template <> struct less<couple>
{
bool operator()(const couple &c,const couple &d) {
if (c.r<d.r) return true;

View File

@ -1,23 +0,0 @@
--- library/tulip/include/tulip/SuperGraph.h.orig Tue Apr 29 16:37:58 2003
+++ library/tulip/include/tulip/SuperGraph.h Fri Oct 29 14:14:08 2004
@@ -50,14 +50,14 @@
};
namespace STL_EXT_NS {
-struct hash<node>{size_t operator()(const node n) const {return n.id;}};
-struct hash<edge>{size_t operator()(const edge e) const {return e.id;}};
+template <> struct hash<node>{size_t operator()(const node n) const {return n.id;}};
+template <> struct hash<edge>{size_t operator()(const edge e) const {return e.id;}};
}
namespace std {
-struct equal_to<node>{size_t operator()(const node n,const node n2) const {return n.id==n2.id;}};
-struct equal_to<edge>{size_t operator()(const edge e,const edge e2) const {return e.id==e2.id;}};
-struct less<node>{size_t operator()(const node n,const node n2) const {return n.id<n2.id;}};
-struct less<edge>{size_t operator()(const edge e,const edge e2) const {return e.id<e2.id;}};
+template <> struct equal_to<node>{size_t operator()(const node n,const node n2) const {return n.id==n2.id;}};
+template <> struct equal_to<edge>{size_t operator()(const edge e,const edge e2) const {return e.id==e2.id;}};
+template <> struct less<node>{size_t operator()(const node n,const node n2) const {return n.id<n2.id;}};
+template <> struct less<edge>{size_t operator()(const edge e,const edge e2) const {return e.id<e2.id;}};
}

View File

@ -1,20 +0,0 @@
--- library/tulip/include/tulip/cxx/TemplateFactory.cxx.orig Wed Apr 2 23:46:09 2003
+++ library/tulip/include/tulip/cxx/TemplateFactory.cxx Mon May 26 14:31:29 2003
@@ -13,7 +13,7 @@
#include <dirent.h>
//implemented in TlpTools.cpp
-int __tulip_selectSO(const struct dirent *ent);
+int __tulip_selectSO(struct dirent *ent);
template<class ObjectFactory, class ObjectType, class Parameter>
bool TemplateFactory<ObjectFactory, ObjectType, Parameter>::exists(const std::string &pluginName) {
@@ -43,7 +43,7 @@
}
else {
createObj =(func) dlsym(handle, "_creator");
- if ((error=dlerror())!=0) {
+ if ((error=(char*)dlerror())!=0) {
dlclose(handle);
if (loader!=0) loader->aborted(std::string(namelist[n]->d_name),std::string(error));
}

View File

@ -1,11 +0,0 @@
--- library/tulip/src/TlpTools.cpp.orig Tue Jul 29 20:59:26 2003
+++ library/tulip/src/TlpTools.cpp Wed Sep 3 23:46:41 2003
@@ -46,7 +46,7 @@
}
//=========================================================
// accepts only file names ending with ".so"; used by TemplateFactory.cxx for directory filtering
-int __tulip_selectSO(const struct dirent *ent) {
+int __tulip_selectSO(struct dirent *ent) {
const char *SO = ".so";
int idx = strlen(ent->d_name) - 3;
if (idx < 0) return 0;

View File

@ -1,166 +0,0 @@
--- library/tulip-geo/include/tulip/cxx/Vector.cxx.orig Wed Apr 2 01:30:26 2003
+++ library/tulip-geo/include/tulip/cxx/Vector.cxx Fri Oct 29 14:14:08 2004
@@ -1,15 +1,17 @@
+//#include <iostream>
+
#define VECTORTLP tlp::geo::Vector<Obj,SIZE>
template <typename Obj,unsigned int SIZE>
VECTORTLP & VECTORTLP::operator*=(const Obj &scalaire) {
for (unsigned int i=0;i<SIZE;++i)
- array[i]*=scalaire;
+ this->array[i]*=scalaire;
return (*this);
}
template <typename Obj,unsigned int SIZE>
VECTORTLP & VECTORTLP::operator*=(const VECTORTLP &vecto) {
for (unsigned int i=0;i<SIZE;++i)
- array[i]*=vecto[i];
+ this->array[i]*=vecto[i];
return (*this);
}
@@ -17,14 +19,14 @@
VECTORTLP & VECTORTLP::operator/=(const Obj &scalaire) {
assert(scalaire!=0);
for (unsigned int i=0;i<SIZE;++i)
- array[i]/=scalaire;
+ this->array[i]/=scalaire;
return (*this);
}
template <typename Obj,unsigned int SIZE>
VECTORTLP & VECTORTLP::operator/=(const VECTORTLP &vecto) {
for (unsigned int i=0;i<SIZE;++i) {
assert(vecto[i]!=0);
- array[i]/=vecto[i];
+ this->array[i]/=vecto[i];
}
return (*this);
}
@@ -32,26 +34,26 @@
template <typename Obj,unsigned int SIZE>
VECTORTLP & VECTORTLP::operator+=(const Obj &scalaire) {
for (unsigned int i=0;i<SIZE;++i)
- array[i]+=scalaire;
+ this->array[i]+=scalaire;
return (*this);
}
template <typename Obj,unsigned int SIZE>
VECTORTLP & VECTORTLP::operator+=(const VECTORTLP &vecto) {
for (unsigned int i=0;i<SIZE;++i)
- array[i]+=vecto[i];
+ this->array[i]+=vecto[i];
return (*this);
}
template <typename Obj,unsigned int SIZE>
VECTORTLP & VECTORTLP::operator-=(const Obj &scalaire) {
for (unsigned int i=0;i<SIZE;++i)
- array[i]-=scalaire;
+ this->array[i]-=scalaire;
return (*this);
}
template <typename Obj,unsigned int SIZE>
VECTORTLP & VECTORTLP::operator-=(const VECTORTLP &vecto) {
for (unsigned int i=0;i<SIZE;++i)
- array[i]-=vecto[i];
+ this->array[i]-=vecto[i];
return (*this);
}
@@ -96,13 +98,13 @@
VECTORTLP result;
switch(SIZE){
case 3:
- result[0]=array[1]*v[2]-array[2]*v[1];
- result[1]=array[2]*v[0]-array[0]*v[2];
- result[2]=array[0]*v[1]-array[1]*v[0];
+ result[0]=this->array[1]*v[2]-this->array[2]*v[1];
+ result[1]=this->array[2]*v[0]-this->array[0]*v[2];
+ result[2]=this->array[0]*v[1]-this->array[1]*v[0];
return result;
break;
default :
- std::cerr << "cross product not implemented for dimension :" << SIZE << endl;
+ std::cerr << "cross product not implemented for dimension :" << SIZE << std::endl;
break;
}
}
@@ -110,14 +112,14 @@
template <typename Obj,unsigned int SIZE>
bool VECTORTLP::operator!=(const VECTORTLP &vecto) const {
for (unsigned int i=0;i<SIZE;++i)
- if (array[i]!=vecto[i]) return true;
+ if (this->array[i]!=vecto[i]) return true;
return false;
}
template <typename Obj,unsigned int SIZE>
bool VECTORTLP::operator==(const VECTORTLP &vecto) const {
for (unsigned int i=0;i<SIZE;++i)
- if (array[i]!=vecto[i]) return false;
+ if (this->array[i]!=vecto[i]) return false;
return true;
}
@@ -126,16 +128,16 @@
template <typename Obj,unsigned int SIZE>
Obj VECTORTLP::dotProduct(const VECTORTLP &v) const{
assert (SIZE>0);
- Obj tmpO= array[0] * v[0];
+ Obj tmpO= this->array[0] * v[0];
for (unsigned int i=1;i<SIZE;++i)
- tmpO+= array[i] * v[i];
+ tmpO+= this->array[i] * v[i];
return tmpO;
}
template <typename Obj,unsigned int SIZE>
VECTORTLP & VECTORTLP::fill(const Obj& scalaire) {
for (unsigned int i=0;i<SIZE;++i)
- array[i]=scalaire;
+ this->array[i]=scalaire;
return (*this);
}
@@ -143,17 +145,17 @@
Obj VECTORTLP::norm() const{
switch(SIZE){
case 1:
- return array[0];
+ return this->array[0];
case 2:
- return sqrt(array[0]*array[0]+array[1]*array[1]);
+ return sqrt(this->array[0]*this->array[0]+this->array[1]*this->array[1]);
break;
case 3:
- return sqrt(array[0]*array[0]+array[1]*array[1]+array[2]*array[2]);
+ return sqrt(this->array[0]*this->array[0]+this->array[1]*this->array[1]+this->array[2]*this->array[2]);
break;
default :
Obj tmp=0;
for (unsigned int i=0;i<SIZE;++i)
- tmp+=array[i]*array[i];
+ tmp+=this->array[i]*this->array[i];
return(sqrt(tmp));
break;
}
@@ -165,15 +167,15 @@
case 1:
return 0;
case 2:
- return sqrt((array[0]-c.array[0])*(array[0]-c.array[0])+(array[1]-c.array[1])*(array[1]-c.array[1]));
+ return sqrt((this->array[0]-c.array[0])*(this->array[0]-c.array[0])+(this->array[1]-c.array[1])*(this->array[1]-c.array[1]));
break;
case 3:
- return sqrt((array[0]-c.array[0])*(array[0]-c.array[0])+(array[1]-c.array[1])*(array[1]-c.array[1])+(array[2]-c.array[2])*(array[2]-c.array[2]));
+ return sqrt((this->array[0]-c.array[0])*(this->array[0]-c.array[0])+(this->array[1]-c.array[1])*(this->array[1]-c.array[1])+(this->array[2]-c.array[2])*(this->array[2]-c.array[2]));
break;
default :
Obj tmp=0;
for (unsigned int i=0;i<SIZE;++i)
- tmp+=(array[i]-c.array[i])*(array[i]-c.array[i]);
+ tmp+=(this->array[i]-c.array[i])*(this->array[i]-c.array[i]);
return(sqrt(tmp));
break;
}

View File

@ -1,7 +0,0 @@
--- plugins/import/completeBinaryTree.cpp.orig Fri Jan 10 13:06:51 2003
+++ plugins/import/completeBinaryTree.cpp Fri Jan 10 13:07:31 2003
@@ -1,3 +1,4 @@
+#include <sys/types.h>
#include <sys/timeb.h>
#include<qinputdialog.h>
#include "TulipPlugin.h"

View File

@ -1,12 +0,0 @@
--- config.h.in.orig Sat Jan 11 01:10:36 2003
+++ config.h.in Sat Jan 11 01:10:42 2003
@@ -34,9 +34,6 @@
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
/* Define to 1 if you have the <strings.h> header file. */
#undef HAVE_STRINGS_H

View File

@ -1,34 +0,0 @@
--- library/tulip-geo/include/tulip/cxx/Circle.cxx.orig 2007-12-18 22:02:09.000000000 +0100
+++ library/tulip-geo/include/tulip/cxx/Circle.cxx 2007-12-18 22:06:10.000000000 +0100
@@ -45,7 +45,7 @@
Vector<Obj,2> dir=c2-c1;
Obj n=dir.norm();
if (n==0)
- return Circle<Obj>(c1,c1.radius >? c2.radius);
+ return Circle<Obj>(c1, (c1.radius > c2.radius) ? c1.radius : c2.radius);
dir/=n;
Vector<Obj,2> ext1=c1-dir*c1.radius;
Vector<Obj,2> ext2=c2+dir*c2.radius;
@@ -64,16 +64,17 @@
boundingBox[3]=(*it)[1]+(*it).radius;
++it;
for (;it!=circles.end();++it) {
- boundingBox[0]=boundingBox[0] <? ((*it)[0]-(*it).radius);
- boundingBox[1]=boundingBox[1] <? ((*it)[1]-(*it).radius);
- boundingBox[2]=boundingBox[2] >? ((*it)[0]+(*it).radius);
- boundingBox[3]=boundingBox[3] >? ((*it)[1]+(*it).radius);
+ boundingBox[0]=(boundingBox[0] < ((*it)[0]-(*it).radius)) ? boundingBox[0] : ((*it)[0]-(*it).radius);
+ boundingBox[1]=(boundingBox[1] < ((*it)[1]-(*it).radius)) ? boundingBox[1] : ((*it)[1]-(*it).radius);
+ boundingBox[2]=(boundingBox[2] > ((*it)[0]+(*it).radius)) ? boundingBox[1] : ((*it)[0]-(*it).radius);
+ boundingBox[3]=(boundingBox[3] > ((*it)[1]+(*it).radius)) ? boundingBox[3] : ((*it)[1]-(*it).radius);
}
tlp::geo::Vector<Obj,2> center;
center[0]=(boundingBox[0]+boundingBox[2])/2;
center[1]=(boundingBox[1]+boundingBox[3])/2;
- Obj radius = ((boundingBox[2]-boundingBox[0])/2 ) >? ( (boundingBox[3]-boundingBox[1])/2 );
+ Obj radius = (((boundingBox[2]-boundingBox[0])/2 ) > ( (boundingBox[3]-boundingBox[1])/2 )) ?
+ ((boundingBox[2]-boundingBox[0])/2 ) : ( (boundingBox[3]-boundingBox[1])/2 );
tlp::geo::Circle<Obj> result(center,radius);
//compute circle hull
for (typename std::vector< tlp::geo::Circle<Obj> >::const_iterator it=circles.begin();it!=circles.end();++it)

View File

@ -1,11 +0,0 @@
--- library/tulip/include/tulip/IdManager.h.orig 2007-12-18 21:33:16.000000000 +0100
+++ library/tulip/include/tulip/IdManager.h 2007-12-18 21:33:32.000000000 +0100
@@ -34,7 +34,7 @@
Free the id given in parameter. This id
will be accessible by a the get function.
*/
- void IdManager::free(const unsigned int);
+ void free(const unsigned int);
/**
Return a new id, the returned id is choosen to minimize
the memory space of the free list, and the fragmetation

View File

@ -1,15 +0,0 @@
--- library/tulip-ogl/src/GlGraphDrawGraph.cpp.orig 2007-12-18 21:44:00.000000000 +0100
+++ library/tulip-ogl/src/GlGraphDrawGraph.cpp 2007-12-18 21:45:56.000000000 +0100
@@ -58,8 +58,10 @@
Coord translate= (elementLayout->getMax(_superGraph)+elementLayout->getMin(_superGraph))/-2.0;
double max=maxS[0]+maxL[0]-minL[0];
- max=max>?maxS[1]+maxL[1]-minL[1];
- max=max>?maxS[2]+maxL[2]-minL[2];
+ double max1 = maxS[1]+maxL[1]-minL[1];
+ double max2 = maxS[2]+maxL[2]-minL[2];
+ max = (max > max1) ? max : max1;
+ max = (max > max2) ? max : max2;
if (max<0.0001) max=1;
max=1/max;

View File

@ -1,21 +0,0 @@
--- library/tulip/src/Color.cpp.orig 2007-12-18 21:27:11.000000000 +0100
+++ library/tulip/src/Color.cpp 2007-12-18 21:40:14.000000000 +0100
@@ -49,10 +49,14 @@
//// static RGB<->HSV conversion functions
void RGBtoHSV(unsigned char r, unsigned char g, unsigned char b, int &h, int &s, int &v) {
- int min, max, delta;
- // "<?" and ">?" are GNU G++ extensions; may not work with other compiler
- min = r <? g <? b;
- max = r >? g >? b;
+ int min, max, delta, tmp;
+
+ tmp = (r < g) ? r : g;
+ min = (b < tmp) ? b : tmp;
+
+ tmp = (r > g) ? r : g;
+ max = (b > tmp) ? b : tmp;
+
v = max; // v
delta = max - min;

View File

@ -1,61 +0,0 @@
--- library/tulip/src/LayoutProxy.cpp.orig 2003-04-07 16:16:06.000000000 +0200
+++ library/tulip/src/LayoutProxy.cpp 2007-12-21 18:16:10.000000000 +0100
@@ -18,7 +18,7 @@
TemplateFactory<LayoutFactory,Layout,PropertyContext *> LayoutProxy::factory;
LayoutProxy::LayoutProxy (PropertyContext *context):PropertyProxy<PointType,LineType>(context) {
- minMaxOk[(int)superGraph]=false;
+ minMaxOk[(size_t)superGraph]=false;
currentLayout=0;
propertyProxy=this;
}
@@ -87,7 +87,7 @@
Coord LayoutProxy::getMax(SuperGraph *sg) {
if (sg==0) sg=superGraph;
- int sgi=(int)sg;
+ size_t sgi=(size_t)sg;
if (minMaxOk.find(sgi)==minMaxOk.end()) minMaxOk[sgi]=false;
if (!minMaxOk[sgi]) computeMinMax(sg);
@@ -96,7 +96,7 @@
Coord LayoutProxy::getMin(SuperGraph *sg) {
if (sg==0) sg=superGraph;
- int sgi=(int)sg;
+ size_t sgi=(size_t)sg;
if (minMaxOk.find(sgi)==minMaxOk.end()) minMaxOk[sgi]=false;
if (!minMaxOk[sgi]) computeMinMax(sg);
return min[sgi];
@@ -107,7 +107,7 @@
#ifndef NDEBUG
cerr << "LayoutProxy::center()" << endl;
#endif
- int sgi=(int)superGraph;
+ size_t sgi=(size_t)superGraph;
if (superGraph->numberOfNodes()==0) return;
Observable::holdObservers();
Coord translate=getMax()+getMin();
@@ -209,9 +209,11 @@
deltaY = (double )getMax()[1]-(double )getMin()[1];
deltaZ = (double )getMax()[2]-(double )getMin()[2];
- double delta= deltaX >? deltaY;
- delta = delta >? deltaZ;
+ double delta;
+ delta = (deltaX > deltaY) ? deltaX : deltaY;
+ delta = (delta > deltaZ) ? delta : deltaZ;
+
if (delta<0.001) return;
if (deltaX<0.001) deltaX=delta;
@@ -302,7 +304,7 @@
}delete itE;
- int sgi=(int)sg;
+ size_t sgi=(size_t)sg;
minMaxOk[sgi]=true;
min[sgi].set(minX,minY,minZ);

View File

@ -1,56 +0,0 @@
--- library/tulip/src/MetricProxy.cpp.orig 2007-12-21 18:18:19.000000000 +0100
+++ library/tulip/src/MetricProxy.cpp 2007-12-21 18:20:29.000000000 +0100
@@ -31,7 +31,7 @@
double MetricProxy::getNodeMin(SuperGraph *sg)
{
if (sg==0) sg=superGraph;
- int sgi=(int)sg;
+ size_t sgi=(size_t)sg;
if (minMaxOkNode.find(sgi)==minMaxOkNode.end()) minMaxOkNode[sgi]=false;
if (!minMaxOkNode[sgi]) computeMinMaxNode(sg);
return minN[sgi];
@@ -44,7 +44,7 @@
double MetricProxy::getNodeMax(SuperGraph *sg)
{
if (sg==0) sg=superGraph;
- int sgi=(int)sg;
+ size_t sgi=(size_t)sg;
if (minMaxOkNode.find(sgi)==minMaxOkNode.end()) minMaxOkNode[sgi]=false;
if (!minMaxOkNode[sgi]) computeMinMaxNode(sg);
return maxN[sgi];
@@ -57,7 +57,7 @@
double MetricProxy::getEdgeMin(SuperGraph *sg)
{
if (sg==0) sg=superGraph;
- int sgi=(int)sg;
+ size_t sgi=(size_t)sg;
if (minMaxOkEdge.find(sgi)==minMaxOkEdge.end()) minMaxOkEdge[sgi]=false;
if (!minMaxOkEdge[sgi]) computeMinMaxEdge(sg);
return minE[sgi];
@@ -71,7 +71,7 @@
{
if (sg==0) sg=superGraph;
- int sgi=(int)sg;
+ size_t sgi=(size_t)sg;
if (minMaxOkEdge.find(sgi)==minMaxOkEdge.end()) minMaxOkEdge[sgi]=false;
if (!minMaxOkEdge[sgi]) computeMinMaxEdge(sg);
return maxE[sgi];
@@ -125,7 +125,7 @@
delete itN;
if (sg==0) sg=superGraph;
- int sgi=(int)sg;
+ size_t sgi=(size_t)sg;
minMaxOkNode[sgi]=true;
minN[sgi]=minN2;
@@ -151,7 +151,7 @@
delete itE;
if (sg==0) sg=superGraph;
- int sgi=(int)sg;
+ size_t sgi=(size_t)sg;
minMaxOkEdge[sgi]=true;
minE[sgi]=minE2;

View File

@ -1,37 +0,0 @@
--- library/tulip/src/SizesProxy.cpp.orig 2003-04-07 16:16:06.000000000 +0200
+++ library/tulip/src/SizesProxy.cpp 2007-12-21 18:28:35.000000000 +0100
@@ -59,7 +59,7 @@
Size SizesProxy::getMax(SuperGraph *sg) {
if (sg==0) sg=superGraph;
- int sgi=(int)sg;
+ size_t sgi=(size_t)sg;
if (minMaxOk.find(sgi)==minMaxOk.end()) minMaxOk[sgi]=false;
if (!minMaxOk[sgi]) computeMinMax(sg);
return max[sgi];
@@ -67,7 +67,7 @@
Size SizesProxy::getMin(SuperGraph *sg) {
if (sg==0) sg=superGraph;
- int sgi=(int)sg;
+ size_t sgi=(size_t)sg;
if (minMaxOk.find(sgi)==minMaxOk.end()) minMaxOk[sgi]=false;
if (!minMaxOk[sgi]) computeMinMax(sg);
return min[sgi];
@@ -94,13 +94,13 @@
node itn=itN->next();
tmpSize=getNodeValue(itn);
for (int i=0;i<3;++i) {
- maxS[i]=maxS[i]>?tmpSize[i];
- minS[i]=minS[i]<?tmpSize[i];
+ maxS[i]=(maxS[i] > tmpSize[i]) ? maxS[i] : tmpSize[i];
+ minS[i]=(minS[i] < tmpSize[i]) ? minS[i] : tmpSize[i];
}
}delete itN;
if (sg==0) sg=superGraph;
- int sgi=(int)sg;
+ size_t sgi=(size_t)sg;
minMaxOk[sgi]=true;
min[sgi]=minS;

View File

@ -1,49 +0,0 @@
--- ltmain.sh.orig Wed Nov 20 19:45:17 2002
+++ ltmain.sh Sat Apr 19 23:26:26 2003
@@ -964,6 +964,7 @@
;;
-avoid-version)
+ build_old_libs=no
avoid_version=yes
continue
;;
@@ -1056,14 +1057,14 @@
# These systems don't actually have a C library (as such)
test "X$arg" = "X-lc" && continue
;;
- *-*-openbsd*)
+ *-*-openbsd* | *-*-freebsd*)
# Do not include libc due to us having libc/libc_r.
test "X$arg" = "X-lc" && continue
;;
esac
elif test "X$arg" = "X-lc_r"; then
case $host in
- *-*-openbsd*)
+ *-*-openbsd* | *-*-freebsd*)
# Do not include libc_r directly, use -pthread flag.
continue
;;
@@ -2499,7 +2500,7 @@
*-*-netbsd*)
# Don't link with libc until the a.out ld.so is fixed.
;;
- *-*-openbsd*)
+ *-*-openbsd* | *-*-freebsd*)
# Do not include libc due to us having libc/libc_r.
;;
*)
@@ -4286,10 +4287,12 @@
fi
# Install the pseudo-library for information purposes.
+ if /usr/bin/false; then
name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
instname="$dir/$name"i
$show "$install_prog $instname $destdir/$name"
$run eval "$install_prog $instname $destdir/$name" || exit $?
+ fi
# Maybe install the static library, too.
test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"

View File

@ -1,11 +0,0 @@
--- plugins/glyph/cone.cpp.orig 2007-12-18 22:28:52.000000000 +0100
+++ plugins/glyph/cone.cpp 2007-12-18 22:29:16.000000000 +0100
@@ -18,7 +18,7 @@
virtual string getName() {return string("Cone");}
virtual void draw(node n);
virtual void setLOD(int n);
- virtual Coord Cone::getAnchor(const Coord &vector) const;
+ virtual Coord getAnchor(const Coord &vector) const;
private:
GLuint LList;

View File

@ -1,11 +0,0 @@
--- plugins/glyph/cylinder.cpp.orig 2007-12-18 22:29:43.000000000 +0100
+++ plugins/glyph/cylinder.cpp 2007-12-18 22:29:50.000000000 +0100
@@ -17,7 +17,7 @@
virtual ~Cylinder();
virtual string getName() {return string("Cylinder");}
virtual void draw(node n);
- virtual Coord Cylinder::getAnchor(const Coord &vector) const;
+ virtual Coord getAnchor(const Coord &vector) const;
virtual void setLOD(int n);
private:

View File

@ -1,29 +0,0 @@
--- plugins/layout/ConeTreeExtended.cpp.orig 2007-12-18 22:22:22.000000000 +0100
+++ plugins/layout/ConeTreeExtended.cpp 2007-12-18 22:25:35.000000000 +0100
@@ -94,6 +94,7 @@
double sumRadius=0;
double maxRadius=0;
double newRadius;
+ double minRadiusResult;
std::vector<double> subCircleRadius(superGraph->outdeg(n));
Iterator<node> *itN=superGraph->getOutNodes(n);
@@ -101,7 +102,7 @@
node itn = itN->next();
subCircleRadius[i] = treePlace3D(itn,posRelX,posRelY);
sumRadius += 2*subCircleRadius[i];
- maxRadius = maxRadius >? subCircleRadius[i];
+ maxRadius = (maxRadius > subCircleRadius[i]) ? maxRadius : subCircleRadius[i];
}delete itN;
double radius=sumRadius/(2*M_PI);
@@ -120,7 +121,8 @@
for (int i=0;i<subCircleRadius.size()-1;++i) {
//if (subCircleRadius[i]>1)
for (int j=i+1;j<subCircleRadius.size();++j) {
- newRadius = newRadius >? minRadius(subCircleRadius[i],vangles[i],subCircleRadius[j],vangles[j]);
+ minRadiusResult = minRadius(subCircleRadius[i],vangles[i],subCircleRadius[j],vangles[j]);
+ newRadius = (newRadius > minRadiusResult) ? newRadius : minRadiusResult;
}
}
if (newRadius==0) newRadius=radius;

View File

@ -1,33 +0,0 @@
--- plugins/layout/TreeReingoldAndTilford.cpp.orig 2007-12-18 21:50:08.000000000 +0100
+++ plugins/layout/TreeReingoldAndTilford.cpp 2007-12-18 21:56:13.000000000 +0100
@@ -20,8 +20,8 @@
itG=arbreG.begin();
itD=arbreD.begin();
decal = ((*itG).R-(*itD).L + 1);
- iG+=(*itG).size<?(*itD).size;
- iD+=(*itG).size<?(*itD).size;
+ iG+= (itG->size < itD->size) ? itG->size : itD->size;
+ iD+= (itG->size < itD->size) ? itG->size : itD->size;
if (iG==(*itG).size) {
++itG;iG=0;
}
@@ -29,8 +29,8 @@
++itD;iD=0;
}
while ((itG!=arbreG.end()) && (itD!=arbreD.end())) {
- decal=decal>?((*itG).R-((*itD).L)+1);
- int min=((*itG).size-iG)<?((*itD).size-iD);
+ decal = (decal > (itG->R - itD->L+1)) ? decal : (itG->R - itD->L+1);
+ int min= ((itG->size - iG) < (itD->size-iD)) ? (itG->size - iG) : (itD->size-iD);
iG+=min;
iD+=min;
if (iG==(*itG).size) {
@@ -53,7 +53,7 @@
while((itL!=L->end()) && (itR!=R->end())) {
tmp.L=(*itL).L;
tmp.R=(*itR).R+decal;
- int min=((*itL).size-iL)<?((*itR).size-iR);
+ int min = ((itL->size-iL) < (itR->size-iR)) ? (itL->size-iL) : (itR->size-iR);
tmp.size=min;
if ((*itL).size==1) { //start

View File

@ -1,33 +0,0 @@
--- plugins/layout/TreeReingoldAndTilfordExtended.cpp.orig 2007-12-18 21:56:53.000000000 +0100
+++ plugins/layout/TreeReingoldAndTilfordExtended.cpp 2007-12-18 22:01:13.000000000 +0100
@@ -21,8 +21,8 @@
itG=arbreG.begin();
itD=arbreD.begin();
decal = ((*itG).R-(*itD).L + 1);
- iG+=(*itG).size<?(*itD).size;
- iD+=(*itG).size<?(*itD).size;
+ iG+= (itG->size < itD->size) ? itG->size : itD->size;
+ iD+= (itG->size < itD->size) ? itG->size : itD->size;
if (iG==(*itG).size) {
++itG;iG=0;
}
@@ -30,8 +30,8 @@
++itD;iD=0;
}
while ((itG!=arbreG.end()) && (itD!=arbreD.end())) {
- decal=decal>?((*itG).R-((*itD).L)+1);
- int min=((*itG).size-iG)<?((*itD).size-iD);
+ decal = (decal > (itG->R - itD->L + 1)) ? decal : (itG->R - itD->L + 1);
+ int min = ((itG->size - iG) < (itD->size - iD)) ? (itG->size - iG) : (itD->size - iD);
iG+=min;
iD+=min;
if (iG==(*itG).size) {
@@ -54,7 +54,7 @@
while((itL!=L->end()) && (itR!=R->end())) {
tmp.L=(*itL).L;
tmp.R=(*itR).R+decal;
- int min=((*itL).size-iL)<?((*itR).size-iR);
+ int min = ((itL->size - iL) < (itR->size - iR)) ? itL->size - iL : itR->size - iR;
tmp.size=min;
if ((*itL).size==1) { //start

View File

@ -1,44 +0,0 @@
--- software/tlprender/src/tlprender.cpp.orig Tue Apr 8 18:34:14 2003
+++ software/tlprender/src/tlprender.cpp Mon May 26 10:46:44 2003
@@ -8,6 +8,9 @@
#include <queue>
#include <stdio.h>
+#ifdef __FreeBSD__
+#include <libgen.h>
+#endif
#include <getopt.h>
/* from man 3 basename, #include <libgen.h>. However we want to use GNU's basename.
* see: info libc, libgen.h and string.h for more information. libgen.h is required for dirname,
@@ -54,7 +57,9 @@
static const int BUFFERSIZE(64 * 1024 * 1024);
static GLfloat *buffer;
+#ifdef HAVE_ON_EXIT
static void exitManager(int, void *);
+#endif
static void parseCommandLine(int, char **);
static void help() __attribute__ ((noreturn));
@@ -318,7 +323,9 @@
/***************************************************************************************************/
int main (int argc, char **argv)
{
+#ifdef HAVE_ON_EXIT
on_exit(exitManager, NULL);
+#endif
parseCommandLine(argc, argv);
@@ -401,9 +408,11 @@
/*
*
*/
+#ifdef HAVE_ON_EXIT
void exitManager(int exitStatus, void *arg)
{
}
+#endif
/*
* command line parser and help() functions below this line, nothing else should be added after

View File

@ -1,11 +0,0 @@
--- library/tulip/include/tulip/tulipconf.h.orig Thu Mar 13 20:20:34 2003
+++ library/tulip/include/tulip/tulipconf.h Fri Oct 29 14:14:08 2004
@@ -8,7 +8,7 @@
#else
# define STL_EXT_NS __gnu_cxx
# define _DEPRECATED __attribute__ ((deprecated))
-# include <ext/stl_hash_fun.h>
+# include <ext/hash_fun.h>
#endif
#include <string>

View File

@ -1,381 +1,478 @@
bin/Tulip
bin/tulip
bin/tulip-config
bin/tulip_check_pl
include/tulip/AbstractProperty.h
include/tulip/AcyclicTest.h
include/tulip/Algorithm.h
include/tulip/Array.h
include/tulip/Bezier.h
include/tulip/Bfs.h
include/tulip/BiconnectedTest.h
include/tulip/BooleanAlgorithm.h
include/tulip/BooleanProperty.h
include/tulip/BoundingBox.h
include/tulip/Camera.h
include/tulip/Circle.h
include/tulip/Cluster.h
include/tulip/ClusterTree.h
include/tulip/ClusterTreeData.h
include/tulip/Clustering.h
include/tulip/Color.h
include/tulip/Colors.h
include/tulip/ColorsProxy.h
include/tulip/ColorAlgorithm.h
include/tulip/ColorProperty.h
include/tulip/ConcatIterator.h
include/tulip/ConnectedTest.h
include/tulip/ConvexHull.h
include/tulip/Coord.h
include/tulip/EpsFunction.h
include/tulip/Delaunay.h
include/tulip/DoubleAlgorithm.h
include/tulip/DoubleProperty.h
include/tulip/DrawingTools.h
include/tulip/Edge.h
include/tulip/ElementPropertiesWidget.h
include/tulip/ElementPropertiesWidgetPlugin.h
include/tulip/ElementPropertiesWidgetUI.h
include/tulip/ExportModule.h
include/tulip/FanError.h
include/tulip/GlFonts.h
include/tulip/GlGraph.h
include/tulip/GlGraphStrategy.h
include/tulip/GlGraphWidget.h
include/tulip/GlLines.h
include/tulip/ExtendedClusterOperation.h
include/tulip/Face.h
include/tulip/FaceIterator.h
include/tulip/FindSelectionData.h
include/tulip/FindSelectionWidget.h
include/tulip/ForEach.h
include/tulip/GWInteractor.h
include/tulip/GWOverviewWidget.h
include/tulip/GWOverviewWidgetData.h
include/tulip/GWOverviewWidgetPlugin.h
include/tulip/GlBox.h
include/tulip/GlCircle.h
include/tulip/GlComplexeEntity.h
include/tulip/GlComposite.h
include/tulip/GlConvexHull.h
include/tulip/GlCurve.h
include/tulip/GlDisplayListManager.h
include/tulip/GlEdge.h
include/tulip/GlEntity.h
include/tulip/GlFeedBackBuilder.h
include/tulip/GlFeedBackRecorder.h
include/tulip/GlGraphComposite.h
include/tulip/GlGraphInputData.h
include/tulip/GlGraphRenderingParameters.h
include/tulip/GlGraphStaticData.h
include/tulip/GlGrid.h
include/tulip/GlHierarchyConvexHulls.h
include/tulip/GlLODCalculator.h
include/tulip/GlLabel.h
include/tulip/GlLayer.h
include/tulip/GlLine.h
include/tulip/GlMainWidget.h
include/tulip/GlMainWidgetPlugin.h
include/tulip/GlMetaNode.h
include/tulip/GlMultiPolygon.h
include/tulip/GlNode.h
include/tulip/GlPolygon.h
include/tulip/GlQuad.h
include/tulip/GlRect.h
include/tulip/GlRectTextured.h
include/tulip/GlScene.h
include/tulip/GlSceneObserver.h
include/tulip/GlSceneVisitor.h
include/tulip/GlSelectSceneVisitor.h
include/tulip/GlSimpleEntity.h
include/tulip/GlSphere.h
include/tulip/GlTLPFeedBackBuilder.h
include/tulip/GlTextureManager.h
include/tulip/GlXMLTools.h
include/tulip/Glyph.h
include/tulip/GraphIterator.h
include/tulip/GlyphManager.h
include/tulip/Graph.h
include/tulip/GraphAlgorithm.h
include/tulip/GraphDecorator.h
include/tulip/GraphMeasure.h
include/tulip/IdManager.h
include/tulip/GraphProperty.h
include/tulip/GraphTools.h
include/tulip/ImportModule.h
include/tulip/Int.h
include/tulip/IntProxy.h
include/tulip/IntegerAlgorithm.h
include/tulip/IntegerProperty.h
include/tulip/Iterator.h
include/tulip/Layout.h
include/tulip/LayoutProxy.h
include/tulip/LayerManagerWidget.h
include/tulip/LayerManagerWidgetData.h
include/tulip/LayoutAlgorithm.h
include/tulip/LayoutProperty.h
include/tulip/MapIterator.h
include/tulip/Matrix.h
include/tulip/MetaGraph.h
include/tulip/MetaGraphProxy.h
include/tulip/MethodFactory.h
include/tulip/Metric.h
include/tulip/MetricProxy.h
include/tulip/MouseInterface.h
include/tulip/MouseObject.h
include/tulip/MouseZoomBox.h
include/tulip/MouseBoxZoomer.h
include/tulip/MouseEdgeBendEditor.h
include/tulip/MouseEdgeBuilder.h
include/tulip/MouseEdgeSelector.h
include/tulip/MouseInteractors.h
include/tulip/MouseMagicSelector.h
include/tulip/MouseNodeBuilder.h
include/tulip/MouseSelectionEditor.h
include/tulip/MouseSelector.h
include/tulip/MutableContainer.h
include/tulip/Node.h
include/tulip/Observable.h
include/tulip/ObservableGraph.h
include/tulip/Ordering.h
include/tulip/OuterPlanarTest.h
include/tulip/PlanarConMap.h
include/tulip/PlanarityTest.h
include/tulip/Plugin.h
include/tulip/PluginContext.h
include/tulip/PluginLibraryLoader.h
include/tulip/PluginLoader.h
include/tulip/PluginLoaderTxt.h
include/tulip/PluginProgress.h
include/tulip/Property.h
include/tulip/PropertyProxy.h
include/tulip/PropertyProxyContainer.h
include/tulip/PropertyWidgets.h
include/tulip/PropertyAlgorithm.h
include/tulip/PropertyWidget.h
include/tulip/PropertyWidgetPlugin.h
include/tulip/QtCPULODCalculator.h
include/tulip/Rectangle.h
include/tulip/Reflect.h
include/tulip/Selection.h
include/tulip/SelectionProxy.h
include/tulip/SimpleVector.h
include/tulip/RenderingParametersDialogData.h
include/tulip/ReturnType.h
include/tulip/SGHierarchyWidget.h
include/tulip/SGHierarchyWidgetPlugin.h
include/tulip/SimpleTest.h
include/tulip/Size.h
include/tulip/Sizes.h
include/tulip/SizesProxy.h
include/tulip/Spline.h
include/tulip/SizeAlgorithm.h
include/tulip/SizeProperty.h
include/tulip/SortIterator.h
include/tulip/StableIterator.h
include/tulip/StlFunctions.h
include/tulip/StlIterator.h
include/tulip/String.h
include/tulip/StringProxy.h
include/tulip/SubGraph.h
include/tulip/SuperGraph.h
include/tulip/SuperGraphAbstract.h
include/tulip/SuperGraphImpl.h
include/tulip/SuperGraphView.h
include/tulip/StringAlgorithm.h
include/tulip/StringCollection.h
include/tulip/StringProperty.h
include/tulip/TemplateFactory.h
include/tulip/TlpQtTools.h
include/tulip/TlpTools.h
include/tulip/TulipElementProperties.h
include/tulip/TulipElementPropertiesData.h
include/tulip/TreeTest.h
include/tulip/TriconnectedTest.h
include/tulip/TulipPlugin.h
include/tulip/TypeConverter.h
include/tulip/TulipRelease.h
include/tulip/TulipTableWidget.h
include/tulip/Types.h
include/tulip/Vector.h
include/tulip/WithDependency.h
include/tulip/WithParameter.h
include/tulip/cxx/AbstractProperty.cxx
include/tulip/cxx/Array.cxx
include/tulip/cxx/Circle.cxx
include/tulip/cxx/Graph.cxx
include/tulip/cxx/Matrix.cxx
include/tulip/cxx/PropertyProxy.cxx
include/tulip/cxx/PropertyProxyContainer.cxx
include/tulip/cxx/Reflect.cxx
include/tulip/cxx/TemplateFactory.cxx
include/tulip/cxx/Vector.cxx
include/tulip/elementpropertieswidget.h
include/tulip/glmainwidget.h
include/tulip/gwoverviewwidget.h
include/tulip/hash_string.h
include/tulip/layermanagerwidget.h
include/tulip/libgpugraph.h
include/tulip/propertywidget.h
include/tulip/sghierarchywidget.h
include/tulip/tulipconf.h
include/tulip/tulipgpu.h
lib/libtulip-3.0.so
lib/libtulip-ogl-3.0.so
lib/libtulip-ogl.a
lib/libtulip-ogl.la
lib/libtulip-ogl.so
lib/libtulip-ogl.so.0
lib/libtulip-qt.a
lib/libtulip-qt.la
lib/libtulip-qt.so
lib/libtulip-qt.so.0
lib/libtulip-pluginsmanager-3.0.so
lib/libtulip-pluginsmanager.a
lib/libtulip-pluginsmanager.la
lib/libtulip-pluginsmanager.so
lib/libtulip-qt4-3.0.so
lib/libtulip-qt4.a
lib/libtulip-qt4.la
lib/libtulip-qt4.so
lib/libtulip.a
lib/libtulip.la
lib/libtulip.so
lib/libtulip.so.0
lib/tlp/bitmaps/Fonts.bmp
lib/tlp/bitmaps/but1.xpm
lib/tlp/bitmaps/but2.xpm
lib/tlp/bitmaps/but3.xpm
lib/tlp/bitmaps/font.ttf
lib/tlp/bitmaps/fontb.ttf
lib/tlp/bitmaps/headerlogo.bmp
lib/tlp/bitmaps/logo.bmp
lib/tlp/bitmaps/logo32x32.bmp
lib/tlp/plugins/clustering/arity.so
lib/tlp/plugins/clustering/arity.a
lib/tlp/plugins/clustering/arity.la
lib/tlp/plugins/clustering/aritysegment.so
lib/tlp/plugins/clustering/aritysegment.a
lib/tlp/plugins/clustering/aritysegment.la
lib/tlp/plugins/clustering/convol.so
lib/tlp/plugins/clustering/convol.a
lib/tlp/plugins/clustering/convol.la
lib/tlp/plugins/clustering/equalvalues.so
lib/tlp/plugins/clustering/equalvalues.a
lib/tlp/plugins/clustering/equalvalues.la
lib/tlp/plugins/clustering/geometric.so
lib/tlp/plugins/clustering/geometric.a
lib/tlp/plugins/clustering/geometric.la
lib/tlp/plugins/clustering/hierarchical.so
lib/tlp/plugins/clustering/hierarchical.a
lib/tlp/plugins/clustering/hierarchical.la
lib/tlp/plugins/clustering/quotientclustering.so
lib/tlp/plugins/clustering/quotientclustering.a
lib/tlp/plugins/clustering/quotientclustering.la
lib/tlp/plugins/clustering/segment.so
lib/tlp/plugins/clustering/segment.a
lib/tlp/plugins/clustering/segment.la
lib/tlp/plugins/clustering/sizen.so
lib/tlp/plugins/clustering/sizen.a
lib/tlp/plugins/clustering/sizen.la
lib/tlp/plugins/clustering/strength.so
lib/tlp/plugins/clustering/strength.a
lib/tlp/plugins/clustering/strength.la
lib/tlp/plugins/colors/histogrammapping.so
lib/tlp/plugins/colors/histogrammapping.a
lib/tlp/plugins/colors/histogrammapping.la
lib/tlp/plugins/colors/linearmapping.so
lib/tlp/plugins/colors/linearmapping.a
lib/tlp/plugins/colors/linearmapping.la
lib/tlp/plugins/colors/uniformquantif.so
lib/tlp/plugins/colors/uniformquantif.a
lib/tlp/plugins/colors/uniformquantif.la
lib/tlp/plugins/designer/libTulipWidgets.so
lib/tlp/plugins/designer/libTulipWidgets.a
lib/tlp/plugins/designer/libTulipWidgets.la
lib/tlp/plugins/export/generic.so
lib/tlp/plugins/export/generic.a
lib/tlp/plugins/export/generic.la
lib/tlp/plugins/export/gml.so
lib/tlp/plugins/export/gml.a
lib/tlp/plugins/export/gml.la
lib/tlp/plugins/export/tlp.so
lib/tlp/plugins/export/tlp.a
lib/tlp/plugins/export/tlp.la
lib/tlp/plugins/glyph/cone.so
lib/tlp/plugins/glyph/cone.a
lib/tlp/plugins/glyph/cone.la
lib/tlp/plugins/glyph/cube.so
lib/tlp/plugins/glyph/cube.a
lib/tlp/plugins/glyph/cube.la
lib/tlp/plugins/glyph/cubeoutlined.so
lib/tlp/plugins/glyph/cubeoutlined.a
lib/tlp/plugins/glyph/cubeoutlined.la
lib/tlp/plugins/glyph/cylinder.so
lib/tlp/plugins/glyph/cylinder.a
lib/tlp/plugins/glyph/cylinder.la
lib/tlp/plugins/glyph/sphere.so
lib/tlp/plugins/glyph/sphere.a
lib/tlp/plugins/glyph/sphere.la
lib/tlp/plugins/import/adjacencymatrix.so
lib/tlp/plugins/import/adjacencymatrix.a
lib/tlp/plugins/import/adjacencymatrix.la
lib/tlp/plugins/import/circulant.so
lib/tlp/plugins/import/circulant.a
lib/tlp/plugins/import/circulant.la
lib/tlp/plugins/import/completebinary.so
lib/tlp/plugins/import/completebinary.a
lib/tlp/plugins/import/completebinary.la
lib/tlp/plugins/import/completegraph.so
lib/tlp/plugins/import/completegraph.a
lib/tlp/plugins/import/completegraph.la
lib/tlp/plugins/import/filesystem.so
lib/tlp/plugins/import/filesystem.a
lib/tlp/plugins/import/filesystem.la
lib/tlp/plugins/import/gml.so
lib/tlp/plugins/import/gml.a
lib/tlp/plugins/import/gml.la
lib/tlp/plugins/import/poset.so
lib/tlp/plugins/import/poset.a
lib/tlp/plugins/import/poset.la
lib/tlp/plugins/import/randomgraph.so
lib/tlp/plugins/import/randomgraph.a
lib/tlp/plugins/import/randomgraph.la
lib/tlp/plugins/import/randomsimplegraph.so
lib/tlp/plugins/import/randomsimplegraph.a
lib/tlp/plugins/import/randomsimplegraph.la
lib/tlp/plugins/import/randomtree.so
lib/tlp/plugins/import/randomtree.a
lib/tlp/plugins/import/randomtree.la
lib/tlp/plugins/import/randomtreegeneral.so
lib/tlp/plugins/import/randomtreegeneral.a
lib/tlp/plugins/import/randomtreegeneral.la
lib/tlp/plugins/import/smallworld.so
lib/tlp/plugins/import/smallworld.a
lib/tlp/plugins/import/smallworld.la
lib/tlp/plugins/import/tlp.so
lib/tlp/plugins/import/tlp.a
lib/tlp/plugins/import/tlp.la
lib/tlp/plugins/layout/circular.so
lib/tlp/plugins/layout/circular.a
lib/tlp/plugins/layout/circular.la
lib/tlp/plugins/layout/conetree.so
lib/tlp/plugins/layout/conetree.a
lib/tlp/plugins/layout/conetree.la
lib/tlp/plugins/layout/conetreeextended.so
lib/tlp/plugins/layout/conetreeextended.a
lib/tlp/plugins/layout/conetreeextended.la
lib/tlp/plugins/layout/embedder.so
lib/tlp/plugins/layout/embedder.a
lib/tlp/plugins/layout/embedder.la
lib/tlp/plugins/layout/gem.so
lib/tlp/plugins/layout/gem.a
lib/tlp/plugins/layout/gem.la
lib/tlp/plugins/layout/gem3d.so
lib/tlp/plugins/layout/gem3d.a
lib/tlp/plugins/layout/gem3d.la
lib/tlp/plugins/layout/generalgraph.so
lib/tlp/plugins/layout/generalgraph.a
lib/tlp/plugins/layout/generalgraph.la
lib/tlp/plugins/layout/generalgraph3d.so
lib/tlp/plugins/layout/generalgraph3d.a
lib/tlp/plugins/layout/generalgraph3d.la
lib/tlp/plugins/layout/generalgraphbox.so
lib/tlp/plugins/layout/generalgraphbox.a
lib/tlp/plugins/layout/generalgraphbox.la
lib/tlp/plugins/layout/random.so
lib/tlp/plugins/layout/random.a
lib/tlp/plugins/layout/random.la
lib/tlp/plugins/layout/springelectrical.so
lib/tlp/plugins/layout/springelectrical.a
lib/tlp/plugins/layout/springelectrical.la
lib/tlp/plugins/layout/sugiyama.so
lib/tlp/plugins/layout/sugiyama.a
lib/tlp/plugins/layout/sugiyama.la
lib/tlp/plugins/layout/treeleaf.so
lib/tlp/plugins/layout/treeleaf.a
lib/tlp/plugins/layout/treeleaf.la
lib/tlp/plugins/layout/treemap.so
lib/tlp/plugins/layout/treemap.a
lib/tlp/plugins/layout/treemap.la
lib/tlp/plugins/layout/treeortho.so
lib/tlp/plugins/layout/treeortho.a
lib/tlp/plugins/layout/treeortho.la
lib/tlp/plugins/layout/treeradial.so
lib/tlp/plugins/layout/treeradial.a
lib/tlp/plugins/layout/treeradial.la
lib/tlp/plugins/layout/treereingold.so
lib/tlp/plugins/layout/treereingold.a
lib/tlp/plugins/layout/treereingold.la
lib/tlp/plugins/layout/treereingoldextended.so
lib/tlp/plugins/layout/treereingoldextended.a
lib/tlp/plugins/layout/treereingoldextended.la
lib/tlp/plugins/layout/tutte.so
lib/tlp/plugins/layout/tutte.a
lib/tlp/plugins/layout/tutte.la
lib/tlp/plugins/metric/arity.so
lib/tlp/plugins/metric/arity.a
lib/tlp/plugins/metric/arity.la
lib/tlp/plugins/metric/barycenter.so
lib/tlp/plugins/metric/barycenter.a
lib/tlp/plugins/metric/barycenter.la
lib/tlp/plugins/metric/cluster.so
lib/tlp/plugins/metric/cluster.a
lib/tlp/plugins/metric/cluster.la
lib/tlp/plugins/metric/connectedandtreecomponnents.so
lib/tlp/plugins/metric/connectedandtreecomponnents.a
lib/tlp/plugins/metric/connectedandtreecomponnents.la
lib/tlp/plugins/metric/connectedcomponnents.so
lib/tlp/plugins/metric/connectedcomponnents.a
lib/tlp/plugins/metric/connectedcomponnents.la
lib/tlp/plugins/metric/daglevel.so
lib/tlp/plugins/metric/daglevel.a
lib/tlp/plugins/metric/daglevel.la
lib/tlp/plugins/metric/id.so
lib/tlp/plugins/metric/id.a
lib/tlp/plugins/metric/id.la
lib/tlp/plugins/metric/leaf.so
lib/tlp/plugins/metric/leaf.a
lib/tlp/plugins/metric/leaf.la
lib/tlp/plugins/metric/node.so
lib/tlp/plugins/metric/node.a
lib/tlp/plugins/metric/node.la
lib/tlp/plugins/metric/pathlength.so
lib/tlp/plugins/metric/pathlength.a
lib/tlp/plugins/metric/pathlength.la
lib/tlp/plugins/metric/pathsum.so
lib/tlp/plugins/metric/pathsum.a
lib/tlp/plugins/metric/pathsum.la
lib/tlp/plugins/metric/random.so
lib/tlp/plugins/metric/random.a
lib/tlp/plugins/metric/random.la
lib/tlp/plugins/metric/segment.so
lib/tlp/plugins/metric/segment.a
lib/tlp/plugins/metric/segment.la
lib/tlp/plugins/metric/spreadingactivation.so
lib/tlp/plugins/metric/spreadingactivation.a
lib/tlp/plugins/metric/spreadingactivation.la
lib/tlp/plugins/metric/spreadinginterpolation.so
lib/tlp/plugins/metric/spreadinginterpolation.a
lib/tlp/plugins/metric/spreadinginterpolation.la
lib/tlp/plugins/metric/strahler.so
lib/tlp/plugins/metric/strahler.a
lib/tlp/plugins/metric/strahler.la
lib/tlp/plugins/metric/strahlerall.so
lib/tlp/plugins/metric/strahlerall.a
lib/tlp/plugins/metric/strahlerall.la
lib/tlp/plugins/metric/strength.so
lib/tlp/plugins/metric/strength.a
lib/tlp/plugins/metric/strength.la
lib/tlp/plugins/metric/strongcomponnet.so
lib/tlp/plugins/metric/strongcomponnet.a
lib/tlp/plugins/metric/strongcomponnet.la
lib/tlp/plugins/metric/treearitymax.so
lib/tlp/plugins/metric/treearitymax.a
lib/tlp/plugins/metric/treearitymax.la
lib/tlp/plugins/metric/viennot.so
lib/tlp/plugins/metric/viennot.a
lib/tlp/plugins/metric/viennot.la
lib/tlp/plugins/selection/inducedsubgraph.so
lib/tlp/plugins/selection/inducedsubgraph.a
lib/tlp/plugins/selection/inducedsubgraph.la
lib/tlp/plugins/selection/labelselection.so
lib/tlp/plugins/selection/labelselection.a
lib/tlp/plugins/selection/labelselection.la
lib/tlp/plugins/selection/loopselection.so
lib/tlp/plugins/selection/loopselection.a
lib/tlp/plugins/selection/loopselection.la
lib/tlp/plugins/selection/multipleselection.so
lib/tlp/plugins/selection/multipleselection.a
lib/tlp/plugins/selection/multipleselection.la
lib/tlp/plugins/selection/pathselection.so
lib/tlp/plugins/selection/pathselection.a
lib/tlp/plugins/selection/pathselection.la
lib/tlp/plugins/selection/reachable.so
lib/tlp/plugins/selection/reachable.a
lib/tlp/plugins/selection/reachable.la
lib/tlp/plugins/selection/spanningdag.so
lib/tlp/plugins/selection/spanningdag.a
lib/tlp/plugins/selection/spanningdag.la
lib/tlp/plugins/selection/spanningtree.so
lib/tlp/plugins/selection/spanningtree.a
lib/tlp/plugins/selection/spanningtree.la
lib/tlp/plugins/sizes/AutoSize.so
lib/tlp/plugins/sizes/AutoSize.a
lib/tlp/plugins/sizes/AutoSize.la
lib/tlp/plugins/sizes/fittolabels.so
lib/tlp/plugins/sizes/fittolabels.a
lib/tlp/plugins/sizes/fittolabels.la
lib/tlp/plugins/string/idlabels.so
lib/tlp/plugins/string/idlabels.a
lib/tlp/plugins/string/idlabels.la
lib/tlp/bitmaps/logo32x32.ico
lib/tlp/bitmaps/logolabri.jpg
lib/tlp/bitmaps/logotulip.jpg
lib/tlp/bitmaps/startup.gif
lib/tlp/bitmaps/tex_back.png
lib/tlp/bitmaps/welcomelogo.bmp
lib/tlp/designer/libElementPropertiesWidgetPlugin.so
lib/tlp/designer/libGlMainWidgetPlugin.so
lib/tlp/designer/libSGHierarchyWidgetPlugin.so
lib/tlp/designer/libGWOverviewWidgetPlugin.so
lib/tlp/designer/libPropertyWidgetPlugin.so
lib/tlp/designer/libElementPropertiesWidgetPlugin-3.0.so
lib/tlp/designer/libElementPropertiesWidgetPlugin.a
lib/tlp/designer/libElementPropertiesWidgetPlugin.la
lib/tlp/designer/libGWOverviewWidgetPlugin-3.0.so
lib/tlp/designer/libGWOverviewWidgetPlugin.a
lib/tlp/designer/libGWOverviewWidgetPlugin.la
lib/tlp/designer/libGlMainWidgetPlugin-3.0.so
lib/tlp/designer/libGlMainWidgetPlugin.a
lib/tlp/designer/libGlMainWidgetPlugin.la
lib/tlp/designer/libPropertyWidgetPlugin-3.0.so
lib/tlp/designer/libPropertyWidgetPlugin.a
lib/tlp/designer/libPropertyWidgetPlugin.la
lib/tlp/designer/libSGHierarchyWidgetPlugin-3.0.so
lib/tlp/designer/libSGHierarchyWidgetPlugin.a
lib/tlp/designer/libSGHierarchyWidgetPlugin.la
lib/tlp/glyphs/libBillboard-3.0.2.a
lib/tlp/glyphs/libBillboard-3.0.2.la
lib/tlp/glyphs/libBillboard-3.0.2.so
lib/tlp/glyphs/libCircle-3.0.2.a
lib/tlp/glyphs/libCircle-3.0.2.la
lib/tlp/glyphs/libCircle-3.0.2.so
lib/tlp/glyphs/libCone-3.0.2.a
lib/tlp/glyphs/libCone-3.0.2.la
lib/tlp/glyphs/libCone-3.0.2.so
lib/tlp/glyphs/libCube-3.0.2.a
lib/tlp/glyphs/libCube-3.0.2.la
lib/tlp/glyphs/libCube-3.0.2.so
lib/tlp/glyphs/libCubeOutlinedTransparent-3.0.2.a
lib/tlp/glyphs/libCubeOutlinedTransparent-3.0.2.la
lib/tlp/glyphs/libCubeOutlinedTransparent-3.0.2.so
lib/tlp/glyphs/libCylinder-3.0.2.a
lib/tlp/glyphs/libCylinder-3.0.2.la
lib/tlp/glyphs/libCylinder-3.0.2.so
lib/tlp/glyphs/libHalfCylinder-3.0.2.a
lib/tlp/glyphs/libHalfCylinder-3.0.2.la
lib/tlp/glyphs/libHalfCylinder-3.0.2.so
lib/tlp/glyphs/libHexagone-3.0.2.a
lib/tlp/glyphs/libHexagone-3.0.2.la
lib/tlp/glyphs/libHexagone-3.0.2.so
lib/tlp/glyphs/libPentagone-3.0.2.a
lib/tlp/glyphs/libPentagone-3.0.2.la
lib/tlp/glyphs/libPentagone-3.0.2.so
lib/tlp/glyphs/libRing-3.0.2.a
lib/tlp/glyphs/libRing-3.0.2.la
lib/tlp/glyphs/libRing-3.0.2.so
lib/tlp/glyphs/libSphere-3.0.2.a
lib/tlp/glyphs/libSphere-3.0.2.la
lib/tlp/glyphs/libSphere-3.0.2.so
lib/tlp/glyphs/libSquare-3.0.2.a
lib/tlp/glyphs/libSquare-3.0.2.la
lib/tlp/glyphs/libSquare-3.0.2.so
lib/tlp/glyphs/libSquareBorderTextured-3.0.2.a
lib/tlp/glyphs/libSquareBorderTextured-3.0.2.la
lib/tlp/glyphs/libSquareBorderTextured-3.0.2.so
lib/tlp/glyphs/libTriangle-3.0.2.a
lib/tlp/glyphs/libTriangle-3.0.2.la
lib/tlp/glyphs/libTriangle-3.0.2.so
lib/tlp/libAdjacencyMatrixImport-3.0.2.a
lib/tlp/libAdjacencyMatrixImport-3.0.2.la
lib/tlp/libAdjacencyMatrixImport-3.0.2.so
lib/tlp/libArityMetric-3.0.2.a
lib/tlp/libArityMetric-3.0.2.la
lib/tlp/libArityMetric-3.0.2.so
lib/tlp/libAutoSize-3.0.2.a
lib/tlp/libAutoSize-3.0.2.la
lib/tlp/libAutoSize-3.0.2.so
lib/tlp/libBetweennessCentrality-3.0.2.a
lib/tlp/libBetweennessCentrality-3.0.2.la
lib/tlp/libBetweennessCentrality-3.0.2.so
lib/tlp/libBiconnectedComponent-3.0.2.a
lib/tlp/libBiconnectedComponent-3.0.2.la
lib/tlp/libBiconnectedComponent-3.0.2.so
lib/tlp/libBubbleTree-3.0.2.a
lib/tlp/libBubbleTree-3.0.2.la
lib/tlp/libBubbleTree-3.0.2.so
lib/tlp/libCircular-3.0.2.a
lib/tlp/libCircular-3.0.2.la
lib/tlp/libCircular-3.0.2.so
lib/tlp/libClusterMetric-3.0.2.a
lib/tlp/libClusterMetric-3.0.2.la
lib/tlp/libClusterMetric-3.0.2.so
lib/tlp/libCompleteGraph-3.0.2.a
lib/tlp/libCompleteGraph-3.0.2.la
lib/tlp/libCompleteGraph-3.0.2.so
lib/tlp/libCompleteTree-3.0.2.a
lib/tlp/libCompleteTree-3.0.2.la
lib/tlp/libCompleteTree-3.0.2.so
lib/tlp/libConeTreeExtended-3.0.2.a
lib/tlp/libConeTreeExtended-3.0.2.la
lib/tlp/libConeTreeExtended-3.0.2.so
lib/tlp/libConnectedAndTreeComponent-3.0.2.a
lib/tlp/libConnectedAndTreeComponent-3.0.2.la
lib/tlp/libConnectedAndTreeComponent-3.0.2.so
lib/tlp/libConnectedComponent-3.0.2.a
lib/tlp/libConnectedComponent-3.0.2.la
lib/tlp/libConnectedComponent-3.0.2.so
lib/tlp/libConnectedComponentPacking-3.0.2.a
lib/tlp/libConnectedComponentPacking-3.0.2.la
lib/tlp/libConnectedComponentPacking-3.0.2.so
lib/tlp/libConvolutionClustering-3.0.2.a
lib/tlp/libConvolutionClustering-3.0.2.la
lib/tlp/libConvolutionClustering-3.0.2.so
lib/tlp/libDagLevelMetric-3.0.2.a
lib/tlp/libDagLevelMetric-3.0.2.la
lib/tlp/libDagLevelMetric-3.0.2.so
lib/tlp/libDendrogram-3.0.2.a
lib/tlp/libDendrogram-3.0.2.la
lib/tlp/libDendrogram-3.0.2.so
lib/tlp/libDepthMetric-3.0.2.a
lib/tlp/libDepthMetric-3.0.2.la
lib/tlp/libDepthMetric-3.0.2.so
lib/tlp/libDotImport-3.0.2.a
lib/tlp/libDotImport-3.0.2.la
lib/tlp/libDotImport-3.0.2.so
lib/tlp/libEccentricity-3.0.2.a
lib/tlp/libEccentricity-3.0.2.la
lib/tlp/libEccentricity-3.0.2.so
lib/tlp/libEmbedder-3.0.2.a
lib/tlp/libEmbedder-3.0.2.la
lib/tlp/libEmbedder-3.0.2.so
lib/tlp/libEnumColorValuesMapping-3.0.2.a
lib/tlp/libEnumColorValuesMapping-3.0.2.la
lib/tlp/libEnumColorValuesMapping-3.0.2.so
lib/tlp/libEqualValueClustering-3.0.2.a
lib/tlp/libEqualValueClustering-3.0.2.la
lib/tlp/libEqualValueClustering-3.0.2.so
lib/tlp/libFileSystem-3.0.2.a
lib/tlp/libFileSystem-3.0.2.la
lib/tlp/libFileSystem-3.0.2.so
lib/tlp/libFitToLabels-3.0.2.a
lib/tlp/libFitToLabels-3.0.2.la
lib/tlp/libFitToLabels-3.0.2.so
lib/tlp/libGMLExport-3.0.2.a
lib/tlp/libGMLExport-3.0.2.la
lib/tlp/libGMLExport-3.0.2.so
lib/tlp/libGMLImport-3.0.2.a
lib/tlp/libGMLImport-3.0.2.la
lib/tlp/libGMLImport-3.0.2.so
lib/tlp/libGemLayout-3.0.2.a
lib/tlp/libGemLayout-3.0.2.la
lib/tlp/libGemLayout-3.0.2.so
lib/tlp/libGeneralGraph3D-3.0.2.a
lib/tlp/libGeneralGraph3D-3.0.2.la
lib/tlp/libGeneralGraph3D-3.0.2.so
lib/tlp/libGrid-3.0.2.a
lib/tlp/libGrid-3.0.2.la
lib/tlp/libGrid-3.0.2.so
lib/tlp/libHierarchicalClustering-3.0.2.a
lib/tlp/libHierarchicalClustering-3.0.2.la
lib/tlp/libHierarchicalClustering-3.0.2.so
lib/tlp/libHierarchicalGraph-3.0.2.a
lib/tlp/libHierarchicalGraph-3.0.2.la
lib/tlp/libHierarchicalGraph-3.0.2.so
lib/tlp/libIdMetric-3.0.2.a
lib/tlp/libIdMetric-3.0.2.la
lib/tlp/libIdMetric-3.0.2.so
lib/tlp/libImprovedWalker-3.0.2.a
lib/tlp/libImprovedWalker-3.0.2.la
lib/tlp/libImprovedWalker-3.0.2.so
lib/tlp/libInducedSubGraphSelection-3.0.2.a
lib/tlp/libInducedSubGraphSelection-3.0.2.la
lib/tlp/libInducedSubGraphSelection-3.0.2.so
lib/tlp/libKruskal-3.0.2.a
lib/tlp/libKruskal-3.0.2.la
lib/tlp/libKruskal-3.0.2.so
lib/tlp/libLeafMetric-3.0.2.a
lib/tlp/libLeafMetric-3.0.2.la
lib/tlp/libLeafMetric-3.0.2.so
lib/tlp/libLoopSelection-3.0.2.a
lib/tlp/libLoopSelection-3.0.2.la
lib/tlp/libLoopSelection-3.0.2.so
lib/tlp/libMetricColorMapping-3.0.2.a
lib/tlp/libMetricColorMapping-3.0.2.la
lib/tlp/libMetricColorMapping-3.0.2.so
lib/tlp/libMetricSizeMapping-3.0.2.a
lib/tlp/libMetricSizeMapping-3.0.2.la
lib/tlp/libMetricSizeMapping-3.0.2.so
lib/tlp/libMixedModel-3.0.2.a
lib/tlp/libMixedModel-3.0.2.la
lib/tlp/libMixedModel-3.0.2.so
lib/tlp/libMultipleSelection-3.0.2.a
lib/tlp/libMultipleSelection-3.0.2.la
lib/tlp/libMultipleSelection-3.0.2.so
lib/tlp/libNodeMetric-3.0.2.a
lib/tlp/libNodeMetric-3.0.2.la
lib/tlp/libNodeMetric-3.0.2.so
lib/tlp/libPathLengthMetric-3.0.2.a
lib/tlp/libPathLengthMetric-3.0.2.la
lib/tlp/libPathLengthMetric-3.0.2.so
lib/tlp/libPlanarGraph-3.0.2.a
lib/tlp/libPlanarGraph-3.0.2.la
lib/tlp/libPlanarGraph-3.0.2.so
lib/tlp/libQuotientClustering-3.0.2.a
lib/tlp/libQuotientClustering-3.0.2.la
lib/tlp/libQuotientClustering-3.0.2.so
lib/tlp/libRandom-3.0.2.a
lib/tlp/libRandom-3.0.2.la
lib/tlp/libRandom-3.0.2.so
lib/tlp/libRandomGraph-3.0.2.a
lib/tlp/libRandomGraph-3.0.2.la
lib/tlp/libRandomGraph-3.0.2.so
lib/tlp/libRandomMetric-3.0.2.a
lib/tlp/libRandomMetric-3.0.2.la
lib/tlp/libRandomMetric-3.0.2.so
lib/tlp/libRandomSimpleGraph-3.0.2.a
lib/tlp/libRandomSimpleGraph-3.0.2.la
lib/tlp/libRandomSimpleGraph-3.0.2.so
lib/tlp/libRandomTree-3.0.2.a
lib/tlp/libRandomTree-3.0.2.la
lib/tlp/libRandomTree-3.0.2.so
lib/tlp/libRandomTreeGeneral-3.0.2.a
lib/tlp/libRandomTreeGeneral-3.0.2.la
lib/tlp/libRandomTreeGeneral-3.0.2.so
lib/tlp/libReachableSubGraphSelection-3.0.2.a
lib/tlp/libReachableSubGraphSelection-3.0.2.la
lib/tlp/libReachableSubGraphSelection-3.0.2.so
lib/tlp/libScatterPlot-3.0.2.a
lib/tlp/libScatterPlot-3.0.2.la
lib/tlp/libScatterPlot-3.0.2.so
lib/tlp/libSegmentMetric-3.0.2.a
lib/tlp/libSegmentMetric-3.0.2.la
lib/tlp/libSegmentMetric-3.0.2.so
lib/tlp/libSmallWorldGraph-3.0.2.a
lib/tlp/libSmallWorldGraph-3.0.2.la
lib/tlp/libSmallWorldGraph-3.0.2.so
lib/tlp/libSpanningDagSelection-3.0.2.a
lib/tlp/libSpanningDagSelection-3.0.2.la
lib/tlp/libSpanningDagSelection-3.0.2.so
lib/tlp/libSpanningTreeSelection-3.0.2.a
lib/tlp/libSpanningTreeSelection-3.0.2.la
lib/tlp/libSpanningTreeSelection-3.0.2.so
lib/tlp/libSquarifiedTreeMap-3.0.2.a
lib/tlp/libSquarifiedTreeMap-3.0.2.la
lib/tlp/libSquarifiedTreeMap-3.0.2.so
lib/tlp/libStrahlerMetric-3.0.2.a
lib/tlp/libStrahlerMetric-3.0.2.la
lib/tlp/libStrahlerMetric-3.0.2.so
lib/tlp/libStrengthClustering-3.0.2.a
lib/tlp/libStrengthClustering-3.0.2.la
lib/tlp/libStrengthClustering-3.0.2.so
lib/tlp/libStrengthMetric-3.0.2.a
lib/tlp/libStrengthMetric-3.0.2.la
lib/tlp/libStrengthMetric-3.0.2.so
lib/tlp/libStrongComponent-3.0.2.a
lib/tlp/libStrongComponent-3.0.2.la
lib/tlp/libStrongComponent-3.0.2.so
lib/tlp/libTreeArityMax-3.0.2.a
lib/tlp/libTreeArityMax-3.0.2.la
lib/tlp/libTreeArityMax-3.0.2.so
lib/tlp/libTreeLeaf-3.0.2.a
lib/tlp/libTreeLeaf-3.0.2.la
lib/tlp/libTreeLeaf-3.0.2.so
lib/tlp/libTreeMap-3.0.2.a
lib/tlp/libTreeMap-3.0.2.la
lib/tlp/libTreeMap-3.0.2.so
lib/tlp/libTreeRadial-3.0.2.a
lib/tlp/libTreeRadial-3.0.2.la
lib/tlp/libTreeRadial-3.0.2.so
lib/tlp/libTreeReingoldAndTilforExtended-3.0.2.a
lib/tlp/libTreeReingoldAndTilforExtended-3.0.2.la
lib/tlp/libTreeReingoldAndTilforExtended-3.0.2.so
lib/tlp/libTutte-3.0.2.a
lib/tlp/libTutte-3.0.2.la
lib/tlp/libTutte-3.0.2.so
lib/tlp/libWebImport-3.0.2.a
lib/tlp/libWebImport-3.0.2.la
lib/tlp/libWebImport-3.0.2.so
share/aclocal/tulip.m4
@dirrm lib/tlp/plugins/string
@dirrm lib/tlp/plugins/sizes
@dirrm lib/tlp/plugins/selection
@dirrm lib/tlp/plugins/metric
@dirrm lib/tlp/plugins/layout
@dirrm lib/tlp/plugins/import
@dirrm lib/tlp/plugins/glyph
@dirrm lib/tlp/plugins/export
@dirrm lib/tlp/plugins/designer
@dirrm lib/tlp/plugins/colors
@dirrm lib/tlp/plugins/clustering
@dirrm lib/tlp/plugins
@dirrm lib/tlp/bitmaps
@dirrm lib/tlp
@dirrm include/tulip/cxx
@dirrm include/tulip
@dirrm lib/tlp/glyphs
@dirrm lib/tlp/designer
@dirrm lib/tlp/bitmaps
@dirrm lib/tlp