Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cue colors #992

Merged
merged 57 commits into from
Aug 27, 2016
Merged
Changes from 1 commit
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
1aeb8b7
Modify Cue for cue point colors.
ferranpujolcamins Aug 14, 2016
0d67283
Modify database shcema to support cue colors.
ferranpujolcamins Aug 14, 2016
b7e864d
Modify Cue constructor to get cue color.
ferranpujolcamins Aug 14, 2016
f2d0cfa
Implement Cue::getColor() and Cue::setColor(...)
ferranpujolcamins Aug 14, 2016
b78cd5d
Modify CueDAO to support cue colors
ferranpujolcamins Aug 14, 2016
ac14bde
Update requiredSchemVersion
ferranpujolcamins Aug 14, 2016
1065e48
Tabs for spaces
ferranpujolcamins Aug 14, 2016
c68086b
Hotcues now display their label in the waveform.
ferranpujolcamins Jan 16, 2015
fbcc455
Make waveformmarks be rendered with the color stored in Cue
ferranpujolcamins Aug 14, 2016
07997b7
Use QColor for defaultColor constant and enclose it in a namespace.
ferranpujolcamins Aug 17, 2016
ac06fc1
Explicitly check for uninitialized mark values in slotCuesUpdated()
ferranpujolcamins Aug 17, 2016
48eed12
Improve coding style
ferranpujolcamins Aug 17, 2016
168859b
Add debug asserts for valid parameter to getHotCueMark
ferranpujolcamins Aug 17, 2016
9895b87
Enclose iMaxCueLabelLenght in a namespace
ferranpujolcamins Aug 17, 2016
5b1dfea
Refactor Cues enumeration with a for each loop in slotCuesUpdated
ferranpujolcamins Aug 17, 2016
a0229f7
Fix empty string check in WaveformRenderMark
ferranpujolcamins Aug 17, 2016
fb939de
Change cue color database type to integer (QRgb)
ferranpujolcamins Aug 17, 2016
e977942
Rename constants
ferranpujolcamins Aug 17, 2016
c1aec44
Change references for pointers.
ferranpujolcamins Aug 18, 2016
9f7230d
Replace WaveformMark CO normal pointer by a unique_ptr
ferranpujolcamins Aug 18, 2016
683638d
Make WaveformMarkSet store mark pointer instead of marks
ferranpujolcamins Aug 18, 2016
e4b585c
Fix make_unique template inference
ferranpujolcamins Aug 18, 2016
4503e06
Fix make_unique template inference
ferranpujolcamins Aug 18, 2016
3edd680
Fix WaveformMarkSet access to WaveformMarks pointers
ferranpujolcamins Aug 18, 2016
ae5b59e
Make m_defaultMark a pointer
ferranpujolcamins Aug 18, 2016
e0bfdfd
Convert m_defaultMark to a unique_ptr
ferranpujolcamins Aug 18, 2016
bd49637
Rename m_pointCos to m_pPointCos
ferranpujolcamins Aug 18, 2016
22b0587
Typo
ferranpujolcamins Aug 18, 2016
67414df
Fix getDefaultMark
ferranpujolcamins Aug 18, 2016
4e24c09
Add clone constructor to WaveformMark
ferranpujolcamins Aug 18, 2016
deba2ae
Provide proper setter for hot cue marks in WaveformMarkSet
ferranpujolcamins Aug 18, 2016
1f1b107
Fix last hotcue not rendered
ferranpujolcamins Aug 19, 2016
cf6bfc4
Fix wrong hotcue number rendered
ferranpujolcamins Aug 19, 2016
7be5597
Remove unused getDefaultMark() from WaveformMarkSet
ferranpujolcamins Aug 19, 2016
58405ee
Add WaveformMarkPreferences class
ferranpujolcamins Aug 21, 2016
30dd1bb
Simplify WaveformMark and make it use WaveformMarkProperties
ferranpujolcamins Aug 21, 2016
da6b9d9
Adapt WaveformMarkSet to WaveformMarkProperties
ferranpujolcamins Aug 21, 2016
db9b553
Adapt renderer and overview to WaveformMarkProperties
ferranpujolcamins Aug 21, 2016
2f8863b
Fix cue mark label rectangle too small for long label
ferranpujolcamins Aug 21, 2016
1d8ef77
Rename WaveformMarkSet::m_pDefaultMark to m_defaultMark
ferranpujolcamins Aug 21, 2016
74bb3bc
Remove explicit WaveformMark constructor
ferranpujolcamins Aug 21, 2016
f3f92c2
Rename WaveformMark:properties() to getProperties()
ferranpujolcamins Aug 21, 2016
f05d1b2
Improve WaveformMarkSet::setup code
ferranpujolcamins Aug 21, 2016
3c4f6da
Make WaveformProperties final.
ferranpujolcamins Aug 21, 2016
360467f
Move hotcue property to WaveformMark
ferranpujolcamins Aug 21, 2016
09a501a
Move setter/getter definition to .h
ferranpujolcamins Aug 21, 2016
a89470c
Add hotCue constructor to Waveformmark
ferranpujolcamins Aug 21, 2016
4ef4cae
Remove redundant type conv. and move operator[] impl. to.h
ferranpujolcamins Aug 21, 2016
6eeea37
Fix missing include
ferranpujolcamins Aug 21, 2016
2859e50
Make WaveformMarkSet getter methods const.
ferranpujolcamins Aug 21, 2016
030c904
Replace QSharedPointer::data() by a const ref
ferranpujolcamins Aug 21, 2016
7c7dea9
Improve WaveformMarkSet::setup code
ferranpujolcamins Aug 21, 2016
b682f11
Introduce WaveformmarkPointer
ferranpujolcamins Aug 21, 2016
6f5770f
Change parameter naming
ferranpujolcamins Aug 21, 2016
10e5ef8
Rewrite cue default color in database schema to decimal
ferranpujolcamins Aug 21, 2016
5b2fb04
Add comment for cue color in database scheme
ferranpujolcamins Aug 21, 2016
fd9b4a5
Merge branch 'master' into CueColors
ferranpujolcamins Aug 27, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions src/waveform/renderers/waveformmarkproperties.cpp
Original file line number Diff line number Diff line change
@@ -8,10 +8,6 @@ WaveformMarkProperties::WaveformMarkProperties()
: m_iHotCue(-1) {
}

WaveformMarkProperties::~WaveformMarkProperties() {
}


WaveformMarkProperties::WaveformMarkProperties(const QDomNode& node,
const SkinContext& context,
const WaveformSignalColors& signalColors)
3 changes: 1 addition & 2 deletions src/waveform/renderers/waveformmarkproperties.h
Original file line number Diff line number Diff line change
@@ -7,13 +7,12 @@
class SkinContext;
class WaveformSignalColors;

class WaveformMarkProperties {
class WaveformMarkProperties final {
public:
WaveformMarkProperties();
WaveformMarkProperties(const QDomNode& node,
const SkinContext& context,
const WaveformSignalColors& signalColors);
virtual ~WaveformMarkProperties();

QColor m_color;
QColor m_textColor;