Changeset 435 in flair-src for trunk/demos/TwoWheelRobotCircleFollower/ugv
- Timestamp:
- Jul 15, 2021, 2:44:03 PM (3 years ago)
- Location:
- trunk/demos/TwoWheelRobotCircleFollower/ugv/src
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/demos/TwoWheelRobotCircleFollower/ugv/src/CircleFollower.cpp
r430 r435 61 61 startCircle=new PushButton(buttonslayout->NewRow(),"start_circle"); 62 62 stopCircle=new PushButton(buttonslayout->LastRowLastCol(),"stop_circle"); 63 button_start_log = new PushButton(buttonslayout->NewRow(), "start_log"); 64 button_stop_log = new PushButton(buttonslayout->LastRowLastCol(), "stop_log"); 63 65 64 66 circle=new TrajectoryGenerator2DCircle(vrpnclient->GetLayout()->NewRow(),"circle"); … … 77 79 uY=new Pid(setupLawTab->At(1,1),"u_y"); 78 80 uY->UseDefaultPlot(graphLawTab->LastRowLastCol()); 81 82 getFrameworkManager()->AddDeviceToLog(uX); 83 getFrameworkManager()->AddDeviceToLog(uY); 79 84 80 85 l=new DoubleSpinBox(setupLawTab->NewRow(),"L", " m", 0, 10, 0.1, 1,1); … … 104 109 105 110 void CircleFollower::CheckPushButton(void) { 111 if (button_start_log->Clicked() == true) 112 getFrameworkManager()->StartLog(); 113 if (button_stop_log->Clicked() == true) 114 getFrameworkManager()->StopLog(); 115 106 116 if (startCircle->Clicked() == true) 107 117 StartCircle(); -
trunk/demos/TwoWheelRobotCircleFollower/ugv/src/CircleFollower.h
r389 r435 56 56 57 57 flair::filter::Pid *uX, *uY; 58 flair::gui::PushButton *startCircle,*stopCircle,*button_kill ;58 flair::gui::PushButton *startCircle,*stopCircle,*button_kill,*button_start_log,*button_stop_log; 59 59 flair::gui::DoubleSpinBox *l; 60 60 flair::meta::MetaVrpnObject *targetVrpn,*ugvVrpn;
Note:
See TracChangeset
for help on using the changeset viewer.