diff --git a/app/br/br.cpp b/app/br/br.cpp index 170d651..b19982f 100644 --- a/app/br/br.cpp +++ b/app/br/br.cpp @@ -178,7 +178,7 @@ public: } else if (!strcmp(fun, "objects")) { check(parc <= 2, "Incorrect parameter count for 'objects'."); int size = br_objects(NULL, 0, parc >= 1 ? parv[0] : ".*", parc >= 2 ? parv[1] : ".*"); - char * temp = new char[size]; + char *temp = new char[size]; br_objects(temp, size, parc >= 1 ? parv[0] : ".*", parc >= 2 ? parv[1] : ".*"); printf("%s\n", temp); delete [] temp; diff --git a/openbr/core/core.cpp b/openbr/core/core.cpp index c21afb8..2133c1f 100644 --- a/openbr/core/core.cpp +++ b/openbr/core/core.cpp @@ -49,7 +49,7 @@ struct AlgorithmCore QScopedPointer trainingWrapper(Transform::make("DirectStream(readMode=DistributeFrames)", NULL)); - CompositeTransform * downcast = dynamic_cast(trainingWrapper.data()); + CompositeTransform *downcast = dynamic_cast(trainingWrapper.data()); if (downcast == NULL) qFatal("downcast failed?"); downcast->transforms.append(this->transform.data()); @@ -144,7 +144,7 @@ struct AlgorithmCore fileExclusion = true; } - Gallery * temp = Gallery::make(input); + Gallery *temp = Gallery::make(input); qint64 total = temp->totalSize(); Globals->currentStep = 0; @@ -156,13 +156,13 @@ struct AlgorithmCore if (!multiProcess) { basePipe.reset(Transform::make(pipeDesc,NULL)); - CompositeTransform * downcast = dynamic_cast(basePipe.data()); + CompositeTransform *downcast = dynamic_cast(basePipe.data()); if (downcast == NULL) qFatal("downcast failed?"); downcast->transforms.prepend(this->transform.data()); if (fileExclusion) { - Transform * temp = Transform::make("FileExclusion(" + gallery.flat() + ")", downcast); + Transform *temp = Transform::make("FileExclusion(" + gallery.flat() + ")", downcast); downcast->transforms.prepend(temp); } @@ -180,7 +180,7 @@ struct AlgorithmCore // Next, we make a Stream (with placeholder transform) QString streamDesc = "Stream(readMode=StreamGallery)"; QScopedPointer baseStream(Transform::make(streamDesc, NULL)); - WrapperTransform * wrapper = dynamic_cast (baseStream.data()); + WrapperTransform *wrapper = dynamic_cast (baseStream.data()); // replace that placeholder with the pipe we built wrapper->transform = basePipe.data(); @@ -373,7 +373,7 @@ struct AlgorithmCore File colGallery = targetGallery; qint64 rowSize; - Gallery * temp; + Gallery *temp; if (transposeMode) { rowGallery = targetGallery; @@ -456,7 +456,7 @@ struct AlgorithmCore { compareRegionDesc = compareRegionDesc; compareRegion.reset(Transform::make(compareRegionDesc,NULL)); - CompositeTransform * downcast = dynamic_cast (compareRegion.data()); + CompositeTransform *downcast = dynamic_cast (compareRegion.data()); if (downcast == NULL) qFatal("Pipe downcast failed in compare"); @@ -496,7 +496,7 @@ struct AlgorithmCore // Assign the comparison transform we previously built, and the output transform we just built to // two stages of a pipe. - CompositeTransform * downcast = dynamic_cast (join.data()); + CompositeTransform *downcast = dynamic_cast (join.data()); downcast->transforms.append(compareRegion.data()); downcast->transforms.append(outputTform.data()); @@ -508,7 +508,7 @@ struct AlgorithmCore // and pass the transforms it reads through the base algorithm. QString streamDesc = "Stream(readMode=StreamGallery)"; QScopedPointer streamBase(Transform::make(streamDesc, NULL)); - WrapperTransform * streamWrapper = dynamic_cast (streamBase.data()); + WrapperTransform *streamWrapper = dynamic_cast (streamBase.data()); streamWrapper->transform = join.data(); // The transform we will use is now complete. @@ -687,7 +687,7 @@ void br::Convert(const File &fileType, const File &inputFile, const File &output if (targetFiles.size() != m.cols) { - MatrixOutput * mOut = dynamic_cast(o.data()); + MatrixOutput *mOut = dynamic_cast(o.data()); if (mOut) mOut->data.create(queryFiles.size(), 1, CV_32FC1); } @@ -730,7 +730,7 @@ QSharedPointer br::Transform::fromAlgorithm(const QString &algori else { QSharedPointer orig_tform = AlgorithmManager::getAlgorithm(algorithm)->transform; QSharedPointer newRoot = QSharedPointer(Transform::make("Stream(readMode=DistributeFrames)", NULL)); - WrapperTransform * downcast = dynamic_cast (newRoot.data()); + WrapperTransform *downcast = dynamic_cast (newRoot.data()); downcast->transform = orig_tform.data(); downcast->init(); return newRoot; diff --git a/openbr/core/eval.cpp b/openbr/core/eval.cpp index 97d015a..8679a10 100644 --- a/openbr/core/eval.cpp +++ b/openbr/core/eval.cpp @@ -68,7 +68,7 @@ static float getTAR(const QList &operatingPoints, float FAR) // Decide whether to construct a normal mask matrix, or a pairwise mask by comparing the dimensions of // scores with the size of the target and query lists -static cv::Mat constructMatchingMask(const cv::Mat & scores, const FileList & target, const FileList & query, int partition=0) +static cv::Mat constructMatchingMask(const cv::Mat &scores, const FileList &target, const FileList &query, int partition=0) { // If the dimensions of the score matrix match the sizes of the target and query lists, construct a normal mask matrix if (target.size() == scores.cols && query.size() == scores.rows) @@ -288,7 +288,7 @@ struct GenImpCounts qint64 impCount; }; -float InplaceEval(const QString & simmat, const QString & target, const QString & query, const QString & csv) +float InplaceEval(const QString &simmat, const QString &target, const QString &query, const QString &csv) { qDebug("Evaluating %s%s%s", qPrintable(simmat), diff --git a/openbr/openbr_plugin.cpp b/openbr/openbr_plugin.cpp index 8434447..e127f55 100644 --- a/openbr/openbr_plugin.cpp +++ b/openbr/openbr_plugin.cpp @@ -517,7 +517,7 @@ TemplateList TemplateList::relabel(const TemplateList &tl, const QString &propNa return result; } -QList TemplateList::indexProperty(const QString & propName, QHash * valueMap,QHash * reverseLookup) const +QList TemplateList::indexProperty(const QString &propName, QHash * valueMap,QHash * reverseLookup) const { QHash dummyForwards; QHash dummyBackwards; @@ -528,13 +528,13 @@ QList TemplateList::indexProperty(const QString & propName, QHash TemplateList::indexProperty(const QString & propName, QHash & valueMap, QHash & reverseLookup) const +QList TemplateList::indexProperty(const QString &propName, QHash &valueMap, QHash &reverseLookup) const { valueMap.clear(); reverseLookup.clear(); const QList originalLabels = File::values(*this, propName); - foreach (const QVariant & label, originalLabels) { + foreach (const QVariant &label, originalLabels) { QString labelString = label.toString(); if (!valueMap.contains(labelString)) { reverseLookup.insert(valueMap.size(), label); @@ -717,6 +717,16 @@ void Object::load(QDataStream &stream) init(); } +bool Object::setPropertyRecursive(const QString &name, QVariant value) +{ + if (this->metaObject()->indexOfProperty(qPrintable(name)) == -1) + return false; + + setProperty(name, value); + init(); + return true; +} + void Object::setProperty(const QString &name, QVariant value) { QString type; @@ -1300,8 +1310,8 @@ QList Transform::getChildren() const { QList output; for (int i=0; i < metaObject()->propertyCount(); i++) { - const char * prop_name = metaObject()->property(i).name(); - const QVariant & variant = this->property(prop_name); + const char *prop_name = metaObject()->property(i).name(); + const QVariant &variant = this->property(prop_name); if (variant.canConvert()) output.append(variant.value()); @@ -1311,11 +1321,11 @@ QList Transform::getChildren() const return output; } -TemplateEvent * Transform::getEvent(const QString & name) +TemplateEvent *Transform::getEvent(const QString &name) { - foreach(Transform * child, getChildren()) + foreach(Transform *child, getChildren()) { - TemplateEvent * probe = child->getEvent(name); + TemplateEvent *probe = child->getEvent(name); if (probe) return probe; } @@ -1337,7 +1347,7 @@ void Transform::train(const TemplateList &data) void Transform::train(const QList &data) { TemplateList combined; - foreach(const TemplateList & set, data) { + foreach(const TemplateList &set, data) { combined.append(set); } train(combined); diff --git a/openbr/openbr_plugin.h b/openbr/openbr_plugin.h index 639514c..0f9d8a0 100644 --- a/openbr/openbr_plugin.h +++ b/openbr/openbr_plugin.h @@ -461,9 +461,9 @@ struct TemplateList : public QList