Update of /cvsroot/audacity/audacity-src/src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv5831
Modified Files:
Tag: Audacity_UmixIt
AColor.cpp AColor.h TrackArtist.cpp TrackPanel.cpp
Log Message:
UmixIt color scheme
Index: AColor.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/AColor.h,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.2.2.1
diff -u -d -r1.5.2.2 -r1.5.2.2.2.1
--- AColor.h 6 Nov 2006 04:50:09 -0000 1.5.2.2
+++ AColor.h 23 Nov 2006 03:45:43 -0000 1.5.2.2.2.1
@@ -42,6 +42,9 @@
static void LightMIDIChannel(wxDC * dc, int channel /* 1 - 16 */ );
static void DarkMIDIChannel(wxDC * dc, int channel /* 1 - 16 */ );
+ // rainbow pastel color based on track's pointer -- so it's unique to
track
+ static wxColour GetTrackColor(void* pTrack); //vvv UmixIt
+
static wxBrush lightBrush[2];
static wxBrush mediumBrush[2];
static wxBrush darkBrush[2];
@@ -56,6 +59,11 @@
static wxBrush muteBrush[2];
static wxBrush soloBrush;
+ //vvv UmixIt
+ // For UmixIt, need color brush for off positions, too.
+ static wxBrush muteBrushOff;
+ static wxBrush soloBrushOff;
+
static wxPen envelopePen;
static wxPen WideEnvelopePen;
static wxBrush envelopeBrush;
Index: TrackArtist.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/TrackArtist.cpp,v
retrieving revision 1.57.2.8
retrieving revision 1.57.2.8.2.1
diff -u -d -r1.57.2.8 -r1.57.2.8.2.1
--- TrackArtist.cpp 4 Jun 2006 10:12:53 -0000 1.57.2.8
+++ TrackArtist.cpp 23 Nov 2006 03:45:43 -0000 1.57.2.8.2.1
@@ -137,6 +137,11 @@
else {
muted = (hasSolo || t->GetMute()) && !t->GetSolo();
linkFlag = t->GetLinked();
+ if (!muted) { //vvv UmixIt
+ wxColour trackColor = AColor::GetTrackColor((void*)t);
+ samplePen.SetColour(trackColor);
+ rmsPen.SetColour(trackColor.Red() * 4/5, trackColor.Green() * 4/5,
trackColor.Blue() * 4/5);
+ }
}
trackRect.height = t->GetHeight();
Index: TrackPanel.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/TrackPanel.cpp,v
retrieving revision 1.212.2.15.2.1
retrieving revision 1.212.2.15.2.2
diff -u -d -r1.212.2.15.2.1 -r1.212.2.15.2.2
--- TrackPanel.cpp 15 Nov 2006 22:35:38 -0000 1.212.2.15.2.1
+++ TrackPanel.cpp 23 Nov 2006 03:45:43 -0000 1.212.2.15.2.2
@@ -4659,6 +4659,10 @@
wxRect bev;
GetTitleBarRect(r, bev);
bev.Inflate(-1, -1);
+ { //vvv UmixIt
+ dc->SetBrush(wxBrush(AColor::GetTrackColor((void*)t), wxSOLID));
+ dc->DrawRectangle(bev);
+ }
AColor::Bevel(*dc, true, bev);
// Draw title text
Index: AColor.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/AColor.cpp,v
retrieving revision 1.10.2.6
retrieving revision 1.10.2.6.2.1
diff -u -d -r1.10.2.6 -r1.10.2.6.2.1
--- AColor.cpp 13 Nov 2006 07:02:16 -0000 1.10.2.6
+++ AColor.cpp 23 Nov 2006 03:45:43 -0000 1.10.2.6.2.1
@@ -12,6 +12,7 @@
**********************************************************************/
#include <wx/dc.h>
+#include <wx/dynarray.h> //vvv UmixIt
#include <wx/settings.h>
#include <wx/utils.h>
@@ -32,6 +33,11 @@
wxBrush AColor::muteBrush[2];
wxBrush AColor::soloBrush;
+// For UmixIt, need color brush for off positions, too.
+wxBrush AColor::muteBrushOff;
+wxBrush AColor::soloBrushOff;
+
+
wxBrush AColor::envelopeBrush;
wxPen AColor::envelopePen;
wxPen AColor::WideEnvelopePen;
@@ -129,7 +135,7 @@
}
else {
dc->SetPen(*wxTRANSPARENT_PEN);
- dc->SetBrush(mediumBrush[index]);
+ dc->SetBrush(muteBrushOff); //vvv UmixIt
dc->SetBrush(mediumBrush[index]);
}
}
@@ -144,7 +150,7 @@
}
else {
dc->SetPen(*wxTRANSPARENT_PEN);
- dc->SetBrush(mediumBrush[index]);
+ dc->SetBrush(soloBrushOff); //vvv UmixIt
dc->SetBrush(mediumBrush[index]);
}
}
@@ -202,9 +208,16 @@
// muteBrush[1].SetColour(170, 180, 170);
// soloBrush.SetColour(255, 140, 140);
// Colors modified to avoid using reserved colors red and green.
- muteBrush[0].SetColour(160, 170, 210);
- muteBrush[1].SetColour(160, 170, 190);
- soloBrush.SetColour(160, 170, 210);
+ //muteBrush[0].SetColour(160, 170, 210);
+ //muteBrush[1].SetColour(160, 170, 190);
+ //soloBrush.SetColour(160, 170, 210);
+ //vvv UmixIt mute & solo colors
+ muteBrush[0].SetColour(220, 220, 0); // darker yellow
+ muteBrush[1].SetColour(200, 200, 0); // dark yellow
+ soloBrush.SetColour(0, 220, 0); // darker green
+
+ muteBrushOff.SetColour(255, 255, 0); // yellow
+ soloBrushOff.SetColour(0, 255, 0); // green
cursorPen.SetColour(0, 0, 0);
@@ -354,6 +367,35 @@
}
+//vvv UmixIt
+ WX_DEFINE_ARRAY(void*, trackPtrsArray);
+ const wxColour gRed = wxColour(255, 130, 140); // red
+ const wxColour gOrange = wxColour(255, 200, 130); // orange
+ const wxColour gYellow = wxColour(255, 240, 120); // yellow
+ const wxColour gGreen = wxColour(120, 255, 120); // green
+ const wxColour gCyan = wxColour(120, 255, 255); // cyan
+ const wxColour gBlue = wxColour(180, 200, 255); // blue
+ const wxColour gPurple = wxColour(255, 180, 255); // purple
+
+ // rainbow pastel color based on track's pointer -- so it's unique to track
+ wxColour AColor::GetTrackColor(void* pTrack)
+ {
+ static trackPtrsArray trackPtrs;
+ int nCase = trackPtrs.Index(pTrack);
+ if (nCase == wxNOT_FOUND) trackPtrs.Add(pTrack);
+ nCase = trackPtrs.Index(pTrack);
+ switch (nCase % 7) {
+ case 0: return gRed;
+ case 1: return gOrange;
+ case 2: return gYellow;
+ case 3: return gGreen;
+ case 4: return gCyan;
+ case 5: return gBlue;
+ case 6: return gPurple;
+ }
+ }
+
+
void GetColorGradient(float value,
bool selected,
bool grayscale,
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
