kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

+ fixes #0002075: Analysis of FreeCAD by PVS-Studio static analyzer

Browse Source
This commit is contained in:
wmayer
2015-05-01 16:56:31 +02:00
parent d8f63bcfd1
commit dd2b39ddd6
21 changed files with 59 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/Gui/BlenderNavigationStyle.cpp
View File

@@ -188,18 +188,6 @@ SbBool BlenderNavigationStyle::processSoEvent(const SoEvent * const ev)
this->centerTime = ev->getTime();
processed = TRUE;
}
else if (!press && (this->currentmode == NavigationStyle::DRAGGING)) {
SbTime tmp = (ev->getTime() - this->centerTime);
float dci = (float)QApplication::doubleClickInterval()/1000.0f;
if (tmp.getValue() < dci) {
newmode = NavigationStyle::ZOOMING;
}
processed = TRUE;
}
else if (!press && (this->currentmode == NavigationStyle::DRAGGING)) {
this->setViewing(false);
processed = TRUE;
}
else if (viewer->isEditing() && (this->currentmode == NavigationStyle::SPINNING)) {
processed = TRUE;
}
@@ -229,14 +217,6 @@ SbBool BlenderNavigationStyle::processSoEvent(const SoEvent * const ev)
this->centerTime = ev->getTime();
processed = TRUE;
}
else if (!press && (this->currentmode == NavigationStyle::DRAGGING)) {
SbTime tmp = (ev->getTime() - this->centerTime);
float dci = (float)QApplication::doubleClickInterval()/1000.0f;
if (tmp.getValue() < dci) {
newmode = NavigationStyle::ZOOMING;
}
processed = TRUE;
}
this->button2down = press;
break;
case SoMouseButtonEvent::BUTTON3:
@@ -340,6 +320,9 @@ SbBool BlenderNavigationStyle::processSoEvent(const SoEvent * const ev)
else
newmode = NavigationStyle::SELECTION;
break;
//case BUTTON1DOWN|BUTTON3DOWN:
// newmode = NavigationStyle::PANNING;
// break;
case SHIFTDOWN|BUTTON3DOWN:
newmode = NavigationStyle::PANNING;
break;
@@ -349,6 +332,9 @@ SbBool BlenderNavigationStyle::processSoEvent(const SoEvent * const ev)
}
newmode = NavigationStyle::DRAGGING;
break;
//case BUTTON1DOWN|BUTTON2DOWN|BUTTON3DOWN:
// newmode = NavigationStyle::ZOOMING;
// break;
case CTRLDOWN|SHIFTDOWN|BUTTON2DOWN:
newmode = NavigationStyle::ZOOMING;
break;