Commit fd6b8604 authored by Bob Obara's avatar Bob Obara

ENH: fixing format issues

parents e9894aec 04a6550f
......@@ -170,8 +170,8 @@ bool DescriptivePhrase::isPropertyValueType() const
phType == STRING_PROPERTY_VALUE;
}
bool DescriptivePhrase::compareByModelInfo(const DescriptivePhrasePtr& a,
const DescriptivePhrasePtr& b)
bool DescriptivePhrase::compareByModelInfo(
const DescriptivePhrasePtr& a, const DescriptivePhrasePtr& b)
{
static const int sortOrder[] = {
1, // ENTITY_LIST
......@@ -245,8 +245,7 @@ bool DescriptivePhrase::compareByModelInfo(const DescriptivePhrasePtr& a,
return compareByTitle(a, b);
}
bool DescriptivePhrase::compareByTitle(const DescriptivePhrasePtr& a,
const DescriptivePhrasePtr& b)
bool DescriptivePhrase::compareByTitle(const DescriptivePhrasePtr& a, const DescriptivePhrasePtr& b)
{
std::string ta(a->title());
std::string tb(b->title());
......@@ -280,6 +279,5 @@ bool DescriptivePhrase::compareByTitle(const DescriptivePhrasePtr& a,
return na < nb;
}
} // model namespace
} // smtk namespace
......@@ -149,18 +149,16 @@ public:
* The sorting is based on Entity Type, Entity Dimension and Title
*/
static bool compareByModelInfo(const DescriptivePhrasePtr& a,
const DescriptivePhrasePtr& b);
static bool compareByModelInfo(const DescriptivePhrasePtr& a, const DescriptivePhrasePtr& b);
/**\brief Ttile-based Comparison method for DescriptivePhrases
*
* This can be used to help sort DescriptivePhrases based on their
* titles.
*/
static bool compareByTitle(const DescriptivePhrasePtr& a,
const DescriptivePhrasePtr& b);
static bool compareByTitle(const DescriptivePhrasePtr& a, const DescriptivePhrasePtr& b);
protected:
DescriptivePhrase();
......
......@@ -30,7 +30,6 @@ namespace smtk
namespace model
{
SimpleModelSubphrases::SimpleModelSubphrases()
: m_abridgeUses(true)
{
......@@ -152,7 +151,7 @@ void SimpleModelSubphrases::childrenOfEntity(EntityPhrase::Ptr phr, DescriptiveP
if (dimBits > 0 && phr->relatedEntity().dimensionBits() > 0 &&
((dimBits > phr->relatedEntity().dimensionBits() &&
!(dimBits & phr->relatedEntity().dimensionBits())) ||
phr->relatedEntity().isModel()))
phr->relatedEntity().isModel()))
{ // Do not report higher-dimensional relation
return;
}
......
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