scopeapp-cvs Mailing List for MacCRO X (Page 8)
Status: Alpha
Brought to you by:
narge
Menu
▾
▴
scopeapp-cvs — Mailing list for CVS commit messages
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-07-22 08:19:24
|
Update of /cvsroot/scopeapp/scopeapp/src
In directory usw-pr-cvs1:/tmp/cvs-serv17885
Modified Files:
ScopeAppDelegate.h ScopeAppDelegate.m
Log Message:
Remove unnecessary notification from delegate, move code from awakeFromNib
to applicationDidFinishLaunching to prevent it being called twice on macosx
Index: ScopeAppDelegate.h
===================================================================
RCS file: /cvsroot/scopeapp/scopeapp/src/ScopeAppDelegate.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ScopeAppDelegate.h 21 Jul 2002 19:40:07 -0000 1.4
--- ScopeAppDelegate.h 22 Jul 2002 08:19:20 -0000 1.5
***************
*** 32,37 ****
}
- - (void) awakeFromNib;
-
// - (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender;
--- 32,35 ----
***************
*** 40,46 ****
- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender;
- // Quick fix to make something appear on the screen. These methods
- // respond to delegate object messages from NSApp
- - (void) applicationWillFinishLaunching: (NSNotification *)not;
- (void) applicationDidFinishLaunching: (NSNotification *)not;
--- 38,41 ----
Index: ScopeAppDelegate.m
===================================================================
RCS file: /cvsroot/scopeapp/scopeapp/src/ScopeAppDelegate.m,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ScopeAppDelegate.m 21 Jul 2002 19:48:29 -0000 1.5
--- ScopeAppDelegate.m 22 Jul 2002 08:19:20 -0000 1.6
***************
*** 32,36 ****
@implementation ScopeAppDelegate
! - (void) awakeFromNib
{
ScopeController* controller;
--- 32,36 ----
@implementation ScopeAppDelegate
! - (void) applicationDidFinishLaunching: (NSNotification *)not
{
ScopeController* controller;
***************
*** 56,72 ****
return YES; // FIXME change after adding support for reading from files ?
}
-
- // FIXME this responds to NSApp, as an effort to show something on the screen.
- // it does show something on the screen, but the program segfaults
- - (void) applicationWillFinishLaunching: (NSNotification *)not
- {
- [self awakeFromNib];
- }
-
- /*- (void) applicationDidFinishLaunching: (NSNotification *)not;
- {
- [mainController windowDidLoad];
- }
- */
@end
--- 56,59 ----
|
|
From: <sco...@li...> - 2002-07-21 23:16:50
|
Update of /cvsroot/scopeapp/scopeapp/src In directory usw-pr-cvs1:/tmp/cvs-serv13400 Modified Files: GNUmakefile Log Message: Small fix in comments. Index: GNUmakefile =================================================================== RCS file: /cvsroot/scopeapp/scopeapp/src/GNUmakefile,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** GNUmakefile 19 Jul 2002 08:03:01 -0000 1.3 --- GNUmakefile 21 Jul 2002 23:16:47 -0000 1.4 *************** *** 6,11 **** # Date: 2002 # ! # Based on the GNUmakefile for Gorm's make file (C) Free Software ! # Foundation 1999 # # This file is part of scopeapp (MacCRO X). --- 6,10 ---- # Date: 2002 # ! # Based on the GNUmakefile Gorm (C) Free Software Foundation 1999 # # This file is part of scopeapp (MacCRO X). |
|
From: <sco...@li...> - 2002-07-21 19:48:32
|
Update of /cvsroot/scopeapp/scopeapp/src
In directory usw-pr-cvs1:/tmp/cvs-serv22727
Modified Files:
ScopeAppDelegate.m
Log Message:
Removed applicationDidFinishLaunching-related things.
Index: ScopeAppDelegate.m
===================================================================
RCS file: /cvsroot/scopeapp/scopeapp/src/ScopeAppDelegate.m,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ScopeAppDelegate.m 21 Jul 2002 19:40:58 -0000 1.4
--- ScopeAppDelegate.m 21 Jul 2002 19:48:29 -0000 1.5
***************
*** 43,49 ****
{
controller = [[ScopeController alloc] initWithSampler: sampler];
- mainController = controller;
}
- mainController = nil;
}
--- 43,47 ----
|
|
From: <sco...@li...> - 2002-07-21 19:41:02
|
Update of /cvsroot/scopeapp/scopeapp/src
In directory usw-pr-cvs1:/tmp/cvs-serv19615
Modified Files:
ScopeAppDelegate.m
Log Message:
Implemented applicationWillFinishLaunching as a way for scopeapp to display a window on the screen.
Index: ScopeAppDelegate.m
===================================================================
RCS file: /cvsroot/scopeapp/scopeapp/src/ScopeAppDelegate.m,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ScopeAppDelegate.m 25 Jun 2002 01:41:30 -0000 1.3
--- ScopeAppDelegate.m 21 Jul 2002 19:40:58 -0000 1.4
***************
*** 43,47 ****
--- 43,49 ----
{
controller = [[ScopeController alloc] initWithSampler: sampler];
+ mainController = controller;
}
+ mainController = nil;
}
***************
*** 56,59 ****
--- 58,74 ----
return YES; // FIXME change after adding support for reading from files ?
}
+
+ // FIXME this responds to NSApp, as an effort to show something on the screen.
+ // it does show something on the screen, but the program segfaults
+ - (void) applicationWillFinishLaunching: (NSNotification *)not
+ {
+ [self awakeFromNib];
+ }
+
+ /*- (void) applicationDidFinishLaunching: (NSNotification *)not;
+ {
+ [mainController windowDidLoad];
+ }
+ */
@end
|
|
From: <sco...@li...> - 2002-07-21 19:40:11
|
Update of /cvsroot/scopeapp/scopeapp/src
In directory usw-pr-cvs1:/tmp/cvs-serv19285
Modified Files:
ScopeAppDelegate.h
Log Message:
Added methods to respond to applicationWillFinishLaunching and applicationDidFinishLaunching
Index: ScopeAppDelegate.h
===================================================================
RCS file: /cvsroot/scopeapp/scopeapp/src/ScopeAppDelegate.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ScopeAppDelegate.h 25 Jun 2002 01:41:30 -0000 1.3
--- ScopeAppDelegate.h 21 Jul 2002 19:40:07 -0000 1.4
***************
*** 27,33 ****
#import <Foundation/Foundation.h>
#import <AppKit/AppKit.h>
@interface ScopeAppDelegate : NSObject {
-
}
--- 27,33 ----
#import <Foundation/Foundation.h>
#import <AppKit/AppKit.h>
+ #import "ScopeController.h"
@interface ScopeAppDelegate : NSObject {
}
***************
*** 39,42 ****
--- 39,47 ----
- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender;
+
+ // Quick fix to make something appear on the screen. These methods
+ // respond to delegate object messages from NSApp
+ - (void) applicationWillFinishLaunching: (NSNotification *)not;
+ - (void) applicationDidFinishLaunching: (NSNotification *)not;
@end
|
|
From: <sco...@li...> - 2002-07-21 19:38:13
|
Update of /cvsroot/scopeapp/scopeapp/src
In directory usw-pr-cvs1:/tmp/cvs-serv18618
Modified Files:
main.m
Log Message:
Used ScopeAppDelegate as application delegate to get something on the screen(quick fix).
Index: main.m
===================================================================
RCS file: /cvsroot/scopeapp/scopeapp/src/main.m,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** main.m 18 Jul 2002 07:32:38 -0000 1.1
--- main.m 21 Jul 2002 19:38:08 -0000 1.2
***************
*** 1,6 ****
--- 1,12 ----
#import <AppKit/AppKit.h>
+ #import "ScopeAppDelegate.h"
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);
}
|
|
From: <sco...@li...> - 2002-07-21 11:25:34
|
Update of /cvsroot/scopeapp/scopeapp/src
In directory usw-pr-cvs1:/tmp/cvs-serv16311
Modified Files:
TestSampler.h TestSampler.m
Log Message:
Fix boolean confusion
Index: TestSampler.h
===================================================================
RCS file: /cvsroot/scopeapp/scopeapp/src/TestSampler.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TestSampler.h 20 Jul 2002 12:23:13 -0000 1.5
--- TestSampler.h 21 Jul 2002 11:25:30 -0000 1.6
***************
*** 29,36 ****
#import "InputSampler.h"
- // Mac OS X defines true intrinsically, GNUstep does not
- #define true YES
- #define false NO
-
@interface TestSampler : NSObject <InputSampler> {
// InputSampler data
--- 29,32 ----
***************
*** 80,84 ****
-(unsigned long) blockSize;
! // return true if the sampler is currently sampling data
-(BOOL) isSampling;
--- 76,80 ----
-(unsigned long) blockSize;
! // return YES if the sampler is currently sampling data
-(BOOL) isSampling;
Index: TestSampler.m
===================================================================
RCS file: /cvsroot/scopeapp/scopeapp/src/TestSampler.m,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TestSampler.m 18 Jul 2002 07:36:00 -0000 1.5
--- TestSampler.m 21 Jul 2002 11:25:31 -0000 1.6
***************
*** 142,146 ****
}
! // return true if the sampler is currently sampling data
-(BOOL) isSampling
{
--- 142,146 ----
}
! // return YES if the sampler is currently sampling data
-(BOOL) isSampling
{
***************
*** 170,174 ****
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
! while(true)
{
if(![myStateLock tryLockWhenCondition: kTestSamplerRunning]) { break; }
--- 170,174 ----
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
! while(YES)
{
if(![myStateLock tryLockWhenCondition: kTestSamplerRunning]) { break; }
|
|
From: <sco...@li...> - 2002-07-20 12:23:17
|
Update of /cvsroot/scopeapp/scopeapp/src
In directory usw-pr-cvs1:/tmp/cvs-serv29406
Modified Files:
TestSampler.h
Log Message:
Defined true to be YES and false to be NO for GNUstep to compile it.
Index: TestSampler.h
===================================================================
RCS file: /cvsroot/scopeapp/scopeapp/src/TestSampler.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TestSampler.h 25 Jun 2002 01:41:30 -0000 1.4
--- TestSampler.h 20 Jul 2002 12:23:13 -0000 1.5
***************
*** 29,32 ****
--- 29,36 ----
#import "InputSampler.h"
+ // Mac OS X defines true intrinsically, GNUstep does not
+ #define true YES
+ #define false NO
+
@interface TestSampler : NSObject <InputSampler> {
// InputSampler data
|
|
From: <sco...@li...> - 2002-07-19 08:10:16
|
Update of /cvsroot/scopeapp/scopeapp/src
In directory usw-pr-cvs1:/tmp/cvs-serv11612/src
Modified Files:
ScopeView.h ScopeView.m XYPlotView.h XYPlotView.m
Log Message:
Add stubs for functions to create display controls
Index: ScopeView.h
===================================================================
RCS file: /cvsroot/scopeapp/scopeapp/src/ScopeView.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ScopeView.h 15 Jul 2002 06:01:56 -0000 1.6
--- ScopeView.h 19 Jul 2002 08:10:12 -0000 1.7
***************
*** 80,83 ****
--- 80,85 ----
-(id) updateControls;
+ -(id) createControls: (NSView*) parentView;
+
- (id)doTriggerOnData: (Sample*[2]) inData
frameCount: (unsigned long) inFrameCount
Index: ScopeView.m
===================================================================
RCS file: /cvsroot/scopeapp/scopeapp/src/ScopeView.m,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ScopeView.m 18 Jul 2002 07:35:58 -0000 1.7
--- ScopeView.m 19 Jul 2002 08:10:12 -0000 1.8
***************
*** 351,354 ****
--- 351,359 ----
}
+ -(id) createControls: (NSView*) parentView
+ {
+ #warning
+ }
+
- (id)doTriggerOnData: (Sample*[2]) inData
frameCount: (unsigned long) inFrameCount
Index: XYPlotView.h
===================================================================
RCS file: /cvsroot/scopeapp/scopeapp/src/XYPlotView.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** XYPlotView.h 15 Jul 2002 06:05:46 -0000 1.1
--- XYPlotView.h 19 Jul 2002 08:10:12 -0000 1.2
***************
*** 56,58 ****
--- 56,60 ----
-(id) updateControls;
+ -(id) createControls: (NSView*) parentView;
+
@end
Index: XYPlotView.m
===================================================================
RCS file: /cvsroot/scopeapp/scopeapp/src/XYPlotView.m,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** XYPlotView.m 18 Jul 2002 07:36:00 -0000 1.2
--- XYPlotView.m 19 Jul 2002 08:10:12 -0000 1.3
***************
*** 85,88 ****
--- 85,93 ----
-(id) updateControls { return self; }
+ -(id) createControls: (NSView*) parentView
+ {
+ #warning
+ }
+
- (id)updateDisplay: (int) inTrace
{
|
|
From: <sco...@li...> - 2002-07-19 08:03:04
|
Update of /cvsroot/scopeapp/scopeapp/src In directory usw-pr-cvs1:/tmp/cvs-serv8586 Modified Files: GNUmakefile Log Message: Add new header file, localised files Index: GNUmakefile =================================================================== RCS file: /cvsroot/scopeapp/scopeapp/src/GNUmakefile,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GNUmakefile 18 Jul 2002 08:56:41 -0000 1.2 --- GNUmakefile 19 Jul 2002 08:03:01 -0000 1.3 *************** *** 51,55 **** # scopeapp_RESOURCE_FILES= ! # FIXME: maybe the .lproj should be here? # --- 51,56 ---- # scopeapp_RESOURCE_FILES= ! scopeapp_LANGUAGES = English ! scopeapp_LOCALIZED_RESOURCE_FILES = Localizable.strings # *************** *** 61,64 **** --- 62,66 ---- QuicktimeSampler.h \ ScopeAppDelegate.h \ + ScopeAppGlobals.h \ ScopeController.h \ ScopeView.h \ *************** *** 78,83 **** ScopeAppDelegate.m \ TestSampler.m - #CoreAudioSampler.m # refuses to compile on linux - #QuicktimeSampler.m # refuses to compile on linux # --- 80,83 ---- |
|
From: <sco...@li...> - 2002-07-19 07:59:19
|
Update of /cvsroot/scopeapp/scopeapp/MacCRO X.pbproj In directory usw-pr-cvs1:/tmp/cvs-serv7511/MacCRO X.pbproj Modified Files: project.pbxproj Log Message: Add ScopeAppGlobals.h |
|
From: <sco...@li...> - 2002-07-19 07:57:36
|
Update of /cvsroot/scopeapp/scopeapp/src
In directory usw-pr-cvs1:/tmp/cvs-serv6333/src
Modified Files:
ScopeController.h ScopeController.m
Log Message:
ScopeController now programatically creates its windows, to
avoid the nib vs. gmodel problem
Index: ScopeController.h
===================================================================
RCS file: /cvsroot/scopeapp/scopeapp/src/ScopeController.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ScopeController.h 15 Jul 2002 06:05:18 -0000 1.4
--- ScopeController.h 19 Jul 2002 07:57:33 -0000 1.5
***************
*** 39,42 ****
--- 39,47 ----
IBOutlet NSPanel* myControlPanel;
IBOutlet NSTabView* myModeTabs;
+ IBOutlet NSTabViewItem* myScopeTab;
+ IBOutlet NSTabViewItem* myXYPlotTab;
+ IBOutlet NSTabViewItem* mySpectrumTab;
+ // IBOutlet NSTabViewItem* myWaterfallTab;
+
@private
id <InputSampler, NSObject> mySampler;
***************
*** 51,64 ****
// tab view delegate methods
- -(void) tabViewDidChangeNumberOfTabViewItems: (NSTabView*) tabView;
-
-(void) tabView: (NSTabView*) tabView
didSelectTabViewItem: (NSTabViewItem*) tabViewItem;
-
- -(BOOL) tabView: (NSTabView*) tabView
- shouldSelectTabViewItem: (NSTabViewItem*) tabViewItem;
-
- -(void) tabView: (NSTabView*) tabView
- willSelectTabViewItem: (NSTabViewItem*) tabViewItem;
@end
--- 56,61 ----
Index: ScopeController.m
===================================================================
RCS file: /cvsroot/scopeapp/scopeapp/src/ScopeController.m,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ScopeController.m 15 Jul 2002 06:05:18 -0000 1.4
--- ScopeController.m 19 Jul 2002 07:57:33 -0000 1.5
***************
*** 25,35 ****
//
#import "ScopeController.h"
! enum {
! eOscilloscopeTab = 0,
! eXYPlotTab,
! eSpectrumTab
! };
@implementation ScopeController
--- 25,43 ----
//
+ #import "ScopeAppGlobals.h"
+
#import "ScopeController.h"
! @interface ScopeController (ScopeControllerInternal)
!
! // create the trace window which is managed by this ScopeController,
! // with the appropriate subviews
! -(id) createTraceWindow;
!
! // create the NSPanel containing all the controls for this
! // ScopeController's trace views
! -(id) createControlPanel;
!
! @end
@implementation ScopeController
***************
*** 37,41 ****
-(id) initWithSampler: (id <InputSampler, NSObject>) sampler
{
! self = [super initWithWindowNibName: @"ScopeWindow"];
if(self != nil)
--- 45,49 ----
-(id) initWithSampler: (id <InputSampler, NSObject>) sampler
{
! self = [super initWithWindow: nil];
if(self != nil)
***************
*** 44,48 ****
mySampler = sampler;
! [mySampler retain];
nCenter = [NSNotificationCenter defaultCenter];
--- 52,63 ----
mySampler = sampler;
! if(mySampler != nil)
! {
! [mySampler retain];
! }
!
! [self createTraceWindow];
! [self createControlPanel];
! [self windowDidLoad]; // would be called when loading from nib
nCenter = [NSNotificationCenter defaultCenter];
***************
*** 73,79 ****
// selectTabViewItemAtIndex: will ever call
// tabView:didSelectTabViewItem:
! [myModeTabs selectTabViewItemAtIndex: eOscilloscopeTab];
! [self tabView: myModeTabs didSelectTabViewItem:
! [myModeTabs tabViewItemAtIndex: eOscilloscopeTab]];
[myModeTabs setDelegate: self];
}
--- 88,93 ----
// selectTabViewItemAtIndex: will ever call
// tabView:didSelectTabViewItem:
! [myModeTabs selectTabViewItem: myScopeTab];
! [self tabView: myModeTabs didSelectTabViewItem: myScopeTab];
[myModeTabs setDelegate: self];
}
***************
*** 102,112 ****
}
- -(void) tabViewDidChangeNumberOfTabViewItems: (NSTabView*) tabView { }
-
-(void) tabView: (NSTabView *) tabView
didSelectTabViewItem: (NSTabViewItem *) tabViewItem;
{
- int newTab = [tabView indexOfTabViewItem: tabViewItem];
-
// assert that the tab view that has been switched is the mode tabs
if(tabView != myModeTabs) { return; }
--- 116,122 ----
***************
*** 121,147 ****
// show and start drawing in the new active view
! switch(newTab)
{
- case eOscilloscopeTab:
[[[self window] contentView] addSubview: myScopeView];
[myScopeView startDrawingWithSampler: mySampler];
! break;
! case eXYPlotTab:
[[[self window] contentView] addSubview: myXYPlotView];
[myXYPlotView startDrawingWithSampler: mySampler];
! break;
! case eSpectrumTab:
! break;
}
}
! -(BOOL) tabView: (NSTabView*) tabView
! shouldSelectTabViewItem: (NSTabViewItem*) tabViewItem
{
! return YES;
}
! -(void) tabView: (NSTabView*) tabView
! willSelectTabViewItem: (NSTabViewItem*) tabViewItem { }
! @end
--- 131,228 ----
// show and start drawing in the new active view
! if(tabViewItem == myScopeTab)
{
[[[self window] contentView] addSubview: myScopeView];
[myScopeView startDrawingWithSampler: mySampler];
! }
! else if(tabViewItem == myXYPlotTab)
! {
[[[self window] contentView] addSubview: myXYPlotView];
[myXYPlotView startDrawingWithSampler: mySampler];
! }
! else if(tabViewItem == myXYPlotTab)
! {
}
}
! @end
!
! @implementation ScopeController (ScopeControllerInternal)
!
! - createTraceWindow
{
! NSWindow* window;
! NSRect rect = NSMakeRect(0, 0, 400, 400);
! unsigned int flags;
!
! // create the window
! flags = (NSTitledWindowMask | NSClosableWindowMask |
! NSMiniaturizableWindowMask | NSResizableWindowMask);
! window = [[NSWindow alloc] initWithContentRect: rect
! styleMask: flags
! backing: NSBackingStoreBuffered
! defer: YES];
! [window setTitle: _(@"MacCRO X")];
! // FIXME move the window to an appropriate position
! // [window setFrameTopLeftPoint: NSMakePoint(20, 63)];
! [window setMinSize: NSMakeSize(400, 422)];
! [window setFrameAutosaveName: @"TraceWindow"];
! [window setFrameUsingName: @"TraceWindow"];
!
! // create the trace views
! // these are not placed in the window yet; that will be
! // done when a tab is selected in the control panel
! myScopeView = [[ScopeView alloc] initWithFrame: rect];
! [myScopeView awakeFromNib];
! [myScopeView autorelease];
!
! myXYPlotView = [[XYPlotView alloc] initWithFrame: rect];
! [myXYPlotView awakeFromNib];
! [myXYPlotView autorelease];
!
! // now claim control of the window
! [self setWindow: window];
! [window release];
!
! return self;
}
! - createControlPanel
! {
! // the layout-related magic numbers in this code
! // were determined by running nibtool -a on the
! // original nib file. If you change them, be sure
! // that the interface still looks right.
! NSRect rect;
! unsigned int flags;
!
! // Create the panel
! rect = NSMakeRect(82, 158, 713, 375);
! flags = (NSTitledWindowMask | NSMiniaturizableWindowMask |
! NSUtilityWindowMask);
! myControlPanel = [[NSPanel alloc] initWithContentRect: rect
! styleMask: flags
! backing: NSBackingStoreBuffered
! defer: YES];
! [myControlPanel setTitle: _(@"Display Controls")];
!
! // Create the mode tab view
! rect = NSMakeRect(-11, -7, 735, 372);
! myModeTabs = [[NSTabView alloc] initWithFrame: rect];
! [[myControlPanel contentView] addSubview: myModeTabs];
!
! // add and populate the tabs
! myScopeTab = [[NSTabViewItem alloc] init];
! [myScopeTab setLabel: _(@"Oscilloscope")];
! [myScopeView createControls: [myScopeTab view]];
! [myModeTabs addTabViewItem: myScopeTab];
!
! myXYPlotTab = [[NSTabViewItem alloc] init];
! [myXYPlotTab setLabel: _(@"X/Y Plot")];
! [myXYPlotView createControls: [myXYPlotTab view]];
! [myModeTabs addTabViewItem: myXYPlotTab];
!
! return self;
! }
! @end
\ No newline at end of file
|
|
From: <sco...@li...> - 2002-07-19 07:55:22
|
Update of /cvsroot/scopeapp/scopeapp/src
In directory usw-pr-cvs1:/tmp/cvs-serv5537/src
Modified Files:
QuicktimeSampler.m
Added Files:
ScopeAppGlobals.h
Log Message:
Use new macro (borrowed from GNUMail) to mark localizable strings in source
code
--- NEW FILE: ScopeAppGlobals.h ---
/*
* ScopeAppGlobals.h
* MacCRO X
*
* Created by Philip Derrin on Fri Jul 19 2002.
* Copyright (c) 2002 Philip Derrin. All rights reserved.
*
*/
// Macro to use on strings which can be localised
// Based on similar macro from GNUMail
// Strings labelled this way are easy to find using
// a perl script, to auto-generate Localizable.strings
#define _(key) [[NSBundle mainBundle] localizedStringForKey:(key) value:key table:nil]
Index: QuicktimeSampler.m
===================================================================
RCS file: /cvsroot/scopeapp/scopeapp/src/QuicktimeSampler.m,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** QuicktimeSampler.m 25 Jun 2002 01:41:30 -0000 1.3
--- QuicktimeSampler.m 19 Jul 2002 07:55:18 -0000 1.4
***************
*** 25,28 ****
--- 25,30 ----
//
+ #import "ScopeAppGlobals.h"
+
#import "QuicktimeSampler.h"
***************
*** 282,294 ****
{
OSErr err;
- NSString* errorString;
- NSBundle* thisBundle = [NSBundle bundleForClass:[self class]];
mySGComp = OpenDefaultComponent(SeqGrabComponentType, 0);
if(mySGComp == NULL)
{
! errorString = [thisBundle localizedStringForKey:@"QTNotFound"
! value: nil table: nil];
! NSRunCriticalAlertPanel(@"Error", errorString, nil, nil, nil);
return nil;
}
--- 284,292 ----
{
OSErr err;
mySGComp = OpenDefaultComponent(SeqGrabComponentType, 0);
if(mySGComp == NULL)
{
! NSRunCriticalAlertPanel(_(@"Error"), _(@"Another application may be using QuickTime Capture, or it may not be installed."), nil, nil, nil);
return nil;
}
***************
*** 297,303 ****
if(err)
{
! errorString = [thisBundle localizedStringForKey:@"QTUnknown"
! value: nil table: nil];
! NSRunCriticalAlertPanel(@"Error", errorString, nil, nil, nil);
return nil;
}
--- 295,299 ----
if(err)
{
! NSRunCriticalAlertPanel(_(@"Error"), _(@"An unknown error occurred while initialising QuickTime Capture."), nil, nil, nil);
return nil;
}
***************
*** 306,313 ****
if(err)
{
fprintf(stderr, "SGNewChannel returned %d\n", err);
! errorString = [thisBundle localizedStringForKey:@"QTBusy"
! value: nil table: nil];
! NSRunCriticalAlertPanel(@"Error", errorString, nil, nil, nil);
return false;
}
--- 302,309 ----
if(err)
{
+ #ifdef DEBUG_CODE
fprintf(stderr, "SGNewChannel returned %d\n", err);
! #endif
! NSRunCriticalAlertPanel(_(@"Error"), _(@"Another application may be recording sound, or this computer may not have sound input hardware."), nil, nil, nil);
return false;
}
***************
*** 320,325 ****
long theRefNum;
OSErr err;
- NSString* errorString;
- NSBundle* thisBundle = [NSBundle bundleForClass:[self class]];
char* theSampleRates;
int i; unsigned long highestRate = 0;
--- 316,319 ----
***************
*** 366,372 ****
if(err)
{
! errorString = [thisBundle localizedStringForKey:@"QTPetulant"
! value: nil table: nil];
! NSRunCriticalAlertPanel(@"Error", errorString, nil, nil, nil);
return nil;
}
--- 360,364 ----
if(err)
{
! NSRunCriticalAlertPanel(_(@"Error"), _(@"Could not record sound, because the channel usage could not be set."), nil, nil, nil);
return nil;
}
***************
*** 374,380 ****
err = SGSetSoundRecordChunkSize(mySGCh, -6554);
if(err) {
! errorString = [thisBundle localizedStringForKey:@"QTInitErr"
! value: nil table: nil];
! NSRunCriticalAlertPanel(@"Error", errorString, nil, nil, nil);
return nil;
}
--- 366,370 ----
err = SGSetSoundRecordChunkSize(mySGCh, -6554);
if(err) {
! NSRunCriticalAlertPanel(_(@"Error"), _(@"An unknown error occurred while initialising Quicktime Capture."), nil, nil, nil);
return nil;
}
***************
*** 382,388 ****
err = SGStartRecord(mySGComp);
if(err) {
! errorString = [thisBundle localizedStringForKey:@"QTRecErr"
! value: nil table: nil];
! NSRunCriticalAlertPanel(@"Error", errorString, nil, nil, nil);
return nil;
}
--- 372,376 ----
err = SGStartRecord(mySGComp);
if(err) {
! NSRunCriticalAlertPanel(_(@"Error"), _(@"An unknown error occurred while trying to record sound."), nil, nil, nil);
return nil;
}
|
|
From: <sco...@li...> - 2002-07-19 07:55:22
|
Update of /cvsroot/scopeapp/scopeapp/English.lproj In directory usw-pr-cvs1:/tmp/cvs-serv5537/English.lproj Modified Files: Localizable.strings Log Message: Use new macro (borrowed from GNUMail) to mark localizable strings in source code Index: Localizable.strings =================================================================== RCS file: /cvsroot/scopeapp/scopeapp/English.lproj/Localizable.strings,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Localizable.strings 18 Jun 2002 05:07:06 -0000 1.1.1.1 --- Localizable.strings 19 Jul 2002 07:55:18 -0000 1.2 *************** *** 1,12 **** ! /* QuicktimeSampler error messages */ - QTNotFound = "Another application may be using QuickTime Capture, or it may not be installed. MacCRO will now quit." - QTUnknown = "An unknown error occurred while initialising QuickTime Capture. MacCRO will now quit." - QTBusy = "Another application may be recording sound, or this computer may not have sound input hardware. MacCRO will now quit." - QTPetulant = "Could not record sound, because Quicktime doesn't like me. MacCRO will now quit." - QTInitErr = "An unknown error occurred while initialising Quicktime Capture. MacCRO will now quit." - QTRecErr = "An unknown error occurred while trying to record sound. MacCRO will now quit." ! /* ASIOSampler error messages */ - /* Not implemented yet */ --- 1,38 ---- ! /** CoreAudioSampler.m **/ ! /** main.m **/ ! ! ! /** QuicktimeSampler.m **/ ! ! "Error" = "Error"; ! "Another application may be using QuickTime Capture, or it may not be installed." = "Another application may be using QuickTime Capture, or it may not be installed."; ! "An unknown error occurred while initialising QuickTime Capture." = "An unknown error occurred while initialising QuickTime Capture."; ! "Another application may be recording sound, or this computer may not have sound input hardware." = "Another application may be recording sound, or this computer may not have sound input hardware."; ! "Could not record sound, because the channel usage could not be set." = "Could not record sound, because the channel usage could not be set."; ! "An unknown error occurred while initialising Quicktime Capture." = "An unknown error occurred while initialising Quicktime Capture."; ! "An unknown error occurred while trying to record sound." = "An unknown error occurred while trying to record sound."; ! ! /** ScopeAppDelegate.m **/ ! ! ! /** ScopeController.m **/ ! ! "MacCRO X" = "MacCRO X"; ! "Display Controls" = "Display Controls"; ! "Oscilloscope" = "Oscilloscope"; ! "X/Y Plot" = "X/Y Plot"; ! ! /** ScopeView.m **/ ! ! ! /** TestSampler.m **/ ! ! ! /** TraceView.m **/ ! ! ! /** XYPlotView.m **/ ! |
|
From: <sco...@li...> - 2002-07-19 07:52:38
|
Update of /cvsroot/scopeapp/scopeapp
In directory usw-pr-cvs1:/tmp/cvs-serv4634
Added Files:
update-l10n.pl
Log Message:
Add script to auto-generate Localizable.strings
--- NEW FILE: update-l10n.pl ---
#! /usr/bin/perl -w
# update-l10n.pl
#
# Script to extract localisable strings in the form _(@"foo") from
# the source files, used to create English.lproj/Localizable.strings
#
# 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/update-l10n.pl,v 1.1 2002/07/19 07:52:34 narge Exp $
#
opendir SRCDIR,"./src";
@sourcefiles = readdir SRCDIR;
for $file (@sourcefiles)
{
if($file !~ /\.m$/) { next; }
print "/** ".$file." **/\n\n";
open SRCFILE,"./src/".$file;
read SRCFILE, $source, -s SRCFILE;
while($source =~ /\W_\(\@(.*?)\)/mg)
{
if(!$strings{$1})
{
print $1." = ".$1.";\n";
}
$strings{$1} = 1;
}
close SRCFILE;
print "\n";
}
|
|
From: <sco...@li...> - 2002-07-18 08:56:44
|
Update of /cvsroot/scopeapp/scopeapp/src In directory usw-pr-cvs1:/tmp/cvs-serv5377 Modified Files: GNUmakefile Log Message: Initial makefile (nearly works) Index: GNUmakefile =================================================================== RCS file: /cvsroot/scopeapp/scopeapp/src/GNUmakefile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** GNUmakefile 18 Jul 2002 08:46:54 -0000 1.1 --- GNUmakefile 18 Jul 2002 08:56:41 -0000 1.2 *************** *** 51,55 **** # scopeapp_RESOURCE_FILES= ! # FIXME: maybe the .lproj should be here? dunno what to do with those :) # --- 51,55 ---- # scopeapp_RESOURCE_FILES= ! # FIXME: maybe the .lproj should be here? # *************** *** 71,82 **** # scopeapp_OBJC_FILES = \ ! XYPlotView.m ! #ScopeAppDelegate.m ! #ScopeController.m ! #ScopeView.m ! #TestSampler.m ! #TraceView.m ! #QuicktimeSampler.m ! #CoreAudioSampler.m # --- 71,83 ---- # scopeapp_OBJC_FILES = \ ! main.m \ ! XYPlotView.m \ ! TraceView.m \ ! ScopeView.m \ ! ScopeController.m \ ! ScopeAppDelegate.m \ ! TestSampler.m ! #CoreAudioSampler.m # refuses to compile on linux ! #QuicktimeSampler.m # refuses to compile on linux # |
|
From: <sco...@li...> - 2002-07-18 08:48:42
|
Update of /cvsroot/scopeapp/scopeapp In directory usw-pr-cvs1:/tmp/cvs-serv2451 Removed Files: GNUmakefile Log Message: Makefile moved into src --- GNUmakefile DELETED --- |
|
From: <sco...@li...> - 2002-07-18 08:46:57
|
Update of /cvsroot/scopeapp/scopeapp/src In directory usw-pr-cvs1:/tmp/cvs-serv1772 Added Files: GNUmakefile Log Message: A bare version of a makefile (doesn't work yet) --- NEW FILE: GNUmakefile --- # GNUmakefile: main makefile for scopeapp (MacCRO X) # # Copyright (C) 2002 by Rafal Kolanski. # # Author: Rafal Kolanski # Date: 2002 # # Based on the GNUmakefile for Gorm's make file (C) Free Software # Foundation 1999 # # This file is part of scopeapp (MacCRO X). # # This program 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. # # This program 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 this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA # # $Header: /cvsroot/scopeapp/scopeapp/src/GNUmakefile,v 1.1 2002/07/18 08:46:54 xaphiosis Exp $ # Not needed yet #GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT) include $(GNUSTEP_MAKEFILES)/common.make # # Main application # #PACKAGE_NAME=scopeapp #needed? APP_NAME=scopeapp # no .gorm files scopeapp_MAIN_MODEL_FILE= scopeapp_APPLICATION_ICON= # # Additional libraries # ADDITIONAL_GUI_LIBS += # # Resource files # scopeapp_RESOURCE_FILES= # FIXME: maybe the .lproj should be here? dunno what to do with those :) # # Header files # scopeapp_HEADERS = \ CoreAudioSampler.h \ InputSampler.h \ QuicktimeSampler.h \ ScopeAppDelegate.h \ ScopeController.h \ ScopeView.h \ TestSampler.h \ TraceView.h \ XYPlotView.h # # Class files # scopeapp_OBJC_FILES = \ XYPlotView.m #ScopeAppDelegate.m #ScopeController.m #ScopeView.m #TestSampler.m #TraceView.m #QuicktimeSampler.m #CoreAudioSampler.m # -include GNUmakefile.preamble -include GNUmakefile.local include $(GNUSTEP_MAKEFILES)/application.make -include GNUmakefile.postamble |
|
From: <sco...@li...> - 2002-07-18 07:36:04
|
Update of /cvsroot/scopeapp/scopeapp/src
In directory usw-pr-cvs1:/tmp/cvs-serv4215
Modified Files:
ScopeView.m TestSampler.m XYPlotView.m
Log Message:
Minor fixes for compiling on linux
Index: ScopeView.m
===================================================================
RCS file: /cvsroot/scopeapp/scopeapp/src/ScopeView.m,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ScopeView.m 15 Jul 2002 06:01:56 -0000 1.6
--- ScopeView.m 18 Jul 2002 07:35:58 -0000 1.7
***************
*** 27,32 ****
#import "ScopeView.h"
! static double_t gTimeScales[10] = {0.001,0.002,0.005,0.01,0.02,0.05,0.1};
! static double_t gVoltScales[7] = {0.01,0.02,0.05,0.1,0.2,0.5,1};
// trigger channel settings
--- 27,32 ----
#import "ScopeView.h"
! static double gTimeScales[10] = {0.001,0.002,0.005,0.01,0.02,0.05,0.1};
! static double gVoltScales[7] = {0.01,0.02,0.05,0.1,0.2,0.5,1};
// trigger channel settings
Index: TestSampler.m
===================================================================
RCS file: /cvsroot/scopeapp/scopeapp/src/TestSampler.m,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TestSampler.m 25 Jun 2002 01:41:30 -0000 1.4
--- TestSampler.m 18 Jul 2002 07:36:00 -0000 1.5
***************
*** 27,30 ****
--- 27,32 ----
#import "TestSampler.h"
+ #include <math.h>
+
// Possible values for the sampler's conditional lock
enum
***************
*** 187,191 ****
myFrequency += 10 * ((float)random() / (float)INT_MAX - 0.5);
! if(myOwner == nil) return noErr;
for(curChannel = 0; curChannel < myChannelCount; curChannel++)
--- 189,193 ----
myFrequency += 10 * ((float)random() / (float)INT_MAX - 0.5);
! if(myOwner == nil) return self;
for(curChannel = 0; curChannel < myChannelCount; curChannel++)
***************
*** 210,214 ****
}
! return noErr;
}
--- 212,216 ----
}
! return self;
}
Index: XYPlotView.m
===================================================================
RCS file: /cvsroot/scopeapp/scopeapp/src/XYPlotView.m,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** XYPlotView.m 15 Jul 2002 06:05:46 -0000 1.1
--- XYPlotView.m 18 Jul 2002 07:36:00 -0000 1.2
***************
*** 27,31 ****
#import "XYPlotView.h"
! static double_t gVoltScales[7] = {0.01,0.02,0.05,0.1,0.2,0.5,1};
@implementation XYPlotView
--- 27,31 ----
#import "XYPlotView.h"
! static double gVoltScales[7] = {0.01,0.02,0.05,0.1,0.2,0.5,1};
@implementation XYPlotView
|
|
From: <sco...@li...> - 2002-07-18 07:34:49
|
Update of /cvsroot/scopeapp/scopeapp/src In directory usw-pr-cvs1:/tmp/cvs-serv3725 Modified Files: InputSampler.h Log Message: Work around forward reference bug in GCC Index: InputSampler.h =================================================================== RCS file: /cvsroot/scopeapp/scopeapp/src/InputSampler.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** InputSampler.h 25 Jun 2002 01:41:30 -0000 1.3 --- InputSampler.h 18 Jul 2002 07:34:46 -0000 1.4 *************** *** 29,34 **** typedef float Sample; ! // Forward declaration ! @protocol InputHandler; // ********** --- 29,48 ---- typedef float Sample; ! // ********** ! // Protocol for an object which handles sampled sound data ! // ********** ! @protocol InputHandler ! ! // Process the given blocks of data from the given input sampler. ! // inData points to an array of pointers to arrays of Sample ! // Warning: this function must be thread-safe, as it may be called from ! // the sampler's thread. ! -(id) processData: (Sample**) inData ! length: (unsigned long) frameCount ! channels: (int) channelCount ! rate: (float) sampleRate ! fromSampler: (id) sampler; ! ! @end // ********** *************** *** 38,42 **** // init a sampler with a given owner object ! -(id) initWithOwner: (id <InputHandler>) owner; // return YES if the sampler has an input settings dialog it can show --- 52,56 ---- // init a sampler with a given owner object ! -(id) initWithOwner: (id <InputHandler, NSObject>) owner; // return YES if the sampler has an input settings dialog it can show *************** *** 76,96 **** // return the number of channels in the input data -(char) channelCount; - - @end - - // ********** - // Protocol for an object which handles sampled sound data - // ********** - @protocol InputHandler - - // Process the given blocks of data from the given input sampler. - // inData points to an array of pointers to arrays of Sample - // Warning: this function must be thread-safe, as it may be called from - // the sampler's thread. - -(id) processData: (Sample**) inData - length: (unsigned long) frameCount - channels: (int) channelCount - rate: (float) sampleRate - fromSampler: (id <InputSampler, NSObject>) sampler; @end --- 90,93 ---- |
|
From: <sco...@li...> - 2002-07-18 07:33:50
|
Update of /cvsroot/scopeapp/scopeapp/MacCRO X.pbproj In directory usw-pr-cvs1:/tmp/cvs-serv3532/MacCRO X.pbproj Modified Files: project.pbxproj Log Message: Moved main.m to src |
|
From: <sco...@li...> - 2002-07-18 07:32:41
|
Update of /cvsroot/scopeapp/scopeapp/src
In directory usw-pr-cvs1:/tmp/cvs-serv3113
Added Files:
main.m
Log Message:
moved from top level, changed #import to work in gnustep too
--- NEW FILE: main.m ---
#import <AppKit/AppKit.h>
int main(int argc, const char *argv[])
{
return NSApplicationMain(argc, argv);
}
|
|
From: <sco...@li...> - 2002-07-18 07:31:53
|
Update of /cvsroot/scopeapp/scopeapp In directory usw-pr-cvs1:/tmp/cvs-serv2862 Removed Files: main.m Log Message: Moved to src directory --- main.m DELETED --- |
|
From: <sco...@li...> - 2002-07-17 16:20:31
|
Work dammit. |
|
From: <sco...@li...> - 2002-07-17 15:53:30
|
Update of /cvsroot/scopeapp/scopeapp In directory usw-pr-cvs1:/tmp/cvs-serv3816 Added Files: GNUmakefile Log Message: A bare version of a makefile (doesn't work yet) --- NEW FILE: GNUmakefile --- # GNUmakefile: main makefile for scopeapp (MacCRO X) # # Copyright (C) 2001 ???. # # Author: Rafal Kolanski # Date: 2001 # Based on Gorm's make file. # # This file is part of scopeapp (MacCRO X). # # This program 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. # # This program 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 this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA # # Not needed yet #GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT) include $(GNUSTEP_MAKEFILES)/common.make # # Main application # #PACKAGE_NAME=scopeapp #needed? APP_NAME=scopeapp # no .gorm files scopeapp_MAIN_MODEL_FILE= scopeapp_APPLICATION_ICON= # # Additional libraries # ADDITIONAL_GUI_LIBS += # # Resource files # scopeapp_RESOURCE_FILES= # FIXME: maybe the .lproj should be here? dunno what to do with those :) # # Header files # scopeapp_HEADERS = \ src/CCoreAudioSampler.h \ src/InputSampler.h \ src/QuicktimeSampler.h \ src/ScopeAppDelegate.h \ src/ScopeController.h \ src/ScopeView.h \ src/TestSampler.h \ src/TraceView.h \ src/XYPlotView.h # # Class files # scopeapp_OBJC_FILES = \ src/XYPlotView.m #src/ScopeAppDelegate.m #src/ScopeController.m #src/ScopeView.m #src/TestSampler.m #src/TraceView.m #src/QuicktimeSampler.m #src/CoreAudioSampler.m # -include GNUmakefile.preamble -include GNUmakefile.local include $(GNUSTEP_MAKEFILES)/application.make -include GNUmakefile.postamble |
