Add all base system changes from the Assembly branch
This commit is contained in:
@@ -215,7 +215,7 @@ View3DInventorViewer::View3DInventorViewer (QWidget *parent, const char *name,
|
||||
// NOTE: For every mouse click event the SoFCUnifiedSelection searches for the picked
|
||||
// point which causes a certain slow-down because for all objects the primitives
|
||||
// must be created. Using an SoSeparator avoids this drawback.
|
||||
Gui::SoFCUnifiedSelection* selectionRoot = new Gui::SoFCUnifiedSelection();
|
||||
selectionRoot = new Gui::SoFCUnifiedSelection();
|
||||
selectionRoot->applySettings();
|
||||
selectionRoot->viewer = this;
|
||||
#endif
|
||||
@@ -292,6 +292,12 @@ View3DInventorViewer::~View3DInventorViewer()
|
||||
Gui::Selection().Detach(this);
|
||||
}
|
||||
|
||||
void View3DInventorViewer::setDocument(Gui::Document *pcDocument)
|
||||
{
|
||||
// write the document the viewer belongs to to the selection node
|
||||
selectionRoot->pcDocument = pcDocument;
|
||||
}
|
||||
|
||||
void View3DInventorViewer::initialize()
|
||||
{
|
||||
navigation = new CADNavigationStyle();
|
||||
@@ -355,10 +361,9 @@ void View3DInventorViewer::removeViewProvider(ViewProvider* pcProvider)
|
||||
|
||||
}
|
||||
|
||||
|
||||
SbBool View3DInventorViewer::setEditingViewProvider(Gui::ViewProvider* p, int ModNum)
|
||||
{
|
||||
if (_ViewProviderSet.find(p) == _ViewProviderSet.end())
|
||||
return false;
|
||||
if (this->editViewProvider)
|
||||
return false; // only one view provider is editable at a time
|
||||
bool ok = p->startEditing(ModNum);
|
||||
|
||||
Reference in New Issue
Block a user