Commit 315f9a7d authored by David Thompson's avatar David Thompson

Rename smtk::model::Storage to smtk::model::Manager.

parent a989e1d1
......@@ -96,7 +96,7 @@ namespace smtk
typedef std::vector<Shell> Shells;
class ShellEntity;
typedef std::vector<ShellEntity> ShellEntities;
class Storage;
class Manager;
class SimpleModelSubphrases;
class SubphraseGenerator;
class ModelDomainItem;
......@@ -181,8 +181,8 @@ namespace smtk
typedef smtk::shared_ptr< smtk::model::Operator > OperatorPtr;
typedef smtk::weak_ptr< smtk::model::Operator > WeakOperatorPtr;
typedef std::set< smtk::model::OperatorPtr > Operators;
typedef smtk::shared_ptr< smtk::model::Storage > StoragePtr;
typedef smtk::weak_ptr< smtk::model::Storage > WeakStoragePtr;
typedef smtk::shared_ptr< smtk::model::Manager > ManagerPtr;
typedef smtk::weak_ptr< smtk::model::Manager > WeakManagerPtr;
typedef smtk::shared_ptr< smtk::model::Item > ItemPtr;
typedef smtk::weak_ptr< smtk::model::Item > WeakItemPtr;
typedef smtk::shared_ptr< smtk::model::GroupItem > GroupItemPtr;
......
......@@ -8,7 +8,7 @@
namespace smtk {
namespace model {
/**\brief Present the contents of an smtk::model::Storage instance via QEntityItemModel.
/**\brief Present the contents of an smtk::model::Manager instance via QEntityItemModel.
*
*/
class QTSMTK_EXPORT QEntityItemDelegate : public QStyledItemDelegate
......
......@@ -9,7 +9,7 @@ class QLineEdit;
namespace smtk {
namespace model {
/**\brief Allow user edits to an smtk::model::Storage instance via QEntityItemModel.
/**\brief Allow user edits to an smtk::model::Manager instance via QEntityItemModel.
*
*/
class QTSMTK_EXPORT QEntityItemEditor : public QWidget
......
......@@ -4,7 +4,7 @@
#include "smtk/model/EntityPhrase.h"
#include "smtk/model/FloatData.h"
#include "smtk/model/IntegerData.h"
#include "smtk/model/Storage.h"
#include "smtk/model/Manager.h"
#include "smtk/model/StringData.h"
#include <QtCore/QDir>
......@@ -79,7 +79,7 @@ static bool UpdateSubphrases(QEntityItemModel* qmodel, const QModelIndex& qidx,
}
// Callback function, invoked when a new arrangement is added to an entity.
static int entityModified(StorageEventType, const smtk::model::Cursor& ent, const smtk::model::Cursor&, void* callData)
static int entityModified(ManagerEventType, const smtk::model::Cursor& ent, const smtk::model::Cursor&, void* callData)
{
QEntityItemModel* qmodel = static_cast<QEntityItemModel*>(callData);
if (!qmodel)
......@@ -271,7 +271,7 @@ bool QEntityItemModel::insertRows(int position, int rows, const QModelIndex& own
int maxPos = position + rows;
for (int row = position; row < maxPos; ++row)
{
smtk::util::UUID uid = this->m_storage->addEntityOfTypeAndDimension(smtk::model::INVALID, -1);
smtk::util::UUID uid = this->m_manager->addEntityOfTypeAndDimension(smtk::model::INVALID, -1);
this->m_phrases.insert(this->m_phrases.begin() + row, uid);
this->m_reverse[uid] = row;
}
......@@ -343,7 +343,7 @@ void QEntityItemModel::sort(int column, Qt::SortOrder order)
break;
case 1:
{
smtk::model::SortByEntityFlags comparator(this->m_storage);
smtk::model::SortByEntityFlags comparator(this->m_manager);
std::multiset<smtk::util::UUID,smtk::model::SortByEntityFlags>
sorter(comparator);
this->sortDataWithContainer(sorter, order);
......@@ -357,7 +357,7 @@ void QEntityItemModel::sort(int column, Qt::SortOrder order)
smtk::model::StringList,
&smtk::model::BRepModel::stringProperty,
&smtk::model::BRepModel::hasStringProperty> comparator(
this->m_storage, "name");
this->m_manager, "name");
std::multiset<
smtk::util::UUID,
smtk::model::SortByEntityProperty<
......@@ -398,7 +398,7 @@ Qt::ItemFlags QEntityItemModel::flags(const QModelIndex& idx) const
return itemFlags;
}
static bool FindStorage(const QEntityItemModel* qmodel, const QModelIndex& qidx, StoragePtr& storage)
static bool FindManager(const QEntityItemModel* qmodel, const QModelIndex& qidx, ManagerPtr& manager)
{
DescriptivePhrasePtr phrase = qmodel->getItem(qidx);
if (phrase)
......@@ -406,26 +406,26 @@ static bool FindStorage(const QEntityItemModel* qmodel, const QModelIndex& qidx,
Cursor related = phrase->relatedEntity();
if (related.isValid())
{
storage = related.storage();
if (storage)
manager = related.manager();
if (manager)
return true;
}
}
return false;
}
/**\brief Return the first smtk::model::Storage instance presented by this model.
/**\brief Return the first smtk::model::Manager instance presented by this model.
*
* Note that it is possible for a QEntityItemModel to present information
* on entities from multiple Storage instances.
* on entities from multiple Manager instances.
* However, in this case, external updates to the selection must either be
* made via Cursor instances (which couple UUIDs with Storage instances) or
* made via Cursor instances (which couple UUIDs with Manager instances) or
* there will be breakage.
*/
smtk::model::StoragePtr QEntityItemModel::storage() const
smtk::model::ManagerPtr QEntityItemModel::manager() const
{
StoragePtr store;
this->foreach_phrase(FindStorage, store, QModelIndex(), false);
ManagerPtr store;
this->foreach_phrase(FindManager, store, QModelIndex(), false);
return store;
}
......@@ -503,8 +503,8 @@ void QEntityItemModel::sortDataWithContainer(T& sorter, Qt::SortOrder order)
this->m_reverse[*si] = i;
/ *
std::cout << i << " " << *si << " " <<
(this->m_storage->hasStringProperty(*si, "name") ?
this->m_storage->stringProperty(*si, "name")[0].c_str() : "--") << "\n";
(this->m_manager->hasStringProperty(*si, "name") ?
this->m_manager->stringProperty(*si, "name")[0].c_str() : "--") << "\n";
* /
}
}
......@@ -517,8 +517,8 @@ void QEntityItemModel::sortDataWithContainer(T& sorter, Qt::SortOrder order)
this->m_reverse[*si] = i;
/ *
std::cout << i << " " << *si << " " <<
(this->m_storage->hasStringProperty(*si, "name") ?
this->m_storage->stringProperty(*si, "name")[0].c_str() : "--") << "\n";
(this->m_manager->hasStringProperty(*si, "name") ?
this->m_manager->stringProperty(*si, "name")[0].c_str() : "--") << "\n";
* /
}
}
......@@ -569,7 +569,7 @@ void QEntityItemModel::subphrasesUpdated(const QModelIndex& qidx)
void QEntityItemModel::updateObserver()
{
StoragePtr store = this->storage();
ManagerPtr store = this->manager();
if (store)
{
store->observe(std::make_pair(ANY_EVENT,MODEL_INCLUDES_FREE_CELL), &entityModified, this);
......
......@@ -12,16 +12,16 @@
namespace smtk {
namespace model {
/**\brief Adapt an smtk::model::Storage instance into a hierarchical Qt model.
/**\brief Adapt an smtk::model::Manager instance into a hierarchical Qt model.
*
* This is done by generating instances of smtk::model::DescriptivePhrase
* subclasses to portray the entities in storage both in terms of their
* inherent attributes and their relations to other entities.
* subclasses to portray the entities in the model manager both in terms of
* their inherent attributes and their relations to other entities.
*
* By calling setPhrases() on the model, you identify the toplevel
* description you wish to present; it may cover any subset of
* an underlying storage model and may even describe entities from different
* storage models.
* an underlying model manager and may even describe entities from different
* model managers.
*
* You may also call setPhraseFilter() on the model with a filter.
* The filter is used to alter the available subphrases of each
......@@ -67,7 +67,7 @@ public:
this->updateObserver();
}
smtk::model::StoragePtr storage() const;
smtk::model::ManagerPtr manager() const;
void setDeleteOnRemoval(bool del)
{
......
......@@ -5,7 +5,7 @@
#include "smtk/model/GroupEntity.h"
#include "smtk/model/IntegerData.h"
#include "smtk/model/ModelEntity.h"
#include "smtk/model/Storage.h"
#include "smtk/model/Manager.h"
#include "smtk/model/StringData.h"
#include "smtk/Qt/qtEntityItemDelegate.h"
#include "smtk/Qt/qtEntityItemModel.h"
......
......@@ -6,7 +6,7 @@
#include "smtk/model/GroupEntity.h"
#include "smtk/model/IntegerData.h"
#include "smtk/model/ModelEntity.h"
#include "smtk/model/Storage.h"
#include "smtk/model/Manager.h"
#include "smtk/model/StringData.h"
#include "smtk/Qt/qtEntityItemDelegate.h"
......@@ -83,7 +83,7 @@ void qtModelView::dropEvent(QDropEvent* dEvent)
this->recursiveSelect(qmodel, sel, ids, ef);
}
Cursors entities;
Cursor::CursorsFromUUIDs(entities, qmodel->storage(), ids);
Cursor::CursorsFromUUIDs(entities, qmodel->manager(), ids);
std::cout << ids.size() << " ids, " << entities.size() << " entities\n";
group.addEntities(entities);
......@@ -241,7 +241,7 @@ DescriptivePhrasePtr qtModelView::currentItem() const
void qtModelView::addGroup(BitFlags flag, const std::string& name)
{
QEntityItemModel* qmodel = this->getModel();
smtk::model::StoragePtr pstore = qmodel->storage();
smtk::model::ManagerPtr pstore = qmodel->manager();
ModelEntities models;
smtk::model::Cursor::CursorsFromUUIDs(
models,
......@@ -260,7 +260,7 @@ void qtModelView::addGroup(BitFlags flag, const std::string& name)
void qtModelView::removeSelected()
{
QEntityItemModel* qmodel = this->getModel();
smtk::model::StoragePtr pstore = qmodel->storage();
smtk::model::ManagerPtr pstore = qmodel->manager();
ModelEntities models;
smtk::model::Cursor::CursorsFromUUIDs(
models,
......
......@@ -8,7 +8,7 @@
#include "smtk/model/ModelEntity.h"
#include "smtk/model/EntityPhrase.h"
#include "smtk/model/EntityListPhrase.h"
#include "smtk/model/Storage.h"
#include "smtk/model/Manager.h"
#include <QtGui/QPushButton>
#include <QtGui/QTreeView>
......@@ -54,12 +54,12 @@ QTreeView* ModelBrowser::tree() const
}
void ModelBrowser::setup(
smtk::model::StoragePtr storage,
smtk::model::ManagerPtr manager,
smtk::model::QEntityItemModel* qmodel,
smtk::model::QEntityItemDelegate* qdelegate,
smtk::model::DescriptivePhrasePtr root)
{
this->m_storage = storage;
this->m_manager = manager;
qmodel->setRoot(root);
this->m_p->modelTree->setModel(qmodel); // Must come after qmodel->setRoot()!
this->m_p->modelTree->setItemDelegate(qdelegate);
......@@ -73,12 +73,12 @@ void ModelBrowser::setup(
void ModelBrowser::addGroup()
{
GroupEntity newGroup = this->m_storage->addGroup(0, "New Group");
GroupEntity newGroup = this->m_manager->addGroup(0, "New Group");
ModelEntities models;
smtk::model::Cursor::CursorsFromUUIDs(
models,
this->m_storage,
this->m_storage->entitiesMatchingFlags(smtk::model::MODEL_ENTITY));
this->m_manager,
this->m_manager->entitiesMatchingFlags(smtk::model::MODEL_ENTITY));
if (!models.empty())
{
models.begin()->addGroup(newGroup);
......@@ -94,7 +94,7 @@ void ModelBrowser::addToGroup()
Cursor item;
GroupEntities groups;
Cursor::CursorsFromUUIDs(
groups, this->m_storage, this->m_storage->entitiesMatchingFlags(smtk::model::GROUP_ENTITY));
groups, this->m_manager, this->m_manager->entitiesMatchingFlags(smtk::model::GROUP_ENTITY));
if (groups.empty())
return;
......
......@@ -26,7 +26,7 @@ public:
QTreeView* tree() const;
void setup(
smtk::model::StoragePtr s,
smtk::model::ManagerPtr s,
smtk::model::QEntityItemModel* qm,
smtk::model::QEntityItemDelegate* qd,
smtk::model::DescriptivePhrasePtr root);
......@@ -40,7 +40,7 @@ public slots:
protected:
class Internals;
Internals* m_p;
smtk::model::StoragePtr m_storage;
smtk::model::ManagerPtr m_manager;
smtk::model::GroupEntity groupParentOfIndex(const QModelIndex& qidx);
};
......
......@@ -3,7 +3,7 @@
#include "smtk/model/ImportJSON.h"
#include "smtk/model/ExportJSON.h"
#include "smtk/model/Storage.h"
#include "smtk/model/Manager.h"
#include "smtk/model/EntityPhrase.h"
#include "smtk/model/EntityListPhrase.h"
#include "smtk/model/SimpleModelSubphrases.h"
......@@ -51,7 +51,7 @@ int main(int argc, char* argv[])
(std::istreambuf_iterator<char>()));
smtk::model::StoragePtr model = smtk::model::Storage::create();
smtk::model::ManagerPtr model = smtk::model::Manager::create();
smtk::model::ImportJSON::intoModel(json.c_str(), model);
model->assignDefaultNames();
......@@ -83,8 +83,8 @@ int main(int argc, char* argv[])
->setup(cursors)
->setDelegate( // set the subphrase generator:
smtk::model::SimpleModelSubphrases::create()));
test(cursors.empty() || qmodel->storage() == model,
"Failed to obtain Storage from QEntityItemModel.");
test(cursors.empty() || qmodel->manager() == model,
"Failed to obtain Manager from QEntityItemModel.");
// Enable user sorting.
view->tree()->setSortingEnabled(true);
......
......@@ -27,7 +27,7 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
#include "smtk/attribute/Item.h"
#include "smtk/attribute/Definition.h"
#include "smtk/attribute/Manager.h"
#include "smtk/model/Storage.h"
#include "smtk/model/Manager.h"
#include "smtk/model/Cursor.h"
#include "smtk/model/Item.h"
#include <iostream>
......@@ -131,19 +131,19 @@ Manager *Attribute::manager() const
return this->m_definition->manager();
}
//----------------------------------------------------------------------------
/**\brief Return the model Storage instance whose entities may have attributes.
/**\brief Return the model Manager instance whose entities may have attributes.
*
* This returns a shared pointer to smtk::model::Storage, which may be
* null if no storage is referenced by the attribute manager (or if the
* This returns a shared pointer to smtk::model::Manager, which may be
* null if no manager is referenced by the attribute manager (or if the
* attribute definition does not reference a valid manager).
*/
smtk::model::StoragePtr Attribute::modelStorage() const
smtk::model::ManagerPtr Attribute::modelManager() const
{
smtk::model::StoragePtr result;
Manager* mgr = this->manager();
if (mgr)
smtk::model::ManagerPtr result;
smtk::attribute::Manager* attMgr = this->manager();
if (attMgr)
{
result = mgr->refStorage();
result = attMgr->refModelManager();
}
return result;
}
......@@ -202,9 +202,9 @@ void Attribute::removeAllAssociations()
this->m_entities.clear();
// new-style model entities
smtk::model::StoragePtr storage;
smtk::model::ManagerPtr manager;
unsigned long attribId = this->id();
if (storage)
if (manager)
{
smtk::util::UUIDs::const_iterator mit;
for (
......@@ -212,7 +212,7 @@ void Attribute::removeAllAssociations()
mit != this->m_modelEntities.end();
++mit)
{
storage->detachAttribute(attribId, *mit, false);
manager->detachAttribute(attribId, *mit, false);
}
}
this->m_modelEntities.clear();
......@@ -267,9 +267,9 @@ bool Attribute::associateEntity(const smtk::util::UUID& entity)
// TODO: Verify that entity may be associated with this attribute.
// If it may not, then we should return false.
this->m_modelEntities.insert(entity);
smtk::model::StoragePtr storage = this->modelStorage();
if (storage)
storage->attachAttribute(this->id(), entity);
smtk::model::ManagerPtr manager = this->modelManager();
if (manager)
manager->attachAttribute(this->id(), entity);
return true; // Entity may be and is now associated.
}
//----------------------------------------------------------------------------
......@@ -287,10 +287,10 @@ void Attribute::disassociateEntity(const smtk::util::UUID& entity, bool reverse)
this->m_modelEntities.erase(entity);
if(reverse)
{
smtk::model::StoragePtr storage = this->modelStorage();
if (storage)
smtk::model::ManagerPtr manager = this->modelManager();
if (manager)
{
storage->detachAttribute(this->id(), entity, false);
manager->detachAttribute(this->id(), entity, false);
}
}
}
......
......@@ -135,7 +135,7 @@ namespace smtk
{this->m_appliesToInteriorNodes = appliesValue;}
smtk::attribute::Manager *manager() const;
smtk::model::StoragePtr modelStorage() const;
smtk::model::ManagerPtr modelManager() const;
void setUserData(const std::string &key, smtk::util::UserDataPtr value)
{this->m_userData[key] = value;}
......@@ -206,13 +206,13 @@ namespace smtk
template<typename T> T Attribute::associatedModelEntities() const
{
T result;
smtk::model::StoragePtr storage = this->modelStorage();
if (!storage) { // No attached storage means we cannot make cursors.
smtk::model::ManagerPtr manager = this->modelManager();
if (!manager) { // No attached manager means we cannot make cursors.
return result;
}
smtk::util::UUIDs::const_iterator it;
for (it = this->m_modelEntities.begin(); it != this->m_modelEntities.end(); ++it) {
typename T::value_type entry(storage, *it);
typename T::value_type entry(manager, *it);
if (entry.isValid()) {
result.insert(result.end(), entry);
}
......
......@@ -25,7 +25,7 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
#include "smtk/attribute/Manager.h"
#include "smtk/attribute/Attribute.h"
#include "smtk/attribute/Definition.h"
#include "smtk/model/Storage.h"
#include "smtk/model/Manager.h"
#include "smtk/view/Root.h"
#include <iostream>
#include <sstream>
......@@ -462,17 +462,17 @@ smtk::attribute::ConstDefinitionPtr Manager::findIsUniqueBaseClass(
return smtk::attribute::ConstDefinitionPtr();
}
//----------------------------------------------------------------------------
void Manager::setRefStorage(smtk::model::StoragePtr refstorage)
void Manager::setRefModelManager(smtk::model::ManagerPtr refModelMgr)
{
smtk::model::StoragePtr curStorage = this->m_refStorage.lock();
if (curStorage && curStorage != refstorage)
smtk::model::ManagerPtr curManager = this->m_refModelMgr.lock();
if (curManager && curManager != refModelMgr)
{
curStorage->setAttributeManager(NULL, false);
curManager->setAttributeManager(NULL, false);
}
this->m_refStorage = refstorage;
if (refstorage && this->m_refStorage.lock()->attributeManager() != this)
this->m_refModelMgr = refModelMgr;
if (refModelMgr && this->m_refModelMgr.lock()->attributeManager() != this)
{
refstorage->setAttributeManager(this, false);
refModelMgr->setAttributeManager(this, false);
}
}
//----------------------------------------------------------------------------
......
......@@ -131,9 +131,9 @@ namespace smtk
void setRefModel(smtk::model::ModelPtr refmodel )
{this->m_refModel = refmodel;}
smtk::model::StoragePtr refStorage() const
{return this->m_refStorage.lock();}
void setRefStorage(smtk::model::StoragePtr refstorage);
smtk::model::ManagerPtr refModelManager() const
{return this->m_refModelMgr.lock();}
void setRefModelManager(smtk::model::ManagerPtr refModelMgr);
bool hasAttributes()
{return this->m_attributes.size()>0; }
......@@ -158,7 +158,7 @@ namespace smtk
smtk::view::RootPtr m_rootView;
smtk::model::WeakModelPtr m_refModel;
smtk::model::WeakStoragePtr m_refStorage;
smtk::model::WeakManagerPtr m_refModelMgr;
// Advance levels, <int-level, <string-label, color[4]>
// higher level means more advanced.
std::map<int, std::string> m_advLevels;
......
......@@ -4,22 +4,22 @@
#include "smtk/attribute/StringItemDefinition.h"
#include "smtk/model/Cursor.h"
#include "smtk/model/Storage.h"
#include "smtk/model/Manager.h"
#include "smtk/model/Vertex.h"
#include "smtk/util/Testing/helpers.h"
using namespace smtk::attribute;
using namespace smtk::model;
using namespace smtk::util;
using namespace smtk;
int main()
{
// ----
// I. First see how things work when Storage is not yet set.
Manager mgr;
// I. First see how things work when Manager is not yet set.
attribute::Manager mgr;
test(
!mgr.refStorage(),
!mgr.refModelManager(),
"Manager should not have model storage by default.");
DefinitionPtr def = mgr.createDefinition("testDef");
......@@ -42,19 +42,19 @@ int main()
// ----
// II. Now see how things work when the attribute manager has
// a valid model storage pointer.
Storage::Ptr storage = Storage::create();
mgr.setRefStorage(storage);
// a valid model modelMgr pointer.
model::Manager::Ptr modelMgr = model::Manager::create();
mgr.setRefModelManager(modelMgr);
test(
mgr.refStorage() == storage,
"Could not set manager's model storage.");
mgr.refModelManager() == modelMgr,
"Could not set attribute manager's model-manager.");
test(
att->modelStorage() == storage,
"Attribute's idea of model storage incorrect.");
att->modelManager() == modelMgr,
"Attribute's idea of model manager incorrect.");
Vertex v0 = storage->addVertex();
Vertex v1 = storage->addVertex();
smtk::model::Vertex v0 = modelMgr->addVertex();
smtk::model::Vertex v1 = modelMgr->addVertex();
v0.attachAttribute(att->id());
test(
att->associatedModelEntityIds().count(v0.entity()) == 1,
......@@ -77,18 +77,18 @@ int main()
"Removing all attribute associations did not empty association list.");
// ----
// III. Test corner cases when switch model storage on the manager.
Storage::Ptr auxStorage = Storage::create();
mgr.setRefStorage(auxStorage);
// III. Test corner cases when switch model managers on the attribute manager.
model::Manager::Ptr auxModelManager = model::Manager::create();
mgr.setRefModelManager(auxModelManager);
test(
mgr.refStorage() == auxStorage,
"Attribute manager's storage not changed.");
mgr.refModelManager() == auxModelManager,
"Attribute manager's modelMgr not changed.");
test(
auxStorage->attributeManager() == &mgr,
"Second storage's attribute manager not changed.");
auxModelManager->attributeManager() == &mgr,
"Second model manager's attribute manager not changed.");
test(
storage->attributeManager() == NULL,
"Original storage's attribute manager not reset.");
modelMgr->attributeManager() == NULL,
"Original model manager's attribute manager not reset.");
return 0;
}
This diff is collapsed.
......@@ -49,7 +49,7 @@ public:
virtual BridgedInfoBits allSupportedInformation() const;
static bool addStorageEntityToCGM(const smtk::model::Cursor& ent);
static bool addManagerEntityToCGM(const smtk::model::Cursor& ent);
protected:
friend class ImportSolid;
......@@ -59,23 +59,23 @@ protected:
virtual BridgedInfoBits transcribeInternal(
const smtk::model::Cursor& entity, BridgedInfoBits requestedInfo);
BridgedInfoBits addCGMEntityToStorage(const smtk::model::Cursor& entity, RefEntity* refEnt, BridgedInfoBits requestedInfo);
BridgedInfoBits addCGMEntityToStorage(const smtk::model::Cursor& entity, GroupingEntity* refEnt, BridgedInfoBits requestedInfo);
BridgedInfoBits addCGMEntityToStorage(const smtk::model::Cursor& entity, SenseEntity* refEnt, BridgedInfoBits requestedInfo);
BridgedInfoBits addCGMEntityToManager(const smtk::model::Cursor& entity, RefEntity* refEnt, BridgedInfoBits requestedInfo);
BridgedInfoBits addCGMEntityToManager(const smtk::model::Cursor& entity, GroupingEntity* refEnt, BridgedInfoBits requestedInfo);
BridgedInfoBits addCGMEntityToManager(const smtk::model::Cursor& entity, SenseEntity* refEnt, BridgedInfoBits requestedInfo);
BridgedInfoBits addBodyToStorage(const smtk::model::ModelEntity&, Body*, BridgedInfoBits requestedInfo);
BridgedInfoBits addVolumeUseToStorage(const smtk::model::VolumeUse&, CoVolume*, BridgedInfoBits requestedInfo);
BridgedInfoBits addFaceUseToStorage(const smtk::model::FaceUse&, CoFace*, BridgedInfoBits requestedInfo);
BridgedInfoBits addEdgeUseToStorage(const smtk::model::EdgeUse&, CoEdge*, BridgedInfoBits requestedInfo);
BridgedInfoBits addVertexUseToStorage(const smtk::model::VertexUse&, CoVertex*, BridgedInfoBits requestedInfo);
BridgedInfoBits addShellToStorage(const smtk::model::Shell&, ::Shell*, BridgedInfoBits requestedInfo);
BridgedInfoBits addLoopToStorage(const smtk::model::Loop&, ::Loop*, BridgedInfoBits requestedInfo);
BridgedInfoBits addChainToStorage(const smtk::model::Chain&, ::Chain*, BridgedInfoBits requestedInfo);
BridgedInfoBits addVolumeToStorage(const smtk::model::Volume&, RefVolume*, BridgedInfoBits requestedInfo);
BridgedInfoBits addFaceToStorage(const smtk::model::Face&, RefFace*, BridgedInfoBits requestedInfo);
BridgedInfoBits addEdgeToStorage(const smtk::model::Edge&, RefEdge*, BridgedInfoBits requestedInfo);
BridgedInfoBits addVertexToStorage(const smtk::model::Vertex&, RefVertex*, BridgedInfoBits requestedInfo);
BridgedInfoBits addGroupToStorage(const smtk::model::GroupEntity&, RefGroup*, BridgedInfoBits requestedInfo);
BridgedInfoBits addBodyToManager(const smtk::model::ModelEntity&, Body*, BridgedInfoBits requestedInfo);
BridgedInfoBits addVolumeUseToManager(const smtk::model::VolumeUse&, CoVolume*, BridgedInfoBits requestedInfo);
BridgedInfoBits addFaceUseToManager(const smtk::model::FaceUse&, CoFace*, BridgedInfoBits requestedInfo);
BridgedInfoBits addEdgeUseToManager(const smtk::model::EdgeUse&, CoEdge*, BridgedInfoBits requestedInfo);
BridgedInfoBits addVertexUseToManager(const smtk::model::VertexUse&, CoVertex*, BridgedInfoBits requestedInfo);
BridgedInfoBits addShellToManager(const smtk::model::Shell&, ::Shell*, BridgedInfoBits requestedInfo);
BridgedInfoBits addLoopToManager(const smtk::model::Loop&, ::Loop*, BridgedInfoBits requestedInfo);
BridgedInfoBits addChainToManager(const smtk::model::Chain&, ::Chain*, BridgedInfoBits requestedInfo);
BridgedInfoBits addVolumeToManager(const smtk::model::Volume&, RefVolume*, BridgedInfoBits requestedInfo);
BridgedInfoBits addFaceToManager(const smtk::model::Face&, RefFace*, BridgedInfoBits requestedInfo);
BridgedInfoBits addEdgeToManager(const smtk::model::Edge&, RefEdge*, BridgedInfoBits requestedInfo);
BridgedInfoBits addVertexToManager(const smtk::model::Vertex&, RefVertex*, BridgedInfoBits requestedInfo);
BridgedInfoBits addGroupToManager(const smtk::model::GroupEntity&, RefGroup*, BridgedInfoBits requestedInfo);
static void colorPropFromIndex(smtk::model::Cursor&, int);
......
......@@ -2,7 +2,7 @@
#include "smtk/cgm/TDUUID.h"
#include "smtk/model/Cursor.h"
#include "smtk/model/Storage.h"
#include "smtk/model/Manager.h"
#include "CGMApp.hpp"
#include "CubitCompat.hpp"
......
......@@ -2,13 +2,13 @@
#define __smtk_cgm_ExportSolid_h
#include "smtk/cgmSMTKExports.h" // for CGMSMTK_EXPORT
#include "smtk/PublicPointerDefs.h" // For StoragePtr
#include "smtk/PublicPointerDefs.h" // For ManagerPtr
#include "smtk/util/UUID.h"
namespace smtk {
namespace model {
class Storage;
class Manager;
}
}
......
......@@ -8,7 +8,7 @@
#include "smtk/model/CellEntity.h"
#include "smtk/model/GroupEntity.h"
#include "smtk/model/ModelEntity.h"
#include "smtk/model/Storage.h"
#include "smtk/model/Manager.h"
#include "smtk/util/UUID.h"
......@@ -33,10 +33,10 @@ using namespace smtk::model;
namespace cgmsmtk {
namespace cgm {
smtk::util::UUIDArray ImportSolid::fromFilenameIntoStorage(
smtk::util::UUIDArray ImportSolid::fromFilenameIntoManager(
const std::string& filename,
const std::string& filetype,
smtk::model::StoragePtr storage)
smtk::model::ManagerPtr manager)
{
smtk::util::UUIDArray result;
cgmsmtk::cgm::CAUUID::registerWithAttributeManager();
......@@ -81,12 +81,12 @@ smtk::util::UUIDArray ImportSolid::fromFilenameIntoStorage(
RefEntity* entry = imported.get_and_step();
cgmsmtk::cgm::TDUUID* refId = cgmsmtk::cgm::TDUUID::ofEntity(entry, true);
smtk::util::UUID entId = refId->entityId();
Cursor smtkEntry(storage, entId);