Forssim

Merge lp:~jocke-karlsson/forssim/Bug_400647 into lp:forssim

  1. Bug_400647
  2. Merge into development
Proposed by jocke
Status: Merged
Merged at revision: not available
Proposed branch: lp:~jocke-karlsson/forssim/Bug_400647
Merge into: lp:forssim
Diff against target: 45 lines
2 files modified
FsWisdom/RemoveWisdomToothWindow.cpp (+2/-0)
FsWisdom/Updater_QButton_SFInt32_Drill_Elevator.cpp (+7/-1)
To merge this branch: bzr merge lp:~jocke-karlsson/forssim/Bug_400647
Reviewer Review Type Date Requested Status
Daniel Stehn Approve
Review via email: mp+14012@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Daniel Stehn (daniel-stehn) wrote :

looks fine

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'FsWisdom/RemoveWisdomToothWindow.cpp'
2--- FsWisdom/RemoveWisdomToothWindow.cpp 2009-10-01 11:31:43 +0000
3+++ FsWisdom/RemoveWisdomToothWindow.cpp 2009-10-27 07:10:23 +0000
4@@ -551,6 +551,7 @@
5 {
6 drillable->whichChoice.get()->setValue(0);
7 deviceShape->whichChoice.get()->setValue(0);
8+ aDrillableNode->drillSpeed.get()->setValue(0); //Solved problem that drillspeed is still "on" (>0) if drill is on and is toggled off and than back but the drillimage is "off"
9 }
10 }
11 }
12@@ -564,6 +565,7 @@
13 {
14 deviceShape->whichChoice.get()->setValue(1);
15 vibrations->whichChoice.get()->setValue(0);
16+ aDrillableNode->drillSpeed.get()->setValue(0);
17 }
18 }
19 }
20
21=== modified file 'FsWisdom/Updater_QButton_SFInt32_Drill_Elevator.cpp'
22--- FsWisdom/Updater_QButton_SFInt32_Drill_Elevator.cpp 2009-09-04 11:25:02 +0000
23+++ FsWisdom/Updater_QButton_SFInt32_Drill_Elevator.cpp 2009-10-27 07:10:23 +0000
24@@ -37,7 +37,7 @@
25 int deviceShape = static_cast< SFInt32 * >(routes_in[0])->getValue();
26 switch (deviceShape) {
27 case 0:
28- //Drill
29+ //Drill off
30 ui.selectDrillButton->setChecked(true);
31 ui.selectElevatorButton->setChecked(false);
32 ui.toolButton->setChecked(true);
33@@ -52,6 +52,12 @@
34 //No tool
35 //No need to do anything since this can only be set from GUI.
36 break;
37+ case 3:
38+ //Drill on
39+ ui.selectDrillButton->setChecked(true);
40+ ui.selectElevatorButton->setChecked(false);
41+ ui.toolButton->setChecked(true);
42+ break;
43 default:
44 cout << "Updater_QButton_SFInt32_Drill_Elevator::update() Undefined value in deviceShape!" << endl;
45 }

Subscribers

People subscribed via source and target branches

to all changes: