Commit bfe4f6a9 authored by Dirk Wilden's avatar Dirk Wilden

drawModes now again listed correct

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@8576 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 874afbff
......@@ -101,7 +101,7 @@ OptionsWidget::OptionsWidget(std::vector<PluginInfo>& _plugins, std::vector<KeyB
connect(headerSelect, SIGNAL(currentIndexChanged(int)),
this, SLOT(slotPreviewStereoSettings(int)));
uint mode = 2;
ACG::SceneGraph::DrawModes::ModeFlagSet mode(2);
for (uint i=1; i < 22; i++) {
std::vector< QString > dm = drawModeToDescriptions( mode );
......@@ -120,7 +120,7 @@ OptionsWidget::OptionsWidget(std::vector<PluginInfo>& _plugins, std::vector<KeyB
for ( int i=0; i < PluginFunctions::viewers(); i++ ){
viewerList->addItem("Viewer " + QString::number(i+1) );
defaultDrawModes_.push_back( 0 );
defaultDrawModes_.push_back( ACG::SceneGraph::DrawModes::DEFAULT );
defaultProjectionMode_.push_back( 0 );
defaultViewingDirections_.push_back( 0 );
}
......
......@@ -52,6 +52,7 @@
#include <QtNetwork>
#include <OpenFlipper/Core/PluginInfo.hh>
#include <ACG/Scenegraph/DrawModes.hh>
//map for keyBindings
typedef std::multimap< std::pair< QObject*, int >, std::pair< int, Qt::KeyboardModifiers > > InverseKeyMap;
......@@ -166,7 +167,7 @@ private:
} downloadType;
// remember changes to viewer properties
std::vector< uint > defaultDrawModes_;
std::vector< ACG::SceneGraph::DrawModes::DrawMode > defaultDrawModes_;
std::vector< int > defaultProjectionMode_;
std::vector< int > defaultViewingDirections_;
......
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