• R/O
  • SSH
  • HTTPS

qrobosdk: コミット


コミットメタ情報

リビジョン1940 (tree)
日時2011-01-24 07:56:38
作者satofumi

ログメッセージ

added gui GUI components

変更サマリ

差分

--- trunk/widgets/UrgDrawWidget/UrgDrawWidget.cpp (revision 1939)
+++ trunk/widgets/UrgDrawWidget/UrgDrawWidget.cpp (revision 1940)
@@ -619,8 +619,8 @@
619619 }
620620
621621
622-void UrgDrawWidget::wheelEvent(QWheelEvent* event) {
623-
622+void UrgDrawWidget::wheelEvent(QWheelEvent* event)
623+{
624624 int degrees = event->delta() / 8;
625625 int steps = degrees / 15;
626626
--- trunk/widgets/ConnectionWidget/ConnectionWidget.h (nonexistent)
+++ trunk/widgets/ConnectionWidget/ConnectionWidget.h (revision 1940)
@@ -0,0 +1,30 @@
1+#ifndef CONNECTION_WIDGET_H
2+#define CONNECTION_WIDGET_H
3+
4+/*!
5+ \file
6+ \brief Connection widget
7+
8+ \author Satofumi KAMIMURA
9+
10+ $Id$
11+*/
12+
13+#include <QWidget>
14+
15+
16+namespace qrk
17+{
18+ class ConnectionWidget : public QWidget
19+ {
20+ Q_OBJECT;
21+
22+ public:
23+ // !!!
24+
25+ private:
26+ // !!!
27+ };
28+}
29+
30+#endif /* !CONNECTION_WIDGET_H */
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
--- trunk/libs/gui/SlideSelect.cpp (nonexistent)
+++ trunk/libs/gui/SlideSelect.cpp (revision 1940)
@@ -0,0 +1,66 @@
1+/*!
2+ \file
3+ \brief 項目のセレクタを移動させて決定を促す選択コンポーネント
4+
5+ \author Satofumi KAMIMURA
6+
7+ $Id$
8+*/
9+
10+#include "SlideSelect.h"
11+
12+using namespace qrk;
13+
14+
15+struct SlideSelect::pImpl
16+{
17+};
18+
19+
20+SlideSelect::SlideSelect(void)
21+ : pimpl(new pImpl)
22+{
23+}
24+
25+
26+Rect<long> SlideSelect::rect(void) const
27+{
28+ // !!!
29+ Rect<long> dummy;
30+ return dummy;
31+}
32+
33+
34+void SlideSelect::setEventAcceptable(bool acceptable)
35+{
36+ (void)acceptable;
37+ // !!!
38+}
39+
40+
41+void SlideSelect::setAlpha(float alpha)
42+{
43+ (void)alpha;
44+ // !!!
45+}
46+
47+
48+float SlideSelect::alpha(void)
49+{
50+ // !!!
51+ return 0.0;
52+}
53+
54+
55+void SlideSelect::setRotateAngle(const Angle& angle)
56+{
57+ (void)angle;
58+ // !!!
59+}
60+
61+
62+void SlideSelect::draw(const Rect<long>& area)
63+{
64+ (void)area;
65+ // !!!
66+}
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
--- trunk/libs/gui/ChangeSelect.h (nonexistent)
+++ trunk/libs/gui/ChangeSelect.h (revision 1940)
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
--- trunk/libs/gui/Makefile (revision 1939)
+++ trunk/libs/gui/Makefile (revision 1940)
@@ -48,6 +48,8 @@
4848 $(GUI_LIB)(ChatMessage.o) \
4949 $(GUI_LIB)(AlignUtils.o) \
5050 $(GUI_LIB)(CheckBox.o) \
51+ $(GUI_LIB)(ChangeSelect.o) \
52+ $(GUI_LIB)(SlideSelect.o) \
5153
5254 # DO NOT DELETE
5355
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
--- trunk/libs/gui/SlideSelect.h (nonexistent)
+++ trunk/libs/gui/SlideSelect.h (revision 1940)
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
--- trunk/libs/gui/ChangeSelect.cpp (nonexistent)
+++ trunk/libs/gui/ChangeSelect.cpp (revision 1940)
@@ -0,0 +1,66 @@
1+/*!
2+ \file
3+ \brief 項目の表示を入れ換えて決定を促す選択コンポーネント
4+
5+ \author Satofumi KAMIMURA
6+
7+ $Id$
8+*/
9+
10+#include "ChangeSelect.h"
11+
12+using namespace qrk;
13+
14+
15+struct ChangeSelect::pImpl
16+{
17+};
18+
19+
20+ChangeSelect::ChangeSelect(void)
21+ : pimpl(new pImpl)
22+{
23+}
24+
25+
26+Rect<long> ChangeSelect::rect(void) const
27+{
28+ // !!!
29+ Rect<long> dummy;
30+ return dummy;
31+}
32+
33+
34+void ChangeSelect::setEventAcceptable(bool acceptable)
35+{
36+ (void)acceptable;
37+ // !!!
38+}
39+
40+
41+void ChangeSelect::setAlpha(float alpha)
42+{
43+ (void)alpha;
44+ // !!!
45+}
46+
47+
48+float ChangeSelect::alpha(void)
49+{
50+ // !!!
51+ return 0.0;
52+}
53+
54+
55+void ChangeSelect::setRotateAngle(const Angle& angle)
56+{
57+ (void)angle;
58+ // !!!
59+}
60+
61+
62+void ChangeSelect::draw(const Rect<long>& area)
63+{
64+ (void)area;
65+ // !!!
66+}
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
--- trunk/libs/range_sensor/samples/calculate_diff.py (nonexistent)
+++ trunk/libs/range_sensor/samples/calculate_diff.py (revision 1940)
@@ -0,0 +1,9 @@
1+#!/usr/bin/env python
2+
3+import sys
4+
5+
6+file = sys.argv[1]
7+for line in open(file):
8+ values = line[:-1].split('\t')
9+ print int(values[0]) - int(values[1])
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
--- trunk/libs/packages/qrk/m4/opencv.m4 (nonexistent)
+++ trunk/libs/packages/qrk/m4/opencv.m4 (revision 1940)
@@ -0,0 +1,163 @@
1+# Configure paths for opencv
2+# Albert Huang
3+# Large parts shamelessly stolen from GIMP
4+
5+dnl AM_PATH_OPENCV([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
6+dnl Test for opencv, and define OPENCV_CFLAGS and OPENCV_LIBS
7+dnl
8+AC_DEFUN([AM_PATH_OPENCV],
9+[dnl
10+dnl Get the cflags and libraries from pkg-config
11+dnl
12+
13+AC_ARG_ENABLE(opencvtest, [ --disable-opencvtest do not try to compile and run a test opencv program],, enable_opencvtest=yes)
14+
15+pkg_name=opencv
16+pkg_config_args="$pkg_name"
17+
18+no_opencv=""
19+
20+AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
21+
22+if test x$PKG_CONFIG != xno ; then
23+if pkg-config --atleast-pkgconfig-version 0.7 ; then
24+:
25+else
26+echo *** pkg-config too old; version 0.7 or better required.
27+no_opencv=yes
28+PKG_CONFIG=no
29+fi
30+else
31+no_opencv=yes
32+fi
33+
34+min_opencv_version=ifelse([$1], ,1.0.0,$1)
35+AC_MSG_CHECKING(for opencv - version >= $min_opencv_version)
36+
37+if test x$PKG_CONFIG != xno ; then
38+## don't try to run the test against uninstalled libtool libs
39+if $PKG_CONFIG --uninstalled $pkg_config_args; then
40+echo "Will use uninstalled version of opencv found in PKG_CONFIG_PATH"
41+enable_opencvtest=no
42+fi
43+
44+if $PKG_CONFIG --atleast-version $min_opencv_version $pkg_config_args; then
45+:
46+else
47+no_opencv=yes
48+fi
49+fi
50+
51+if test x"$no_opencv" = x ; then
52+OPENCV_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
53+OPENCV_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
54+
55+opencv_pkg_major_version=`$PKG_CONFIG --modversion $pkg_name | \
56+sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
57+opencv_pkg_minor_version=`$PKG_CONFIG --modversion $pkg_name | \
58+sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
59+opencv_pkg_micro_version=`$PKG_CONFIG --modversion $pkg_name | \
60+sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
61+if test "x$enable_opencvtest" = "xyes" ; then
62+ac_save_CFLAGS="$CFLAGS"
63+ac_save_LIBS="$LIBS"
64+CFLAGS="$CFLAGS $OPENCV_CFLAGS"
65+LIBS="$OPENCV_LIBS $LIBS"
66+
67+dnl
68+dnl Now check if the installed opencv is sufficiently new. (Also sanity
69+dnl checks the results of pkg-config to some extent
70+dnl
71+rm -f conf.opencvtest
72+AC_TRY_RUN([
73+#include <stdio.h>
74+#include <stdlib.h>
75+#include <string.h>
76+
77+#include <opencv/cv.h>
78+
79+CvPoint cvp = { 0, 0 };
80+
81+int main ()
82+{
83+int major, minor, micro;
84+char *tmp_version;
85+
86+system ("touch conf.opencvtest");
87+
88+/* HP/UX 9 (%@#!) writes to sscanf strings */
89+tmp_version = strdup("$min_opencv_version");
90+if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
91+printf("%s, bad version string\n", "$min_opencv_version");
92+exit(1);
93+}
94+
95+if (($opencv_pkg_major_version > major) ||
96+(($opencv_pkg_major_version == major) && ($opencv_pkg_minor_version > minor)) ||
97+(($opencv_pkg_major_version == major) && ($opencv_pkg_minor_version == minor) && ($opencv_pkg_micro_version >= micro)))
98+{
99+return 0;
100+}
101+else
102+{
103+printf("\n*** 'pkg-config --modversion %s' returned %d.%d.%d, but the minimum version\n", "$pkg_name", $opencv_pkg_major_version, $opencv_pkg_minor_version, $opencv_pkg_micro_version);
104+printf("*** of opencv required is %d.%d.%d. If pkg-config is correct, then it is\n", major, minor, micro);
105+printf("*** best to upgrade to the required version.\n");
106+printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
107+printf("*** to point to the correct the correct configuration files\n");
108+return 1;
109+}
110+}
111+
112+],, no_opencv=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
113+CFLAGS="$ac_save_CFLAGS"
114+LIBS="$ac_save_LIBS"
115+fi
116+fi
117+if test "x$no_opencv" = x ; then
118+AC_MSG_RESULT(yes (version $opencv_pkg_major_version.$opencv_pkg_minor_version.$opencv_pkg_micro_version))
119+ifelse([$2], , :, [$2])
120+else
121+if test "$PKG_CONFIG" = "no" ; then
122+echo "*** A new enough version of pkg-config was not found."
123+echo "*** See http://www.freedesktop.org/software/pkgconfig/"
124+else
125+if test -f conf.opencvtest ; then
126+:
127+else
128+echo "*** Could not run opencv test program, checking why..."
129+CFLAGS="$CFLAGS $OPENCV_CFLAGS"
130+LIBS="$LIBS $OPENCV_LIBS"
131+AC_TRY_LINK([
132+#include <stdio.h>
133+#include <opencv/cv.h>
134+
135+CvPoint cvp = { 0, 0 };
136+
137+
138+], [ return 0; ],
139+[ echo "*** The test program compiled, but did not run. This usually means"
140+echo "*** that the run-time linker is not finding opencv or finding the wrong"
141+echo "*** version of opencv. If it is not finding opencv, you'll need to set your"
142+echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
143+echo "*** to the installed location Also, make sure you have run ldconfig if that"
144+echo "*** is required on your system"
145+echo "***"
146+echo "*** If you have an old version installed, it is best to remove it, although"
147+echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
148+[ echo "*** The test program failed to compile or link. See the file config.log for the"
149+echo "*** exact error that occurred. This usually means opencv is incorrectly installed."])
150+CFLAGS="$ac_save_CFLAGS"
151+LIBS="$ac_save_LIBS"
152+fi
153+fi
154+OPENCV_CFLAGS=""
155+OPENCV_LIBS=""
156+ifelse([$3], , :, [$3])
157+fi
158+AC_SUBST(OPENCV_CFLAGS)
159+AC_SUBST(OPENCV_LIBS)
160+AC_SUBST(OPENCV_DATA_DIR)
161+AC_SUBST(OPENCV_PLUGIN_DIR)
162+rm -f conf.opencvtest
163+])
--- trunk/libs/packages/urg/src/cpp/monitor/Makefile.am (revision 1939)
+++ trunk/libs/packages/urg/src/cpp/monitor/Makefile.am (revision 1940)
@@ -8,4 +8,4 @@
88 liburg_monitor_la_SOURCES = MonitorDataHandler.cpp MonitorModeManager.cpp MonitorEventScheduler.cpp DeviceIpManager.cpp LogNameHolder.cpp mConnection.cpp mUrgDevice.cpp UrgServer.cpp
99
1010 AM_CXXFLAGS = ${SDL_CFLAGS}
11-LIBS += ${BOOST_FILESYSTEM_LIB}
11+#LIBS += ${BOOST_FILESYSTEM_LIB}
--- trunk/libs/packages/urg/ChangeLog (revision 1939)
+++ trunk/libs/packages/urg/ChangeLog (revision 1940)
@@ -40,7 +40,7 @@
4040 * 0.8.6 released.
4141
4242 2010-01-07 Satofumi KAMIMURA <satofumi@uers.sourceforge.jp>
43- * Fixed to build C++ library without Boot library on Windows.
43+ * Fixed to build C++ library without Boost library on Windows.
4444 * 0.8.5 released.
4545
4646 2009-12-01 Satofumi KAMIMURA <satofumi@uers.sourceforge.jp>
旧リポジトリブラウザで表示