Skip to content
Snippets Groups Projects
Commit 1cd27b66 authored by Günes Minareci's avatar Günes Minareci
Browse files

Merge branch 'master' of rcs:robocup-speechrec

parents e65e7a34 3fb3c349
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 31 additions and 26 deletions
pocketsphinxAdapter/grammar/gprs/gprs.jsgf
+ 6
− 5
View file @ 1cd27b66
......@@ -4,12 +4,12 @@ public <task> = [tobi] [(would | could) you] [please] <command> [please] [tobi];
<command> = <bring_command> | <goto_command> | <follow_command> | <find_command> | <put_command> | <learn_command> | <wait>;
<bring_command> = <bringVerb> [<person>] [the | an | a | some | this] <grab_object> [from | into | to] [<location> | <person>];
<bring_command> = <bringVerb> [<person>] [<article>] <grab_object> [from | into | to] [<article>] [<location> | <person>];
<goto_command> = <gotoVerb> <preposition> <location>;
<follow_command> = <followVerb> <person>;
<find_command> = <findVerb> ([the | an | a | some | this] <grab_object> | <person>) [in <location>];
<find_command> = <findVerb> ([<article>] <grab_object> | <person>) [in <location>];
<put_command> = <putVerb> <grab_object> <preposition> <location>;
<learn_command> = <learnVerb> [the | a | an | this] (<person> | <location>);
<learn_command> = <learnVerb> [<article>] (<person> | <location>);
<bringVerb> = bring | carry | retrieve | fetch | get | give;
<findVerb> = find | search for;
......@@ -18,7 +18,7 @@ public <task> = [tobi] [(would | could) you] [please] <command> [please] [tobi];
<followVerb> = follow;
<learnVerb> = learn | remember | memorize;
<person> = someone | <personal_pronoun> | <person_name> | (the | a | this) (person | man | woman | guy | girl | boy | human | robot);
<person> = someone | <personal_pronoun> | <person_name> | (person | man | woman | guy | girl | boy | human | robot);
<personal_pronoun> = him | her | me;
<person_name> = james|john|robert|michael|william|david|richard|charles|linda|thomas|mary|patricia|joseph|dorothy|barbara|susan|jennifer|maria|elizabeth|margaret;
......@@ -28,7 +28,7 @@ public <task> = [tobi] [(would | could) you] [please] <command> [please] [tobi];
<drink_class> = coke | beer | wine | redbull | water | juice;
<snack_class> = cookies | peanuts | chocolate | hazelnuts | noodles;
<location> = [the | an | a | this] (<appliance_class> | <shelf_class> | <seat_class> | <table_class> | <bin_class> | <decoration_class> | <room_class> | location | room | appliance | shelf | seat | table | bin | decoration | somewhere);
<location> = <appliance_class> | <shelf_class> | <seat_class> | <table_class> | <bin_class> | <decoration_class> | <room_class> | location | room | appliance | shelf | seat | table | bin | decoration | somewhere;
<appliance_class> = fridge | sink | tv;
<shelf_class> = hanger | shelf;
<seat_class> = couch | lounge | bed | armchair;
......@@ -38,4 +38,5 @@ public <task> = [tobi] [(would | could) you] [please] <command> [please] [tobi];
<room_class> = kitchen | living_room | dining_room;
<preposition> = (on [top of]) | in | ([next] to) | at | near | in | into | from;
<article> = the | an | a | some | this;
<wait> = wait;
pocketsphinxAdapter/nbproject/configurations.xml
+ 12
− 12
View file @ 1cd27b66
......@@ -636,22 +636,14 @@
<item path="src/PocketSphinxWidget.cpp" ex="false" tool="1" flavor2="4">
<ccTool>
<incDir>
<pElem>.</pElem>
<pElem>build</pElem>
<pElem>/usr/include/qt4</pElem>
<pElem>/usr/include/qt4/QtGui</pElem>
<pElem>/usr/include/qt4/QtCore</pElem>
<pElem>/usr/include/sphinxbase</pElem>
<pElem>/usr/include/pocketsphinx</pElem>
<pElem>/usr/include/alsa</pElem>
<pElem>/usr/include/boost-1_49</pElem>
<pElem>/usr/include/rsb0.9</pElem>
<pElem>/usr/include/rsc0.9</pElem>
<pElem>/usr/include/rsc0.9/3rdparty/boost.uuid</pElem>
<pElem>/usr/include/rst0.9/stable</pElem>
<pElem>build</pElem>
<pElem>/vol/robocup/2013/include</pElem>
<pElem>/vol/robocup/2013/include/sphinxbase</pElem>
<pElem>/vol/robocup/2013/include/pocketsphinx</pElem>
<pElem>/usr/include/alsa</pElem>
<pElem>/vol/robocup/2013/include/rsb0.9</pElem>
<pElem>/vol/robocup/2013/include/rsc0.9</pElem>
<pElem>/vol/robocup/2013/include/rsc0.9/3rdparty/boost.uuid</pElem>
......@@ -669,14 +661,22 @@
<item path="src/PocketSphinxWrapper.cpp" ex="false" tool="1" flavor2="4">
<ccTool>
<incDir>
<pElem>build</pElem>
<pElem>.</pElem>
<pElem>/usr/include/qt4</pElem>
<pElem>/usr/include/qt4/QtGui</pElem>
<pElem>/usr/include/qt4/QtCore</pElem>
<pElem>/usr/include/sphinxbase</pElem>
<pElem>/usr/include/pocketsphinx</pElem>
<pElem>/usr/include/alsa</pElem>
<pElem>/usr/include/boost-1_49</pElem>
<pElem>/usr/include/rsb0.9</pElem>
<pElem>/usr/include/rsc0.9</pElem>
<pElem>/usr/include/rsc0.9/3rdparty/boost.uuid</pElem>
<pElem>/usr/include/rst0.9/stable</pElem>
<pElem>build</pElem>
<pElem>/vol/robocup/2013/include</pElem>
<pElem>/vol/robocup/2013/include/sphinxbase</pElem>
<pElem>/vol/robocup/2013/include/pocketsphinx</pElem>
<pElem>/usr/include/alsa</pElem>
<pElem>/vol/robocup/2013/include/rsb0.9</pElem>
<pElem>/vol/robocup/2013/include/rsc0.9</pElem>
<pElem>/vol/robocup/2013/include/rsc0.9/3rdparty/boost.uuid</pElem>
......
pocketsphinxAdapter/nbproject/private/Default.properties
+ 1
− 1
View file @ 1cd27b66
/home/biron/git/robocup-speechrec/pocketsphinxAdapter/src/PocketSphinxWrapper.cpp=/home/biron/git/robocup-speechrec/pocketsphinxAdapter/build/src#-DRST_EXPORT= -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -I/home/biron/git/robocup-speechrec/pocketsphinxAdapter/build -I/usr/include/qt4 -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtCore -I/vol/robocup/2013/include -I/vol/robocup/2013/include/sphinxbase -I/vol/robocup/2013/include/pocketsphinx -I/usr/include/alsa -I/vol/robocup/2013/share/rsb0.9/../../include/rsb0.9 -I/vol/robocup/2013/share/rsc0.9/../../include/rsc0.9 -I/vol/robocup/2013/share/rsc0.9/../../include/rsc0.9/3rdparty/boost.uuid -I/vol/robocup/2013/share/rst0.9/../../include/rst0.9/stable -I/usr/include/libxml2 -o CMakeFiles/pocketsphinxAdapter.dir/PocketSphinxWrapper.cpp.o -c /home/biron/git/robocup-speechrec/pocketsphinxAdapter/src/PocketSphinxWrapper.cpp
/home/biron/git/robocup-speechrec/pocketsphinxAdapter/src/PocketSphinxWidget.cpp=/home/biron/git/robocup-speechrec/pocketsphinxAdapter/build/src#-DRST_EXPORT= -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -I/home/biron/git/robocup-speechrec/pocketsphinxAdapter/build -I/usr/include/qt4 -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtCore -I/vol/robocup/2013/include -I/vol/robocup/2013/include/sphinxbase -I/vol/robocup/2013/include/pocketsphinx -I/usr/include/alsa -I/vol/robocup/2013/share/rsb0.9/../../include/rsb0.9 -I/vol/robocup/2013/share/rsc0.9/../../include/rsc0.9 -I/vol/robocup/2013/share/rsc0.9/../../include/rsc0.9/3rdparty/boost.uuid -I/vol/robocup/2013/share/rst0.9/../../include/rst0.9/stable -I/usr/include/libxml2 -o CMakeFiles/pocketsphinxAdapter.dir/PocketSphinxWidget.cpp.o -c /home/biron/git/robocup-speechrec/pocketsphinxAdapter/src/PocketSphinxWidget.cpp
/vol/robocup/2013/lib/librsb.so.0.9=/home/biron/git/robocup-speechrec/pocketsphinxAdapter/build/src#CMakeFiles/pocketsphinxAdapter.dir/PocketsphinxAdapter.cpp.o CMakeFiles/pocketsphinxAdapter.dir/PocketSphinxWrapper.cpp.o CMakeFiles/pocketsphinxAdapter.dir/PocketSphinxWidget.cpp.o CMakeFiles/pocketsphinxAdapter.dir/SimpleDoubleThresholdSegmenter.cpp.o CMakeFiles/pocketsphinxAdapter.dir/SimpleTextAddField.cpp.o CMakeFiles/pocketsphinxAdapter.dir/AlsaMicGrabber.cpp.o CMakeFiles/pocketsphinxAdapter.dir/EqualizerColorWidget.cpp.o CMakeFiles/pocketsphinxAdapter.dir/JsgfParser.cpp.o CMakeFiles/pocketsphinxAdapter.dir/publishRsb.cpp.o CMakeFiles/pocketsphinxAdapter.dir/rsbRemoteReceiver.cpp.o CMakeFiles/pocketsphinxAdapter.dir/dataRingBuffer.cpp.o CMakeFiles/pocketsphinxAdapter.dir/configFileParser.cpp.o CMakeFiles/pocketsphinxAdapter.dir/moc_PocketsphinxAdapter.cxx.o CMakeFiles/pocketsphinxAdapter.dir/moc_PocketSphinxWidget.cxx.o CMakeFiles/pocketsphinxAdapter.dir/moc_SimpleDoubleThresholdSegmenter.cxx.o CMakeFiles/pocketsphinxAdapter.dir/moc_SimpleTextAddField.cxx.o CMakeFiles/pocketsphinxAdapter.dir/moc_PocketSphinxWrapper.cxx.o CMakeFiles/pocketsphinxAdapter.dir/moc_AlsaMicGrabber.cxx.o CMakeFiles/pocketsphinxAdapter.dir/moc_EqualizerColorWidget.cxx.o CMakeFiles/pocketsphinxAdapter.dir/moc_publishRsb.cxx.o CMakeFiles/pocketsphinxAdapter.dir/moc_rsbRemoteReceiver.cxx.o -o pocketsphinxAdapter -rdynamic -L/vol/robocup/2013/lib -lpocketsphinx -lsphinxbase -lsphinxad -lpulse -lpulse-simple -lpthread -lm -lblas -llapack -lsndfile -lasound -lQtGui -lQtCore /vol/robocup/2013/lib/librsb.so.0.9 /vol/robocup/2013/lib/librst.so.0.9 /vol/robocup/2013/lib/librsbxml.so.0.9 -lboost_thread-mt -lboost_system-mt /vol/robocup/2013/lib/librsb.so.0.9 /vol/robocup/2013/lib/libspread.so -lboost_date_time-mt /vol/robocup/2013/lib/librst.so.0.9 -lprotobuf /vol/robocup/2013/lib/librsc0.9.so.0.9 -lboost_thread-mt -lboost_filesystem-mt -lboost_signals-mt -lboost_regex-mt -lboost_program_options-mt -lpthread -lboost_system-mt -ldl -lxmltio -lxqilla -lxerces-c -lpthread -llog4cxx -Wl,-rpath,/vol/robocup/2013/lib::::::::::::::::::::::
pocketsphinxAdapter/nbproject/project.xml
+ 1
− 1
View file @ 1cd27b66
......@@ -6,7 +6,7 @@
<name>pocketsphinxAdapter</name>
<c-extensions>c</c-extensions>
<cpp-extensions>cpp,cxx</cpp-extensions>
<header-extensions>h,tcc</header-extensions>
<header-extensions>h,tcc,txt</header-extensions>
<sourceEncoding>UTF-8</sourceEncoding>
<make-dep-projects/>
<sourceRootList>
......
pocketsphinxAdapter/src/PocketSphinxWidget.cpp
+ 7
− 6
View file @ 1cd27b66
......@@ -137,7 +137,8 @@ pocketSphinxWidget::loadPS()
{
boost::filesystem::path myRsbPath = rsbLineEdit->text().toStdString();
myRsbPath.remove_filename();
std::string scope = myRsbPath.string();
std::string scope ("/request");
scope.append(myRsbPath.string());
//scope.append("/commands");
myRemoteReceiver = boost::make_shared<rsbRemoteReceiver>(scope);
}
......@@ -152,15 +153,15 @@ pocketSphinxWidget::loadPS()
name = nameLineEdit->text();
rsbScope = rsbLineEdit->text();
groupBoxLayout = boost::make_shared<QHBoxLayout>();
finalGroupBox = boost::make_shared<QGroupBox>(nameLineEdit->text());
//finalGroupBox = boost::make_shared<QGroupBox>(nameLineEdit->text());
QString infoString;
if (0 == rsbScope.compare(""))
infoString = "PocketSphinx loaded successfully";
infoString = "PocketSphinx <b>" + name + "</b> loaded successfully";
else
infoString = QString ("PocketSphinx loaded successfully publishing on scope: ").append(rsbScope);
infoString = QString ("PocketSphinx <b>"+name+"</b> loaded successfully publishing on scope: <b>").append(rsbScope).append("</b>");
psInfoLabel = boost::make_shared<QLabel>(infoString);
groupBoxLayout->addWidget(psInfoLabel.get());
finalGroupBox->setLayout(groupBoxLayout.get());
//finalGroupBox->setLayout(groupBoxLayout.get());
formLayout->removeWidget(nameLabel.get());
formLayout->removeWidget(nameLineEdit.get());
formLayout->removeWidget(hmmLabel.get());
......@@ -197,7 +198,7 @@ pocketSphinxWidget::loadPS()
rsbLineEdit.reset();
bestPathCeckBox.reset();
loadButton.reset();
formLayout->addWidget(finalGroupBox.get(),0,0);
formLayout->addLayout(groupBoxLayout.get(),0,0);
setLayout(formLayout.get());
emit psLoaded(myId);
}
......
pocketsphinxAdapter/src/PocketsphinxAdapter.cpp
+ 3
− 0
View file @ 1cd27b66
......@@ -48,6 +48,7 @@ pocketsphinxAdapterMainWindow::pocketsphinxAdapterMainWindow(QWidget* parent) :
connect(addPWidget.get(), SIGNAL (clicked() ), this, SLOT (addPocketSphinxWidget() ) );
/*
QObject::connect(&amg, SIGNAL ( updated_dB_and_clipped(float, bool) ), &w, SLOT ( update_eq_only(float, bool) ) );*/
this->setLayout(vBoxMainLayout.get());
}
pocketsphinxAdapterMainWindow::pocketsphinxAdapterMainWindow(boost::shared_ptr<PocketSphinxGlobalConfig> myConfig, QWidget* parent) : QMainWindow(parent), connectedToRemote(false) {
......@@ -101,6 +102,7 @@ pocketsphinxAdapterMainWindow::pocketsphinxAdapterMainWindow(boost::shared_ptr<P
boost::this_thread::sleep(boost::posix_time::millisec(500));
}
}
this->setLayout(vBoxMainLayout.get());
/*
QObject::connect(&amg, SIGNAL ( updated_dB_and_clipped(float, bool) ), &w, SLOT ( update_eq_only(float, bool) ) );*/
}
......@@ -284,6 +286,7 @@ main(int argc, char** argv) {
}
pocketsphinxAdapterMainWindow w(myConfig);
w.setGeometry(200, 100, 1024, 800);
myapp.setActiveWindow(&w);
w.show();
QObject::connect(&w, SIGNAL(gotQuit()), &myapp, SLOT(quit()));
if (myConfig->IsOpenDeviceDirectly())
......
pocketsphinxAdapter/src/sendSpeechRecEnable.cpp
+ 1
− 1
View file @ 1cd27b66
......@@ -21,7 +21,7 @@ int main(int argc, char** argv) {
std::string value = "1";
if (argc > 1)
value = argv[1];
std::string scope ("/speechrec/psa");
std::string scope ("/request/speechrec/psa");
rsb::Factory& factory = rsb::getFactory();
rsb::patterns::RemoteServerPtr remoteServer = factory.createRemoteServer(scope);
std::cout << "Calling Server at scope " << scope << " ... " << std::endl;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment