Forssim

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

  1. 397772
  2. Merge into development
Proposed by jocke
Status: Merged
Merged at revision: not available
Proposed branch: lp:~jocke-karlsson/forssim/397772
Merge into: lp:forssim
Diff against target: None lines
To merge this branch: bzr merge lp:~jocke-karlsson/forssim/397772
Reviewer Review Type Date Requested Status
Martin Flodin Approve
Review via email: mp+10312@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Martin Flodin (mflodin) wrote :

Johan has tested and approves the merge

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-08-14 11:11:30 +0000
3+++ FsWisdom/RemoveWisdomToothWindow.cpp 2009-08-18 13:34:42 +0000
4@@ -200,6 +200,7 @@
5 ui.rotationPlusZ_2->setEnabled(false);
6 ui.rotationMinusY_2->setEnabled(false);
7 ui.rotationMinusZ_2->setEnabled(false);
8+ ui.progressBar_2->setValue(0);
9 }
10
11 RemoveWisdomToothWindow::~RemoveWisdomToothWindow()
12
13=== modified file 'src/AVolumePlaybackNode.cpp'
14--- src/AVolumePlaybackNode.cpp 2009-08-12 12:55:11 +0000
15+++ src/AVolumePlaybackNode.cpp 2009-08-18 13:13:28 +0000
16@@ -135,13 +135,12 @@
17 {
18 if ((direction->getValue() != 0) || (directionFastPlayback->getValue() != 0))
19 {
20- isPlay->setValue(false);
21 tempStop = true;
22 }
23 }
24
25 //Play the complete saved scenario.
26- if (isPlay->getValue())
27+ if (isPlay->getValue() && tempStop!=true)
28 {
29 if (playbackTimeField->getValue() < getEndTime())
30 {
31@@ -232,11 +231,10 @@
32
33 if (tempStop)
34 {
35- isPlay->setValue(true);
36 tempStop = false;
37 }
38+
39 oldRealTime = realTime;
40-
41 }
42
43 void AVolumePlaybackNode::setEndTime()

Subscribers

People subscribed via source and target branches

to all changes: