speed-dreams
/
soundeditor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re #802 Qatsh port to Qt5 (still crashes with MinGW 4.7 at least) 

git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/subprojects/soundeditor/trunk@5414 30fe4595-0a0c-4342-8851-515496e4dcbd
This commit is contained in:
pouillot 2013-04-20 16:33:09 +00:00 committed by Xavier Del Campo Romero
parent ee33e7e02a
commit 613c44ef3f
Signed by: xavi
GPG Key ID: 84FF3612A9BF43F2
64 changed files with 308 additions and 226 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -6,7 +6,7 @@ project(qatsh)
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 2.8)
# CMake Build options. # CMake Build options.
if(NOT CMAKE_BUILD_TYPE) if(NOT DEFINED CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "Release" CACHE STRING set(CMAKE_BUILD_TYPE "Release" CACHE STRING
"Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel." "Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel."
FORCE) FORCE)

68
INSTALL.txt
View File

@ -20,7 +20,7 @@ III - Linux Installation from sources
IV - Windows Installation from sources IV - Windows Installation from sources
1 - Building with MinGW 4.4 1 - Building with MinGW 4.4 / 4.7
2 - Building with MS VC++ 2008 (9) / 2010 (10) 2 - Building with MS VC++ 2008 (9) / 2010 (10)
3 - Running Qatsh 3 - Running Qatsh
@ -38,14 +38,14 @@ I - Pre-requisites
a. Linux a. Linux
* Qt 4.4 (or later) libraries * Qt 4.4 (or later), or Qt 5.0 (or later) libraries
Install them through your package manager : the package name should look Install them through your package manager : the package name should look
like "libqt-4.x.y...-dev" or "libqt-4.x.y...-devel" like "libqt4...-dev" or "libqt4...-devel" or "libqt-4.x.y...-dev" or "libqt-4.x.y...-devel"
(don't forget the "-dev(el)" at the end). (replace 4 by 5 for Qt 5, and don't forget the "-dev(el)" at the end).
Example: Example:
* Linux Mint Debian : TODO * Linux Mint Debian : libqt4-dev
* Ubuntu 12.10 : TODO * Ubuntu 12.10 : TODO
* libSndFile 1.0.17 (or later) library * libSndFile 1.0.17 (or later) library
@ -56,32 +56,32 @@ I - Pre-requisites
b. Windows b. Windows
* Qt 4.4 (or later) libraries * Qt 4.4 (or later), or Qt 5.0 (or later) libraries
Note : You may have them already installed if you installed a complete Qt 4 SDK Note : You may have them already installed if you installed a complete Qt 4 / 5 SDK
(bundling Qt 4 libs + MinGW + Qt Creator in 1 package) (bundling Qt 4 / 5 libs + MinGW + Qt Creator in an all-in-one package)
Download the latest binary installer of the "Qt libraries" Download the latest binary installer of the "Qt libraries"
for your platform (32 or 64 bits) and chosen compiler (MinGW 4.4 or MSVC 20XX) from : for your platform (32 or 64 bits) and chosen compiler (MinGW 4.4/4.7 or MSVC 20XX) from :
http://qt-project.org/downloads#qt-lib http://qt-project.org/downloads#qt-lib
And then install it in the standard location (recommended). And then install it in the standard location (recommended).
And then add the installed "bin" folder in your PATH environment variable And then add the installed "bin" folder in your PATH environment variable
(to make have CMake detect Qt 4) : (to have CMake detect Qt 4 / 5) :
- Windows "Start Menu" - Windows "Start Menu"
- "Settings" / "Configuration panel" / "System" - "Settings" / "Configuration panel" / "System"
- "Advanced" tab / "Environment variables" button, - "Advanced" tab / "Environment variables" button,
- Select the "PATH" user variable and click on "Chnage" button, - Select the "PATH" user variable and click on "Chnage" button,
- Add "C:\Qt\4.x.y\bin;" at the beginning of the current value - Add "C:\Qt\<Qt version>\bin;" at the beginning of the current value
(4.x.y being the actual installed version of Qt libraries) , and click on "OK" (<Qt version> being the actual installed version of Qt libraries), and click on "OK"
- Click on "OK" - Click on "OK"
- Click on "OK" - Click on "OK"
Notes for the MinGW version : Notes for the MinGW version :
- Be careful to specify the right folder - Be careful to specify the right folder
when asked to by the installation wizard about MinGW 4.4 ! when asked to by the installation wizard about MinGW 4.4/4.7 !
* libSndFile 1.0.17 (or later) library * libSndFile 1.0.17 (or later) library
@ -91,7 +91,7 @@ I - Pre-requisites
And then install it in the standard location (recommended). And then install it in the standard location (recommended).
Note: The shipped binaries work with both MinGW 4.4 and MSVC 20XX. Note: The shipped binaries work with both MinGW 4.4/4.7 and MSVC 20XX.
c. Mac OS X c. Mac OS X
@ -110,7 +110,7 @@ I - Pre-requisites
like "gcc" or "g++" or "gnu-c++" or so ... like "gcc" or "g++" or "gnu-c++" or so ...
Example: Example:
* Linux Mint Debian : TODO * Linux Mint Debian : gcc
* Ubuntu 12.10 : TODO * Ubuntu 12.10 : TODO
* CMake 2.8 (or later) * CMake 2.8 (or later)
@ -126,10 +126,19 @@ I - Pre-requisites
And then install it in the standard location (recommended). And then install it in the standard location (recommended).
* Compiler and IDE (option 1) : QtCreator 2.5 (or later) and MinGW 4.4 (no other) * Compiler and IDE (option 1) :
a) For Qt 5 : QtCreator 2.6.2 (or later) and MinGW 4.7 (no other)
You'll find an all-in-one package : http://qt-project.org/downloads#qt-lib
QtCreator is pre-configured for the bundled MinGW 4.7 + QT 5 libs,
but you'll need to configure it for CMake : see below specific instructions in b.
b) For Qt 4 : QtCreator 2.5 (or later) and MinGW 4.4 (no other)
As of early March 2013, there's no more all-in-one Qt 4 libs + MinGW + Qt Creator As of early March 2013, there's no more all-in-one Qt 4 libs + MinGW + Qt Creator
package available (only for Qt 5). package available.
You need to get and install individual components yourself. You need to get and install individual components yourself.
- Download MinGW 4.4 (latest 4.7 is not compatible with Qt 4.8.x libraries) - Download MinGW 4.4 (latest 4.7 is not compatible with Qt 4.8.x libraries)
@ -160,7 +169,7 @@ I - Pre-requisites
(example : qt-creator-windows-opensource-2.6.2.exe) (example : qt-creator-windows-opensource-2.6.2.exe)
- Configure QtCreator (tell it where to find CMake, MinGW 4.4 and Qt libs, - Configure QtCreator (tell it where to find CMake, MinGW 4.4 and Qt libs,
in cae it didn't auto-detect them : ignore the relevant actions below if so) in case it didn't auto-detect them : ignore the relevant actions below if so)
- start it, - start it,
- Tools / Options opens the Options windows, - Tools / Options opens the Options windows,
- Select "Compile & Run" in the list of the left, - Select "Compile & Run" in the list of the left,
@ -391,6 +400,10 @@ See above for pre-requisite conventions about where the sources are located.
Usefull CMake variables for Qatsh (note that some might be "advanced" ones) : Usefull CMake variables for Qatsh (note that some might be "advanced" ones) :
- OPTION_QT5:BOOL : Set it to On to force building with Qt 5 libs
(usefull only if you also have Qt 4 libs installed)
(def: Off)
- CMAKE_BUILD_TYPE:STRING : - CMAKE_BUILD_TYPE:STRING :
Debug, Release, RelWithDebInfo, MinSizeRel (def: Release) Debug, Release, RelWithDebInfo, MinSizeRel (def: Release)
@ -477,15 +490,14 @@ See above for pre-requisite conventions about where the sources are located.
* Run CMake page : use : * Run CMake page : use :
+ CMake generator : "MinGW generator" (mandatory choice here !) + CMake generator : "MinGW generator" (mandatory choice here !)
+ CMake arguments : + CMake arguments :
-DOPTION_OFFICIAL_ONLY:BOOL=On -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_BUILD_TYPE:STRING=Release
+ Click on the Run CMake button + Click on the Run CMake button
Note: See II.2.c above for more about possible / useful CMake arguments. Note: See III.1.a above for more about possible / useful CMake arguments.
Note: The 'Release' build gives you -O3-optimised binaries. Note: The 'Release' build gives you -O3-optimised binaries.
Apart from "won't build" or "won't install" message (don't care), All should go smoothly, especially the detection of the 3rd party libraries.
all should go smoothly, especially the detection of the 3rd party libraries.
* Done * Done
@ -564,7 +576,7 @@ See above for pre-requisite conventions about where the sources are located.
c. Press the "Generate" button. CMake will generate the solution file "qatsh.sln" c. Press the "Generate" button. CMake will generate the solution file "qatsh.sln"
in the ...\build folder, and associated project files (*.vcproj) in the ...\build folder in the ...\build folder, and associated project files (*.vcproj) in the ...\build folder
and subfolders and subfolders
(Note : .sln/.vcproj are OK for MSVC 2005, but you might get other files extensions (Note : .sln/.vcproj are OK for MSVC 2005/8/10, but you might get other files extensions
the later MSVC versions). the later MSVC versions).
d. Load qatsh.sln in MSVC IDE. d. Load qatsh.sln in MSVC IDE.
@ -573,11 +585,11 @@ See above for pre-requisite conventions about where the sources are located.
f. Build the whole Solution (Build / Build Solution) f. Build the whole Solution (Build / Build Solution)
g. At this stage, you can already debug or run qatsh from MSVC g. At this stage, you can already debug or run qatsh from MSVC
without installing (the built executable in the build/qatsh folder), without installing (the built executable in the build/qatsh folder),
provided you have added "C:\Program files\Mega-Nerd\libsndfile\bin;" provided you have added "C:\Program files\Mega-Nerd\libsndfile\bin;"
at the beginning of your PATH environment variable at the beginning of your PATH environment variable
(see for how to do this). (see for how to do this).
h. But you can also install it (in C:\Program files\qatsh with default CMake settings) : h. But you can also install it (in C:\Program files\qatsh with default CMake settings) :
Build the 'INSTALL' project (right click on it and select Build). Build the 'INSTALL' project (right click on it and select Build).

67
cmake/thirdparty.cmake
View File

@ -31,7 +31,7 @@
MACRO(_FIND_3RDPARTY_DLL LIB_PATH_NAMES LIB_NAME_HINTS DLL_NAME_PREFIXES DLL_PATHNAME_VAR) MACRO(_FIND_3RDPARTY_DLL LIB_PATH_NAMES LIB_NAME_HINTS DLL_NAME_PREFIXES DLL_PATHNAME_VAR)
#MESSAGE(STATUS "_FIND_3RDPARTY_DLL : Libs=${LIB_PATH_NAMES} Hints=${LIB_NAME_HINTS}") MESSAGE(STATUS "_FIND_3RDPARTY_DLL : Libs=${LIB_PATH_NAMES} Hints=${LIB_NAME_HINTS}")
FOREACH(_LIB_NAME_HINT ${LIB_NAME_HINTS}) FOREACH(_LIB_NAME_HINT ${LIB_NAME_HINTS})
@ -95,11 +95,29 @@ MACRO(INSTALL_3RDPARTY_RUNTIME)
SET(_QT_DBG_SFX "d") SET(_QT_DBG_SFX "d")
ENDIF() ENDIF()
_FIND_3RDPARTY_DLL("${QT_QTCORE_LIBRARY}" "QtCore${_QT_DBG_SFX}4" "" _DLL_PATHNAME) IF(OPTION_QT5)
LIST(APPEND _THIRDPARTY_DLL_PATHNAMES "${_DLL_PATHNAME}")
_FIND_3RDPARTY_DLL("${QT_QTGUI_LIBRARY}" "QtGui${_QT_DBG_SFX}4" "" _DLL_PATHNAME) GET_TARGET_PROPERTY(_THIRDPARTY_LIB_PATHNAME "${Qt5Core_LIBRARIES}" LOCATION)
LIST(APPEND _THIRDPARTY_DLL_PATHNAMES "${_DLL_PATHNAME}") _FIND_3RDPARTY_DLL("${_THIRDPARTY_LIB_PATHNAME}" "Qt5Core${_QT_DBG_SFX}" "" _DLL_PATHNAME)
LIST(APPEND _THIRDPARTY_DLL_PATHNAMES "${_DLL_PATHNAME}")
GET_TARGET_PROPERTY(_THIRDPARTY_LIB_PATHNAME "${Qt5Widgets_LIBRARIES}" LOCATION)
_FIND_3RDPARTY_DLL("${_THIRDPARTY_LIB_PATHNAME}" "Qt5Gui${_QT_DBG_SFX}" "" _DLL_PATHNAME)
LIST(APPEND _THIRDPARTY_DLL_PATHNAMES "${_DLL_PATHNAME}")
STRING(REPLACE "Qt5Gui" "Qt5Widgets" _THIRDPARTY_LIB_PATHNAME "${_THIRDPARTY_LIB_PATHNAME}")
_FIND_3RDPARTY_DLL("${_THIRDPARTY_LIB_PATHNAME}" "Qt5Widgets${_QT_DBG_SFX}" "" _DLL_PATHNAME)
LIST(APPEND _THIRDPARTY_DLL_PATHNAMES "${_DLL_PATHNAME}")
ELSE()
_FIND_3RDPARTY_DLL("${QT_QTCORE_LIBRARY}" "QtCore${_QT_DBG_SFX}4" "" _DLL_PATHNAME)
LIST(APPEND _THIRDPARTY_DLL_PATHNAMES "${_DLL_PATHNAME}")
_FIND_3RDPARTY_DLL("${QT_QTGUI_LIBRARY}" "QtGui${_QT_DBG_SFX}4" "" _DLL_PATHNAME)
LIST(APPEND _THIRDPARTY_DLL_PATHNAMES "${_DLL_PATHNAME}")
ENDIF()
# LibSndFile # LibSndFile
_FIND_3RDPARTY_DLL("${LIBSNDFILE_LIBRARY}" "sndfile;sndfile-1" "lib;" _DLL_PATHNAME) _FIND_3RDPARTY_DLL("${LIBSNDFILE_LIBRARY}" "sndfile;sndfile-1" "lib;" _DLL_PATHNAME)
@ -119,15 +137,38 @@ MACRO(INSTALL_3RDPARTY_RUNTIME)
ELSEIF(MINGW) ELSEIF(MINGW)
# Works with MinGW 4.4 and 4.7. IF(OPTION_QT5)
GET_FILENAME_COMPONENT(_MINGW_BINDIR "${CMAKE_CXX_COMPILER}" PATH)
SET(_DLL_PATHNAME "${_MINGW_BINDIR}/mingwm10.dll")
MESSAGE(STATUS "Will install compiler run-time ${_DLL_PATHNAME}")
LIST(APPEND _THIRDPARTY_DLL_PATHNAMES "${_DLL_PATHNAME}")
SET(_DLL_PATHNAME "${_MINGW_BINDIR}/libgcc_s_dw2-1.dll") # Works with MinGW 4.7 shipped with QtCreator >= 2.6 and Qt 5.
MESSAGE(STATUS "Will install compiler run-time ${_DLL_PATHNAME}") SET(_DLL_PATHNAME "${_MINGW_BINDIR}/libstdc++-6.dll")
LIST(APPEND _THIRDPARTY_DLL_PATHNAMES "${_DLL_PATHNAME}") MESSAGE(STATUS "Will install compiler run-time ${_DLL_PATHNAME}")
LIST(APPEND _THIRDPARTY_DLL_PATHNAMES "${_DLL_PATHNAME}")
SET(_DLL_PATHNAME "${_MINGW_BINDIR}/libgcc_s_sjlj-1.dll")
MESSAGE(STATUS "Will install compiler run-time ${_DLL_PATHNAME}")
LIST(APPEND _THIRDPARTY_DLL_PATHNAMES "${_DLL_PATHNAME}")
SET(_DLL_PATHNAME "${_MINGW_BINDIR}/libwinpthread-1.dll")
MESSAGE(STATUS "Will install compiler run-time ${_DLL_PATHNAME}")
LIST(APPEND _THIRDPARTY_DLL_PATHNAMES "${_DLL_PATHNAME}")
SET(_DLL_PATHNAME "${_MINGW_BINDIR}/libgcc_s_dw2-1.dll")
MESSAGE(STATUS "Will install compiler run-time ${_DLL_PATHNAME}")
LIST(APPEND _THIRDPARTY_DLL_PATHNAMES "${_DLL_PATHNAME}")
ELSE()
# Works with MinGW 4.4 shipped with QtCreator < 2.6 and with stock MinGW 4.7.
GET_FILENAME_COMPONENT(_MINGW_BINDIR "${CMAKE_CXX_COMPILER}" PATH)
SET(_DLL_PATHNAME "${_MINGW_BINDIR}/mingwm10.dll")
MESSAGE(STATUS "Will install compiler run-time ${_DLL_PATHNAME}")
LIST(APPEND _THIRDPARTY_DLL_PATHNAMES "${_DLL_PATHNAME}")
SET(_DLL_PATHNAME "${_MINGW_BINDIR}/libgcc_s_dw2-1.dll")
MESSAGE(STATUS "Will install compiler run-time ${_DLL_PATHNAME}")
LIST(APPEND _THIRDPARTY_DLL_PATHNAMES "${_DLL_PATHNAME}")
ENDIF()
ENDIF(MSVC) ENDIF(MSVC)

5
qatsh/ATSDataProxyModel.cpp
View File

@ -7,7 +7,7 @@
#include <iostream> #include <iostream>
#include <QtCore/QModelIndex> #include <QModelIndex>
#include "ATSModel.h" #include "ATSModel.h"
#include "ATSDataProxyModel.h" #include "ATSDataProxyModel.h"
@ -39,7 +39,8 @@ void ATSDataProxyModel::onSourceModelReset()
//std::cout << "ATSDataProxyModel::onSourceModelReset" << std::endl; //std::cout << "ATSDataProxyModel::onSourceModelReset" << std::endl;
// Warn attached views that we were reset // Warn attached views that we were reset
reset(); beginResetModel();
endResetModel();
} }
// Get number of frames ==================================================== // Get number of frames ====================================================

4
qatsh/ATSDataProxyModel.h
View File

@ -8,8 +8,8 @@
#ifndef ATSDATAPROXYMODEL_H #ifndef ATSDATAPROXYMODEL_H
#define ATSDATAPROXYMODEL_H #define ATSDATAPROXYMODEL_H
#include <QtGui/QAbstractProxyModel> #include <QAbstractProxyModel>
#include <QtCore/QModelIndex> #include <QModelIndex>
class ATSDataProxyModel : public QAbstractProxyModel class ATSDataProxyModel : public QAbstractProxyModel

8
qatsh/ATSFrameProxyModel.cpp
View File

@ -7,7 +7,7 @@
#include <iostream> #include <iostream>
#include <QtCore/QModelIndex> #include <QModelIndex>
#include "ATSDataProxyModel.h" #include "ATSDataProxyModel.h"
#include "ATSFrameProxyModel.h" #include "ATSFrameProxyModel.h"
@ -46,7 +46,8 @@ void ATSFrameProxyModel::onSourceModelReset()
// << _nCurrFrameIndex << std::endl; // << _nCurrFrameIndex << std::endl;
// And also warn attached views that we were reset // And also warn attached views that we were reset
reset(); beginResetModel();
endResetModel();
} }
// Set current frame ======================================================= // Set current frame =======================================================
@ -56,7 +57,8 @@ void ATSFrameProxyModel::setCurrentFrame(int nFrameIndex)
_nCurrFrameIndex = nFrameIndex; _nCurrFrameIndex = nFrameIndex;
// Warn attached views that the whole model has changed. // Warn attached views that the whole model has changed.
reset(); beginResetModel();
endResetModel();
} }
// Get number of frames ==================================================== // Get number of frames ====================================================

4
qatsh/ATSFrameProxyModel.h
View File

@ -8,8 +8,8 @@
#ifndef ATSFRAMEDATAPROXYMODEL_H #ifndef ATSFRAMEDATAPROXYMODEL_H
#define ATSFRAMEDATAPROXYMODEL_H #define ATSFRAMEDATAPROXYMODEL_H
#include <QtGui/QAbstractProxyModel> #include <QAbstractProxyModel>
#include <QtCore/QModelIndex> #include <QModelIndex>
class ATSFrameProxyModel : public QAbstractProxyModel class ATSFrameProxyModel : public QAbstractProxyModel

6
qatsh/ATSModel.cpp
View File

@ -6,7 +6,7 @@
#include <iostream> #include <iostream>
#include <QtCore/QModelIndex> #include <QModelIndex>
#include "ATSModel.h" #include "ATSModel.h"
#include "ATSModelItems.h" #include "ATSModelItems.h"
@ -59,12 +59,14 @@ void ATSModel::reInitialize(EReInitType eReInitType) // Don't call before load()
{ {
case eEverything: case eEverything:
beginResetModel();
if (_pmiRootItem) if (_pmiRootItem)
delete _pmiRootItem; delete _pmiRootItem;
_pmiRootItem = new ATSRootItem(_pATSSound); _pmiRootItem = new ATSRootItem(_pATSSound);
// Warn attached views and proxy models that the whole model has changed. // Warn attached views and proxy models that the whole model has changed.
reset(); endResetModel();
break; break;

2
qatsh/ATSModel.h
View File

@ -7,7 +7,7 @@
#ifndef ATSMODEL_H #ifndef ATSMODEL_H
#define ATSMODEL_H #define ATSMODEL_H
#include <QtCore/QAbstractItemModel> #include <QAbstractItemModel>
class ATSRootItem; class ATSRootItem;
class ATSSound; class ATSSound;

2
qatsh/ATSModelItems.h
View File

@ -11,7 +11,7 @@
#ifndef ATSMODELITEMS_H #ifndef ATSMODELITEMS_H
#define ATSMODELITEMS_H #define ATSMODELITEMS_H
#include <QtCore/QVariant> #include <QVariant>
#include "ATSSound.h" #include "ATSSound.h"

2
qatsh/ATSModelManager.cpp
View File

@ -5,7 +5,7 @@
// //
// QATSH Copyright 2009 Jean-Philippe MEURET <jpmeuret@free.fr> // QATSH Copyright 2009 Jean-Philippe MEURET <jpmeuret@free.fr>
#include <QtGui/QItemSelectionModel> #include <QItemSelectionModel>
#include "ATSModelManager.h" #include "ATSModelManager.h"

2
qatsh/ATSPartialsFrameProxyModel.cpp
View File

@ -7,7 +7,7 @@
#include <iostream> #include <iostream>
#include <QtGui/QItemSelection> #include <QItemSelection>
#include "ATSModelItems.h" #include "ATSModelItems.h"
#include "ATSPartialsProxyModel.h" #include "ATSPartialsProxyModel.h"

2
qatsh/ATSPartialsFrameProxyModel.h
View File

@ -7,7 +7,7 @@
#ifndef ATSPARTIALSFRAMEPROXYMODEL_H #ifndef ATSPARTIALSFRAMEPROXYMODEL_H
#define ATSPARTIALSFRAMEPROXYMODEL_H #define ATSPARTIALSFRAMEPROXYMODEL_H
#include <QtCore/QModelIndex> #include <QModelIndex>
#include "ATSFrameProxyModel.h" #include "ATSFrameProxyModel.h"

15
qatsh/ATSPartialsProxyModel.cpp
View File

@ -8,7 +8,7 @@
#include <iostream> #include <iostream>
#include <QtGui/QItemSelection> #include <QItemSelection>
#include "TypesAndConstants.h" #include "TypesAndConstants.h"
#include "ATSModel.h" #include "ATSModel.h"
@ -205,11 +205,12 @@ void ATSPartialsProxyModel::addPartial(const QModelIndex& qmiToCopy)
ATSModel* pSourceModel = static_cast<ATSModel*>(sourceModel()); ATSModel* pSourceModel = static_cast<ATSModel*>(sourceModel());
pSourceModel->sound()->addPartial(nCopyIndex); pSourceModel->sound()->addPartial(nCopyIndex);
// Re-initialize the dedictated part of the source model. // Re-initialize the dedicated part of the source model.
pSourceModel->reInitialize(ATSModel::ePartialsListOnly); pSourceModel->reInitialize(ATSModel::ePartialsListOnly);
// Warn everyone that the model heavily changed. // Warn everyone that the model heavily changed.
reset(); beginResetModel();
endResetModel();
} }
void ATSPartialsProxyModel::removePartials(const QModelIndexList& qlmiToRemove) void ATSPartialsProxyModel::removePartials(const QModelIndexList& qlmiToRemove)
@ -240,10 +241,11 @@ void ATSPartialsProxyModel::removePartials(const QModelIndexList& qlmiToRemove)
pSourceModel->reInitialize(ATSModel::ePartialsListOnly); pSourceModel->reInitialize(ATSModel::ePartialsListOnly);
// Warn everyone that the model heavily changed. // Warn everyone that the model heavily changed.
reset(); beginResetModel();
endResetModel();
} }
std::string ATSPartialsProxyModel::modifyPartials(const QModelIndexList& qlmiToModify, std::string ATSPartialsProxyModel::modifyPartials(const QModelIndexList& qlmiToModify,
const QString& qsFormula, const QString& qsFormula,
TypesAndConstants::EPartialMagnitude eMagnitude) TypesAndConstants::EPartialMagnitude eMagnitude)
{ {
@ -275,7 +277,8 @@ std::string ATSPartialsProxyModel::modifyPartials(const QModelIndexList& qlmiTo
pSourceModel->reInitialize(ATSModel::ePartialsListOnly); pSourceModel->reInitialize(ATSModel::ePartialsListOnly);
// Warn everyone that the model heavily changed. // Warn everyone that the model heavily changed.
reset(); beginResetModel();
endResetModel();
return strParsedFormula; return strParsedFormula;
} }

4
qatsh/ATSPropertiesProxyModel.h
View File

@ -8,8 +8,8 @@
#ifndef ATSPPROPERTIESPROXYMODEL_H #ifndef ATSPPROPERTIESPROXYMODEL_H
#define ATSPPROPERTIESPROXYMODEL_H #define ATSPPROPERTIESPROXYMODEL_H
#include <QtCore/QModelIndex> #include <QModelIndex>
#include <QtGui/QAbstractProxyModel> #include <QAbstractProxyModel>
class ATSPropertiesProxyModel : public QAbstractProxyModel class ATSPropertiesProxyModel : public QAbstractProxyModel

2
qatsh/ATSResidualsFrameProxyModel.h
View File

@ -8,7 +8,7 @@
#ifndef ATSRESIDUALSFRAMEPROXYMODEL_H #ifndef ATSRESIDUALSFRAMEPROXYMODEL_H
#define ATSRESIDUALSFRAMEPROXYMODEL_H #define ATSRESIDUALSFRAMEPROXYMODEL_H
#include <QtCore/QModelIndex> #include <QModelIndex>
#include "ATSFrameProxyModel.h" #include "ATSFrameProxyModel.h"

2
qatsh/ATSResidualsProxyModel.h
View File

@ -7,7 +7,7 @@
#ifndef ATSRESIDUALSPROXYMODEL_H #ifndef ATSRESIDUALSPROXYMODEL_H
#define ATSRESIDUALSPROXYMODEL_H #define ATSRESIDUALSPROXYMODEL_H
#include <QtCore/QModelIndex> #include <QModelIndex>
#include "ATSDataProxyModel.h" #include "ATSDataProxyModel.h"

4
qatsh/AnalysisParamsDialog.cpp
View File

@ -4,8 +4,8 @@
// //
// QATSH Copyright 2009 Jean-Philippe MEURET <jpmeuret@free.fr> // QATSH Copyright 2009 Jean-Philippe MEURET <jpmeuret@free.fr>
#include <QtGui/QPushButton> #include <QPushButton>
#include <QtGui/QDoubleValidator> #include <QDoubleValidator>
#include "AnalysisParamsDialog.h" #include "AnalysisParamsDialog.h"
#include "ui_AnalysisParamsDialog.h" #include "ui_AnalysisParamsDialog.h"

2
qatsh/AnalysisParamsDialog.h
View File

@ -7,7 +7,7 @@
#ifndef AnalysisParamsDialog_h #ifndef AnalysisParamsDialog_h
#define AnalysisParamsDialog_h #define AnalysisParamsDialog_h
#include <QtGui/QDialog> #include <QDialog>
namespace Ui { namespace Ui {
class AnalysisParamsDialog; class AnalysisParamsDialog;

4
qatsh/AnalysisParamsWidget.cpp
View File

@ -4,8 +4,8 @@
// //
// QATSH Copyright 2009 Jean-Philippe MEURET <jpmeuret@free.fr> // QATSH Copyright 2009 Jean-Philippe MEURET <jpmeuret@free.fr>
#include <QtGui/QPushButton> #include <QPushButton>
#include <QtGui/QDoubleValidator> #include <QDoubleValidator>
#include "AnalysisParamsWidget.h" #include "AnalysisParamsWidget.h"
#include "ui_AnalysisParamsWidget.h" #include "ui_AnalysisParamsWidget.h"

2
qatsh/AnalysisParamsWidget.h
View File

@ -7,7 +7,7 @@
#ifndef AnalysisParamsWidget_h #ifndef AnalysisParamsWidget_h
#define AnalysisParamsWidget_h #define AnalysisParamsWidget_h
#include <QtGui/QWidget> #include <QWidget>
namespace Ui { namespace Ui {
class AnalysisParamsWidget; class AnalysisParamsWidget;

50
qatsh/CMakeLists.txt
View File

@ -6,10 +6,33 @@
message(STATUS "Configuring qatsh ...") message(STATUS "Configuring qatsh ...")
# External dependencies. # External dependencies.
find_package(Qt4 4.4 COMPONENTS QtCore QtGui REQUIRED) # 1) Qt (4 or 5)
include(${QT_USE_FILE}) if(NOT DEFINED OPTION_QT5 OR NOT OPTION_QT5)
set(QT_LIBRARIES ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) # Odd it is needed (CMake 2.8.8) ! SET(OPTION_QT5 Off CACHE BOOL "Check to build with Qt 5 (rather than Qt 4)" FORCE)
endif()
if(NOT OPTION_QT5)
find_package(Qt4 4.4 COMPONENTS QtCore QtGui REQUIRED)
endif()
if(NOT QT4_FOUND)
MESSAGE(STATUS "Qt 4 not found : Trying Qt 5")
SET(OPTION_QT5 On)
endif()
if(OPTION_QT5)
cmake_minimum_required(VERSION 2.8.8)
endif()
if(OPTION_QT5)
#set(CMAKE_AUTOMOC ON)
find_package(Qt5Core REQUIRED)
find_package(Qt5Widgets REQUIRED)
set(QT_LIBRARIES ${Qt5Core_LIBRARIES} ${Qt5Widgets_LIBRARIES})
set(QT_INCLUDES ${Qt5Core_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS})
else()
include(${QT_USE_FILE})
set(QT_LIBRARIES ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) # Odd it is needed (CMake 2.8.8) !
endif()
# 2) LibSndFile
find_package(LibSndFile REQUIRED) find_package(LibSndFile REQUIRED)
# Sources # Sources
@ -139,13 +162,25 @@ set(_UIS MainWindow.ui
set(_RSCS qatsh.qrc) set(_RSCS qatsh.qrc)
# Run moc on header files using Q_OBJECT # Run moc on header files using Q_OBJECT
qt4_wrap_cpp(_MOC_SRCS ${_MOC_HDRS}) if(OPTION_QT5)
qt5_wrap_cpp(_MOC_SRCS ${_MOC_HDRS})
else()
qt4_wrap_cpp(_MOC_SRCS ${_MOC_HDRS})
endif()
# Run uic on .ui files. # Run uic on .ui files.
qt4_wrap_ui(_UI_HDRS ${_UIS}) if(OPTION_QT5)
qt5_wrap_ui(_UI_HDRS ${_UIS})
else()
qt4_wrap_ui(_UI_HDRS ${_UIS})
endif()
# Generate code for resources. # Generate code for resources.
qt4_add_resources(_RCC_SRCS ${_RSCS}) if(OPTION_QT5)
qt5_add_resources(_RCC_SRCS ${_RSCS})
else()
qt4_add_resources(_RCC_SRCS ${_RSCS})
endif()
# Embbed icon in executable. # Embbed icon in executable.
if(MINGW) if(MINGW)
@ -165,6 +200,9 @@ include_directories(${CMAKE_SOURCE_DIR}/mathexpr ${CMAKE_SOURCE_DIR}/atsa
add_executable(qatsh ${_SRCS} ${_MOC_SRCS} ${_MOC_HDRS} ${_HDRS} ${_UI_HDRS} ${_RCC_SRCS}) add_executable(qatsh ${_SRCS} ${_MOC_SRCS} ${_MOC_HDRS} ${_HDRS} ${_UI_HDRS} ${_RCC_SRCS})
# Link libs. # Link libs.
#if(OPTION_QT5)
# qt5_use_modules(qatsh Widgets)
#endif()
target_link_libraries(qatsh atsa mathexpr ${QT_LIBRARIES} ${LIBSNDFILE_LIBRARY}) target_link_libraries(qatsh atsa mathexpr ${QT_LIBRARIES} ${LIBSNDFILE_LIBRARY})
# Installation. # Installation.

4
qatsh/ColorMap.h
View File

@ -7,8 +7,8 @@
#ifndef COLORMAP_H #ifndef COLORMAP_H
#define COLORMAP_H #define COLORMAP_H
#include <QtCore/QList> #include <QList>
#include <QtGui/QColor> #include <QColor>
class ColorMap class ColorMap

52
qatsh/ColorScale.cpp
View File

@ -4,8 +4,8 @@
// //
// QATSH Copyright 2009 Jean-Philippe MEURET <jpmeuret@free.fr> // QATSH Copyright 2009 Jean-Philippe MEURET <jpmeuret@free.fr>
#include <QtGui/QResizeEvent> #include <QResizeEvent>
#include <QtGui/QGraphicsSimpleTextItem> #include <QGraphicsSimpleTextItem>
#include <iostream> #include <iostream>
@ -56,8 +56,6 @@ void ColorScale::redraw()
{ {
//std::cout << "ColorScale::redraw" << std::endl; //std::cout << "ColorScale::redraw" << std::endl;
//setViewportUpdateMode(QGraphicsView::NoViewportUpdate);
double dLabelScaleX = 1.0; double dLabelScaleX = 1.0;
double dLabelScaleY = 1.0; double dLabelScaleY = 1.0;
if (_pqgiMinLabel) if (_pqgiMinLabel)
@ -83,19 +81,15 @@ void ColorScale::redraw()
const QColor& qColor = _pColorMap->color(nColorInd); const QColor& qColor = _pColorMap->color(nColorInd);
QGraphicsRectItem* pgiRect = QGraphicsRectItem* pgiRect =
new QGraphicsRectItem(0.0, 0.0, 24.0, 1.0); new QGraphicsRectItem(0.0, 0.0, 24.0, 1.0);
pgiRect->setPos(0.0, nColors - 1 - nColorInd); pgiRect->setPos(0.0, nColors - 1 - nColorInd);
pgiRect->setPen(QPen(qColor)); pgiRect->setPen(QPen(qColor));
pgiRect->setBrush(QBrush(qColor)); pgiRect->setBrush(QBrush(qColor));
pgiRect->setZValue(-1.0); // Ensure min/max labels not drawn behind this one. pgiRect->setZValue(-1.0); // Ensure min/max labels not drawn behind this one.
pqgvScene->addItem(pgiRect); pqgvScene->addItem(pgiRect);
} }
// Draw min and max value. // Draw min and max values (as fixed size labels).
//QFont qFont("Serif", 8); // Windows OK. QFont qFont("Tahoma", 8); // Note: Serif, Courier, Times, Fixed also OK under Windows.
//QFont qFont("Courier", 8); // Windows OK.
//QFont qFont("Times", 8); // Windows OK.
//QFont qFont("Fixed", 8); // Windows OK.
QFont qFont("Tahoma", 8); // Windows OK.
qFont.setStretch(80); qFont.setStretch(80);
//std::cout << "ColorScale::redraw : Font " << qFont.rawName().toStdString() //std::cout << "ColorScale::redraw : Font " << qFont.rawName().toStdString()
// << ", size pt " << qFont.pointSize() // << ", size pt " << qFont.pointSize()
@ -104,13 +98,10 @@ void ColorScale::redraw()
_pqgiMaxLabel = _pqgiMaxLabel =
new QGraphicsSimpleTextItem(QString("%1").arg(_pColorMap->maxValue(), 0, 'g', 2)); new QGraphicsSimpleTextItem(QString("%1").arg(_pColorMap->maxValue(), 0, 'g', 2));
_pqgiMaxLabel->setPos(1.0, 0.0); _pqgiMaxLabel->setPos(1.0, 0.0);
//QPen qPen; // = _pqgiMaxLabel->pen();
//qPen.setColor(Qt::white);
//qPen.setCosmetic(true);
_pqgiMaxLabel->setPen(QPen(Qt::white)); _pqgiMaxLabel->setPen(QPen(Qt::white));
//_pqgiMaxLabel->setBrush(Qt::white);
_pqgiMaxLabel->setFont(qFont); _pqgiMaxLabel->setFont(qFont);
_pqgiMaxLabel->scale(dLabelScaleX, dLabelScaleY); _pqgiMaxLabel->setTransform(QTransform::fromScale(dLabelScaleX, dLabelScaleY), true);
_pqgiMaxLabel->setFlag(QGraphicsItem::ItemIgnoresTransformations); // Lock size.
pqgvScene->addItem(_pqgiMaxLabel); pqgvScene->addItem(_pqgiMaxLabel);
@ -118,16 +109,13 @@ void ColorScale::redraw()
new QGraphicsSimpleTextItem(QString("%1").arg(_pColorMap->minValue(), 0, 'g', 2)); new QGraphicsSimpleTextItem(QString("%1").arg(_pColorMap->minValue(), 0, 'g', 2));
_pqgiMinLabel->setPos(1.0, nColors - _pqgiMinLabel->sceneBoundingRect().height()); _pqgiMinLabel->setPos(1.0, nColors - _pqgiMinLabel->sceneBoundingRect().height());
_pqgiMinLabel->setPen(QPen(Qt::white)); _pqgiMinLabel->setPen(QPen(Qt::white));
//_pqgiMinLabel->setPen(QColor(0, 0, 0));
//_pqgiMinLabel->setBrush(QBrush(Qt::white));
_pqgiMinLabel->setFont(qFont); _pqgiMinLabel->setFont(qFont);
_pqgiMinLabel->scale(dLabelScaleX, dLabelScaleY); _pqgiMinLabel->setTransform(QTransform::fromScale(dLabelScaleX, dLabelScaleY), true);
_pqgiMinLabel->setFlag(QGraphicsItem::ItemIgnoresTransformations); // Lock size.
pqgvScene->addItem(_pqgiMinLabel); pqgvScene->addItem(_pqgiMinLabel);
QResizeEvent qre(size(), size()); QResizeEvent qre(size(), size());
resizeEvent(&qre); resizeEvent(&qre);
//setViewportUpdateMode(QGraphicsView::SmartViewportUpdate);
} }
@ -136,26 +124,14 @@ void ColorScale::resizeEvent(QResizeEvent *pqEvent)
//std::cout << "ColorScale::resizeEvent(" //std::cout << "ColorScale::resizeEvent("
// << pqEvent->size().width() << "x" << pqEvent->size().height()<< ")"<< std::endl; // << pqEvent->size().width() << "x" << pqEvent->size().height()<< ")"<< std::endl;
// Save previous view scale.
const QTransform qmOldTrans = transform();
// Apply new scale because of resizing. // Apply new scale because of resizing.
QTransform qmNewTrans; setTransform(QTransform::fromScale(pqEvent->size().width() / scene()->sceneRect().width(),
const QRectF sceneRect = scene()->sceneRect(); pqEvent->size().height() / scene()->sceneRect().height()));
qmNewTrans.scale(pqEvent->size().width() / sceneRect.width(),
pqEvent->size().height() / sceneRect.height());
setTransform(qmNewTrans);
// Apply inverted scale to the labels (we don't want they change their size). // Keep min. value label at the bottom (as if it was ignoring the scaling).
// TODO: Remove this awful trick and use QGraphicsItem::ItemIgnoresTransformations
// when creating the labels.
_pqgiMinLabel->scale(qmOldTrans.m11() / qmNewTrans.m11(),
qmOldTrans.m22() / qmNewTrans.m22());
_pqgiMinLabel->setPos(1.0, _pColorMap->nbColors() _pqgiMinLabel->setPos(1.0, _pColorMap->nbColors()
- _pqgiMinLabel->sceneBoundingRect().height()); - _pqgiMinLabel->boundingRect().height());
_pqgiMaxLabel->scale(qmOldTrans.m11() / qmNewTrans.m11(),
qmOldTrans.m22() / qmNewTrans.m22());
//QTransform qtLabelTrans = _pqgiMinLabel->transform(); //QTransform qtLabelTrans = _pqgiMinLabel->transform();
//std::cout << "ColorScale::resizeEvent : Label trans m11=" //std::cout << "ColorScale::resizeEvent : Label trans m11="
// << qtLabelTrans.m11() << ", m22=" << qtLabelTrans.m22() << std::endl; // << qtLabelTrans.m11() << ", m22=" << qtLabelTrans.m22() << std::endl;

2
qatsh/ColorScale.h
View File

@ -7,7 +7,7 @@
#ifndef COLORSCALE_H #ifndef COLORSCALE_H
#define COLORSCALE_H #define COLORSCALE_H
#include <QtGui/QGraphicsView> #include <QGraphicsView>
class QGraphicsSimpleTextItem; class QGraphicsSimpleTextItem;
class ColorMap; class ColorMap;

2
qatsh/DataSelectionWidget.h
View File

@ -7,7 +7,7 @@
#ifndef DataSelectionWidget_h #ifndef DataSelectionWidget_h
#define DataSelectionWidget_h #define DataSelectionWidget_h
#include <QtGui/QWidget> #include <QWidget>
#include "TypesAndConstants.h" #include "TypesAndConstants.h"

14
qatsh/DocumentWindow.cpp
View File

@ -12,17 +12,17 @@
#include <iostream> #include <iostream>
#include <vector> #include <vector>
#include <QtCore/QSettings> #include <QSettings>
#include <QtGui/QItemSelection> #include <QItemSelection>
#include <QtGui/QItemSelectionModel> #include <QItemSelectionModel>
#include <QtGui/QMessageBox> #include <QMessageBox>
#ifdef PHONON_AUDIO #ifdef PHONON_AUDIO
#include <Phonon/MediaObject> #include <Phonon/MediaObject>
#include <Phonon/MediaSource> #include <Phonon/MediaSource>
#else #else
#include <QtCore/QProcess> #include <QProcess>
#endif #endif
#include "TypesAndConstants.h" #include "TypesAndConstants.h"
@ -276,12 +276,12 @@ bool DocumentWindow::synthesiseFile(const QString &qsFileName,
{ {
// Save the sampled sound to the given file. // Save the sampled sound to the given file.
// TODO: Customizable sample format. // TODO: Customizable sample format.
bDone = pSampSound->store(qsFileName.toAscii(), eFormat); bDone = pSampSound->store(qsFileName.toStdString().c_str(), eFormat);
// Free now useless sampled sound. // Free now useless sampled sound.
delete pSampSound; delete pSampSound;
// Save a copy of the synthesis inputs for later. // Save a copy of the synthesis inputs for later.
_qsLastSyntResFileName = qsFileName; _qsLastSyntResFileName = qsFileName;
if (!_pLastSyntParams) if (!_pLastSyntParams)
_pLastSyntParams = new ATSSynthesis(); _pLastSyntParams = new ATSSynthesis();

4
qatsh/DocumentWindow.h
View File

@ -14,8 +14,8 @@
#include <vector> #include <vector>
#include <QtCore/QString> #include <QString>
#include <QtGui/QWidget> #include <QWidget>
#include "SampledSound.h" #include "SampledSound.h"

2
qatsh/FilePropertiesDialog.cpp
View File

@ -4,7 +4,7 @@
// //
// QATSH Copyright 2009 Jean-Philippe MEURET <jpmeuret@free.fr> // QATSH Copyright 2009 Jean-Philippe MEURET <jpmeuret@free.fr>
#include <QtCore/QModelIndex> #include <QModelIndex>
#include "ATSModelItems.h" #include "ATSModelItems.h"
#include "ATSPropertiesProxyModel.h" #include "ATSPropertiesProxyModel.h"

2
qatsh/FilePropertiesDialog.h
View File

@ -7,7 +7,7 @@
#ifndef FilePropertiesDialog_h #ifndef FilePropertiesDialog_h
#define FilePropertiesDialog_h #define FilePropertiesDialog_h
#include <QtGui/QDialog> #include <QDialog>
class QModelIndex; class QModelIndex;

2
qatsh/FilePropertiesView.cpp
View File

@ -8,7 +8,7 @@
#include "ui_FilePropertiesView.h" #include "ui_FilePropertiesView.h"
#include <QtCore/QModelIndex> #include <QModelIndex>
#include "ATSModelItems.h" #include "ATSModelItems.h"
#include "ATSModel.h" #include "ATSModel.h"

2
qatsh/FilePropertiesView.h
View File

@ -7,7 +7,7 @@
#ifndef FilePropertiesView_h #ifndef FilePropertiesView_h
#define FilePropertiesView_h #define FilePropertiesView_h
#include <QtGui/QWidget> #include <QWidget>
class QModelIndex; class QModelIndex;

10
qatsh/FrameAndDataEditionWidget.cpp
View File

@ -6,11 +6,11 @@
#include <iostream> #include <iostream>
#include <QtCore/QSettings> #include <QSettings>
#include <QtGui/QApplication> #include <QApplication>
#include <QtGui/QMessageBox> #include <QMessageBox>
#include <QtGui/QItemSelection> #include <QItemSelection>
#include <QtGui/QItemSelectionModel> #include <QItemSelectionModel>
#include "FrameAndDataEditionWidget.h" #include "FrameAndDataEditionWidget.h"
#include "ui_FrameAndDataEditionWidget.h" #include "ui_FrameAndDataEditionWidget.h"

2
qatsh/FrameAndDataEditionWidget.h
View File

@ -7,7 +7,7 @@
#ifndef FrameAndDataEditionWidget_h #ifndef FrameAndDataEditionWidget_h
#define FrameAndDataEditionWidget_h #define FrameAndDataEditionWidget_h
#include <QtGui/QWidget> #include <QWidget>
#include "TypesAndConstants.h" #include "TypesAndConstants.h"

2
qatsh/FrameSelectionWidget.h
View File

@ -7,7 +7,7 @@
#ifndef FrameSelectionWidget_h #ifndef FrameSelectionWidget_h
#define FrameSelectionWidget_h #define FrameSelectionWidget_h
#include <QtGui/QWidget> #include <QWidget>
#include "TypesAndConstants.h" #include "TypesAndConstants.h"

2
qatsh/IATSAnalysis.h
View File

@ -7,7 +7,7 @@
#ifndef IATSANALYSIS_H #ifndef IATSANALYSIS_H
#define IATSANALYSIS_H #define IATSANALYSIS_H
#include <QtCore/QString> #include <QString>
class SampledSound; class SampledSound;
class ATSSound; class ATSSound;

2
qatsh/Main.cpp
View File

@ -9,7 +9,7 @@
// Copyright 2009 Jean-Philippe MEURET <jpmeuret@free.fr> // Copyright 2009 Jean-Philippe MEURET <jpmeuret@free.fr>
#include <QtGui/QApplication> #include <QApplication>
#include "MainWindow.h" #include "MainWindow.h"
#include "PreferencesDialog.h" #include "PreferencesDialog.h"

14
qatsh/MainWindow.cpp
View File

@ -4,14 +4,14 @@
#include <iostream> #include <iostream>
#include <QtCore/QSettings> #include <QSettings>
#include <QtCore/QFileInfo> #include <QFileInfo>
#include <QtCore/QModelIndex> #include <QModelIndex>
#include <QtGui/QCloseEvent> #include <QCloseEvent>
#include <QtGui/QVBoxLayout> #include <QVBoxLayout>
#include <QtGui/QMessageBox> #include <QMessageBox>
#include <QtGui/QFileDialog> #include <QFileDialog>
#include "IATSAnalysis.h" #include "IATSAnalysis.h"
#include "DocumentWindow.h" #include "DocumentWindow.h"

4
qatsh/MainWindow.h
View File

@ -5,8 +5,8 @@
#ifndef MainWindow_h #ifndef MainWindow_h
#define MainWindow_h #define MainWindow_h
#include <QtCore/QString> #include <QString>
#include <QtGui/QMainWindow> #include <QMainWindow>
#include "DocumentWindow.h" #include "DocumentWindow.h"

15
qatsh/PartialsFrameTableView.cpp
View File

@ -7,9 +7,9 @@
#include <iostream> #include <iostream>
#include "ATSMath.h" #include "ATSMath.h"
#include <QtGui/QHeaderView> #include <QHeaderView>
#include <QtGui/QItemSelection> #include <QItemSelection>
#include <QtGui/QItemSelectionModel> #include <QItemSelectionModel>
#include "ATSModelItems.h" #include "ATSModelItems.h"
#include "ATSModelManager.h" #include "ATSModelManager.h"
@ -26,9 +26,12 @@ PartialsFrameTableView::PartialsFrameTableView(QWidget *parent)
: QFrame(parent), _pui(new Ui::PartialsFrameTableView), _pModelMgr(0) : QFrame(parent), _pui(new Ui::PartialsFrameTableView), _pModelMgr(0)
{ {
_pui->setupUi(this); _pui->setupUi(this);
#if (QT_VERSION >= QT_VERSION_CHECK(5,0,0))
_pui->qtvPartials->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
#else
_pui->qtvPartials->horizontalHeader()->setResizeMode(QHeaderView::Stretch); _pui->qtvPartials->horizontalHeader()->setResizeMode(QHeaderView::Stretch);
#endif
// Enable control value synchronization // Enable control value synchronization
_bSynchronizeControls = true; _bSynchronizeControls = true;
} }
@ -53,7 +56,7 @@ void PartialsFrameTableView::setModelManager(ATSModelManager* pModelMgr)
const QItemSelection&)), const QItemSelection&)),
this, SLOT(onSelectionChanged(const QItemSelection&, const QItemSelection&))); this, SLOT(onSelectionChanged(const QItemSelection&, const QItemSelection&)));
std::cout << "PartialsFrameTableView::setModelManager" << std::endl; //std::cout << "PartialsFrameTableView::setModelManager" << std::endl;
_nMaxFrameIndex = _pModelMgr->partialsFrameModel()->nbFrames() - 1; _nMaxFrameIndex = _pModelMgr->partialsFrameModel()->nbFrames() - 1;
_dFrameDuration = _pModelMgr->partialsFrameModel()->frameDuration(); _dFrameDuration = _pModelMgr->partialsFrameModel()->frameDuration();

2
qatsh/PartialsFrameTableView.h
View File

@ -7,7 +7,7 @@
#ifndef PartialsFrameTableView_h #ifndef PartialsFrameTableView_h
#define PartialsFrameTableView_h #define PartialsFrameTableView_h
#include <QtGui/QFrame> #include <QFrame>
namespace Ui { namespace Ui {
class PartialsFrameTableView; class PartialsFrameTableView;

6
qatsh/PartialsSpecgramGraphicsFrameItem.cpp
View File

@ -6,9 +6,9 @@
#include <iostream> #include <iostream>
#include <QtGui/QItemSelectionModel> #include <QItemSelectionModel>
#include <QtGui/QPen> #include <QPen>
#include <QtGui/QGraphicsSceneHoverEvent> #include <QGraphicsSceneHoverEvent>
#include "ColorMap.h" #include "ColorMap.h"
#include "PartialsSpecgramGraphicsScene.h" #include "PartialsSpecgramGraphicsScene.h"

2
qatsh/PartialsSpecgramGraphicsFrameItem.h
View File

@ -7,7 +7,7 @@
#ifndef PartialsSpecgramGraphicsFrameItem_H #ifndef PartialsSpecgramGraphicsFrameItem_H
#define PartialsSpecgramGraphicsFrameItem_H #define PartialsSpecgramGraphicsFrameItem_H
#include <QtGui/QGraphicsLineItem> #include <QGraphicsLineItem>
class ColorMap; class ColorMap;
class QGraphicsSceneHoverEvent; class QGraphicsSceneHoverEvent;

16
qatsh/PartialsSpecgramGraphicsScene.cpp
View File

@ -7,15 +7,15 @@
#include <limits> #include <limits>
#include <iostream> #include <iostream>
#include <QtCore/QObject> #include <QObject>
#include <QtCore/QList> #include <QList>
#include <QtCore/QRectF> #include <QRectF>
#include <QtCore/QModelIndex> #include <QModelIndex>
#include <QtGui/QPen> #include <QPen>
#include <QtGui/QGraphicsView> #include <QGraphicsView>
#include <QtGui/QGraphicsItemGroup> #include <QGraphicsItemGroup>
#include <QtGui/QItemSelection> #include <QItemSelection>
#include "ATSMath.h" #include "ATSMath.h"

6
qatsh/PartialsSpecgramGraphicsScene.h
View File

@ -7,9 +7,9 @@
#ifndef PartialsSpecgramGraphicsScene_H #ifndef PartialsSpecgramGraphicsScene_H
#define PartialsSpecgramGraphicsScene_H #define PartialsSpecgramGraphicsScene_H
#include <QtCore/QVector> #include <QVector>
#include <QtGui/QItemSelectionModel> #include <QItemSelectionModel>
#include <QtGui/QGraphicsScene> #include <QGraphicsScene>
#include "ColorMap.h" #include "ColorMap.h"
#include "RulerSpec.h" #include "RulerSpec.h"

18
qatsh/PartialsSpecgramGraphicsView.cpp
View File

@ -4,11 +4,11 @@
// //
// QATSH Copyright 2009 Jean-Philippe MEURET <jpmeuret@free.fr> // QATSH Copyright 2009 Jean-Philippe MEURET <jpmeuret@free.fr>
#include <QtCore/QRectF> #include <QRectF>
#include <QtGui/QBrush> #include <QBrush>
#include <QtGui/QResizeEvent> #include <QResizeEvent>
#include <QtGui/QWheelEvent> #include <QWheelEvent>
#include <QtGui/QKeyEvent> #include <QKeyEvent>
// #ifndef QT_NO_OPENGL // #ifndef QT_NO_OPENGL
// # include <QtOpenGL/QGLWidget> // # include <QtOpenGL/QGLWidget>
@ -109,8 +109,8 @@ void PartialsSpecgramGraphicsView::zoomShiftTime(double dAbsFactor, double dAbsS
if (!_bInitialized) if (!_bInitialized)
return; return;
std::cout << "PartialsSpecgramGraphicsView::zoomShiftTime(factor=" //std::cout << "PartialsSpecgramGraphicsView::zoomShiftTime(factor="
<< dAbsFactor << ", shiftVal=" << dAbsShiftValue << ") : newTrans=..." << std::endl; // << dAbsFactor << ", shiftVal=" << dAbsShiftValue << ") : newTrans=..." << std::endl;
// Build new view transform. // Build new view transform.
const QTransform qOldTrans = transform(); const QTransform qOldTrans = transform();
@ -129,8 +129,8 @@ void PartialsSpecgramGraphicsView::zoomShiftFrequency(double dAbsFactor, double
if (!_bInitialized) if (!_bInitialized)
return; return;
std::cout << "PartialsSpecgramGraphicsView::zoomShiftFreq(factor=" //std::cout << "PartialsSpecgramGraphicsView::zoomShiftFreq(factor="
<< dAbsFactor << ", shiftVal=" << dAbsShiftValue << ") : newTrans=..." << std::endl; // << dAbsFactor << ", shiftVal=" << dAbsShiftValue << ") : newTrans=..." << std::endl;
// Build new view transform. // Build new view transform.
const QTransform qOldTrans = transform(); const QTransform qOldTrans = transform();

2
qatsh/PartialsSpecgramGraphicsView.h
View File

@ -7,7 +7,7 @@
#ifndef PARTIALSSPECTRUMGRAPHICSVIEW_H #ifndef PARTIALSSPECTRUMGRAPHICSVIEW_H
#define PARTIALSSPECTRUMGRAPHICSVIEW_H #define PARTIALSSPECTRUMGRAPHICSVIEW_H
#include <QtGui/QGraphicsView> #include <QGraphicsView>
class ATSModelManager; class ATSModelManager;
class ColorMap; class ColorMap;

2
qatsh/PartialsSpecgramWidget.h
View File

@ -9,7 +9,7 @@
#ifndef PartialsSpecgramWidget_h #ifndef PartialsSpecgramWidget_h
#define PartialsSpecgramWidget_h #define PartialsSpecgramWidget_h
#include <QtGui/QWidget> #include <QWidget>
namespace Ui { namespace Ui {
class PartialsSpecgramWidget; class PartialsSpecgramWidget;

4
qatsh/PreferencesDialog.cpp
View File

@ -4,8 +4,8 @@
// //
// QATSH Copyright 2009 Jean-Philippe MEURET <jpmeuret@free.fr> // QATSH Copyright 2009 Jean-Philippe MEURET <jpmeuret@free.fr>
#include <QtCore/QSettings> #include <QSettings>
#include <QtGui/QPushButton> #include <QPushButton>
#include "PreferencesDialog.h" #include "PreferencesDialog.h"
#include "ui_PreferencesDialog.h" #include "ui_PreferencesDialog.h"

2
qatsh/PreferencesDialog.h
View File

@ -7,7 +7,7 @@
#ifndef PreferencesDialog_h #ifndef PreferencesDialog_h
#define PreferencesDialog_h #define PreferencesDialog_h
#include <QtGui/QDialog> #include <QDialog>
namespace Ui { namespace Ui {
class PreferencesDialog; class PreferencesDialog;

10
qatsh/ResidualsFrameTableView.cpp
View File

@ -6,9 +6,9 @@
#include <iostream> #include <iostream>
#include <QtGui/QHeaderView> #include <QHeaderView>
#include <QtGui/QItemSelection> #include <QItemSelection>
#include <QtGui/QItemSelectionModel> #include <QItemSelectionModel>
#include "ATSMath.h" #include "ATSMath.h"
#include "ATSModelManager.h" #include "ATSModelManager.h"
@ -24,7 +24,11 @@ ResidualsFrameTableView::ResidualsFrameTableView(QWidget *parent)
{ {
_pui->setupUi(this); _pui->setupUi(this);
#if (QT_VERSION >= QT_VERSION_CHECK(5,0,0))
_pui->qtvResiduals->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
#else
_pui->qtvResiduals->horizontalHeader()->setResizeMode(QHeaderView::Stretch); _pui->qtvResiduals->horizontalHeader()->setResizeMode(QHeaderView::Stretch);
#endif
// Enable control value synchronization // Enable control value synchronization
_bSynchronizeControls = true; _bSynchronizeControls = true;

2
qatsh/ResidualsFrameTableView.h
View File

@ -7,7 +7,7 @@
#ifndef ResidualsFrameTableView_h #ifndef ResidualsFrameTableView_h
#define ResidualsFrameTableView_h #define ResidualsFrameTableView_h
#include <QtGui/QFrame> #include <QFrame>
namespace Ui { namespace Ui {
class ResidualsFrameTableView; class ResidualsFrameTableView;

16
qatsh/ResidualsSpecgramGraphicsScene.cpp
View File

@ -6,15 +6,15 @@
#include <iostream> #include <iostream>
#include <QtCore/QObject> #include <QObject>
#include <QtCore/QList> #include <QList>
#include <QtCore/QRectF> #include <QRectF>
#include <QtCore/QModelIndex> #include <QModelIndex>
#include <QtGui/QPen> #include <QPen>
#include <QtGui/QGraphicsView> #include <QGraphicsView>
#include <QtGui/QGraphicsRectItem> #include <QGraphicsRectItem>
#include <QtGui/QGraphicsItemGroup> #include <QGraphicsItemGroup>
#include "ATSMath.h" #include "ATSMath.h"

2
qatsh/ResidualsSpecgramGraphicsScene.h
View File

@ -7,7 +7,7 @@
#ifndef RESIDUALSSPECTRUMGRAPHICSSCENE_H #ifndef RESIDUALSSPECTRUMGRAPHICSSCENE_H
#define RESIDUALSSPECTRUMGRAPHICSSCENE_H #define RESIDUALSSPECTRUMGRAPHICSSCENE_H
#include <QtGui/QGraphicsScene> #include <QGraphicsScene>
#include "ColorMap.h" #include "ColorMap.h"
#include "RulerSpec.h" #include "RulerSpec.h"

10
qatsh/ResidualsSpecgramGraphicsView.cpp
View File

@ -4,11 +4,11 @@
// //
// QATSH Copyright 2009 Jean-Philippe MEURET <jpmeuret@free.fr> // QATSH Copyright 2009 Jean-Philippe MEURET <jpmeuret@free.fr>
#include <QtCore/QRectF> #include <QRectF>
#include <QtGui/QBrush> #include <QBrush>
#include <QtGui/QResizeEvent> #include <QResizeEvent>
#include <QtGui/QWheelEvent> #include <QWheelEvent>
#include <QtGui/QKeyEvent> #include <QKeyEvent>
// #ifndef QT_NO_OPENGL // #ifndef QT_NO_OPENGL
// # include <QtOpenGL/QGLWidget> // # include <QtOpenGL/QGLWidget>

2
qatsh/ResidualsSpecgramGraphicsView.h
View File

@ -7,7 +7,7 @@
#ifndef RESIDUALSSPECGRAMGRAPHICSVIEW_H #ifndef RESIDUALSSPECGRAMGRAPHICSVIEW_H
#define RESIDUALSSPECGRAMGRAPHICSVIEW_H #define RESIDUALSSPECGRAMGRAPHICSVIEW_H
#include <QtGui/QGraphicsView> #include <QGraphicsView>
class ATSModelManager; class ATSModelManager;
class ColorMap; class ColorMap;

2
qatsh/ResidualsSpecgramWidget.h
View File

@ -9,7 +9,7 @@
#ifndef ResidualsSpecgramWidget_h #ifndef ResidualsSpecgramWidget_h
#define ResidualsSpecgramWidget_h #define ResidualsSpecgramWidget_h
#include <QtGui/QWidget> #include <QWidget>
namespace Ui { namespace Ui {
class ResidualsSpecgramWidget; class ResidualsSpecgramWidget;

10
qatsh/Ruler.cpp
View File

@ -6,11 +6,11 @@
#include <iostream> #include <iostream>
#include <QtGui/QPainter> #include <QPainter>
#include <QtGui/QPalette> #include <QPalette>
#include <QtGui/QFontMetrics> #include <QFontMetrics>
#include <QtGui/QResizeEvent> #include <QResizeEvent>
#include <QtGui/QWheelEvent> #include <QWheelEvent>
#include "ATSMath.h" #include "ATSMath.h"
#include "Ruler.h" #include "Ruler.h"

2
qatsh/Ruler.h
View File

@ -7,7 +7,7 @@
#ifndef RULER_H #ifndef RULER_H
#define RULER_H #define RULER_H
#include <QtGui/QWidget> #include <QWidget>
class RulerSpec; class RulerSpec;

4
qatsh/RulerSpec.h
View File

@ -7,8 +7,8 @@
#ifndef RULERSPEC_H #ifndef RULERSPEC_H
#define RULERSPEC_H #define RULERSPEC_H
#include <QtCore/Qt> #include <Qt>
#include <QtCore/QList> #include <QList>
class RulerSpec class RulerSpec

6
qatsh/SynthesisParamsWidget.cpp
View File

@ -4,8 +4,8 @@
// //
// QATSH Copyright 2009 Jean-Philippe MEURET <jpmeuret@free.fr> // QATSH Copyright 2009 Jean-Philippe MEURET <jpmeuret@free.fr>
#include <QtGui/QPushButton> #include <QPushButton>
#include <QtGui/QDoubleValidator> #include <QDoubleValidator>
#include "SynthesisParamsWidget.h" #include "SynthesisParamsWidget.h"
#include "ui_SynthesisParamsWidget.h" #include "ui_SynthesisParamsWidget.h"
@ -75,7 +75,7 @@ void SynthesisParamsWidget::setMaxDuration(double dMaxDuration)
void SynthesisParamsWidget::setupSynthesis() void SynthesisParamsWidget::setupSynthesis()
{ {
if (!_pSynthesis) if (!_pSynthesis)
_pSynthesis = new ATSSynthesis(); _pSynthesis = new ATSSynthesis();
_pSynthesis->setStartTime(_pui->qsbStartTime->value()); _pSynthesis->setStartTime(_pui->qsbStartTime->value());
_pSynthesis->setDuration(_pui->qsbDuration->value()); _pSynthesis->setDuration(_pui->qsbDuration->value());

2
qatsh/SynthesisParamsWidget.h
View File

@ -7,7 +7,7 @@
#ifndef SynthesisParamsWidget_h #ifndef SynthesisParamsWidget_h
#define SynthesisParamsWidget_h #define SynthesisParamsWidget_h
#include <QtGui/QWidget> #include <QWidget>
namespace Ui { namespace Ui {
class SynthesisParamsWidget; class SynthesisParamsWidget;

8
qatsh/TableAndToolsWidget.cpp
View File

@ -10,10 +10,10 @@
#include <iostream> #include <iostream>
#include <QtCore/QDir> #include <QDir>
#include <QtGui/QHeaderView> #include <QHeaderView>
#include <QtGui/QPushButton> #include <QPushButton>
#include <QtGui/QFileDialog> #include <QFileDialog>
#include "TableAndToolsWidget.h" #include "TableAndToolsWidget.h"
#include "ui_TableAndToolsWidget.h" #include "ui_TableAndToolsWidget.h"

2
qatsh/TableAndToolsWidget.h
View File

@ -11,7 +11,7 @@
#ifndef TableAndToolsWidget_h #ifndef TableAndToolsWidget_h
#define TableAndToolsWidget_h #define TableAndToolsWidget_h
#include <QtGui/QWidget> #include <QWidget>
#include "TypesAndConstants.h" #include "TypesAndConstants.h"