suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ fix author notes, fix memory leak, fix build failure under Windows

Browse Source
This commit is contained in:
wmayer 2014-07-30 10:04:03 +02:00
parent 6ca580456b
commit a252471625
7 changed files with 25 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Gui/InventorAll.h
View File

@ -45,6 +45,7 @@
#include <Inventor/SbViewportRegion.h> #include <Inventor/SbViewportRegion.h>
#include <Inventor/actions/SoBoxHighlightRenderAction.h> #include <Inventor/actions/SoBoxHighlightRenderAction.h>
#include <Inventor/actions/SoGetBoundingBoxAction.h> #include <Inventor/actions/SoGetBoundingBoxAction.h>
#include <Inventor/actions/SoGetMatrixAction.h>
#include <Inventor/actions/SoGetPrimitiveCountAction.h> #include <Inventor/actions/SoGetPrimitiveCountAction.h>
#include <Inventor/actions/SoGLRenderAction.h> #include <Inventor/actions/SoGLRenderAction.h>
#include <Inventor/actions/SoHandleEventAction.h> #include <Inventor/actions/SoHandleEventAction.h>

2
src/Gui/PropertyView.cpp
View File

@ -1,5 +1,5 @@
/*************************************************************************** /***************************************************************************
* Copyright (c) 2002 J<EFBFBD>rgen Riegel <juergen.riegel@web.de> * * Copyright (c) 2002 Juergen Riegel <juergen.riegel@web.de> *
* * * *
* This file is part of the FreeCAD CAx development system. * * This file is part of the FreeCAD CAx development system. *
* * * *

4
src/Gui/View3DInventor.h
View File

@ -1,5 +1,5 @@
/*************************************************************************** /***************************************************************************
* Copyright (c) 2004 J<EFBFBD>rgen Riegel <juergen.riegel@web.de> * * Copyright (c) 2004 Juergen Riegel <juergen.riegel@web.de> *
* * * *
* This file is part of the FreeCAD CAx development system. * * This file is part of the FreeCAD CAx development system. *
* * * *
@ -58,7 +58,7 @@ protected:
/** The 3D view window /** The 3D view window
* It consists out of the 3D view * It consists out of the 3D view
* \author J<EFBFBD>rgen Riegel * \author Juergen Riegel
*/ */
class GuiExport View3DInventor : public MDIView, public ParameterGrp::ObserverType class GuiExport View3DInventor : public MDIView, public ParameterGrp::ObserverType
{ {

9
src/Gui/View3DInventorViewer.cpp
View File

@ -742,15 +742,14 @@ const std::vector<SbVec2s>& View3DInventorViewer::getPolygon(SbBool* clip_inner)
SbVec2f View3DInventorViewer::screenCoordsOfPath(SoPath *path) const SbVec2f View3DInventorViewer::screenCoordsOfPath(SoPath *path) const
{ {
// Generate a matrix (well, a SoGetMatrixAction) that // Generate a matrix (well, a SoGetMatrixAction) that
// moves us us to the picked object's coordinate space. // moves us to the picked object's coordinate space.
SoGetMatrixAction *gma; SoGetMatrixAction gma(getViewportRegion());
gma = new SoGetMatrixAction(getViewportRegion()); gma.apply(path);
gma->apply(path);
// Use that matrix to translate the origin in the picked // Use that matrix to translate the origin in the picked
// object's coordinate space into object space // object's coordinate space into object space
SbVec3f imageCoords(0, 0, 0); SbVec3f imageCoords(0, 0, 0);
SbMatrix m = gma->getMatrix().transpose(); SbMatrix m = gma.getMatrix().transpose();
m.multMatrixVec(imageCoords, imageCoords); m.multMatrixVec(imageCoords, imageCoords);
// Now, project the object space coordinates of the object // Now, project the object space coordinates of the object

8
src/Gui/View3DInventorViewer.h
View File

@ -1,5 +1,5 @@
/*************************************************************************** /***************************************************************************
* Copyright (c) 2004 J<EFBFBD>rgen Riegel <juergen.riegel@web.de> * * Copyright (c) 2004 Juergen Riegel <juergen.riegel@web.de> *
* * * *
* This file is part of the FreeCAD CAx development system. * * This file is part of the FreeCAD CAx development system. *
* * * *
@ -61,7 +61,7 @@ class SoFCUnifiedSelection;
class GLGraphicsItem; class GLGraphicsItem;
class SoShapeScale; class SoShapeScale;
/** GUI view into a 3-D Scene provided by View3DInventor /** GUI view into a 3D scene provided by View3DInventor
* *
*/ */
class GuiExport View3DInventorViewer : public SoQtViewer, public Gui::SelectionSingleton::ObserverType class GuiExport View3DInventorViewer : public SoQtViewer, public Gui::SelectionSingleton::ObserverType
@ -127,10 +127,6 @@ public:
SbBool isBacklight(void) const; SbBool isBacklight(void) const;
void setSceneGraph (SoNode *root); void setSceneGraph (SoNode *root);
// TODO: I think it might be cleaner to move this functionality into a
// different class, with this class supporting something like a
// rotate() slot that gets triggered by the new Animator class?
// IR 20140630
void setAnimationEnabled(const SbBool enable); void setAnimationEnabled(const SbBool enable);
SbBool isAnimationEnabled(void) const; SbBool isAnimationEnabled(void) const;

3
src/Mod/Sketcher/Gui/ViewProviderSketch.cpp
View File

@ -1,5 +1,5 @@
/*************************************************************************** /***************************************************************************
* Copyright (c) 2009 J<EFBFBD>rgen Riegel <juergen.riegel@web.de> * * Copyright (c) 2009 Juergen Riegel <juergen.riegel@web.de> *
* * * *
* This file is part of the FreeCAD CAx development system. * * This file is part of the FreeCAD CAx development system. *
* * * *
@ -2038,7 +2038,6 @@ void ViewProviderSketch::clearCoinImage(SoImage *soImagePtr)
soImagePtr->setToDefaults(); soImagePtr->setToDefaults();
} }
QColor ViewProviderSketch::constrColor(int constraintId) QColor ViewProviderSketch::constrColor(int constraintId)
{ {
static QColor constrIcoColor((int)(ConstrIcoColor [0] * 255.0f), static QColor constrIcoColor((int)(ConstrIcoColor [0] * 255.0f),

2
src/Mod/Sketcher/Gui/ViewProviderSketch.h
View File

@ -1,5 +1,5 @@
/*************************************************************************** /***************************************************************************
* Copyright (c) 2009 J<EFBFBD>rgen Riegel <juergen.riegel@web.de> * * Copyright (c) 2009 Juergen Riegel <juergen.riegel@web.de> *
* * * *
* This file is part of the FreeCAD CAx development system. * * This file is part of the FreeCAD CAx development system. *
* * * *