Changeset 120 in pacpusframework for branches/2.0-beta1/src


Ignore:
Timestamp:
Jul 15, 2013, 4:59:37 PM (11 years ago)
Author:
morasjul
Message:
  • add PacpusSerialport (QT 5.1 required)
  • add part of QT4 / QT5 cmake script
  • fix CMake (link)
  • add ComponentBase virtual function addInput() & addOutput() call before component configuration
Location:
branches/2.0-beta1/src
Files:
1 added
1 deleted
7 edited

Legend:

Unmodified
Added
Removed
  • branches/2.0-beta1/src/DBITEPlayer/CMakeLists.txt

    r111 r120  
    6767# Libraries & Dependencies
    6868# ========================================
     69
     70set(OPT_LIBRARIES
     71    optimized dbiteplayerlib debug dbiteplayerlib_d
     72    optimized FileLib debug FileLib_d
     73    optimized PacpusLib debug PacpusLib_d
     74)
     75
    6976# Windows platform
    7077if(WIN32)
    71 set(LIBS
     78    LIST(APPEND OPT_LIBRARIES
    7279        optimized ROAD_TIME debug ROAD_TIME_d
    7380        Winmm
    74 )
     81    )
    7582endif()
    7683
     
    7986    ${PROJECT_NAME}
    8087    ${QT_LIBRARIES}
    81     ${LIBS}
     88    ${OPT_LIBRARIES}
    8289    ${PACPUS_DEPENDENCIES_LIB}
    83     optimized dbiteplayerlib debug dbiteplayerlib_d
    84     optimized FileLib debug FileLib_d
    85     optimized PacpusLib debug PacpusLib_d
    8690)
    8791
  • branches/2.0-beta1/src/DBITEPlayerLib/CMakeLists.txt

    r111 r120  
    8888# Libraries
    8989# ========================================
     90set(OPT_LIBRARIES
     91        optimized FileLib debug FileLib_d
     92        optimized PacpusLib debug PacpusLib_d
     93)
     94
    9095# Windows platform
    9196if(WIN32)
    92 set(LIBS
     97    LIST(APPEND OPT_LIBRARIES
    9398        optimized ROAD_TIME debug ROAD_TIME_d
    9499        Winmm
     
    100105    ${PROJECT_NAME}
    101106    ${PACPUS_DEPENDENCIES_LIB}
    102     ${LIBS}
    103     optimized FileLib debug FileLib_d
    104     optimized PacpusLib debug PacpusLib_d
     107    ${OPT_LIBRARIES}
    105108    ${QT_LIBRARIES}
    106109)
  • branches/2.0-beta1/src/PacpusLib/CMakeLists.txt

    r111 r120  
    6565    ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/inputOutputInterface.h
    6666    ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/PacpusEvent.h
    67     #${PACPUS_INCLUDE_DIR}/Pacpus/kernel/CommunicationComponent.h
     67    #${PACPUS_INCLUDE_DIR}/Pacpus/kernel/pacpusStruct.h
    6868
    6969    ./ComponentBase.cpp
     
    7575    ./XmlConfigFile.cpp
    7676    ./inputOutputBase.cpp
     77    #./pacpusStruct.cpp
    7778)
    7879
     
    8283)
    8384
    84  qt5_wrap_cpp(
     85qt5_wrap_cpp(
    8586     PROJECT_MOC_SRCS
    8687     ${FILES_TO_MOC}
     
    9798
    9899if(UNIX)
    99         set(LIBS optimized FileLib debug FileLib_d)
     100    set(OPT_LIBRARIES optimized FileLib debug FileLib_d)
    100101else()
    101     set(LIBS
    102         optimized ROAD_TIME debug ROAD_TIME_d
    103         )
     102    set(OPT_LIBRARIES optimized ROAD_TIME debug ROAD_TIME_d)
    104103endif()
    105104
     
    111110    ${QT_LIBRARIES}
    112111    ${PACPUS_DEPENDENCIES_LIB}
    113     ${LIBS}
     112    ${OPT_LIBRARIES}
    114113)
    115114
  • branches/2.0-beta1/src/PacpusLib/ComponentBase.cpp

    r110 r120  
    104104    }
    105105}
     106
     107void ComponentBase::addInput()
     108{
     109
     110}
     111
     112void ComponentBase::addOutput()
     113{
     114
     115}
  • branches/2.0-beta1/src/PacpusLib/ComponentManager.cpp

    r110 r120  
    263263            LOG_WARN("component '" << componentName << "' does not exist");
    264264        } else {
     265           // Pacpus 2.0 : add input and output
     266            component->addInput();
     267            component->addOutput();
     268
    265269            if (component->configuration_ == ComponentBase::CONFIGURATION_DELAYED) {
    266270                LOG_DEBUG("try to configure component '" << componentName << "'");
     
    299303        int connectionPriority = cfg.getConnectionPriority();
    300304
     305
     306        //TODO set connection mode from string
     307
     308        //InputInterfaceBase::GetLast;
     309        //InputInterfaceBase::NeverSkip;
     310        //InputInterfaceBase::TimeBounded;
     311
     312
    301313        if (!createConnection(connectionOutput, connectionInput, connectionType,connectionPriority)) {
    302314            LOG_ERROR("cannot create connection '" << connectionOutput+"=>"+connectionInput << "'");
    303315            continue;
    304316        }
    305     }
     317    } // for
    306318
    307319    return componentMap_.count();
  • branches/2.0-beta1/src/PacpusSensor/CMakeLists.txt

    r111 r120  
    2929    ${PROJECT_BINARY_DIR}/../PacpusLib
    3030    ${PROJECT_BINARY_DIR}/../FileLib
     31    ${PROJECT_BINARY_DIR}/../PacpusTools
    3132)
    3233
     
    4647set(SENSOR_UI_CLASSES src/ui/pacpusmainwindow.ui)
    4748set(SENSOR_MOC_CLASSES src/ui/pacpusmainwindow.h)
     49
    4850qt5_wrap_ui(SENSOR_UI_SOURCES_H ${SENSOR_UI_CLASSES})
    4951qt5_wrap_cpp(SENSOR_MOC_SOURCES ${SENSOR_MOC_CLASSES})
     52
    5053source_group(Main_ui FILES ${PROJECT_SRCS} )
    5154source_group(moc FILES ${SENSOR_MOC_SOURCES} ${SENSOR_UI_SOURCES_H} )
     
    6669# Libraries
    6770# ========================================
     71
     72set(OPT_LIBRARIES
     73        optimized FileLib debug FileLib_d
     74        optimized PacpusLib debug PacpusLib_d
     75        optimized PacpusTools debug PacpusTools_d
     76)
     77
    6878# Windows platform
    6979if(WIN32)
    70 set(LIBS
     80    LIST(APPEND OPT_LIBRARIES
    7181        optimized ROAD_TIME debug ROAD_TIME_d
    7282        Winmm
     
    7888    ${PROJECT_NAME}
    7989    ${PACPUS_DEPENDENCIES_LIB}
    80     optimized FileLib debug FileLib_d
    81     optimized PacpusLib debug PacpusLib_d
    82     ${LIBS}
     90    ${OPT_LIBRARIES}
    8391    ${QT_LIBRARIES}
    8492)
  • branches/2.0-beta1/src/PacpusTools/CMakeLists.txt

    r119 r120  
    4040    ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/geodesie.h
    4141    #${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/pacpusStruct.h
    42     #${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/PacpusSerialPort.h
     42    ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/PacpusSerialPort.h
    4343    ./src/matrice.cpp
    4444    ./src/geodesie.cpp
    4545    ./src/AsyncWorkerBase.cpp
    4646    ./src/PeriodicWorker.cpp
    47     #./src/PacpusSerialPort.cpp
     47    ./src/PacpusSerialPort.cpp
    4848)
    4949
     
    5555    ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/AsyncWorkerBase.h
    5656    ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/PeriodicWorker.h
    57     #${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/PacpusSerialPort.h
     57    ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/PacpusSerialPort.h
    5858)
    5959
Note: See TracChangeset for help on using the changeset viewer.