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

Some fixes in python ViewProvider handling

Browse Source
This commit is contained in:
jriegel 2013-06-09 17:52:03 +02:00
parent e189c0b336
commit b7523b63af
5 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/App/Application.cpp
View File

@ -1046,6 +1046,7 @@ void Application::initTypes(void)
App ::AnnotationLabel ::init();
App ::MeasureDistance ::init();
App ::MaterialObject ::init();
App ::MaterialObjectPython ::init();
App ::Placement ::init();
App ::Plane ::init();
}

2
src/App/MaterialObject.cpp
View File

@ -50,7 +50,7 @@ namespace App {
/// @cond DOXERR
PROPERTY_SOURCE_TEMPLATE(App::MaterialObjectPython, App::MaterialObject)
template<> const char* App::MaterialObjectPython::getViewProviderName(void) const {
return "Gui::ViewProviderMaterialObject";
return "Gui::ViewProviderMaterialObjectPython";
}
template<> PyObject* App::MaterialObjectPython::getPyObject(void) {
if (PythonObject.is(Py::_None())) {

3
src/Gui/Application.cpp
View File

@ -95,6 +95,7 @@
#include "ViewProviderMeasureDistance.h"
#include "ViewProviderPlacement.h"
#include "ViewProviderPlane.h"
#include "ViewProviderMaterialObject.h"
#include "Language/Translator.h"
#include "TaskView/TaskDialogPython.h"
@ -1449,6 +1450,8 @@ void Application::initTypes(void)
Gui::ViewProviderPythonGeometry ::init();
Gui::ViewProviderPlacement ::init();
Gui::ViewProviderPlane ::init();
Gui::ViewProviderMaterialObject ::init();
Gui::ViewProviderMaterialObjectPython ::init();
// Workbench
Gui::Workbench ::init();

7
src/Gui/ViewProviderMaterialObject.cpp
View File

@ -1,5 +1,5 @@
/***************************************************************************
* Copyright (c) 2006 Werner Mayer <wmayer[at]users.sourceforge.net> *
* Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) *
* *
* This file is part of the FreeCAD CAx development system. *
* *
@ -58,6 +58,11 @@ ViewProviderMaterialObject::~ViewProviderMaterialObject()
{
}
bool ViewProviderMaterialObject::doubleClicked(void)
{
Gui::Application::Instance->activeDocument()->setEdit(this, (int)ViewProvider::Default);
return true;
}
/**
* Returns the pixmap for the list item.

9
src/Gui/ViewProviderMaterialObject.h
View File

@ -1,5 +1,5 @@
/***************************************************************************
* Copyright (c) 2006 Werner Mayer <wmayer[at]users.sourceforge.net> *
* Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) *
* *
* This file is part of the FreeCAD CAx development system. *
* *
@ -21,8 +21,8 @@
***************************************************************************/
#ifndef GUI_VIEWPROVIDER_DOCUMENTOBJECTGROUP_H
#define GUI_VIEWPROVIDER_DOCUMENTOBJECTGROUP_H
#ifndef GUI_ViewProviderMaterialObject_H
#define GUI_ViewProviderMaterialObject_H
#include "ViewProviderDocumentObject.h"
@ -42,6 +42,7 @@ public:
QIcon getIcon(void) const;
bool doubleClicked(void);
};
@ -49,5 +50,5 @@ typedef ViewProviderPythonFeatureT<ViewProviderMaterialObject> ViewProviderMater
} // namespace Gui
#endif // GUI_VIEWPROVIDER_DOCUMENTOBJECTGROUP_H
#endif // GUI_ViewProviderMaterialObject_H