On Tuesday 08 May 2007 23:06, Chris Cannam wrote:
> Unless someone else disagrees with us (that the halo is the best
> option), then I think yes. If you can make the patch against the new
> trunk that would be simplest.
Here it is.
Yves
diff -Naur rg-s95.initial/src/gui/configuration/NotationConfigurationPage.cpp rg-s95.modif/src/gui/configuration/NotationConfigurationPage.cpp
--- rg-s95.initial/src/gui/configuration/NotationConfigurationPage.cpp 2007-05-09 18:23:37.000000000 +0200
+++ rg-s95.modif/src/gui/configuration/NotationConfigurationPage.cpp 2007-05-09 21:38:08.000000000 +0200
@@ -296,20 +296,12 @@
m_showRanges->setChecked(defaultShowRanges);
layout->addWidget(m_showRanges, 6, 1);
- layout->addWidget(new QLabel(
- i18n("Show superimposed notes"), frame), 7, 0);
- m_showCollisions = new KComboBox(frame);
- m_showCollisions->setEditable(false);
- m_showCollisions->insertItem(i18n("As normal single notes"));
- m_showCollisions->insertItem(i18n("In a different color"));
- m_showCollisions->insertItem(i18n("High-lit with a halo effect"));
- int defaultShowCollisions = m_cfg->readNumEntry("showcollisions", 2);
- if (defaultShowCollisions >= 0 && defaultShowCollisions <= 2) {
- m_showCollisions->setCurrentItem(defaultShowCollisions);
- }
+ m_showCollisions = new QCheckBox
+ (i18n("High-lit superimposed notes with a halo effect"), frame);
+ bool defaultShowCollisions = m_cfg->readBoolEntry("showcollisions", true);
+ m_showCollisions->setChecked(defaultShowCollisions);
layout->addWidget(m_showCollisions, 7, 1);
-
addTab(frame, i18n("Layout"));
@@ -604,7 +596,7 @@
m_cfg->writeEntry("showunknowns", m_showUnknowns->isChecked());
m_cfg->writeEntry("showinvisibles", m_showInvisibles->isChecked());
m_cfg->writeEntry("showranges", m_showRanges->isChecked());
- m_cfg->writeEntry("showcollisions", m_showCollisions->currentItem());
+ m_cfg->writeEntry("showcollisions", m_showCollisions->isChecked());
m_cfg->writeEntry("style", m_untranslatedNoteStyle[m_noteStyle->currentItem()]);
m_cfg->writeEntry("inserttype", m_insertType->currentItem());
m_cfg->writeEntry("autobeam", m_autoBeam->isChecked());
diff -Naur rg-s95.initial/src/gui/configuration/NotationConfigurationPage.h rg-s95.modif/src/gui/configuration/NotationConfigurationPage.h
--- rg-s95.initial/src/gui/configuration/NotationConfigurationPage.h 2007-05-09 18:23:37.000000000 +0200
+++ rg-s95.modif/src/gui/configuration/NotationConfigurationPage.h 2007-05-09 21:38:40.000000000 +0200
@@ -93,7 +93,7 @@
QCheckBox *m_showUnknowns;
QCheckBox *m_showInvisibles;
QCheckBox *m_showRanges;
- QComboBox *m_showCollisions;
+ QCheckBox *m_showCollisions;
QComboBox *m_noteStyle;
QComboBox *m_insertType;
QCheckBox *m_autoBeam;
diff -Naur rg-s95.initial/src/gui/editors/notation/NotationStaff.cpp rg-s95.modif/src/gui/editors/notation/NotationStaff.cpp
--- rg-s95.initial/src/gui/editors/notation/NotationStaff.cpp 2007-05-09 18:23:49.000000000 +0200
+++ rg-s95.modif/src/gui/editors/notation/NotationStaff.cpp 2007-05-09 21:44:21.000000000 +0200
@@ -92,7 +92,7 @@
m_colourQuantize(true),
m_showUnknowns(true),
m_showRanges(true),
- m_showCollisions(0),
+ m_showCollisions(true),
m_printPainter(0),
m_ready(false)
{
@@ -103,7 +103,7 @@
// Shouldn't change these during the lifetime of the staff, really:
m_showUnknowns = config->readBoolEntry("showunknowns", false);
m_showRanges = config->readBoolEntry("showranges", true);
- m_showCollisions = config->readNumEntry("showcollisions", 2);
+ m_showCollisions = config->readBoolEntry("showcollisions", true);
m_keySigCancelMode = config->readNumEntry("keysigcancelmode", 1);
@@ -1710,21 +1710,15 @@
// The normal on-screen case
- params.setCollision(false);
bool collision = false;
QCanvasItem * haloItem = 0;
- if (m_showCollisions != 0) {
+ if (m_showCollisions) {
collision = elt->isColliding();
if (collision) {
- if (m_showCollisions == 2) {
- // Make collision halo
- QCanvasPixmap *haloPixmap = factory->makeNoteHaloPixmap(params);
- haloItem = new QCanvasNotationSprite(*elt, haloPixmap, m_canvas);
- haloItem->setZ(-1);
- } else {
- // Ask notePixmapFactory for collision color
- params.setCollision(true);
- }
+ // Make collision halo
+ QCanvasPixmap *haloPixmap = factory->makeNoteHaloPixmap(params);
+ haloItem = new QCanvasNotationSprite(*elt, haloPixmap, m_canvas);
+ haloItem->setZ(-1);
}
}
@@ -1732,15 +1726,13 @@
int z = 0;
if (factory->isSelected())
- z = 4;
- else if (collision)
z = 3;
else if (quantized)
z = 2;
setPixmap(elt, pixmap, z, SplitToFit);
- if ((collision) && (m_showCollisions == 2)) {
+ if (collision) {
// Display collision halo
LinedStaffCoords coords =
getCanvasCoordsForLayoutCoords(elt->getLayoutX(),
diff -Naur rg-s95.initial/src/gui/editors/notation/NotationStaff.h rg-s95.modif/src/gui/editors/notation/NotationStaff.h
--- rg-s95.initial/src/gui/editors/notation/NotationStaff.h 2007-05-09 18:23:49.000000000 +0200
+++ rg-s95.modif/src/gui/editors/notation/NotationStaff.h 2007-05-09 21:44:48.000000000 +0200
@@ -458,7 +458,7 @@
bool m_colourQuantize;
bool m_showUnknowns;
bool m_showRanges;
- int m_showCollisions;
+ bool m_showCollisions;
int m_keySigCancelMode;
QPainter *m_printPainter;
diff -Naur rg-s95.initial/src/gui/editors/notation/NotePixmapFactory.cpp rg-s95.modif/src/gui/editors/notation/NotePixmapFactory.cpp
--- rg-s95.initial/src/gui/editors/notation/NotePixmapFactory.cpp 2007-05-09 18:23:49.000000000 +0200
+++ rg-s95.modif/src/gui/editors/notation/NotePixmapFactory.cpp 2007-05-09 21:45:40.000000000 +0200
@@ -483,7 +483,6 @@
NoteCharacter body = getCharacter
(charName,
params.m_highlighted ? HighlightedColour :
- params.m_isColliding ? CollisionColour :
params.m_quantized ? QuantizedColour :
params.m_trigger ? TriggerColour :
params.m_inRange ? PlainColour : OutRangeColour,
@@ -3242,13 +3241,6 @@
GUIPalette::OutRangeNoteHue,
GUIPalette::OutRangeNoteMinValue,
ch, charType, inverted);
-
- case CollisionColour:
- return m_font->getCharacterColoured
- (name,
- GUIPalette::CollidingNoteHue,
- GUIPalette::CollidingNoteMinValue,
- ch, charType, inverted);
}
return m_font->getCharacter(name, ch, charType, inverted);
diff -Naur rg-s95.initial/src/gui/editors/notation/NotePixmapFactory.h rg-s95.modif/src/gui/editors/notation/NotePixmapFactory.h
--- rg-s95.initial/src/gui/editors/notation/NotePixmapFactory.h 2007-05-09 18:23:49.000000000 +0200
+++ rg-s95.modif/src/gui/editors/notation/NotePixmapFactory.h 2007-05-09 21:46:06.000000000 +0200
@@ -251,8 +251,7 @@
QuantizedColour,
HighlightedColour,
TriggerColour,
- OutRangeColour,
- CollisionColour
+ OutRangeColour
};
/// draws selected/shaded status from m_selected/m_shaded:
diff -Naur rg-s95.initial/src/gui/editors/notation/NotePixmapParameters.cpp rg-s95.modif/src/gui/editors/notation/NotePixmapParameters.cpp
--- rg-s95.initial/src/gui/editors/notation/NotePixmapParameters.cpp 2007-05-09 18:23:49.000000000 +0200
+++ rg-s95.modif/src/gui/editors/notation/NotePixmapParameters.cpp 2007-05-09 21:46:40.000000000 +0200
@@ -66,8 +66,7 @@
m_tuplingLineGradient(0.0),
m_tied(false),
m_tieLength(0),
- m_inRange(true),
- m_isColliding(false)
+ m_inRange(true)
{
// nothing else
}
diff -Naur rg-s95.initial/src/gui/editors/notation/NotePixmapParameters.h rg-s95.modif/src/gui/editors/notation/NotePixmapParameters.h
--- rg-s95.initial/src/gui/editors/notation/NotePixmapParameters.h 2007-05-09 18:23:49.000000000 +0200
+++ rg-s95.modif/src/gui/editors/notation/NotePixmapParameters.h 2007-05-09 21:47:13.000000000 +0200
@@ -92,8 +92,6 @@
void setInRange(bool inRange) { m_inRange = inRange; }
- void setCollision(bool collision) { m_isColliding = collision; }
-
std::vector<Mark> getNormalMarks() const;
std::vector<Mark> getAboveMarks() const; // bowings, pause etc
@@ -144,8 +142,6 @@
bool m_inRange;
- bool m_isColliding;
-
std::vector<Mark> m_marks;
};
diff -Naur rg-s95.initial/src/gui/general/GUIPalette.cpp rg-s95.modif/src/gui/general/GUIPalette.cpp
--- rg-s95.initial/src/gui/general/GUIPalette.cpp 2007-05-09 18:23:52.000000000 +0200
+++ rg-s95.modif/src/gui/general/GUIPalette.cpp 2007-05-09 21:25:42.000000000 +0200
@@ -258,8 +258,6 @@
const int GUIPalette::OutRangeNoteHue = 0;
const int GUIPalette::OutRangeNoteMinValue = 200;
-const int GUIPalette::CollidingNoteHue = 320;
-const int GUIPalette::CollidingNoteMinValue = 255;
const int GUIPalette::CollisionHaloHue = 42;
const int GUIPalette::CollisionHaloSaturation = 200;
diff -Naur rg-s95.initial/src/gui/general/GUIPalette.h rg-s95.modif/src/gui/general/GUIPalette.h
--- rg-s95.initial/src/gui/general/GUIPalette.h 2007-05-09 18:23:52.000000000 +0200
+++ rg-s95.modif/src/gui/general/GUIPalette.h 2007-05-09 21:26:59.000000000 +0200
@@ -126,8 +126,6 @@
static const int OutRangeNoteHue;
static const int OutRangeNoteMinValue;
- static const int CollidingNoteHue;
- static const int CollidingNoteMinValue;
static const int CollisionHaloHue;
static const int CollisionHaloSaturation;
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Rosegarden-devel mailing list
[email protected] - use the link below to unsubscribe
https://lists.sourceforge.net/lists/listinfo/rosegarden-devel
