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

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

Disabled playback buttons when not in playback-mode.
If we alter want to be able to do playback during drilling we can change this.

318. By jocke

fix for play-button adding time even after endtime

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-07-20 13:23:20 +0000
3+++ FsWisdom/RemoveWisdomToothWindow.cpp 2009-08-12 11:23:50 +0000
4@@ -174,7 +174,14 @@
5 updater_label_teethRotationField_2.reset(new Updater_QLabel_SFRotation(ui,ui.teethRotation,ui.teethRadio,teeth->rotation.get(),defaultValues->rotationZoomFactorField.get(),1));
6
7 this->isPlayback = playback;
8-
9+ if (playback)
10+ {
11+ enablePlayback();
12+ }
13+ else
14+ {
15+ disablePlayback();
16+ }
17 }
18
19 RemoveWisdomToothWindow::~RemoveWisdomToothWindow()
20@@ -339,6 +346,7 @@
21 deviceShape->whichChoice.get()->setValue(0);
22 }
23 }
24+
25 void RemoveWisdomToothWindow::selectElevator()
26 {
27 if(ui.selectElevatorButton->isChecked()&&ui.toolButton->isChecked())
28@@ -348,3 +356,27 @@
29 }
30 }
31
32+void RemoveWisdomToothWindow::disablePlayback()
33+{
34+ cout << "disablePlayback " << endl;
35+ ui.rw_2->setEnabled(false);
36+ ui.playstop_2->setEnabled(false);
37+ ui.ffw_2->setEnabled(false);
38+ ui.reset_2->setEnabled(false);
39+ ui.pushButton->setEnabled(false);
40+ ui.playbacktime_2->setEnabled(false);
41+ ui.playbacklabel_2->setEnabled(false);
42+}
43+
44+void RemoveWisdomToothWindow::enablePlayback()
45+{
46+ cout << "enablePlayback " << endl;
47+ ui.rw_2->setEnabled(true);
48+ ui.playstop_2->setEnabled(true);
49+ ui.ffw_2->setEnabled(true);
50+ ui.reset_2->setEnabled(true);
51+ ui.pushButton->setEnabled(true);
52+ ui.playbacktime_2->setEnabled(true);
53+ ui.playbacklabel_2->setEnabled(true);
54+}
55+
56
57=== modified file 'FsWisdom/RemoveWisdomToothWindow.h'
58--- FsWisdom/RemoveWisdomToothWindow.h 2009-06-12 11:47:31 +0000
59+++ FsWisdom/RemoveWisdomToothWindow.h 2009-08-12 11:23:50 +0000
60@@ -85,6 +85,8 @@
61 void highlightForbidden();
62 void selectDrill();
63 void selectElevator();
64+ void disablePlayback();
65+ void enablePlayback();
66
67 private:
68 Ui::RemoveWisdomToothWindowClass ui;

Subscribers

People subscribed via source and target branches

to all changes: