Commit 351909fd authored by Jan Möbius's avatar Jan Möbius

Fixed a lot of cppcheck warnings and some minor bugs

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@13301 383ad7c9-94d9-4d36-a494-682f7c89f535
parent a74df69c
...@@ -416,6 +416,9 @@ void MovePlugin::slotPickModeChanged( const std::string& _mode) ...@@ -416,6 +416,9 @@ void MovePlugin::slotPickModeChanged( const std::string& _mode)
{ {
switch (manMode_) switch (manMode_)
{ {
case QtTranslationManipulatorNode::Rotation:
PluginFunctions::setViewObjectMarker (PluginFunctions::defaultViewObjectMarker ());
break;
case QtTranslationManipulatorNode::Resize: case QtTranslationManipulatorNode::Resize:
PluginFunctions::setViewObjectMarker (PluginFunctions::defaultViewObjectMarker ()); PluginFunctions::setViewObjectMarker (PluginFunctions::defaultViewObjectMarker ());
break; break;
...@@ -536,6 +539,10 @@ void MovePlugin::setManipMode (QtTranslationManipulatorNode::ManipulatorMode _mo ...@@ -536,6 +539,10 @@ void MovePlugin::setManipMode (QtTranslationManipulatorNode::ManipulatorMode _mo
if (!hide_) if (!hide_)
switch (manMode_) switch (manMode_)
{ {
case QtTranslationManipulatorNode::Rotation:
PluginFunctions::setViewObjectMarker (PluginFunctions::defaultViewObjectMarker ());
placeMode_ = false;
break;
case QtTranslationManipulatorNode::Resize: case QtTranslationManipulatorNode::Resize:
PluginFunctions::setViewObjectMarker (PluginFunctions::defaultViewObjectMarker ()); PluginFunctions::setViewObjectMarker (PluginFunctions::defaultViewObjectMarker ());
placeMode_ = false; placeMode_ = false;
...@@ -706,8 +713,8 @@ void MovePlugin::placeManip(QMouseEvent * _event, bool _snap) { ...@@ -706,8 +713,8 @@ void MovePlugin::placeManip(QMouseEvent * _event, bool _snap) {
bool successfullyPicked = false; bool successfullyPicked = false;
int data = -1;
/* /*
* Snap manipulator to nearest geometry * Snap manipulator to nearest geometry
* element depending on which selection type is * element depending on which selection type is
...@@ -764,6 +771,8 @@ void MovePlugin::placeManip(QMouseEvent * _event, bool _snap) { ...@@ -764,6 +771,8 @@ void MovePlugin::placeManip(QMouseEvent * _event, bool _snap) {
object->manipPlaced(true); object->manipPlaced(true);
/// TODO: Whats this?
int data = -1;
if (data != -1) if (data != -1)
object->manipulatorNode()->setData( data ); object->manipulatorNode()->setData( data );
...@@ -1582,7 +1591,7 @@ void MovePlugin::updateManipulatorDialog() { ...@@ -1582,7 +1591,7 @@ void MovePlugin::updateManipulatorDialog() {
movePropsWidget* MovePlugin::getDialogWidget(BaseObjectData* _obj) { movePropsWidget* MovePlugin::getDialogWidget(BaseObjectData* _obj) {
for(QList<movePropsWidget*>::iterator it = propsWindows_.begin(); for(QList<movePropsWidget*>::iterator it = propsWindows_.begin();
it != propsWindows_.end(); it++) { it != propsWindows_.end(); ++it) {
if ( (*it)->getBaseObjectDataId() == _obj->id() ) if ( (*it)->getBaseObjectDataId() == _obj->id() )
return *it; return *it;
} }
......
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