Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
David Thompson
SMTK
Commits
53d285f2
Commit
53d285f2
authored
Dec 10, 2015
by
Robert Maynard
Browse files
Correct compiation issues detected in MeshOperator.
parent
9032d2fb
Changes
2
Show whitespace changes
Inline
Side-by-side
smtk/extension/remus/CMakeLists.txt
View file @
53d285f2
...
...
@@ -4,9 +4,10 @@ smtk_operator_xml("${CMAKE_CURRENT_SOURCE_DIR}/MeshOperator.sbt" remusOperatorXM
add_library
(
smtkRemusExt
${
remusExtSource
}
)
target_link_libraries
(
smtkRemusExt
PRIVATE
LINK_
PRIVATE
RemusClient
smtkCore
${
Boost_LIBRARIES
}
)
target_include_directories
(
smtkRemusExt PRIVATE
${
REMUS_INCLUDE_DIRS
}
)
...
...
smtk/extension/remus/MeshOperator.cxx
View file @
53d285f2
...
...
@@ -18,6 +18,9 @@
#include
"smtk/model/Manager.h"
#include
"smtk/model/Model.h"
#include
"smtk/mesh/Manager.h"
#include
"smtk/mesh/Collection.h"
#include
"smtk/attribute/Attribute.h"
#include
"smtk/attribute/ModelEntityItem.h"
#include
"smtk/attribute/StringItem.h"
...
...
@@ -156,10 +159,12 @@ OperatorResult MeshOperator::operateInternal()
//now fetch the latest results from the server
remus
::
proto
::
JobResult
meshMetaData
=
client
.
retrieveResults
(
job
);
smtk
::
mesh
::
ManagerPtr
meshManager
=
this
->
manager
()
->
meshes
();
//determine all existing collection
typedef
std
::
map
<
smtk
::
common
::
UUID
,
smtk
::
mesh
::
CollectionPtr
>
CollectionStorage
;
CollectionStorage
existingCollections
(
this
->
m
anager
()
->
collectionBegin
(),
this
->
m
anager
()
->
collectionEnd
());
CollectionStorage
existingCollections
(
meshM
anager
->
collectionBegin
(),
meshM
anager
->
collectionEnd
());
//parse the job result as json mesh data
cJSON
*
root
=
cJSON_Parse
(
meshMetaData
.
data
());
...
...
@@ -176,12 +181,12 @@ OperatorResult MeshOperator::operateInternal()
//
//
//
for
(
smtk
::
mesh
::
Manager
::
const_iterator
i
=
this
->
m
anager
()
->
collectionBegin
();
i
!=
this
->
m
anager
()
->
collectionEnd
();
for
(
smtk
::
mesh
::
Manager
::
const_iterator
i
=
meshM
anager
->
collectionBegin
();
i
!=
meshM
anager
->
collectionEnd
();
++
i
)
{
smtk
::
mesh
::
CollectionPtr
collection
=
i
->
second
;
smtk
::
mesh
::
UUID
collectionUUID
=
i
->
first
;
smtk
::
common
::
UUID
collectionUUID
=
i
->
first
;
if
(
existingCollections
.
find
(
collectionUUID
)
==
existingCollections
.
end
())
{
//found a new collection
std
::
string
location
=
collection
->
readLocation
();
...
...
Write
Preview
Supports
Markdown
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