SF.net SVN: supercollider:[9113] trunk

View: New views

1 Messages — Rating Filter: Alert me

SF.net SVN: supercollider:[9113] trunk

by mullmusik :: Rate this Message:

Reply to Author | View Threaded | Show Only this Message

Revision: 9113
http://supercollider.svn.sourceforge.net/supercollider/?rev=9113&view=rev
Author: mullmusik
Date: 2009-04-24 09:28:02 +0000 (Fri, 24 Apr 2009)

Log Message:
-----------
Fixes for grid bugs

Modified Paths:
--------------
trunk/Source/app/SCSoundFileView.M
trunk/Source/app/SCView.M
trunk/build/Help/GUI/Cocoa-GUI/SCEnvelopeView.html
trunk/build/SCClassLibrary/Common/GUI/osx/Base/SCView.sc

Modified: trunk/Source/app/SCSoundFileView.M
===================================================================
--- trunk/Source/app/SCSoundFileView.M 2009-04-23 13:31:18 UTC (rev 9112)
+++ trunk/Source/app/SCSoundFileView.M 2009-04-24 09:28:02 UTC (rev 9113)
@@ -613,7 +613,7 @@

if(!mDrawsWaveForm) goto restore;
// draw grid.
- if(mGridOn){
+ if(mGridOn && (mGridResolution > 0.0)){
float gridsize = ((mGridResolution * mSndBuf.samplerate) / ( mResampleFactor * mZoom.x));
CGContextSetRGBFillColor(cgc, mGridColor.red, mGridColor.green, mGridColor.blue, mGridColor.alpha);
//float xgridpos = mBounds.x + 1.;

Modified: trunk/Source/app/SCView.M
===================================================================
--- trunk/Source/app/SCView.M 2009-04-23 13:31:18 UTC (rev 9112)
+++ trunk/Source/app/SCView.M 2009-04-24 09:28:02 UTC (rev 9113)
@@ -5062,7 +5062,7 @@
xgridpos = bounds.x+1.f + xgrid;
ygrid = ygrid*bounds.height;
ygridpos = bounds.y+1.f + ygrid;
- while(xgridpos < maxwidth)
+ while(xgridpos < maxwidth && (xgrid > 0.0))
{
drawRect = CGRectMake(xgridpos,
bounds.y + 1.f,
@@ -5072,7 +5072,7 @@
xgridpos += xgrid;
}

- while(ygridpos < maxheight)
+ while(ygridpos < maxheight && (ygrid > 0.0))
{
drawRect = CGRectMake(bounds.x+1.f,
ygridpos,

Modified: trunk/build/Help/GUI/Cocoa-GUI/SCEnvelopeView.html
===================================================================
--- trunk/build/Help/GUI/Cocoa-GUI/SCEnvelopeView.html 2009-04-23 13:31:18 UTC (rev 9112)
+++ trunk/build/Help/GUI/Cocoa-GUI/SCEnvelopeView.html 2009-04-24 09:28:02 UTC (rev 9113)
@@ -11,7 +11,7 @@
p.p2 {margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Helvetica; min-height: 14.0px}
p.p3 {margin: 0.0px 0.0px 0.0px 0.0px; font: 9.0px Monaco; min-height: 12.0px}
p.p4 {margin: 0.0px 0.0px 0.0px 0.0px; font: 14.0px Helvetica}
-p.p5 {margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Helvetica; color: #0018e8}
+p.p5 {margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Helvetica; color: #001bec}
p.p6 {margin: 0.0px 0.0px 0.0px 57.0px; text-indent: -57.0px; font: 9.0px Monaco; min-height: 12.0px}
p.p7 {margin: 0.0px 0.0px 0.0px 57.0px; text-indent: -57.0px; font: 12.0px Helvetica}
p.p8 {margin: 0.0px 0.0px 0.0px 57.0px; text-indent: -57.0px; font: 12.0px Helvetica; min-height: 14.0px}
@@ -22,28 +22,29 @@
p.p13 {margin: 0.0px 0.0px 0.0px 57.0px; text-indent: -57.0px; font: 14.0px Helvetica}
p.p14 {margin: 0.0px 0.0px 0.0px 57.0px; text-indent: -57.0px; font: 14.0px Helvetica; min-height: 17.0px}
p.p15 {margin: 0.0px 0.0px 0.0px 57.0px; text-indent: -57.0px; font: 12.0px Monaco; min-height: 16.0px}
-p.p16 {margin: 0.0px 0.0px 0.0px 57.0px; text-indent: -57.0px; font: 9.0px Monaco; color: #316f11}
-p.p17 {margin: 0.0px 0.0px 0.0px 0.0px; font: 9.0px Monaco; color: #a8220e}
-p.p18 {margin: 0.0px 0.0px 0.0px 0.0px; font: 9.0px Monaco; color: #0013bb}
+p.p16 {margin: 0.0px 0.0px 0.0px 57.0px; text-indent: -57.0px; font: 9.0px Monaco; color: #406c0f}
+p.p17 {margin: 0.0px 0.0px 0.0px 0.0px; font: 9.0px Monaco; color: #9a2a1b}
+p.p18 {margin: 0.0px 0.0px 0.0px 0.0px; font: 9.0px Monaco; color: #001db9}
span.s1 {font: 18.0px Helvetica}
span.s2 {color: #000000}
span.s3 {text-decoration: underline}
span.s4 {color: #6f7178}
span.s5 {font: 9.0px Monaco}
-span.s6 {color: #0013bb}
+span.s6 {color: #001db9}
span.s7 {color: #606060}
span.s8 {color: #6f7284}
span.s9 {color: #6d7086}
span.s10 {color: #6e7185}
-span.s11 {color: #5e67a0}
-span.s12 {color: #1f41da}
-span.s13 {color: #334dcf}
+span.s11 {color: #5e689f}
+span.s12 {color: #1b46d8}
+span.s13 {color: #3151cd}
span.s14 {font: 12.0px Monaco}
-span.s15 {color: #2f4bd4}
-span.s16 {color: #6f7181}
-span.s17 {color: #6c6f88}
-span.s18 {font: 14.0px Helvetica}
-span.s19 {font: 12.0px Helvetica}
+span.s15 {color: #2853d2}
+span.s16 {color: #2d4fd2}
+span.s17 {color: #6f7181}
+span.s18 {color: #6c6f88}
+span.s19 {font: 14.0px Helvetica}
+span.s20 {font: 12.0px Helvetica}
span.Apple-tab-span {white-space:pre}
</style>
</head>
@@ -159,7 +160,7 @@
 
 grid
 grid_(point)
- Set a grid using a <a href="../../Geometry/Point.html">Point</a>.
+ Set a grid using a <a href="../../Geometry/Point.html">Point</a>. x and y correspond to times and levels respectively. Specify a value of 0.0 if you do not want that axis to be drawn.
 
 gridOn
 gridOn_(flag)
@@ -168,7 +169,7 @@
 
 gridColor
 gridColor_
- Set the <a href="../GUI-Tools/Color.html">Color</a> of the grid.
+ Set the <a href="../GUI-Tools/Color.html">Color</a> of the grid.
 
 connect (from, aconnections)
 
@@ -180,20 +181,20 @@
 metaAction
 
 Gets/sets a function to be evaluate on Ctrl-click
- arg1 - An instance of <a href="../../Core/Kernel/Function.html">Function</a>. Default value is nil.
+ arg1 - An instance of <a href="../../Core/Kernel/Function.html">Function</a>. Default value is nil.
 
Customizing Appearance
 
 strokeColor_ (acolor)
 
 The line and text color of the view.
- acolor - An instance of <a href="../GUI-Tools/Color.html">Color</a>.
+ acolor - An instance of <a href="../GUI-Tools/Color.html">Color</a>.
 
 colors_ (strokec, fillc)
 
 Sets the stroke and fill colors of the view.
- strokec - An instance of <a href="../GUI-Tools/Color.html">Color</a>.
- fillc - An instance of <a href="../GUI-Tools/Color.html">Color</a>.
+ strokec - An instance of <a href="../GUI-Tools/Color.html">Color</a>.
+ fillc - An instance of <a href="../GUI-Tools/Color.html">Color</a>.
 
 drawLines (abool)
 drawLines_ (abool)
@@ -234,7 +235,7 @@
 acolor - An instance of <a href="../GUI-Tools/Color.html">Color</a>.
 
Subclassing and Internal Methods
- The following methods are usually not used directly or are called by a primitive. Programmers can still call or override these as needed.
+ The following methods are usually not used directly or are called by a primitive. Programmers can still call or override these as needed.
 
 defaultKeyDownAction (char, modifiers, unicode)
 
@@ -259,7 +260,7 @@
 
 The method called by default when attempting to place a drag in this object. Will recieve any drag, but the drag should be an array of values of the form:
 
- [ [ x1, x2, x3, ... ], [ y1, y2, y3, ... ] ]
+ [ [ x1, x2, x3, ... ], [ y1, y2, y3, ... ] ]
 
 defaultReceiveDrag
 
@@ -323,7 +324,7 @@
)
 
// show grid
-b.gridOn_(false);
+b.gridOn_(true);
 
// show Env
b.setEnv(Env.asr(0.5,1, 0.2));

Modified: trunk/build/SCClassLibrary/Common/GUI/osx/Base/SCView.sc
===================================================================
--- trunk/build/SCClassLibrary/Common/GUI/osx/Base/SCView.sc 2009-04-23 13:31:18 UTC (rev 9112)
+++ trunk/build/SCClassLibrary/Common/GUI/osx/Base/SCView.sc 2009-04-24 09:28:02 UTC (rev 9113)
@@ -1601,7 +1601,7 @@
var <>size ;
var <editable = true;
var <curves = \linear;
- var gridOn, gridColor, grid;
+ var <gridOn, <gridColor, <grid;

init{arg argParent, argBounds;
super.init(argParent, argBounds);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

_______________________________________________
sc-dev mailing list

info (subscription, etc.): http://www.beast.bham.ac.uk/research/sc_mailing_lists.shtml
archive: http://www.listarc.bham.ac.uk/marchives/sc-dev/
search: http://www.listarc.bham.ac.uk/lists/sc-dev/search/