Changeset 4773


Ignore:
Timestamp:
May 16, 2017, 12:44:19 PM (2 years ago)
Author:
Juanma
Message:

Updated to 2.3.2-1

Location:
qstopmotion/trunk/fuentes
Files:
183 edited

Legend:

Unmodified
Added
Removed
  • qstopmotion/trunk/fuentes/CMakeLists.txt

    r446 r4773  
    22# CMake file for the qStopMotion project                                      #
    33# (c) Ralf Lange, longsoft.de                                                 #
    4 # Last update: 2015-06-12                                                     #
     4# Last update: 2016-11-10                                                     #
    55#                                                                             #
    66# Usage:                                                                      #
     
    1010#      + press the CMake button                                               #
    1111#   * makefile: (Windows)                                                     #
    12 #      + cmake -G "NMake Makefile"                                            #
     12#      + open Visual Studio Command Prompt                                    #
     13#        (for 64bit use: 'VS2013 x64 Native Tools Command Prompt'             #
     14#        (for 32bit use: 'VS2013 x32 Native Tools Command Prompt'             #
     15#      + cmake -G "NMake Makefiles" .                                         #
    1316#      + nmake                                                                #
    1417#      + nmake install (with administration rights)                           #
     
    1922#      + sudo make install                                                    #
    2023#   * MS Visual Studio (Windows)                                              #
    21 #      + cmake -G "Visual Studio 10 2010"                                     #
     24#      + for 32bit: cmake -G "Visual Studio 12 2013"                          #
     25#      + for 64bit: cmake -G "Visual Studio 12 2013 x64"                      #
    2226#      + open the solution file                                               #
    2327#                                                                             #
     
    2630project(qStopMotion)
    2731
    28 cmake_minimum_required(VERSION 2.8.2)
     32cmake_minimum_required(VERSION 2.8.8)
     33
     34###############################################################################
     35# Platform check
     36###############################################################################
     37
     38IF(WIN32)
     39    IF(CMAKE_CL_64)
     40        message("Target platform: Windows 64bit")
     41    ELSE(CMAKE_CL_64)
     42        message("Target platform: Windows 32bit")
     43    ENDIF(CMAKE_CL_64)
     44ELSEIF(UNIX)
     45    IF(APPLE)
     46        message(
     47            FATAL_ERROR
     48            "Target platform: MacOS 64bit - Not supported!"
     49        )
     50    ENDIF(APPLE)
     51
     52    IF("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
     53        message("Target platform: Unix 64bit")
     54    ELSE("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
     55        message("Target platform: Unix 32bit")
     56    ENDIF("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
     57ELSE(WIN32)
     58    message(
     59        FATAL_ERROR
     60        "Target platform - Not supported!"
     61    )
     62ENDIF(WIN32)
    2963
    3064###############################################################################
     
    3367
    3468IF(NOT DEFINED CMAKE_BUILD_TYPE)
    35     SET(CMAKE_BUILD_TYPE "Release")
     69    SET(
     70        CMAKE_BUILD_TYPE
     71        "Release"
     72        CACHE
     73        STRING
     74        "Create Release Version"
     75        FORCE
     76    )
    3677ENDIF(NOT DEFINED CMAKE_BUILD_TYPE)
    3778
     
    3980SET(QSTOPMOTION_HOMEPAGE "http://www.qstopmotion.org")
    4081SET(QSTOPMOTION_VERSION_MAJOR "2")
    41 SET(QSTOPMOTION_VERSION_MINOR "0")
     82SET(QSTOPMOTION_VERSION_MINOR "3")
    4283SET(QSTOPMOTION_VERSION_PATCH "2")
    4384
     
    4586
    4687###############################################################################
    47 # Qt4 support
    48 ###############################################################################
    49 
    50 # find and setup Qt4 for this poroject
    51 find_package(Qt4 REQUIRED)
    52 
    53 message("Qt Version: ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH}")
     88# Qt5 support
     89###############################################################################
    5490
    5591# Enable/disable Qt functionality
    56 set(QT_USE_QTXML TRUE)
    57 
    58 # include a cmake listfile
    59 include(${QT_USE_FILE})
     92SET(CMAKE_AUTOMOC ON)
     93SET(CMAKE_INCLUDE_CURRENT_DIR ON)
     94
     95# find and setup Qt5 for this poroject
     96find_package(Qt5 REQUIRED COMPONENTS Core Widgets Xml)
     97
     98message("Qt5 Version: ${Qt5Widgets_VERSION_STRING}")
    6099
    61100IF(CMAKE_BUILD_TYPE STREQUAL "Release")
     
    102141ENDIF(WIN32)
    103142
    104 IF(UNIX)
     143IF(UNIX AND NOT APPLE)
    105144    SET(
    106145        HEADERS
     
    109148        src/technical/grabber/video4linux2/v4l2controller.h
    110149    )
    111 ENDIF(UNIX)
     150ENDIF(UNIX AND NOT APPLE)
    112151
    113152# add all header files of the project to MOC to MOC_HEADERS
     
    181220ENDIF(WIN32)
    182221
    183 IF(UNIX)
     222IF(UNIX AND NOT APPLE)
    184223    SET(
    185224        MOC_HEADERS
    186225        ${MOC_HEADERS}
    187226        src/technical/grabber/gphoto2/gpgrabber.h
    188         # src/technical/grabber/gstreamer/gstdevicegrabber.h
    189         src/technical/grabber/gstreamer/gstgrabber.h
    190         src/technical/grabber/gstreamer/videotestgrabber.h
    191         src/technical/grabber/gstreamer/linux/dv1394grabber.h
    192         src/technical/grabber/gstreamer/linux/usbgrabber.h
    193227        src/technical/grabber/video4linux2/v4l2grabber.h
    194228    )
    195 ENDIF(UNIX)
     229ENDIF(UNIX AND NOT APPLE)
    196230
    197231# add all source files to SOURCES
     
    234268    src/frontends/qtfrontend/dialogs/helpbrowser.cpp
    235269    src/frontends/qtfrontend/dialogs/startdialog.cpp
     270    src/frontends/qtfrontend/elements/clickablelabel.cpp
    236271    src/frontends/qtfrontend/elements/flexiblelineedit.cpp
    237272    src/frontends/qtfrontend/elements/flexiblespinbox.cpp
     
    281316ENDIF(WIN32)
    282317
    283 IF(UNIX)
     318IF(UNIX AND NOT APPLE)
    284319    SET(
    285320        SOURCES
     
    287322        src/technical/grabber/gphoto2/gpcontroller.cpp
    288323        src/technical/grabber/gphoto2/gpgrabber.cpp
    289         src/technical/grabber/gstreamer/gstgrabber.cpp
    290         src/technical/grabber/gstreamer/videotestgrabber.cpp
    291         src/technical/grabber/gstreamer/linux/dv1394grabber.cpp
    292         src/technical/grabber/gstreamer/linux/usbgrabber.cpp
    293324        src/technical/grabber/video4linux2/v4l2controller.cpp
    294325        src/technical/grabber/video4linux2/v4l2grabber.cpp
    295326    )
    296 ENDIF(UNIX)
     327ENDIF(UNIX AND NOT APPLE)
    297328
    298329SET(
     
    334365)
    335366
    336 ###############################################################################
    337 # GStreamer support
    338 #
    339 # (Only UNIX)
    340 #
    341 # used libraries: glib-2.0.lib, gobject-2.0.lib, gstreamer-0.10.lib, xml2.lib
    342 ###############################################################################
    343 
    344 IF(WIN32)
    345 
    346     SET(GSTREAMER_INCLUDE_DIR)
    347     SET(GSTREAMER_LIBRARIES)
    348     SET(GSTREAMER_FOUND)
    349 
    350 ELSE(WIN32)
    351 
    352     include(${CMAKE_SOURCE_DIR}/cmake/FindGStreamerPkgConfig.cmake)
    353     message("GSTREAMER_INCLUDE_DIR: ${GSTREAMER_INCLUDE_DIR}")
    354     message("GSTREAMER_LIBRARY: ${GSTREAMER_LIBRARY}")
    355     message("GSTREAMER_BASE_LIBRARY: ${GSTREAMER_BASE_LIBRARY}")
    356     message("GSTREAMER_LIBRARIES: ${GSTREAMER_LIBRARIES}")
    357     message("GSTREAMER_STATIC_LIBRARIES: ${GSTREAMER_STATIC_LIBRARIES}")
    358     message("GSTREAMER_VERSION: ${GSTREAMER_VERSION}")
    359     message("GSTREAMER_DEFINITIONS: ${GSTREAMER_DEFINITIONS}")
    360 
    361     add_definitions("-Wno-deprecated-declarations")
    362 
    363 ENDIF(WIN32)
     367SET(
     368    DEB_FILES
     369    deb/qstopmotion.xpm       # DEB Icon is installed in a separate step
     370    deb/changelog             # DEB changelog file
     371    deb/changelog.gz          # DEB changelog file compressed
     372    deb/copyright             # DEB copyright file
     373    deb/qstopmotion.menu      # DEB .menu is installed in a separate step for Debian systems
     374    deb/postinst              # DEB post installation script file, call update-menus
     375)
     376
     377SET(
     378    RPM_FILES
     379    rpm/qstopmotion.png       # RPM Icon is installed in a separate step
     380)
    364381
    365382###############################################################################
     
    371388###############################################################################
    372389
    373 IF(UNIX)
    374 
    375     include(${CMAKE_SOURCE_DIR}/cmake/FindGPhoto2PkgConfig.cmake)
     390IF(UNIX AND NOT APPLE)
     391    find_package(PkgConfig)
     392    pkg_check_modules(GPHOTO2 REQUIRED libgphoto2)
    376393    message("GPHOTO2_INCLUDE_DIR: ${GPHOTO2_INCLUDE_DIR}")
    377394    message("GPHOTO2_LIBRARIES: ${GPHOTO2_LIBRARIES}")
    378 
    379 ELSE(UNIX)
    380 
     395ELSE(UNIX AND NOT APPLE)
    381396    SET(GPHOTO2_INCLUDE_DIR)
    382397    SET(GPHOTO2_LIBRARIES)
    383 
    384 ENDIF(UNIX)
     398ENDIF(UNIX AND NOT APPLE)
    385399
    386400###############################################################################
     
    392406###############################################################################
    393407
    394 IF(UNIX)
    395 
     408IF(UNIX AND NOT APPLE)
    396409    include(${CMAKE_SOURCE_DIR}/cmake/FindV4L2PkgConfig.cmake)
    397410    message("V4L2_INCLUDE_DIRS: ${V4L2_INCLUDE_DIRS}")
    398411    message("V4L2_LIBRARIES: ${V4L2_LIBRARIES}")
    399 
    400 ELSE(UNIX)
    401 
     412ELSE(UNIX AND NOT APPLE)
    402413    SET(V4L2_INCLUDE_DIRS)
    403414    SET(V4L2_LIBRARIES)
    404 
    405 ENDIF(UNIX)
     415ENDIF(UNIX AND NOT APPLE)
    406416
    407417###############################################################################
     
    434444include_directories(
    435445    ${CMAKE_SOURCE_DIR}/src
    436     ${QT_INCLUDE_DIR}
    437     ${QT_QTXML_INCLUDE_DIR}
    438     ${GSTREAMER_INCLUDE_DIR}
    439446    ${GPHOTO2_INCLUDE_DIR}
    440447    ${V4L2_INCLUDE_DIRS}
     
    454461###############################################################################
    455462
     463IF(WIN32)
     464    add_definitions(-DUNICODE -D_UNICODE)
     465ENDIF(WIN32)
     466
    456467###############################################################################
    457468# Create binaries
     
    472483)
    473484
    474 # Set the output directory for the static libraries
    475 # SET(LIBRARY_OUTPUT_DIRECTORY
    476 #     ${PROJECT_BINARY_DIR}/bin
    477 #     CACHE PATH
    478 #     "Single directory for all executables"
    479 # )
    480 
    481 # Set the output directory for the shared libraries
    482 # SET(ARCHIVE_OUTPUT_DIRECTORY
    483 #     ${PROJECT_BINARY_DIR}/bin
    484 #     CACHE PATH
    485 #     "Single directory for all executables"
    486 # )
    487 
    488485MARK_AS_ADVANCED(
    489486    EXECUTABLE_OUTPUT_PATH
    490487    RUNTIME_OUTPUT_DIRECTORY
    491 #     LIBRARY_OUTPUT_DIRECTORY
    492 #     ARCHIVE_OUTPUT_DIRECTORY
    493 )
    494 # Create .moc files
    495 qt4_wrap_cpp(
    496     MOC_SOURCES
    497     ${MOC_HEADERS}
    498 )
    499 
    500 # Create a executable
    501 IF(UNIX)
    502 
     488)
     489
     490IF(UNIX AND NOT APPLE)
     491    # Linux
     492
     493    # Create a executable
    503494    add_executable(
    504495        qstopmotion
     
    507498    )
    508499
     500    # tell cmake which libraries to link
     501    target_link_libraries(
     502        qstopmotion
     503        ${GPHOTO2_LIBRARIES}
     504        ${V4L2_LIBRARIES}
     505        Qt5::Widgets
     506    )
    509507ELSEIF(APPLE)
    510 
     508    # MacOSX
     509
     510    # Create a executable
    511511    add_executable(
    512512        qstopmotion
     
    516516    )
    517517
     518    # tell cmake which libraries to link
     519    target_link_libraries(
     520        qstopmotion
     521        ${GPHOTO2_LIBRARIES}
     522        ${V4L2_LIBRARIES}
     523        Qt5::Widgets
     524    )
    518525ELSEIF(WIN32)
    519 
     526    # Windows
     527
     528    # Create a executable
    520529    add_executable(
    521530        qstopmotion
     
    526535    )
    527536
     537    # tell cmake which libraries to link
     538    target_link_libraries(
     539        qstopmotion
     540        ${MEDIAFOUNDATION_LIBRARIES}
     541        Qt5::WinMain
     542        Qt5::Widgets
     543    )
    528544ENDIF()
    529  
    530 # tell cmake which libraries to link
    531 target_link_libraries(
     545
     546# Use the Qt5 modules
     547qt5_use_modules(
    532548    qstopmotion
    533     ${QT_LIBRARIES}
    534     ${QT_QTMAIN_LIBRARY}
    535     ${QT_QTXML_LIBRARIES}
    536     ${GSTREAMER_LIBRARIES}
    537     ${GPHOTO2_LIBRARIES}
    538     ${V4L2_LIBRARIES}
    539     ${MEDIAFOUNDATION_LIBRARIES}
    540 )
    541 
    542 add_definitions(${QT_DEFINITIONS})
     549    Core
     550    Gui
     551    Widgets
     552    Xml
     553)
     554
     555add_definitions(
     556    ${QT_DEFINITIONS}
     557)
    543558
    544559IF(WIN32)
    545 
    546 ELSE(WIN32)
    547 
    548     add_definitions(${GSTREAMER_DEFINITIONS})
    549 
    550 ENDIF(WIN32)
    551 
    552 IF(WIN32)
    553 
    554560    file(COPY graphics DESTINATION ".")
    555561    file(COPY manual DESTINATION ".")
     
    558564    file(COPY ${GENERAL_FILES} DESTINATION ".")
    559565
    560     file(COPY ffmpeg DESTINATION ".")
    561     file(COPY libav DESTINATION ".")
    562 
    563     file(COPY qtruntime DESTINATION ".")
    564 
    565 ELSE(WIN32)
    566 
     566    IF(CMAKE_CL_64)
     567        # Windows 64bit
     568       
     569        IF(CMAKE_BUILD_TYPE STREQUAL "Release")
     570            file(COPY qt5runtime64bit/release/ DESTINATION "qtruntime")
     571        ELSE(CMAKE_BUILD_TYPE STREQUAL "Release")
     572            file(COPY qt5runtime64bit/debug/ DESTINATION "qtruntime")
     573        ENDIF(CMAKE_BUILD_TYPE STREQUAL "Release")
     574
     575        file(COPY ffmpeg64bit/ DESTINATION "ffmpeg")
     576        file(COPY libav64bit/ DESTINATION "libav")
     577    ELSE(CMAKE_CL_64)
     578        # Windows 32bit
     579       
     580        IF(CMAKE_BUILD_TYPE STREQUAL "Release")
     581            file(COPY qt5runtime32bit/release/ DESTINATION "qtruntime")
     582        ELSE(CMAKE_BUILD_TYPE STREQUAL "Release")
     583            file(COPY qt5runtime32bit/debug/ DESTINATION "qtruntime")
     584        ENDIF(CMAKE_BUILD_TYPE STREQUAL "Release")
     585
     586        file(COPY ffmpeg32bit/ DESTINATION "ffmpeg")
     587        file(COPY libav32bit/ DESTINATION "libav")
     588    ENDIF(CMAKE_CL_64)
     589ENDIF(WIN32)
     590
     591IF(UNIX AND NOT APPLE)
    567592    file(COPY graphics DESTINATION "share/qstopmotion/")
    568593    file(COPY manual/ DESTINATION "share/doc/qstopmotion/")
     
    572597    file(COPY ${GENERAL_FILES} DESTINATION "share/qstopmotion/")
    573598    file(COPY ${UNIX_FILES} DESTINATION "share/qstopmotion/")
    574 
    575 ENDIF(WIN32)
    576 
    577 ###############################################################################
    578 # Translation
    579 ###############################################################################
    580 
    581 set (FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${HEADERS} ${MOC_HEADERS} ${SOURCES})
    582 
    583 file (GLOB TRANSLATIONS_FILES ${TRANSLATIONS})
    584 
    585 option (UPDATE_TRANSLATIONS "Update source translation translations/*.ts files (WARNING: make clean will delete the source .ts files! Danger!)")
    586 if (UPDATE_TRANSLATIONS)
    587   qt4_create_translation(QM_FILES ${FILES_TO_TRANSLATE} ${TRANSLATIONS_FILES})
    588 else (UPDATE_TRANSLATIONS)
    589   qt4_add_translation(QM_FILES ${TRANSLATIONS_FILES})
    590 endif (UPDATE_TRANSLATIONS)
    591 
    592 add_custom_target (translations_target DEPENDS ${QM_FILES})
     599    file(COPY ${DEB_FILES} DESTINATION "share/qstopmotion/deb/")
     600    file(COPY ${RPM_FILES} DESTINATION "share/qstopmotion/rpm/")
     601ENDIF(UNIX AND NOT APPLE)
    593602
    594603###############################################################################
     
    599608    # The predefined windows installer path include the qstopmotion subdirectory
    600609   
    601     set(QSTOPMOTION_GENERALS_INSTALL_DIR ".")
    602     set(QSTOPMOTION_BIN_INSTALL_DIR "bin")
    603     set(QSTOPMOTION_GRAPHICS_INSTALL_DIR "graphics")
    604     set(QSTOPMOTION_GRAPHICS_ICONS_INSTALL_DIR "graphics/icons")
    605     set(QSTOPMOTION_GRAPHICS_PICTURES_INSTALL_DIR "graphics/pictures")
    606     set(QSTOPMOTION_MANUAL_INSTALL_DIR "manual")
    607     set(QSTOPMOTION_TRANSLATIONS_INSTALL_DIR "translations")
    608     set(QSTOPMOTION_PIXMAP_INSTALL_DIR "pixmaps")
    609     set(QSTOPMOTION_ICONS_INSTALL_DIR "icons")
    610 
    611 ELSE(WIN32)
     610    SET(QSTOPMOTION_GENERALS_INSTALL_DIR ".")
     611    SET(QSTOPMOTION_BIN_INSTALL_DIR "bin")
     612    SET(QSTOPMOTION_GRAPHICS_INSTALL_DIR "graphics")
     613    SET(QSTOPMOTION_GRAPHICS_ICONS_INSTALL_DIR "graphics/icons")
     614    SET(QSTOPMOTION_GRAPHICS_PICTURES_INSTALL_DIR "graphics/pictures")
     615    SET(QSTOPMOTION_MANUAL_INSTALL_DIR "manual")
     616    SET(QSTOPMOTION_TRANSLATIONS_INSTALL_DIR "translations")
     617    SET(QSTOPMOTION_PIXMAP_INSTALL_DIR "pixmaps")
     618    SET(QSTOPMOTION_ICONS_INSTALL_DIR "icons")
     619ENDIF(WIN32)
     620
     621IF(UNIX AND NOT APPLE)
    612622    # The predefined CMake-Linux installer path is "/usr/local"
    613623    # The predefined RPM installer path is "/usr"
    614624    # The predefined DEB installer path is "/usr"
    615625
    616     set(QSTOPMOTION_GENERALS_INSTALL_DIR "share/qstopmotion")
    617     set(QSTOPMOTION_BIN_INSTALL_DIR "bin")
    618     set(QSTOPMOTION_GRAPHICS_INSTALL_DIR "share/qstopmotion/graphics")
    619     set(QSTOPMOTION_GRAPHICS_ICONS_INSTALL_DIR "share/qstopmotion/graphics/icons")
    620     set(QSTOPMOTION_GRAPHICS_PICTURES_INSTALL_DIR "share/qstopmotion/graphics/pictures")
    621     set(QSTOPMOTION_TRANSLATIONS_INSTALL_DIR "share/qstopmotion/translations")
    622     set(QSTOPMOTION_MANUAL_INSTALL_DIR "share/doc/qstopmotion")
    623     set(QSTOPMOTION_DESKTOP_INSTALL_DIR "share/applications")
    624     set(QSTOPMOTION_MENUFILE_INSTALL_DIR "share/menu")
    625     set(QSTOPMOTION_PIXMAP_INSTALL_DIR "share/pixmaps")
    626     set(QSTOPMOTION_ICONS_INSTALL_DIR "share/icons")
    627     set(QSTOPMOTION_MAN1_INSTALL_DIR "share/man/man1")
    628 
    629 ENDIF(WIN32)
     626    SET(QSTOPMOTION_GENERALS_INSTALL_DIR "share/qstopmotion")
     627    SET(QSTOPMOTION_BIN_INSTALL_DIR "bin")
     628    SET(QSTOPMOTION_GRAPHICS_INSTALL_DIR "share/qstopmotion/graphics")
     629    SET(QSTOPMOTION_GRAPHICS_ICONS_INSTALL_DIR "share/qstopmotion/graphics/icons")
     630    SET(QSTOPMOTION_GRAPHICS_PICTURES_INSTALL_DIR "share/qstopmotion/graphics/pictures")
     631    SET(QSTOPMOTION_TRANSLATIONS_INSTALL_DIR "share/qstopmotion/translations")
     632    SET(QSTOPMOTION_MANUAL_INSTALL_DIR "share/doc/qstopmotion")
     633    SET(QSTOPMOTION_DESKTOP_INSTALL_DIR "share/applications")
     634    SET(QSTOPMOTION_MENUFILE_INSTALL_DIR "share/menu")
     635    SET(QSTOPMOTION_PIXMAP_INSTALL_DIR "share/pixmaps")
     636    SET(QSTOPMOTION_ICONS_INSTALL_DIR "share/icons")
     637    SET(QSTOPMOTION_MAN1_INSTALL_DIR "share/man/man1")
     638ENDIF(UNIX AND NOT APPLE)
    630639
    631640# installation of the executables
     
    655664# installation only on Windows systems
    656665IF(WIN32)
    657     message("Special task for deb package!")
     666    message("Special task for windows package!")
    658667   
    659668    # installation of the general-purpose files
     
    665674
    666675# installation only on UNIX systems
    667 IF(UNIX)
     676IF(UNIX AND NOT APPLE)
    668677    # installation of the general unix files
    669678    install(
     
    689698        DESTINATION ${QSTOPMOTION_MAN1_INSTALL_DIR}
    690699    )
    691 ENDIF(UNIX)
     700ENDIF(UNIX AND NOT APPLE)
     701
     702# installation on DEB systems
     703IF(CPACK_BINARY_DEB)
     704    message("Special task for deb package!")
     705   
     706    # installation of the icon file
     707    install(
     708        FILES "deb/qstopmotion.xpm"
     709        DESTINATION ${QSTOPMOTION_PIXMAP_INSTALL_DIR}
     710    )
     711
     712    # installation of the .menufile file
     713    install(
     714        FILES "deb/qstopmotion.menu"
     715        DESTINATION ${QSTOPMOTION_MENUFILE_INSTALL_DIR}
     716    )
     717
     718    # installation of the changelog file
     719    install(
     720        FILES "deb/changelog.gz"
     721        DESTINATION ${QSTOPMOTION_MANUAL_INSTALL_DIR}
     722    )
     723
     724    # installation of the copyright file
     725    install(
     726        FILES "deb/copyright"
     727        DESTINATION ${QSTOPMOTION_MANUAL_INSTALL_DIR}
     728    )
     729ENDIF(CPACK_BINARY_DEB)
     730
     731# installation on RPM systems
     732IF(CPACK_BINARY_RPM)
     733    message("Special task for rpm package!")
     734   
     735    # installation of the general-purpose files
     736    install(
     737        FILES ${GENERAL_FILES}
     738        DESTINATION ${QSTOPMOTION_GENERALS_INSTALL_DIR}
     739    )
     740
     741    # installation of the icon file
     742    install(
     743        FILES "rpm/qstopmotion.png"
     744        DESTINATION ${QSTOPMOTION_PIXMAP_INSTALL_DIR}
     745    )
     746ENDIF(CPACK_BINARY_RPM)
    692747
    693748# installation on Windows systems
    694749IF(WIN32)
    695     # installation of ffmpeg
    696     install(
    697         DIRECTORY ffmpeg
    698         DESTINATION ${QSTOPMOTION_GENERALS_INSTALL_DIR}
    699     )
    700 
    701     # installation of libav
    702     install(
    703         DIRECTORY libav
    704         DESTINATION ${QSTOPMOTION_GENERALS_INSTALL_DIR}
    705     )
    706 
    707     # installation of Qt runtime
    708     install(
    709         DIRECTORY qtruntime/
    710         DESTINATION ${QSTOPMOTION_BIN_INSTALL_DIR}
    711     )
     750    IF(CMAKE_CL_64)
     751        # Windows 64bit
     752       
     753        # installation of Qt runtime
     754        IF(CMAKE_BUILD_TYPE STREQUAL "Release")
     755            install(
     756                DIRECTORY qt5runtime64bit/release/
     757                DESTINATION ${QSTOPMOTION_BIN_INSTALL_DIR}
     758            )
     759        ELSE(CMAKE_BUILD_TYPE STREQUAL "Release")
     760            install(
     761                DIRECTORY qt5runtime64bit/debug/
     762                DESTINATION ${QSTOPMOTION_BIN_INSTALL_DIR}
     763            )
     764        ENDIF(CMAKE_BUILD_TYPE STREQUAL "Release")
     765
     766        # installation of ffmpeg
     767        install(
     768            DIRECTORY ffmpeg64bit/
     769            DESTINATION "${QSTOPMOTION_GENERALS_INSTALL_DIR}/ffmpeg"
     770        )
     771   
     772        # installation of libav
     773        install(
     774            DIRECTORY libav64bit/
     775            DESTINATION "${QSTOPMOTION_GENERALS_INSTALL_DIR}/libav"
     776        )
     777   
     778    ELSE(CMAKE_CL_64)
     779        # Windows 32bit
     780       
     781        # installation of Qt runtime
     782        IF(CMAKE_BUILD_TYPE STREQUAL "Release")
     783            install(
     784                DIRECTORY qt5runtime32bit/release/
     785                DESTINATION ${QSTOPMOTION_BIN_INSTALL_DIR}
     786            )
     787        ELSE(CMAKE_BUILD_TYPE STREQUAL "Release")
     788            install(
     789                DIRECTORY qt5runtime32bit/debug/
     790                DESTINATION ${QSTOPMOTION_BIN_INSTALL_DIR}
     791            )
     792        ENDIF(CMAKE_BUILD_TYPE STREQUAL "Release")
     793
     794        # installation of ffmpeg
     795        install(
     796            DIRECTORY ffmpeg32bit/
     797            DESTINATION "${QSTOPMOTION_GENERALS_INSTALL_DIR}/ffmpeg"
     798        )
     799   
     800        # installation of libav
     801        install(
     802            DIRECTORY libav32bit/
     803            DESTINATION "${QSTOPMOTION_GENERALS_INSTALL_DIR}/libav"
     804        )
     805   
     806    ENDIF(CMAKE_CL_64)
     807       
    712808ENDIF(WIN32)
    713809
     
    787883# CPACK_PACKAGE_VERSION - generated from major, minor, patch
    788884
    789 IF(UNIX)
     885IF(UNIX AND NOT APPLE)
    790886    # Try to find architecture
    791887    execute_process (COMMAND uname -m OUTPUT_VARIABLE CPACK_PACKAGE_ARCHITECTURE)
     
    807903        "${LSB_DISTRIB}-${CPACK_PACKAGE_ARCHITECTURE}"
    808904    )
    809 ENDIF(UNIX)
     905
     906MESSAGE("UNAME Infos =========================================================")
     907MESSAGE("UNAME_ARCHITECTURE: ${UNAME_ARCHITECTURE}")
     908MESSAGE("UNAME_LINUX_VERSION: ${UNAME_LINUX_VERSION}")
     909MESSAGE("LSB Infos ===========================================================")
     910MESSAGE("LSB_ID: ${LSB_ID}")
     911MESSAGE("LSB_RELEASE: ${LSB_RELEASE}")
     912MESSAGE("LSB_DISTRIB: ${LSB_DISTRIB}")
     913MESSAGE("Infos ===============================================================")
     914MESSAGE("CPACK_SYSTEM_NAME: ${CPACK_SYSTEM_NAME}")
     915MESSAGE("CPACK_PACKAGE_ARCHITECTURE: ${CPACK_PACKAGE_ARCHITECTURE}")
     916MESSAGE("End Infos ===========================================================")
     917
     918ENDIF(UNIX AND NOT APPLE)
    810919
    811920###############################################################################
     
    820929        "${CPACK_SOURCE_IGNORE_FILES}"
    821930        "${PROJECT_SOURCE_DIR}/.hg/"
     931        "${PROJECT_SOURCE_DIR}/.hgignore"
    822932        "${PROJECT_SOURCE_DIR}/.hgtags"
    823     )
    824 ELSE(WIN32)
     933        "${PROJECT_SOURCE_DIR}/.hgtimestamp"
     934    )
     935ENDIF(WIN32)
     936
     937IF(UNIX AND NOT APPLE)
    825938    # Exclude:
    826939    # * Mercurial SMC files
     
    832945        "${CPACK_SOURCE_IGNORE_FILES}"
    833946        "${PROJECT_SOURCE_DIR}/.hg/"
     947        "${PROJECT_SOURCE_DIR}/.hgignore"
    834948        "${PROJECT_SOURCE_DIR}/.hgtags"
    835         "${PROJECT_SOURCE_DIR}/ffmpeg/"
    836         "${PROJECT_SOURCE_DIR}/libav/"
    837         "${PROJECT_SOURCE_DIR}/qtruntime/"
    838     )
    839 ENDIF(WIN32)
     949        "${PROJECT_SOURCE_DIR}/.hgtimestamp"
     950        "${PROJECT_SOURCE_DIR}/ffmpeg32bit/"
     951        "${PROJECT_SOURCE_DIR}/ffmpeg64bit/"
     952        "${PROJECT_SOURCE_DIR}/libav32bit/"
     953        "${PROJECT_SOURCE_DIR}/libav64bit/"
     954        "${PROJECT_SOURCE_DIR}/qt4runtime/"
     955        "${PROJECT_SOURCE_DIR}/qt5runtime32bit/"
     956        "${PROJECT_SOURCE_DIR}/qt5runtime64bit/"
     957    )
     958ENDIF(UNIX AND NOT APPLE)
    840959
    841960###############################################################################
     
    843962###############################################################################
    844963
     964# Installers for 32- vs. 64-bit CMake:
     965#  - Root install directory (displayed to end user at installer-run time)
     966#  - "NSIS package/display name" (text used in the installer GUI)
     967#  - Registry key used to store info about the installation
     968IF(CMAKE_CL_64)
     969    # 64-bit Windows
     970    SET(
     971        CPACK_NSIS_INSTALL_ROOT
     972        "$PROGRAMFILES64"
     973    )
     974    SET(
     975        CPACK_NSIS_PACKAGE_NAME
     976        "${CPACK_PACKAGE_INSTALL_DIRECTORY} (Win64)"
     977    )
     978    SET(
     979        CPACK_PACKAGE_INSTALL_REGISTRY_KEY
     980        "${CPACK_PACKAGE_NAME} ${CPACK_PACKAGE_VERSION} (Win64)"
     981    )
     982ELSE(CMAKE_CL_64)
     983    # 32-bit Windows
     984    SET(
     985        CPACK_NSIS_INSTALL_ROOT
     986        "$PROGRAMFILES"
     987    )
     988    SET(
     989        CPACK_NSIS_PACKAGE_NAME
     990        "${CPACK_PACKAGE_INSTALL_DIRECTORY}"
     991    )
     992    SET(
     993        CPACK_PACKAGE_INSTALL_REGISTRY_KEY
     994        "${CPACK_PACKAGE_NAME} ${CPACK_PACKAGE_VERSION}"
     995    )
     996ENDIF(CMAKE_CL_64)
     997
     998MESSAGE("CPACK_NSIS_INSTALL_ROOT: ${CPACK_NSIS_INSTALL_ROOT}")
     999MESSAGE("CPACK_NSIS_PACKAGE_NAME: ${CPACK_NSIS_PACKAGE_NAME}")
     1000MESSAGE("CPACK_PACKAGE_INSTALL_REGISTRY_KEY: ${CPACK_PACKAGE_INSTALL_REGISTRY_KEY}")
     1001
    8451002# Installing Microsoft run time libraries in the same directory as the executables
    8461003SET(
    8471004    CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP
    848     TRUE
     1005    true
    8491006)
    8501007INCLUDE(InstallRequiredSystemLibraries)
     
    9031060
    9041061###############################################################################
     1062# DEB package - Linux only (Debian, OpenSuse, Ubuntu, ...)
     1063###############################################################################
     1064
     1065IF ("${LSB_DISTRIB}" MATCHES "Ubuntu|Debian")
     1066    # We need to alter the architecture names as per distro rules
     1067    IF ("${CPACK_PACKAGE_ARCHITECTURE}" MATCHES "i[3-6]86")
     1068        SET(
     1069            CPACK_PACKAGE_ARCHITECTURE
     1070            "i386"
     1071        )
     1072    ENDIF ("${CPACK_PACKAGE_ARCHITECTURE}" MATCHES "i[3-6]86")
     1073    IF ("${CPACK_PACKAGE_ARCHITECTURE}" MATCHES "x86_64")
     1074        SET(
     1075            CPACK_PACKAGE_ARCHITECTURE
     1076            "amd64"
     1077        )
     1078    ENDIF ("${CPACK_PACKAGE_ARCHITECTURE}" MATCHES "x86_64")
     1079    SET(
     1080        CPACK_SYSTEM_NAME
     1081        "${LSB_DISTRIB}-${CPACK_PACKAGE_ARCHITECTURE}"
     1082    )
     1083
     1084    # Set the dependencies based on the distro version
     1085    # thus only one package is build you must list here *any* depending libraries,
     1086    # even if they are only used in one module
     1087    IF ("${LSB_DISTRIB}" MATCHES "Ubuntu14.04")
     1088        SET(
     1089            CPACK_DEBIAN_PACKAGE_DEPENDS
     1090            "libc6 (>=2.11), libavbin0 (>=7-1), libqt5core5 (>=5.2.1) | libqt5core5a (>=5.2.1), libqt5gui5 (>=5.2.1), libqt5widgets5 (>=5.2.1), libqt5xml5 (>=5.2.1), libv4l-0 (>=1.0.0), libgphoto2-6 (>=2.5.3), qt5-image-formats-plugins (>=5.2.1)"
     1091        )
     1092    ENDIF ("${LSB_DISTRIB}" MATCHES "Ubuntu14.04")
     1093    IF ("${LSB_DISTRIB}" MATCHES "Ubuntu16.04")
     1094        SET(
     1095            CPACK_DEBIAN_PACKAGE_DEPENDS
     1096            "libc6 (>=2.11), ffmpeg (>=2.8.6), libqt5core5 (>=5.3.2) | libqt5core5a (>=5.3.2), libqt5gui5 (>=5.3.2), libqt5widgets5 (>=5.3.2), libqt5xml5 (>=5.3.2), libv4l-0 (>=1.0.0), libgphoto2-6 (>=2.5.3), qt5-image-formats-plugins (>=5.3.2)"
     1097        )
     1098    ENDIF ("${LSB_DISTRIB}" MATCHES "Ubuntu16.04")
     1099    IF ("${LSB_DISTRIB}" MATCHES "Debian7.*")
     1100        SET(
     1101            CPACK_DEBIAN_PACKAGE_DEPENDS
     1102            "libc6 (>=2.11), ffmpeg (>=0.8.9), libqtcore4 (>=4.8.2), libqtgui4 (>=4.8.2), libqt4-xml (>=4.8.2), libv4l-0 (>=0.8.8), libgphoto2-2 (>=2.4.14), libgphoto2-port0 (>=2.4.14)"
     1103        )
     1104    ENDIF ("${LSB_DISTRIB}" MATCHES "Debian7.*")
     1105    IF ("${LSB_DISTRIB}" MATCHES "Debian8.*")
     1106        SET(
     1107            CPACK_DEBIAN_PACKAGE_DEPENDS
     1108            "libc6 (>=2.11), libav-tools (>=6:11.3), libqt5core5 (>=5.3.2) | libqt5core5a (>=5.3.2), libqt5gui5 (>=5.3.2), libqt5widgets5 (>=5.3.2), libqt5xml5 (>=5.3.2), libv4l-0 (>=1.0.0), libgphoto2-6 (>=2.5.3), qt5-image-formats-plugins (>=5.3.2)"
     1109        )
     1110    ENDIF ("${LSB_DISTRIB}" MATCHES "Debian8.*")
     1111    IF (NOT CPACK_DEBIAN_PACKAGE_DEPENDS)
     1112        MESSAGE ("WARNING: ${LSB_DISTRIB} not supported yet.\nPlease set deps in CMakeLists.txt before packaging.")
     1113    ENDIF (NOT CPACK_DEBIAN_PACKAGE_DEPENDS)
     1114ENDIF ("${LSB_DISTRIB}" MATCHES "Ubuntu|Debian")
     1115MESSAGE("CPACK_DEBIAN_PACKAGE_DEPENDS: ${CPACK_DEBIAN_PACKAGE_DEPENDS}")
     1116
     1117# Mandatory
     1118# CPACK_DEBIAN_PACKAGE_NAME = CPACK_PACKAGE_NAME
     1119MESSAGE("CPACK_DEBIAN_PACKAGE_NAME: ${CPACK_DEBIAN_PACKAGE_NAME}")
     1120# CPACK_DEBIAN_PACKAGE_VERSION = CPACK_PACKAGE_VERSION
     1121MESSAGE("CPACK_DEBIAN_PACKAGE_VERSION: ${CPACK_DEBIAN_PACKAGE_VERSION}")
     1122# CPACK_DEBIAN_PACKAGE_ARCHITECTURE = dpkg output       # dpkg --print-architecture ???
     1123MESSAGE("CPACK_DEBIAN_PACKAGE_ARCHITECTURE: ${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
     1124# CPACK_DEBIAN_PACKAGE_MAINTAINER = CPACK_PACKAGE_CONTACT
     1125MESSAGE("CPACK_DEBIAN_PACKAGE_MAINTAINER: ${CPACK_DEBIAN_PACKAGE_MAINTAINER}")
     1126SET(
     1127    CPACK_DEBIAN_PACKAGE_DESCRIPTION
     1128    "create stop motion animations\n qStopMotion can be used to create stop motion animations."
     1129)
     1130MESSAGE("CPACK_DEBIAN_PACKAGE_DESCRIPTION: ${CPACK_DEBIAN_PACKAGE_DESCRIPTION}")
     1131SET(
     1132    CPACK_DEBIAN_PACKAGE_SECTION
     1133    "graphics"
     1134)
     1135MESSAGE("CPACK_DEBIAN_PACKAGE_SECTION: ${CPACK_DEBIAN_PACKAGE_SECTION}")
     1136SET(
     1137    CPACK_DEBIAN_PACKAGE_PRIORITY
     1138    "optional"
     1139)
     1140MESSAGE("CPACK_DEBIAN_PACKAGE_PRIORITY: ${CPACK_DEBIAN_PACKAGE_PRIORITY}")
     1141
     1142# Options
     1143
     1144SET(CPACK_DEBIAN_PACKAGE_HOMEPAGE ${QSTOPMOTION_HOMEPAGE})
     1145# CPACK_DEBIAN_PACKAGE_SHLIBDEPS
     1146# SET(CPACK_DEBIAN_PACKAGE_DEBUG "ON")
     1147# CPACK_DEBIAN_PACKAGE_DEBUG
     1148# CPACK_DEBIAN_PACKAGE_ENHANCES
     1149# CPACK_DEBIAN_PACKAGE_BREAKS
     1150# CPACK_DEBIAN_PACKAGE_CONFLICTS
     1151# CPACK_DEBIAN_PACKAGE_PROVIDES
     1152# CPACK_DEBIAN_PACKAGE_REPLACES
     1153SET(
     1154    CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA
     1155    "${CMAKE_SOURCE_DIR}/deb/postinst"
     1156)
     1157
     1158###############################################################################
     1159# RPM package - Linux only (Fedora, Red Hat, CentOS, Mandriva, ...)
     1160###############################################################################
     1161
     1162# Mandatory
     1163SET(
     1164    CPACK_RPM_PACKAGE_SUMMARY
     1165    ${CPACK_PACKAGE_DESCRIPTION_SUMMARY}
     1166)
     1167MESSAGE("CPACK_RPM_PACKAGE_SUMMARY: ${CPACK_RPM_PACKAGE_SUMMARY}")
     1168# CPACK_RPM_PACKAGE_NAME = CPACK_PACKAGE_NAME
     1169MESSAGE("CPACK_RPM_PACKAGE_NAME: ${CPACK_RPM_PACKAGE_NAME}")
     1170# CPACK_RPM_PACKAGE_VERSION = CPACK_PACKAGE_VERSION
     1171MESSAGE("CPACK_RPM_PACKAGE_VERSION: ${CPACK_RPM_PACKAGE_VERSION}")
     1172# SET(CPACK_RPM_PACKAGE_RELEASE "1")
     1173MESSAGE("CPACK_RPM_PACKAGE_RELEASE: ${CPACK_RPM_PACKAGE_RELEASE}")
     1174SET(
     1175    CPACK_RPM_PACKAGE_LICENSE
     1176    "GPLv2"
     1177)
     1178MESSAGE("CPACK_RPM_PACKAGE_LICENSE: ${CPACK_RPM_PACKAGE_LICENSE}")
     1179SET(
     1180    CPACK_RPM_PACKAGE_GROUP
     1181    "Applications/Multimedia"
     1182)
     1183MESSAGE("CPACK_RPM_PACKAGE_GROUP: ${CPACK_RPM_PACKAGE_GROUP}")
     1184# CPACK_RPM_PACKAGE_VENDOR = CPACK_PACKAGE_VENDOR
     1185MESSAGE("CPACK_RPM_PACKAGE_VENDOR: ${CPACK_RPM_PACKAGE_VENDOR}")
     1186# CPACK_RPM_PACKAGE_MAINTAINER = CPACK_PACKAGE_CONTACT
     1187MESSAGE("CPACK_RPM_PACKAGE_MAINTAINER: ${CPACK_RPM_PACKAGE_MAINTAINER}")
     1188
     1189# Options
     1190# SET(CPACK_RPM_PACKAGE_ARCHITECTURE "noarch")
     1191SET(
     1192    CPACK_RPM_PACKAGE_URL
     1193    ${QSTOPMOTION_HOMEPAGE}
     1194)
     1195# CPACK_RPM_PACKAGE_DESCRIPTION = CPACK_PACKAGE_DESCRIPTION_FILE
     1196# CPACK_RPM_COMPRESSION_TYPE
     1197# requireses must be in a aphabetic order
     1198# Qt5: qt5-qtbase - Core, Concurrent, DBus, Network, Sql, Test, Xml
     1199# Qt5: qt5-qtbase-gui - Gui, OpenGL, PrintSupport, Widgets, XcbQpa
     1200# Qt5: qt5-qtimageformats - Qt5 image format plugins
     1201# Qt5: qt5-qtmultimedia - Multimedia, MultimediaQuick, MultimediaWidgets
     1202SET(
     1203    CPACK_RPM_PACKAGE_REQUIRES
     1204    "glibc >= 2.12, libgphoto2 >= 2.4.7, libv4l >= 0.6.3, qt5-qtbase >= 5.2.0, qt5-qtbase-gui >= 5.2.0, qt5-qtimageformats >= 5.2.0"
     1205)
     1206MESSAGE("CPACK_RPM_PACKAGE_REQUIRES: ${CPACK_RPM_PACKAGE_REQUIRES}")
     1207# CPACK_RPM_PACKAGE_SUGGESTS
     1208# CPACK_RPM_PACKAGE_PROVIDES
     1209
     1210# SET(CPACK_RPM_SPEC_INSTALL_POST "desktop-file-validate /usr/share/applications/qstopmotion.desktop")
     1211
     1212# SET(CPACK_RPM_PRE_INSTALL_SCRIPT_FILE "pre_install.sh")
     1213# SET(CPACK_RPM_POST_INSTALL_SCRIPT_FILE "post_install.sh")
     1214# SET(CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE "pre_install.sh")
     1215# SET(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE "post_install.sh")
     1216
     1217# Prevent conflicts with the filesystem package
     1218SET(
     1219    CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION
     1220    "/usr/bin"
     1221    "/usr/share/applications"
     1222    "/usr/share/icons"
     1223    "/usr/share/pixmaps"
     1224    "/usr/share/man"
     1225    "/usr/share/man/man1"
     1226)
     1227
     1228###############################################################################
    9051229# Activate packaging functionality
    9061230###############################################################################
  • qstopmotion/trunk/fuentes/Changes.txt

    r446 r4773  
    22===============================================================================
    33
     4qStopMotion (2.3.2) - 2016-11-10
     5  * Some spelling corrections.
     6  * Update of the Czech translation.
     7qStopMotion (2.3.0) - 2016-08-02
     8  * Overlay intensity slider now works.
     9  * Change the onion scinning to gray scale images.
     10  * Remove all gstreamer using.
     11  * Bug fixing.
     12qStopMotion (2.2.0) - 2016-05-09
     13  * Change the controller dialog from listboxes to slider
     14  * Improve the gphoto image grabber
     15  * Bug fixing.
    416qStopMotion (2.0.2) - 2015-09-09
    517  * Update the Ubuntu package generation. Fix most of the lintian messages.
     
    1123  * Video4Linux2 grabber can handle BGR image format.
    1224  * Add libav as the second encoder application.
    13 <<<<<<< local
    1425qStopMotion (2.0.0 (Beta)) - 2015-05-21
    15 =======
    16 qStopMotion (2.0.0 (Beta))
    17 >>>>>>> other
    1826  * Remove of the Gstreamer grabber from the Windows platform.
    1927  * On Windows qStopMotion can be started as an portable application.
  • qstopmotion/trunk/fuentes/README.txt

    r446 r4773  
    88------------
    99You need the following libraries installed to use qStopMotion:
    10     - Qt4
     10    - Qt5
    1111    - ffmpeg
    1212    - gstreamer or libav (Linux only)
     
    2626    - CMake
    2727    - G++ Compiler
    28     - Qt4 development files
     28    - Qt5 development files
    2929    - gstreamer or libav development files
    3030    - gphoto2 development files
     
    5353
    5454ralf.lange@qstopmotion.org
    55 2015-09-09
     552016-05-10
    5656
  • qstopmotion/trunk/fuentes/README_NMake_Windows.txt

    r446 r4773  
    11Building qStopMotion using MS Windows SDK
    2 Last Change: 2014-04-15
     2Last Change: 2016-05-10
    33
    441. Preparation of the development environment
    55================================================================================
    66
    7 1.1 Install the MS Windows SDK
     71.1 Install the Visual Studio 2013
    88--------------------------------------------------------------------------------
    99
    10 * Download the "Windows SDK for Windows 7 and .NET Framework 4"
    11   - If you use a 32bit Windows system download GRMSDK_EN_DVD or the online installer
    12   - If you use a 64bit Windows system download GRMSDKX_EN_DVD or the online installer
    13 * This package including the Visual Studio 2010 command line tools and the
    14   debugging tools for windows.
     10* Download the "Visual Studio 2013 Community Edition"
     11* This package including the Visual Studio 2010 command line tools.
    1512* Install in the default installation directory
    16   (C:\Program Files\Microsoft SDKs\Windows\v7.1).
     13  (C:\Program Files\Microsoft Visual Studio 12.0).
     14  - Switch off all optional features
     15  - Start the IDE and search for updates
     16* Add the binary directory to the path variable
     17  (C:\Program Files\Microsoft Visual Studio 12.0\VC\bin\).
    1718
    18 1.2 Qt for Windows and Visual Studio
     191.2 Install the Windows SDK
    1920--------------------------------------------------------------------------------
    2021
    21 * Download Qt libraries 4.8.2 for Windows 32-bit (VS 2010) from qt-project.com/downloads
     22* Download the "Windows Software Development Kit for Windows 8.1"
     23* This package including the debugging tools for windows.
     24* Install in the default installation directory
     25  (C:\Program Files\Windows Kits\v8.1).
     26
     271.3 Qt5 for Windows and Visual Studio
     28--------------------------------------------------------------------------------
     29
     30* Download Qt runtime 5.5.x for Windows 64-bit (VS 2013) from qt-project.com/downloads
    2231* Install in the Directory C:\Tools\Qt\...
    2332* Qt need write permissions to this directory during compilation and linking.
    24 * Add the binary directory to the path variable (e.g. C:\Tools\Qt\4.8.2\bin\).
     33* Add the binary directory to the path variable (e.g. C:\Tools\Qt\Qt5.5.1\bin\).
     34* Set the environment variable 'Qt5_DIR' to 'C:\Tools\Qt\Qt5.5.1\5.5\msvc2013_64\'
    2535
    26 1.3 CMake 2.8.12
     361.4 CMake
    2737--------------------------------------------------------------------------------
    2838
    29 * Download CMake 2.8.12.x from "http://www.cmake.org/cmake/resources/software.html"
     39* Download CMake >= 3.3.2 (32bit) from "http://www.cmake.org/cmake/resources/software.html"
     40* Install in the default installation directory.
    3041* Add CMake to the system PATH for all users.
    31 * Install in the default installation directory.
    3242* Create a start script for CMake (C:\Tools\cmakestart.bat)
    3343    rem Set the Visual Studion 10 environment variables
     
    3747* Create a shortcut to the start script.
    3848
    39 1.4 Mercurial SCM (Developers only)
     491.5 Mercurial SCM (Developers only)
    4050--------------------------------------------------------------------------------
    4151
     
    4353* Install in the default installation directory.
    4454
    45 1.5 NSIS 2.46
     551.6 NSIS 2.46
    4656--------------------------------------------------------------------------------
    4757
     
    107117--------------------------------------------------------------------------------
    108118
     119* Create a build directory
    109120* Start the CMake GUI using the shortcut to the start script.
    110 * Select the directory with the cmakelist.txt file as the source code directory.
    111 * Select a separate directory as the destination directory.
    112 * Set the 'Grouped' and 'Advanced' checkboxes.
    113 * To build the release version add a new string entry with the name
    114   'CMAKE_BUILD_TYPE' and the value 'Release'. The default build type is 'Debug'.
    115 * Press the configure button.
    116 * Select the generator "NMake Makefiles".
    117 * Select the entry CPACK - CPACK_BINARY_NSIS.
    118 * Select the entry CPACK - CPACK_BINARY_ZIP.
    119 * Select the entry CPACK - CPACK_SOURCE_ZIP.
    120 * Press the configure button again.
    121 * Press the generate button.
     121  - Select the directory with the cmakelist.txt file as the source code directory.
     122  - Select a separate directory as the destination directory.
     123  - Set the 'Grouped' and 'Advanced' checkboxes.
     124  - To build the release version add a new string entry with the name
     125    'CMAKE_BUILD_TYPE' and the value 'Release'. The default build type is 'Debug'.
     126  - Press the configure button.
     127  - Select the generator "NMake Makefiles".
     128  - Select the entry CPACK - CPACK_BINARY_NSIS.
     129  - Select the entry CPACK - CPACK_BINARY_ZIP.
     130  - Select the entry CPACK - CPACK_SOURCE_ZIP.
     131  - Press the configure button again.
     132  - Press the generate button.
     133or
     134* Start the "Visua Studio 2013 - Visual Studio Tools - VS2013 x64 Native Tools Command Prompt"
     135  - move to the build directory
     136  - cmake -G „NMake Makefiles“ -D CMAKE_BUILD_TYPE:STRING=Release -D CPACK_BINARY_NSIS:BOOL=ON -D CPACK_BINARY_ZIP:BOOL=ON ../qstopmotion
    122137
    1231383.4 Build the application
    124139--------------------------------------------------------------------------------
    125140
    126 * Start the "Qt 4.8.4 Command Prompt".
    127 * Move to the new created destination directory.
     141* Start the "Visua Studio 2013 - Visual Studio Tools - VS2013 x64 Native Tools Command Prompt"
     142* Move to the build directory.
    128143* Call "nmake".
    129144* Locking for error and warning messages.
     
    132147================================================================================
    133148
    134 * Start a Visual Studio command prompt with administration rights.
     149* Start the "Visua Studio 2013 - Visual Studio Tools - VS2013 x64 Native Tools Command Prompt"
    135150* call "nmake install".
    136151
     
    147162--------------------------------------------------------------------------------
    148163
    149 * Start the "Qt 4.8.4 Command Prompt".
     164* Start the "Visua Studio 2013 - Visual Studio Tools - VS2013 x64 Native Tools Command Prompt"
    150165* Move to the new created destination directory.
    151166* Call "nmake package".
    152 * The Windows installer with the name 'qstopmotion-x.y.z-win32.exe' will be
     167* The Windows installer with the name 'qstopmotion-x.y.z-win64.exe' will be
    153168  created in the destination directory.
    154 * The portable application with the name 'qstopmotion-x.y.z-win32.zip' will be
     169* The portable application with the name 'qstopmotion-x.y.z-win64.zip' will be
    155170  created in the destination directory.
    156171
     
    173188--------------------------------------------------------------------------------
    174189
    175 * Start the "Qt 4.8.4 Command Prompt".
     190* Start the "Visua Studio 2013 - Visual Studio Tools - VS2013 x64 Native Tools Command Prompt"
    176191* Move to the new created destination directory.
    177192* Call "nmake package_source"
    178193* A new zip package with the name 'qstopmotion-x.y.z-Source.zip' will be created
    179194  in the destination directory
    180 
    181 7. Create source documentation
    182 ================================================================================
    183 
    184 7.1 Download and install Doxygen
    185 --------------------------------------------------------------------------------
    186 
    187 * Download installer from ...
  • qstopmotion/trunk/fuentes/README_VisualStudio_Windows.txt

    r446 r4773  
    11Building qStopMotion using MS Visual Studio
    2 Last Change: 2014-12-15
     2Last Change: 2016-05-10
    33
    441. Preparation of the development environment
    55================================================================================
    66
    7 1.1 Install MS Visual Studio 2010 Express/Professional
     71.1 Install the Visual Studio 2013
    88--------------------------------------------------------------------------------
    99
    10 * Install in the default installation directory.
     10* Download the "Visual Studio 2013 Community Edition"
     11* This package including the Visual Studio 2010 command line tools.
     12* Install in the default installation directory
     13  (C:\Program Files\Microsoft Visual Studio 12.0).
     14  - Switch off all optional features
     15  - Start the IDE and search for updates
     16* Add the binary directory to the path variable
     17  (C:\Program Files\Microsoft Visual Studio 12.0\VC\bin\).
    1118
    12 1.2 Qt for Windows and Visual Studio
     191.2 Install the Windows SDK
    1320--------------------------------------------------------------------------------
    1421
    15 * Download Qt libraries 4.8.4 for Windows 32-bit (VS 2010) from qt-project.com/downloads
     22* Download the "Windows Software Development Kit for Windows 8.1"
     23* This package including the debugging tools for windows.
     24* Install in the default installation directory
     25  (C:\Program Files\Windows Kits\v8.1).
     26
     271.3 Qt5 for Windows and Visual Studio
     28--------------------------------------------------------------------------------
     29
     30* Download Qt runtime 5.5.x for Windows 64-bit (VS 2013) from qt-project.com/downloads
    1631* Install in the Directory C:\Tools\Qt\...
    1732* Qt need write permissions to this directory during compilation and linking.
    18 * Add the binary directory to the path variable (e.g. C:\Tools\Qt\4.8.4\bin\).
     33* Add the binary directory to the path variable (e.g. C:\Tools\Qt\Qt5.5.1\bin\).
     34* Set the environment variable 'Qt5_DIR' to 'C:\Tools\Qt\Qt5.5.1\5.5\msvc2013_64\'
    1935
    20 1.3 CMake 2.8.12
     361.4 CMake
    2137--------------------------------------------------------------------------------
    2238
    23 * Download CMake 2.8.12.x from "http://www.cmake.org/cmake/resources/software.html"
     39* Download CMake >= 3.3.2 (32bit) from "http://www.cmake.org/cmake/resources/software.html"
     40* Install in the default installation directory.
    2441* Add CMake to the system PATH for all users.
    25 * Install in the default installation directory.
    2642* Create a start script for CMake (C:\Tools\cmakestart.bat)
    2743    rem Set the Visual Studion 10 environment variables
     
    3147* Create a shortcut to the start script.
    3248
    33 1.4 NSIS 2.46
    34 --------------------------------------------------------------------------------
    35 
    36 * Download NSIS from "http://nsis.sourceforge.net/Main_Page"
    37 * Install in the default installation directory.
    38 
    39491.5 Mercurial SCM (Developers only)
    4050--------------------------------------------------------------------------------
    4151
    4252* Download Mercurial or TortoiseHG with Mercurial from "http://mercurial.selenic.com/downloads"
     53* Install in the default installation directory.
     54
     551.6 NSIS 2.46
     56--------------------------------------------------------------------------------
     57
     58* Download NSIS from "http://nsis.sourceforge.net/Main_Page"
    4359* Install in the default installation directory.
    4460
     
    105121* Select the destination directory
    106122* Press the configure button
    107 * Select the generator "Visual Studio 11"
    108   (the generator "Visual Studio 12" did not work in this time)
     123* Select the generator "Visual Studio 12 2013 Win64"
    109124* Press the generate button
    110125
  • qstopmotion/trunk/fuentes/cmake/FindGPhoto2PkgConfig.cmake

    r446 r4773  
    2626    SET(
    2727        GPHOTO2_FOUND
    28         TRUE
     28        true
    2929    )
    3030    MESSAGE(STATUS "Found in cache: gphoto2 !")
     
    121121    SET(
    122122        GPHOTO2_FOUND
    123         TRUE
     123        true
    124124    )
    125125    MESSAGE(STATUS "Found: gphoto2 !")
     
    129129    SET(
    130130        GPHOTO2_FOUND
    131         FALSE
     131        false
    132132    )
    133133    MESSAGE(SEND_ERROR "Not found: gphoto2 !")
  • qstopmotion/trunk/fuentes/cmake/FindGStreamerPkgConfig.cmake

    r446 r4773  
    3737   SET(
    3838       GStreamer_FIND_QUIETLY
    39        TRUE
     39       true
    4040   )
    4141ELSE (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND
     
    4444   SET(
    4545       GStreamer_FIND_QUIETLY
    46        FALSE
     46       false
    4747   )
    4848ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND
     
    144144    SET(
    145145        GSTREAMER_FOUND
    146         TRUE
     146        true
    147147    )
    148148    MESSAGE(STATUS "Found: GStreamer ${GSTREAMER_VERSION} !")
     
    158158    SET(
    159159        GSTREAMER_FOUND
    160         FALSE
     160        false
    161161    )
    162162    MESSAGE(SEND_ERROR "Not found: GStreamer !")
  • qstopmotion/trunk/fuentes/cmake/FindV4L2PkgConfig.cmake

    r446 r4773  
    4949
    5050include(FindPackageHandleStandardArgs)
    51 # handle the QUIETLY and REQUIRED arguments and set V4L2_FOUND to TRUE
    52 # if all listed variables are TRUE
     51# handle the QUIETLY and REQUIRED arguments and set V4L2_FOUND to true
     52# if all listed variables are true
    5353find_package_handle_standard_args(
    5454    Libv4l2
  • qstopmotion/trunk/fuentes/deb/changelog

    r446 r4773  
     1qStopMotion (2.3.2) unstable; urgency=low
     2  * Some spelling corrections.
     3  * Update of the Czech translation.
     4 -- Ralf Lange <ralf.lange@qstopmotion.org> Thu, 10 Nov 2016 00:09:11 +0100
     5
     6qStopMotion (2.3.0) unstable; urgency=low
     7  * Overlay intensity slider now works.
     8  * Change the onion scinning to gray scale images.
     9  * Remove all gstreamer using.
     10  * Bug fixing.
     11 -- Ralf Lange <ralf.lange@qstopmotion.org> Thu, 02 Aug 2016 00:09:11 +0100
     12
     13qStopMotion (2.2.0) unstable; urgency=low
     14  * Change the controller dialog from listboxes to slider
     15  * Improve the gphoto image grabber
     16  * Bug fixing.
     17 -- Ralf Lange <ralf.lange@qstopmotion.org> Thu, 09 May 2016 00:09:11 +0100
     18
    119qstopmotion (2.0.2) unstable; urgency=low
    220 * Update the Ubuntu package generation. Fix most of the lintian messages.
  • qstopmotion/trunk/fuentes/debian/changelog

    r4756 r4773  
    1 qstopmotion (2.0.2-1~getdeb1+lliurex2) xenial; urgency=medium
     1qstopmotion (2.3.2-1) unstable; urgency=low
    22
    3   * Added metainfo
     3  * Initial release (Closes: #827840)
    44
    5  -- Juanma Navarro Mañez <juanma1980@gmail.com>  Mon, 15 May 2017 14:09:55 +0200
    6 
    7 qstopmotion (2.0.2-1~getdeb1+lliurex1) xenial; urgency=medium
    8 
    9   * Imported code to lliurex xenial
    10 
    11  -- M.Angel Juan <m.angel.juan@gmail.com>  Mon, 08 Feb 2016 15:03:05 +0100
    12 
    13 qstopmotion (2.0.2-1~getdeb1) trusty; urgency=medium
    14 
    15   * New upstream version
    16     * Update the Ubuntu package generation. Fix most of the lintian
    17       messages.
    18     * Add the CentOS package generation.
    19     * Bug fixing.
    20 
    21  -- Christoph Korn <christoph.korn@getdeb.net>  Wed, 23 Sep 2015 19:19:10 +0200
    22 
    23 qstopmotion (2.0.0-1~getdeb1) trusty; urgency=medium
    24 
    25   * New upstream version
    26     * Remove of the Gstreamer grabber from the Windows platform.
    27     * On Windows qStopMotion can be started as an portable application.
    28     * Video4Linux2 grabber on the Linux platform.
    29     * Camera controller for the Video4Linux2 grabber.
    30 
    31  -- Christoph Korn <christoph.korn@getdeb.net>  Fri, 02 Jan 2015 22:07:52 +0100
    32 
    33 qstopmotion (1.0.1-1~getdeb1) precise; urgency=low
    34 
    35   * Initial release (LP: #1187151)
    36 
    37  -- Christoph Korn <christoph.korn@getdeb.net>  Wed, 05 Jun 2013 19:24:56 +0200
     5 -- Adrian Knoth <adi@drcomp.erfurt.thur.de>  Mon, 14 Nov 2016 20:58:37 +0100
  • qstopmotion/trunk/fuentes/debian/compat

    r446 r4773  
    1 9
     110
  • qstopmotion/trunk/fuentes/debian/control

    r4756 r4773  
    22Section: video
    33Priority: optional
    4 Maintainer: Christoph Korn <christoph.korn@getdeb.net>
    5 Build-Depends: llxsrchelper,debhelper (>= 9),
    6                cmake,
    7                libqt4-dev,
    8                libgstreamer0.10-dev,
    9                libgstreamer-plugins-base0.10-dev,
    10                libgphoto2-dev,
    11                linux-libc-dev,
    12                libv4l-dev
    13 Standards-Version: 3.9.5
    14 Homepage: http://www.qstopmotion.org/
     4Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers@lists.alioth.debian.org>
     5Uploaders: Adrian Knoth <adi@drcomp.erfurt.thur.de>
     6Build-Depends: debhelper (>=10),
     7 libgphoto2-dev,
     8 libxml2-dev,
     9 libv4l-dev,
     10 qtbase5-dev,
     11 cmake
     12Standards-Version: 3.9.8
     13Homepage: http://www.qstopmotion.org
     14Vcs-Git: https://anonscm.debian.org/git/pkg-multimedia/qstopmotion.git
     15Vcs-Browser: https://anonscm.debian.org/gitweb/?p=pkg-multimedia/qstopmotion.git
    1516
    1617Package: qstopmotion
    1718Architecture: any
    18 Depends: ${shlibs:Depends},
    19          ${misc:Depends}
    20 Description: Creates stop-motion animation movies
    21  qStopMotion is a free application for creating stop-motion
    22  animation movies. The users will be able to create
    23  stop-motions from pictures imported from a camera or from
    24  the harddrive and export the animation to different video
    25  formats such as mpeg or avi.
     19Depends: ${shlibs:Depends}, ${misc:Depends}
     20Recommends: ffmpeg,
     21 v4l-utils
     22Description: Application for creating stop-motion animation movies
     23 The users will be able to create stop-motions from pictures imported
     24 from a camera or from the harddrive and export the animation to
     25 different video formats such as mpeg or avi.
  • qstopmotion/trunk/fuentes/debian/copyright

    r446 r4773  
    1 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
     1Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
    22Upstream-Name: qstopmotion
    3 Source: http://sourceforge.net/projects/qstopmotion/files/
     3Source: http://www.qstopmotion.org
    44
    55Files: *
    6 Copyright: Ralf Lange <ralf.lange@longsoft.de>
    7            Bjoern Erik Nilsen <bjoern.nilsen@bjoernen.com>
    8            Fredrik Berg Kjoelstad <fredrikbk@hotmail.com>
    9 License: GPL-2.0+
     6Copyright: 2005-2016 Ralf Lange <ralf.lange@longsoft.de>
     7 2005-2016 Bjoern Erik Nilsen <bjoern.nilsen@bjoernen.com>
     8 2005-2008 Fredrik Berg Kjoelstad <fredrikbk@hotmail.com>
     9License: GPL-2+
    1010
    1111Files: debian/*
    12 Copyright: 2013 Christoph Korn <christoph.korn@getdeb.net>
    13 License: GPL-2.0+
     12Copyright: 2016 Adrian Knoth <adi@drcomp.erfurt.thur.de>
     13License: GPL-2+
    1414
    15 License: GPL-2.0+
     15License: GPL-2+
    1616 This package is free software; you can redistribute it and/or modify
    1717 it under the terms of the GNU General Public License as published by
     
    2525 .
    2626 You should have received a copy of the GNU General Public License
    27  along with this program. If not, see <http://www.gnu.org/licenses/>
     27 along with this program. If not, see <https://www.gnu.org/licenses/>
    2828 .
    2929 On Debian systems, the complete text of the GNU General
    3030 Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
    31 
  • qstopmotion/trunk/fuentes/debian/patches/series

    r4759 r4773  
    1 cmakelists.patch
    2 ftbfs.patch
    3 metadata
  • qstopmotion/trunk/fuentes/debian/rules

    r446 r4773  
    11#!/usr/bin/make -f
     2#export DH_VERBOSE = 1
     3
     4
     5# see FEATURE AREAS in dpkg-buildflags(1)
     6export DEB_BUILD_MAINT_OPTIONS = hardening=+all
     7
     8# see ENVIRONMENT in dpkg-buildflags(1)
     9# package maintainers to append CFLAGS
     10#export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
     11# package maintainers to append LDFLAGS
     12#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
     13
     14
    215%:
    3         dh $@
     16        dh $@ --buildsystem=cmake --parallel
     17
     18
     19# dh_make generated override targets
     20# This is example for Cmake (See https://bugs.debian.org/641051 )
     21#override_dh_auto_configure:
     22#       dh_auto_configure -- #  -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
     23
  • qstopmotion/trunk/fuentes/debian/watch

    r446 r4773  
    1 version=3
    2 http://sf.net/qstopmotion/qstopmotion-([\d\.]+)-Source\.tar\.(?:gz|bz2|xz)?
     1# Compulsory line, this is a version 4 file
     2version=4
     3
     4# SourceForge hosted projects
     5http://sf.net/qstopmotion/ qstopmotion-(.*)-Source\.tar\.gz debian uupdate
  • qstopmotion/trunk/fuentes/linux/qstopmotion.1

    r446 r4773  
    4545.SH SEE ALSO
    4646The full documentation for qStopMotion is maintained in the application help menu.
    47 Visit the projects website for more informations.
     47Visit the projects website for more information.
    4848(http://www.qStopMotion.org)
    4949.br
  • qstopmotion/trunk/fuentes/linux/qstopmotion.desktop

    r446 r4773  
    99Categories=AudioVideo;Video;AudioVideoEditing;
    1010StartupNotify=true
     11Keywords=animation;stop-motion;video;
    1112MimeType=application/x-qstopmotion;
  • qstopmotion/trunk/fuentes/manual/adding_sound.html

    r446 r4773  
    2323        <DIV CLASS="section">
    2424                <H1 CLASS="section">X. Adding sound</H1>
    25                 <P>You also can add sound to your animations. Before you can do this however you need to have a frame to attatch the sound to. Therefore you should add some frames from the harddrive or webcamera first.</P>
    26                 <P>When you have one or more frames you can add a sound by double clicking with the mouse on the frame to attatch the sound to. You will then get a menu where you can add sounds. When running the animation the sound will be played from this frame and until the sound is completed or the animation is at an end.</P>
     25                <P>You also can add sound to your animations. Before you can do this however you need to have a frame to attach the sound to. Therefore you should add some frames from the harddrive or webcamera first.</P>
     26                <P>When you have one or more frames you can add a sound by double clicking with the mouse on the frame to attach the sound to. You will then get a menu where you can add sounds. When running the animation the sound will be played from this frame and until the sound is completed or the animation is at an end.</P>
    2727                <DIV CLASS="note">
    2828                        <TABLE CLASS="note" WIDTH="100%" BORDER="0">
  • qstopmotion/trunk/fuentes/manual/index.html

    r446 r4773  
    1212    <H3 CLASS="author">Fredrik Berg Kjoelstad</H3>
    1313    <H3 CLASS="author">Bjoern Erik Nilsen</H3>
    14     <P CLASS="pubdate"> Sunday, 15 October 2013<BR>
     14    <P CLASS="pubdate"> Sunday, 31 July 2016<BR>
    1515    </P>
    1616    <HR>
  • qstopmotion/trunk/fuentes/qstopmotion.pro

    r446 r4773  
    22# QtCreator file for the qStopMotion project                                  #
    33# (c) Ralf Lange, longsoft.de                                                 #
    4 # Last update: 2015-05-12                                                     #
     4# Last update: 2016-02-02                                                     #
    55#                                                                             #
    66# Please use CMake and the CMakeLists.txt file to build qStopMotion!          #
     
    134134           src/frontends/qtfrontend/dialogs/helpbrowser.cpp \
    135135           src/frontends/qtfrontend/dialogs/startdialog.cpp \
     136           src/frontends/qtfrontend/elements/clickablelabel.cpp \
    136137           src/frontends/qtfrontend/elements/flexiblelineedit.cpp \
    137138           src/frontends/qtfrontend/elements/flexiblespinbox.cpp \
     
    256257# DEFINES += NO_DEBUG
    257258TEMPLATE = app
    258 QT += xml
     259QT += widgets xml
    259260
    260261target.path = /usr/local/bin
  • qstopmotion/trunk/fuentes/src/domain/animation/animationproject.cpp

    r446 r4773  
    11/******************************************************************************
    2  *  Copyright (C) 2005-2015 by                                                *
     2 *  Copyright (C) 2005-2016 by                                                *
    33 *    Bjoern Erik Nilsen (bjoern.nilsen@bjoernen.com),                        *
    44 *    Fredrik Berg Kjoelstad (fredrikbk@hotmail.com),                         *
     
    2323#include "animationproject.h"
    2424
     25#include <QDebug>
     26#include <QDir>
     27#include <QFile>
     28#include <QtGlobal>
     29
    2530#include "domain/domainfacade.h"
    2631// #include "technical/audio/ossdriver.h"
    2732#include "technical/videoencoder/videoencoderfactory.h"
    2833
    29 #include <QtCore/QDir>
    30 #include <QtCore/QFile>
    31 #include <QtCore/QtDebug>
    32 
    3334
    3435AnimationProject::AnimationProject(Frontend* f)
    3536{
    36     qDebug("AnimationProject::Constructor --> Start");
     37    qDebug() << "AnimationProject::Constructor --> Start";
    3738
    3839    frontend                 = f;
     
    4546    mixCount                 = 2;
    4647    playbackCount            = 0;
     48    overlayIntensity         = 100;
    4749
    4850    encoderApplication       = 0;
     
    7173    isAudioDriverInitialized = false;
    7274
    73     qDebug("AnimationProject::Constructor --> End");
     75    qDebug() << "AnimationProject::Constructor --> End";
    7476}
    7577
     
    7779AnimationProject::~AnimationProject()
    7880{
    79     qDebug("AnimationProject::Destructor --> Start");
     81    qDebug() << "AnimationProject::Destructor --> Start";
    8082
    8183    unsigned int sceneSize = scenes.size();
     
    99101    frontend = NULL;
    100102
    101     qDebug("AnimationProject::Destructor --> End");
     103    qDebug() << "AnimationProject::Destructor --> End";
    102104}
    103105
     
    177179void AnimationProject::setRecordingMode(int newRecordingMode)
    178180{
    179     recordingMode = newRecordingMode;
    180     incSettingsChanges();
     181    if (recordingMode != newRecordingMode) {
     182        recordingMode = newRecordingMode;
     183        incSettingsChanges();
     184    }
    181185}
    182186
     
    190194void AnimationProject::setVideoSource(int newVideoSource)
    191195{
    192     videoSource = newVideoSource;
    193     incSettingsChanges();
     196    if (videoSource != newVideoSource) {
     197        videoSource = newVideoSource;
     198        incSettingsChanges();
     199    }
    194200}
    195201
     
    203209void AnimationProject::setResolution(int newResolution)
    204210{
    205     videoResolution = newResolution;
    206     incSettingsChanges();
     211    if (videoResolution != newResolution) {
     212        videoResolution = newResolution;
     213        incSettingsChanges();
     214    }
    207215}
    208216
     
    216224void AnimationProject::setMixMode(int newMixMode)
    217225{
    218     mixMode = newMixMode;
    219     incSettingsChanges();
     226    if (mixMode != newMixMode) {
     227        mixMode = newMixMode;
     228        incSettingsChanges();
     229    }
    220230}
    221231
     
    229239void AnimationProject::setMixCount(int newMixCount)
    230240{
    231     mixCount = newMixCount;
    232     incSettingsChanges();
     241    if (mixCount != newMixCount) {
     242        mixCount = newMixCount;
     243        incSettingsChanges();
     244    }
    233245}
    234246
     
    242254void AnimationProject::setPlaybackCount(int newPlaybackCount)
    243255{
    244     playbackCount = newPlaybackCount;
    245     incSettingsChanges();
     256    if (playbackCount != newPlaybackCount) {
     257        playbackCount = newPlaybackCount;
     258        incSettingsChanges();
     259    }
    246260}
    247261
     
    255269void AnimationProject::setUnitMode(int newUnitMode)
    256270{
    257     unitMode = newUnitMode;
    258     incSettingsChanges();
     271    if (unitMode != newUnitMode) {
     272        unitMode = newUnitMode;
     273        incSettingsChanges();
     274    }
     275}
     276
     277
     278int AnimationProject::getOverlayIntensity()
     279{
     280    return overlayIntensity;
     281}
     282
     283
     284void AnimationProject::setOverlayIntensity(int overlay)
     285{
     286    if (overlayIntensity != overlay) {
     287        overlayIntensity = overlay;
     288        incSettingsChanges();
     289    }
    259290}
    260291
     
    301332void AnimationProject::setImageSize(int newIS)
    302333{
    303     imageSize = newIS;
    304     incSettingsChanges();
     334    if (imageSize != newIS) {
     335        imageSize = newIS;
     336        incSettingsChanges();
     337    }
    305338}
    306339
     
    314347void AnimationProject::setImageTransformation(int newTransform)
    315348{
    316     imageTransformation = newTransform;
    317     incSettingsChanges();
     349    if (imageTransformation != newTransform) {
     350        imageTransformation = newTransform;
     351        incSettingsChanges();
     352    }
    318353}
    319354
     
    327362void AnimationProject::setImageAdjustment(int newIA)
    328363{
    329     imageAdjustment = newIA;
    330     incSettingsChanges();
     364    if (imageAdjustment != newIA) {
     365        imageAdjustment = newIA;
     366        incSettingsChanges();
     367    }
    331368}
    332369
     
    340377void AnimationProject::setZoomValue(int newZV)
    341378{
    342     zoomValue = newZV;
    343     incSettingsChanges();
     379    if (zoomValue != newZV) {
     380        zoomValue = newZV;
     381        incSettingsChanges();
     382    }
    344383}
    345384
     
    371410void AnimationProject::setEncoderApplication(int newEA)
    372411{
    373     encoderApplication = newEA;
    374     incSettingsChanges();
     412    if (encoderApplication != newEA) {
     413        encoderApplication = newEA;
     414        incSettingsChanges();
     415    }
    375416}
    376417
     
    384425void AnimationProject::setVideoFormat(int newVF)
    385426{
    386     videoFormat = newVF;
    387     incSettingsChanges();
     427    if (videoFormat != newVF) {
     428        videoFormat = newVF;
     429        incSettingsChanges();
     430    }
    388431}
    389432
     
    397440void AnimationProject::setVideoSize(int newVS)
    398441{
    399     videoSize = newVS;
    400     incSettingsChanges();
     442    if (videoSize != newVS) {
     443        videoSize = newVS;
     444        incSettingsChanges();
     445    }
    401446}
    402447
     
    410455void AnimationProject::setVideoFps(int newFPS)
    411456{
    412     videoFps = newFPS;
    413     incSettingsChanges();
     457    if (videoFps != newFPS) {
     458        videoFps = newFPS;
     459        incSettingsChanges();
     460    }
    414461}
    415462
     
    423470void AnimationProject::setUseDefaultOutputFile(bool newUDOF)
    424471{
    425     useDefaultOutputFile = newUDOF;
    426     incSettingsChanges();
     472    if (useDefaultOutputFile != newUDOF) {
     473        useDefaultOutputFile = newUDOF;
     474        incSettingsChanges();
     475    }
    427476}
    428477
     
    436485void AnimationProject::setDefaultOutputFileName(const QString newDOFN)
    437486{
    438     defaultOutputFileName = newDOFN;
    439     incSettingsChanges();
     487    if (defaultOutputFileName.compare(newDOFN) != 0) {
     488        defaultOutputFileName = newDOFN;
     489        incSettingsChanges();
     490    }
    440491}
    441492
     
    446497bool AnimationProject::openProject(const QString &filePath)
    447498{
    448     qDebug("AnimationProject::openProject --> Start");
     499    qDebug() << "AnimationProject::openProject --> Start";
    449500
    450501    serializer->setNewProjectFilePath(filePath);
     
    452503
    453504    if (!readSettingsFromProject(serializer->getSettingsElement())) {
    454         qWarning("AnimationProject::openProject --> Read settings failed");
     505        qWarning() << "AnimationProject::openProject --> Read settings failed";
    455506        return false;
    456507    }
    457508    if (!readScenesFromProject(serializer->getAnimationElement())) {
    458         qWarning("AnimationProject::openProject --> Read animation data failed");
     509        qWarning() << "AnimationProject::openProject --> Read animation data failed";
    459510        return false;
    460511    }
    461512    if (scenes.size() == 0) {
    462         qDebug("AnimationProject::openProject --> End (without scene)");
     513        qDebug() << "AnimationProject::openProject --> End (without scene)";
    463514        return false;
    464515    }
    465516
    466     qDebug("AnimationProject::openProject --> End");
     517    qDebug() << "AnimationProject::openProject --> End";
    467518    return true;
    468519}
     
    471522bool AnimationProject::saveProject(const QString &filePath, bool saveAs)
    472523{
    473     qDebug("AnimationProject::saveProject --> Start");
     524    qDebug() << "AnimationProject::saveProject --> Start";
    474525
    475526    if (!filePath.isEmpty()) {
     
    480531
    481532    if (!serializer->save(this, saveAs)) {
    482         qWarning("AnimationProject::saveProject --> save animation data failed");
     533        qWarning() << "AnimationProject::saveProject --> save animation data failed";
    483534        frontend->hideProgress();
    484535        return false;
     
    490541    frontend->hideProgress();
    491542
    492     qDebug("AnimationProject::saveProject --> End");
     543    qDebug() << "AnimationProject::saveProject --> End";
    493544    return true;
    494545}
     
    497548bool AnimationProject::newProject(const QString &projectDescription)
    498549{
    499     qDebug("AnimationProject::newProject --> Start");
     550    qDebug() << "AnimationProject::newProject --> Start";
    500551
    501552    description.append(projectDescription);
    502553
    503     qDebug("AnimationProject::newProject --> End");
     554    qDebug() << "AnimationProject::newProject --> End";
    504555    return true;
    505556}
     
    509560{
    510561    if (0 == settingsChanges) {
    511         return FALSE;
    512     }
    513     return TRUE;
     562        return false;
     563    }
     564    return true;
    514565}
    515566
     
    532583{
    533584    if (0 == animationChanges) {
    534         return FALSE;
    535     }
    536     return TRUE;
     585        return false;
     586    }
     587    return true;
    537588}
    538589
     
    554605bool AnimationProject::initAudioDevice()
    555606{
    556     qDebug("AnimationProject::initAudioDevice --> Empty");
     607    qDebug() << "AnimationProject::initAudioDevice --> Empty";
    557608    /*
    558609    isAudioDriverInitialized = audioDriver->initialize();
     
    565616    }
    566617
    567     qDebug("AnimationProject::initAudioDevice --> Start");
     618    qDebug() << "AnimationProject::initAudioDevice --> Start";
    568619    return isAudioDriverInitialized;
    569620    */
     
    574625void AnimationProject::shutdownAudioDevice()
    575626{
    576     qDebug("AnimationProject::shutdownAudioDevice --> Start");
     627    qDebug() << "AnimationProject::shutdownAudioDevice --> Start";
    577628
    578629    audioDriver->shutdown();
    579630    isAudioDriverInitialized = false;
    580631
    581     qDebug("AnimationProject::shutdownAudioDevice --> End");
     632    qDebug() << "AnimationProject::shutdownAudioDevice --> End";
    582633}
    583634
     
    585636bool AnimationProject::exportToVideo(VideoEncoder * encoder)
    586637{
    587     qDebug("AnimationProject::exportToVideo --> Start");
     638    qDebug() << "AnimationProject::exportToVideo --> Start";
    588639
    589640    VideoEncoderFactory factory(this->getFrontend());
     
    592643    }
    593644
    594     qDebug("AnimationProject::exportToVideo --> End");
     645    qDebug() << "AnimationProject::exportToVideo --> End";
    595646    return false;
    596647}
     
    605656bool AnimationProject::readSettingsFromProject(QDomElement &settingsNode)
    606657{
    607     qDebug("AnimationProject::readSettingsFromProject --> Start");
     658    qDebug() << "AnimationProject::readSettingsFromProject --> Start";
    608659
    609660    QDomElement currElement = settingsNode.firstChildElement();
     
    656707            unitMode = tmp.toInt();
    657708        }
     709        else if (nodeName.compare("overlayintensity") == 0) {
     710            QString tmp = currElement.text();
     711            overlayIntensity = tmp.toInt();
     712            frontend->setOverlayIntensity(overlayIntensity);
     713        }
    658714        // Save image import parameter
    659715        else if (nodeName.compare("imageformat") == 0) {
     
    723779    }
    724780
    725     qDebug("AnimationProject::readSettingsFromProject --> End");
     781    qDebug() << "AnimationProject::readSettingsFromProject --> End";
    726782    return true;
    727783}
     
    730786bool AnimationProject::saveSettingsToProject(QDomDocument &doc, QDomElement &settingsNode)
    731787{
    732     qDebug("AnimationProject::saveSettingsToProject --> Start");
     788    qDebug() << "AnimationProject::saveSettingsToProject --> Start";
    733789
    734790    // Save project parameter
     
    776832    settingsNode.appendChild(unitModeElement);
    777833
     834    // Save overlay intensity parameter
     835    QDomElement overlayIntensityElement = doc.createElement("overlayintensity");
     836    QDomText overlayIntensityText = doc.createTextNode(QString("%1").arg(overlayIntensity));
     837    overlayIntensityElement.appendChild(overlayIntensityText);
     838    settingsNode.appendChild(overlayIntensityElement);
     839
    778840    // Save image import preferences
    779841
     
    858920    settingsNode.appendChild(dofnElement);
    859921
    860     qDebug("AnimationProject::saveSettingsToProject --> End");
     922    qDebug() << "AnimationProject::saveSettingsToProject --> End";
    861923    return true;
    862924}
     
    886948void AnimationProject::setActiveScene(Scene *newScene)
    887949{
    888     qDebug("AnimationProject::setActiveScene --> Start");
     950    qDebug() << "AnimationProject::setActiveScene --> Start";
    889951
    890952    int sceneSize = scenes.size();
     
    903965    }
    904966
    905     qDebug("AnimationProject::setActiveScene --> End");
     967    qDebug() << "AnimationProject::setActiveScene --> End";
    906968}
    907969
     
    909971void AnimationProject::setActiveSceneIndex(int sceneIndex)
    910972{
    911     qDebug("AnimationProject::setActiveSceneIndex --> Start");
     973    qDebug() << "AnimationProject::setActiveSceneIndex --> Start";
    912974
    913975    // The new scene index can be the same as the active scene index
     
    917979    this->activeSceneIndex = sceneIndex;
    918980
    919     qDebug("AnimationProject::setActiveSceneIndex --> End");
     981    qDebug() << "AnimationProject::setActiveSceneIndex --> End";
    920982}
    921983
     
    9641026void AnimationProject::addScene(const QString &sceneDescription)
    9651027{
    966     qDebug("AnimationProject::addScene --> Start");
     1028    qDebug() << "AnimationProject::addScene --> Start";
    9671029
    9681030    Scene *scene = new Scene(this);
     
    9771039    scenes.append(scene);
    9781040
    979     qDebug("AnimationProject::addScene --> End");
     1041    qDebug() << "AnimationProject::addScene --> End";
    9801042}
    9811043
     
    9831045void AnimationProject::addScene(Scene *scene)
    9841046{
    985     qDebug("AnimationProject::addScene --> Start");
     1047    qDebug() << "AnimationProject::addScene --> Start";
    9861048
    9871049    scenes.append(scene);
    9881050
    989     qDebug("AnimationProject::addScene --> End");
     1051    qDebug() << "AnimationProject::addScene --> End";
    9901052}
    9911053
     
    9931055void AnimationProject::insertScene(int sceneIndex, const QString &sceneDescription)
    9941056{
    995     qDebug("AnimationProject::insertScene --> Start");
     1057    qDebug() << "AnimationProject::insertScene --> Start";
    9961058
    9971059    Q_ASSERT(sceneIndex > -1);
     
    10121074    }
    10131075
    1014     qDebug("AnimationProject::insertScene --> End");
     1076    qDebug() << "AnimationProject::insertScene --> End";
    10151077}
    10161078
     
    10181080void AnimationProject::insertScene(int sceneIndex, Scene *scene)
    10191081{
    1020     qDebug("AnimationProject::insertScene --> Start");
     1082    qDebug() << "AnimationProject::insertScene --> Start";
    10211083
    10221084    Q_ASSERT(sceneIndex > -1);
     
    10281090    }
    10291091
    1030     qDebug("AnimationProject::insertScene --> End");
     1092    qDebug() << "AnimationProject::insertScene --> End";
    10311093}
    10321094
     
    10661128Scene *AnimationProject::removeScene(int sceneIndex)
    10671129{
    1068     qDebug("AnimationProject::removeScene --> Start");
     1130    qDebug() << "AnimationProject::removeScene --> Start";
    10691131
    10701132    Q_ASSERT(sceneIndex != activeSceneIndex);
     
    10781140    scenes.remove(sceneIndex);
    10791141
    1080     qDebug("AnimationProject::removeScene --> End");
     1142    qDebug() << "AnimationProject::removeScene --> End";
    10811143    return removedScene;
    10821144}
     
    10851147bool AnimationProject::readScenesFromProject(QDomElement &animationNode)
    10861148{
    1087     qDebug("AnimationProject::readScenesFromProject --> Start");
     1149    qDebug() << "AnimationProject::readScenesFromProject --> Start";
    10881150
    10891151    QString activeSceneId;
     
    11021164
    11031165            if (!newScene->readDataFromProject(currElement)) {
    1104                 qDebug("AnimationProject::readScenesFromProject --> End (false)");
     1166                qDebug() << "AnimationProject::readScenesFromProject --> End (false)";
    11051167                return false;
    11061168            }
     
    11311193    }
    11321194
    1133     qDebug("AnimationProject::readScenesFromProject --> End");
     1195    qDebug() << "AnimationProject::readScenesFromProject --> End";
    11341196    return true;
    11351197}
     
    11381200bool AnimationProject::saveScenesToProject(QDomDocument &doc, QDomElement &animationNode)
    11391201{
    1140     qDebug("AnimationProject::saveScenesToProject --> Start");
     1202    qDebug() << "AnimationProject::saveScenesToProject --> Start";
    11411203
    11421204    unsigned int  sceneSize = scenes.size();
     
    12381300
    12391301        if (!scenes[sceneIndex]->saveDataToProject(doc, sceneElement)) {
    1240             qDebug("AnimationProject::saveScenesToProject --> End (false)");
     1302            qDebug() << "AnimationProject::saveScenesToProject --> End (false)";
    12411303            return false;
    12421304        }
     
    12581320    }
    12591321
    1260     qDebug("AnimationProject::saveScenesToProject --> End");
     1322    qDebug() << "AnimationProject::saveScenesToProject --> End";
    12611323    return true;
    12621324}
     
    12651327bool AnimationProject::saveAsScenesToProject(QDomDocument &doc, QDomElement &animationNode)
    12661328{
    1267     qDebug("AnimationProject::saveScenesToProject --> Start");
     1329    qDebug() << "AnimationProject::saveScenesToProject --> Start";
    12681330
    12691331    unsigned int  sceneSize = scenes.size();
     
    13401402
    13411403        if (!scenes[sceneIndex]->saveDataToProject(doc, sceneElement)) {
    1342             qDebug("AnimationProject::saveScenesToProject --> End (false)");
     1404            qDebug() << "AnimationProject::saveScenesToProject --> End (false)";
    13431405            return false;
    13441406        }
     
    13601422    }
    13611423
    1362     qDebug("AnimationProject::saveScenesToProject --> End");
     1424    qDebug() << "AnimationProject::saveScenesToProject --> End";
    13631425    return true;
    13641426}
     
    13671429bool AnimationProject::convertImages(int newFormat, int newQuality)
    13681430{
    1369     qDebug("AnimationProject::saveScenesToProject --> Start");
     1431    qDebug() << "AnimationProject::saveScenesToProject --> Start";
    13701432
    13711433    unsigned int  sceneSize = scenes.size();
     
    14101472int AnimationProject::addSoundToScene(unsigned int sceneIndex, const QString &sound, const QString &soundName)
    14111473{
    1412     qDebug("AnimationProject::addSoundToScene --> Start");
     1474    qDebug() << "AnimationProject::addSoundToScene --> Start";
    14131475
    14141476    ++soundsNumber;
     
    14181480            tr("Cannot open the selected audio file for reading.\n"
    14191481            "Check that you have the right permissions set.\n"
    1420             "The animation will be runned without sound if you\n"
     1482            "The animation will be run without sound if you\n"
    14211483            "choose to play."));
    14221484        --soundsNumber;
     
    14241486        frontend->showWarning(tr("Add Sound"),
    14251487            tr("The selected audio file is not valid within the\n"
    1426             "given audio format. The animation will be runned\n"
     1488            "given audio format. The animation will be run\n"
    14271489            "without sound if you choose to play."));
    14281490        --soundsNumber;
    14291491    }
    14301492
    1431     qDebug("AnimationProject::addSoundToScene --> End");
     1493    qDebug() << "AnimationProject::addSoundToScene --> End";
    14321494    return ret;
    14331495}
     
    15791641void AnimationProject::setActiveExposureIndex(int exposureIndex)
    15801642{
    1581     qDebug("AnimationProject::setActiveExposureIndex --> Start");
     1643    qDebug() << "AnimationProject::setActiveExposureIndex --> Start";
    15821644
    15831645    scenes[this->activeSceneIndex]->setActiveExposureIndex(exposureIndex);
    15841646
    1585     qDebug("AnimationProject::setActiveExposureIndex --> End");
     1647    qDebug() << "AnimationProject::setActiveExposureIndex --> End";
    15861648}
    15871649
     
    16021664                                        unsigned int exposureIndex)
    16031665{
    1604     // qDebug("AnimationProject::getExposure --> Start");
     1666    // qDebug() << "AnimationProject::getExposure --> Start");
    16051667
    16061668    Q_ASSERT(exposureIndex < scenes[sceneIndex]->getExposureSize());
     
    16081670    Exposure* exposure = scenes[sceneIndex]->getExposure(takeIndex, exposureIndex);
    16091671
    1610     // qDebug("AnimationProject::getExposure --> End");
     1672    // qDebug() << "AnimationProject::getExposure --> End");
    16111673    return exposure;
    16121674}
     
    17171779                                           int &modExposureIndex)
    17181780{
    1719     qDebug("AnimationProject::getModifyedExposure --> Start");
     1781    qDebug() << "AnimationProject::getModifyedExposure --> Start";
    17201782
    17211783    int sceneSize = scenes.size();
     
    17241786        if (scenes[modSceneIndex]->getModifyedExposure(filePath, modTakeIndex, modExposureIndex)) {
    17251787            // Exposure found
    1726             qDebug("AnimationProject::getModifyedExposure --> End");
     1788            qDebug() << "AnimationProject::getModifyedExposure --> End";
    17271789            return true;
    17281790        }
     
    17311793    modSceneIndex = -1;
    17321794
    1733     qDebug("AnimationProject::getModifyedExposure --> End (Error)");
     1795    qDebug() << "AnimationProject::getModifyedExposure --> End (Error)";
    17341796    return false;
    17351797}
     
    17421804void AnimationProject::loadSavedScenes()
    17431805{
    1744     qDebug("AnimationProject::loadSavedScenes --> Start");
     1806    qDebug() << "AnimationProject::loadSavedScenes --> Start");
    17451807
    17461808    unsigned int numElem = scenes.size();
     
    17501812    setActiveSceneIndex(numElem - 1);
    17511813
    1752     qDebug("AnimationProject::loadSavedScenes --> End");
     1814    qDebug() << "AnimationProject::loadSavedScenes --> End");
    17531815}
    17541816
     
    17561818void AnimationProject::activateScene()
    17571819{
    1758     qDebug("AnimationProject::activateScene --> Start");
     1820    qDebug() << "AnimationProject::activateScene --> Start");
    17591821
    17601822    this->notifyActivateScene();
    17611823
    1762     qDebug("AnimationProject::activateScene --> End");
     1824    qDebug() << "AnimationProject::activateScene --> End");
    17631825}
    17641826*/
  • qstopmotion/trunk/fuentes/src/domain/animation/animationproject.h

    r446 r4773  
    11/******************************************************************************
    2  *  Copyright (C) 2005-2015 by                                                *
     2 *  Copyright (C) 2005-2016 by                                                *
    33 *    Bjoern Erik Nilsen (bjoern.nilsen@bjoernen.com),                        *
    44 *    Fredrik Berg Kjoelstad (fredrikbk@hotmail.com),                         *
     
    2424#define ANIMATIONPROJECT_H
    2525
     26#include <QString>
     27#include <QVector>
     28
    2629#include "domain/animation/exposure.h"
    2730#include "domain/animation/projectserializer.h"
     
    3033#include "technical/audio/audiodriver.h"
    3134#include "technical/videoencoder/ffmpegencoder.h"
    32 
    33 #include <QtCore/QObject>
    34 #include <QtCore/QString>
    35 #include <QtCore/QVector>
    3635
    3736class ProjectSerializer;
     
    9291    /**
    9392     * Retrieves the new project file name
    94      * @return the project file name if it's setted, NULL otherwise.
     93     * @return the project file name if it's set, NULL otherwise.
    9594     */
    9695    const QString getNewProjectFilePath() const;
     
    219218     */
    220219    void setUnitMode(int newUnitMode);
     220
     221    /**
     222     * Get the overlay intensity value.
     223     * @return The overlay intensity value.
     224     */
     225    int getOverlayIntensity();
     226
     227    /**
     228     * Set the overlay intensity value of the project.
     229     * @param overlay The new overlay intensity value.
     230     */
     231    void setOverlayIntensity(int overlay);
    221232
    222233    /**************************************************************************
     
    9931004
    9941005    /**
     1006     * Active overlay value of the project.
     1007     */
     1008    int overlayIntensity;
     1009
     1010    /**
    9951011     * All of the scenes in the animation.
    9961012     */
  • qstopmotion/trunk/fuentes/src/domain/animation/exposure.cpp

    r446 r4773  
    2323#include "exposure.h"
    2424
     25#include <QDebug>
     26#include <QFile>
     27#include <QImage>
     28#include <QString>
     29
    2530#include "domain/animation/projectserializer.h"
    2631#include "technical/util.h"
     
    2833#include "technical/grabber/imagegrabber.h"
    2934
    30 #include <QtCore/QFile>
    31 #include <QtCore/QString>
    32 #include <QtCore/QtDebug>
    33 #include <QtGui/QImage>
    34 
    3535
    3636unsigned int Exposure::tempNumber = 0;
     
    142142const QString Exposure::getImagePath() const
    143143{
    144     // qDebug("Exposure::getNewImagePath --> Start");
     144    // qDebug() << "Exposure::getNewImagePath --> Start");
    145145
    146146    Q_ASSERT(!theFrame.isEmpty());
     
    161161    absImagePath.append(theFrame);
    162162
    163     // qDebug("Exposure::getNewImagePath --> End");
     163    // qDebug() << "Exposure::getNewImagePath --> End");
    164164    return absImagePath;
    165165}
     
    371371bool Exposure::readDataFromProject(QDomElement &exposureNode)
    372372{
    373     // qDebug("Exposure::readDataFromProject --> Start");
     373    // qDebug() << "Exposure::readDataFromProject --> Start");
    374374
    375375    id.append(exposureNode.attributeNode(QLatin1String("id")).value());
     
    395395    }
    396396
    397     // qDebug("Exposure::readDataFromProject --> End");
     397    // qDebug() << "Exposure::readDataFromProject --> End");
    398398    return true;
    399399}
     
    402402bool Exposure::saveDataToProject(QDomDocument &doc, QDomElement &exposureNode)
    403403{
    404     qDebug("Exposure::saveDataFromProject --> Start");
     404    qDebug() << "Exposure::saveDataFromProject --> Start";
    405405
    406406    QDomElement   theFrameElement;
     
    431431    */
    432432
    433     qDebug("Exposure::saveDataFromProject --> End");
     433    qDebug() << "Exposure::saveDataFromProject --> End";
    434434    return true;
    435435}
  • qstopmotion/trunk/fuentes/src/domain/animation/exposure.h

    r446 r4773  
    2424#define EXPOSURE_H
    2525
     26#include <QDomDocument>
     27#include <QDomElement>
     28#include <QObject>
     29#include <QString>
     30#include <QVector>
     31
    2632#include "domain/animation/animationproject.h"
    2733// #include "domain/animation/scene.h"
    2834#include "domain/animation/take.h"
    29 
    30 #include <QtCore/QObject>
    31 #include <QtCore/QString>
    32 #include <QtCore/QVector>
    33 #include <QtXml/QDomDocument>
    34 #include <QtXml/QDomElement>
    3535
    3636// class AnimationProject;
  • qstopmotion/trunk/fuentes/src/domain/animation/projectserializer.cpp

    r446 r4773  
    2626#include "technical/preferencestool.h"
    2727
    28 #include <QtCore/QDir>
    29 #include <QtCore/QFile>
    30 #include <QtCore/QtDebug>
    31 #include <QtCore/QTextStream>
    32 #include <QtXml/QDomDocumentType>
    33 #include <QtXml/QDomImplementation>
     28#include <QDebug>
     29#include <QDir>
     30#include <QDomDocumentType>
     31#include <QDomImplementation>
     32#include <QFile>
     33#include <QtGlobal>
     34#include <QTextStream>
    3435
    3536
     
    6263bool ProjectSerializer::read()
    6364{
    64     qDebug("ProjectSerializer::read --> Start");
     65    qDebug() << "ProjectSerializer::read --> Start";
    6566
    6667    QString      errorStr;
     
    104105    }
    105106    if (versionElement.isNull()) {
    106         qWarning("ProjectSerializer::read --> Error while parsing project file");
     107        qWarning() << "ProjectSerializer::read --> Error while parsing project file";
    107108        return false;
    108109    }
    109110
    110     qDebug("ProjectSerializer::read --> End");
     111    qDebug() << "ProjectSerializer::read --> End";
    111112    return true;
    112113}
     
    116117bool ProjectSerializer::save(AnimationProject *animation, bool saveAs)
    117118{
    118     qDebug("ProjectSerializer::save --> Start");
    119 
    120     bool isSaved = FALSE;
     119    qDebug() << "ProjectSerializer::save --> Start";
     120
     121    bool isSaved = false;
    121122    QDomElement rootElement;
    122123    QDomElement versionElement;
     
    182183    QFile file(newProjectFilePath);
    183184    if (!file.open(QIODevice::ReadWrite | QIODevice::Truncate)) {
    184         qWarning("ProjectSerializer::save --> Can't open project file");
     185        qWarning() << "ProjectSerializer::save --> Can't open project file";
    185186        return isSaved;
    186187    }
     
    189190    out.flush();
    190191    file.close();
    191     isSaved = TRUE;
     192    isSaved = true;
    192193
    193194    unsigned int numElem = animation->getTotalExposureSize();
     
    195196    animation->getFrontend()->hideProgress();
    196197
    197     qDebug("ProjectSerializer::save --> End");
     198    qDebug() << "ProjectSerializer::save --> End";
    198199    return isSaved;
    199200}
     
    212213void ProjectSerializer::setNewProjectFilePath(const QString &pfp)
    213214{
    214     qDebug("ProjectSerializer::setNewProjectFilePath --> Start");
     215    qDebug() << "ProjectSerializer::setNewProjectFilePath --> Start";
    215216
    216217    Q_ASSERT(!pfp.isEmpty());
     
    289290    }
    290291
    291     qDebug("ProjectSerializer::setNewProjectFilePath --> End");
     292    qDebug() << "ProjectSerializer::setNewProjectFilePath --> End";
    292293}
    293294
  • qstopmotion/trunk/fuentes/src/domain/animation/projectserializer.h

    r446 r4773  
    2424#define PROJECTSERIALIZER_H
    2525
     26#include <QDomDocument>
     27#include <QDomElement>
     28#include <QString>
     29
    2630// #include "domain/animation/animationproject.h"
    2731#include "frontends/frontend.h"
    28 
    29 #include <QtCore/QObject>
    30 #include <QtCore/QString>
    31 #include <QtXml/QDomDocument>
    32 #include <QtXml/QDomElement>
    3332
    3433class ProjectSerializer;
  • qstopmotion/trunk/fuentes/src/domain/animation/scene.cpp

    r446 r4773  
    2323#include "scene.h"
    2424
     25#include <QDebug>
     26#include <QFile>
     27#include <QFileInfo>
     28#include <QtGlobal>
     29
    2530#include "domain/domainfacade.h"
    2631#include "technical/preferencestool.h"
    27 
    28 #include <QtCore/QFile>
    29 #include <QtCore/QFileInfo>
    30 #include <QtCore/QtDebug>
    3132
    3233
     
    138139bool Scene::readDataFromProject(QDomElement &sceneNode)
    139140{
    140     qDebug("Scene::readDataFromProject --> Start");
     141    qDebug() << "Scene::readDataFromProject --> Start";
    141142
    142143    QString activeTakeId;
     
    155156
    156157            if (!newTake->readDataFromProject(currElement)) {
    157                 qWarning("Scene::readDataFromProject --> Read take data failed");
     158                qWarning() << "Scene::readDataFromProject --> Read take data failed";
    158159                return false;
    159160            }
     
    168169        else if (elementName.compare("sound") == 0) {
    169170            if (!readSoundFromProject(currElement)) {
    170                 qWarning("Scene::readDataFromProject --> Read sound data failed");
     171                qWarning() << "Scene::readDataFromProject --> Read sound data failed";
    171172                return false;
    172173            }
     
    191192    this->isProjectFile = true;
    192193
    193     qDebug("Scene::readDataFromProject --> End");
     194    qDebug() << "Scene::readDataFromProject --> End";
    194195    return true;
    195196}
     
    198199bool Scene::saveDataToProject(QDomDocument &doc, QDomElement &sceneNode)
    199200{
    200     qDebug("Scene::saveDataToProject --> Start");
     201    qDebug() << "Scene::saveDataToProject --> Start";
    201202
    202203    unsigned int takeSize = takes.size();
     
    212213        sceneNode.appendChild(takeElement);
    213214        if (!takes[takeIndex]->saveDataToProject(doc, takeElement)) {
    214             qWarning("Scene::saveDataToProject --> Save take data failed");
     215            qWarning() << "Scene::saveDataToProject --> Save take data failed";
    215216            return false;
    216217        }
     
    234235    // Sounds
    235236    if (!saveSoundToProject(doc, sceneNode)) {
    236         qWarning("Scene::saveDataToProject --> Save sound data failed");
     237        qWarning() << "Scene::saveDataToProject --> Save sound data failed";
    237238        return false;
    238239    }
     
    240241    this->isProjectFile = true;
    241242
    242     qDebug("Scene::saveDataToProject --> End");
     243    qDebug() << "Scene::saveDataToProject --> End";
    243244    return true;
    244245}
     
    273274void Scene::setActiveTakeIndex(int takeIndex)
    274275{
    275     qDebug("Scene::setActiveTakeIndex --> Start");
     276    qDebug() << "Scene::setActiveTakeIndex --> Start";
    276277
    277278    // The new take index can be the same as the active take index
     
    281282    this->activeTakeIndex = takeIndex;
    282283
    283     qDebug("Scene::setActiveTakeIndex --> End");
     284    qDebug() << "Scene::setActiveTakeIndex --> End";
    284285}
    285286
     
    295296void Scene::setActiveTake(Take *newTake)
    296297{
    297     qDebug("Scene::setActiveTake --> Start");
     298    qDebug() << "Scene::setActiveTake --> Start";
    298299
    299300    // Check the actual scene index
     
    317318    }
    318319
    319     qDebug("Scene::setActiveTake --> End");
     320    qDebug() << "Scene::setActiveTake --> End";
    320321}
    321322
     
    335336void Scene::addTake(const QString &takeDescription)
    336337{
    337     qDebug("Scene::addTake(new) --> Start");
     338    qDebug() << "Scene::addTake(new) --> Start";
    338339
    339340    Take *take = new Take(this);
     
    347348    takes.append(take);
    348349
    349     qDebug("Scene::addTake(new) --> End");
     350    qDebug() << "Scene::addTake(new) --> End";
    350351}
    351352
     
    353354void Scene::addTake(Take *take)
    354355{
    355     qDebug("Scene::addTake(exist) --> Start");
     356    qDebug() << "Scene::addTake(exist) --> Start";
    356357
    357358    takes.append(take);
    358359
    359     qDebug("Scene::addTake(exist) --> End");
     360    qDebug() << "Scene::addTake(exist) --> End";
    360361}
    361362
     
    363364void Scene::insertTake(int takeIndex, const QString &takeDescription)
    364365{
    365     qDebug("Scene::insertTake(new) --> Start");
     366    qDebug() << "Scene::insertTake(new) --> Start";
    366367
    367368    Q_ASSERT(takeIndex > -1);
     
    382383    }
    383384
    384     qDebug("Scene::insertTake(new) --> End");
     385    qDebug() << "Scene::insertTake(new) --> End";
    385386}
    386387
     
    388389void Scene::insertTake(int takeIndex, Take *take)
    389390{
    390     qDebug("Scene::insertTake(exist) --> Start");
     391    qDebug() << "Scene::insertTake(exist) --> Start";
    391392
    392393    Q_ASSERT(takeIndex > -1);
     
    398399    }
    399400
    400     qDebug("Scene::insertTake(exist) --> End");
     401    qDebug() << "Scene::insertTake(exist) --> End";
    401402}
    402403
     
    418419Take *Scene::removeTake(int takeIndex)
    419420{
    420     qDebug("Scene::removeTake --> Start");
     421    qDebug() << "Scene::removeTake --> Start";
    421422
    422423    Q_ASSERT(takeIndex != activeTakeIndex);
     
    430431    takes.remove(takeIndex);
    431432
    432     qDebug("Scene::removeTake --> End");
     433    qDebug() << "Scene::removeTake --> End";
    433434    return removedTake;
    434435}
     
    521522                                int &modExposureIndex)
    522523{
    523     qDebug("Scene::getModifyedExposure --> Start");
     524    qDebug() << "Scene::getModifyedExposure --> Start";
    524525
    525526    int takeSize = takes.size();
     
    528529        if (takes[modTakeIndex]->getModifyedExposure(filePath, modExposureIndex)) {
    529530            // Exposure found
    530             qDebug("Scene::getModifyedExposure --> End");
     531            qDebug() << "Scene::getModifyedExposure --> End";
    531532            return true;
    532533        }
     
    535536    modTakeIndex = -1;
    536537
    537     qDebug("Scene::getModifyedExposure --> End (Error)");
     538    qDebug() << "Scene::getModifyedExposure --> End (Error)";
    538539    return false;
    539540}
     
    598599unsigned int Scene::getSoundStartPosition() const
    599600{
    600     qDebug("Take::getSountPosition --> Start");
     601    qDebug() << "Take::getSountPosition --> Start";
    601602
    602603    return this->soundStartPosition;
     
    613614int Scene::addSound(const QString & /*filename*/, const QString & /*soundname*/)
    614615{
    615     qDebug("Scene::addSound --> Start");
     616    qDebug() << "Scene::addSound --> Start";
    616617
    617618    /*
     
    677678    }
    678679    */
    679     qDebug("Scene::addSound --> End");
     680    qDebug() << "Scene::addSound --> End";
    680681
    681682    return 0;
     
    775776bool Scene::readSoundFromProject(QDomElement &soundNode)
    776777{
    777     qDebug("Scene::readSoundFromProject --> Start");
     778    qDebug() << "Scene::readSoundFromProject --> Start";
    778779
    779780    QDomElement currElement = soundNode.firstChildElement();
     
    800801    }
    801802
    802     qDebug("Scene::readSoundFromProject --> End");
     803    qDebug() << "Scene::readSoundFromProject --> End";
    803804    return true;
    804805}
     
    807808bool Scene::saveSoundToProject(QDomDocument &doc, QDomElement &sceneNode)
    808809{
    809     qDebug("Scene::saveSoundFromProject --> Start");
     810    qDebug() << "Scene::saveSoundFromProject --> Start";
    810811
    811812
     
    832833    }
    833834
    834     qDebug("Scene::saveSoundFromProject --> End");
     835    qDebug() << "Scene::saveSoundFromProject --> End";
    835836    return true;
    836837}
     
    842843bool Scene::operator!= (const Scene &other) const
    843844{
    844     qDebug("Scene::operator!= --> Start");
    845 
    846     qDebug("Scene::operator!= --> End");
     845    qDebug() << "Scene::operator!= --> Start");
     846
     847    qDebug() << "Scene::operator!= --> End");
    847848}
    848849*/
     
    853854void Scene::activateTake()
    854855{
    855     qDebug("Scene::activateTake --> Start");
     856    qDebug() << "Scene::activateTake --> Start");
    856857
    857858    parent->notifyActivateTake();
    858859
    859     qDebug("Scene::activateTake --> End");
     860    qDebug() << "Scene::activateTake --> End");
    860861}
    861862*/
  • qstopmotion/trunk/fuentes/src/domain/animation/scene.h

    r446 r4773  
    2424#define SCENE_H
    2525
     26#include <QDomDocument>
     27#include <QDomElement>
     28#include <QString>
     29#include <QVector>
     30
    2631#include "domain/animation/animationproject.h"
    2732#include "domain/animation/exposure.h"
     
    3035#include "technical/audio/audiodriver.h"
    3136#include "technical/audio/audioformat.h"
    32 
    33 #include <QtCore/QObject>
    34 #include <QtCore/QString>
    35 #include <QtCore/QVector>
    36 #include <QtXml/QDomDocument>
    37 #include <QtXml/QDomElement>
    3837
    3938class AnimationProject;
  • qstopmotion/trunk/fuentes/src/domain/animation/take.cpp

    r446 r4773  
    2323#include "take.h"
    2424
     25#include <QDebug>
     26#include <QFileInfo>
     27#include <QtGlobal>
     28
    2529#include "domain/domainfacade.h"
    26 
    27 #include <QtCore/QFileInfo>
    28 #include <QtCore/QtDebug>
    2930
    3031
     
    4748    }
    4849    exposures.clear();
     50
    4951}
    5052
     
    7476{
    7577    return description;
     78
    7679}
    7780
     
    107110
    108111    index = parent->getIndex();
     112#include <QDebug>
    109113
    110114    return index;
     
    138142bool Take::readDataFromProject(QDomElement &takeNode)
    139143{
    140     qDebug("Take::readDataFromProject --> Start");
     144    qDebug() << "Take::readDataFromProject --> Start";
    141145
    142146    QString activeExposureId;
     
    155159
    156160            if (!newExposure->readDataFromProject(currElement)) {
    157                 qWarning("Take::readDataFromProject --> Read exposure data failed");
     161                qWarning() << "Take::readDataFromProject --> Read exposure data failed";
    158162                return false;
    159163            }
     
    168172        else if (elementName.compare("sound") == 0) {
    169173            if (!readSoundFromProject(currElement)) {
    170                 qWarning("Take::readDataFromProject --> Read sound data failed");
     174                qWarning() << "Take::readDataFromProject --> Read sound data failed";
    171175                return false;
    172176            }
     
    191195    this->isProjectFile = true;
    192196
    193     qDebug("Take::readDataFromProject --> End");
     197    qDebug() << "Take::readDataFromProject --> End";
    194198    return true;
    195199}
     
    198202bool Take::saveDataToProject(QDomDocument &doc, QDomElement &takeNode)
    199203{
    200     qDebug("Take::saveDataFromProject --> Start");
     204    qDebug() << "Take::saveDataFromProject --> Start";
    201205
    202206    unsigned int exposureSize = exposures.size();
     
    213217        takeNode.appendChild(exposureElement);
    214218        if (!exposures[exposureIndex]->saveDataToProject(doc, exposureElement)) {
    215             qWarning("Take::saveDataFromProject --> Save exposure data failed");
     219            qWarning() << "Take::saveDataFromProject --> Save exposure data failed";
    216220            return false;
    217221        }
     
    235239    // Sounds
    236240    if (!saveSoundToProject(doc, takeNode)) {
    237         qWarning("Take::saveDataFromProject --> Save sound data failed");
     241        qWarning() << "Take::saveDataFromProject --> Save sound data failed";
    238242        return false;
    239243    }
     
    241245    this->isProjectFile = true;
    242246
    243     qDebug("Take::saveDataFromProject --> End");
     247    qDebug() << "Take::saveDataFromProject --> End";
    244248    return true;
    245249}
     
    274278void Take::setActiveExposure(Exposure *newExposure)
    275279{
    276     qDebug("Take::setActiveExposure --> Start");
     280    qDebug() << "Take::setActiveExposure --> Start";
    277281
    278282    // Check the active take index and active scene index
     
    295299    }
    296300
    297     qDebug("Take::setActiveExposure --> End");
     301    qDebug() << "Take::setActiveExposure --> End";
    298302}
    299303
     
    301305void Take::setActiveExposureIndex(int exposureIndex)
    302306{
    303     qDebug("Take::setActiveExposureIndex --> Start");
     307    qDebug() << "Take::setActiveExposureIndex --> Start";
    304308
    305309    // The new exposure index can be the same as the active exposure index
     
    309313    this->activeExposureIndex = exposureIndex;
    310314
    311     qDebug("Take::setActiveExposureIndex --> End");
     315    qDebug() << "Take::setActiveExposureIndex --> End";
    312316}
    313317
     
    336340void Take::addExposure(const QString &fileName, int location)
    337341{
    338     qDebug("Take::addExposure(new) --> Start");
     342    qDebug() << "Take::addExposure(new) --> Start";
    339343
    340344    Exposure *newExposure = new Exposure(this, fileName, location);
     
    345349    exposures.append(newExposure);
    346350
    347     qDebug("Take::addExposure(new) --> End");
     351    qDebug() << "Take::addExposure(new) --> End";
    348352}
    349353
     
    351355void Take::addExposure(Exposure *exposure)
    352356{
    353     qDebug("Take::addExposure(exist) --> Start");
     357    qDebug() << "Take::addExposure(exist) --> Start";
    354358
    355359    exposures.append(exposure);
    356360
    357     qDebug("Take::addExposure(exist) --> End");
     361    qDebug() << "Take::addExposure(exist) --> End";
    358362}
    359363
     
    361365void Take::insertExposure(int exposureIndex, const QString &fileName, int location)
    362366{
    363     qDebug("Take::insertExposure(new) --> Start");
     367    qDebug() << "Take::insertExposure(new) --> Start";
    364368
    365369    Q_ASSERT(exposureIndex > -1);
     
    376380    }
    377381
    378     qDebug("Take::insertExposure(new) --> End");
     382    qDebug() << "Take::insertExposure(new) --> End";
    379383}
    380384
     
    382386void Take::insertExposure(int exposureIndex, Exposure *exposure)
    383387{
    384     qDebug("Take::insertExposure(exist) --> Start");
     388    qDebug() << "Take::insertExposure(exist) --> Start";
    385389
    386390    Q_ASSERT(exposureIndex > -1);
     
    392396    }
    393397
    394     qDebug("Take::insertExposure(exist) --> End");
     398    qDebug() << "Take::insertExposure(exist) --> End";
    395399}
    396400
     
    399403                               int &modExposureIndex)
    400404{
    401     qDebug("Take::getModifyedExposure --> Start");
     405    qDebug() << "Take::getModifyedExposure --> Start";
    402406
    403407    int exposureSize = exposures.size();
     
    407411        if (0 == filePath.compare(imagePath)) {
    408412            // Exposure found
    409             qDebug("Take::getModifyedExposure --> End");
     413            qDebug() << "Take::getModifyedExposure --> End";
    410414            return true;
    411415        }
     
    414418    modExposureIndex = -1;
    415419
    416     qDebug("Take::getModifyedExposure --> End (Error)");
     420    qDebug() << "Take::getModifyedExposure --> End (Error)";
    417421    return false;
    418422}
     
    525529unsigned int Take::getSoundStartPosition() const
    526530{
    527     qDebug("Take::getSountPosition --> Start");
    528 
    529531    return soundStartPosition;
    530532}
     
    539541bool Take::readSoundFromProject(QDomElement &soundNode)
    540542{
    541     qDebug("Take::readSoundFromProject --> Start");
     543    qDebug() << "Take::readSoundFromProject --> Start";
    542544
    543545    QDomElement currElement = soundNode.firstChildElement();
     
    555557    }
    556558
    557     qDebug("Take::readSoundFromProject --> End");
     559    qDebug() << "Take::readSoundFromProject --> End";
    558560    return true;
    559561}
     
    563565                              QDomElement &/*takeNode*/)
    564566{
    565     qDebug("Take::saveSoundFromProject --> Start");
     567    qDebug() << "Take::saveSoundFromProject --> Start";
    566568    // Save the node offset value
    567569   
    568     qDebug("Take::saveSoundFromProject --> End");
     570    qDebug() << "Take::saveSoundFromProject --> End";
    569571    return true;
    570572}
     
    576578void Take::activateExposure()
    577579{
    578     qDebug("Take::activateExposure --> Start");
     580    qDebug() << "Take::activateExposure --> Start";
    579581
    580582    parent->getParent()->notifyActivateExposure();
    581583
    582     qDebug("Take::activateExposure --> End");
     584    qDebug() << "Take::activateExposure --> End";
    583585}
    584586*/
  • qstopmotion/trunk/fuentes/src/domain/animation/take.h

    r446 r4773  
    2424#define TAKE_H
    2525
     26#include <QDomDocument>
     27#include <QDomElement>
     28#include <QString>
     29#include <QVector>
     30
    2631#include "domain/animation/animationproject.h"
    2732#include "domain/animation/scene.h"
     
    2934#include "domain/animation/exposure.h"
    3035#include "frontends/frontend.h"
    31 
    32 #include <QtCore/QObject>
    33 #include <QtCore/QString>
    34 #include <QtCore/QVector>
    35 #include <QtXml/QDomDocument>
    36 #include <QtXml/QDomElement>
    3736
    3837class Scene;
  • qstopmotion/trunk/fuentes/src/domain/domainfacade.cpp

    r446 r4773  
    11/******************************************************************************
    2  *  Copyright (C) 2005-2015 by                                                *
     2 *  Copyright (C) 2005-2016 by                                                *
    33 *    Bjoern Erik Nilsen (bjoern.nilsen@bjoernen.com),                        *
    44 *    Fredrik Berg Kjoelstad (fredrikbk@hotmail.com),                         *
     
    2222
    2323#include "domainfacade.h"
     24
     25#include <QDebug>
     26#include <QDir>
     27#include <QFile>
    2428
    2529#include "domain/animation/animationproject.h"
     
    4549#include "technical/videoencoder/videoencoder.h"
    4650
    47 #include <QtCore/QDir>
    48 #include <QtCore/QFile>
    49 #include <QtCore/QtDebug>
    50 
    5151
    5252DomainFacade::DomainFacade(Frontend *f)
     
    186186{
    187187    if (NULL == animationProject) {
    188         return FALSE;
     188        return false;
    189189    }
    190190    return animationProject->isSettingsChanges();
     
    195195{
    196196    if (NULL == animationProject) {
    197         return FALSE;
     197        return false;
    198198    }
    199199    return animationProject->isAnimationChanges();
     
    204204{
    205205    if (NULL == animationProject) {
    206         return FALSE;
    207     }
    208     return TRUE;
     206        return false;
     207    }
     208    return true;
    209209}
    210210
     
    325325}
    326326
     327
     328int DomainFacade::getOverlayIntensity()
     329{
     330    return animationProject->getOverlayIntensity();
     331}
     332
     333
     334void DomainFacade::setOverlayIntensity(int overlay)
     335{
     336    if (NULL != animationProject) {
     337        animationProject->setOverlayIntensity(overlay);
     338    }
     339}
     340
    327341/**************************************************************************
    328342 * Image import preferences
     
    511525bool DomainFacade::recoverProject()
    512526{
    513     qDebug("DomainFacade::recoverProject --> Start");
     527    qDebug() << "DomainFacade::recoverProject --> Start";
    514528
    515529    bool recovered = false;
     
    714728    frontend->setToolBarState(ToolBar::toolBarCameraOff);
    715729
    716     qDebug("DomainFacade::recoverProject --> End");
     730    qDebug() << "DomainFacade::recoverProject --> End";
    717731    return recovered;
    718732}
     
    866880void DomainFacade::saveProject(const QString &projectPath, bool saveAs)
    867881{
    868     qDebug("DomainFacade::saveProject --> Start");
     882    qDebug() << "DomainFacade::saveProject --> Start";
    869883
    870884    Q_ASSERT(NULL != animationProject);
     
    881895    }
    882896
    883     qDebug("DomainFacade::saveProject --> End");
     897    qDebug() << "DomainFacade::saveProject --> End";
    884898}
    885899
     
    887901void DomainFacade::closeProject()
    888902{
    889     qDebug("DomainFacade::closeProject --> Start");
     903    qDebug() << "DomainFacade::closeProject --> Start";
    890904
    891905    Q_ASSERT(NULL != animationProject);
     
    901915    getView()->notifyRemoveProject();
    902916
    903     qDebug("DomainFacade::closeProject --> End");
     917    qDebug() << "DomainFacade::closeProject --> End";
    904918}
    905919
     
    10071021                                  const QString soundName)
    10081022{
    1009     qDebug("DomainFacade::addSoundToScene --> Start");
    1010 
    10111023    return animationProject->addSoundToScene(sceneIndex, filename, soundName);
    10121024}
     
    12331245    bool ret;
    12341246
    1235     qDebug("DomainFacade::copyToTemp --> Start");
     1247    qDebug() << "DomainFacade::copyToTemp --> Start";
    12361248
    12371249    // creates a new image name
     
    12781290    Exposure::tempNumber++;
    12791291
    1280     qDebug("DomainFacade::copyToTemp --> End");
     1292    qDebug() << "DomainFacade::copyToTemp --> End";
    12811293
    12821294    return toImageName;
  • qstopmotion/trunk/fuentes/src/domain/domainfacade.h

    r446 r4773  
    11/******************************************************************************
    2  *  Copyright (C) 2005-2015 by                                                *
     2 *  Copyright (C) 2005-2016 by                                                *
    33 *    Bjoern Erik Nilsen (bjoern.nilsen@bjoernen.com),                        *
    44 *    Fredrik Berg Kjoelstad (fredrikbk@hotmail.com),                         *
     
    2424#define DOMAINFACADE_H
    2525
     26#include <QFile>
     27#include <QObject>
     28#include <QString>
     29#include <QVector>
     30#include <QTreeWidget>
     31#include <QUndoStack>
     32
    2633#include "domain/animation/animationproject.h"
    2734#include "frontends/frontend.h"
    2835// #include "frontends/viewfacade.h"
    2936#include "technical/videoencoder/videoencoder.h"
    30 
    31 #include <QtCore/QFile>
    32 #include <QtCore/QObject>
    33 #include <QtCore/QString>
    34 #include <QtCore/QVector>
    35 #include <QtGui/QTreeWidget>
    36 #include <QtGui/QUndoStack>
    3737
    3838class AnimationProject;
     
    157157    /**
    158158     * Retrieves the new project file path.
    159      * @return the project file path if it's setted, NULL otherwise.
     159     * @return the project file path if it's set, NULL otherwise.
    160160     */
    161161    const QString getNewProjectFilePath();
     
    163163    /**
    164164     * Retrieves the new project path.
    165      * @return the project path if it's setted, NULL otherwise.
     165     * @return the project path if it's set, NULL otherwise.
    166166     */
    167167    const QString getNewProjectPath();
     
    169169    /**
    170170     * Retrieves the project description.
    171      * @return the project description if it's setted, NULL otherwise.
     171     * @return the project description if it's set, NULL otherwise.
    172172     */
    173173    const QString getProjectDescription();
     
    268268     */
    269269    void setUnitMode(int newUnitMode);
     270
     271    /**
     272     * Get the overlay intensity value.
     273     * @return The overlay intensity value.
     274     */
     275    int getOverlayIntensity();
     276
     277    /**
     278     * Set the overlay intensity value of the project.
     279     * @param overlay The new overlay intensity value.
     280     */
     281    void setOverlayIntensity(int overlay);
    270282
    271283    /**************************************************************************
  • qstopmotion/trunk/fuentes/src/domain/undo/undobase.cpp

    r446 r4773  
    11/******************************************************************************
    2  *  Copyright (C) 2005-2012 by                                                *
     2 *  Copyright (C) 2005-2015 by                                                *
    33 *    Bjoern Erik Nilsen (bjoern.nilsen@bjoernen.com),                        *
    44 *    Fredrik Berg Kjoelstad (fredrikbk@hotmail.com),                         *
     
    2323#include "undobase.h"
    2424
     25
    2526UndoBase::UndoBase(DomainFacade *df)
    2627{
  • qstopmotion/trunk/fuentes/src/domain/undo/undobase.h

    r446 r4773  
    11/******************************************************************************
    2  *  Copyright (C) 2005-2012 by                                                *
     2 *  Copyright (C) 2005-2015 by                                                *
    33 *    Bjoern Erik Nilsen (bjoern.nilsen@bjoernen.com),                        *
    44 *    Fredrik Berg Kjoelstad (fredrikbk@hotmail.com),                         *
     
    2424#define UNDOBASE_H
    2525
     26#include <QUndoCommand>
     27
    2628#include <domain/domainfacade.h>
    2729
    28 #include <QtGui/QUndoCommand>
    2930
    3031/**
  • qstopmotion/trunk/fuentes/src/domain/undo/undoexposureadd.cpp

    r446 r4773  
    2323#include "undoexposureadd.h"
    2424
     25#include <QDebug>
     26#include <QLatin1String>
     27#include <QVector>
     28
    2529#include "domain/animation/exposure.h"
    26 
    27 #include <QtCore/QVector>
    2830
    2931
     
    5052    if (NULL != exposure) {
    5153        delete exposure;
     54
    5255        exposure = NULL;
    5356    }
     
    5760void UndoExposureAdd::undo()
    5861{
    59     qDebug("UndoExposureAdd::undo --> Start");
     62    qDebug() << "UndoExposureAdd::undo --> Start";
    6063
    6164    Q_ASSERT(NULL == exposure);
     
    7174    facade->writeHistoryEntry(QLatin1String("undo"));
    7275
    73     qDebug("UndoExposureAdd::undo --> End");
     76    qDebug() << "UndoExposureAdd::undo --> End";
    7477}
    7578
     
    7780void UndoExposureAdd::redo()
    7881{
    79     qDebug("UndoExposureAdd::redo --> Start");
     82    qDebug() << "UndoExposureAdd::redo --> Start";
     83#include <QVector>
    8084
    8185    AnimationProject *animationProject = facade->getAnimationProject();
     
    102106    animationProject->incAnimationChanges();
    103107
    104     qDebug("UndoExposureAdd::redo --> End");
     108    qDebug() << "UndoExposureAdd::redo --> End";
    105109}
  • qstopmotion/trunk/fuentes/src/domain/undo/undoexposureinsert.cpp

    r446 r4773  
    2323#include "undoexposureinsert.h"
    2424
     25#include <QDebug>
     26#include <QVector>
     27#include <QLatin1String>
     28
    2529#include "domain/animation/exposure.h"
    26 
    27 #include <QtCore/QVector>
    2830
    2931
     
    5759void UndoExposureInsert::undo()
    5860{
    59     qDebug("UndoExposureInsert::undo --> Start");
     61    qDebug() << "UndoExposureInsert::undo --> Start";
    6062
    6163    Q_ASSERT(NULL == exposure);
     
    7173    facade->writeHistoryEntry(QLatin1String("undo"));
    7274
    73     qDebug("UndoExposureInsert::undo --> End");
     75    qDebug() << "UndoExposureInsert::undo --> End";
    7476}
    7577
     
    7779void UndoExposureInsert::redo()
    7880{
    79     qDebug("UndoExposureInsert::redo --> Start");
     81    qDebug() << "UndoExposureInsert::redo --> Start";
    8082
    8183    AnimationProject *animationProject = facade->getAnimationProject();
     
    104106    animationProject->incAnimationChanges();
    105107
    106     qDebug("UndoExposureInsert::redo --> End");
     108    qDebug() << "UndoExposureInsert::redo --> End";
    107109}
  • qstopmotion/trunk/fuentes/src/domain/undo/undoexposuremove.cpp

    r446 r4773  
    2323#include "undoexposuremove.h"
    2424
     25#include <QDebug>
     26#include <QLatin1String>
     27
    2528
    2629UndoExposureMove::UndoExposureMove(DomainFacade *df,
     
    3942    toTakeIndex = tti;
    4043    toExposureIndex = tei;
    41     undoFlag = FALSE;
     44    undoFlag = false;
    4245    setText(QString(tr("Move exposure (%1,%2,%3)")).arg(toSceneIndex).arg(toTakeIndex).arg(toExposureIndex));
    4346}
     
    5356    /* TODO: Implementation of the redoExposureMove function
    5457
    55     qDebug("UndoExposureMove::undo --> Start");
     58    qDebug() << "UndoExposureMove::undo --> Start";
    5659
    5760
    5861    facade->writeHistoryEntry(QLatin1String("undo"));
    59     undoFlag = TRUE;
     62    undoFlag = true;
    6063
    61     qDebug("UndoExposureMove::undo --> End");
     64    qDebug() << "UndoExposureMove::undo --> End";
    6265    */
    6366}
     
    6871    /* TODO: Implementation of the redoExposureMove function
    6972
    70     qDebug("UndoExposureMove::redo --> Start");
     73    qDebug() << "UndoExposureMove::redo --> Start";
    7174
    7275    Exposure* exposure = animationProject->removeExposure(sceneIndex, takeIndex, exposureIndex);
     
    8487    if (undoFlag) {
    8588        facade->writeHistoryEntry(QLatin1String("redo"));
    86         undoFlag = FALSE;
     89        undoFlag = false;
    8790    }
    8891    else {
     
    9699    }
    97100
    98     qDebug("UndoExposureMove::redo --> End");
     101    qDebug() << "UndoExposureMove::redo --> End";
    99102    */
    100103}
  • qstopmotion/trunk/fuentes/src/domain/undo/undoexposuremove.h

    r446 r4773  
    2525
    2626#include <domain/undo/undobase.h>
     27
    2728
    2829/**
  • qstopmotion/trunk/fuentes/src/domain/undo/undoexposureremove.cpp

    r446 r4773  
    2323#include "undoexposureremove.h"
    2424
     25#include <QDebug>
     26#include <QLatin1String>
     27
    2528#include "domain/animation/exposure.h"
    2629
     
    3639    exposureIndex = ei;
    3740    exposure = NULL;
    38     undoFlag = FALSE;
     41    undoFlag = false;
    3942    setText(QString(tr("Remove exposure (%1,%2,%3)"))
    4043            .arg(sceneIndex).arg(takeIndex).arg(exposureIndex));
     
    5356void UndoExposureRemove::undo()
    5457{
    55     qDebug("UndoExposureRemove::undo --> Start");
     58    qDebug() << "UndoExposureRemove::undo --> Start";
    5659
    5760    AnimationProject *animationProject = facade->getAnimationProject();
     
    7073    }
    7174    exposure = NULL;
    72     undoFlag = TRUE;
     75    undoFlag = true;
    7376
    7477    animationProject->decAnimationChanges();
     
    7679    facade->writeHistoryEntry(QLatin1String("undo"));
    7780
    78     qDebug("UndoExposureRemove::undo --> End");
     81    qDebug() << "UndoExposureRemove::undo --> End";
    7982}
    8083
     
    8285void UndoExposureRemove::redo()
    8386{
    84     qDebug("UndoExposureRemove::redo --> Start");
     87    qDebug() << "UndoExposureRemove::redo --> Start";
    8588
    8689    AnimationProject *animationProject = facade->getAnimationProject();
     
    9497    if (undoFlag) {
    9598        // Call of the redo function after a undo call
    96         undoFlag = FALSE;
     99        undoFlag = false;
    97100
    98101        facade->writeHistoryEntry(QLatin1String("redo"));
     
    106109    }
    107110
    108     qDebug("UndoExposureRemove::redo --> End");
     111    qDebug() << "UndoExposureRemove::redo --> End";
    109112}
  • qstopmotion/trunk/fuentes/src/domain/undo/undoexposureremove.h

    r446 r4773  
    2525
    2626#include <domain/undo/undobase.h>
     27
    2728
    2829/**
  • qstopmotion/trunk/fuentes/src/domain/undo/undoexposureselect.cpp

    r446 r4773  
    2121#include "undoexposureselect.h"
    2222
     23#include <QDebug>
     24#include <QLatin1String>
     25
    2326
    2427UndoExposureSelect::UndoExposureSelect(DomainFacade *df,
     
    3437    newTakeIndex = nti;
    3538    newExposureIndex = nei;
    36     undoFlag = FALSE;
     39    undoFlag = false;
    3740    setText(QString(tr("Select exposure (%1,%2,%3)-->(%4,%5,%6)"))
    3841            .arg(oldSceneIndex).arg(oldTakeIndex).arg(oldExposureIndex)
     
    4851void UndoExposureSelect::undo()
    4952{
    50     qDebug("UndoExposureSelect::undo --> Start");
     53    qDebug() << "UndoExposureSelect::undo --> Start";
    5154
    5255    AnimationProject *animationProject = facade->getAnimationProject();
     
    6669
    6770    facade->writeHistoryEntry(QLatin1String("undo"));
    68     undoFlag = TRUE;
     71    undoFlag = true;
    6972
    70     qDebug("UndoExposureSelect::undo --> End");
     73    qDebug() << "UndoExposureSelect::undo --> End";
    7174}
    7275
     
    7477void UndoExposureSelect::redo()
    7578{
    76     qDebug("UndoExposureSelect::redo --> Start");
     79    qDebug() << "UndoExposureSelect::redo --> Start";
    7780
    7881    AnimationProject *animationProject = facade->getAnimationProject();
     
    9396    if (undoFlag) {
    9497        facade->writeHistoryEntry(QLatin1String("redo"));
    95         undoFlag = FALSE;
     98        undoFlag = false;
    9699    }
    97100    else {
     
    106109    }
    107110
    108     qDebug("UndoExposureSelect::redo --> End");
     111    qDebug() << "UndoExposureSelect::redo --> End";
    109112}
  • qstopmotion/trunk/fuentes/src/domain/undo/undoexposureselect.h

    r446 r4773  
    2323
    2424#include <domain/undo/undobase.h>
     25
    2526
    2627/**
  • qstopmotion/trunk/fuentes/src/domain/undo/undoprojectnew.cpp

    r446 r4773  
    2222
    2323#include "undoprojectnew.h"
     24
     25#include <QDebug>
     26#include <QLatin1String>
     27
    2428#include "frontends/qtfrontend/toolbar.h"
    2529
     
    4650void UndoProjectNew::undo()
    4751{
    48     qDebug("UndoProjectNew::undo --> Start");
     52    qDebug() << "UndoProjectNew::undo --> Start";
    4953
    5054    Q_ASSERT(NULL == project);
     
    6367    facade->writeHistoryEntry(QLatin1String("undo"));
    6468
    65     qDebug("UndoProjectNew::undo --> End");
     69    qDebug() << "UndoProjectNew::undo --> End";
    6670}
    6771
     
    6973void UndoProjectNew::redo()
    7074{
    71     qDebug("UndoProjectNew::redo --> Start");
     75    qDebug() << "UndoProjectNew::redo --> Start";
    7276
    7377    Frontend *frontend = facade->getFrontend();
     
    97101    frontend->setToolBarState(ToolBar::toolBarCameraOff);
    98102
    99     qDebug("UndoProjectNew::redo --> End");
     103    qDebug() << "UndoProjectNew::redo --> End";
    100104}
  • qstopmotion/trunk/fuentes/src/domain/undo/undoprojectnew.h

    r446 r4773  
    2525
    2626#include <domain/undo/undobase.h>
     27
    2728
    2829/**
  • qstopmotion/trunk/fuentes/src/domain/undo/undoprojectopen.cpp

    r446 r4773  
    2323#include "undoprojectopen.h"
    2424
     25#include <QDebug>
     26#include <QLatin1String>
     27
    2528
    2629UndoProjectOpen::UndoProjectOpen(DomainFacade *df,
     
    4548void UndoProjectOpen::undo()
    4649{
    47     qDebug("UndoProjectOpen::undo --> Start");
     50    qDebug() << "UndoProjectOpen::undo --> Start";
    4851
    4952    Q_ASSERT(NULL == project);
     
    5861    facade->writeHistoryEntry(QLatin1String("undo"));
    5962
    60     qDebug("UndoProjectOpen::undo --> End");
     63    qDebug() << "UndoProjectOpen::undo --> End";
    6164}
    6265
     
    6467void UndoProjectOpen::redo()
    6568{
    66     qDebug("UndoProjectOpen::redo --> Start");
     69    qDebug() << "UndoProjectOpen::redo --> Start";
    6770
    68     bool projectOpen = TRUE;
     71    bool projectOpen = true;
    6972
    7073    // facade->getView()->notifyNewProject();
     
    109112    }
    110113
    111     qDebug("UndoProjectOpen::redo --> End");
     114    qDebug() << "UndoProjectOpen::redo --> End";
    112115}
  • qstopmotion/trunk/fuentes/src/domain/undo/undoprojectopen.h

    r446 r4773  
    2525
    2626#include <domain/undo/undobase.h>
     27
    2728
    2829/**
  • qstopmotion/trunk/fuentes/src/domain/undo/undosceneadd.cpp

    r446 r4773  
    2222
    2323#include "undosceneadd.h"
     24
     25#include <QDebug>
     26#include <QLatin1String>
    2427
    2528
     
    4750void UndoSceneAdd::undo()
    4851{
    49     qDebug("UndoSceneAdd::undo --> Start");
     52    qDebug() << "UndoSceneAdd::undo --> Start";
    5053
    5154    AnimationProject *animationProject = facade->getAnimationProject();
     
    5962    facade->writeHistoryEntry(QLatin1String("undo"));
    6063
    61     qDebug("UndoSceneAdd::undo --> End");
     64    qDebug() << "UndoSceneAdd::undo --> End";
    6265}
    6366
     
    6568void UndoSceneAdd::redo()
    6669{
    67     qDebug("UndoSceneAdd::redo --> Start");
     70    qDebug() << "UndoSceneAdd::redo --> Start";
    6871
    6972    AnimationProject *animationProject = facade->getAnimationProject();
     
    9093    animationProject->incAnimationChanges();
    9194
    92     qDebug("UndoSceneAdd::redo --> End");
     95    qDebug() << "UndoSceneAdd::redo --> End";
    9396}
  • qstopmotion/trunk/fuentes/src/domain/undo/undosceneadd.h

    r446 r4773  
    2525
    2626#include <domain/undo/undobase.h>
     27
    2728
    2829/**
  • qstopmotion/trunk/fuentes/src/domain/undo/undosceneinsert.cpp

    r446 r4773  
    2222
    2323#include "undosceneinsert.h"
     24
     25#include <QDebug>
     26#include <QLatin1String>
    2427
    2528
     
    4750void UndoSceneInsert::undo()
    4851{
    49     qDebug("UndoSceneInsert::undo --> Start");
     52    qDebug() << "UndoSceneInsert::undo --> Start";
    5053
    5154    AnimationProject *animationProject = facade->getAnimationProject();
     
    5962    facade->writeHistoryEntry(QLatin1String("undo"));
    6063
    61     qDebug("UndoSceneInsert::undo --> End");
     64    qDebug() << "UndoSceneInsert::undo --> End";
    6265}
    6366
     
    6568void UndoSceneInsert::redo()
    6669{
    67     qDebug("UndoSceneInsert::redo --> Start");
     70    qDebug() << "UndoSceneInsert::redo --> Start";
    6871
    6972    AnimationProject *animationProject = facade->getAnimationProject();
     
    9093    animationProject->incAnimationChanges();
    9194
    92     qDebug("UndoSceneInsert::redo --> End");
     95    qDebug() << "UndoSceneInsert::redo --> End";
    9396}
  • qstopmotion/trunk/fuentes/src/domain/undo/undosceneinsert.h

    r446 r4773  
    2525
    2626#include <domain/undo/undobase.h>
     27
    2728
    2829/**
  • qstopmotion/trunk/fuentes/src/domain/undo/undoscenemove.cpp

    r446 r4773  
    2323#include "undoscenemove.h"
    2424
     25#include <QDebug>
     26#include <QLatin1String>
     27
    2528
    2629UndoSceneMove::UndoSceneMove(DomainFacade *df,
     
    3134    fromSceneIndex = fsi;
    3235    toSceneIndex = tsi;
    33     undoFlag = FALSE;
     36    undoFlag = false;
    3437    setText(QString(tr("Move scene (%1,%2)")).arg(fromSceneIndex).arg(toSceneIndex));
    3538}
     
    4346void UndoSceneMove::undo()
    4447{
    45     qDebug("UndoSceneMove::undo --> Start");
     48    qDebug() << "UndoSceneMove::undo --> Start";
    4649
    4750    AnimationProject *animationProject = facade->getAnimationProject();
     
    5053
    5154    facade->writeHistoryEntry(QLatin1String("undo"));
    52     undoFlag = TRUE;
     55    undoFlag = true;
    5356
    54     qDebug("UndoSceneMove::undo --> Start");
     57    qDebug() << "UndoSceneMove::undo --> Start";
    5558}
    5659
     
    5861void UndoSceneMove::redo()
    5962{
    60     qDebug("UndoSceneMove::redo --> Start");
     63    qDebug() << "UndoSceneMove::redo --> Start";
    6164
    6265    AnimationProject *animationProject = facade->getAnimationProject();
     
    6770    if (undoFlag) {
    6871        facade->writeHistoryEntry(QLatin1String("redo"));
    69         undoFlag = FALSE;
     72        undoFlag = false;
    7073    }
    7174    else {
     
    7679    }
    7780
    78     qDebug("UndoSceneMove::redo --> Start");
     81    qDebug() << "UndoSceneMove::redo --> Start";
    7982}
  • qstopmotion/trunk/fuentes/src/domain/undo/undoscenemove.h

    r446 r4773  
    2525
    2626#include <domain/undo/undobase.h>
     27
    2728
    2829/**
  • qstopmotion/trunk/fuentes/src/domain/undo/undosceneremove.cpp

    r446 r4773  
    2323#include "undosceneremove.h"
    2424
     25#include <QDebug>
     26#include <QLatin1String>
     27
    2528
    2629UndoSceneRemove::UndoSceneRemove(DomainFacade *df,
     
    3033    sceneIndex = si;
    3134    removedScene = NULL;
    32     undoFlag = FALSE;
     35    undoFlag = false;
    3336    setText(QString(tr("Remove scene (%1)")).arg(sceneIndex));
    3437}
     
    4649void UndoSceneRemove::undo()
    4750{
    48     qDebug("UndoSceneRemove::undo --> Start");
     51    qDebug() << "UndoSceneRemove::undo --> Start";
    4952
    5053    AnimationProject *animationProject = facade->getAnimationProject();
     
    6568
    6669    facade->writeHistoryEntry(QLatin1String("undo"));
    67     undoFlag = TRUE;
     70    undoFlag = true;
    6871
    69     qDebug("UndoSceneRemove::undo --> End");
     72    qDebug() << "UndoSceneRemove::undo --> End";
    7073}
    7174
     
    7376void UndoSceneRemove::redo()
    7477{
    75     qDebug("UndoSceneRemove::redo --> Start");
     78    qDebug() << "UndoSceneRemove::redo --> Start";
    7679
    7780    AnimationProject *animationProject = facade->getAnimationProject();
     
    8588    if (undoFlag) {
    8689        facade->writeHistoryEntry(QLatin1String("redo"));
    87         undoFlag = FALSE;
     90        undoFlag = false;
    8891    }
    8992    else {
     
    9396    }
    9497
    95     qDebug("UndoSceneRemove::redo --> End");
     98    qDebug() << "UndoSceneRemove::redo --> End";
    9699}
  • qstopmotion/trunk/fuentes/src/domain/undo/undosceneremove.h

    r446 r4773  
    2525
    2626#include <domain/undo/undobase.h>
     27
    2728
    2829/**
  • qstopmotion/trunk/fuentes/src/domain/undo/undosceneselect.cpp

    r446 r4773  
    2121#include "undosceneselect.h"
    2222
     23#include <QDebug>
     24#include <QLatin1String>
     25
    2326
    2427UndoSceneSelect::UndoSceneSelect(DomainFacade *df,
     
    2831    oldSceneIndex = facade->getActiveSceneIndex();
    2932    newSceneIndex = nsi;
    30     undoFlag = FALSE;
     33    undoFlag = false;
    3134    setText(QString(tr("Select scene (%1)-->(%2)"))
    3235            .arg(oldSceneIndex).arg(newSceneIndex));
     
    4144void UndoSceneSelect::undo()
    4245{
    43     qDebug("UndoSceneSelect::undo --> Start");
     46    qDebug() << "UndoSceneSelect::undo --> Start";
    4447
    4548    AnimationProject *animationProject = facade->getAnimationProject();
     
    7679
    7780    facade->writeHistoryEntry(QLatin1String("undo"));
    78     undoFlag = TRUE;
     81    undoFlag = true;
    7982
    80     qDebug("UndoSceneSelect::undo --> Start");
     83    qDebug() << "UndoSceneSelect::undo --> Start";
    8184}
    8285
     
    8487void UndoSceneSelect::redo()
    8588{
    86     qDebug("UndoSceneSelect::redo --> Start");
     89    qDebug() << "UndoSceneSelect::redo --> Start";
    8790
    8891    AnimationProject *animationProject = facade->getAnimationProject();
     
    120123    if (undoFlag) {
    121124        facade->writeHistoryEntry(QLatin1String("redo"));
    122         undoFlag = FALSE;
     125        undoFlag = false;
    123126    }
    124127    else {
     
    129132    }
    130133
    131     qDebug("UndoSceneSelect::redo --> End");
     134    qDebug() << "UndoSceneSelect::redo --> End";
    132135}
  • qstopmotion/trunk/fuentes/src/domain/undo/undosceneselect.h

    r446 r4773  
    2323
    2424#include <domain/undo/undobase.h>
     25
    2526
    2627/**
  • qstopmotion/trunk/fuentes/src/domain/undo/undotakeadd.cpp

    r446 r4773  
    2222
    2323#include "undotakeadd.h"
     24
     25#include <QDebug>
     26#include <QLatin1String>
    2427
    2528
     
    5154void UndoTakeAdd::undo()
    5255{
    53     qDebug("UndoTakeAdd::undo --> Start");
     56    qDebug() << "UndoTakeAdd::undo --> Start";
    5457
    5558    AnimationProject *animationProject = facade->getAnimationProject();
     
    6366    facade->writeHistoryEntry(QLatin1String("undo"));
    6467
    65     qDebug("UndoTakeAdd::undo --> End");
     68    qDebug() << "UndoTakeAdd::undo --> End";
    6669}
    6770
     
    6972void UndoTakeAdd::redo()
    7073{
    71     qDebug("UndoTakeAdd::redo --> Start");
     74    qDebug() << "UndoTakeAdd::redo --> Start";
    7275
    7376    AnimationProject *animationProject = facade->getAnimationProject();
     
    9598    animationProject->incAnimationChanges();
    9699
    97     qDebug("UndoTakeAdd::redo --> End");
     100    qDebug() << "UndoTakeAdd::redo --> End";
    98101}
  • qstopmotion/trunk/fuentes/src/domain/undo/undotakeadd.h

    r446 r4773  
    2525
    2626#include <domain/undo/undobase.h>
     27
    2728
    2829/**
  • qstopmotion/trunk/fuentes/src/domain/undo/undotakeinsert.cpp

    r446 r4773  
    2222
    2323#include "undotakeinsert.h"
     24
     25#include <QDebug>
     26#include <QLatin1String>
    2427
    2528
     
    5255void UndoTakeInsert::undo()
    5356{
    54     qDebug("UndoTakeInsert::undo --> Start");
     57    qDebug() << "UndoTakeInsert::undo --> Start";
    5558
    5659    AnimationProject *animationProject = facade->getAnimationProject();
     
    6467    facade->writeHistoryEntry(QLatin1String("undo"));
    6568
    66     qDebug("UndoTakeInsert::undo --> End");
     69    qDebug() << "UndoTakeInsert::undo --> End";
    6770}
    6871
     
    7073void UndoTakeInsert::redo()
    7174{
    72     qDebug("UndoTakeInsert::redo --> Start");
     75    qDebug() << "UndoTakeInsert::redo --> Start";
    7376
    7477    AnimationProject *animationProject = facade->getAnimationProject();
     
    9699    animationProject->incAnimationChanges();
    97100
    98     qDebug("UndoTakeInsert::redo --> End");
     101    qDebug() << "UndoTakeInsert::redo --> End";
    99102}
  • qstopmotion/trunk/fuentes/src/domain/undo/undotakeinsert.h

    r446 r4773  
    2525
    2626#include <domain/undo/undobase.h>
     27
    2728
    2829/**
  • qstopmotion/trunk/fuentes/src/domain/undo/undotakemove.cpp

    r446 r4773  
    2121#include "undotakemove.h"
    2222
     23#include <QDebug>
     24#include <QLatin1String>
     25
    2326
    2427UndoTakeMove::UndoTakeMove(DomainFacade *df,
     
    3336    toSceneIndex = tsi;
    3437    toTakeIndex = tti;
    35     undoFlag = FALSE;
     38    undoFlag = false;
    3639    setText(QString(tr("Move take (%1,%2)"))
    3740            .arg(toSceneIndex).arg(toTakeIndex));
     
    4649void UndoTakeMove::undo()
    4750{
    48     qDebug("UndoTakeMove::undo --> Start");
     51    qDebug() << "UndoTakeMove::undo --> Start";
    4952
    5053
    5154    facade->writeHistoryEntry(QLatin1String("undo"));
    52     undoFlag = TRUE;
     55    undoFlag = true;
    5356
    54     qDebug("UndoTakeMove::undo --> Start");
     57    qDebug() << "UndoTakeMove::undo --> Start";
    5558}
    5659
     
    5861void UndoTakeMove::redo()
    5962{
    60     qDebug("UndoTakeMove::redo --> Start");
     63    qDebug() << "UndoTakeMove::redo --> Start";
    6164
    6265    AnimationProject *animationProject = facade->getAnimationProject();
     
    6770    if (undoFlag) {
    6871        facade->writeHistoryEntry(QLatin1String("redo"));
    69         undoFlag = FALSE;
     72        undoFlag = false;
    7073    }
    7174    else {
     
    7881    }
    7982
    80     qDebug("UndoTakeMove::redo --> Start");
     83    qDebug() << "UndoTakeMove::redo --> Start";
    8184}
  • qstopmotion/trunk/fuentes/src/domain/undo/undotakemove.h

    r446 r4773  
    2323
    2424#include <domain/undo/undobase.h>
     25
    2526
    2627/**
  • qstopmotion/trunk/fuentes/src/domain/undo/undotakeremove.cpp

    r446 r4773  
    2323#include "undotakeremove.h"
    2424
     25#include <QDebug>
     26#include <QLatin1String>
     27
    2528
    2629UndoTakeRemove::UndoTakeRemove(DomainFacade *df,
     
    3235    takeIndex = ti;
    3336    removedTake = NULL;
    34     undoFlag = FALSE;
     37    undoFlag = false;
    3538    setText(QString(tr("Remove take (%1,%2)"))
    3639            .arg(sceneIndex).arg(takeIndex));
     
    4952void UndoTakeRemove::undo()
    5053{
    51     qDebug("UndoTakeRemove::undo --> Start");
     54    qDebug() << "UndoTakeRemove::undo --> Start";
    5255
    5356
     
    6972
    7073    facade->writeHistoryEntry(QLatin1String("undo"));
    71     undoFlag = TRUE;
     74    undoFlag = true;
    7275
    73     qDebug("UndoTakeRemove::undo --> End");
     76    qDebug() << "UndoTakeRemove::undo --> End";
    7477}
    7578
     
    7780void UndoTakeRemove::redo()
    7881{
    79     qDebug("UndoTakeRemove::redo --> Start");
     82    qDebug() << "UndoTakeRemove::redo --> Start";
    8083
    8184    AnimationProject *animationProject = facade->getAnimationProject();
     
    8992    if (undoFlag) {
    9093        facade->writeHistoryEntry(QLatin1String("redo"));
    91         undoFlag = FALSE;
     94        undoFlag = false;
    9295    }
    9396    else {
     
    98101    }
    99102
    100     qDebug("UndoTakeRemove::redo --> End");
     103    qDebug() << "UndoTakeRemove::redo --> End";
    101104}
  • qstopmotion/trunk/fuentes/src/domain/undo/undotakeremove.h

    r446 r4773  
    2525
    2626#include <domain/undo/undobase.h>
     27
    2728
    2829/**
  • qstopmotion/trunk/fuentes/src/domain/undo/undotakeselect.cpp

    r446 r4773  
    2121#include "undotakeselect.h"
    2222
     23#include <QDebug>
     24#include <QLatin1String>
     25
    2326
    2427UndoTakeSelect::UndoTakeSelect(DomainFacade *df,
     
    3134    newSceneIndex = nsi;
    3235    newTakeIndex = nti;
    33     undoFlag = FALSE;
     36    undoFlag = false;
    3437    setText(QString(tr("Select take (%1,%2)-->(%3,%4)"))
    3538            .arg(oldSceneIndex).arg(oldTakeIndex)
     
    4548void UndoTakeSelect::undo()
    4649{
    47     qDebug("UndoTakeSelect::undo --> Start");
     50    qDebug() << "UndoTakeSelect::undo --> Start";
    4851
    4952    AnimationProject *animationProject = facade->getAnimationProject();
     
    7174
    7275    facade->writeHistoryEntry(QLatin1String("undo"));
    73     undoFlag = TRUE;
     76    undoFlag = true;
    7477
    75     qDebug("UndoTakeSelect::undo --> End");
     78    qDebug() << "UndoTakeSelect::undo --> End";
    7679}
    7780
     
    7982void UndoTakeSelect::redo()
    8083{
    81     qDebug("UndoTakeSelect::redo --> Start");
     84    qDebug() << "UndoTakeSelect::redo --> Start";
    8285
    8386    AnimationProject *animationProject = facade->getAnimationProject();
     
    106109    if (undoFlag) {
    107110        facade->writeHistoryEntry(QLatin1String("redo"));
    108         undoFlag = FALSE;
     111        undoFlag = false;
    109112    }
    110113    else {
     
    117120    }
    118121
    119     qDebug("UndoTakeSelect::redo --> End");
     122    qDebug() << "UndoTakeSelect::redo --> End";
    120123}
  • qstopmotion/trunk/fuentes/src/domain/undo/undotakeselect.h

    r446 r4773  
    2323
    2424#include <domain/undo/undobase.h>
     25
    2526
    2627/**
  • qstopmotion/trunk/fuentes/src/frontends/frontend.h

    r446 r4773  
    11/******************************************************************************
    2  *  Copyright (C) 2005-2015 by                                                *
     2 *  Copyright (C) 2005-2016 by                                                *
    33 *    Bjoern Erik Nilsen (bjoern.nilsen@bjoernen.com),                        *
    44 *    Fredrik Berg Kjoelstad (fredrikbk@hotmail.com),                         *
     
    351351
    352352    /**
    353      * Is the Gstreamer library installed on the operation system.
    354      *
    355      * @brief isGstreamerInstalled
    356      * @return true if the library is installed.
    357      */
    358     virtual bool isGstreamerInstalled() = 0;
    359 
    360     /**
    361353     * Abstract function to get the possible video devices.
    362354     * @return Vector with the devices.
     
    556548    virtual void setPlaybackCount(int count) = 0;
    557549
     550    /**
     551     * Get the overlay intensity value.
     552     * @return The overlay intensity value.
     553     */
     554    virtual int getOverlayIntensity() = 0;
     555
     556    /**
     557     * Set the overlay intensity value of the project.
     558     * @param overlay The new overlay intensity value.
     559     */
     560    virtual void setOverlayIntensity(int overlay) = 0;
     561
    558562    /**************************************************************************
    559563     * Other
     
    564568     */
    565569    virtual void testMainWidget() = 0;
     570
    566571};
    567572
  • qstopmotion/trunk/fuentes/src/frontends/observer.h

    r446 r4773  
    3535 * changes in the animationmodel has to implement from this class.
    3636 *
    37  * The observers implemented with this class also has to be attatched to the
     37 * The observers implemented with this class also has to be attached to the
    3838 * animationmodel.
    3939 *
  • qstopmotion/trunk/fuentes/src/frontends/qtfrontend/dialogs/aboutdialog.cpp

    r446 r4773  
    2323#include "aboutdialog.h"
    2424
     25#include <QLabel>
     26#include <QProcess>
     27#include <QPushButton>
     28#include <QTextEdit>
     29#include <QVBoxLayout>
     30
    2531#include "licence.h"
    2632#include "technical/preferencestool.h"
    27 
    28 #include <QtGui>
    2933
    3034
     
    4953                          "<p>" + tr("This is the qStopMotion application for creating stop motion animations.") + "</p>"
    5054                          "<p>" + tr("Version: ") + PreferencesTool::applicationVersion + "</p>"
    51                           "<p>&copy; 2010-2015, Ralf Lange, longsoft.de </p>"
     55                          "<p>&copy; 2010-" + PreferencesTool::applicationYear + ", Ralf Lange, longsoft.de </p>"
    5256                          "<hr />"));
    5357    aboutLayout->addWidget(new QLabel(
     
    7882    thanksText->setHtml(
    7983                "<p><b>" + tr("Translation") + "</b><br>"
    80                 "Norma Ludwig (" + tr("French") + " - qStopMotion)<br>"
     84                "Norma Klinsmann (" + tr("French") + " - qStopMotion)<br>"
    8185                "Guillaume B &lt;littletux@zarb.org&gt; (" + tr("French") + " - stopmotion for Linux)<br>"
    8286                "David Lamhauge &lt;davidlamhauge@gmail.com&gt; (" + tr("Danish") + ")<br>"
     
    129133    // Add line containing the OS version number
    130134    version.append(tr("Operating system name and version: "));
    131 #ifdef Q_WS_WIN
     135#if defined(Q_OS_WIN32) || defined(Q_OS_WIN64)
    132136    // Windows version
    133137    switch(QSysInfo::WindowsVersion) {
     
    161165    }
    162166#endif
    163 #ifdef Q_WS_MAC
     167#ifdef Q_OS_OSX
    164168    // Apple OS X version
    165169    switch(QSysInfo::MacintoshVersion) {
     
    190194    }
    191195#endif
    192 #ifdef Q_WS_X11
     196#ifdef Q_OS_LINUX
    193197    // Linux version
    194198    QProcess uname;
  • qstopmotion/trunk/fuentes/src/frontends/qtfrontend/dialogs/aboutdialog.h

    r446 r4773  
    11/******************************************************************************
    2  *  Copyright (C) 2005-2015 by                                                *
     2 *  Copyright (C) 2005-2016 by                                                *
    33 *    Bjoern Erik Nilsen (bjoern.nilsen@bjoernen.com),                        *
    44 *    Fredrik Berg Kjoelstad (fredrikbk@hotmail.com),                         *
     
    2424#define ABOUTDIALOG_H
    2525
    26 #include "frontends/frontend.h"
    27 
    2826#include <QDialog>
    2927#include <QTabWidget>
     28
     29#include "frontends/frontend.h"
    3030
    3131
  • qstopmotion/trunk/fuentes/src/frontends/qtfrontend/dialogs/cameracontrollerdialog.cpp

    r446 r4773  
    11/******************************************************************************
    2  *  Copyright (C) 2005-2015 by                                                *
     2 *  Copyright (C) 2005-2016 by                                                *
    33 *    Bjoern Erik Nilsen (bjoern.nilsen@bjoernen.com),                        *
    44 *    Fredrik Berg Kjoelstad (fredrikbk@hotmail.com),                         *
     
    2222
    2323#include "cameracontrollerdialog.h"
     24
     25#include <QDebug>
     26#include <QHBoxLayout>
     27#include <QProgressDialog>
     28#include <QUrl>
     29
    2430#include "technical/preferencestool.h"
    25 
    26 #include <QtCore/QtDebug>
    27 #include <QtCore/QUrl>
    28 #include <QtGui/QHBoxLayout>
    29 #include <QtGui/QProgressDialog>
    3031
    3132
     
    3536    : QDialog(parent)
    3637{
    37     qDebug("CameraControllerDialog::Constructor --> Start");
     38    qDebug() << "CameraControllerDialog::Constructor --> Start";
    3839
    3940    frontend = f;
     
    4344    deviceId.remove(QLatin1Char('/'));   // Remove all slashs (Linux)
    4445    grabberController = device->getController();
    45     stepBrightness = -1;
    46     stepContrast = -1;
    47     stepSaturation = -1;
    48     stepHue = -1;
    49     stepGamma = -1;
    50     stepSharpness = -1;
    51     stepBacklight = -1;
    52     stepWhite = -1;
    53     stepGain = -1;
    54     stepColor = -1;
    55     stepExposure = -1;
    56     stepZoom = -1;
    57     stepFocus = -1;
    58     stepPan = -1;
    59     stepTilt = -1;
    60     stepIris = -1;
    61     stepRoll = -1;
    6246
    6347    makeGUI();
    6448    retranslateStrings();
    6549
    66     qDebug("CameraControllerDialog::Constructor --> End");
     50    qDebug() << "CameraControllerDialog::Constructor --> End";
    6751}
    6852
     
    8973
    9074    brightnessLabel = new QLabel("brightnessLabel");
    91     brightnessComboBox = new QComboBox();
    92     connect(brightnessComboBox, SIGNAL(activated(int)), this, SLOT(changeBrightness(int)));
     75    brightnessSlider = new QSlider(Qt::Horizontal);
     76    connect(brightnessSlider, SIGNAL(valueChanged(int)), this, SLOT(changeBrightness(int)));
    9377    brightnessLabel->hide();
    94     brightnessComboBox->hide();
     78    brightnessSlider->hide();
    9579
    9680    contrastCheckBox = new QCheckBox("contrastCheckBox");
     
    10084
    10185    contrastLabel = new QLabel("contrastLabel");
    102     contrastComboBox = new QComboBox();
    103     connect(contrastComboBox, SIGNAL(activated(int)), this, SLOT(changeContrast(int)));
     86    contrastSlider = new QSlider(Qt::Horizontal);
     87    connect(contrastSlider, SIGNAL(valueChanged(int)), this, SLOT(changeContrast(int)));
    10488    contrastLabel->hide();
    105     contrastComboBox->hide();
     89    contrastSlider->hide();
    10690
    10791    saturationCheckBox = new QCheckBox("saturationCheckBox");
     
    11195
    11296    saturationLabel = new QLabel("saturationLabel");
    113     saturationComboBox = new QComboBox();
    114     connect(saturationComboBox, SIGNAL(activated(int)), this, SLOT(changeSaturation(int)));
     97    saturationSlider = new QSlider(Qt::Horizontal);
     98    connect(saturationSlider, SIGNAL(valueChanged(int)), this, SLOT(changeSaturation(int)));
    11599    saturationLabel->hide();
    116     saturationComboBox->hide();
     100    saturationSlider->hide();
    117101
    118102    hueCheckBox = new QCheckBox("hueCheckBox");
     
    122106
    123107    hueLabel = new QLabel("hueLabel");
    124     hueComboBox = new QComboBox();
    125     connect(hueComboBox, SIGNAL(activated(int)), this, SLOT(changeHue(int)));
     108    hueSlider = new QSlider(Qt::Horizontal);
     109    connect(hueSlider, SIGNAL(valueChanged(int)), this, SLOT(changeHue(int)));
    126110    hueLabel->hide();
    127     hueComboBox->hide();
     111    hueSlider->hide();
    128112
    129113    gammaCheckBox = new QCheckBox("gammaCheckBox");
     
    133117
    134118    gammaLabel = new QLabel("gammaLabel");
    135     gammaComboBox = new QComboBox();
    136     connect(gammaComboBox, SIGNAL(activated(int)), this, SLOT(changeGamma(int)));
     119    gammaSlider = new QSlider(Qt::Horizontal);
     120    connect(gammaSlider, SIGNAL(valueChanged(int)), this, SLOT(changeGamma(int)));
    137121    gammaLabel->hide();
    138     gammaComboBox->hide();
     122    gammaSlider->hide();
    139123
    140124    sharpnessCheckBox = new QCheckBox("sharpnessCheckBox");
     
    144128
    145129    sharpnessLabel = new QLabel("sharpnessLabel");
    146     sharpnessComboBox = new QComboBox();
    147     connect(sharpnessComboBox, SIGNAL(activated(int)), this, SLOT(changeSharpness(int)));
     130    sharpnessSlider = new QSlider(Qt::Horizontal);
     131    connect(sharpnessSlider, SIGNAL(valueChanged(int)), this, SLOT(changeSharpness(int)));
    148132    sharpnessLabel->hide();
    149     sharpnessComboBox->hide();
     133    sharpnessSlider->hide();
    150134
    151135    backlightCheckBox = new QCheckBox("backlightCheckBox");
     
    155139
    156140    backlightLabel = new QLabel("backlightLabel");
    157     backlightComboBox = new QComboBox();
    158     connect(backlightComboBox, SIGNAL(activated(int)), this, SLOT(changeBacklight(int)));
     141    backlightSlider = new QSlider(Qt::Horizontal);
     142    connect(backlightSlider, SIGNAL(valueChanged(int)), this, SLOT(changeBacklight(int)));
    159143    backlightLabel->hide();
    160     backlightComboBox->hide();
     144    backlightSlider->hide();
    161145
    162146    whiteCheckBox = new QCheckBox("whiteCheckBox");
     
    166150
    167151    whiteLabel = new QLabel("whiteLabel");
    168     whiteComboBox = new QComboBox();
    169     connect(whiteComboBox, SIGNAL(activated(int)), this, SLOT(changeWhite(int)));
     152    whiteSlider = new QSlider(Qt::Horizontal);
     153    connect(whiteSlider, SIGNAL(valueChanged(int)), this, SLOT(changeWhite(int)));
    170154    whiteLabel->hide();
    171     whiteComboBox->hide();
     155    whiteSlider->hide();
    172156
    173157    gainCheckBox = new QCheckBox("gainCheckBox");
     
    177161
    178162    gainLabel = new QLabel("gainLabel");
    179     gainComboBox = new QComboBox();
    180     connect(gainComboBox, SIGNAL(activated(int)), this, SLOT(changeGain(int)));
     163    gainSlider = new QSlider(Qt::Horizontal);
     164    connect(gainSlider, SIGNAL(valueChanged(int)), this, SLOT(changeGain(int)));
    181165    gainLabel->hide();
    182     gainComboBox->hide();
     166    gainSlider->hide();
    183167
    184168    colorCheckBox = new QCheckBox("colorCheckBox");
     
    188172
    189173    colorLabel = new QLabel("colorLabel");
    190     colorComboBox = new QComboBox();
    191     connect(colorComboBox, SIGNAL(activated(int)), this, SLOT(changeColor(int)));
     174    colorSlider = new QSlider(Qt::Horizontal);
     175    connect(colorSlider, SIGNAL(valueChanged(int)), this, SLOT(changeColor(int)));
    192176    colorLabel->hide();
    193     colorComboBox->hide();
     177    colorSlider->hide();
    194178
    195179    controlGroupBox = new QGroupBox("controlGroupBox");
     
    204188
    205189    exposureLabel = new QLabel("exposureLabel");
    206     exposureComboBox = new QComboBox();
    207     connect(exposureComboBox, SIGNAL(activated(int)), this, SLOT(changeExposure(int)));
     190    exposureSlider = new QSlider(Qt::Horizontal);
     191    connect(exposureSlider, SIGNAL(valueChanged(int)), this, SLOT(changeExposure(int)));
    208192    exposureLabel->hide();
    209     exposureComboBox->hide();
     193    exposureSlider->hide();
    210194
    211195    zoomCheckBox = new QCheckBox("zoomCheckBox");
     
    215199
    216200    zoomLabel = new QLabel("zoomLabel");
    217     zoomComboBox = new QComboBox();
    218     connect(zoomComboBox, SIGNAL(activated(int)), this, SLOT(changeZoom(int)));
     201    zoomSlider = new QSlider(Qt::Horizontal);
     202    connect(zoomSlider, SIGNAL(valueChanged(int)), this, SLOT(changeZoom(int)));
    219203    zoomLabel->hide();
    220     zoomComboBox->hide();
     204    zoomSlider->hide();
    221205
    222206    focusCheckBox = new QCheckBox("focusCheckBox");
     
    226210
    227211    focusLabel = new QLabel("focusLabel");
    228     focusComboBox = new QComboBox();
    229     connect(focusComboBox, SIGNAL(activated(int)), this, SLOT(changeFocus(int)));
     212    focusSlider = new QSlider(Qt::Horizontal);
     213    connect(focusSlider, SIGNAL(valueChanged(int)), this, SLOT(changeFocus(int)));
    230214    focusLabel->hide();
    231     focusComboBox->hide();
     215    focusSlider->hide();
    232216
    233217    panCheckBox = new QCheckBox("panCheckBox");
     
    237221
    238222    panLabel = new QLabel("panLabel");
    239     panComboBox = new QComboBox();
    240     connect(panComboBox, SIGNAL(activated(int)), this, SLOT(changePan(int)));
     223    panSlider = new QSlider(Qt::Horizontal);
     224    connect(panSlider, SIGNAL(valueChanged(int)), this, SLOT(changePan(int)));
    241225    panLabel->hide();
    242     panComboBox->hide();
     226    panSlider->hide();
    243227
    244228    tiltCheckBox = new QCheckBox("tiltCheckBox");
     
    248232
    249233    tiltLabel = new QLabel("tiltLabel");
    250     tiltComboBox = new QComboBox();
    251     connect(tiltComboBox, SIGNAL(activated(int)), this, SLOT(changeTilt(int)));
     234    tiltSlider = new QSlider(Qt::Horizontal);
     235    connect(tiltSlider, SIGNAL(valueChanged(int)), this, SLOT(changeTilt(int)));
    252236    tiltLabel->hide();
    253     tiltComboBox->hide();
     237    tiltSlider->hide();
    254238
    255239    irisCheckBox = new QCheckBox("irisCheckBox");
     
    259243
    260244    irisLabel = new QLabel("irisLabel");
    261     irisComboBox = new QComboBox();
    262     connect(irisComboBox, SIGNAL(activated(int)), this, SLOT(changeIris(int)));
     245    irisSlider = new QSlider(Qt::Horizontal);
     246    connect(irisSlider, SIGNAL(valueChanged(int)), this, SLOT(changeIris(int)));
    263247    irisLabel->hide();
    264     irisComboBox->hide();
     248    irisSlider->hide();
    265249
    266250    rollCheckBox = new QCheckBox("rollCheckBox");
     
    270254
    271255    rollLabel = new QLabel("rollLabel");
    272     rollComboBox = new QComboBox();
    273     connect(rollComboBox, SIGNAL(activated(int)), this, SLOT(changeRoll(int)));
     256    rollSlider = new QSlider(Qt::Horizontal);
     257    connect(rollSlider, SIGNAL(valueChanged(int)), this, SLOT(changeRoll(int)));
    274258    rollLabel->hide();
    275     rollComboBox->hide();
     259    rollSlider->hide();
    276260
    277261    resetButton = new QPushButton("resetButton");
     
    291275    qualityLayout->addWidget(brightnessCheckBox);
    292276    qualityLayout->addWidget(brightnessLabel);
    293     qualityLayout->addWidget(brightnessComboBox);
     277    qualityLayout->addWidget(brightnessSlider);
    294278    qualityLayout->addWidget(contrastCheckBox);
    295279    qualityLayout->addWidget(contrastLabel);
    296     qualityLayout->addWidget(contrastComboBox);
     280    qualityLayout->addWidget(contrastSlider);
    297281    qualityLayout->addWidget(saturationCheckBox);
    298282    qualityLayout->addWidget(saturationLabel);
    299     qualityLayout->addWidget(saturationComboBox);
     283    qualityLayout->addWidget(saturationSlider);
    300284    qualityLayout->addWidget(hueCheckBox);
    301285    qualityLayout->addWidget(hueLabel);
    302     qualityLayout->addWidget(hueComboBox);
     286    qualityLayout->addWidget(hueSlider);
    303287    qualityLayout->addWidget(gammaCheckBox);
    304288    qualityLayout->addWidget(gammaLabel);
    305     qualityLayout->addWidget(gammaComboBox);
     289    qualityLayout->addWidget(gammaSlider);
    306290    qualityLayout->addWidget(sharpnessCheckBox);
    307291    qualityLayout->addWidget(sharpnessLabel);
    308     qualityLayout->addWidget(sharpnessComboBox);
     292    qualityLayout->addWidget(sharpnessSlider);
    309293    qualityLayout->addWidget(backli