Path: Enabling highlight/selection colors in paths

This commit is contained in:
Yorik van Havre 2015-01-09 18:39:21 -02:00
parent 01032c952d
commit ce8ed2ade3
4 changed files with 7 additions and 3 deletions

View File

@ -22,6 +22,7 @@ link_directories(${OCC_LIBRARY_DIR})
set(PathGui_LIBS set(PathGui_LIBS
Path Path
PartGui
FreeCADGui FreeCADGui
) )

View File

@ -29,10 +29,12 @@
#ifdef FC_OS_WIN32 #ifdef FC_OS_WIN32
# define PartExport __declspec(dllimport) # define PartExport __declspec(dllimport)
# define PathExport __declspec(dllimport) # define PathExport __declspec(dllimport)
# define PartGuiExport __declspec(dllexport)
# define PathGuiExport __declspec(dllexport) # define PathGuiExport __declspec(dllexport)
#else // for Linux #else // for Linux
# define PartExport # define PartExport
# define PathExport # define PathExport
# define PartGuiExport
# define PathGuiExport # define PathGuiExport
#endif #endif

View File

@ -64,6 +64,7 @@
using namespace Gui; using namespace Gui;
using namespace PathGui; using namespace PathGui;
using namespace Path; using namespace Path;
using namespace PartGui;
PROPERTY_SOURCE(PathGui::ViewProviderPath, Gui::ViewProviderGeometryObject) PROPERTY_SOURCE(PathGui::ViewProviderPath, Gui::ViewProviderGeometryObject)
@ -104,7 +105,7 @@ ViewProviderPath::ViewProviderPath()
pcDrawStyle->style = SoDrawStyle::LINES; pcDrawStyle->style = SoDrawStyle::LINES;
pcDrawStyle->lineWidth = LineWidth.getValue(); pcDrawStyle->lineWidth = LineWidth.getValue();
pcLines = new SoIndexedLineSet; pcLines = new PartGui::SoBrepEdgeSet();
pcLines->ref(); pcLines->ref();
pcLineColor = new SoMaterial; pcLineColor = new SoMaterial;

View File

@ -27,10 +27,10 @@
#include <Gui/ViewProviderGeometryObject.h> #include <Gui/ViewProviderGeometryObject.h>
#include <Gui/SoFCSelection.h> #include <Gui/SoFCSelection.h>
#include <Gui/ViewProviderPythonFeature.h> #include <Gui/ViewProviderPythonFeature.h>
#include <Mod/Part/Gui/SoBrepEdgeSet.h>
class SoCoordinate3; class SoCoordinate3;
class SoDrawStyle; class SoDrawStyle;
class SoIndexedLineSet;
class SoMaterial; class SoMaterial;
class SoBaseColor; class SoBaseColor;
class SoMaterialBinding; class SoMaterialBinding;
@ -73,7 +73,7 @@ protected:
SoCoordinate3 * pcLineCoords; SoCoordinate3 * pcLineCoords;
SoCoordinate3 * pcMarkerCoords; SoCoordinate3 * pcMarkerCoords;
SoDrawStyle * pcDrawStyle; SoDrawStyle * pcDrawStyle;
SoIndexedLineSet * pcLines; PartGui::SoBrepEdgeSet * pcLines;
SoMaterial * pcLineColor; SoMaterial * pcLineColor;
SoBaseColor * pcMarkerColor; SoBaseColor * pcMarkerColor;
SoMaterialBinding * pcMatBind; SoMaterialBinding * pcMatBind;