scopeapp-cvs Mailing List for MacCRO X (Page 7)
Status: Alpha
Brought to you by:
narge
You can subscribe to this list here.
2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(8) |
Jul
(52) |
Aug
(3) |
Sep
|
Oct
(7) |
Nov
(1) |
Dec
(31) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2003 |
Jan
(10) |
Feb
(75) |
Mar
|
Apr
(17) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(11) |
Dec
|
From: <sco...@li...> - 2002-10-29 04:24:50
|
Update of /cvsroot/scopeapp/scopeapp/src In directory usw-pr-cvs1:/tmp/cvs-serv4168 Added Files: SpectrumView.h SpectrumView.m Log Message: Initial checkin of (incomplete) spectrum view code (currently skeleton only) --- NEW FILE: SpectrumView.h --- // // SpectrumView.h // MacCRO X // // Created by Philip Derrin on Sun Jul 14 2002. // Copyright (c) 2002 Philip Derrin. // // This file is part of MacCRO X. // // MacCRO X is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation; either version 2 of the License, or // (at your option) any later version. // // MacCRO X is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // // You should have received a copy of the GNU General Public License // along with MacCRO X; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // $Header: /cvsroot/scopeapp/scopeapp/src/SpectrumView.h,v 1.1 2002/10/29 04:24:46 narge Exp $ // #import <AppKit/AppKit.h> #import "TraceView.h" @interface SpectrumView : TraceView { // **** Controls **** // Frequency scale IBOutlet NSTextField* myFreqFrom; IBOutlet NSTextField* myFreqTo; IBOutlet NSButton* myFreqIsLogCheckbox; // Amplitude scale IBOutlet NSTextField* myAmpFrom; IBOutlet NSTextField* myAmpTo; IBOutlet NSButton* myAmpIsLogCheckbox; IBOutlet NSPopupMenu* myAmpUnitsMenu; // Accumulation settings IBOutlet NSButton* myAccumulateCheckbox; IBOutlet NSButton* myAccumulateReset; // display settings IBOutlet NSButton* myShowTimeCheckbox; IBOutlet NSButton* myShowScaleCheckbox; @protected // spectrum analyser settings double myXScale, myYScale; double myGain; BOOL myXIsLog, myYIsLog; BOOL myShowTime, myShowScales; } -(IBAction) changedFreqScale: (id) sender; -(IBAction) changedVoltScale: (id) sender; -(IBAction) changedAccumulationSettings: (id) sender; -(IBAction) changedDisplaySettings: (id) sender; -(id) updateControls; @end --- NEW FILE: SpectrumView.m --- // // SpectrumView.m // MacCRO X // // Created by Philip Derrin on Sun Jul 14 2002. // Copyright (c) 2002 Philip Derrin. // // This file is part of MacCRO X. // // MacCRO X is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation; either version 2 of the License, or // (at your option) any later version. // // MacCRO X is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // // You should have received a copy of the GNU General Public License // along with MacCRO X; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // $Header: /cvsroot/scopeapp/scopeapp/src/SpectrumView.m,v 1.1 2002/10/29 04:24:46 narge Exp $ // #import "SpectrumView.h" static double gVoltScales[7] = {0.01,0.02,0.05,0.1,0.2,0.5,1}; @implementation SpectrumView - (void)awakeFromNib { // FIXME testing hack - implement updateControls myGain = 1.0; myDataWanted[0] = 882; // FIXME add a control for this myDataWanted[1] = 882; // FIXME add a control for this myXScale = 1; myYScale = 1; [super awakeFromNib]; } - (void) dealloc { [self stopDrawing]; /* currently nothing to deallocate */ [super dealloc]; } -(IBAction) changedScale: (id) sender { if(sender == myYScaleSlider) { // if the scale slider moved, zero the fine slider [myYFineSlider setIntValue: 0]; } if(sender == myXScaleSlider) { [myXFineSlider setIntValue: 0]; } [self stopDrawing]; myXScale = gVoltScales[[myXScaleSlider intValue]-1] * pow(2.0, [myXFineSlider doubleValue]); myYScale = gVoltScales[[myYScaleSlider intValue]-1] * pow(2.0, [myYFineSlider doubleValue]); [self startDrawing]; } -(IBAction) changedDisplaySettings: (id) sender { myShowTime = [myShowTimeCheckbox intValue]; myShowScales = [myShowScaleCheckbox intValue]; } // FIXME implement this function to set the controls appropriately from // default / saved values -(id) updateControls { return self; } - (id)updateDisplay: (int) inTrace { double theScaleFactor[2]; float curX, curY; unsigned long curSample; theScaleFactor[0] = myGain * 1 / myXScale; theScaleFactor[1] = myGain * 1 / myYScale; [myDisplayLock lock]; [myBezierPaths[0] removeAllPoints]; // FIXME do fft & display data #error [myDisplayLock unlock]; return self; } @end |
Update of /cvsroot/scopeapp/scopeapp/src In directory usw-pr-cvs1:/tmp/cvs-serv19021 Modified Files: CoreAudioSampler.h CoreAudioSampler.m InputSampler.h QuicktimeSampler.h QuicktimeSampler.m ScopeAppDelegate.h ScopeAppDelegate.m ScopeAppGlobals.h ScopeController.h ScopeController.m ScopeView.h ScopeView.m TestSampler.h TestSampler.m TraceView.h TraceView.m XYPlotView.h XYPlotView.m main.m Log Message: Added sane vim defaults (yay for vim!) Index: CoreAudioSampler.h =================================================================== RCS file: /cvsroot/scopeapp/scopeapp/src/CoreAudioSampler.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CoreAudioSampler.h 25 Jun 2002 01:41:30 -0000 1.3 --- CoreAudioSampler.h 19 Oct 2002 06:39:31 -0000 1.4 *************** *** 88,89 **** --- 88,90 ---- @end + // vim:syn=objc:nocin:si: Index: CoreAudioSampler.m =================================================================== RCS file: /cvsroot/scopeapp/scopeapp/src/CoreAudioSampler.m,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** CoreAudioSampler.m 15 Jul 2002 06:12:06 -0000 1.4 --- CoreAudioSampler.m 19 Oct 2002 06:39:31 -0000 1.5 *************** *** 326,327 **** --- 326,329 ---- AudioDevicePropertyID inPropertyID, void* inClientData) { return noErr; } + + // vim:syn=objc:nocin:si: Index: InputSampler.h =================================================================== RCS file: /cvsroot/scopeapp/scopeapp/src/InputSampler.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** InputSampler.h 18 Jul 2002 07:34:46 -0000 1.4 --- InputSampler.h 19 Oct 2002 06:39:31 -0000 1.5 *************** *** 95,96 **** --- 95,98 ---- // Create a new input sampler with the best available source id <InputSampler, NSObject> NewSamplerWithBestSource(); + + // vim:syn=objc:nocin:si: Index: QuicktimeSampler.h =================================================================== RCS file: /cvsroot/scopeapp/scopeapp/src/QuicktimeSampler.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** QuicktimeSampler.h 25 Jun 2002 01:41:30 -0000 1.3 --- QuicktimeSampler.h 19 Oct 2002 06:39:31 -0000 1.4 *************** *** 91,92 **** --- 91,93 ---- @end + // vim:syn=objc:nocin:si: Index: QuicktimeSampler.m =================================================================== RCS file: /cvsroot/scopeapp/scopeapp/src/QuicktimeSampler.m,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** QuicktimeSampler.m 19 Jul 2002 07:55:18 -0000 1.4 --- QuicktimeSampler.m 19 Oct 2002 06:39:31 -0000 1.5 *************** *** 451,452 **** --- 451,454 ---- writeType: inWriteType]; } + + // vim:syn=objc:nocin:si: Index: ScopeAppDelegate.h =================================================================== RCS file: /cvsroot/scopeapp/scopeapp/src/ScopeAppDelegate.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** ScopeAppDelegate.h 31 Jul 2002 09:23:05 -0000 1.8 --- ScopeAppDelegate.h 19 Oct 2002 06:39:31 -0000 1.9 *************** *** 43,44 **** --- 43,46 ---- @end + + // vim:syn=objc:nocin:si: Index: ScopeAppDelegate.m =================================================================== RCS file: /cvsroot/scopeapp/scopeapp/src/ScopeAppDelegate.m,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** ScopeAppDelegate.m 31 Jul 2002 11:34:59 -0000 1.12 --- ScopeAppDelegate.m 19 Oct 2002 06:39:31 -0000 1.13 *************** *** 82,83 **** --- 82,85 ---- @end + + // vim:syn=objc:nocin:si: Index: ScopeAppGlobals.h =================================================================== RCS file: /cvsroot/scopeapp/scopeapp/src/ScopeAppGlobals.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ScopeAppGlobals.h 19 Jul 2002 07:55:18 -0000 1.1 --- ScopeAppGlobals.h 19 Oct 2002 06:39:31 -0000 1.2 *************** *** 13,14 **** --- 13,16 ---- // a perl script, to auto-generate Localizable.strings #define _(key) [[NSBundle mainBundle] localizedStringForKey:(key) value:key table:nil] + + // vim:syn=objc:nocin:si: Index: ScopeController.h =================================================================== RCS file: /cvsroot/scopeapp/scopeapp/src/ScopeController.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ScopeController.h 19 Jul 2002 07:57:33 -0000 1.5 --- ScopeController.h 19 Oct 2002 06:39:31 -0000 1.6 *************** *** 60,61 **** --- 60,63 ---- @end + + // vim:syn=objc:nocin:si: Index: ScopeController.m =================================================================== RCS file: /cvsroot/scopeapp/scopeapp/src/ScopeController.m,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ScopeController.m 2 Aug 2002 15:29:23 -0000 1.7 --- ScopeController.m 19 Oct 2002 06:39:31 -0000 1.8 *************** *** 230,231 **** --- 230,232 ---- @end + // vim:syn=objc:nocin:si: Index: ScopeView.h =================================================================== RCS file: /cvsroot/scopeapp/scopeapp/src/ScopeView.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ScopeView.h 19 Jul 2002 08:10:12 -0000 1.7 --- ScopeView.h 19 Oct 2002 06:39:31 -0000 1.8 *************** *** 88,89 **** --- 88,91 ---- @end + + // vim:syn=objc:nocin:si: Index: ScopeView.m =================================================================== RCS file: /cvsroot/scopeapp/scopeapp/src/ScopeView.m,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** ScopeView.m 30 Jul 2002 03:58:21 -0000 1.10 --- ScopeView.m 19 Oct 2002 06:39:31 -0000 1.11 *************** *** 378,379 **** --- 378,380 ---- @end + // vim:syn=objc:nocin:si: Index: TestSampler.h =================================================================== RCS file: /cvsroot/scopeapp/scopeapp/src/TestSampler.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** TestSampler.h 21 Jul 2002 11:25:30 -0000 1.6 --- TestSampler.h 19 Oct 2002 06:39:31 -0000 1.7 *************** *** 86,87 **** --- 86,89 ---- @end + + // vim:syn=objc:nocin:si: Index: TestSampler.m =================================================================== RCS file: /cvsroot/scopeapp/scopeapp/src/TestSampler.m,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** TestSampler.m 21 Jul 2002 11:25:31 -0000 1.6 --- TestSampler.m 19 Oct 2002 06:39:31 -0000 1.7 *************** *** 216,217 **** --- 216,219 ---- @end + + // vim:syn=objc:nocin:si: Index: TraceView.h =================================================================== RCS file: /cvsroot/scopeapp/scopeapp/src/TraceView.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TraceView.h 15 Jul 2002 05:59:56 -0000 1.2 --- TraceView.h 19 Oct 2002 06:39:31 -0000 1.3 *************** *** 73,74 **** --- 73,76 ---- @end + + // vim:syn=objc:nocin:si: Index: TraceView.m =================================================================== RCS file: /cvsroot/scopeapp/scopeapp/src/TraceView.m,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** TraceView.m 30 Jul 2002 03:58:21 -0000 1.4 --- TraceView.m 19 Oct 2002 06:39:31 -0000 1.5 *************** *** 340,341 **** --- 340,343 ---- @end + + // vim:syn=objc:nocin:si: Index: XYPlotView.h =================================================================== RCS file: /cvsroot/scopeapp/scopeapp/src/XYPlotView.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** XYPlotView.h 19 Jul 2002 08:10:12 -0000 1.2 --- XYPlotView.h 19 Oct 2002 06:39:31 -0000 1.3 *************** *** 59,60 **** --- 59,62 ---- @end + + // vim:syn=objc:nocin:si: Index: XYPlotView.m =================================================================== RCS file: /cvsroot/scopeapp/scopeapp/src/XYPlotView.m,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** XYPlotView.m 30 Jul 2002 03:58:21 -0000 1.5 --- XYPlotView.m 19 Oct 2002 06:39:31 -0000 1.6 *************** *** 131,132 **** --- 131,133 ---- @end + // vim:syn=objc:nocin:si: Index: main.m =================================================================== RCS file: /cvsroot/scopeapp/scopeapp/src/main.m,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** main.m 22 Jul 2002 09:15:44 -0000 1.3 --- main.m 19 Oct 2002 06:39:31 -0000 1.4 *************** *** 41,42 **** --- 41,44 ---- return 0; } + + // vim:syn=objc:nocin:si: |
From: <sco...@li...> - 2002-08-31 03:39:20
|
Update of /cvsroot/scopeapp/scopeapp/src/gnustep-compat In directory usw-pr-cvs1:/tmp/cvs-serv19189 Added Files: GSHbox.h GSHbox.m GSTable.h GSTable.m GSVbox.h GSVbox.m Log Message: Added GSHbox, GSVbox and GSTable to sources for use on Mac OS X (makes window layout code much less ugly) --- NEW FILE: GSHbox.h --- /* GSHbox.h The GSHbox class (a GNU extension) Copyright (C) 1999 Free Software Foundation, Inc. Author: Nicola Pero <n....@mi...> Date: 1999 This file is part of the GNUstep GUI Library. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifndef _GNUstep_H_GSHbox #define _GNUstep_H_GSHbox #include "GSTable.h" // // GSHbox inherits from GSTable the autosizing/autoresizing engine. // The only real difference between a GSHbox and a GSTable with 1 row // is that the GSHbox has a much simpler, easier and friendlier API. // // You shouldn't use GSTable methods with GSHbox (exception: methods // explicitly quoted in comments to this file as 'inherited from GSTable'). // If you need to do that, you should be using GSTable instead. // @interface GSHbox: GSTable { BOOL _haveViews; float _defaultMinXMargin; } // // Initizialing. // Always use init for GSHbox: other methods don't make sense. // Don't used GSTable methods. You do not need to specify // the number of views you plan to put in the box // when you initialize it. // So, the correct way to start a new GSHbox is simply: // // hbox = [GSHbox new]; // -(id) init; // // Setting Border. // // Use these if you want some spacing around the table. // Changing the border will update immediately the box. // The default border is zero. // // Inherited from GSTable Class: // To have the same border on the four sides use: //-(void) setBorder: (float)aBorder; // // To set borders in the horizontal or vertical direction, use: //-(void) setXBorder: (float)aBorder; //-(void) setYBorder: (float)aBorder; // // To specificy different borders, use: //-(void) setMinXBorder: (float)aBorder; //-(void) setMaxXBorder: (float)aBorder; //-(void) setMinYBorder: (float)aBorder; //-(void) setMaxYBorder: (float)aBorder; // // // Adding a View. // Use these methods to pack views in the GSHbox. // Don't use the corresponding methods of GSTable, which are far more general // and far more complicate. If you need to do that, use GSTable instead. // -(void) addView: (NSView *)aView; -(void) addView: (NSView *)aView enablingXResizing: (BOOL)aFlag; -(void) addView: (NSView *)aView withMinXMargin: (float)aMargin; -(void) addView: (NSView *)aView // enablingXResizing is YES if the {view and its margins} should be // resized when the GSHbox is resized in the horizontal direction. // FALSE does not resize it. Default is YES. enablingXResizing: (BOOL)aFlag // With a GSHbox, only one margin is set when you add views to the GSHbox: // the margin between each view and the preceding one. // Exception: the first view is special, and has no margin set (it has no // preceding view to be separated from). // Space above or below the view may result if the view is shorter, // in the vertical direction, than the other views in the GSHbox; // in that case the view is resized to fit vertically, // according to its autoresizingMask. // By changing the autoresizingMask you may decide whether the space // should go to the view or to its vertical margins; this for example // lets you center vertically or flush up/down your view. withMinXMargin: (float)aMargin; // // Adding a Separator. // -(void) addSeparator; -(void) addSeparatorWithMinXMargin: (float)aMargin; // // Setting Margins. // // Use only the following method to set a default margin. // The default margin set with the following method will be used // for all the views added after. // (Exception: the first view put in the box has no margins at all) // It will not affect already added views. // In a GSHbox, only one margin is used, the one between each view // and the preceding one. If what you want is space around the GSHbox, // you don't want a margin but a border; use setBorder: // (see above, "Setting Border"). // If you need more complicated margins/borders, use GSTable. -(void) setDefaultMinXMargin: (float)aMargin; // // Minimum Size. // // This returns the minimum size the GSHbox should be resized to. // Trying to resize the GSHbox below this size will only result in clipping // (ie, making it disappear) part of the GSHbox. // Inherited from GSTable Class: // -(NSSize) minimumSize; // // Resizing. // // If for any reason you need the GSHbox to revert to its minimum size, // invoke the following. // Inherited from GSTable Class: // -(void) sizeToFit; // // Getting Number of Views // // Return the number of views in the GSHbox (separators included). -(int) numberOfViews; @end #endif /* _GNUstep_H_GSHbox */ --- NEW FILE: GSHbox.m --- /** <title>GSHbox</title> <abstract>The GSHbox class (a GNU extension)</abstract> Copyright (C) 1999 Free Software Foundation, Inc. Author: Nicola Pero <n....@mi...> Date: 1999 This file is part of the GNUstep GUI Library. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #import "GSHbox.h" // For the separator #import <AppKit/AppKit.h> @implementation GSHbox: GSTable // // Class methods // +(void) initialize { if (self == [GSHbox class]) [self setVersion: 1]; } // // Instance Methods // -(id) init { [super initWithNumberOfRows: 1 numberOfColumns: 1]; _haveViews = NO; _defaultMinXMargin = 0; return self; } -(void) dealloc { [super dealloc]; } // // Adding Views // -(void) addView: (NSView *)aView { [self addView: aView enablingXResizing: YES withMinXMargin: _defaultMinXMargin]; } -(void) addView: (NSView *)aView enablingXResizing: (BOOL)aFlag { [self addView: aView enablingXResizing: aFlag withMinXMargin: _defaultMinXMargin]; } -(void) addView: (NSView *)aView withMinXMargin: (float) aMargin { [self addView: aView enablingXResizing: YES withMinXMargin: aMargin]; } -(void) addView: (NSView *)aView enablingXResizing: (BOOL)aFlag withMinXMargin: (float)aMargin { if (_haveViews) { int entries = _numberOfColumns; [super addColumn]; [super setXResizingEnabled: aFlag forColumn: entries]; [super putView: aView atRow: 0 column: entries withMinXMargin: aMargin maxXMargin: 0 minYMargin: 0 maxYMargin: 0]; } else // !_haveViews { [super setXResizingEnabled: aFlag forColumn: 0]; [super putView: aView atRow: 0 column: 0 withMinXMargin: 0 maxXMargin: 0 minYMargin: 0 maxYMargin: 0]; _haveViews = YES; } } // // Adding a Separator // -(void) addSeparator { [self addSeparatorWithMinXMargin: _defaultMinXMargin]; } -(void) addSeparatorWithMinXMargin: (float)aMargin { NSBox *separator; separator = [[NSBox alloc] initWithFrame: NSMakeRect (0, 0, 2, 2)]; [separator setAutoresizingMask: (NSViewMinXMargin | NSViewMaxXMargin | NSViewHeightSizable)]; [separator setTitlePosition: NSNoTitle]; [separator setBorderType: NSGrooveBorder]; [self addView: separator enablingXResizing: NO withMinXMargin: aMargin]; [separator release]; } // // Setting Margins // -(void) setDefaultMinXMargin: (float)aMargin { _defaultMinXMargin = aMargin; } // // Getting the number of Entries // -(int) numberOfViews { if (_haveViews) return _numberOfColumns; else return 0; } // // NSCoding protocol // -(void) encodeWithCoder: (NSCoder*)aCoder { [super encodeWithCoder: aCoder]; [aCoder encodeValueOfObjCType: @encode(BOOL) at: &_haveViews]; [aCoder encodeValueOfObjCType: @encode(float) at: &_defaultMinXMargin]; } -(id) initWithCoder: (NSCoder*)aDecoder { [super initWithCoder: aDecoder]; [aDecoder decodeValueOfObjCType: @encode(BOOL) at: &_haveViews]; [aDecoder decodeValueOfObjCType: @encode(float) at: &_defaultMinXMargin]; return self; } @end --- NEW FILE: GSTable.h --- /* GSTable.h The GSTable class (a GNU extension) Copyright (C) 1999 Free Software Foundation, Inc. Author: Nicola Pero <n....@mi...> Date: 1999 This file is part of the GNUstep GUI Library. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifndef _GNUstep_H_GSTable #define _GNUstep_H_GSTable #include <AppKit/AppKit.h> @interface GSTable: NSView { int _numberOfRows; int _numberOfColumns; // Border around the table. float _minXBorder; float _maxXBorder; float _minYBorder; float _maxYBorder; // We control the NSView inserted in the GSTable (which we call // the prisoners) by enclosing them in jails. // Each prisoner is enclosed in a jail (which is a subview under // our control). // Each prisoner is allowed to resize only inside its jail. NSView **_jails; // YES if the column/row should be expanded/reduced when the size // of the GSTable is expanded/reduced (this BOOL is otherwhere // called X/Y Resizing Enabled). BOOL *_expandColumn; BOOL *_expandRow; // Cache the total number of rows/columns which have expand set to YES int _expandingColumnNumber; int _expandingRowNumber; // Dimension of each column/row float *_columnDimension; float *_rowDimension; // Origin of each column/row float *_columnXOrigin; float *_rowYOrigin; // Minimum dimension each row/column is allowed to have // (which is the size the jail had when first created). float *_minColumnDimension; float *_minRowDimension; // Cache the minimum size the GSTable should be resized to. NSSize _minimumSize; // YES if there is a prisoner in that GSTable position. // (to avoid creating a jail if there is no prisoner to control). BOOL *_havePrisoner; } // // Initizialing. // -(id) initWithNumberOfRows: (int)rows numberOfColumns: (int)columns; // Initialize with a default of 2 columns and 2 rows. -(id) init; // // Setting Border Dimension. // Border is space around the table. // -(void) setBorder: (float)aBorder; -(void) setXBorder: (float)aBorder; -(void) setYBorder: (float)aBorder; -(void) setMinXBorder: (float)aBorder; -(void) setMaxXBorder: (float)aBorder; -(void) setMinYBorder: (float)aBorder; -(void) setMaxYBorder: (float)aBorder; // // Adding a View. // Use these methods to put views in the GSTable. // -(void) putView: (NSView *)aView atRow: (int)row column: (int)column; -(void) putView: (NSView *)aView atRow: (int)row column: (int)column withMargins: (float)margins; -(void) putView: (NSView *)aView atRow: (int)row column: (int)column withXMargins: (float)xMargins yMargins: (float)yMargins; -(void) putView: (NSView *)aView atRow: (int)row column: (int)column // Each view which is added to the GSTable can have some margins // set. The GSTable treats the view and its margins as a whole. // They are given (as a whole) some space, which is reduced or // increased (but only if X or Y Resizing is Enabled for the column // or the row in which the view resides) when the GSTable is // resized. When this happens, the space is added (or subtracted) // to the view or to the margins according to the autoResizeMask of // the view. withMinXMargin: (float)minXMargin // Left Margin maxXMargin: (float)maxXMargin // Right Margin minYMargin: (float)minYMargin // Lower Margin (Upper if flipped) maxYMargin: (float)maxYMargin; // Upper Margin (Lower if flipped) // // Minimum Size. // This returns the minimum size the GSTable should be resized to. // Trying to resize the GSTable below this size will only result in clipping // (ie, making it disappear) part of the GSTable. // -(NSSize) minimumSize; // // Resizing. // If for any reason you need the GSTable to be redrawn (with minimum size), // invoke the following. -(void) sizeToFit; // // Setting Row and Column Expand Flag // When the GSTable is resized, the extra space is equally divided // between the Rows and Columns which have X/Y Resizing Enabled. // -(void) setXResizingEnabled: (BOOL)aFlag forColumn: (int)aColumn; -(BOOL) isXResizingEnabledForColumn: (int)aColumn; -(void) setYResizingEnabled: (BOOL)aFlag forRow: (int)aRow; -(BOOL) isYResizingEnabledForRow: (int)aRow; // // Adding Rows and Columns // These should be used to add more rows and columns to the GSTable. // Of course it is faster to create a GSTable with the right number of rows // and columns from the beginning. // -(void) addRow; // TODO: -(void) insertRow: (int)row; // TODO: -(void) removeRow: (int)row; -(void) addColumn; // TODO: -(void) insertColumn: (int)column; // TODO: -(void) removeColumn: (int)column; // // Getting Row and Column Number // -(int) numberOfRows; -(int) numberOfColumns; @end #endif /* _GNUstep_H_GSTable */ --- NEW FILE: GSTable.m --- /** <titlt>GSTable.m</title> <abstract>The GSTable class (a GNU extension)</abstract> Copyright (C) 1999 Free Software Foundation, Inc. Author: Nicola Pero <n....@mi...> Date: 1999 This file is part of the GNUstep GUI Library. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU [...986 lines suppressed...] int i,j; for (j = 0; j < _numberOfColumns; j++) for (i = 0; i < _numberOfRows; i++) { if (_havePrisoner[(i * _numberOfColumns) + j]) { [_jails[(i * _numberOfColumns) + j] setFrameOrigin: NSMakePoint (_columnXOrigin[j], _rowYOrigin[i])]; [_jails[(i * _numberOfColumns) + j] setFrameSize: NSMakeSize (_columnDimension[j], _rowDimension[i])]; } } } @end --- NEW FILE: GSVbox.h --- /* GSVbox.h The GSVbox class (a GNU extension) Copyright (C) 1999 Free Software Foundation, Inc. Author: Nicola Pero <n....@mi...> Date: 1999 This file is part of the GNUstep GUI Library. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ // // See GSHbox.h for comments. // This file is generated from GSHbox.h by removing comments // and substituting all occurrences of "hbox" with "vbox", // "XResizing" with "YResizing", "MinXMargin" with "MinYMargin". // #ifndef _GNUstep_H_GSVbox #define _GNUstep_H_GSVbox #include "GSTable.h" @interface GSVbox: GSTable { BOOL _haveViews; float _defaultMinYMargin; } // // Initizialing. // -(id) init; // // Setting Border. // // Inherited from GSTable Class: //-(void) setBorder: (float)aBorder; //-(void) setXBorder: (float)aBorder; //-(void) setYBorder: (float)aBorder; //-(void) setMinXBorder: (float)aBorder; //-(void) setMaxXBorder: (float)aBorder; //-(void) setMinYBorder: (float)aBorder; //-(void) setMaxYBorder: (float)aBorder; // // Adding a View. // -(void) addView: (NSView *)aView; -(void) addView: (NSView *)aView enablingYResizing: (BOOL)aFlag; -(void) addView: (NSView *)aView withMinYMargin: (float)aMargin; -(void) addView: (NSView *)aView enablingYResizing: (BOOL)aFlag withMinYMargin: (float)aMargin; // // Adding a Separator. // -(void) addSeparator; -(void) addSeparatorWithMinYMargin: (float)aMargin; // // Setting Margins. // -(void) setDefaultMinYMargin: (float)aMargin; // // Minimum Size. // // Inherited from GSTable Class: // -(NSSize) minimumSize; // // Resizing. // // Inherited from GSTable Class: // -(void) sizeToFit; // // Getting Number of Views // -(int) numberOfViews; @end #endif /* _GNUstep_H_GSVbox */ --- NEW FILE: GSVbox.m --- /** <title>GSVbox</title> <abstract>The GSVbox class (a GNU extension)</abstract> Copyright (C) 1999 Free Software Foundation, Inc. Author: Nicola Pero <n....@mi...> Date: 1999 This file is part of the GNUstep GUI Library. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ // See GSHbox.m for comments // This file is derived from GSVbox.m #import "GSVbox.h" #import <AppKit/AppKit.h> @implementation GSVbox: GSTable // // Class methods // +(void) initialize { if (self == [GSVbox class]) [self setVersion: 1]; } // // Instance Methods // -(id) init { [super initWithNumberOfRows: 1 numberOfColumns: 1]; _haveViews = NO; _defaultMinYMargin = 0; return self; } -(void) dealloc { [super dealloc]; } // // Adding Views // -(void) addView: (NSView *)aView { [self addView: aView enablingYResizing: YES withMinYMargin: _defaultMinYMargin]; } -(void) addView: (NSView *)aView enablingYResizing: (BOOL)aFlag { [self addView: aView enablingYResizing: aFlag withMinYMargin: _defaultMinYMargin]; } -(void) addView: (NSView *)aView withMinYMargin: (float) aMargin { [self addView: aView enablingYResizing: YES withMinYMargin: aMargin]; } -(void) addView: (NSView *)aView enablingYResizing: (BOOL)aFlag withMinYMargin: (float)aMargin { if (_haveViews) { int entries = _numberOfRows; [super addRow]; [super setYResizingEnabled: aFlag forRow: entries]; [super putView: aView atRow: entries column: 0 withMinXMargin: 0 maxXMargin: 0 minYMargin: aMargin maxYMargin: 0]; } else // !_haveViews { [super setYResizingEnabled: aFlag forRow: 0]; [super putView: aView atRow: 0 column: 0 withMinXMargin: 0 maxXMargin: 0 minYMargin: 0 maxYMargin: 0]; _haveViews = YES; } } // // Adding a Separator // -(void) addSeparator { [self addSeparatorWithMinYMargin: _defaultMinYMargin]; } -(void) addSeparatorWithMinYMargin: (float)aMargin { NSBox *separator; separator = [[NSBox alloc] initWithFrame: NSMakeRect (0, 0, 2, 2)]; [separator setAutoresizingMask: (NSViewWidthSizable | NSViewMinYMargin | NSViewMaxYMargin)]; [separator setTitlePosition: NSNoTitle]; [separator setBorderType: NSGrooveBorder]; [self addView: separator enablingYResizing: NO withMinYMargin: aMargin]; [separator release]; } // // Setting Margins // -(void) setDefaultMinYMargin: (float)aMargin { _defaultMinYMargin = aMargin; } // // Getting the number of Entries // -(int) numberOfViews { if (_haveViews) return _numberOfRows; else return 0; } // // NSCoding protocol // -(void) encodeWithCoder: (NSCoder*)aCoder { [super encodeWithCoder: aCoder]; [aCoder encodeValueOfObjCType: @encode(BOOL) at: &_haveViews]; [aCoder encodeValueOfObjCType: @encode(float) at: &_defaultMinYMargin]; } -(id) initWithCoder: (NSCoder*)aDecoder { [super initWithCoder: aDecoder]; [aDecoder decodeValueOfObjCType: @encode(BOOL) at: &_haveViews]; [aDecoder decodeValueOfObjCType: @encode(float) at: &_defaultMinYMargin]; return self; } @end |
From: <sco...@li...> - 2002-08-31 03:38:06
|
Update of /cvsroot/scopeapp/scopeapp/src/gnustep-compat In directory usw-pr-cvs1:/tmp/cvs-serv19123/gnustep-compat Log Message: Directory /cvsroot/scopeapp/scopeapp/src/gnustep-compat added to the repository |
From: <sco...@li...> - 2002-08-02 15:29:28
|
Update of /cvsroot/scopeapp/scopeapp/src In directory usw-pr-cvs1:/tmp/cvs-serv7039 Modified Files: ScopeController.m Log Message: Save position of control panel window Index: ScopeController.m =================================================================== RCS file: /cvsroot/scopeapp/scopeapp/src/ScopeController.m,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ScopeController.m 22 Jul 2002 12:32:22 -0000 1.6 --- ScopeController.m 2 Aug 2002 15:29:23 -0000 1.7 *************** *** 206,209 **** --- 206,211 ---- defer: YES]; [myControlPanel setTitle: _(@"Display Controls")]; + [myControlPanel setFrameAutosaveName: @"ControlPanel"]; + [myControlPanel setFrameUsingName: @"ControlPanel"]; // Create the mode tab view |
From: <sco...@li...> - 2002-07-31 11:35:02
|
Update of /cvsroot/scopeapp/scopeapp/src In directory usw-pr-cvs1:/tmp/cvs-serv6575/src Modified Files: ScopeAppDelegate.m Log Message: Remove unnecessary autorelease Index: ScopeAppDelegate.m =================================================================== RCS file: /cvsroot/scopeapp/scopeapp/src/ScopeAppDelegate.m,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** ScopeAppDelegate.m 31 Jul 2002 11:24:00 -0000 1.11 --- ScopeAppDelegate.m 31 Jul 2002 11:34:59 -0000 1.12 *************** *** 72,76 **** { NSMenu* menu; ! menu = [[NSMenu new] autorelease]; [menu addItemWithTitle: _(@"Quit") --- 72,76 ---- { NSMenu* menu; ! menu = [NSMenu new]; [menu addItemWithTitle: _(@"Quit") |
From: <sco...@li...> - 2002-07-31 11:24:05
|
Update of /cvsroot/scopeapp/scopeapp/English.lproj In directory usw-pr-cvs1:/tmp/cvs-serv3148/English.lproj Modified Files: Localizable.strings Log Message: Localise menu items (gnustep only, for now) Index: Localizable.strings =================================================================== RCS file: /cvsroot/scopeapp/scopeapp/English.lproj/Localizable.strings,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Localizable.strings 19 Jul 2002 07:55:18 -0000 1.2 --- Localizable.strings 31 Jul 2002 11:24:00 -0000 1.3 *************** *** 17,20 **** --- 17,21 ---- /** ScopeAppDelegate.m **/ + "Quit" = "Quit"; /** ScopeController.m **/ |
From: <sco...@li...> - 2002-07-31 11:24:05
|
Update of /cvsroot/scopeapp/scopeapp/src In directory usw-pr-cvs1:/tmp/cvs-serv3148/src Modified Files: ScopeAppDelegate.m Log Message: Localise menu items (gnustep only, for now) Index: ScopeAppDelegate.m =================================================================== RCS file: /cvsroot/scopeapp/scopeapp/src/ScopeAppDelegate.m,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** ScopeAppDelegate.m 31 Jul 2002 09:23:21 -0000 1.10 --- ScopeAppDelegate.m 31 Jul 2002 11:24:00 -0000 1.11 *************** *** 25,28 **** --- 25,29 ---- // + #import "ScopeAppGlobals.h" #import "ScopeAppDelegate.h" #import "ScopeController.h" *************** *** 37,41 **** --- 38,46 ---- id sampler; + #ifdef __APPLE__ + // menu is loaded from MainMenu.nib + #else [self createMenu]; + #endif // FIXME choose an appropriate InputSampler *************** *** 69,73 **** menu = [[NSMenu new] autorelease]; ! [menu addItemWithTitle: @"Quit" action: @selector (terminate:) keyEquivalent: @"q"]; --- 74,78 ---- menu = [[NSMenu new] autorelease]; ! [menu addItemWithTitle: _(@"Quit") action: @selector (terminate:) keyEquivalent: @"q"]; |
From: <sco...@li...> - 2002-07-31 09:23:24
|
Update of /cvsroot/scopeapp/scopeapp/src In directory usw-pr-cvs1:/tmp/cvs-serv4372 Modified Files: ScopeAppDelegate.m Log Message: Added simplest of menus. Index: ScopeAppDelegate.m =================================================================== RCS file: /cvsroot/scopeapp/scopeapp/src/ScopeAppDelegate.m,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** ScopeAppDelegate.m 29 Jul 2002 09:40:38 -0000 1.9 --- ScopeAppDelegate.m 31 Jul 2002 09:23:21 -0000 1.10 *************** *** 37,40 **** --- 37,42 ---- id sampler; + [self createMenu]; + // FIXME choose an appropriate InputSampler sampler = [[TestSampler alloc] init]; *************** *** 60,63 **** --- 62,77 ---- { return YES; // FIXME change after adding support for reading from files ? + } + + - (void) createMenu + { + NSMenu* menu; + menu = [[NSMenu new] autorelease]; + + [menu addItemWithTitle: @"Quit" + action: @selector (terminate:) + keyEquivalent: @"q"]; + + [NSApp setMainMenu: menu]; } |
From: <sco...@li...> - 2002-07-31 09:23:08
|
Update of /cvsroot/scopeapp/scopeapp/src In directory usw-pr-cvs1:/tmp/cvs-serv4278 Modified Files: ScopeAppDelegate.h Log Message: Added simplest of menus. Index: ScopeAppDelegate.h =================================================================== RCS file: /cvsroot/scopeapp/scopeapp/src/ScopeAppDelegate.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ScopeAppDelegate.h 29 Jul 2002 09:25:42 -0000 1.7 --- ScopeAppDelegate.h 31 Jul 2002 09:23:05 -0000 1.8 *************** *** 40,42 **** --- 40,44 ---- - (void) applicationDidFinishLaunching: (NSNotification *)not; + - (void) createMenu; + @end |
From: <sco...@li...> - 2002-07-30 03:58:24
|
Update of /cvsroot/scopeapp/scopeapp/src In directory usw-pr-cvs1:/tmp/cvs-serv13306 Modified Files: TraceView.m XYPlotView.m ScopeView.m Log Message: Use myDataStored[] in trace classes Index: TraceView.m =================================================================== RCS file: /cvsroot/scopeapp/scopeapp/src/TraceView.m,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TraceView.m 29 Jul 2002 08:54:48 -0000 1.3 --- TraceView.m 30 Jul 2002 03:58:21 -0000 1.4 *************** *** 70,76 **** myCollectedData[1] = malloc(myDataWanted[1] * sizeof(Sample)); myDataCollected[0] = 0; ! myDataCollected[0] = 0; myDisplayData[0] = NULL; myDisplayData[1] = NULL; } --- 70,78 ---- myCollectedData[1] = malloc(myDataWanted[1] * sizeof(Sample)); myDataCollected[0] = 0; ! myDataCollected[1] = 0; myDisplayData[0] = NULL; myDisplayData[1] = NULL; + myDataStored[0] = 0; + myDataStored[1] = 0; } *************** *** 328,332 **** // Override for what seems to be a bug in gnustep ! #ifdef MACOSX [self display]; #else --- 330,334 ---- // Override for what seems to be a bug in gnustep ! #ifdef __APPLE__ [self display]; #else Index: XYPlotView.m =================================================================== RCS file: /cvsroot/scopeapp/scopeapp/src/XYPlotView.m,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** XYPlotView.m 22 Jul 2002 12:33:16 -0000 1.4 --- XYPlotView.m 30 Jul 2002 03:58:21 -0000 1.5 *************** *** 116,120 **** for(curSample = 0; ! (curSample < myDataCollected[0]) && (curSample < myDataCollected[1]); curSample++) { --- 116,120 ---- for(curSample = 0; ! (curSample < myDataStored[0]) && (curSample < myDataStored[1]); curSample++) { Index: ScopeView.m =================================================================== RCS file: /cvsroot/scopeapp/scopeapp/src/ScopeView.m,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** ScopeView.m 22 Jul 2002 12:35:21 -0000 1.9 --- ScopeView.m 30 Jul 2002 03:58:21 -0000 1.10 *************** *** 308,312 **** switch(traceMode) { case eTraceChannel1: ! for(curSample = 0; curSample < myDataWanted[0]; curSample++) { curX = (float)curSample / (mySampleRate * myXScales[0]); curValue = myDisplayData[0][curSample]; --- 308,312 ---- switch(traceMode) { case eTraceChannel1: ! for(curSample = 0; curSample < myDataStored[0]; curSample++) { curX = (float)curSample / (mySampleRate * myXScales[0]); curValue = myDisplayData[0][curSample]; *************** *** 316,320 **** break; case eTraceChannel2: ! for(curSample = 0; curSample < myDataWanted[1]; curSample++) { curX = (float)curSample / (mySampleRate * myXScales[0]); curValue = myDisplayData[1][curSample]; --- 316,320 ---- break; case eTraceChannel2: ! for(curSample = 0; curSample < myDataStored[1]; curSample++) { curX = (float)curSample / (mySampleRate * myXScales[0]); curValue = myDisplayData[1][curSample]; *************** *** 324,328 **** break; case eTraceAdd: ! for(curSample = 0; curSample < myDataWanted[0]; curSample++) { curX = (float)curSample / (mySampleRate * myXScales[0]); curValue = (myDisplayData[0][curSample] + --- 324,328 ---- break; case eTraceAdd: ! for(curSample = 0; curSample < myDataStored[0]; curSample++) { curX = (float)curSample / (mySampleRate * myXScales[0]); curValue = (myDisplayData[0][curSample] + *************** *** 333,337 **** break; case eTraceSubtract: ! for(curSample = 0; curSample < myDataWanted[0]; curSample++) { curX = (float)curSample / (mySampleRate * myXScales[0]); curValue = (myDisplayData[0][curSample] - --- 333,337 ---- break; case eTraceSubtract: ! for(curSample = 0; curSample < myDataStored[0]; curSample++) { curX = (float)curSample / (mySampleRate * myXScales[0]); curValue = (myDisplayData[0][curSample] - |
From: <sco...@li...> - 2002-07-29 09:57:55
|
Update of /cvsroot/scopeapp/scopeapp/MacCRO X.pbproj In directory usw-pr-cvs1:/tmp/cvs-serv32421/MacCRO X.pbproj Modified Files: project.pbxproj Log Message: Add Todo.rtf |
From: <sco...@li...> - 2002-07-29 09:57:31
|
Update of /cvsroot/scopeapp/scopeapp In directory usw-pr-cvs1:/tmp/cvs-serv32318 Added Files: Todo.rtf Log Message: Initial list of things to do. --- NEW FILE: Todo.rtf --- {\rtf1\mac\ansicpg10000\cocoartf100 {\fonttbl\f0\fswiss\fcharset77 Optima-Bold;\f1\fswiss\fcharset77 Optima-Regular;\f2\fmodern\fcharset77 Courier; } {\colortbl;\red255\green255\blue255;} \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \f0\b\fs56 \cf0 MacCRO X\ \f1\b0\fs28 \ \f0\b Stuff That Must Be Done\ \f1\b0 \'a5 Debug the code that creates the trace window. In particular, position the window correctly.\ \'a5 Test & debug the oscilloscope and X/Y plot modes.\ \'a5 Test & debug CoreAudioSampler and remove QuicktimeSampler once the Core Audio code works well.\ \'a5 Spectrum analyser.\ \'a5 Finish the control panel. This just involves turning the existing nib files into objective-C code.\ \'a5 Main menu in gnustep.\ \'a5 Fix the problem with display updates in gnustep.\ \ \f0\b Stuff That Should Be Done Fairly Soon If Possible\ \f1\b0 \'a5 Fix the cosmetic bug involving tabs in gnustep.\ \'a5 InputSampler objects for audio files, and for linux audio input devices.\ \'a5 Multiple trace windows\ \'a5 UI for seeking in files.\ \'a5 Triggering code. Do this in InputSampler classes rather than TraceView if possible; UI might have to be changed to make this work well.\ \ \f2\fs24 $Header: /cvsroot/scopeapp/scopeapp/Todo.rtf,v 1.1 2002/07/29 09:57:26 narge Exp $\ } |
From: <sco...@li...> - 2002-07-29 09:40:41
|
Update of /cvsroot/scopeapp/scopeapp/src In directory usw-pr-cvs1:/tmp/cvs-serv27665 Modified Files: ScopeAppDelegate.m Log Message: Add comments to clarify the roles of ScopeAppDelegate and ScopeController Index: ScopeAppDelegate.m =================================================================== RCS file: /cvsroot/scopeapp/scopeapp/src/ScopeAppDelegate.m,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** ScopeAppDelegate.m 29 Jul 2002 09:25:42 -0000 1.8 --- ScopeAppDelegate.m 29 Jul 2002 09:40:38 -0000 1.9 *************** *** 37,46 **** id sampler; ! // FIXME create an appropriate InputSampler sampler = [[TestSampler alloc] init]; if(sampler) { controller = [[ScopeController alloc] initWithSampler: sampler]; } } --- 37,51 ---- id sampler; ! // FIXME choose an appropriate InputSampler sampler = [[TestSampler alloc] init]; if(sampler) { + // FIXME eventually this program will be (sort of) document-based, + // with an NSDocumentController keeping track of all the existing + // ScopeControllers and their associated windows. For now, just + // create a ScopeController and let it take care of itself controller = [[ScopeController alloc] initWithSampler: sampler]; + //[controller autorelease]; } } |
From: <sco...@li...> - 2002-07-29 09:25:44
|
Update of /cvsroot/scopeapp/scopeapp/src In directory usw-pr-cvs1:/tmp/cvs-serv19716 Modified Files: ScopeAppDelegate.h ScopeAppDelegate.m Log Message: Remove myController from the delegate, because the delegate does not own the ScopeController object(s). Index: ScopeAppDelegate.h =================================================================== RCS file: /cvsroot/scopeapp/scopeapp/src/ScopeAppDelegate.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ScopeAppDelegate.h 29 Jul 2002 09:00:31 -0000 1.6 --- ScopeAppDelegate.h 29 Jul 2002 09:25:42 -0000 1.7 *************** *** 30,34 **** @interface ScopeAppDelegate : NSObject { - ScopeController* myController; } --- 30,33 ---- Index: ScopeAppDelegate.m =================================================================== RCS file: /cvsroot/scopeapp/scopeapp/src/ScopeAppDelegate.m,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ScopeAppDelegate.m 29 Jul 2002 09:01:25 -0000 1.7 --- ScopeAppDelegate.m 29 Jul 2002 09:25:42 -0000 1.8 *************** *** 34,37 **** --- 34,38 ---- - (void) applicationDidFinishLaunching: (NSNotification *)not { + ScopeController* controller; id sampler; *************** *** 41,45 **** if(sampler) { ! myController = [[ScopeController alloc] initWithSampler: sampler]; } } --- 42,46 ---- if(sampler) { ! controller = [[ScopeController alloc] initWithSampler: sampler]; } } |
From: <sco...@li...> - 2002-07-29 09:01:28
|
Update of /cvsroot/scopeapp/scopeapp/src In directory usw-pr-cvs1:/tmp/cvs-serv14101 Modified Files: ScopeAppDelegate.m Log Message: Changed controller to myController. Index: ScopeAppDelegate.m =================================================================== RCS file: /cvsroot/scopeapp/scopeapp/src/ScopeAppDelegate.m,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ScopeAppDelegate.m 22 Jul 2002 08:19:20 -0000 1.6 --- ScopeAppDelegate.m 29 Jul 2002 09:01:25 -0000 1.7 *************** *** 34,38 **** - (void) applicationDidFinishLaunching: (NSNotification *)not { - ScopeController* controller; id sampler; --- 34,37 ---- *************** *** 42,46 **** if(sampler) { ! controller = [[ScopeController alloc] initWithSampler: sampler]; } } --- 41,45 ---- if(sampler) { ! myController = [[ScopeController alloc] initWithSampler: sampler]; } } |
From: <sco...@li...> - 2002-07-29 09:00:34
|
Update of /cvsroot/scopeapp/scopeapp/src In directory usw-pr-cvs1:/tmp/cvs-serv13809 Modified Files: ScopeAppDelegate.h Log Message: Added myController var so Delegate class remembers the controller it's using. Index: ScopeAppDelegate.h =================================================================== RCS file: /cvsroot/scopeapp/scopeapp/src/ScopeAppDelegate.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ScopeAppDelegate.h 22 Jul 2002 08:19:20 -0000 1.5 --- ScopeAppDelegate.h 29 Jul 2002 09:00:31 -0000 1.6 *************** *** 30,33 **** --- 30,34 ---- @interface ScopeAppDelegate : NSObject { + ScopeController* myController; } |
From: <sco...@li...> - 2002-07-29 08:54:51
|
Update of /cvsroot/scopeapp/scopeapp/src In directory usw-pr-cvs1:/tmp/cvs-serv11950 Modified Files: TraceView.m Log Message: Added temporary override of the [self display] crash. Index: TraceView.m =================================================================== RCS file: /cvsroot/scopeapp/scopeapp/src/TraceView.m,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TraceView.m 15 Jul 2002 05:59:56 -0000 1.2 --- TraceView.m 29 Jul 2002 08:54:48 -0000 1.3 *************** *** 326,330 **** --- 326,336 ---- [self updateDisplay: 0]; [self updateDisplay: 1]; + + // Override for what seems to be a bug in gnustep + #ifdef MACOSX [self display]; + #else + [self setNeedsDisplay: YES]; + #endif [myDrawThreadState unlock]; } |
From: <sco...@li...> - 2002-07-22 12:42:00
|
Update of /cvsroot/scopeapp/scopeapp/src In directory usw-pr-cvs1:/tmp/cvs-serv18484 Modified Files: GNUmakefile Log Message: Oops. Had wrong slash. Fixed. Index: GNUmakefile =================================================================== RCS file: /cvsroot/scopeapp/scopeapp/src/GNUmakefile,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** GNUmakefile 22 Jul 2002 12:39:49 -0000 1.5 --- GNUmakefile 22 Jul 2002 12:41:57 -0000 1.6 *************** *** 51,55 **** scopeapp_RESOURCE_FILES= # not good practice, but works ! scopeapp_LANGUAGES = ..\English scopeapp_LOCALIZED_RESOURCE_FILES = Localizable.strings # --- 51,55 ---- scopeapp_RESOURCE_FILES= # not good practice, but works ! scopeapp_LANGUAGES = ../English scopeapp_LOCALIZED_RESOURCE_FILES = Localizable.strings # |
From: <sco...@li...> - 2002-07-22 12:39:52
|
Update of /cvsroot/scopeapp/scopeapp/src In directory usw-pr-cvs1:/tmp/cvs-serv17667 Modified Files: GNUmakefile Log Message: Fixed location of English.proj Index: GNUmakefile =================================================================== RCS file: /cvsroot/scopeapp/scopeapp/src/GNUmakefile,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** GNUmakefile 21 Jul 2002 23:16:47 -0000 1.4 --- GNUmakefile 22 Jul 2002 12:39:49 -0000 1.5 *************** *** 6,10 **** # Date: 2002 # ! # Based on the GNUmakefile Gorm (C) Free Software Foundation 1999 # # This file is part of scopeapp (MacCRO X). --- 6,10 ---- # Date: 2002 # ! # Based on the GNUmakefile from Gorm (C) Free Software Foundation 1999 # # This file is part of scopeapp (MacCRO X). *************** *** 50,54 **** # scopeapp_RESOURCE_FILES= ! scopeapp_LANGUAGES = English scopeapp_LOCALIZED_RESOURCE_FILES = Localizable.strings # --- 50,55 ---- # scopeapp_RESOURCE_FILES= ! # not good practice, but works ! scopeapp_LANGUAGES = ..\English scopeapp_LOCALIZED_RESOURCE_FILES = Localizable.strings # |
From: <sco...@li...> - 2002-07-22 12:35:24
|
Update of /cvsroot/scopeapp/scopeapp/src In directory usw-pr-cvs1:/tmp/cvs-serv16503 Modified Files: ScopeView.m Log Message: Added empty line at end of file (one less warning). Index: ScopeView.m =================================================================== RCS file: /cvsroot/scopeapp/scopeapp/src/ScopeView.m,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** ScopeView.m 19 Jul 2002 08:10:12 -0000 1.8 --- ScopeView.m 22 Jul 2002 12:35:21 -0000 1.9 *************** *** 376,378 **** */ ! @end \ No newline at end of file --- 376,379 ---- */ ! @end ! |
From: <sco...@li...> - 2002-07-22 12:33:19
|
Update of /cvsroot/scopeapp/scopeapp/src In directory usw-pr-cvs1:/tmp/cvs-serv15644 Modified Files: XYPlotView.m Log Message: Added empty line at end of file (one less warning). Index: XYPlotView.m =================================================================== RCS file: /cvsroot/scopeapp/scopeapp/src/XYPlotView.m,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** XYPlotView.m 19 Jul 2002 08:10:12 -0000 1.3 --- XYPlotView.m 22 Jul 2002 12:33:16 -0000 1.4 *************** *** 129,131 **** } ! @end \ No newline at end of file --- 129,132 ---- } ! @end ! |
From: <sco...@li...> - 2002-07-22 12:32:25
|
Update of /cvsroot/scopeapp/scopeapp/src In directory usw-pr-cvs1:/tmp/cvs-serv15203 Modified Files: ScopeController.m Log Message: Added empty line at end of file (one less warning). Index: ScopeController.m =================================================================== RCS file: /cvsroot/scopeapp/scopeapp/src/ScopeController.m,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ScopeController.m 19 Jul 2002 07:57:33 -0000 1.5 --- ScopeController.m 22 Jul 2002 12:32:22 -0000 1.6 *************** *** 226,228 **** } ! @end \ No newline at end of file --- 226,229 ---- } ! @end ! |
From: <sco...@li...> - 2002-07-22 09:15:47
|
Update of /cvsroot/scopeapp/scopeapp/src In directory usw-pr-cvs1:/tmp/cvs-serv7131/src Modified Files: main.m Log Message: Manually create delegate object and load MainMenu.nib Index: main.m =================================================================== RCS file: /cvsroot/scopeapp/scopeapp/src/main.m,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** main.m 21 Jul 2002 19:38:08 -0000 1.2 --- main.m 22 Jul 2002 09:15:44 -0000 1.3 *************** *** 1,2 **** --- 1,27 ---- + // + // main.m + // MacCRO X + // + // Copyright (c) 2002 Philip Derrin and Rafal Kolanski. + // + // This file is part of MacCRO X. + // + // MacCRO X is free software; you can redistribute it and/or modify + // it under the terms of the GNU General Public License as published by + // the Free Software Foundation; either version 2 of the License, or + // (at your option) any later version. + // + // MacCRO X is distributed in the hope that it will be useful, + // but WITHOUT ANY WARRANTY; without even the implied warranty of + // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + // GNU General Public License for more details. + // + // You should have received a copy of the GNU General Public License + // along with MacCRO X; if not, write to the Free Software + // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + // + // $Header$ + // + #import <AppKit/AppKit.h> #import "ScopeAppDelegate.h" *************** *** 4,12 **** int main(int argc, const char *argv[]) { ! // attempting to intuitively use ScopeAppDelegate as the delegate ! // for the whole application FIXME [NSApplication sharedApplication]; [NSApp setDelegate: [ScopeAppDelegate new]]; ! ! return NSApplicationMain(argc, argv); } --- 29,42 ---- int main(int argc, const char *argv[]) { ! NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; ! [NSApplication sharedApplication]; + [NSApp setDelegate: [ScopeAppDelegate new]]; ! [NSBundle loadNibNamed:@"MainMenu" owner: NSApp]; ! [NSApp run]; ! ! [pool release]; ! ! return 0; } |
From: <sco...@li...> - 2002-07-22 09:15:14
|
Update of /cvsroot/scopeapp/scopeapp/English.lproj/MainMenu.nib In directory usw-pr-cvs1:/tmp/cvs-serv6693/English.lproj/MainMenu.nib Modified Files: info.nib objects.nib Log Message: Remove delegate object from MainMenu.nib Index: info.nib =================================================================== RCS file: /cvsroot/scopeapp/scopeapp/English.lproj/MainMenu.nib/info.nib,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** info.nib 18 Jun 2002 05:07:06 -0000 1.1.1.1 --- info.nib 22 Jul 2002 09:15:11 -0000 1.2 *************** *** 5,16 **** <key>IBDocumentLocation</key> <string>28 220 408 261 0 0 1280 1002 </string> <key>IBFramework Version</key> ! <string>219.0</string> ! <key>IBMainMenuLocation</key> ! <string>74 637 285 44 0 0 1280 1002 </string> <key>IBSystem Version</key> ! <string>5L14</string> ! <key>IBUserGuides</key> ! <dict/> </dict> </plist> --- 5,21 ---- <key>IBDocumentLocation</key> <string>28 220 408 261 0 0 1280 1002 </string> + <key>IBEditorPositions</key> + <dict> + <key>29</key> + <string>28 486 285 44 0 0 1280 1002 </string> + </dict> <key>IBFramework Version</key> ! <string>263.2</string> ! <key>IBOpenObjects</key> ! <array> ! <integer>29</integer> ! </array> <key>IBSystem Version</key> ! <string>5S66</string> </dict> </plist> Index: objects.nib =================================================================== RCS file: /cvsroot/scopeapp/scopeapp/English.lproj/MainMenu.nib/objects.nib,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 Binary files /tmp/cvsHTG7Ux and /tmp/cvswi22HV differ |