Commit 897ff391 authored by David Gobbi's avatar David Gobbi Committed by Marcus D. Hanwell
Browse files

COMP: remove BTX/ETX from vtkVariant method args

parent 0aeadcc1
......@@ -278,7 +278,6 @@ public:
return this->GetNumberOfComponents() * this->GetNumberOfTuples();
}
//BTX
// Description:
// Return the indices where a specific value appears.
virtual vtkIdType LookupValue(vtkVariant value) = 0;
......@@ -291,7 +290,6 @@ public:
// Description:
// Insert a value into the array from a variant.
virtual void InsertVariantValue(vtkIdType idx, vtkVariant value) = 0;
//ETX
// Description:
// Tell the array explicitly that the data has changed.
......
......@@ -137,11 +137,9 @@ public:
// Insets values and checks to make sure there is enough memory
void InsertValue(vtkIdType id, int i);
//BTX
// Description:
// Insert a value into the array from a variant.
void InsertVariantValue(vtkIdType idx, vtkVariant value);
//ETX
vtkIdType InsertNextValue(int i);
......@@ -190,12 +188,10 @@ public:
// Returns a new vtkBitArrayIterator instance.
vtkArrayIterator* NewIterator();
//BTX
// Description:
// Return the indices where a specific value appears.
virtual vtkIdType LookupValue(vtkVariant value);
virtual void LookupValue(vtkVariant value, vtkIdList* ids);
//ETX
vtkIdType LookupValue(int value);
void LookupValue(int value, vtkIdList* ids);
......
......@@ -234,13 +234,11 @@ public:
// Description:
// Returns a vtkArrayIteratorTemplate<T>.
virtual vtkArrayIterator* NewIterator();
//BTX
// Description:
// Return the indices where a specific value appears.
virtual vtkIdType LookupValue(vtkVariant value);
virtual void LookupValue(vtkVariant value, vtkIdList* ids);
//ETX
vtkIdType LookupValue(T value);
void LookupValue(T value, vtkIdList* ids);
......
......@@ -174,15 +174,15 @@ public:
int GetNumberOfElementComponents() { return 0; }
int GetElementComponentSize() { return static_cast<int>(sizeof(vtkStdString::value_type)); }
//BTX
// Description:
// Insert data at a specified position in the array.
//BTX
void InsertValue(vtkIdType id, vtkStdString f);
//ETX
// Description:
// Insert a value into the array from a variant.
void InsertVariantValue(vtkIdType idx, vtkVariant value);
//ETX
void InsertValue(vtkIdType id, const char *val);
// Description:
......
......@@ -62,13 +62,11 @@ public:
virtual unsigned long GetActualMemorySize();
virtual int IsNumeric();
virtual vtkArrayIterator* NewIterator();
//BTX
virtual vtkVariant GetVariantValue(vtkIdType idx);
virtual vtkIdType LookupValue(vtkVariant value);
virtual void LookupValue(vtkVariant value, vtkIdList* ids);
virtual void InsertVariantValue(vtkIdType idx, vtkVariant value);
//ETX
virtual void DataChanged();
virtual void ClearLookup();
......
......@@ -147,12 +147,11 @@ public:
// Create a string variant from a const char*.
vtkVariant(const char* value);
//BTX
// Description:
// Create a string variant from a std string.
vtkVariant(vtkStdString value);
//BTX
// Description:
// Create a Unicode string variant
vtkVariant(const vtkUnicodeString& value);
......@@ -258,16 +257,14 @@ public:
// Get the type of the variant as a string.
const char* GetTypeAsString() const;
//BTX
// Description:
// Convert the variant to a string.
vtkStdString ToString() const;
//BTX
// Description:
// convert the variant to a Unicode string.
vtkUnicodeString ToUnicodeString() const;
//ETX
// Description:
......@@ -311,7 +308,6 @@ public:
unsigned long ToUnsignedLong(bool* valid) const;
unsigned long ToUnsignedLong() const {
return this->ToUnsignedLong(0); };
//BTX
#if defined(VTK_TYPE_USE___INT64)
__int64 To__Int64(bool* valid) const;
__int64 To__Int64() const {
......@@ -328,7 +324,6 @@ public:
unsigned long long ToUnsignedLongLong() const {
return this->ToUnsignedLongLong(0); };
#endif
//ETX
vtkTypeInt64 ToTypeInt64(bool* valid) const;
vtkTypeInt64 ToTypeInt64() const {
return this->ToTypeInt64(0); };
......
......@@ -206,7 +206,6 @@ public:
vtkIdType InsertNextValue(vtkVariant value);
//BTX
// Description:
// Return a pointer to the location in the internal array at the specified index.
vtkVariant* GetPointer(vtkIdType id);
......@@ -226,12 +225,10 @@ public:
// Return the number of values in the array.
vtkIdType GetNumberOfValues() { return this->MaxId + 1; }
//BTX
// Description:
// Return the indices where a specific value appears.
virtual vtkIdType LookupValue(vtkVariant value);
virtual void LookupValue(vtkVariant value, vtkIdList* ids);
//ETX
// Description:
// Tell the array explicitly that the data has changed.
......@@ -277,10 +274,8 @@ private:
vtkVariantArray(const vtkVariantArray&); // Not implemented.
void operator=(const vtkVariantArray&); // Not implemented.
//BTX
vtkVariantArrayLookup* Lookup;
void UpdateLookup();
//ETX
};
#endif
......@@ -105,11 +105,11 @@ class VTK_FILTERING_EXPORT vtkDistributedGraphHelper : public vtkObject
// hashed distribution will be used.
void SetVertexPedigreeIdDistribution(vtkVertexPedigreeIdDistribution Func,
void *userData);
//ETX
// Description:
// Determine which processor owns the vertex with the given pedigree ID.
vtkIdType GetVertexOwnerByPedigreeId(const vtkVariant& pedigreeId);
//ETX
// Description:
// Synchronizes all of the processors involved in this distributed
......
......@@ -422,7 +422,6 @@ public:
vtkDistributedGraphHelper *GetDistributedGraphHelper();
//ETX
//BTX
// Description:
// Retrieve the vertex with the given pedigree ID. If successful,
// returns the ID of the vertex. Otherwise, either the vertex data
......@@ -431,7 +430,6 @@ public:
// If the graph is a distributed graph, this method will return the
// Distributed-ID of the vertex.
vtkIdType FindVertex(const vtkVariant& pedigreeID);
//ETX
// Description:
// Shallow copies the data object into this graph.
......
......@@ -88,7 +88,6 @@ public:
// the delays associated with returning the vertex index.
vtkIdType AddVertex(vtkVariantArray *propertyArr);
//BTX
// Description:
// Adds a vertex with the given \p pedigreeID to the graph and
// returns the index of the new vertex.
......@@ -104,7 +103,6 @@ public:
// LazyAddVertex, which provides better performance by eliminating
// the delays associated with returning the vertex index.
vtkIdType AddVertex(const vtkVariant& pedigreeId);
//ETX
// Description:
// Adds a directed edge from \p u to \p v,
......@@ -200,7 +198,6 @@ public:
// called on the helper.
void LazyAddVertex(vtkVariantArray *propertyArr);
//BTX
// Description:
// Adds a vertex with the given \p pedigreeID to the graph.
//
......@@ -267,7 +264,6 @@ public:
void LazyAddEdge(const vtkVariant& u,
const vtkVariant& v,
vtkVariantArray *propertyArr = 0);
//ETX
// Description:
// Variant of AddEdge() that returns a heavyweight \p vtkGraphEdge object.
......
......@@ -88,8 +88,6 @@ public:
// the delays associated with returning the vertex index.
vtkIdType AddVertex(vtkVariantArray *propertyArr);
//BTX
// Description:
// Adds a vertex with the given \p pedigreeID to the graph and
// returns the index of the new vertex.
......@@ -106,6 +104,7 @@ public:
// the delays associated with returning the vertex index.
vtkIdType AddVertex(const vtkVariant& pedigreeId);
//BTX
// Description:
// Adds an undirected edge from \p u to \p v,
// where \p u and \p v are vertex indices,
......@@ -196,7 +195,6 @@ public:
// called on the helper.
void LazyAddVertex(vtkVariantArray *propertyArr);
//BTX
// Description:
// Adds a vertex with the given \p pedigreeID to the graph.
//
......@@ -207,7 +205,6 @@ public:
// whose DistributedHelper is non-null) the next time Synchronize is
// called on the helper.
void LazyAddVertex(const vtkVariant& pedigreeId);
//ETX
// Description:
// Adds an undirected edge from \p u to \p v,
......@@ -231,7 +228,6 @@ public:
// called on the helper.
void LazyAddEdge(vtkIdType u, vtkIdType v, vtkVariantArray *propertyArr);
//BTX
// Description:
// Adds an undirected edge from \p u to \p v,
// where \p u is a vertex pedigree ID and \p v is a vertex index.
......@@ -274,7 +270,6 @@ public:
void LazyAddEdge(const vtkVariant& u,
const vtkVariant& v,
vtkVariantArray *propertyArr = 0);
//ETX
// Description:
// Variant of AddEdge() that returns a heavyweight \p vtkGraphEdge object.
......
......@@ -156,7 +156,6 @@ public:
// Table single entry functions
//
//BTX
// Description:
// Retrieve a value in the table by row and column index as a variant.
// Note that this calls GetValueByName internally so that each column
......@@ -175,7 +174,6 @@ public:
// Description:
// Set a value in the table by row index and column name as a variant.
void SetValueByName(vtkIdType row, const char* col, vtkVariant value);
//ETX
// Description:
// Initialize to an empty table.
......
......@@ -82,11 +82,9 @@ public:
// Return true if there is an error on the current query.
bool HasError();
//BTX
// Description:
// Return data in current row, field c
vtkVariant DataValue(vtkIdType c);
//ETX
// Description:
// Get the last error text from the query
......
......@@ -78,11 +78,9 @@ public:
// Return true if there is an error on the current query.
bool HasError();
//BTX
// Description:
// Return data in current row, field c
vtkVariant DataValue(vtkIdType c);
//ETX
// Description:
// Get the last error text from the query
......
......@@ -82,11 +82,9 @@ public:
bool RollbackTransaction();
bool CommitTransaction();
//BTX
// Description:
// Return data in current row, field c
vtkVariant DataValue( vtkIdType c );
//ETX
// Description:
// Get the last error text from the query
......
......@@ -95,7 +95,6 @@ public:
// inactive query.
virtual bool IsActive() = 0;
//BTX
// Description:
// Advance row, return false if past end.
// Also, fill array with row values.
......@@ -104,7 +103,6 @@ public:
// Description:
// Return data in current row, field c
virtual vtkVariant DataValue(vtkIdType c) = 0;
//ETX
// Description:
// Returns true if an error is set, otherwise false.
......
......@@ -153,8 +153,8 @@ public:
virtual bool BindParameter(int index, const char *stringValue, size_t length);
//BTX
virtual bool BindParameter(int index, const vtkStdString &string);
virtual bool BindParameter(int index, vtkVariant var);
//ETX
virtual bool BindParameter(int index, vtkVariant var);
// Description:
// Bind a blob value. Not all databases support blobs as a data
// type. Check vtkSQLDatabase::IsSupported(VTK_SQL_FEATURE_BLOB) to
......
......@@ -96,11 +96,9 @@ public:
bool RollbackTransaction();
bool CommitTransaction();
//BTX
// Description:
// Return data in current row, field c
vtkVariant DataValue(vtkIdType c);
//ETX
// Description:
// Get the last error text from the query
......@@ -137,8 +135,8 @@ public:
bool BindParameter(int index, const char *stringValue, size_t length);
//BTX
bool BindParameter(int index, const vtkStdString &string);
bool BindParameter(int index, vtkVariant value);
//ETX
bool BindParameter(int index, vtkVariant value);
// Description:
// Bind a blob value. Not all databases support blobs as a data
// type. Check vtkSQLDatabase::IsSupported(VTK_SQL_FEATURE_BLOB) to
......
......@@ -73,9 +73,7 @@ public:
// Description:
// Edits the lookup table to use for point icons. This is only used if
// input array 0 is set and UsePointLookupTable is on.
//BTX
void SetIconType(vtkVariant v, int icon);
//ETX
void SetIconType(double v, int icon)
{ this->SetIconType(vtkVariant(v), icon); }
void SetIconType(const char* v, int icon)
......
......@@ -75,23 +75,18 @@ private:
vtkIdType OriginVertexIndex;
char* ArrayName;
//BTX
vtkVariant OriginValue;
//ETX
bool ArrayNameSet;
// Description:
// Using the convenience function for set strings internally
vtkSetStringMacro(ArrayName);
//BTX
// Description:
// This method is basically a helper function to find
// the index of a specific value within a specific array
vtkIdType GetVertexIndex(
vtkAbstractArray *abstract,vtkVariant value);
//ETX
vtkBoostBrandesCentrality(const vtkBoostBrandesCentrality&); // Not implemented.
void operator=(const vtkBoostBrandesCentrality&); // Not implemented.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment