From b8cdcc82b191c5a1f2337bc3e3381d773dd8f09a Mon Sep 17 00:00:00 2001
From: Matthias Schoepfer <mschoepf@techfak.uni-bielefeld.de>
Date: Tue, 25 Jun 2013 00:03:25 +0200
Subject: [PATCH] changed scope + minor beautification of loaded ps instance
---
.../nbproject/configurations.xml | 24 +++++++++----------
.../nbproject/private/Default.properties | 2 +-
pocketsphinxAdapter/nbproject/project.xml | 2 +-
.../src/PocketSphinxWidget.cpp | 13 +++++-----
.../src/PocketsphinxAdapter.cpp | 3 +++
.../src/sendSpeechRecEnable.cpp | 2 +-
6 files changed, 25 insertions(+), 21 deletions(-)
diff --git a/pocketsphinxAdapter/nbproject/configurations.xml b/pocketsphinxAdapter/nbproject/configurations.xml
index 9f014f9f..d5b60aaa 100644
--- a/pocketsphinxAdapter/nbproject/configurations.xml
+++ b/pocketsphinxAdapter/nbproject/configurations.xml
@@ -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>
diff --git a/pocketsphinxAdapter/nbproject/private/Default.properties b/pocketsphinxAdapter/nbproject/private/Default.properties
index 37050938..1ccb5dec 100644
--- a/pocketsphinxAdapter/nbproject/private/Default.properties
+++ b/pocketsphinxAdapter/nbproject/private/Default.properties
@@ -1,2 +1,2 @@
-/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::::::::::::::::::::::
diff --git a/pocketsphinxAdapter/nbproject/project.xml b/pocketsphinxAdapter/nbproject/project.xml
index fda70d50..1a323db9 100644
--- a/pocketsphinxAdapter/nbproject/project.xml
+++ b/pocketsphinxAdapter/nbproject/project.xml
@@ -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>
diff --git a/pocketsphinxAdapter/src/PocketSphinxWidget.cpp b/pocketsphinxAdapter/src/PocketSphinxWidget.cpp
index 3f0f9bd2..2be01172 100644
--- a/pocketsphinxAdapter/src/PocketSphinxWidget.cpp
+++ b/pocketsphinxAdapter/src/PocketSphinxWidget.cpp
@@ -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);
}
diff --git a/pocketsphinxAdapter/src/PocketsphinxAdapter.cpp b/pocketsphinxAdapter/src/PocketsphinxAdapter.cpp
index e5c4d544..8fc4e46a 100644
--- a/pocketsphinxAdapter/src/PocketsphinxAdapter.cpp
+++ b/pocketsphinxAdapter/src/PocketsphinxAdapter.cpp
@@ -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())
diff --git a/pocketsphinxAdapter/src/sendSpeechRecEnable.cpp b/pocketsphinxAdapter/src/sendSpeechRecEnable.cpp
index d2f3da41..19b55707 100644
--- a/pocketsphinxAdapter/src/sendSpeechRecEnable.cpp
+++ b/pocketsphinxAdapter/src/sendSpeechRecEnable.cpp
@@ -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;
--
GitLab