Commit a2280188 authored by uycyb's avatar uycyb

clean commit

parents
*.pro.user*
*.autosave
*~
._*
doc
*.origin
Makefile
*.supp
/build
This diff is collapsed.
This diff is collapsed.
#-------------------------------------------------
#
# Project created by QtCreator 2013-12-16T13:09:32
#
#-------------------------------------------------
QT += core gui
QT += printsupport
QT += svg
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
TARGET = LenLab
TEMPLATE = app
QMAKE_CXXFLAGS += -std=c++11
unix:CONFIG += qwt
SOURCES += src/main.cpp\
src/mainwindow.cpp \
src/frm_savedatalogger.cpp \
src/lockobject.cpp \
src/oszilloskopCommunication.cpp \
src/generalcommunication.cpp \
src/signalgeneratorcommunication.cpp \
src/frm_saveimage.cpp \
src/oszidatabuffer.cpp \
src/dft.cpp \
src/frm_saveoszi.cpp \
src/frm_savepage.cpp \
src/bodediagramtabpage.cpp \
src/commandcreator.cpp \
src/config.cpp \
src/currenttabpage.cpp \
src/dataloggerdataobject.cpp \
src/dataloggertabpage.cpp \
src/dataparser.cpp \
src/datapacket.cpp \
src/logger.cpp \
src/datavisualisation.cpp \
src/meassuringobject.cpp \
src/tabpage.cpp \
src/meassuringpage.cpp \
src/startpagetopwidget.cpp \
src/newtabpagedummy.cpp \
src/usbhandler.cpp \
src/startpage.cpp \
src/signalgeneratorobject.cpp \
src/signalgeneratorpage.cpp \
src/oszitabpage.cpp \
src/oszidataobject.cpp \
src/oszicursor.cpp \
src/oszicursorpoint.cpp \
src/basecursor.cpp \
src/basecursorpoint.cpp \
src/curvecollector.cpp \
src/usbhandlersync.cpp \
src/usbhandlerbase.cpp \
src/singlecursor.cpp \
src/frm_savebode.cpp \
src/bodediagramdataobject.cpp \
src/additional.cpp \
src/lineardatavisualisation.cpp \
src/logarithmicdatavisualisation.cpp \
src/oszidatavisualisation.cpp \
src/dataloggervisualisation.cpp \
src/bodevisualisation.cpp \
src/bodecursor.cpp \
src/infowidget.cpp \
src/nyquistplottabpage.cpp \
src/nyquistdataobject.cpp \
src/nyquistdatavisualisation.cpp \
src/nyquistcursor.cpp
HEADERS += src/mainwindow.h \
src/commanddeclaration.h \
src/TriggerDefines.h \
src/frm_savedatalogger.h \
src/lockobject.h \
src/oszilloskopCommunication.h \
src/generalcommunication.h \
src/signalgeneratorcommunication.h \
src/bodediagramdataobject.h \
src/frm_saveimage.h \
src/oszidatabuffer.h \
src/dft.h \
src/frm_saveoszi.h \
src/frm_savepage.h \
src/bodediagramtabpage.h \
src/commandcreator.h \
src/config.h \
src/currenttabpage.h \
src/dataloggerdataobject.h \
src/dataloggertabpage.h \
src/dataparser.h \
src/datapacket.h \
src/datavisualisation.h \
src/logger.h \
src/meassuringobject.h \
src/meassuringpage.h \
src/newtabpagedummy.h \
src/oszidataobject.h \
src/oszitabpage.h \
src/signalgeneratorobject.h \
src/signalgeneratorpage.h \
src/startpage.h \
src/startpagetopwidget.h \
src/usbhandler.h \
src/tabpage.h \
src/oszicursor.h \
src/oszicursorpoint.h \
src/usbconfig.h \
src/basecursor.h \
src/basecursorpoint.h \
src/curvecollector.h \
src/usbhandlersync.h \
src/usbhandlerbase.h \
src/buildinfo.h \
src/singlecursor.h \
src/frm_savebode.h \
src/additional.h \
src/lineardatavisualisation.h \
src/logarithmicdatavisualisation.h \
src/oszidatavisualisation.h \
src/dataloggervisualisation.h \
src/bodevisualisation.h \
src/bodecursor.h \
src/infowidget.h \
src/nyquistplottabpage.h \
src/nyquistdataobject.h \
src/nyquistdatavisualisation.h \
src/nyquistcursor.h
FORMS += src/mainwindow.ui \
src/additional.ui
DEPENDPATH += ${INCLUDEPATH}
static{
CONFIG += static
DEFINES += STATIC
}
unix:!macx: LIBS += -lusb-1.0
unix:INCLUDEPATH += /usr/local/include/libusb-1.0
unix: LIBS += -L$$PWD/ext/qwt/lib/ -lqwt
unix:INCLUDEPATH += $$PWD/ext/qwt/src
unix:DEPENDPATH += $$PWD/ext/qwt/src
unix32:LIBS += -L/usr/lib/i386-linux-gnu/mesa-egl/
win32:CONFIG(release, debug|release): LIBS += -L$$PWD/windows -lqwt
else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../../qwt/lib/ -lqwtd
win32:INCLUDEPATH += $$PWD/../../qwt/src
win32:DEPENDPATH += $$PWD/../../qwt/src
win32:CONFIG(release, debug|release): LIBS += -L$$PWD/windows/ -lusb-1.0
else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/windows/ -lusb-1.0
INCLUDEPATH += $$PWD/windows
DEPENDPATH += $$PWD/windows
OTHER_FILES += \
LenLab.supp
RESOURCES += \
src/logoImage.qrc
DISTFILES += \
changelog.txt
#-------------------------------------------------
#
# Project created by QtCreator 2013-12-16T13:09:32
#
#-------------------------------------------------
QT += core gui
QT += printsupport widgets
TARGET = LenLab
TEMPLATE = app
SOURCES += main.cpp \
mainwindow.cpp \
frm_savedatalogger.cpp \
lockobject.cpp \
oszilloskopCommunication.cpp \
generalcommunication.cpp \
signalgeneratorcommunication.cpp \
bodediagramdataobject.cpp \
frm_saveimage.cpp \
oszidatabuffer.cpp \
dft.cpp \
frm_saveoszi.cpp \
frm_savepage.cpp \
bodediagramtabpage.cpp \
commandcreator.cpp \
config.cpp \
currenttabpage.cpp \
dataloggerdataobject.cpp \
dataloggertabpage.cpp \
dataparser.cpp \
datapacket.cpp \
logger.cpp \
datavisualisation.cpp \
meassuringobject.cpp \
tabpage.cpp \
meassuringpage.cpp \
startpagetopwidget.cpp \
newtabpagedummy.cpp \
usbhandler.cpp \
startpage.cpp \
signalgeneratorobject.cpp \
signalgeneratorpage.cpp \
oszitabpage.cpp \
oszidataobject.cpp \
oszicursor.cpp \
oszicursorpoint.cpp \
basecursor.cpp \
basecursorpoint.cpp \
curvecollector.cpp \
usbhandlersync.cpp \
usbhandlerbase.cpp \
singlecursor.cpp \
frm_savebode.cpp
HEADERS += mainwindow.h \
commanddeclaration.h \
TriggerDefines.h \
frm_savedatalogger.h \
lockobject.h \
oszilloskopCommunication.h \
generalcommunication.h \
signalgeneratorcommunication.h \
bodediagramdataobject.h \
frm_saveimage.h \
oszidatabuffer.h \
dft.h \
frm_saveoszi.h \
frm_savepage.h \
bodediagramtabpage.h \
commandcreator.h \
config.h \
currenttabpage.h \
dataloggerdataobject.h \
dataloggertabpage.h \
dataparser.h \
datapacket.h \
datavisualisation.h \
logger.h \
meassuringobject.h \
meassuringpage.h \
newtabpagedummy.h \
oszidataobject.h \
oszitabpage.h \
signalgeneratorobject.h \
signalgeneratorpage.h \
startpage.h \
startpagetopwidget.h \
usbhandler.h \
tabpage.h \
oszicursor.h \
oszicursorpoint.h \
usbconfig.h \
basecursor.h \
basecursorpoint.h \
curvecollector.h \
usbhandlersync.h \
usbhandlerbase.h \
buildinfo.h \
singlecursor.h \
frm_savebode.h
FORMS += mainwindow.ui
RESOURCES += logoImage.qrc
OTHER_FILES += LenLab.supp
CONFIG += c++11
# qwt
include( $$PWD/../install/features/qwt.prf )
# libusb
LIBS += -L$$PWD/../install/lib -lusb-1.0
INCLUDEPATH += $$PWD/../install/include/libusb-1.0
win32 {
# libusb (dll resides in install/bin)
LIBS += -L$$PWD/../install/bin
}
macx {
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
}
DEPENDPATH += INCLUDEPATH
#-------------------------------------------------
#
# Project created by QtCreator 2013-12-16T13:09:32
#
#-------------------------------------------------
include ( /Volumes/bordeaux/IBT/thirdparty/macosx/features/qwt.prf )
QT += core gui
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport
TARGET = LenLab
TEMPLATE = app
QMAKE_CXXFLAGS += -std=c++11
QMAKE_MAC_SDK = macosx10.11
macx:CONFIG += qwt
SOURCES += main.cpp \
mainwindow.cpp \
frm_savedatalogger.cpp \
lockobject.cpp \
oszilloskopCommunication.cpp \
generalcommunication.cpp \
signalgeneratorcommunication.cpp \
frm_saveimage.cpp \
oszidatabuffer.cpp \
dft.cpp \
frm_saveoszi.cpp \
frm_savepage.cpp \
bodediagramtabpage.cpp \
commandcreator.cpp \
config.cpp \
currenttabpage.cpp \
dataloggerdataobject.cpp \
dataloggertabpage.cpp \
dataparser.cpp \
datapacket.cpp \
logger.cpp \
datavisualisation.cpp \
meassuringobject.cpp \
tabpage.cpp \
meassuringpage.cpp \
startpagetopwidget.cpp \
newtabpagedummy.cpp \
usbhandler.cpp \
startpage.cpp \
signalgeneratorobject.cpp \
signalgeneratorpage.cpp \
oszitabpage.cpp \
oszidataobject.cpp \
oszicursor.cpp \
oszicursorpoint.cpp \
basecursor.cpp \
basecursorpoint.cpp \
curvecollector.cpp \
usbhandlersync.cpp \
usbhandlerbase.cpp \
singlecursor.cpp \
frm_savebode.cpp \
bodediagramdataobject.cpp \
additional.cpp \
lineardatavisualisation.cpp \
logarithmicdatavisualisation.cpp \
oszidatavisualisation.cpp \
dataloggervisualisation.cpp \
bodevisualisation.cpp \
bodecursor.cpp \
infowidget.cpp \
nyquistplottabpage.cpp \
nyquistdataobject.cpp \
nyquistdatavisualisation.cpp \
nyquistcursor.cpp
HEADERS += mainwindow.h \
commanddeclaration.h \
TriggerDefines.h \
frm_savedatalogger.h \
lockobject.h \
oszilloskopCommunication.h \
generalcommunication.h \
signalgeneratorcommunication.h \
bodediagramdataobject.h \
frm_saveimage.h \
oszidatabuffer.h \
dft.h \
frm_saveoszi.h \
frm_savepage.h \
bodediagramtabpage.h \
commandcreator.h \
config.h \
currenttabpage.h \
dataloggerdataobject.h \
dataloggertabpage.h \
dataparser.h \
datapacket.h \
datavisualisation.h \
logger.h \
meassuringobject.h \
meassuringpage.h \
newtabpagedummy.h \
oszidataobject.h \
oszitabpage.h \
signalgeneratorobject.h \
signalgeneratorpage.h \
startpage.h \
startpagetopwidget.h \
usbhandler.h \
tabpage.h \
oszicursor.h \
oszicursorpoint.h \
usbconfig.h \
basecursor.h \
basecursorpoint.h \
curvecollector.h \
usbhandlersync.h \
usbhandlerbase.h \
buildinfo.h \
singlecursor.h \
frm_savebode.h \
additional.h \
lineardatavisualisation.h \
logarithmicdatavisualisation.h \
oszidatavisualisation.h \
dataloggervisualisation.h \
bodevisualisation.h \
bodecursor.h \
infowidget.h \
nyquistplottabpage.h \
nyquistdataobject.h \
nyquistdatavisualisation.h \
nyquistcursor.h
FORMS += mainwindow.ui \
additional.ui
RESOURCES += logoImage.qrc
OTHER_FILES += LenLab.supp
# libusb
LIBS += -L/opt/local/lib -lusb-1.0
# Aus dem Netz:
LIBS += -L"/Volumes/bordeaux/IBT10.10/thirdparty/macosx/lib"
# -F/Volumes/bordeaux/IBT10.10/thirdparty/macosx/lib -framework qwt
INCLUDEPATH += /opt/local/include/libusb-1.0 /System/Library/
macx {
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.10
}
DEPENDPATH += INCLUDEPATH
LenLab build notes
==================
project directory::
(Qt)
qwt-6.1.1
libusb-1.0.19
install
LenLab
macx
====
qt
--
Qt 5.3.2
http://qt-project.org
release: http://download.qt-project.org/official_releases/qt/5.3/5.3.2/qt-opensource-mac-x64-clang-5.3.2.dmg
online installer: http://download.qt-project.org/official_releases/online_installers/qt-opensource-mac-x64-1.6.0-5-online.dmg
no need to build
qwt
---
qwt-6.1.1.tar.bz2
http://qwt.sourceforge.net
http://sourceforge.net/projects/qwt/files/latest/download?source=files
http://sourceforge.net/projects/qwt/files/qwt/6.1.1/qwt-6.1.1.tar.bz2/download
qwtconfig.pri::
unix {
QWT_INSTALL_PREFIX = /Users/christoph/Workshop/install
}
build commands::
qmake qwt.pro
make
make install
libusb
------
libusb-1.0.19.tar.bz2
http://libusb.info
https://sourceforge.net/projects/libusb/files/latest/download?source=files
http://sourceforge.net/projects/libusb/files/libusb-1.0/libusb-1.0.19/libusb-1.0.19.tar.bz2/download
build commands::
./configure --prefix=/Users/christoph/Workshop/install
make
make install
LenLab
------
QtCreator Build LenLabBuildEnv.pro
macdeployqt copies Qt and third party libraries into the application bundle. qwt sets no
search path, so we change that path before calling macdeployqt.
deploying::
install_name_tool -change qwt.framework/Versions/6/qwt $HOME/Workshop/install/lib/qwt.framework/Versions/6/qwt LenLab.app/Contents/MacOS/LenLab
../Qt5.3.2/5.3/clang_64/bin/macdeployqt LenLab.app/
show search path for frameworks and libraries::
otool -L LenLab.app/Contents/MacOS/LenLab
http://qt-project.org/doc/qt-4.8/deployment-mac.html
dmg-file::
hdiutil create -volname LenLab_OSX_2015-01-13 -srcFolder LenLab_OSX_2015-01-13 -ov -format UDZO LenLab_OSX_2015-01-13.dmg
http://apple.stackexchange.com/questions/48414/how-do-i-create-a-dmg-file-from-a-directory
Compiling at IBT
------
Following information applies for the compilation with IBT server system only
Update the repository on your IBT machine using
git pull
Open the project file called LenLabBuildEnvIBTMAC.pro using QtCreator
Compile the project as release
After the Compilation is done, copy the LenLab.app to change folder to LenLab_MacOSX and check the libraries to be added.
Check for the directories which are linked by
cd /Volumes/louise/Benutzer/to101/IBT_to101/Lectures/LENlab/SoftwareGIT/LenLab_MacOSX
otool -L LenLab.app/Contents/MacOS/LenLab