From f7069b4ed54a1a9e9db3d38f0d8d7fd8cb8b70cd Mon Sep 17 00:00:00 2001
From: Brad Barber <bradb@shore.net>
Date: Mon, 11 Jan 2010 19:59:17 -0500
Subject: [PATCH] Move Qt files to qt-qhull.cpp Add qh_QHpointer defines to
vcproj files Add libqhullp to sln solution file
---
README.txt | 17 ++
cpp/Coordinates.h | 6 +-
cpp/QhullFacetList.cpp | 39 +++-
cpp/QhullFacetSet.cpp | 24 ++-
cpp/QhullHyperplane.cpp | 23 ++-
cpp/QhullPoint.cpp | 21 ++-
cpp/QhullPointSet.cpp | 21 ++-
cpp/QhullPoints.cpp | 20 ++-
cpp/qhulltest/Coordinates_test.cpp | 24 +--
cpp/qhulltest/PointCoordinates_test.cpp | 8 +-
cpp/qhulltest/QhullFacetList_test.cpp | 65 +------
cpp/qhulltest/QhullFacetSet_test.cpp | 37 +---
cpp/qhulltest/QhullHyperplane_test.cpp | 33 +---
cpp/qhulltest/QhullPointSet_test.cpp | 32 +---
cpp/qhulltest/QhullPoint_test.cpp | 31 +---
cpp/qhulltest/QhullPoints_test.cpp | 31 +---
cpp/qhulltest/UsingLibQhull_test.cpp | 6 +-
cpp/qt-qhull.cpp | 128 +++++++++++++
cpp/road/RoadTest.h | 7 +-
project/libqhullp.vcproj | 229 ++++++++++++++++++++++++
project/qhull.sln | 92 +++-------
project/qhull.vcproj | 4 +-
project/qhullcpp.vcproj | 10 +-
project/qhulltest.vcproj | 48 +++--
project/qhulltest/qhulltest.pro | 1 +
src/Changes.txt | 11 +-
src/user.h | 2 +-
27 files changed, 605 insertions(+), 365 deletions(-)
create mode 100644 cpp/qt-qhull.cpp
create mode 100644 project/libqhullp.vcproj
diff --git a/README.txt b/README.txt
index 42eba2f..ed2905c 100644
--- a/README.txt
+++ b/README.txt
@@ -231,6 +231,14 @@ build systems.
- set the library file (use the same for debug and release)
- build the project
+ - create a "Win32 static library" called "libqhullp"
+ - move these files from "qhull source"
+ geom.c geom2.c global.c io.c mem.c merge.c poly.c poly2.c libqhull.c
+ qset.c random.c rboxlib.c stat.c user.c usermem.c userprintf.c
+ - define qh_QHpointer=1
+ - set the library file (use the same for debug and release)
+ - build the project
+
- create a "Win32 console application" called "qhull"
- Move unix.c from "qhull source"
- Add the library file created by "libqhull"
@@ -239,21 +247,30 @@ build systems.
- create a "Win32 console application" called "qconvex"
- Move qconvex.c from "qhull source"
- Copy the library file from "libqhull"
+ - build the project
- do the same for qdelaun.c, qhalf, qvoronoi.c, user_eg.c, user_eg2.c
- create a "Win32 dynamic library" called "libqhullcpp"
- Move cpp sources in cpp/*.cpp from "qhull source"
Do not move cpp/qhulltest, road/RoadTest.cpp, or user_eg3.cpp
+ - define qh_QHpointer=1
+ - Add the library file created by "libqhullp"
+ - build the project
- create a "Win32 console application" called "user_eg3"
- Move user_eg3 from "qhull source"
+ - define qh_QHpointer=1
- Add the library file created by "libqhullcpp"
+ - build the project
- create a "Win32 console application" called "qhulltest"
- Install Qt for DevStudio (http://qt.nokia.com/downloads)
- Add everything in cpp/qhulltest
- Add road/RoadTest.cpp
+ - define qh_QHpointer=1
+ - Add the library file created by "libqhullcpp"
+ - build the project
- use Project:Settings to make any changes
- use batch build to rebuild everything
diff --git a/cpp/Coordinates.h b/cpp/Coordinates.h
index 1edb706..8414ad2 100644
--- a/cpp/Coordinates.h
+++ b/cpp/Coordinates.h
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/Coordinates.h#33 $$Change: 1167 $
-** $DateTime: 2010/01/08 19:03:17 $$Author: bbarber $
+** $Id: //product/qhull/main/rel/cpp/Coordinates.h#34 $$Change: 1176 $
+** $DateTime: 2010/01/11 19:40:05 $$Author: bbarber $
**
****************************************************************************/
@@ -180,7 +180,7 @@ public:
bool operator>(const Coordinates::const_iterator &other) const { return *this>reinterpret_cast<const iterator &>(other); }
bool operator>=(const Coordinates::const_iterator &other) const { return *this>=reinterpret_cast<const iterator &>(other); }
- iterator operator++() { return iterator(++i); } //FIXUP QH10000 Should return reference, but get reference to temporary
+ iterator operator++() { return iterator(++i); } //FIXUP QH10012 Should return reference, but get reference to temporary
iterator operator++(int) { return iterator(i++); }
iterator operator--() { return iterator(--i); }
iterator operator--(int) { return iterator(i--); }
diff --git a/cpp/QhullFacetList.cpp b/cpp/QhullFacetList.cpp
index 8a074bc..dce1efb 100644
--- a/cpp/QhullFacetList.cpp
+++ b/cpp/QhullFacetList.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullFacetList.cpp#23 $$Change: 1171 $
-** $DateTime: 2010/01/09 10:11:25 $$Author: bbarber $
+** $Id: //product/qhull/main/rel/cpp/QhullFacetList.cpp#24 $$Change: 1176 $
+** $DateTime: 2010/01/11 19:40:05 $$Author: bbarber $
**
****************************************************************************/
@@ -24,6 +24,41 @@ using std::vector;
namespace orgQhull {
+#//Conversion
+
+// See qt_qhull.cpp for QList conversions
+
+#ifndef QHULL_NO_STL
+std::vector<QhullFacet> QhullFacetList::
+toStdVector() const
+{
+ QhullLinkedListIterator<QhullFacet> i(*this);
+ std::vector<QhullFacet> vs;
+ while(i.hasNext()){
+ QhullFacet f= i.next();
+ if(isSelectAll() || f.isGood()){
+ vs.push_back(f);
+ }
+ }
+ return vs;
+}//toStdVector
+#endif //QHULL_NO_STL
+
+#ifndef QHULL_NO_STL
+//! Same as PrintVertices
+std::vector<QhullVertex> QhullFacetList::
+vertices_toStdVector(int qhRunId) const
+{
+ std::vector<QhullVertex> vs;
+ QhullVertexSet qvs(qhRunId, first().getFacetT(), NULL, isSelectAll());
+
+ for(QhullVertexSet::iterator i=qvs.begin(); i!=qvs.end(); ++i){
+ vs.push_back(*i);
+ }
+ return vs;
+}//vertices_toStdVector
+#endif //QHULL_NO_STL
+
#//Read-only
bool QhullFacetList::
diff --git a/cpp/QhullFacetSet.cpp b/cpp/QhullFacetSet.cpp
index 34b71b5..1bb320e 100644
--- a/cpp/QhullFacetSet.cpp
+++ b/cpp/QhullFacetSet.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullFacetSet.cpp#19 $$Change: 1139 $
-** $DateTime: 2010/01/03 11:20:29 $$Author: bbarber $
+** $Id: //product/qhull/main/rel/cpp/QhullFacetSet.cpp#20 $$Change: 1176 $
+** $DateTime: 2010/01/11 19:40:05 $$Author: bbarber $
**
****************************************************************************/
@@ -24,6 +24,26 @@ using std::vector;
namespace orgQhull {
+#//Conversion
+
+// See qt-qhull.cpp for QList conversions
+
+#ifndef QHULL_NO_STL
+std::vector<QhullFacet> QhullFacetSet::
+toStdVector() const
+{
+ QhullSetIterator<QhullFacet> i(*this);
+ std::vector<QhullFacet> vs;
+ while(i.hasNext()){
+ QhullFacet f= i.next();
+ if(isSelectAll() || f.isGood()){
+ vs.push_back(f);
+ }
+ }
+ return vs;
+}//toStdVector
+#endif //QHULL_NO_STL
+
#//Read-only
bool QhullFacetSet::
diff --git a/cpp/QhullHyperplane.cpp b/cpp/QhullHyperplane.cpp
index 406d96b..f3af99c 100644
--- a/cpp/QhullHyperplane.cpp
+++ b/cpp/QhullHyperplane.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullHyperplane.cpp#10 $$Change: 1167 $
-** $DateTime: 2010/01/08 19:03:17 $$Author: bbarber $
+** $Id: //product/qhull/main/rel/cpp/QhullHyperplane.cpp#11 $$Change: 1176 $
+** $DateTime: 2010/01/11 19:40:05 $$Author: bbarber $
**
****************************************************************************/
@@ -11,11 +11,30 @@
#include <iostream>
+
#ifdef _MSC_VER // Microsoft Visual C++ -- warning level 4
#endif
namespace orgQhull {
+#//Conversion
+
+// See qt-qhull.cpp for QList conversions
+
+#ifndef QHULL_NO_STL
+std::vector<coordT> QhullHyperplane::
+toStdVector() const
+{
+ QhullHyperplaneIterator i(*this);
+ std::vector<coordT> fs;
+ while(i.hasNext()){
+ fs.push_back(i.next());
+ }
+ fs.push_back(hyperplane_offset);
+ return fs;
+}//toStdVector
+#endif //QHULL_NO_STL
+
#//Value
//! Return distance from point to hyperplane.
diff --git a/cpp/QhullPoint.cpp b/cpp/QhullPoint.cpp
index 1e6e257..88802a4 100644
--- a/cpp/QhullPoint.cpp
+++ b/cpp/QhullPoint.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullPoint.cpp#27 $$Change: 1167 $
-** $DateTime: 2010/01/08 19:03:17 $$Author: bbarber $
+** $Id: //product/qhull/main/rel/cpp/QhullPoint.cpp#28 $$Change: 1176 $
+** $DateTime: 2010/01/11 19:40:05 $$Author: bbarber $
**
****************************************************************************/
@@ -42,6 +42,23 @@ id(int qhRunId, int dimension, const coordT *c)
return (int)i; // WARN64
}//id
+#//Conversion
+
+// See qt-qhull.cpp for QList conversion
+
+#ifndef QHULL_NO_STL
+std::vector<coordT> QhullPoint::
+toStdVector() const
+{
+ QhullPointIterator i(*this);
+ std::vector<coordT> vs;
+ while(i.hasNext()){
+ vs.push_back(i.next());
+ }
+ return vs;
+}//toStdVector
+#endif //QHULL_NO_STL
+
#//Operator
bool QhullPoint::
diff --git a/cpp/QhullPointSet.cpp b/cpp/QhullPointSet.cpp
index 212a11d..52ceca7 100644
--- a/cpp/QhullPointSet.cpp
+++ b/cpp/QhullPointSet.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullPointSet.cpp#10 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //product/qhull/main/rel/cpp/QhullPointSet.cpp#11 $$Change: 1176 $
+** $DateTime: 2010/01/11 19:40:05 $$Author: bbarber $
**
****************************************************************************/
@@ -16,6 +16,23 @@
namespace orgQhull {
+#// Conversion
+
+// See qt-qhull.cpp for QList conversion
+
+#ifndef QHULL_NO_STL
+std::vector<QhullPoint> QhullPointSet::
+toStdVector() const
+{
+ QhullPointSetIterator i(*this);
+ std::vector<QhullPoint> vs;
+ while(i.hasNext()){
+ vs.push_back(i.next());
+ }
+ return vs;
+}//toStdVector
+#endif //QHULL_NO_STL
+
#//Element-access
//! Derived from QhullSet::value
QhullPoint QhullPointSet::
diff --git a/cpp/QhullPoints.cpp b/cpp/QhullPoints.cpp
index 5695d69..3d71534 100644
--- a/cpp/QhullPoints.cpp
+++ b/cpp/QhullPoints.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullPoints.cpp#20 $$Change: 1150 $
-** $DateTime: 2010/01/04 22:43:14 $$Author: bbarber $
+** $Id: //product/qhull/main/rel/cpp/QhullPoints.cpp#21 $$Change: 1176 $
+** $DateTime: 2010/01/11 19:40:05 $$Author: bbarber $
**
****************************************************************************/
@@ -16,6 +16,22 @@
namespace orgQhull {
+#//Conversion
+// See qt-qhull.cpp for QList conversion
+
+#ifndef QHULL_NO_STL
+std::vector<QhullPoint> QhullPoints::
+toStdVector() const
+{
+ QhullPointsIterator i(*this);
+ std::vector<QhullPoint> vs;
+ while(i.hasNext()){
+ vs.push_back(i.next());
+ }
+ return vs;
+}//toStdVector
+#endif //QHULL_NO_STL
+
#//Read-only
bool QhullPoints::
diff --git a/cpp/qhulltest/Coordinates_test.cpp b/cpp/qhulltest/Coordinates_test.cpp
index 1d9e427..54b58c6 100644
--- a/cpp/qhulltest/Coordinates_test.cpp
+++ b/cpp/qhulltest/Coordinates_test.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/qhulltest/Coordinates_test.cpp#17 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //product/qhull/main/rel/cpp/qhulltest/Coordinates_test.cpp#18 $$Change: 1176 $
+** $DateTime: 2010/01/11 19:40:05 $$Author: bbarber $
**
****************************************************************************/
@@ -97,7 +97,7 @@ t_convert()
QCOMPARE(qc[k], c[k]);
}
Coordinates c4;
- c4= std::vector<double>(2, 0.0); //FIXUP move to Coordinates_test
+ c4= std::vector<double>(2, 0.0);
QCOMPARE(c4.back(), 0.0);
Coordinates c5(std::vector<double>(2, 0.0));
QCOMPARE(c4.size(), c5.size());
@@ -529,24 +529,6 @@ t_io()
QCOMPARE(s.count("2"), 2);
}//t_io
-#//Conversions
-
-//FIXUP -- Move conditional, Coordinates code to Coordinates.cpp
-
-#ifdef QHULL_USES_QT
-QList<coordT> Coordinates::
-toQList() const
-{
- CoordinatesIterator i(*this);
- QList<coordT> cs;
- while(i.hasNext()){
- cs.append(i.next());
- }
- return cs;
-}//toQList
-#endif //QHULL_USES_QT
-
-
}//orgQhull
#include "moc/Coordinates_test.moc"
diff --git a/cpp/qhulltest/PointCoordinates_test.cpp b/cpp/qhulltest/PointCoordinates_test.cpp
index 3bb28ba..c936764 100644
--- a/cpp/qhulltest/PointCoordinates_test.cpp
+++ b/cpp/qhulltest/PointCoordinates_test.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/qhulltest/PointCoordinates_test.cpp#15 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //product/qhull/main/rel/cpp/qhulltest/PointCoordinates_test.cpp#16 $$Change: 1176 $
+** $DateTime: 2010/01/11 19:40:05 $$Author: bbarber $
**
****************************************************************************/
@@ -392,10 +392,6 @@ t_io()
QCOMPARE(s.count("2"), 4);
}//t_io
-#//Conversions
-
-//FIXUP -- Move conditional, PointCoordinates code to PointCoordinates.cpp
-
}//orgQhull
#include "moc/PointCoordinates_test.moc"
diff --git a/cpp/qhulltest/QhullFacetList_test.cpp b/cpp/qhulltest/QhullFacetList_test.cpp
index 6689f21..1994c90 100644
--- a/cpp/qhulltest/QhullFacetList_test.cpp
+++ b/cpp/qhulltest/QhullFacetList_test.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/qhulltest/QhullFacetList_test.cpp#16 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //product/qhull/main/rel/cpp/qhulltest/QhullFacetList_test.cpp#17 $$Change: 1176 $
+** $DateTime: 2010/01/11 19:40:05 $$Author: bbarber $
**
****************************************************************************/
@@ -167,67 +167,6 @@ t_io()
}
}//t_io
-//FIXUP -- Move conditional, QhullFacetSet code to QhullFacetSet.cpp
-#ifndef QHULL_NO_STL
-std::vector<QhullFacet> QhullFacetList::
-toStdVector() const
-{
- QhullLinkedListIterator<QhullFacet> i(*this);
- std::vector<QhullFacet> vs;
- while(i.hasNext()){
- QhullFacet f= i.next();
- if(isSelectAll() || f.isGood()){
- vs.push_back(f);
- }
- }
- return vs;
-}//toStdVector
-#endif //QHULL_NO_STL
-
-#ifdef QHULL_USES_QT
-QList<QhullFacet> QhullFacetList::
-toQList() const
-{
- QhullLinkedListIterator<QhullFacet> i(*this);
- QList<QhullFacet> vs;
- while(i.hasNext()){
- QhullFacet f= i.next();
- if(isSelectAll() || f.isGood()){
- vs.append(f);
- }
- }
- return vs;
-}//toQList
-#endif //QHULL_USES_QT
-
-#ifndef QHULL_NO_STL
-//! Same as PrintVertices
-std::vector<QhullVertex> QhullFacetList::
-vertices_toStdVector(int qhRunId) const
-{
- std::vector<QhullVertex> vs;
- QhullVertexSet qvs(qhRunId, first().getFacetT(), NULL, isSelectAll());
-
- for(QhullVertexSet::iterator i=qvs.begin(); i!=qvs.end(); ++i){
- vs.push_back(*i);
- }
- return vs;
-}//vertices_toStdVector
-#endif //QHULL_NO_STL
-
-#ifdef QHULL_USES_QT
-//! Same as PrintVertices
-QList<QhullVertex> QhullFacetList::
-vertices_toQList(int qhRunId) const
-{
- QList<QhullVertex> vs;
- QhullVertexSet qvs(qhRunId, first().getFacetT(), NULL, isSelectAll());
- for(QhullVertexSet::iterator i=qvs.begin(); i!=qvs.end(); ++i){
- vs.push_back(*i);
- }
- return vs;
-}//vertices_toQList
-#endif //QHULL_USES_QT
}//orgQhull
#include "moc/QhullFacetList_test.moc"
diff --git a/cpp/qhulltest/QhullFacetSet_test.cpp b/cpp/qhulltest/QhullFacetSet_test.cpp
index c0e2d12..9401f7a 100644
--- a/cpp/qhulltest/QhullFacetSet_test.cpp
+++ b/cpp/qhulltest/QhullFacetSet_test.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/qhulltest/QhullFacetSet_test.cpp#13 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //product/qhull/main/rel/cpp/qhulltest/QhullFacetSet_test.cpp#14 $$Change: 1176 $
+** $DateTime: 2010/01/11 19:40:05 $$Author: bbarber $
**
****************************************************************************/
@@ -148,39 +148,6 @@ t_io()
}
}//t_io
-//FIXUP -- Move conditional, QhullFacetSet code to QhullFacetSet.cpp
-#ifndef QHULL_NO_STL
-std::vector<QhullFacet> QhullFacetSet::
-toStdVector() const
-{
- QhullSetIterator<QhullFacet> i(*this);
- std::vector<QhullFacet> vs;
- while(i.hasNext()){
- QhullFacet f= i.next();
- if(isSelectAll() || f.isGood()){
- vs.push_back(f);
- }
- }
- return vs;
-}//toStdVector
-#endif //QHULL_NO_STL
-
-#ifdef QHULL_USES_QT
-QList<QhullFacet> QhullFacetSet::
-toQList() const
-{
- QhullSetIterator<QhullFacet> i(*this);
- QList<QhullFacet> vs;
- while(i.hasNext()){
- QhullFacet f= i.next();
- if(isSelectAll() || f.isGood()){
- vs.append(f);
- }
- }
- return vs;
-}//toQList
-#endif //QHULL_USES_QT
-
}//orgQhull
#include "moc/QhullFacetSet_test.moc"
diff --git a/cpp/qhulltest/QhullHyperplane_test.cpp b/cpp/qhulltest/QhullHyperplane_test.cpp
index 0b079fe..ac59a86 100644
--- a/cpp/qhulltest/QhullHyperplane_test.cpp
+++ b/cpp/qhulltest/QhullHyperplane_test.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/qhulltest/QhullHyperplane_test.cpp#11 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //product/qhull/main/rel/cpp/qhulltest/QhullHyperplane_test.cpp#12 $$Change: 1176 $
+** $DateTime: 2010/01/11 19:40:05 $$Author: bbarber $
**
****************************************************************************/
@@ -407,35 +407,6 @@ t_io()
}//t_io
-//FIXUP -- Move conditional, QhullHyperplane code to QhullHyperplane.cpp
-#ifndef QHULL_NO_STL
-std::vector<coordT> QhullHyperplane::
-toStdVector() const
-{
- QhullHyperplaneIterator i(*this);
- std::vector<coordT> fs;
- while(i.hasNext()){
- fs.push_back(i.next());
- }
- fs.push_back(hyperplane_offset);
- return fs;
-}//toStdVector
-#endif //QHULL_NO_STL
-
-#ifdef QHULL_USES_QT
-QList<coordT> QhullHyperplane::
-toQList() const
-{
- QhullHyperplaneIterator i(*this);
- QList<coordT> fs;
- while(i.hasNext()){
- fs.append(i.next());
- }
- fs.append(hyperplane_offset);
- return fs;
-}//toQList
-#endif //QHULL_USES_QT
-
}//orgQhull
#include "moc/QhullHyperplane_test.moc"
diff --git a/cpp/qhulltest/QhullPointSet_test.cpp b/cpp/qhulltest/QhullPointSet_test.cpp
index a51b122..7f5c791 100644
--- a/cpp/qhulltest/QhullPointSet_test.cpp
+++ b/cpp/qhulltest/QhullPointSet_test.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (p) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/qhulltest/QhullPointSet_test.cpp#9 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //product/qhull/main/rel/cpp/qhulltest/QhullPointSet_test.cpp#10 $$Change: 1176 $
+** $DateTime: 2010/01/11 19:40:05 $$Author: bbarber $
**
****************************************************************************/
@@ -365,34 +365,6 @@ t_io()
// QCOMPARE(s.count(QRegExp("f\\d")), 3*7 + 13*3*2);
}//t_io
-//FIXUP -- Move conditional, QhullPointSet code to QhullPointSet.cpp
-#ifndef QHULL_NO_STL
-std::vector<QhullPoint> QhullPointSet::
-toStdVector() const
-{
- QhullPointSetIterator i(*this);
- std::vector<QhullPoint> vs;
- while(i.hasNext()){
- vs.push_back(i.next());
- }
- return vs;
-}//toStdVector
-#endif //QHULL_NO_STL
-
-#ifdef QHULL_USES_QT
-QList<QhullPoint> QhullPointSet::
-toQList() const
-{
- QhullPointSetIterator i(*this);
- QList<QhullPoint> vs;
- while(i.hasNext()){
- vs.append(i.next());
- }
- return vs;
-}//toQList
-#endif //QHULL_USES_QT
-
-
}//orgQhull
#include "moc/QhullPointSet_test.moc"
diff --git a/cpp/qhulltest/QhullPoint_test.cpp b/cpp/qhulltest/QhullPoint_test.cpp
index 6393839..03f5d4b 100644
--- a/cpp/qhulltest/QhullPoint_test.cpp
+++ b/cpp/qhulltest/QhullPoint_test.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/qhulltest/QhullPoint_test.cpp#16 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //product/qhull/main/rel/cpp/qhulltest/QhullPoint_test.cpp#17 $$Change: 1176 $
+** $DateTime: 2010/01/11 19:40:05 $$Author: bbarber $
**
****************************************************************************/
@@ -392,33 +392,6 @@ t_io()
}
}//t_io
-//FIXUP -- Move conditional, QhullPoint code to QhullPoint.cpp
-#ifndef QHULL_NO_STL
-std::vector<coordT> QhullPoint::
-toStdVector() const
-{
- QhullPointIterator i(*this);
- std::vector<coordT> vs;
- while(i.hasNext()){
- vs.push_back(i.next());
- }
- return vs;
-}//toStdVector
-#endif //QHULL_NO_STL
-
-#ifdef QHULL_USES_QT
-QList<coordT> QhullPoint::
-toQList() const
-{
- QhullPointIterator i(*this);
- QList<coordT> vs;
- while(i.hasNext()){
- vs.append(i.next());
- }
- return vs;
-}//toQList
-#endif //QHULL_USES_QT
-
}//orgQhull
#include "moc/QhullPoint_test.moc"
diff --git a/cpp/qhulltest/QhullPoints_test.cpp b/cpp/qhulltest/QhullPoints_test.cpp
index 12b051c..1def8ac 100644
--- a/cpp/qhulltest/QhullPoints_test.cpp
+++ b/cpp/qhulltest/QhullPoints_test.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (p) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/qhulltest/QhullPoints_test.cpp#18 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //product/qhull/main/rel/cpp/qhulltest/QhullPoints_test.cpp#19 $$Change: 1176 $
+** $DateTime: 2010/01/11 19:40:05 $$Author: bbarber $
**
****************************************************************************/
@@ -476,33 +476,6 @@ t_io()
// QCOMPARE(s.count(QRegExp("f\\d")), 3*7 + 13*3*2);
}//t_io
-//FIXUP -- Move conditional, QhullPoints code to QhullPoints.cpp
-#ifndef QHULL_NO_STL
-std::vector<QhullPoint> QhullPoints::
-toStdVector() const
-{
- QhullPointsIterator i(*this);
- std::vector<QhullPoint> vs;
- while(i.hasNext()){
- vs.push_back(i.next());
- }
- return vs;
-}//toStdVector
-#endif //QHULL_NO_STL
-
-#ifdef QHULL_USES_QT
-QList<QhullPoint> QhullPoints::
-toQList() const
-{
- QhullPointsIterator i(*this);
- QList<QhullPoint> vs;
- while(i.hasNext()){
- vs.append(i.next());
- }
- return vs;
-}//toQList
-#endif //QHULL_USES_QT
-
}//orgQhull
#include "moc/QhullPoints_test.moc"
diff --git a/cpp/qhulltest/UsingLibQhull_test.cpp b/cpp/qhulltest/UsingLibQhull_test.cpp
index 0e8a2cc..5d6f15d 100644
--- a/cpp/qhulltest/UsingLibQhull_test.cpp
+++ b/cpp/qhulltest/UsingLibQhull_test.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/qhulltest/UsingLibQhull_test.cpp#5 $$Change: 1139 $
-** $DateTime: 2010/01/03 11:20:29 $$Author: bbarber $
+** $Id: //product/qhull/main/rel/cpp/qhulltest/UsingLibQhull_test.cpp#6 $$Change: 1176 $
+** $DateTime: 2010/01/11 19:40:05 $$Author: bbarber $
**
****************************************************************************/
@@ -203,8 +203,6 @@ t_cleanuptestcase()
UsingLibQhull::unsetGlobals();
}//t_cleanuptestcase
-
-
}//orgQhull
#include "moc/UsingLibQhull_test.moc"
diff --git a/cpp/qt-qhull.cpp b/cpp/qt-qhull.cpp
new file mode 100644
index 0000000..2e29948
--- /dev/null
+++ b/cpp/qt-qhull.cpp
@@ -0,0 +1,128 @@
+/****************************************************************************
+**
+** Copyright (C) 2009-2010 C.B. Barber. All rights reserved.
+** $Id: //product/qhull/main/rel/cpp/qt-qhull.cpp#1 $$Change: 1176 $
+** $DateTime: 2010/01/11 19:40:05 $$Author: bbarber $
+**
+****************************************************************************/
+
+#include <QList>
+
+#include "Coordinates.h"
+#include "QhullFacetList.h"
+#include "QhullFacetSet.h"
+#include "QhullHyperplane.h"
+#include "QhullPoint.h"
+#include "QhullPoints.h"
+#include "QhullPointSet.h"
+#include "QhullVertex.h"
+#include "QhullVertexSet.h"
+
+namespace orgQhull {
+
+#//Conversions
+
+#ifndef QHULL_USES_QT
+#error Compile with QHULL_USES_QT defined
+#endif
+
+QList<coordT> Coordinates::
+toQList() const
+{
+ CoordinatesIterator i(*this);
+ QList<coordT> cs;
+ while(i.hasNext()){
+ cs.append(i.next());
+ }
+ return cs;
+}//toQList
+
+QList<QhullFacet> QhullFacetList::
+toQList() const
+{
+ QhullLinkedListIterator<QhullFacet> i(*this);
+ QList<QhullFacet> vs;
+ while(i.hasNext()){
+ QhullFacet f= i.next();
+ if(isSelectAll() || f.isGood()){
+ vs.append(f);
+ }
+ }
+ return vs;
+}//toQList
+
+//! Same as PrintVertices
+QList<QhullVertex> QhullFacetList::
+vertices_toQList(int qhRunId) const
+{
+ QList<QhullVertex> vs;
+ QhullVertexSet qvs(qhRunId, first().getFacetT(), NULL, isSelectAll());
+ for(QhullVertexSet::iterator i=qvs.begin(); i!=qvs.end(); ++i){
+ vs.push_back(*i);
+ }
+ return vs;
+}//vertices_toQList
+
+QList<QhullFacet> QhullFacetSet::
+toQList() const
+{
+ QhullSetIterator<QhullFacet> i(*this);
+ QList<QhullFacet> vs;
+ while(i.hasNext()){
+ QhullFacet f= i.next();
+ if(isSelectAll() || f.isGood()){
+ vs.append(f);
+ }
+ }
+ return vs;
+}//toQList
+
+#ifdef QHULL_USES_QT
+QList<coordT> QhullHyperplane::
+toQList() const
+{
+ QhullHyperplaneIterator i(*this);
+ QList<coordT> fs;
+ while(i.hasNext()){
+ fs.append(i.next());
+ }
+ fs.append(hyperplane_offset);
+ return fs;
+}//toQList
+#endif //QHULL_USES_QT
+
+QList<coordT> QhullPoint::
+toQList() const
+{
+ QhullPointIterator i(*this);
+ QList<coordT> vs;
+ while(i.hasNext()){
+ vs.append(i.next());
+ }
+ return vs;
+}//toQList
+
+QList<QhullPoint> QhullPoints::
+toQList() const
+{
+ QhullPointsIterator i(*this);
+ QList<QhullPoint> vs;
+ while(i.hasNext()){
+ vs.append(i.next());
+ }
+ return vs;
+}//toQList
+
+QList<QhullPoint> QhullPointSet::
+toQList() const
+{
+ QhullPointSetIterator i(*this);
+ QList<QhullPoint> vs;
+ while(i.hasNext()){
+ vs.append(i.next());
+ }
+ return vs;
+}//toQList
+
+}//orgQhull
+
diff --git a/cpp/road/RoadTest.h b/cpp/road/RoadTest.h
index d0b340c..f44ef7d 100644
--- a/cpp/road/RoadTest.h
+++ b/cpp/road/RoadTest.h
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/road/RoadTest.h#15 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //product/qhull/main/rel/cpp/road/RoadTest.h#16 $$Change: 1176 $
+** $DateTime: 2010/01/11 19:40:05 $$Author: bbarber $
**
****************************************************************************/
@@ -10,10 +10,9 @@
#define ROADTEST_H
//pre-compiled with RoadTest.h
-#include <QObject>
+#include <QObject> // Qt C++ Framework
#include <QtTest/QtTest>
-//FIXUP -- test that compiler sets QHULL_USES_QT.
#define QHULL_USES_QT 1
namespace orgQhull {
diff --git a/project/libqhullp.vcproj b/project/libqhullp.vcproj
new file mode 100644
index 0000000..e11ff13
--- /dev/null
+++ b/project/libqhullp.vcproj
@@ -0,0 +1,229 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="libqhullp"
+ ProjectGUID="{346B4633-5623-47A0-AA35-63966AC20B03}"
+ RootNamespace="libqhullp"
+ Keyword="Win32Proj"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory=".."
+ IntermediateDirectory="../tmp/$(ConfigurationName)"
+ ConfigurationType="4"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB;qh_QHpointer=1"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory=".."
+ IntermediateDirectory="..\tmp\$(ConfigurationName)"
+ ConfigurationType="4"
+ CharacterSet="1"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
+ <File
+ RelativePath="..\src\geom.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\geom2.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\global.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\io.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\libqhull.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\mem.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\merge.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\poly.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\poly2.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\random.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\rboxlib.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\stat.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\user.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\usermem.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\userprintf.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ >
+ </Filter>
+ <File
+ RelativePath=".\ReadMe.txt"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/project/qhull.sln b/project/qhull.sln
index 6fb7f61..6772c01 100644
--- a/project/qhull.sln
+++ b/project/qhull.sln
@@ -1,133 +1,85 @@
Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qhull", "qhull.vcproj", "{DEB5D824-712C-47C7-BE7E-E0A866373C26}"
- ProjectSection(ProjectDependencies) = postProject
- {D1377F6B-7868-460C-9FC5-489C32A3D08F} = {D1377F6B-7868-460C-9FC5-489C32A3D08F}
- EndProjectSection
ProjectSection(WebsiteProperties) = preProject
- Debug.AspNetCompiler.Debug = "True"
- Release.AspNetCompiler.Debug = "False"
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libqhull", "libqhull.vcproj", "{D1377F6B-7868-460C-9FC5-489C32A3D08F}"
ProjectSection(WebsiteProperties) = preProject
- Debug.AspNetCompiler.Debug = "True"
- Release.AspNetCompiler.Debug = "False"
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rbox", "rbox.vcproj", "{D137FB9B-7868-460C-9FC5-489C32A3D08F}"
- ProjectSection(ProjectDependencies) = postProject
- {D1377F6B-7868-460C-9FC5-489C32A3D08F} = {D1377F6B-7868-460C-9FC5-489C32A3D08F}
- EndProjectSection
ProjectSection(WebsiteProperties) = preProject
- Debug.AspNetCompiler.Debug = "True"
- Release.AspNetCompiler.Debug = "False"
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qhullcpp", "qhullcpp.vcproj", "{83B9A40B-EA6E-4DD8-A9D5-D51FFA0B5F49}"
- ProjectSection(ProjectDependencies) = postProject
- {D1377F6B-7868-460C-9FC5-489C32A3D08F} = {D1377F6B-7868-460C-9FC5-489C32A3D08F}
- EndProjectSection
ProjectSection(WebsiteProperties) = preProject
- Debug.AspNetCompiler.Debug = "True"
- Release.AspNetCompiler.Debug = "False"
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "user_eg3", "user_eg3.vcproj", "{B94D6587-1030-4EA0-8322-E9B2902A9AC4}"
ProjectSection(ProjectDependencies) = postProject
- {D1377F6B-7868-460C-9FC5-489C32A3D08F} = {D1377F6B-7868-460C-9FC5-489C32A3D08F}
- {83B9A40B-EA6E-4DD8-A9D5-D51FFA0B5F49} = {83B9A40B-EA6E-4DD8-A9D5-D51FFA0B5F49}
+ {346B4633-5623-47A0-AA35-63966AC20B03} = {346B4633-5623-47A0-AA35-63966AC20B03}
EndProjectSection
ProjectSection(WebsiteProperties) = preProject
- Debug.AspNetCompiler.Debug = "True"
- Release.AspNetCompiler.Debug = "False"
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qhulltest", "qhulltest.vcproj", "{AFDCA33D-3D74-3866-BAE1-97033FE213AA}"
- GlobalSection(Qt) = preSolution
- Integration = True
- EndGlobalSection
- ProjectSection(ProjectDependencies) = postProject
- {83B9A40B-EA6E-4DD8-A9D5-D51FFA0B5F49} = {83B9A40B-EA6E-4DD8-A9D5-D51FFA0B5F49}
- {D1377F6B-7868-460C-9FC5-489C32A3D08F} = {D1377F6B-7868-460C-9FC5-489C32A3D08F}
- EndProjectSection
ProjectSection(WebsiteProperties) = preProject
- Debug.AspNetCompiler.Debug = "True"
- Release.AspNetCompiler.Debug = "False"
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libqhullp", "libqhullp.vcproj", "{346B4633-5623-47A0-AA35-63966AC20B03}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Debug|Mixed Platforms = Debug|Mixed Platforms
Debug|Win32 = Debug|Win32
- Release|Any CPU = Release|Any CPU
- Release|Mixed Platforms = Release|Mixed Platforms
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {DEB5D824-712C-47C7-BE7E-E0A866373C26}.Debug|Any CPU.ActiveCfg = Debug|Win32
- {DEB5D824-712C-47C7-BE7E-E0A866373C26}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
- {DEB5D824-712C-47C7-BE7E-E0A866373C26}.Debug|Mixed Platforms.Build.0 = Debug|Win32
{DEB5D824-712C-47C7-BE7E-E0A866373C26}.Debug|Win32.ActiveCfg = Debug|Win32
{DEB5D824-712C-47C7-BE7E-E0A866373C26}.Debug|Win32.Build.0 = Debug|Win32
- {DEB5D824-712C-47C7-BE7E-E0A866373C26}.Release|Any CPU.ActiveCfg = Release|Win32
- {DEB5D824-712C-47C7-BE7E-E0A866373C26}.Release|Mixed Platforms.ActiveCfg = Release|Win32
- {DEB5D824-712C-47C7-BE7E-E0A866373C26}.Release|Mixed Platforms.Build.0 = Release|Win32
{DEB5D824-712C-47C7-BE7E-E0A866373C26}.Release|Win32.ActiveCfg = Release|Win32
{DEB5D824-712C-47C7-BE7E-E0A866373C26}.Release|Win32.Build.0 = Release|Win32
- {D1377F6B-7868-460C-9FC5-489C32A3D08F}.Debug|Any CPU.ActiveCfg = Debug|Win32
- {D1377F6B-7868-460C-9FC5-489C32A3D08F}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
- {D1377F6B-7868-460C-9FC5-489C32A3D08F}.Debug|Mixed Platforms.Build.0 = Debug|Win32
{D1377F6B-7868-460C-9FC5-489C32A3D08F}.Debug|Win32.ActiveCfg = Debug|Win32
{D1377F6B-7868-460C-9FC5-489C32A3D08F}.Debug|Win32.Build.0 = Debug|Win32
- {D1377F6B-7868-460C-9FC5-489C32A3D08F}.Release|Any CPU.ActiveCfg = Release|Win32
- {D1377F6B-7868-460C-9FC5-489C32A3D08F}.Release|Mixed Platforms.ActiveCfg = Release|Win32
- {D1377F6B-7868-460C-9FC5-489C32A3D08F}.Release|Mixed Platforms.Build.0 = Release|Win32
{D1377F6B-7868-460C-9FC5-489C32A3D08F}.Release|Win32.ActiveCfg = Release|Win32
{D1377F6B-7868-460C-9FC5-489C32A3D08F}.Release|Win32.Build.0 = Release|Win32
- {D137FB9B-7868-460C-9FC5-489C32A3D08F}.Debug|Any CPU.ActiveCfg = Debug|Win32
- {D137FB9B-7868-460C-9FC5-489C32A3D08F}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
- {D137FB9B-7868-460C-9FC5-489C32A3D08F}.Debug|Mixed Platforms.Build.0 = Debug|Win32
{D137FB9B-7868-460C-9FC5-489C32A3D08F}.Debug|Win32.ActiveCfg = Debug|Win32
{D137FB9B-7868-460C-9FC5-489C32A3D08F}.Debug|Win32.Build.0 = Debug|Win32
- {D137FB9B-7868-460C-9FC5-489C32A3D08F}.Release|Any CPU.ActiveCfg = Release|Win32
- {D137FB9B-7868-460C-9FC5-489C32A3D08F}.Release|Mixed Platforms.ActiveCfg = Release|Win32
- {D137FB9B-7868-460C-9FC5-489C32A3D08F}.Release|Mixed Platforms.Build.0 = Release|Win32
{D137FB9B-7868-460C-9FC5-489C32A3D08F}.Release|Win32.ActiveCfg = Release|Win32
{D137FB9B-7868-460C-9FC5-489C32A3D08F}.Release|Win32.Build.0 = Release|Win32
- {83B9A40B-EA6E-4DD8-A9D5-D51FFA0B5F49}.Debug|Any CPU.ActiveCfg = Debug|Win32
- {83B9A40B-EA6E-4DD8-A9D5-D51FFA0B5F49}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
- {83B9A40B-EA6E-4DD8-A9D5-D51FFA0B5F49}.Debug|Mixed Platforms.Build.0 = Debug|Win32
{83B9A40B-EA6E-4DD8-A9D5-D51FFA0B5F49}.Debug|Win32.ActiveCfg = Debug|Win32
{83B9A40B-EA6E-4DD8-A9D5-D51FFA0B5F49}.Debug|Win32.Build.0 = Debug|Win32
- {83B9A40B-EA6E-4DD8-A9D5-D51FFA0B5F49}.Release|Any CPU.ActiveCfg = Release|Win32
- {83B9A40B-EA6E-4DD8-A9D5-D51FFA0B5F49}.Release|Mixed Platforms.ActiveCfg = Release|Win32
- {83B9A40B-EA6E-4DD8-A9D5-D51FFA0B5F49}.Release|Mixed Platforms.Build.0 = Release|Win32
{83B9A40B-EA6E-4DD8-A9D5-D51FFA0B5F49}.Release|Win32.ActiveCfg = Release|Win32
{83B9A40B-EA6E-4DD8-A9D5-D51FFA0B5F49}.Release|Win32.Build.0 = Release|Win32
- {B94D6587-1030-4EA0-8322-E9B2902A9AC4}.Debug|Any CPU.ActiveCfg = Debug|Win32
- {B94D6587-1030-4EA0-8322-E9B2902A9AC4}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
- {B94D6587-1030-4EA0-8322-E9B2902A9AC4}.Debug|Mixed Platforms.Build.0 = Debug|Win32
{B94D6587-1030-4EA0-8322-E9B2902A9AC4}.Debug|Win32.ActiveCfg = Debug|Win32
{B94D6587-1030-4EA0-8322-E9B2902A9AC4}.Debug|Win32.Build.0 = Debug|Win32
- {B94D6587-1030-4EA0-8322-E9B2902A9AC4}.Release|Any CPU.ActiveCfg = Release|Win32
- {B94D6587-1030-4EA0-8322-E9B2902A9AC4}.Release|Mixed Platforms.ActiveCfg = Release|Win32
- {B94D6587-1030-4EA0-8322-E9B2902A9AC4}.Release|Mixed Platforms.Build.0 = Release|Win32
{B94D6587-1030-4EA0-8322-E9B2902A9AC4}.Release|Win32.ActiveCfg = Release|Win32
{B94D6587-1030-4EA0-8322-E9B2902A9AC4}.Release|Win32.Build.0 = Release|Win32
- {AFDCA33D-3D74-3866-BAE1-97033FE213AA}.Debug|Any CPU.ActiveCfg = Debug|Win32
- {AFDCA33D-3D74-3866-BAE1-97033FE213AA}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
- {AFDCA33D-3D74-3866-BAE1-97033FE213AA}.Debug|Mixed Platforms.Build.0 = Debug|Win32
{AFDCA33D-3D74-3866-BAE1-97033FE213AA}.Debug|Win32.ActiveCfg = Debug|Win32
{AFDCA33D-3D74-3866-BAE1-97033FE213AA}.Debug|Win32.Build.0 = Debug|Win32
- {AFDCA33D-3D74-3866-BAE1-97033FE213AA}.Release|Any CPU.ActiveCfg = Release|Win32
- {AFDCA33D-3D74-3866-BAE1-97033FE213AA}.Release|Mixed Platforms.ActiveCfg = Release|Win32
- {AFDCA33D-3D74-3866-BAE1-97033FE213AA}.Release|Mixed Platforms.Build.0 = Release|Win32
{AFDCA33D-3D74-3866-BAE1-97033FE213AA}.Release|Win32.ActiveCfg = Release|Win32
{AFDCA33D-3D74-3866-BAE1-97033FE213AA}.Release|Win32.Build.0 = Release|Win32
+ {346B4633-5623-47A0-AA35-63966AC20B03}.Debug|Win32.ActiveCfg = Debug|Win32
+ {346B4633-5623-47A0-AA35-63966AC20B03}.Debug|Win32.Build.0 = Debug|Win32
+ {346B4633-5623-47A0-AA35-63966AC20B03}.Release|Win32.ActiveCfg = Release|Win32
+ {346B4633-5623-47A0-AA35-63966AC20B03}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
+ GlobalSection(Qt) = preSolution
+ Integration = True
+ EndGlobalSection
EndGlobal
diff --git a/project/qhull.vcproj b/project/qhull.vcproj
index 51b61a2..29bb729 100644
--- a/project/qhull.vcproj
+++ b/project/qhull.vcproj
@@ -209,11 +209,11 @@
Filter="h;hpp;hxx;hm;inl"
>
<File
- RelativePath="..\src\mem.h"
+ RelativePath="..\src\libqhull.h"
>
</File>
<File
- RelativePath="..\src\libqhull.h"
+ RelativePath="..\src\mem.h"
>
</File>
<File
diff --git a/project/qhullcpp.vcproj b/project/qhullcpp.vcproj
index 4774c84..36a3b0e 100644
--- a/project/qhullcpp.vcproj
+++ b/project/qhullcpp.vcproj
@@ -121,7 +121,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\cpp,..\..\cpp,..\src,..\..\src,..\tmp,..\..\tmp"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;qh_QHpointer=1"
GeneratePreprocessedFile="0"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -275,6 +275,10 @@
RelativePath="..\cpp\functionObjects.h"
>
</File>
+ <File
+ RelativePath="..\src\libqhull.h"
+ >
+ </File>
<File
RelativePath="..\src\mem.h"
>
@@ -319,10 +323,6 @@
RelativePath="..\cpp\QhullIterator.h"
>
</File>
- <File
- RelativePath="..\src\libqhull.h"
- >
- </File>
<File
RelativePath="..\cpp\QhullLinkedList.h"
>
diff --git a/project/qhulltest.vcproj b/project/qhulltest.vcproj
index 93b1e4b..fc4769e 100644
--- a/project/qhulltest.vcproj
+++ b/project/qhulltest.vcproj
@@ -46,7 +46,7 @@
AdditionalOptions="-Zm200 -EHsc -w34100 -w34189"
Optimization="4"
AdditionalIncludeDirectories=".,..\cpp,..\..\cpp,..\src,..\..\src,..\tmp,..\..\tmp,"$(QTDIR)\include\QtCore","$(QTDIR)\include","$(QTDIR)\include\QtTest",$(QTDIR)\mkspecs\win32-msvc2005"
- PreprocessorDefinitions="UNICODE,WIN32,QT_LARGEFILE_SUPPORT,QT_DLL,QT_CORE_LIB,QT_THREAD_SUPPORT"
+ PreprocessorDefinitions="qh_QHpointer=1;QHULL_USES_QT;UNICODE,WIN32,QT_LARGEFILE_SUPPORT,QT_DLL,QT_CORE_LIB,QT_THREAD_SUPPORT"
GeneratePreprocessedFile="0"
RuntimeLibrary="3"
BufferSecurityCheck="false"
@@ -274,6 +274,18 @@
RelativePath="..\cpp\qhulltest\QhullVertex_test.cpp"
>
</File>
+ <File
+ RelativePath="..\cpp\qt-qhull.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="0"
+ />
+ </FileConfiguration>
+ </File>
<File
RelativePath="..\cpp\qhulltest\RboxPoints_test.cpp"
>
@@ -301,7 +313,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Moc'ing RoadTest.h..."
- CommandLine=""$(QTDIR)\bin\moc.exe" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I".\." -I".\..\cpp\." -I".\..\..\cpp\." -I".\..\src\." -I".\..\..\src\." -I".\..\tmp\." -I".\..\..\tmp\." -I"$(QTDIR)\include\QtCore\." -I"$(QTDIR)\include\." -I"$(QTDIR)\include\QtTest\." -I"$(QTDIR)\mkspecs\win32-msvc2005\." "..\cpp\road\RoadTest.h" -o ".\..\tmp\moc\moc_RoadTest.cpp" "-f../road/RoadTest.h" "-f..\..\cpp\road\RoadTest.h"
"
+ CommandLine=""$(QTDIR)\bin\moc.exe" -Dqh_QHpointer=1 -DQHULL_USES_QT -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I".\." -I".\..\cpp\." -I".\..\..\cpp\." -I".\..\src\." -I".\..\..\src\." -I".\..\tmp\." -I".\..\..\tmp\." -I"$(QTDIR)\include\QtCore\." -I"$(QTDIR)\include\." -I"$(QTDIR)\include\QtTest\." -I"$(QTDIR)\mkspecs\win32-msvc2005\." "..\cpp\road\RoadTest.h" -o ".\..\tmp\moc\moc_RoadTest.cpp" "-f../road/RoadTest.h" "-f..\..\cpp\road\RoadTest.h"
"
AdditionalDependencies=""$(QTDIR)\bin\moc.exe";..\cpp\road\RoadTest.h"
Outputs="".\..\tmp\moc\moc_RoadTest.cpp""
/>
@@ -333,7 +345,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Moc'ing Coordinates_test.cpp..."
- CommandLine=""$(QTDIR)\bin\moc.exe" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I".\." -I".\..\cpp\." -I".\..\..\cpp\." -I".\..\src\." -I".\..\..\src\." -I".\..\tmp\." -I".\..\..\tmp\." -I"$(QTDIR)\include\QtCore\." -I"$(QTDIR)\include\." -I"$(QTDIR)\include\QtTest\." -I"$(QTDIR)\mkspecs\win32-msvc2005\." "..\cpp\qhulltest\Coordinates_test.cpp" -o ".\..\tmp\moc\Coordinates_test.moc"
"
+ CommandLine=""$(QTDIR)\bin\moc.exe" -Dqh_QHpointer=1 -DQHULL_USES_QT -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I".\." -I".\..\cpp\." -I".\..\..\cpp\." -I".\..\src\." -I".\..\..\src\." -I".\..\tmp\." -I".\..\..\tmp\." -I"$(QTDIR)\include\QtCore\." -I"$(QTDIR)\include\." -I"$(QTDIR)\include\QtTest\." -I"$(QTDIR)\mkspecs\win32-msvc2005\." "..\cpp\qhulltest\Coordinates_test.cpp" -o ".\..\tmp\moc\Coordinates_test.moc"
"
AdditionalDependencies=""$(QTDIR)\bin\moc.exe";..\cpp\qhulltest\Coordinates_test.cpp"
Outputs="".\..\tmp\moc\Coordinates_test.moc""
/>
@@ -355,7 +367,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Moc'ing PointCoordinates_test.cpp..."
- CommandLine=""$(QTDIR)\bin\moc.exe" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I".\." -I".\..\cpp\." -I".\..\..\cpp\." -I".\..\src\." -I".\..\..\src\." -I".\..\tmp\." -I".\..\..\tmp\." -I"$(QTDIR)\include\QtCore\." -I"$(QTDIR)\include\." -I"$(QTDIR)\include\QtTest\." -I"$(QTDIR)\mkspecs\win32-msvc2005\." "..\cpp\qhulltest\PointCoordinates_test.cpp" -o ".\..\tmp\moc\PointCoordinates_test.moc"
"
+ CommandLine=""$(QTDIR)\bin\moc.exe" -Dqh_QHpointer=1 -DQHULL_USES_QT -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I".\." -I".\..\cpp\." -I".\..\..\cpp\." -I".\..\src\." -I".\..\..\src\." -I".\..\tmp\." -I".\..\..\tmp\." -I"$(QTDIR)\include\QtCore\." -I"$(QTDIR)\include\." -I"$(QTDIR)\include\QtTest\." -I"$(QTDIR)\mkspecs\win32-msvc2005\." "..\cpp\qhulltest\PointCoordinates_test.cpp" -o ".\..\tmp\moc\PointCoordinates_test.moc"
"
AdditionalDependencies=""$(QTDIR)\bin\moc.exe";..\cpp\qhulltest\PointCoordinates_test.cpp"
Outputs="".\..\tmp\moc\PointCoordinates_test.moc""
/>
@@ -381,7 +393,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Moc'ing Qhull_test.cpp..."
- CommandLine=""$(QTDIR)\bin\moc.exe" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I".\." -I".\..\cpp\." -I".\..\..\cpp\." -I".\..\src\." -I".\..\..\src\." -I".\..\tmp\." -I".\..\..\tmp\." -I"$(QTDIR)\include\QtCore\." -I"$(QTDIR)\include\." -I"$(QTDIR)\include\QtTest\." -I"$(QTDIR)\mkspecs\win32-msvc2005\." "..\cpp\qhulltest\Qhull_test.cpp" -o ".\..\tmp\moc\Qhull_test.moc"
"
+ CommandLine=""$(QTDIR)\bin\moc.exe" -Dqh_QHpointer=1 -DQHULL_USES_QT -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I".\." -I".\..\cpp\." -I".\..\..\cpp\." -I".\..\src\." -I".\..\..\src\." -I".\..\tmp\." -I".\..\..\tmp\." -I"$(QTDIR)\include\QtCore\." -I"$(QTDIR)\include\." -I"$(QTDIR)\include\QtTest\." -I"$(QTDIR)\mkspecs\win32-msvc2005\." "..\cpp\qhulltest\Qhull_test.cpp" -o ".\..\tmp\moc\Qhull_test.moc"
"
AdditionalDependencies=""$(QTDIR)\bin\moc.exe";..\cpp\qhulltest\Qhull_test.cpp"
Outputs="".\..\tmp\moc\Qhull_test.moc""
/>
@@ -403,7 +415,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Moc'ing QhullFacet_test.cpp..."
- CommandLine=""$(QTDIR)\bin\moc.exe" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I".\." -I".\..\cpp\." -I".\..\..\cpp\." -I".\..\src\." -I".\..\..\src\." -I".\..\tmp\." -I".\..\..\tmp\." -I"$(QTDIR)\include\QtCore\." -I"$(QTDIR)\include\." -I"$(QTDIR)\include\QtTest\." -I"$(QTDIR)\mkspecs\win32-msvc2005\." "..\cpp\qhulltest\QhullFacet_test.cpp" -o ".\..\tmp\moc\QhullFacet_test.moc"
"
+ CommandLine=""$(QTDIR)\bin\moc.exe" -Dqh_QHpointer=1 -DQHULL_USES_QT -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I".\." -I".\..\cpp\." -I".\..\..\cpp\." -I".\..\src\." -I".\..\..\src\." -I".\..\tmp\." -I".\..\..\tmp\." -I"$(QTDIR)\include\QtCore\." -I"$(QTDIR)\include\." -I"$(QTDIR)\include\QtTest\." -I"$(QTDIR)\mkspecs\win32-msvc2005\." "..\cpp\qhulltest\QhullFacet_test.cpp" -o ".\..\tmp\moc\QhullFacet_test.moc"
"
AdditionalDependencies=""$(QTDIR)\bin\moc.exe";..\cpp\qhulltest\QhullFacet_test.cpp"
Outputs="".\..\tmp\moc\QhullFacet_test.moc""
/>
@@ -425,7 +437,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Moc'ing QhullFacetList_test.cpp..."
- CommandLine=""$(QTDIR)\bin\moc.exe" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I".\." -I".\..\cpp\." -I".\..\..\cpp\." -I".\..\src\." -I".\..\..\src\." -I".\..\tmp\." -I".\..\..\tmp\." -I"$(QTDIR)\include\QtCore\." -I"$(QTDIR)\include\." -I"$(QTDIR)\include\QtTest\." -I"$(QTDIR)\mkspecs\win32-msvc2005\." "..\cpp\qhulltest\QhullFacetList_test.cpp" -o ".\..\tmp\moc\QhullFacetList_test.moc"
"
+ CommandLine=""$(QTDIR)\bin\moc.exe" -Dqh_QHpointer=1 -DQHULL_USES_QT -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I".\." -I".\..\cpp\." -I".\..\..\cpp\." -I".\..\src\." -I".\..\..\src\." -I".\..\tmp\." -I".\..\..\tmp\." -I"$(QTDIR)\include\QtCore\." -I"$(QTDIR)\include\." -I"$(QTDIR)\include\QtTest\." -I"$(QTDIR)\mkspecs\win32-msvc2005\." "..\cpp\qhulltest\QhullFacetList_test.cpp" -o ".\..\tmp\moc\QhullFacetList_test.moc"
"
AdditionalDependencies=""$(QTDIR)\bin\moc.exe";..\cpp\qhulltest\QhullFacetList_test.cpp"
Outputs="".\..\tmp\moc\QhullFacetList_test.moc""
/>
@@ -447,7 +459,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Moc'ing QhullFacetSet_test.cpp..."
- CommandLine=""$(QTDIR)\bin\moc.exe" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I".\." -I".\..\cpp\." -I".\..\..\cpp\." -I".\..\src\." -I".\..\..\src\." -I".\..\tmp\." -I".\..\..\tmp\." -I"$(QTDIR)\include\QtCore\." -I"$(QTDIR)\include\." -I"$(QTDIR)\include\QtTest\." -I"$(QTDIR)\mkspecs\win32-msvc2005\." "..\cpp\qhulltest\QhullFacetSet_test.cpp" -o ".\..\tmp\moc\QhullFacetSet_test.moc"
"
+ CommandLine=""$(QTDIR)\bin\moc.exe" -Dqh_QHpointer=1 -DQHULL_USES_QT -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I".\." -I".\..\cpp\." -I".\..\..\cpp\." -I".\..\src\." -I".\..\..\src\." -I".\..\tmp\." -I".\..\..\tmp\." -I"$(QTDIR)\include\QtCore\." -I"$(QTDIR)\include\." -I"$(QTDIR)\include\QtTest\." -I"$(QTDIR)\mkspecs\win32-msvc2005\." "..\cpp\qhulltest\QhullFacetSet_test.cpp" -o ".\..\tmp\moc\QhullFacetSet_test.moc"
"
AdditionalDependencies=""$(QTDIR)\bin\moc.exe";..\cpp\qhulltest\QhullFacetSet_test.cpp"
Outputs="".\..\tmp\moc\QhullFacetSet_test.moc""
/>
@@ -469,7 +481,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Moc'ing QhullHyperplane_test.cpp..."
- CommandLine=""$(QTDIR)\bin\moc.exe" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I".\." -I".\..\cpp\." -I".\..\..\cpp\." -I".\..\src\." -I".\..\..\src\." -I".\..\tmp\." -I".\..\..\tmp\." -I"$(QTDIR)\include\QtCore\." -I"$(QTDIR)\include\." -I"$(QTDIR)\include\QtTest\." -I"$(QTDIR)\mkspecs\win32-msvc2005\." "..\cpp\qhulltest\QhullHyperplane_test.cpp" -o ".\..\tmp\moc\QhullHyperplane_test.moc"
"
+ CommandLine=""$(QTDIR)\bin\moc.exe" -Dqh_QHpointer=1 -DQHULL_USES_QT -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I".\." -I".\..\cpp\." -I".\..\..\cpp\." -I".\..\src\." -I".\..\..\src\." -I".\..\tmp\." -I".\..\..\tmp\." -I"$(QTDIR)\include\QtCore\." -I"$(QTDIR)\include\." -I"$(QTDIR)\include\QtTest\." -I"$(QTDIR)\mkspecs\win32-msvc2005\." "..\cpp\qhulltest\QhullHyperplane_test.cpp" -o ".\..\tmp\moc\QhullHyperplane_test.moc"
"
AdditionalDependencies=""$(QTDIR)\bin\moc.exe";..\cpp\qhulltest\QhullHyperplane_test.cpp"
Outputs="".\..\tmp\moc\QhullHyperplane_test.moc""
/>
@@ -495,7 +507,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Moc'ing QhullLinkedList_test.cpp..."
- CommandLine=""$(QTDIR)\bin\moc.exe" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I".\." -I".\..\cpp\." -I".\..\..\cpp\." -I".\..\src\." -I".\..\..\src\." -I".\..\tmp\." -I".\..\..\tmp\." -I"$(QTDIR)\include\QtCore\." -I"$(QTDIR)\include\." -I"$(QTDIR)\include\QtTest\." -I"$(QTDIR)\mkspecs\win32-msvc2005\." "..\cpp\qhulltest\QhullLinkedList_test.cpp" -o ".\..\tmp\moc\QhullLinkedList_test.moc"
"
+ CommandLine=""$(QTDIR)\bin\moc.exe" -Dqh_QHpointer=1 -DQHULL_USES_QT -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I".\." -I".\..\cpp\." -I".\..\..\cpp\." -I".\..\src\." -I".\..\..\src\." -I".\..\tmp\." -I".\..\..\tmp\." -I"$(QTDIR)\include\QtCore\." -I"$(QTDIR)\include\." -I"$(QTDIR)\include\QtTest\." -I"$(QTDIR)\mkspecs\win32-msvc2005\." "..\cpp\qhulltest\QhullLinkedList_test.cpp" -o ".\..\tmp\moc\QhullLinkedList_test.moc"
"
AdditionalDependencies=""$(QTDIR)\bin\moc.exe";..\cpp\qhulltest\QhullLinkedList_test.cpp"
Outputs="".\..\tmp\moc\QhullLinkedList_test.moc""
/>
@@ -517,7 +529,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Moc'ing QhullPoint_test.cpp..."
- CommandLine=""$(QTDIR)\bin\moc.exe" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I".\." -I".\..\cpp\." -I".\..\..\cpp\." -I".\..\src\." -I".\..\..\src\." -I".\..\tmp\." -I".\..\..\tmp\." -I"$(QTDIR)\include\QtCore\." -I"$(QTDIR)\include\." -I"$(QTDIR)\include\QtTest\." -I"$(QTDIR)\mkspecs\win32-msvc2005\." "..\cpp\qhulltest\QhullPoint_test.cpp" -o ".\..\tmp\moc\QhullPoint_test.moc"
"
+ CommandLine=""$(QTDIR)\bin\moc.exe" -Dqh_QHpointer=1 -DQHULL_USES_QT -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I".\." -I".\..\cpp\." -I".\..\..\cpp\." -I".\..\src\." -I".\..\..\src\." -I".\..\tmp\." -I".\..\..\tmp\." -I"$(QTDIR)\include\QtCore\." -I"$(QTDIR)\include\." -I"$(QTDIR)\include\QtTest\." -I"$(QTDIR)\mkspecs\win32-msvc2005\." "..\cpp\qhulltest\QhullPoint_test.cpp" -o ".\..\tmp\moc\QhullPoint_test.moc"
"
AdditionalDependencies=""$(QTDIR)\bin\moc.exe";..\cpp\qhulltest\QhullPoint_test.cpp"
Outputs="".\..\tmp\moc\QhullPoint_test.moc""
/>
@@ -539,7 +551,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Moc'ing QhullPoints_test.cpp..."
- CommandLine=""$(QTDIR)\bin\moc.exe" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I".\." -I".\..\cpp\." -I".\..\..\cpp\." -I".\..\src\." -I".\..\..\src\." -I".\..\tmp\." -I".\..\..\tmp\." -I"$(QTDIR)\include\QtCore\." -I"$(QTDIR)\include\." -I"$(QTDIR)\include\QtTest\." -I"$(QTDIR)\mkspecs\win32-msvc2005\." "..\cpp\qhulltest\QhullPoints_test.cpp" -o ".\..\tmp\moc\QhullPoints_test.moc"
"
+ CommandLine=""$(QTDIR)\bin\moc.exe" -Dqh_QHpointer=1 -DQHULL_USES_QT -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I".\." -I".\..\cpp\." -I".\..\..\cpp\." -I".\..\src\." -I".\..\..\src\." -I".\..\tmp\." -I".\..\..\tmp\." -I"$(QTDIR)\include\QtCore\." -I"$(QTDIR)\include\." -I"$(QTDIR)\include\QtTest\." -I"$(QTDIR)\mkspecs\win32-msvc2005\." "..\cpp\qhulltest\QhullPoints_test.cpp" -o ".\..\tmp\moc\QhullPoints_test.moc"
"
AdditionalDependencies=""$(QTDIR)\bin\moc.exe";..\cpp\qhulltest\QhullPoints_test.cpp"
Outputs="".\..\tmp\moc\QhullPoints_test.moc""
/>
@@ -561,7 +573,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Moc'ing QhullPointSet_test.cpp..."
- CommandLine=""$(QTDIR)\bin\moc.exe" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I".\." -I".\..\cpp\." -I".\..\..\cpp\." -I".\..\src\." -I".\..\..\src\." -I".\..\tmp\." -I".\..\..\tmp\." -I"$(QTDIR)\include\QtCore\." -I"$(QTDIR)\include\." -I"$(QTDIR)\include\QtTest\." -I"$(QTDIR)\mkspecs\win32-msvc2005\." "..\cpp\qhulltest\QhullPointSet_test.cpp" -o ".\..\tmp\moc\QhullPointSet_test.moc"
"
+ CommandLine=""$(QTDIR)\bin\moc.exe" -Dqh_QHpointer=1 -DQHULL_USES_QT -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I".\." -I".\..\cpp\." -I".\..\..\cpp\." -I".\..\src\." -I".\..\..\src\." -I".\..\tmp\." -I".\..\..\tmp\." -I"$(QTDIR)\include\QtCore\." -I"$(QTDIR)\include\." -I"$(QTDIR)\include\QtTest\." -I"$(QTDIR)\mkspecs\win32-msvc2005\." "..\cpp\qhulltest\QhullPointSet_test.cpp" -o ".\..\tmp\moc\QhullPointSet_test.moc"
"
AdditionalDependencies=""$(QTDIR)\bin\moc.exe";..\cpp\qhulltest\QhullPointSet_test.cpp"
Outputs="".\..\tmp\moc\QhullPointSet_test.moc""
/>
@@ -583,7 +595,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Moc'ing QhullRidge_test.cpp..."
- CommandLine=""$(QTDIR)\bin\moc.exe" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I".\." -I".\..\cpp\." -I".\..\..\cpp\." -I".\..\src\." -I".\..\..\src\." -I".\..\tmp\." -I".\..\..\tmp\." -I"$(QTDIR)\include\QtCore\." -I"$(QTDIR)\include\." -I"$(QTDIR)\include\QtTest\." -I"$(QTDIR)\mkspecs\win32-msvc2005\." "..\cpp\qhulltest\QhullRidge_test.cpp" -o ".\..\tmp\moc\QhullRidge_test.moc"
"
+ CommandLine=""$(QTDIR)\bin\moc.exe" -Dqh_QHpointer=1 -DQHULL_USES_QT -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I".\." -I".\..\cpp\." -I".\..\..\cpp\." -I".\..\src\." -I".\..\..\src\." -I".\..\tmp\." -I".\..\..\tmp\." -I"$(QTDIR)\include\QtCore\." -I"$(QTDIR)\include\." -I"$(QTDIR)\include\QtTest\." -I"$(QTDIR)\mkspecs\win32-msvc2005\." "..\cpp\qhulltest\QhullRidge_test.cpp" -o ".\..\tmp\moc\QhullRidge_test.moc"
"
AdditionalDependencies=""$(QTDIR)\bin\moc.exe";..\cpp\qhulltest\QhullRidge_test.cpp"
Outputs="".\..\tmp\moc\QhullRidge_test.moc""
/>
@@ -605,7 +617,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Moc'ing QhullSet_test.cpp..."
- CommandLine=""$(QTDIR)\bin\moc.exe" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I".\." -I".\..\cpp\." -I".\..\..\cpp\." -I".\..\src\." -I".\..\..\src\." -I".\..\tmp\." -I".\..\..\tmp\." -I"$(QTDIR)\include\QtCore\." -I"$(QTDIR)\include\." -I"$(QTDIR)\include\QtTest\." -I"$(QTDIR)\mkspecs\win32-msvc2005\." "..\cpp\qhulltest\QhullSet_test.cpp" -o ".\..\tmp\moc\QhullSet_test.moc"
"
+ CommandLine=""$(QTDIR)\bin\moc.exe" -Dqh_QHpointer=1 -DQHULL_USES_QT -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I".\." -I".\..\cpp\." -I".\..\..\cpp\." -I".\..\src\." -I".\..\..\src\." -I".\..\tmp\." -I".\..\..\tmp\." -I"$(QTDIR)\include\QtCore\." -I"$(QTDIR)\include\." -I"$(QTDIR)\include\QtTest\." -I"$(QTDIR)\mkspecs\win32-msvc2005\." "..\cpp\qhulltest\QhullSet_test.cpp" -o ".\..\tmp\moc\QhullSet_test.moc"
"
AdditionalDependencies=""$(QTDIR)\bin\moc.exe";..\cpp\qhulltest\QhullSet_test.cpp"
Outputs="".\..\tmp\moc\QhullSet_test.moc""
/>
@@ -627,7 +639,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Moc'ing QhullVertex_test.cpp..."
- CommandLine=""$(QTDIR)\bin\moc.exe" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I".\." -I".\..\cpp\." -I".\..\..\cpp\." -I".\..\src\." -I".\..\..\src\." -I".\..\tmp\." -I".\..\..\tmp\." -I"$(QTDIR)\include\QtCore\." -I"$(QTDIR)\include\." -I"$(QTDIR)\include\QtTest\." -I"$(QTDIR)\mkspecs\win32-msvc2005\." "..\cpp\qhulltest\QhullVertex_test.cpp" -o ".\..\tmp\moc\QhullVertex_test.moc"
"
+ CommandLine=""$(QTDIR)\bin\moc.exe" -Dqh_QHpointer=1 -DQHULL_USES_QT -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I".\." -I".\..\cpp\." -I".\..\..\cpp\." -I".\..\src\." -I".\..\..\src\." -I".\..\tmp\." -I".\..\..\tmp\." -I"$(QTDIR)\include\QtCore\." -I"$(QTDIR)\include\." -I"$(QTDIR)\include\QtTest\." -I"$(QTDIR)\mkspecs\win32-msvc2005\." "..\cpp\qhulltest\QhullVertex_test.cpp" -o ".\..\tmp\moc\QhullVertex_test.moc"
"
AdditionalDependencies=""$(QTDIR)\bin\moc.exe";..\cpp\qhulltest\QhullVertex_test.cpp"
Outputs="".\..\tmp\moc\QhullVertex_test.moc""
/>
@@ -649,7 +661,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Moc'ing RboxPoints_test.cpp..."
- CommandLine=""$(QTDIR)\bin\moc.exe" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I".\." -I".\..\cpp\." -I".\..\..\cpp\." -I".\..\src\." -I".\..\..\src\." -I".\..\tmp\." -I".\..\..\tmp\." -I"$(QTDIR)\include\QtCore\." -I"$(QTDIR)\include\." -I"$(QTDIR)\include\QtTest\." -I"$(QTDIR)\mkspecs\win32-msvc2005\." "..\cpp\qhulltest\RboxPoints_test.cpp" -o ".\..\tmp\moc\RboxPoints_test.moc"
"
+ CommandLine=""$(QTDIR)\bin\moc.exe" -Dqh_QHpointer=1 -DQHULL_USES_QT -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I".\." -I".\..\cpp\." -I".\..\..\cpp\." -I".\..\src\." -I".\..\..\src\." -I".\..\tmp\." -I".\..\..\tmp\." -I"$(QTDIR)\include\QtCore\." -I"$(QTDIR)\include\." -I"$(QTDIR)\include\QtTest\." -I"$(QTDIR)\mkspecs\win32-msvc2005\." "..\cpp\qhulltest\RboxPoints_test.cpp" -o ".\..\tmp\moc\RboxPoints_test.moc"
"
AdditionalDependencies=""$(QTDIR)\bin\moc.exe";..\cpp\qhulltest\RboxPoints_test.cpp"
Outputs="".\..\tmp\moc\RboxPoints_test.moc""
/>
@@ -671,7 +683,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Moc'ing UsingLibQhull_test.cpp..."
- CommandLine=""$(QTDIR)\bin\moc.exe" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I".\." -I".\..\cpp\." -I".\..\..\cpp\." -I".\..\src\." -I".\..\..\src\." -I".\..\tmp\." -I".\..\..\tmp\." -I"$(QTDIR)\include\QtCore\." -I"$(QTDIR)\include\." -I"$(QTDIR)\include\QtTest\." -I"$(QTDIR)\mkspecs\win32-msvc2005\." "..\cpp\qhulltest\UsingLibQhull_test.cpp" -o ".\..\tmp\moc\UsingLibQhull_test.moc"
"
+ CommandLine=""$(QTDIR)\bin\moc.exe" -Dqh_QHpointer=1 -DQHULL_USES_QT -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I".\." -I".\..\cpp\." -I".\..\..\cpp\." -I".\..\src\." -I".\..\..\src\." -I".\..\tmp\." -I".\..\..\tmp\." -I"$(QTDIR)\include\QtCore\." -I"$(QTDIR)\include\." -I"$(QTDIR)\include\QtTest\." -I"$(QTDIR)\mkspecs\win32-msvc2005\." "..\cpp\qhulltest\UsingLibQhull_test.cpp" -o ".\..\tmp\moc\UsingLibQhull_test.moc"
"
AdditionalDependencies=""$(QTDIR)\bin\moc.exe";..\cpp\qhulltest\UsingLibQhull_test.cpp"
Outputs="".\..\tmp\moc\UsingLibQhull_test.moc""
/>
diff --git a/project/qhulltest/qhulltest.pro b/project/qhulltest/qhulltest.pro
index 1fe9dee..447c489 100644
--- a/project/qhulltest/qhulltest.pro
+++ b/project/qhulltest/qhulltest.pro
@@ -42,6 +42,7 @@ SOURCES += cpp/qhulltest/QhullRidge_test.cpp
SOURCES += cpp/qhulltest/QhullSet_test.cpp
SOURCES += cpp/qhulltest/qhulltest.cpp
SOURCES += cpp/qhulltest/QhullVertex_test.cpp
+SOURCES += cpp/qhulltest/qt-qhull.cpp
SOURCES += cpp/qhulltest/UsingLibQhull_test.cpp
SOURCES += cpp/qhulltest/RboxPoints_test.cpp
HEADERS += cpp/Coordinates.h
diff --git a/src/Changes.txt b/src/Changes.txt
index f408c08..ade8874 100644
--- a/src/Changes.txt
+++ b/src/Changes.txt
@@ -40,7 +40,8 @@ To do for suggestions
- Fix doc comments
Qhull cpp questions
- - iterator Coordinates::operator++() { return iterator(++i); } //FIXUP Should return reference, but get reference to temporary
+ - iterator Coordinates::operator++() { return iterator(++i); }
+ - //FIXUP QH10012 Should return reference, but get reference to temporary
- size() as size_t, size_type, or int
- Should all containers have a reserve()?
- Qhull.feasiblePoint interface
@@ -97,7 +98,6 @@ To do
------------
Need help
- - git has an empty ConvexHull submodule on master or next. How to remove it?
- The C++ interface needs work. Give it a try and make it better.
- Set up debian build.
Please keep debian files in config/ and project/debian/
@@ -107,6 +107,13 @@ Need help
If practical, please move to project/
- Verify -fno-strict-aliasing needed for gcc 4.1, 4.2, and 4.3 (qset segfault)
+------------
+Qhull next branch
+
+- Add qt-qhull.cpp with Qt conditional code
+- Fix qhull.sln and project files for qh_QHpointer
+- Add libqhullp.proj
+
------------
qhull 2010.1 2010/01/10
- Test for NULL fp in qh_eachvoronoi [D. Szczerba]
diff --git a/src/user.h b/src/user.h
index dc4d8d8..ee6666f 100644
--- a/src/user.h
+++ b/src/user.h
@@ -50,7 +50,7 @@ Code flags --
If add new messages, assign these values and increment.
def counters = [27, 1047, 2059, 3025, 4068, 5003, 6233, 7079, 8143, 9410]
- 10011-10016 available
+ QH10012-10016 available
See: qh_ERR* [libqhull.h]
*/
--
GitLab