• R/O
  • SSH
  • HTTPS

qrobosdk: コミット


コミットメタ情報

リビジョン1769 (tree)
日時2010-04-11 23:39:37
作者satofumi

ログメッセージ

add StopWatch.cpp

変更サマリ

差分

--- trunk/libs/lua/luabindSystem.cpp (revision 1768)
+++ trunk/libs/lua/luabindSystem.cpp (revision 1769)
@@ -11,6 +11,7 @@
1111 #include "delay.h"
1212 #include "ticks.h"
1313 #include "CycleTimer.h"
14+#include "StopWatch.h"
1415 #include <luabind/luabind.hpp>
1516
1617 using namespace qrk;
@@ -33,6 +34,12 @@
3334 .def("cycleFps", &CycleTimer::cycleFps)
3435 .def("setCycleMsec", &CycleTimer::setCycleMsec)
3536 .def("cycleMsec", &CycleTimer::cycleMsec)
36- .def("toNextCycleMsec", &CycleTimer::toNextCycleMsec)
37+ .def("toNextCycleMsec", &CycleTimer::toNextCycleMsec),
38+
39+ class_<StopWatch>("StopWatch")
40+ .def(constructor<>())
41+ .def("start", &StopWatch::start)
42+ .def("ticks", &StopWatch::ticks)
43+ .def("stop", &StopWatch::stop)
3744 ];
3845 }
--- trunk/libs/lua/Makefile (revision 1768)
+++ trunk/libs/lua/Makefile (revision 1769)
@@ -108,7 +108,7 @@
108108 luabindSyncGui_master.o: ../common/Color.h
109109 luabindSyncGui_slave.o: luabindSyncGui_slave.h
110110 luabindSystem.o: luabindSystem.h ../system/delay.h ../system/ticks.h
111-luabindSystem.o: ../system/CycleTimer.h
111+luabindSystem.o: ../system/CycleTimer.h ../system/StopWatch.h
112112 luabindUrgDistance.o: luabindUrgDistance.h ../monitoring/mUrgDistance.h
113113 luabindUrgDistance.o: ../range_finder/UrgDistance.h
114114 luabindUrgDistance.o: ../range_finder/UrgDevice.h ../coordinate/Coordinate.h
--- trunk/libs/gui/samples/Makefile (revision 1768)
+++ trunk/libs/gui/samples/Makefile (revision 1769)
@@ -58,7 +58,7 @@
5858 chatMessageSample.o: ../Label.h ../CallbackEvent.h ../Event.h ../EventUtils.h
5959 chatMessageSample.o: ../../system/delay.h
6060 drawColorSurface.o: ../Screen.h ../../geometry/Rect.h ../ColorSurface.h
61-drawColorSurface.o: ../Surface.h ../../common/Color.h
61+drawColorSurface.o: ../Surface.h ../ImageSurface.h ../../common/Color.h
6262 drawText.o: ../Screen.h ../../geometry/Rect.h ../Font.h ../../common/Color.h
6363 drawText.o: ../TextSurface.h ../Surface.h
6464 handleEvent.o: ../Screen.h ../../geometry/Rect.h ../CallbackEvent.h
旧リポジトリブラウザで表示