- Timestamp:
- Mar 27, 2014, 12:53:36 PM (11 years ago)
- Location:
- trunk/src
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/DBITEPlayerLib/DbtPlyTrigger.cpp
r288 r290 48 48 return CONFIGURED_FAILED; 49 49 } 50 connect(this, SIGNAL(triggerSig()),50 QObject::connect(this, SIGNAL(triggerSig()), 51 51 mEngine.get(), SLOT(engReceiver()), 52 52 Qt::DirectConnection); -
trunk/src/DBITEPlayerLib/DbtPlyUserInterface.cpp
r288 r290 167 167 QGridLayout * mainLayout = new QGridLayout(this); 168 168 169 butGroup = new QButtonGroup (this);169 butGroup = new QButtonGroup(this); 170 170 playBut = new QPushButton ("|>", this); 171 171 playBut->resize(kButtonWidthInPixels, kButtonHeightInPixels); … … 314 314 { 315 315 // FIXME: use Qt5 connect style 316 connect(playBut, SIGNAL(clicked()),316 QObject::connect(playBut, SIGNAL(clicked()), 317 317 mEngine.get(), SLOT(playEvent())); 318 connect(pauseBut, SIGNAL(clicked()),318 QObject::connect(pauseBut, SIGNAL(clicked()), 319 319 mEngine.get(), SLOT(pauseEvent())); 320 connect(stopBut, SIGNAL(clicked()),320 QObject::connect(stopBut, SIGNAL(clicked()), 321 321 mEngine.get(), SLOT(stopEvent())); 322 connect(speedUpBut, SIGNAL(clicked()),322 QObject::connect(speedUpBut, SIGNAL(clicked()), 323 323 mEngine.get(), SLOT(speedUpEvent())); 324 connect(speedDownBut, SIGNAL(clicked()),324 QObject::connect(speedDownBut, SIGNAL(clicked()), 325 325 mEngine.get(), SLOT(speedDownEvent())); 326 326 } … … 328 328 void DbtPlyUserInterface::connectDisplay() 329 329 { 330 connect(mEngine.get(), SIGNAL(displayStateSig(DbtPlyEngineState *, float)),330 QObject::connect(mEngine.get(), SIGNAL(displayStateSig(DbtPlyEngineState *, float)), 331 331 this, SLOT(displayStateSlot(DbtPlyEngineState *, float))); 332 333 connect (mEngine.get(), SIGNAL(timeMinMax(road_time_t, road_time_t)), 332 QObject::connect(mEngine.get(), SIGNAL(timeMinMax(road_time_t, road_time_t)), 334 333 this, SLOT(displayMinMaxTime(road_time_t , road_time_t))); 335 connect(mEngine.get(), SIGNAL(curReplayTime(road_time_t)),334 QObject::connect(mEngine.get(), SIGNAL(curReplayTime(road_time_t)), 336 335 this, SLOT(displayTime(road_time_t))); 337 connect(rev, SIGNAL(toggled(bool)),336 QObject::connect(rev, SIGNAL(toggled(bool)), 338 337 mEngine.get(), SLOT(changeDirection(bool))); 339 338 } … … 341 340 void DbtPlyUserInterface::connectSlider() 342 341 { 343 connect(timeSlider, SIGNAL(sliderPressed()),342 QObject::connect(timeSlider, SIGNAL(sliderPressed()), 344 343 mEngine.get(), SLOT(pauseEvent())); 345 connect(timeSlider, SIGNAL(sliderReleased()),344 QObject::connect(timeSlider, SIGNAL(sliderReleased()), 346 345 mEngine.get(), SLOT(playEvent())); 347 346 } -
trunk/src/PacpusLib/ComponentBase.cpp
r288 r290 17 17 #include <boost/program_options/parsers.hpp> 18 18 #include <boost/program_options/variables_map.hpp> 19 //#include <boost/thread/thread.hpp>20 19 #include <ostream> 21 20 #include <string> … … 245 244 } 246 245 247 InputInterfaceBase 246 InputInterfaceBase* ComponentBase::getInput(QString inputName) const 248 247 { 249 248 if (inputs().contains(inputName)) { 250 return inputs()[inputName] ;249 return inputs()[inputName].get(); 251 250 } 252 251 LOG_WARN("Component " << getName() << " does not contain input " << inputName); … … 254 253 } 255 254 256 OutputInterfaceBase 255 OutputInterfaceBase* ComponentBase::getOutput(QString outputName) const 257 256 { 258 257 if (outputs().contains(outputName)) { 259 return outputs()[outputName] ;258 return outputs()[outputName].get(); 260 259 } 261 260 LOG_WARN("Component " << getName() << " does not contain output " << outputName); -
trunk/src/PacpusLib/ComponentManager.cpp
r288 r290 38 38 /// Connects OutputInterfaceBase @b out to InputInterfaceBase @b in using given priority and reading mode. 39 39 /// @returns @b true if connection has been added successfully, @b false otherwise. 40 bool connectInterface(OutputInterfaceBase * out, InputInterfaceBase* in, int priority, InputInterfaceBase::ReadingMode mode = InputInterfaceBase::GetLast);40 bool connectInterface(OutputInterfaceBase* out, InputInterfaceBase* in, int priority, InputInterfaceBase::ReadingMode mode = InputInterfaceBase::GetLast); 41 41 42 42 //////////////////////////////////////////////////////////////////////////////// 43 43 44 bool connectInterface(OutputInterfaceBase * out, InputInterfaceBase* in, int priority, InputInterfaceBase::ReadingMode mode)44 bool connectInterface(OutputInterfaceBase* out, InputInterfaceBase* in, int priority, InputInterfaceBase::ReadingMode mode) 45 45 { 46 46 // check connections -
trunk/src/PacpusSensor/src/main.cpp
r289 r290 14 14 #include <boost/cstdlib.hpp> 15 15 #include <boost/exception/diagnostic_information.hpp> 16 #include <QApplication>17 #include <QThread>18 16 #ifdef WIN32 19 # 17 # define NOMINMAX 20 18 # include <windows.h> 21 19 #endif … … 64 62 PacpusMainWindow window; 65 63 window.show(); 66 LOG_INFO("Current Thread " << QThread::currentThread());67 64 68 65 int exitStatus = boost::exit_exception_failure;
Note:
See TracChangeset
for help on using the changeset viewer.