propagation up to the toplevel error handler in BPY_txt_do_python_Text().
Before these changes were made, the operator() methods of predicates
and functions, for example, returned a value of various types such as
bool, double and Vec2f. These returned values were not capable to
represent an error state in many cases.
Now the operator() methods always return 0 on normal exit and -1 on
error. The original returned values are stored in the "result" member
variables of the predicate/function classes.
This means that if we have a code fragment like below:
UnaryPredicate1D& pred;
Interface1D& inter;
if (pred(inter)) {
/* do something */
}
then we have to rewrite it as follows:
UnaryPredicate1D& pred;
Interface1D& inter;
if (pred(inter) < 0)
return -1; /* an error in pred() is propagated */
if (pred.result) {
/* do something */
}
Suppose that pred is a user-defined predicate in Python, i.e. the predicate
is likely error-prone (especially when debugging the predicate). The first
code fragment shown above prevents the proper error propagation because
the boolean return value of UnaryPredicate1D::operator() cannot inform the
occurrence of an error to the caller; the second code fragment can.
In addition to the operator() methods of predicates and functions, similar
improvements have been made to all other C++ API functions and methods that
are involved in the execution of user-defined Python code snippets. Changes
in the signatures of functions and methods are summarized as follows (note
that all subclasses of listed classes are also subject to the changes).
Old signatures:
virtual void Iterator::increment();
virtual void Iterator::decrement();
virtual void ChainingIterator::init();
virtual ViewEdge * ChainingIterator::traverse(const AdjacencyIterator &it);
static void Operators::select(UnaryPredicate1D& pred);
static void Operators::chain(ViewEdgeInternal::ViewEdgeIterator& it,
UnaryPredicate1D& pred, UnaryFunction1D_void& modifier);
static void Operators::chain(ViewEdgeInternal::ViewEdgeIterator& it,
UnaryPredicate1D& pred);
static void Operators::bidirectionalChain(ChainingIterator& it,
UnaryPredicate1D& pred);
static void Operators::bidirectionalChain(ChainingIterator& it);
static void Operators::sequentialSplit(UnaryPredicate0D& startingPred,
UnaryPredicate0D& stoppingPred, float sampling = 0);
static void Operators::sequentialSplit(UnaryPredicate0D& pred, float sampling = 0);
static void Operators::recursiveSplit(UnaryFunction0D<double>& func,
UnaryPredicate1D& pred, float sampling = 0);
static void Operators::recursiveSplit(UnaryFunction0D<double>& func,
UnaryPredicate0D& pred0d, UnaryPredicate1D& pred, float sampling = 0);
static void Operators::sort(BinaryPredicate1D& pred);
static void Operators::create(UnaryPredicate1D& pred, vector<StrokeShader*> shaders);
virtual bool UnaryPredicate0D::operator()(Interface0DIterator& it);
virtual bool BinaryPredicate0D::operator()(Interface0D& inter1, Interface0D& inter2);
virtual bool UnaryPredicate1D::operator()(Interface1D& inter);
virtual bool BinaryPredicate1D::operator()(Interface1D& inter1, Interface1D& inter2);
virtual void StrokeShader::shade(Stroke& ioStroke) const;
virtual T UnaryFunction0D::operator()(Interface0DIterator& iter);
virtual T UnaryFunction1D::operator()(Interface1D& inter);
New signatures:
virtual int Iterator::increment();
virtual int Iterator::decrement();
virtual int ChainingIterator::init();
virtual int ChainingIterator::traverse(const AdjacencyIterator &it);
static int Operators::select(UnaryPredicate1D& pred);
static int Operators::chain(ViewEdgeInternal::ViewEdgeIterator& it,
UnaryPredicate1D& pred, UnaryFunction1D_void& modifier);
static int Operators::chain(ViewEdgeInternal::ViewEdgeIterator& it,
UnaryPredicate1D& pred);
static int Operators::bidirectionalChain(ChainingIterator& it,
UnaryPredicate1D& pred);
static int Operators::bidirectionalChain(ChainingIterator& it);
static int Operators::sequentialSplit(UnaryPredicate0D& startingPred,
UnaryPredicate0D& stoppingPred, float sampling = 0);
static int Operators::sequentialSplit(UnaryPredicate0D& pred, float sampling = 0);
static int Operators::recursiveSplit(UnaryFunction0D<double>& func,
UnaryPredicate1D& pred, float sampling = 0);
static int Operators::recursiveSplit(UnaryFunction0D<double>& func,
UnaryPredicate0D& pred0d, UnaryPredicate1D& pred, float sampling = 0);
static int Operators::sort(BinaryPredicate1D& pred);
static int Operators::create(UnaryPredicate1D& pred, vector<StrokeShader*> shaders);
virtual int UnaryPredicate0D::operator()(Interface0DIterator& it);
virtual int BinaryPredicate0D::operator()(Interface0D& inter1, Interface0D& inter2);
virtual int UnaryPredicate1D::operator()(Interface1D& inter);
virtual int BinaryPredicate1D::operator()(Interface1D& inter1, Interface1D& inter2);
virtual int StrokeShader::shade(Stroke& ioStroke) const;
virtual int UnaryFunction0D::operator()(Interface0DIterator& iter);
virtual int UnaryFunction1D::operator()(Interface1D& inter);
230 lines
6.5 KiB
C++
Executable File
230 lines
6.5 KiB
C++
Executable File
//
|
|
// Filename : StrokeIterators.h
|
|
// Author(s) : Stephane Grabli
|
|
// Purpose : Iterators used to iterate over the elements of the Stroke
|
|
// Date of creation : 01/07/2003
|
|
//
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
//
|
|
// Copyright (C) : Please refer to the COPYRIGHT file distributed
|
|
// with this source distribution.
|
|
//
|
|
// This program is free software; you can redistribute it and/or
|
|
// modify it under the terms of the GNU General Public License
|
|
// as published by the Free Software Foundation; either version 2
|
|
// of the License, or (at your option) any later version.
|
|
//
|
|
// This program is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with this program; if not, write to the Free Software
|
|
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
//
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef STROKEITERATORS_H
|
|
# define STROKEITERATORS_H
|
|
|
|
# include "Stroke.h"
|
|
|
|
namespace StrokeInternal {
|
|
|
|
//
|
|
// StrokeVertexIterator
|
|
//
|
|
/////////////////////////////////////////////////
|
|
|
|
/*! Class defining an iterator designed to iterate over
|
|
* the StrokeVertex of a Stroke.
|
|
* An instance of a StrokeVertexIterator can only be obtained
|
|
* from a Stroke by calling strokeVerticesBegin() or strokeVerticesEnd().
|
|
* It is iterating over the same vertices as an Interface0DIterator.
|
|
* The difference resides in the object access. Indeed, an Interface0DIterator
|
|
* allows only an access to an Interface0D whereas we could need
|
|
* to access the specialized StrokeVertex type. In this case, one
|
|
* should use a StrokeVertexIterator.
|
|
* The castToInterface0DIterator() method is useful to get an Interface0DIterator
|
|
* from a StrokeVertexIterator in order to call any functions of the
|
|
* type UnaryFunction0D.
|
|
* \attention In the scripting language, you must call
|
|
* \code it2 = StrokeVertexIterator(it1) \endcode instead of
|
|
* \code it2 = it1 \endcode
|
|
* where \a it1 and \a it2 are 2 StrokeVertexIterator.
|
|
* Otherwise, incrementing \a it1 will also increment \a it2.
|
|
*/
|
|
class StrokeVertexIterator : public Interface0DIteratorNested
|
|
{
|
|
public:
|
|
|
|
/*! Default constructor. */
|
|
StrokeVertexIterator() {}
|
|
|
|
/*! Copy constructor. */
|
|
StrokeVertexIterator(const StrokeVertexIterator& vi) {
|
|
_it = vi._it;
|
|
_begin = vi._begin;
|
|
_end = vi._end;
|
|
}
|
|
|
|
StrokeVertexIterator(const ::Stroke::vertex_container::iterator& it,
|
|
const ::Stroke::vertex_container::iterator& begin,
|
|
const ::Stroke::vertex_container::iterator& end) {
|
|
_it = it;
|
|
_begin = begin;
|
|
_end = end;
|
|
}
|
|
|
|
virtual ~StrokeVertexIterator() {}
|
|
|
|
/*! Casts this StrokeVertexIterator into an Interface0DIterator.
|
|
* Useful for any call to a function of the type UnaryFunction0D.
|
|
*/
|
|
inline Interface0DIterator castToInterface0DIterator() const {
|
|
Interface0DIterator ret(new StrokeVertexIterator(*this));
|
|
return ret;
|
|
}
|
|
/*! operator=
|
|
* \attention In the scripting language, you must call
|
|
* \code it2 = StrokeVertexIterator(it1) \endcode instead of
|
|
* \code it2 = it1 \endcode
|
|
* where \a it1 and \a it2 are 2 StrokeVertexIterator.
|
|
* Otherwise, incrementing \a it1 will also increment \a it2.
|
|
*
|
|
*/
|
|
StrokeVertexIterator& operator=(const StrokeVertexIterator& vi) {
|
|
_it = vi._it;
|
|
_begin = vi._begin;
|
|
_end = vi._end;
|
|
return *this;
|
|
}
|
|
|
|
/*! Returns the string "StrokeVertexIterator". */
|
|
virtual string getExactTypeName() const {
|
|
return "StrokeVertexIterator";
|
|
}
|
|
|
|
/*! Returns a reference to the pointed StrokeVertex.
|
|
* In the scripting language, you must call
|
|
* "getObject()"instead.
|
|
*/
|
|
virtual StrokeVertex& operator*() {
|
|
return **_it;
|
|
}
|
|
|
|
/*! Returns a pointer to the pointed StrokeVertex.
|
|
* Can't be called in the scripting language.
|
|
*/
|
|
virtual StrokeVertex* operator->() {
|
|
return &(operator*());
|
|
}
|
|
|
|
/*! Increments. In the scripting language, call
|
|
* "increment()".
|
|
*/
|
|
virtual StrokeVertexIterator& operator++() {
|
|
increment();
|
|
return *this;
|
|
}
|
|
|
|
/*! Increments. In the scripting language, call
|
|
* "increment()".
|
|
*/
|
|
virtual StrokeVertexIterator operator++(int) {
|
|
StrokeVertexIterator ret(*this);
|
|
increment();
|
|
return ret;
|
|
}
|
|
|
|
/*! Decrements. In the scripting language, call
|
|
* "decrement()".
|
|
*/
|
|
virtual StrokeVertexIterator& operator--() {
|
|
decrement();
|
|
return *this;
|
|
}
|
|
|
|
/*! Decrements. In the scripting language, call
|
|
* "decrement()".
|
|
*/
|
|
virtual StrokeVertexIterator operator--(int) {
|
|
StrokeVertexIterator ret(*this);
|
|
decrement();
|
|
return ret;
|
|
}
|
|
|
|
/*! Increments. */
|
|
virtual int increment() {
|
|
++_it;
|
|
return 0;
|
|
}
|
|
|
|
/*! Decrements. */
|
|
virtual int decrement() {
|
|
--_it;
|
|
return 0;
|
|
}
|
|
|
|
/*! Returns true if the pointed StrokeVertex is the
|
|
* first of the Stroke.
|
|
*/
|
|
bool isBegin() const {
|
|
return _it == _begin;
|
|
}
|
|
|
|
/*! Returns true if the pointed StrokeVertex is after the
|
|
* last StrokeVertex of the Stroke.
|
|
*/
|
|
bool isEnd() const {
|
|
return _it == _end;
|
|
}
|
|
|
|
/*! operator == */
|
|
virtual bool operator==(const Interface0DIteratorNested& it) const {
|
|
const StrokeVertexIterator* it_exact = dynamic_cast<const StrokeVertexIterator*>(&it);
|
|
if (!it_exact)
|
|
return false;
|
|
return (_it == it_exact->_it);
|
|
}
|
|
|
|
/*! Returns the curvilinear abscissa of the current point */
|
|
virtual float t() const{
|
|
return (*_it)->curvilinearAbscissa();
|
|
}
|
|
/*! Returns the point's parameter in the stroke */
|
|
virtual float u() const{
|
|
return (*_it)->u();
|
|
}
|
|
|
|
/*! Cloning method */
|
|
virtual StrokeVertexIterator* copy() const {
|
|
return new StrokeVertexIterator(*this);
|
|
}
|
|
|
|
//
|
|
// Not exported in Python
|
|
//
|
|
//////////////////////////////////////////////////
|
|
|
|
const ::Stroke::vertex_container::iterator& getIt() {
|
|
return _it;
|
|
}
|
|
|
|
private:
|
|
|
|
::Stroke::vertex_container::iterator _it;
|
|
::Stroke::vertex_container::iterator _begin;
|
|
::Stroke::vertex_container::iterator _end;
|
|
};
|
|
|
|
} // end of namespace StrokeInternal
|
|
|
|
|
|
#endif // STROKEITERATORS_H
|
|
|
|
|