Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Ben Boeckel
SMTK
Commits
fd6b8604
Commit
fd6b8604
authored
Aug 19, 2017
by
Bob Obara
Browse files
Options
Browse Files
Download
Plain Diff
ENH: fixing format issues
parents
e9894aec
04a6550f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
13 deletions
+8
-13
smtk/model/DescriptivePhrase.cxx
smtk/model/DescriptivePhrase.cxx
+3
-5
smtk/model/DescriptivePhrase.h
smtk/model/DescriptivePhrase.h
+4
-6
smtk/model/SimpleModelSubphrases.cxx
smtk/model/SimpleModelSubphrases.cxx
+1
-2
No files found.
smtk/model/DescriptivePhrase.cxx
View file @
fd6b8604
...
...
@@ -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
smtk/model/DescriptivePhrase.h
View file @
fd6b8604
...
...
@@ -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
();
...
...
smtk/model/SimpleModelSubphrases.cxx
View file @
fd6b8604
...
...
@@ -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
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment