Commit 22c5e3df authored by Jan Möbius's avatar Jan Möbius

Renamed some parameters in postprocessor info and stored more information

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@16213 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 1d2f8026
......@@ -2034,7 +2034,10 @@ void Core::loadPlugin(const QString& _filename,const bool _silent, QString& _lic
// Retrieve and store PostProcessor information
if ( postProcessorInfo != 0) {
postProcessorInfo->plugin = postProcessorPlugin;
postProcessorInfo->plugin = postProcessorPlugin;
postProcessorInfo->name = basePlugin->name();
postProcessorInfo->version = basePlugin->version();
postProcessorInfo->description = basePlugin->description();
if ( checkSlot( plugin , "optionsAction()" ) ) {
//Get an action for the post processor options
......
......@@ -277,20 +277,20 @@ unsigned int PostProcessorManager::available() {
return availablePostProcessors_.size();
}
void PostProcessorManager::setActive(unsigned int _active, int _id ) {
void PostProcessorManager::setActive(unsigned int _active, int _viewerId ) {
// Temporary viewer with no fixed id
if ( _id < 0 ) {
std::cerr << "PostProcessorManager::setActive illegal viewer id: " << _id << std::endl;
if ( _viewerId < 0 ) {
std::cerr << "PostProcessorManager::setActive illegal viewer id: " << _viewerId << std::endl;
return;
}
// Increase vector size
if ( _id >= (int)activePostProcessors_.size() )
activePostProcessors_.resize(_id +1 );
if ( _viewerId >= (int)activePostProcessors_.size() )
activePostProcessors_.resize(_viewerId +1 );
if ( _active < availablePostProcessors_.size() )
activePostProcessors_[_id] = _active;
activePostProcessors_[_viewerId] = _active;
else
std::cerr << "Out of range error when setting active post processor" << std::endl;
}
......
......@@ -47,6 +47,7 @@
#include <QString>
#include <QObject>
#include <ACG/Scenegraph/DrawModes.hh>
#include <OpenFlipper/BasePlugin/BaseInterface.hh>
#include <OpenFlipper/BasePlugin/PostProcessorInterface.hh>
#include <OpenFlipper/BasePlugin/RenderInterface.hh>
#include <OpenFlipper/common/GlobalDefines.hh>
......@@ -189,7 +190,13 @@ class DLLEXPORT PostProcessorInfo{
PostProcessorInterface* plugin;
/// Name of the plugin ( requested from the plugin on load)
QString name;
QString name;
/// Description of the plugin
QString description;
/// Version of the plugin
QString version;
/// Possible action to add an options action or menu to the system.
QAction* optionsAction;
......@@ -239,10 +246,10 @@ class DLLEXPORT PostProcessorManager {
/** \brief set the active post processor for viewer
*
* @param _id viewer id
* @param _active id of the post processor
* @param _viewerId viewer id
* @param _active id of the post processor
*/
void setActive(unsigned int _active, int _id);
void setActive(unsigned int _active, int _viewerId);
/** \brief set the active post processor for viewer
*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment