Commit a77edb04 authored by Robert Maynard's avatar Robert Maynard
Browse files

Merge branch 'correct_build_issues_in_mesh_operator' into 'master'

Correct compiation issues detected in MeshOperator.



See merge request !9
parents 9032d2fb 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})
......
......@@ -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->manager()->collectionBegin(),
this->manager()->collectionEnd());
CollectionStorage existingCollections(meshManager->collectionBegin(),
meshManager->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->manager()->collectionBegin();
i != this->manager()->collectionEnd();
for(smtk::mesh::Manager::const_iterator i = meshManager->collectionBegin();
i != meshManager->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();
......
Supports Markdown
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