kindred/create
1
1
Fork 0
Code Issues 51 Pull Requests 1 Actions Packages Projects 9 Releases 2 Wiki Activity

Extension: Port ViewProvider of OriginGroup

Browse Source
This commit is contained in:
Stefan Tröger
2016-08-27 16:05:26 +02:00
committed by wmayer
parent 261798da2e
commit fe32f03e63
6 changed files with 271 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Gui/CMakeLists.txt
View File

@@ -824,6 +824,7 @@ SET(Viewprovider_CPP_SRCS
ViewProviderExtension.cpp
ViewProviderGroupExtension.cpp
ViewProviderGeoFeatureGroupExtension.cpp
ViewProviderOriginGroupExtension.cpp
ViewProviderAnnotation.cpp
ViewProviderDocumentObject.cpp
ViewProviderDocumentObjectGroup.cpp
@@ -854,6 +855,7 @@ SET(Viewprovider_SRCS
ViewProviderExtension.h
ViewProviderGroupExtension.h
ViewProviderGeoFeatureGroupExtension.h
ViewProviderOriginGroupExtension.h
ViewProviderAnnotation.h
ViewProviderDocumentObject.h
ViewProviderDocumentObjectGroup.h

2
src/Gui/ViewProviderGeoFeatureGroupExtension.cpp
View File

@@ -1,4 +1,6 @@
/***************************************************************************
* Copyright (c) 2011 Juergen Riegel <FreeCAD@juergen-riegel.net> *
* Copyright (c) 2015 Alexander Golubev (Fat-Zer) <fatzer2@gmail.com> *
* Copyright (c) 2016 Stefan Tröger <stefantroeger@gmx.net> *
* *
* This file is part of the FreeCAD CAx development system. *

145
src/Gui/ViewProviderOriginGroup.cpp
View File

@@ -45,146 +45,13 @@
using namespace Gui;
PROPERTY_SOURCE(Gui::ViewProviderOriginGroup, Gui::ViewProviderGeoFeatureGroup)
PROPERTY_SOURCE_WITH_EXTENSIONS(Gui::ViewProviderOriginGroup, Gui::ViewProviderDocumentObject, (Gui::ViewProviderOriginGroupExtension))
ViewProviderOriginGroup::ViewProviderOriginGroup ()
{ }
ViewProviderOriginGroup::~ViewProviderOriginGroup () {
connectChangedObjectApp.disconnect();
connectChangedObjectGui.disconnect();
{
initExtension(this);
}
std::vector<App::DocumentObject*> ViewProviderOriginGroup::constructChildren (
const std::vector<App::DocumentObject*> &children ) const
{
auto group = dynamic_cast <App::OriginGroupExtension *> ( getObject()->getExtension(App::OriginGroupExtension::getClassTypeId()) );
App::DocumentObject *originObj = group->Origin.getValue();
// Origin must be first
if (originObj) {
std::vector<App::DocumentObject*> rv;
rv.push_back (originObj);
std::copy (children.begin(), children.end(), std::back_inserter (rv));
return rv;
} else { // Generally shouldn't happen but must be handled in case origin is lost
return children;
}
}
std::vector<App::DocumentObject*> ViewProviderOriginGroup::claimChildren () const {
return constructChildren ( ViewProviderGeoFeatureGroup::claimChildren () );
}
std::vector<App::DocumentObject*> ViewProviderOriginGroup::claimChildren3D () const {
return constructChildren ( ViewProviderGeoFeatureGroup::claimChildren3D () );
}
void ViewProviderOriginGroup::attach(App::DocumentObject *pcObject) {
ViewProviderGeoFeatureGroup::attach ( pcObject );
App::Document *adoc = pcObject->getDocument ();
Gui::Document *gdoc = Gui::Application::Instance->getDocument ( adoc ) ;
assert ( adoc );
assert ( gdoc );
connectChangedObjectApp = adoc->signalChangedObject.connect (
boost::bind ( &ViewProviderOriginGroup::slotChangedObjectApp, this, _1) );
connectChangedObjectGui = gdoc->signalChangedObject.connect (
boost::bind ( &ViewProviderOriginGroup::slotChangedObjectGui, this, _1) );
}
void ViewProviderOriginGroup::updateData ( const App::Property* prop ) {
auto group = dynamic_cast <App::OriginGroupExtension *> ( getObject()->getExtension(App::OriginGroupExtension::getClassTypeId()) );
if ( group && prop == &group->Group ) {
updateOriginSize();
}
ViewProviderGeoFeatureGroup::updateData ( prop );
}
void ViewProviderOriginGroup::slotChangedObjectApp ( const App::DocumentObject& obj) {
auto group = dynamic_cast <App::OriginGroupExtension *> ( getObject()->getExtension(App::OriginGroupExtension::getClassTypeId()) );
if ( group && group->hasObject (&obj, /*recusive=*/ true ) ) {
updateOriginSize ();
}
}
void ViewProviderOriginGroup::slotChangedObjectGui ( const Gui::ViewProviderDocumentObject& vp) {
if ( !vp.isDerivedFrom ( Gui::ViewProviderOrigin::getClassTypeId () ) &&
!vp.isDerivedFrom ( Gui::ViewProviderOriginFeature::getClassTypeId () ) ) {
// Ignore origins to avoid infinite recursion (not likely in a well-formed focument,
// but may happen in documents designed in old versions of assembly branch )
auto group = dynamic_cast <App::OriginGroupExtension *> ( getObject()->getExtension(App::OriginGroupExtension::getClassTypeId()) );
App::DocumentObject *obj = vp.getObject ();
if ( group && obj && group->hasObject (obj, /*recusive=*/ true ) ) {
updateOriginSize ();
}
}
}
void ViewProviderOriginGroup::updateOriginSize () {
auto group = dynamic_cast <App::OriginGroupExtension *> ( getObject()->getExtension(App::OriginGroupExtension::getClassTypeId()) );
// obtain an Origin and it's ViewProvider
App::Origin* origin = 0;
Gui::ViewProviderOrigin* vpOrigin = 0;
try {
origin = group->getOrigin ();
assert (origin);
Gui::ViewProvider *vp = Gui::Application::Instance->getViewProvider(origin);
if (!vp) {
throw Base::Exception ("No view provider linked to the Origin");
}
assert ( vp->isDerivedFrom ( Gui::ViewProviderOrigin::getClassTypeId () ) );
vpOrigin = static_cast <Gui::ViewProviderOrigin *> ( vp );
} catch (const Base::Exception &ex) {
Base::Console().Error ("%s\n", ex.what() );
return;
}
Gui::Document* gdoc = Gui::Application::Instance->getDocument(getObject()->getDocument());
if(!gdoc)
return;
Gui::MDIView* view = gdoc->getViewOfViewProvider(this);
if(!view)
return;
Gui::View3DInventorViewer* viewer = static_cast<Gui::View3DInventor*>(view)->getViewer();
SoGetBoundingBoxAction bboxAction(viewer->getSoRenderManager()->getViewportRegion());
// calculate the bounding box for out content
SbBox3f bbox(0,0,0, 0,0,0);
for(App::DocumentObject* obj : group->getGeoSubObjects()) {
ViewProvider *vp = Gui::Application::Instance->getViewProvider(obj);
if (!vp) {
continue;
}
bboxAction.apply ( vp->getRoot () );
bbox.extendBy ( bboxAction.getBoundingBox () );
};
// get the bounding box values
SbVec3f max = bbox.getMax();
SbVec3f min = bbox.getMin();
Base::Vector3d size;
for (uint_fast8_t i=0; i<3; i++) {
size[i] = std::max ( fabs ( max[i] ), fabs ( min[i] ) );
if (size[i] < 1e-7) { // TODO replace the magic values (2015-08-31, Fat-Zer)
size[i] = ViewProviderOrigin::defaultSize();
}
}
vpOrigin->Size.setValue ( size * 1.3 );
}
ViewProviderOriginGroup::~ViewProviderOriginGroup ()
{
}

25
src/Gui/ViewProviderOriginGroup.h
View File

@@ -26,34 +26,17 @@
#include <boost/signals.hpp>
#include "ViewProviderGeoFeatureGroup.h"
#include "ViewProviderOriginGroupExtension.h"
namespace Gui {
class GuiExport ViewProviderOriginGroup: public ViewProviderGeoFeatureGroup
class GuiExport ViewProviderOriginGroup: public ViewProviderDocumentObject,
public ViewProviderOriginGroupExtension
{
PROPERTY_HEADER(Gui::ViewProviderOriginGroup);
PROPERTY_HEADER_WITH_EXTENSIONS(Gui::ViewProviderOriginGroup);
public:
ViewProviderOriginGroup ();
virtual ~ViewProviderOriginGroup ();
virtual std::vector<App::DocumentObject*> claimChildren(void)const;
virtual std::vector<App::DocumentObject*> claimChildren3D(void)const;
virtual void attach(App::DocumentObject *pcObject);
virtual void updateData(const App::Property* prop);
void updateOriginSize();
protected:
void slotChangedObjectApp ( const App::DocumentObject& obj );
void slotChangedObjectGui ( const Gui::ViewProviderDocumentObject& obj );
private:
std::vector<App::DocumentObject*> constructChildren (
const std::vector<App::DocumentObject*> &children ) const;
boost::signals::connection connectChangedObjectApp;
boost::signals::connection connectChangedObjectGui;
};
} /* Gui */

192
src/Gui/ViewProviderOriginGroupExtension.cpp Normal file
View File

@@ -0,0 +1,192 @@
/***************************************************************************
* Copyright (c) 2015 Alexander Golubev (Fat-Zer) <fatzer2@gmail.com> *
* Copyright (c) 2016 Stefan Tröger <stefantroeger@gmx.net> *
* *
* This file is part of the FreeCAD CAx development system. *
* *
* This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Library General Public *
* License as published by the Free Software Foundation; either *
* version 2 of the License, or (at your option) any later version. *
* *
* This library is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU Library General Public License for more details. *
* *
* You should have received a copy of the GNU Library General Public *
* License along with this library; see the file COPYING.LIB. If not, *
* write to the Free Software Foundation, Inc., 59 Temple Place, *
* Suite 330, Boston, MA 02111-1307, USA *
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
#endif
#include "ViewProviderOriginGroupExtension.h"
#include "Application.h"
#include "Document.h"
#include "ViewProviderOriginFeature.h"
#include "ViewProviderOrigin.h"
#include "View3DInventorViewer.h"
#include "View3DInventor.h"
#include <App/OriginGroupExtension.h>
#include <App/Document.h>
#include <App/Origin.h>
#include <Base/Console.h>
#include <boost/bind.hpp>
#include <Inventor/actions/SoGetBoundingBoxAction.h>
#include <Inventor/nodes/SoSeparator.h>
using namespace Gui;
PROPERTY_SOURCE(Gui::ViewProviderOriginGroupExtension, Gui::ViewProviderGeoFeatureGroupExtension)
ViewProviderOriginGroupExtension::ViewProviderOriginGroupExtension()
{
initExtension(ViewProviderOriginGroupExtension::getClassTypeId());
}
ViewProviderOriginGroupExtension::~ViewProviderOriginGroupExtension()
{
connectChangedObjectApp.disconnect();
connectChangedObjectGui.disconnect();
}
std::vector<App::DocumentObject*> ViewProviderOriginGroupExtension::constructChildren (
const std::vector<App::DocumentObject*> &children ) const
{
auto* group = getExtendedViewProvider()->getObject()->getExtensionByType<App::OriginGroupExtension>();
App::DocumentObject *originObj = group->Origin.getValue();
// Origin must be first
if (originObj) {
std::vector<App::DocumentObject*> rv;
rv.push_back (originObj);
std::copy (children.begin(), children.end(), std::back_inserter (rv));
return rv;
} else { // Generally shouldn't happen but must be handled in case origin is lost
return children;
}
}
std::vector<App::DocumentObject*> ViewProviderOriginGroupExtension::extensionClaimChildren () const {
return constructChildren ( ViewProviderGeoFeatureGroupExtension::extensionClaimChildren () );
}
std::vector<App::DocumentObject*> ViewProviderOriginGroupExtension::extensionClaimChildren3D () const {
return constructChildren ( ViewProviderGeoFeatureGroupExtension::extensionClaimChildren3D () );
}
void ViewProviderOriginGroupExtension::extensionAttach(App::DocumentObject *pcObject) {
ViewProviderOriginGroupExtension::extensionAttach ( pcObject );
App::Document *adoc = pcObject->getDocument ();
Gui::Document *gdoc = Gui::Application::Instance->getDocument ( adoc ) ;
assert ( adoc );
assert ( gdoc );
connectChangedObjectApp = adoc->signalChangedObject.connect (
boost::bind ( &ViewProviderOriginGroupExtension::slotChangedObjectApp, this, _1) );
connectChangedObjectGui = gdoc->signalChangedObject.connect (
boost::bind ( &ViewProviderOriginGroupExtension::slotChangedObjectGui, this, _1) );
}
void ViewProviderOriginGroupExtension::extensionUpdateData( const App::Property* prop ) {
auto* group = getExtendedViewProvider()->getObject()->getExtensionByType<App::OriginGroupExtension>();
if ( prop == &group->Group ) {
updateOriginSize();
}
ViewProviderOriginGroupExtension::extensionUpdateData ( prop );
}
void ViewProviderOriginGroupExtension::slotChangedObjectApp ( const App::DocumentObject& obj) {
auto* group = getExtendedViewProvider()->getObject()->getExtensionByType<App::OriginGroupExtension>();
if ( group->hasObject (&obj, /*recusive=*/ true ) ) {
updateOriginSize ();
}
}
void ViewProviderOriginGroupExtension::slotChangedObjectGui ( const Gui::ViewProviderDocumentObject& vp) {
if ( !vp.hasExtension ( Gui::ViewProviderOrigin::getClassTypeId () ) &&
!vp.isDerivedFrom ( Gui::ViewProviderOriginFeature::getClassTypeId () ) ) {
// Ignore origins to avoid infinite recursion (not likely in a well-formed focument,
// but may happen in documents designed in old versions of assembly branch )
auto* group = getExtendedViewProvider()->getObject()->getExtensionByType<App::OriginGroupExtension>();
App::DocumentObject *obj = vp.getObject ();
if ( group && obj && group->hasObject (obj, /*recusive=*/ true ) ) {
updateOriginSize ();
}
}
}
void ViewProviderOriginGroupExtension::updateOriginSize () {
auto* group = getExtendedViewProvider()->getObject()->getExtensionByType<App::OriginGroupExtension>();
// obtain an Origin and it's ViewProvider
App::Origin* origin = 0;
Gui::ViewProviderOrigin* vpOrigin = 0;
try {
origin = group->getOrigin ();
assert (origin);
Gui::ViewProvider *vp = Gui::Application::Instance->getViewProvider(origin);
if (!vp) {
throw Base::Exception ("No view provider linked to the Origin");
}
assert ( vp->isDerivedFrom ( Gui::ViewProviderOrigin::getClassTypeId () ) );
vpOrigin = static_cast <Gui::ViewProviderOrigin *> ( vp );
} catch (const Base::Exception &ex) {
Base::Console().Error ("%s\n", ex.what() );
return;
}
Gui::Document* gdoc = getExtendedViewProvider()->getDocument();
if(!gdoc)
return;
Gui::MDIView* view = gdoc->getViewOfViewProvider(getExtendedViewProvider());
if(!view)
return;
Gui::View3DInventorViewer* viewer = static_cast<Gui::View3DInventor*>(view)->getViewer();
SoGetBoundingBoxAction bboxAction(viewer->getSoRenderManager()->getViewportRegion());
// calculate the bounding box for out content
SbBox3f bbox(0,0,0, 0,0,0);
for(App::DocumentObject* obj : group->getGeoSubObjects()) {
ViewProvider *vp = Gui::Application::Instance->getViewProvider(obj);
if (!vp) {
continue;
}
bboxAction.apply ( vp->getRoot () );
bbox.extendBy ( bboxAction.getBoundingBox () );
};
// get the bounding box values
SbVec3f max = bbox.getMax();
SbVec3f min = bbox.getMin();
Base::Vector3d size;
for (uint_fast8_t i=0; i<3; i++) {
size[i] = std::max ( fabs ( max[i] ), fabs ( min[i] ) );
if (size[i] < 1e-7) { // TODO replace the magic values (2015-08-31, Fat-Zer)
size[i] = ViewProviderOrigin::defaultSize();
}
}
vpOrigin->Size.setValue ( size * 1.3 );
}

65
src/Gui/ViewProviderOriginGroupExtension.h Normal file
View File

@@ -0,0 +1,65 @@
/***************************************************************************
* Copyright (c) 2015 Alexander Golubev (Fat-Zer) <fatzer2@gmail.com> *
* Copyright (c) 2016 Stefan Tröger <stefantroeger@gmx.net> *
* *
* This file is part of the FreeCAD CAx development system. *
* *
* This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Library General Public *
* License as published by the Free Software Foundation; either *
* version 2 of the License, or (at your option) any later version. *
* *
* This library is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU Library General Public License for more details. *
* *
* You should have received a copy of the GNU Library General Public *
* License along with this library; see the file COPYING.LIB. If not, *
* write to the Free Software Foundation, Inc., 59 Temple Place, *
* Suite 330, Boston, MA 02111-1307, USA *
* *
***************************************************************************/
#ifndef GUI_VIEWPROVIDERORIGINGROUPEXTENSION_H
#define GUI_VIEWPROVIDERORIGINGROUPEXTENSION_H
#include <App/Extension.h>
#include "ViewProviderGeoFeatureGroup.h"
namespace Gui
{
class GuiExport ViewProviderOriginGroupExtension : public ViewProviderGeoFeatureGroupExtension
{
PROPERTY_HEADER(Gui::ViewProviderOriginGroupExtension);
public:
/// Constructor
ViewProviderOriginGroupExtension(void);
virtual ~ViewProviderOriginGroupExtension();
virtual std::vector<App::DocumentObject*> extensionClaimChildren(void)const override;
virtual std::vector<App::DocumentObject*> extensionClaimChildren3D(void)const override;
virtual void extensionAttach(App::DocumentObject *pcObject) override;
virtual void extensionUpdateData(const App::Property* prop) override;
void updateOriginSize();
protected:
void slotChangedObjectApp ( const App::DocumentObject& obj );
void slotChangedObjectGui ( const Gui::ViewProviderDocumentObject& obj );
private:
std::vector<App::DocumentObject*> constructChildren (
const std::vector<App::DocumentObject*> &children ) const;
boost::signals::connection connectChangedObjectApp;
boost::signals::connection connectChangedObjectGui;
};
} //namespace Gui
#endif // GUI_VIEWPROVIDERORIGINGROUPEXTENSION_H