Commit a9d0640b authored by Matthias Möller's avatar Matthias Möller

remove dead code

refs #2358

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@20039 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 9a2b4df5
......@@ -165,10 +165,8 @@ CoreWidget( QVector<ViewMode*>& _viewModes,
questionButton_(0),
globalDrawMenu_(0),
rendererMenu_(0),
postprocessorMenu_(0),
drawGroup_(0),
rendererGroup_(0),
postProcessorGroup_(0),
viewGroup_(0),
perspectiveProjectionAction_(0),
activeDrawModes_(0),
......
......@@ -819,9 +819,6 @@ public:
/// Setup and update the global renderer menu
void slotUpdateRendererMenu();
/// Setup and update the global postprocessor menu
void slotUpdatePostProcessorMenu();
/// Change viewer layout that was selected in the combo box
void setViewerLayout(int _idx);
......@@ -848,17 +845,11 @@ public:
/// This variable holds the global renderer menu
QMenu* rendererMenu_;
/// This variable holds the global postprocessor menu
QMenu* postprocessorMenu_;
QActionGroup * drawGroup_;
/// Group for all renderers
QActionGroup * rendererGroup_;
/// Group for all postprocessors
QActionGroup * postProcessorGroup_;
/// Group for all menu items
QActionGroup* viewGroup_;
......
......@@ -823,72 +823,6 @@ void CoreWidget::slotUpdateRendererMenu() {
}
void CoreWidget::slotUpdatePostProcessorMenu() {
// Add the menu if it does not exist yet
if ( postprocessorMenu_ == 0 ) {
QString iconPath = OpenFlipper::Options::iconDirStr()+OpenFlipper::Options::dirSeparator();
postprocessorMenu_ = new QMenu(tr("Global Post Processor"),viewMenu_);
postprocessorMenu_->setIcon(QIcon(iconPath+"postprocessors.png"));
extended_actions.push_back(viewMenu_->addMenu(postprocessorMenu_));
connect(postprocessorMenu_,SIGNAL(aboutToShow () ) , this, SLOT(slotUpdatePostProcessorMenu() ) );
}
// delete the old post processor group if it exists
if ( postProcessorGroup_ ) {
disconnect( postProcessorGroup_ , SIGNAL( triggered( QAction * ) ),
this , SLOT( slotGlobalPostProcessorMenu( QAction * ) ) );
delete( postProcessorGroup_ );
postProcessorGroup_ = 0;
}
// Recreate actionGroup
postProcessorGroup_ = new QActionGroup( this );
postProcessorGroup_->setExclusive( true );
// // Get the options action for the currently active postprocessor
// for ( int i = 0 ; i < PluginFunctions::viewers() ; ++i)
// if( postProcessorManager()[ postProcessorManager().activeId( i )]->optionsAction != 0 ) {
// postprocessorMenu_->addAction(postProcessorManager()[ postProcessorManager().activeId( i ) ]->optionsAction );
// }
// postprocessorMenu_->addSeparator();
// Now add the post processors
for ( unsigned int i = 0 ; i < postProcessorManager().available() ; ++i) {
// Add a new Action with the postprocessors name
QAction * action = new QAction( postProcessorManager()[i]->name, postProcessorGroup_ );
action->setCheckable( true );
// Check if this processor is currently active
if ( postProcessorManager().activeId(PluginFunctions::activeExaminer() ) == i )
action->setChecked(true);
// Remember the id for the processor
action->setData(QVariant(i));
}
// Remove old data
postprocessorMenu_->clear();
// Add all new actions from the group to the menu
postprocessorMenu_->addActions( postProcessorGroup_->actions() );
// Connect signal of group to our managing slot
connect( postProcessorGroup_ , SIGNAL( triggered( QAction * ) ),
this , SLOT( slotGlobalPostProcessorMenu( QAction * ) ) );
}
void CoreWidget::slotUpdateGlobalDrawMenu() {
if ( drawGroup_ ) {
......
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