projects
/
cs356-p1-elevator.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GUI-ize the Floor and Elevator entry
[cs356-p1-elevator.git]
/
elevatorgui.hpp
diff --git
a/elevatorgui.hpp
b/elevatorgui.hpp
index
3a4b1f3
..
6dd2206
100644
(file)
--- a/
elevatorgui.hpp
+++ b/
elevatorgui.hpp
@@
-38,7
+38,6
@@
class ElevatorGUI : public Gtk::Window
void on_call_button_toggled (CallButton *button);
void on_request_button_toggled (RequestButton *button);
void on_playpause_button_clicked ();
void on_call_button_toggled (CallButton *button);
void on_request_button_toggled (RequestButton *button);
void on_playpause_button_clicked ();
- void on_stop_button_clicked ();
void on_quit_button_clicked ();
/* Timer Function */
void on_quit_button_clicked ();
/* Timer Function */
@@
-49,7
+48,7
@@
class ElevatorGUI : public Gtk::Window
int number_of_floors_;
int number_of_elevators_;
int number_of_floors_;
int number_of_elevators_;
- enum {
STOPPED,
RUNNING, PAUSED } simulation_status_;
+ enum { RUNNING, PAUSED } simulation_status_;
ElevatorController ec_;
ElevatorController ec_;
@@
-65,8
+64,8
@@
class ElevatorGUI : public Gtk::Window
// holds custom ElevatorDoor which knows it's elevator# and floor#
ElevatorDoorVector elevator_doors_;
// holds custom ElevatorDoor which knows it's elevator# and floor#
ElevatorDoorVector elevator_doors_;
- // Holds the Play / Pause button
, Stop button,
and Quit button
- Gtk::Button button_playpause_, button_
stop_, button_
quit_;
+ // Holds the Play / Pause button and Quit button
+ Gtk::Button button_playpause_, button_quit_;
// Holds the Table which holds everything
Gtk::Table table_;
// Holds the Table which holds everything
Gtk::Table table_;