scopeapp-cvs Mailing List for MacCRO X (Page 4)
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...> - 2003-02-05 13:00:00
|
Update of /cvsroot/scopeapp/scopeapp In directory sc8-pr-cvs1:/tmp/cvs-serv20746 Modified Files: ChangeLog Log Message: Fixed names in rcs2log-generated part of ChangeLog Index: ChangeLog =================================================================== RCS file: /cvsroot/scopeapp/scopeapp/ChangeLog,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ChangeLog 5 Feb 2003 12:58:52 -0000 1.2 --- ChangeLog 5 Feb 2003 12:59:57 -0000 1.3 *************** *** 84,88 **** Add code to show license window. ! 2002-12-08 xaphiosis <xap...@us...> * src/ScopeController.m: Added copyright, removed debugging messages. --- 84,88 ---- Add code to show license window. ! 2002-12-08 Rafal Kolanski <xap...@us...> * src/ScopeController.m: Added copyright, removed debugging messages. *************** *** 91,100 **** New display method executable as main thread. The call is still commented out (gnustep bug?) ! 2002-12-07 xaphiosis <xap...@us...> * src/ScopeAppGlobals.h: Redefinition of "_" is not necessary on GNUstep. Already in NSBundle.h ! 2002-12-06 xaphiosis <xap...@us...> * src/ScopeController.m: --- 91,100 ---- New display method executable as main thread. The call is still commented out (gnustep bug?) ! 2002-12-07 Rafal Kolanski <xap...@us...> * src/ScopeAppGlobals.h: Redefinition of "_" is not necessary on GNUstep. Already in NSBundle.h ! 2002-12-06 Rafal Kolanski <xap...@us...> * src/ScopeController.m: *************** *** 119,123 **** Add new InputSampler using the PortAudio library ! 2002-11-12 xaphiosis <xap...@us...> * src/ScopeView.m: Branch broke some stuff. First try at fixing. --- 119,123 ---- Add new InputSampler using the PortAudio library ! 2002-11-12 Rafal Kolanski <xap...@us...> * src/ScopeView.m: Branch broke some stuff. First try at fixing. *************** *** 155,159 **** Localise menu items (gnustep only, for now) ! 2002-07-31 xaphiosis <xap...@us...> * src/ScopeAppDelegate.m, src/ScopeAppDelegate.h: --- 155,159 ---- Localise menu items (gnustep only, for now) ! 2002-07-31 Rafal Kolanski <xap...@us...> * src/ScopeAppDelegate.m, src/ScopeAppDelegate.h: *************** *** 175,179 **** own the ScopeController object(s). ! 2002-07-29 xaphiosis <xap...@us...> * src/ScopeAppDelegate.m: Changed controller to myController. --- 175,179 ---- own the ScopeController object(s). ! 2002-07-29 Rafal Kolanski <xap...@us...> * src/ScopeAppDelegate.m: Changed controller to myController. *************** *** 186,190 **** Added temporary override of the [self display] crash. ! 2002-07-22 xaphiosis <xap...@us...> * src/GNUmakefile: Oops. Had wrong slash. Fixed. --- 186,190 ---- Added temporary override of the [self display] crash. ! 2002-07-22 Rafal Kolanski <xap...@us...> * src/GNUmakefile: Oops. Had wrong slash. Fixed. *************** *** 204,208 **** called twice on macosx ! 2002-07-21 xaphiosis <xap...@us...> * src/GNUmakefile: Small fix in comments. --- 204,208 ---- called twice on macosx ! 2002-07-21 Rafal Kolanski <xap...@us...> * src/GNUmakefile: Small fix in comments. *************** *** 227,231 **** * src/TestSampler.m, src/TestSampler.h: Fix boolean confusion ! 2002-07-20 xaphiosis <xap...@us...> * src/TestSampler.h: --- 227,231 ---- * src/TestSampler.m, src/TestSampler.h: Fix boolean confusion ! 2002-07-20 Rafal Kolanski <xap...@us...> * src/TestSampler.h: *************** *** 250,254 **** * update-l10n.pl: Add script to auto-generate Localizable.strings ! 2002-07-18 xaphiosis <xap...@us...> * src/GNUmakefile: Initial makefile (nearly works) --- 250,254 ---- * update-l10n.pl: Add script to auto-generate Localizable.strings ! 2002-07-18 Rafal Kolanski <xap...@us...> * src/GNUmakefile: Initial makefile (nearly works) *************** *** 270,274 **** * main.m: Moved to src directory ! 2002-07-17 xaphiosis <xap...@us...> * GNUmakefile: A bare version of a makefile (doesn't work yet) --- 270,274 ---- * main.m: Moved to src directory ! 2002-07-17 Rafal Kolanski <xap...@us...> * GNUmakefile: A bare version of a makefile (doesn't work yet) |
|
From: <sco...@li...> - 2003-02-05 12:58:55
|
Update of /cvsroot/scopeapp/scopeapp In directory sc8-pr-cvs1:/tmp/cvs-serv20010 Modified Files: ChangeLog Log Message: Add my changelog entries for today (5th feb 03) Index: ChangeLog =================================================================== RCS file: /cvsroot/scopeapp/scopeapp/ChangeLog,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ChangeLog 2 Feb 2003 06:35:08 -0000 1.1 --- ChangeLog 5 Feb 2003 12:58:52 -0000 1.2 *************** *** 1,2 **** --- 1,31 ---- + 2003-02-05 Philip Derrin <na...@us...> + + * src/ScopeAppDefaults.m, src/ScopeAppDefaults.h: + New files containing a class to conveniently deal with user prefs. + + * English.lproj/PrefsPanel.nib: + New bundle containing preferences panel interface + + * English.lproj/MainMenu.nib: + Enabled preferences menu item; moved Close item to Window menu; + added item to bring the control panel to the front + + * src/TraceView.m (-drawRect:): + Use user preferences to select drawing colours. + + * src/ScopeController.h, src/ScopeController.m + (orderFrontControlWindow:): + New method to bring the control window to the front + + * src/ScopeAppDelegate.h, src/ScopeAppDelegate.m + (orderFrontPreferencesPanel:): + New method to open the preferences panel + + * src/SpectrumView.h, src/SpectrumView.m (-updateDisplay:, + -changedFreqScale:, -changedVoltScale:): + Corrected a number of stupid maths bugs involving logarithmic scales + and calculation of offsets; replaced "scale" and "offset" variables + with more appropriate "to" and "from". + 2003-02-01 Philip Derrin <na...@us...> |
|
From: <sco...@li...> - 2003-02-05 12:57:46
|
Update of /cvsroot/scopeapp/scopeapp/MacCRO X.pbproj In directory sc8-pr-cvs1:/tmp/cvs-serv19805/MacCRO X.pbproj Modified Files: project.pbxproj Log Message: Add new files (ScopeAppDefaults.[mh], PrefsPanel.nib) |
|
From: <sco...@li...> - 2003-02-05 12:57:15
|
Update of /cvsroot/scopeapp/scopeapp/src
In directory sc8-pr-cvs1:/tmp/cvs-serv19492/src
Modified Files:
SpectrumView.h SpectrumView.m
Log Message:
Corrected a number of stupid maths bugs involving logarithmic scales and
calculation of offsets; replaced "scale" and "offset" variables with more
appropriate "to" and "from".
Index: SpectrumView.h
===================================================================
RCS file: /cvsroot/scopeapp/scopeapp/src/SpectrumView.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SpectrumView.h 2 Feb 2003 05:28:08 -0000 1.3
--- SpectrumView.h 5 Feb 2003 12:57:12 -0000 1.4
***************
*** 60,65 ****
@protected
// spectrum analyser settings
! double myXScales[2], myYScales[2];
! double myXOffsets[2], myYOffsets[2];
BOOL myXIsLog, myYIsLog;
double myGain;
--- 60,65 ----
@protected
// spectrum analyser settings
! double myXFrom[2], myYFrom[2];
! double myXTo[2], myYTo[2];
BOOL myXIsLog, myYIsLog;
double myGain;
Index: SpectrumView.m
===================================================================
RCS file: /cvsroot/scopeapp/scopeapp/src/SpectrumView.m,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SpectrumView.m 1 Feb 2003 09:15:11 -0000 1.4
--- SpectrumView.m 5 Feb 2003 12:57:12 -0000 1.5
***************
*** 38,49 ****
myDataWanted[0] = 4096;
myDataWanted[1] = 4096;
! myXScales[0] = 1.0;
! myYScales[0] = 1.0;
! myXScales[1] = 1.0;
! myYScales[1] = 1.0;
! myXOffsets[0] = 0.0;
! myYOffsets[0] = 0.0;
! myXOffsets[1] = 0.0;
! myYOffsets[1] = 0.0;
myFFTSetup = create_fftsetup(12, kFFTRadix2); // FIXME make sure log2n is ok
--- 38,49 ----
myDataWanted[0] = 4096;
myDataWanted[1] = 4096;
! myXFrom[0] = 1.0;
! myYFrom[0] = 1.0;
! myXFrom[1] = 1.0;
! myYFrom[1] = 1.0;
! myXTo[0] = 0.0;
! myYTo[0] = 0.0;
! myXTo[1] = 0.0;
! myYTo[1] = 0.0;
myFFTSetup = create_fftsetup(12, kFFTRadix2); // FIXME make sure log2n is ok
***************
*** 87,105 ****
if(wasDrawing) [self startDrawing];
} else {
! float from, to;
!
! from = [myFreqFrom floatValue];
! to = [myFreqTo floatValue];
!
! if(to - from <= 0) {
! myXScales[0] = 0;
! } else {
! myXScales[0] = 1 / (to - from);
! }
!
! myXScales[1] = myXScales[0];
! myXOffsets[0] = from;
! myXOffsets[1] = from;
if([myFreqIsLogCheckbox state] == NSOnState) {
--- 87,95 ----
if(wasDrawing) [self startDrawing];
} else {
! myXFrom[0] = [myFreqFrom floatValue];
! myXTo[0] = [myFreqTo floatValue];
! myXFrom[1] = myXFrom[0];
! myXTo[1] = myXTo[0];
if([myFreqIsLogCheckbox state] == NSOnState) {
***************
*** 125,138 ****
}
! if(to - from <= 0) {
! myYScales[0] = 0;
! } else {
! myYScales[0] = to - from;
! }
!
! myYScales[1] = myYScales[0];
!
! myYOffsets[0] = from;
! myYOffsets[1] = from;
if([myAmpIsLogCheckbox state] == NSOnState) {
--- 115,120 ----
}
! myYFrom[0] = myYFrom[1] = from;
! myYTo[0] = myYTo[1] = to;
if([myAmpIsLogCheckbox state] == NSOnState) {
***************
*** 181,185 ****
{
float curX, curY;
! float xscale, yscale;
int i, istart;
float *real, *imag;
--- 163,167 ----
{
float curX, curY;
! float xscale, yscale, xoffset, yoffset;
int i, istart;
float *real, *imag;
***************
*** 220,237 ****
// calculate the values by which frequency and magnitude must be
! // scaled
! xscale = mySampleRate * myXScales[inTrace] / myDataStored[inTrace];
! yscale = myGain * myYScales[inTrace];
// calculate the first value to be plotted
! istart = floor(myXOffsets[inTrace]) - 1;
if (istart < 0) istart = 0;
for(i = istart; i < myDataStored[inTrace] / 2; i++) {
! double f = (i - istart) * xscale;
! double m = myYOffsets[inTrace] + (sqrt(real[i] * real[i]
! + imag[i] * imag[i]) * yscale);
! curX = myXIsLog ? log10(f) : f;
! curY = myYIsLog ? log10(m) : m;
[myTracePaths[inTrace] addPoint: NSMakePoint(curX, curY)];
// if we've gone past the right-hand edge of the display, stop
--- 202,238 ----
// calculate the values by which frequency and magnitude must be
! // scaled and offset
! xoffset = -myXFrom[inTrace];
!
! if(myXTo[inTrace] - myXFrom[inTrace] <= 0) {
! xscale = 0;
! } else if(myXIsLog) {
! xscale = 1 / log10(myXTo[inTrace] / myXFrom[inTrace]);
! xoffset = -log10(myXFrom[inTrace] * myDataStored[inTrace]
! / mySampleRate);
! } else {
! xscale = mySampleRate /
! ((myXTo[inTrace] - myXFrom[inTrace]) * myDataStored[inTrace]);
! }
!
! yoffset = -myYFrom[inTrace];
!
! if(myYTo[inTrace] - myYFrom[inTrace] <= 0) {
! yscale = 0;
! } else if(myYIsLog) {
! yscale = 1 / log10(myYFrom[inTrace] / myYTo[inTrace]);
! yoffset = -log10(myYFrom[inTrace] / myGain);
! } else {
! yscale = myGain / (myYTo[inTrace] - myYFrom[inTrace]);
! }
// calculate the first value to be plotted
! istart = floor(myXFrom[inTrace] * myDataStored[inTrace] / mySampleRate) - 1;
if (istart < 0) istart = 0;
for(i = istart; i < myDataStored[inTrace] / 2; i++) {
! double m = sqrt(real[i] * real[i] + imag[i] * imag[i]);
! curX = ((myXIsLog ? log10(i) : i) + xoffset) * xscale;
! curY = ((myYIsLog ? log10(m) : m) + yoffset) * yscale;
[myTracePaths[inTrace] addPoint: NSMakePoint(curX, curY)];
// if we've gone past the right-hand edge of the display, stop
|
|
From: <sco...@li...> - 2003-02-05 12:56:17
|
Update of /cvsroot/scopeapp/scopeapp/src
In directory sc8-pr-cvs1:/tmp/cvs-serv19293/src
Modified Files:
ScopeAppDelegate.h ScopeAppDelegate.m
Log Message:
New method to open the preferences panel
Index: ScopeAppDelegate.h
===================================================================
RCS file: /cvsroot/scopeapp/scopeapp/src/ScopeAppDelegate.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ScopeAppDelegate.h 10 Dec 2002 15:01:11 -0000 1.11
--- ScopeAppDelegate.h 5 Feb 2003 12:56:14 -0000 1.12
***************
*** 42,45 ****
--- 42,47 ----
- (void) applicationDidFinishLaunching: (NSNotification *)not;
+ - (IBAction) orderFrontPreferencesPanel: (id) sender;
+
- (IBAction) orderFrontLicensePanel: (id) sender;
Index: ScopeAppDelegate.m
===================================================================
RCS file: /cvsroot/scopeapp/scopeapp/src/ScopeAppDelegate.m,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** ScopeAppDelegate.m 2 Feb 2003 05:28:07 -0000 1.18
--- ScopeAppDelegate.m 5 Feb 2003 12:56:14 -0000 1.19
***************
*** 27,30 ****
--- 27,31 ----
#import "ScopeAppGlobals.h"
#import "ScopeAppDelegate.h"
+ #import "ScopeAppDefaults.h"
#import "ScopeController.h"
#import "InputSampler.h"
***************
*** 63,66 ****
--- 64,72 ----
{
return YES; // FIXME change after adding support for reading from files ?
+ }
+
+ - (IBAction) orderFrontPreferencesPanel: (id) sender
+ {
+ [[ScopeAppDefaults sharedInstance] showPreferencesPanel];
}
|
|
From: <sco...@li...> - 2003-02-05 12:55:41
|
Update of /cvsroot/scopeapp/scopeapp/src
In directory sc8-pr-cvs1:/tmp/cvs-serv19006/src
Modified Files:
ScopeController.h ScopeController.m
Log Message:
New method to bring the control window to the front
Index: ScopeController.h
===================================================================
RCS file: /cvsroot/scopeapp/scopeapp/src/ScopeController.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ScopeController.h 2 Feb 2003 05:28:08 -0000 1.8
--- ScopeController.h 5 Feb 2003 12:55:38 -0000 1.9
***************
*** 55,58 ****
--- 55,60 ----
didSelectTabViewItem: (NSTabViewItem*) tabViewItem;
+ -(IBAction) orderFrontControlWindow: (id) sender;
+
@end
Index: ScopeController.m
===================================================================
RCS file: /cvsroot/scopeapp/scopeapp/src/ScopeController.m,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ScopeController.m 2 Feb 2003 05:28:08 -0000 1.12
--- ScopeController.m 5 Feb 2003 12:55:38 -0000 1.13
***************
*** 155,158 ****
--- 155,164 ----
willSelectTabViewItem: (NSTabViewItem*) tabViewItem { }
+ -(IBAction) orderFrontControlWindow: (id) sender
+ {
+ [myControlPanel orderWindow: NSWindowAbove
+ relativeTo: [[self window] windowNumber]];
+ }
+
@end
|
|
From: <sco...@li...> - 2003-02-05 12:55:01
|
Update of /cvsroot/scopeapp/scopeapp/src In directory sc8-pr-cvs1:/tmp/cvs-serv18667/src Modified Files: TraceView.m Log Message: Use user preferences to select drawing colours. Index: TraceView.m =================================================================== RCS file: /cvsroot/scopeapp/scopeapp/src/TraceView.m,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** TraceView.m 2 Feb 2003 05:28:08 -0000 1.11 --- TraceView.m 5 Feb 2003 12:54:58 -0000 1.12 *************** *** 26,29 **** --- 26,30 ---- #import "TraceView.h" + #import "ScopeAppDefaults.h" // possible states for the data NSConditionLock *************** *** 102,107 **** NSTimeInterval time; #endif - NSColor* backColor = [NSColor whiteColor]; - NSColor* foreColor; NSRect bounds = [self bounds]; NSGraphicsContext* context; --- 103,106 ---- *************** *** 115,119 **** [NSBezierPath clipRect: rect]; ! [backColor set]; [NSBezierPath fillRect: rect]; --- 114,118 ---- [NSBezierPath clipRect: rect]; ! [[[ScopeAppDefaults sharedInstance] colourForBackground] set]; [NSBezierPath fillRect: rect]; *************** *** 136,146 **** // draw trace A ! foreColor = [NSColor blackColor]; ! [foreColor set]; [myTracePaths[0] stroke]; // draw trace B ! foreColor = [NSColor redColor]; ! [foreColor set]; [myTracePaths[1] stroke]; --- 135,143 ---- // draw trace A ! [[[ScopeAppDefaults sharedInstance] colourForTrace: 0] set]; [myTracePaths[0] stroke]; // draw trace B ! [[[ScopeAppDefaults sharedInstance] colourForTrace: 1] set]; [myTracePaths[1] stroke]; |
|
From: <sco...@li...> - 2003-02-05 12:52:37
|
Update of /cvsroot/scopeapp/scopeapp/English.lproj/MainMenu.nib
In directory sc8-pr-cvs1:/tmp/cvs-serv17628/English.lproj/MainMenu.nib
Modified Files:
classes.nib info.nib objects.nib
Log Message:
Enabled preferences menu item; moved Close item to Window menu; added item to
bring the control panel to the front
Index: classes.nib
===================================================================
RCS file: /cvsroot/scopeapp/scopeapp/English.lproj/MainMenu.nib/classes.nib,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** classes.nib 10 Dec 2002 15:04:45 -0000 1.2
--- classes.nib 5 Feb 2003 12:52:33 -0000 1.3
***************
*** 2,6 ****
IBClasses = (
{
! ACTIONS = {orderFrontLicensePanel = id; };
CLASS = FirstResponder;
LANGUAGE = ObjC;
--- 2,10 ----
IBClasses = (
{
! ACTIONS = {
! orderFrontControlWindow = id;
! orderFrontLicensePanel = id;
! orderFrontPreferencesPanel = id;
! };
CLASS = FirstResponder;
LANGUAGE = ObjC;
Index: info.nib
===================================================================
RCS file: /cvsroot/scopeapp/scopeapp/English.lproj/MainMenu.nib/info.nib,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** info.nib 10 Dec 2002 15:04:45 -0000 1.3
--- info.nib 5 Feb 2003 12:52:33 -0000 1.4
***************
*** 8,12 ****
<dict>
<key>29</key>
! <string>36 588 285 44 0 0 1280 1002 </string>
</dict>
<key>IBFramework Version</key>
--- 8,12 ----
<dict>
<key>29</key>
! <string>403 938 285 44 0 0 1280 1002 </string>
</dict>
<key>IBFramework Version</key>
Index: objects.nib
===================================================================
RCS file: /cvsroot/scopeapp/scopeapp/English.lproj/MainMenu.nib/objects.nib,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
Binary files /tmp/cvsxZX4nv and /tmp/cvsS3FcAQ differ
|
|
From: <sco...@li...> - 2003-02-05 12:51:44
|
Update of /cvsroot/scopeapp/scopeapp/English.lproj/PrefsPanel.nib
In directory sc8-pr-cvs1:/tmp/cvs-serv17436/English.lproj/PrefsPanel.nib
Added Files:
classes.nib info.nib objects.nib
Log Message:
New bundle containing preferences panel interface
--- NEW FILE: classes.nib ---
{
IBClasses = (
{CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
{
ACTIONS = {changedSetting = id; };
CLASS = ScopeAppDefaults;
LANGUAGE = ObjC;
OUTLETS = {
myBackColourWell = NSColorWell;
myGridColourWell = NSColorWell;
myMetalWindowControl = NSButton;
myPrefsPanel = NSPanel;
myTraceAColourWell = NSColorWell;
myTraceBColourWell = NSColorWell;
};
SUPERCLASS = NSObject;
}
);
IBVersion = 1;
}
--- NEW FILE: info.nib ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
<string>75 157 356 240 0 0 1280 1002 </string>
<key>IBFramework Version</key>
<string>286.0</string>
<key>IBOpenObjects</key>
<array>
<integer>5</integer>
</array>
<key>IBSystem Version</key>
<string>6F21</string>
</dict>
</plist>
--- NEW FILE: objects.nib ---
(This appears to be a binary file; contents omitted.)
|
|
From: <sco...@li...> - 2003-02-05 12:50:49
|
Update of /cvsroot/scopeapp/scopeapp/English.lproj/PrefsPanel.nib In directory sc8-pr-cvs1:/tmp/cvs-serv17173/English.lproj/PrefsPanel.nib Log Message: Directory /cvsroot/scopeapp/scopeapp/English.lproj/PrefsPanel.nib added to the repository |
|
From: <sco...@li...> - 2003-02-05 12:50:22
|
Update of /cvsroot/scopeapp/scopeapp/src
In directory sc8-pr-cvs1:/tmp/cvs-serv16672/src
Added Files:
ScopeAppDefaults.h ScopeAppDefaults.m
Log Message:
New files containing a class to conveniently deal with user prefs.
--- NEW FILE: ScopeAppDefaults.h ---
//
// ScopeAppDefaults.h
// MacCRO X
//
// Created by Philip Derrin on Wed Feb 05 2003.
// Copyright (c) 2003 Philip Derrin. All rights reserved.
//
// 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/ScopeAppDefaults.h,v 1.1 2003/02/05 12:50:19 narge Exp $
//
#import <Foundation/Foundation.h>
#import <AppKit/AppKit.h>
// This class is a wrapper around NSUserDefaults. It exists for two reasons:
// to provide convenient methods for getting current settings and showing the
// prefs panel; and to provide thread-safety, which NSUserDefaults does not have.
@interface ScopeAppDefaults : NSObject {
NSColor* myTraceColours[2];
NSColor* myBackColour;
NSColor* myGridColour;
IBOutlet NSPanel* myPrefsPanel;
IBOutlet NSColorWell* myTraceAColourWell;
IBOutlet NSColorWell* myTraceBColourWell;
IBOutlet NSColorWell* myBackColourWell;
IBOutlet NSColorWell* myGridColourWell;
}
+ sharedInstance;
- (void) showPreferencesPanel;
- (NSColor*) colourForTrace: (int) inTrace;
- (NSColor*) colourForBackground;
- (NSColor*) colourForGrid;
- (IBAction) changedSetting: (id) sender;
@end
--- NEW FILE: ScopeAppDefaults.m ---
//
// ScopeAppDefaults.m
// MacCRO X
//
// Created by Philip Derrin on Wed Feb 05 2003.
// Copyright (c) 2003 Philip Derrin. All rights reserved.
//
// 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/ScopeAppDefaults.m,v 1.1 2003/02/05 12:50:19 narge Exp $
//
#import "ScopeAppDefaults.h"
#define SATraceColour0 @"Colour for trace A"
#define SATraceColour1 @"Colour for trace B"
#define SABackColour @"Background colour"
#define SAGridColour @"Grid colour"
NSLock* gDefaultsLock = nil;
@interface ScopeAppDefaults (SADefaultsPrivate)
- sharedInit;
- loadDefaults;
- saveDefaults;
@end
@implementation ScopeAppDefaults
+ sharedInstance
{
static ScopeAppDefaults* shared = nil;
if(shared == nil) {
shared = [[ScopeAppDefaults alloc] sharedInit];
}
return shared;
}
- (void) showPreferencesPanel
{
if(myPrefsPanel == nil)
{
[NSBundle loadNibNamed:@"PrefsPanel" owner: self];
[myTraceAColourWell setColor: myTraceColours[0]];
[myTraceBColourWell setColor: myTraceColours[1]];
[myBackColourWell setColor: myBackColour];
[myGridColourWell setColor: myGridColour];
}
[myPrefsPanel makeKeyAndOrderFront: self];
}
- (NSColor*) colourForTrace: (int) inTrace
{
return myTraceColours[inTrace];
}
- (NSColor*) colourForBackground
{
return myBackColour;
}
- (NSColor*) colourForGrid
{
return myGridColour;
}
- (IBAction) changedSetting: (id) sender
{
[myTraceColours[0] autorelease];
myTraceColours[0] = [[myTraceAColourWell color] retain];
[myTraceColours[1] autorelease];
myTraceColours[1] = [[myTraceBColourWell color] retain];
[myBackColour autorelease];
myBackColour = [[myBackColourWell color] retain];
[myGridColour autorelease];
myGridColour = [[myGridColourWell color] retain];
[self saveDefaults];
}
@end
@implementation ScopeAppDefaults (SADefaultsPrivate)
- sharedInit
{
self = [super init];
if(self != nil)
{
if(gDefaultsLock == nil) gDefaultsLock = [[NSLock alloc] init];
[self loadDefaults];
myPrefsPanel = nil;
}
return self;
}
- loadDefaults
{
NSUserDefaults* defaults;
NSData* data;
[gDefaultsLock lock];
defaults = [NSUserDefaults standardUserDefaults];
data = [defaults objectForKey: SATraceColour0];
if(data == nil) {
myTraceColours[0] = [NSColor greenColor];
} else {
myTraceColours[0] = [NSUnarchiver unarchiveObjectWithData: data];
}
[myTraceColours[0] retain];
data = [defaults objectForKey: SATraceColour1];
if(data == nil) {
myTraceColours[1] = [NSColor cyanColor];
} else {
myTraceColours[1] = [NSUnarchiver unarchiveObjectWithData: data];
}
[myTraceColours[1] retain];
data = [defaults objectForKey: SABackColour];
if(data == nil) {
myBackColour = [NSColor blackColor];
} else {
myBackColour = [NSUnarchiver unarchiveObjectWithData: data];
}
[myBackColour retain];
data = [defaults objectForKey: SAGridColour];
if(data == nil) {
myGridColour = [NSColor grayColor];
} else {
myGridColour = [NSUnarchiver unarchiveObjectWithData: data];
}
[myGridColour retain];
[gDefaultsLock unlock];
return self;
}
- saveDefaults
{
NSUserDefaults* defaults;
[gDefaultsLock lock];
defaults = [NSUserDefaults standardUserDefaults];
[defaults
setObject: [NSArchiver archivedDataWithRootObject: myTraceColours[0]]
forKey: SATraceColour0];
[defaults
setObject: [NSArchiver archivedDataWithRootObject: myTraceColours[1]]
forKey: SATraceColour1];
[defaults
setObject: [NSArchiver archivedDataWithRootObject: myBackColour]
forKey: SABackColour];
[defaults
setObject: [NSArchiver archivedDataWithRootObject: myGridColour]
forKey: SAGridColour];
[gDefaultsLock unlock];
return self;
}
@end
|
|
From: <sco...@li...> - 2003-02-02 11:46:50
|
Update of /cvsroot/scopeapp/web In directory sc8-pr-cvs1:/tmp/cvs-serv9129 Modified Files: index.html Log Message: Add download instructions for 0.1 alpha release Index: index.html =================================================================== RCS file: /cvsroot/scopeapp/web/index.html,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** index.html 10 Jan 2003 01:40:48 -0000 1.1.1.1 --- index.html 2 Feb 2003 11:46:47 -0000 1.2 *************** *** 14,42 **** captured from sound input devices, or stored in recorded audio files.</p> ! <p>MacCRO was originally developed for classic Mac OS; this is the Mac OS X ! version. I am unfortunately unable to open-source the original version. ! However, this version will (eventually) be better than the original.</p> ! <p>MacCRO X will be written in Objective-C using Apple's <a ! href="http://developer.apple.com/cocoa">Cocoa framework</a>. I have ! also had offers of help to develop a Linux version using the <a ! href="http://www.gnustep.org/">GNUstep libraries</a>. ! If you wish to assist in some way, please contact me.</p> ! <p>The existing code is nowhere near complete: the spectrum ! analyser and lissajous are not implemented at all, and the ! oscilloscope has major bugs. Searching for "FIXME" also returns far more ! results than it should. It's a good start, though.</p> ! <p>You can find the source code for MacCRO at its ! <a href="http://www.sourceforge.net/projects/scopeapp/"> ! Sourceforge project page</a>. Currently no files have been released, so ! you'll need to use anonymous cvs - just open up a Terminal window and ! follow the instructions on the Sourceforge cvs page.</a> ! <p><a href="mailto:na...@us...">Philip Derrin</a></p> <p><a href="http://sourceforge.net"><img src="http://sourceforge.net/sflogo.php?group_id=56104&type=7" width="201" height="62" border="0" alt="SourceForge Logo"></a></p> - </BODY> --- 14,41 ---- captured from sound input devices, or stored in recorded audio files.</p> ! <p>MacCRO was originally developed for classic Mac OS, but that version is no ! longer distributed or supported. This version will (eventually) be better than ! the original.</p> ! <p>MacCRO X is written in Objective-C using Apple's ! <a href="http://developer.apple.com/cocoa">Cocoa framework</a>. I have also had ! offers of help to develop a Linux version using the ! <a href="http://www.gnustep.org/">GNUstep libraries</a>. If you wish to assist ! in some way, please <a href="mailto:na...@us...">contact me</a>.</p> ! <h2>Alpha release</h2> ! <p>An alpha release of MacCRO X (for Mac OS X 10.2 only) is now available. ! Please note that this is only a testing release. There may be bugs, and there ! are a few features still missing which will be implemented in the near future. ! However, if you think you might find MacCRO useful, please download it and ! try it out. If you find any bugs, you can report them using the bug tracker on ! <a href="http://sourceforge.net/projects/scopeapp/">MacCRO's SourceForge page</a>.</p> ! <p><a href="http://sourceforge.net/project/showfiles.php?group_id=56104">Download MacCRO X 0.1</a></p> ! <p><a href="http://sourceforge.net/tracker/?group_id=56104&atid=479362">Report a bug</a></p> ! <p><a href="http://sourceforge.net/tracker/?group_id=56104&atid=479365">Request a feature</a></p> <p><a href="http://sourceforge.net"><img src="http://sourceforge.net/sflogo.php?group_id=56104&type=7" width="201" height="62" border="0" alt="SourceForge Logo"></a></p> </BODY> |
|
From: <sco...@li...> - 2003-02-02 11:43:00
|
Update of /cvsroot/scopeapp/web
In directory sc8-pr-cvs1:/tmp/cvs-serv8921
Modified Files:
default.css
Log Message:
Fix fonts slightly
Index: default.css
===================================================================
RCS file: /cvsroot/scopeapp/web/default.css,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** default.css 10 Jan 2003 01:40:48 -0000 1.1.1.1
--- default.css 2 Feb 2003 11:42:57 -0000 1.2
***************
*** 2,10 ****
color: black;
background: white;
! font-family: "Apple Garamond", "Garamond Narrow", serif
}
TABLE {
color: black;
! font-family: "Apple Garamond", "Garamond Narrow", serif
}
TH {
--- 2,10 ----
color: black;
background: white;
! font-family: Palatino, serif
}
TABLE {
color: black;
! font-family: Palatino, serif
}
TH {
|
|
From: <sco...@li...> - 2003-02-02 10:23:18
|
Update of /cvsroot/scopeapp/scopeapp/English.lproj In directory sc8-pr-cvs1:/tmp/cvs-serv16535 Modified Files: Localizable.strings Log Message: Remove unused messages Index: Localizable.strings =================================================================== RCS file: /cvsroot/scopeapp/scopeapp/English.lproj/Localizable.strings,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Localizable.strings 10 Dec 2002 15:07:40 -0000 1.4 --- Localizable.strings 2 Feb 2003 10:23:15 -0000 1.5 *************** *** 7,18 **** /** ScopeAppDelegate.m **/ - "Quit" = "Quit"; /** ScopeController.m **/ - "MacCRO X" = "MacCRO X"; - "Display Controls" = "Display Controls"; - "Oscilloscope" = "Oscilloscope"; - "X/Y Plot" = "X/Y Plot"; /** ScopeView.m **/ --- 7,13 ---- |
|
From: <sco...@li...> - 2003-02-02 10:22:19
|
Update of /cvsroot/scopeapp/scopeapp In directory sc8-pr-cvs1:/tmp/cvs-serv16160 Modified Files: Source Readme.rtf Log Message: Updated to refer to alpha release Index: Source Readme.rtf =================================================================== RCS file: /cvsroot/scopeapp/scopeapp/Source Readme.rtf,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Source Readme.rtf 1 Feb 2003 09:10:35 -0000 1.1 --- Source Readme.rtf 2 Feb 2003 10:22:16 -0000 1.2 *************** *** 8,11 **** --- 8,12 ---- \fs28 Copyright \'a9 2002, 2003 by Philip Derrin\ + http://scopeapp.sourceforge.net/\ \f1\b0 \ *************** *** 14,20 **** \f1\b0 \ ! This is the source code package for MacCRO X. It is distributed under the GNU General Public License; refer to License.rtf for the full text. There are currently no binaries distributed by me, because I do not consider MacCRO X to be in a useable state (yet).\ \ ! This is a complete rewrite of MacCRO. The code is not based on the Classic version, apart from the general appearance of the interface. It's a Cocoa program, so the interface is built with Interface Builder and the code is in Objective-C.\ \ --- 15,23 ---- \f1\b0 \ ! This is the source code package for MacCRO X. It is distributed under the GNU General Public License; refer to License.rtf for the full text. A binary distribution is available from the SourceForge download page \ \ ! This is a complete rewrite of MacCRO for Mac OS X. The code is not based on the old Mac OS version, apart from the general appearance of the interface. It's a Cocoa program, so the interface is built with Interface Builder and the code is in Objective-C.\ ! \ ! At some time in the near future it will also run in X11 on Linux and similar Unix-like systems, using GNUstep (http://www.gnustep.org/ for more information). It is likely that the GNUstep release will be called "Scope.app", hence the SourceForge project name.\ \ |
|
From: <sco...@li...> - 2003-02-02 06:45:35
|
Update of /cvsroot/scopeapp/scopeapp In directory sc8-pr-cvs1:/tmp/cvs-serv27352 Modified Files: Readme.rtf Log Message: Add authors' contact details Index: Readme.rtf =================================================================== RCS file: /cvsroot/scopeapp/scopeapp/Readme.rtf,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Readme.rtf 1 Feb 2003 09:10:34 -0000 1.5 --- Readme.rtf 2 Feb 2003 06:45:32 -0000 1.6 *************** *** 15,19 **** \f1\b0 \ ! This is an alpha release of MacCRO X. It is incomplete. Important features are missing, and there are probably bugs. Not everything works, and things that do work may not work correctly. If you find any such problems, or if you have any improvements to suggest, please contact the authors. See Todo.rtf for the current list.\ \ Unlike the original MacCRO, this is free software. It is distributed under the terms of the GNU General Public License; for further information, start MacCRO and select "Show License" from the Help menu or read the License.rtf file included in this package.\ --- 15,19 ---- \f1\b0 \ ! This is an alpha testing release of MacCRO X. It is incomplete. Important features are missing, and there are probably bugs. Not everything works, and things that do work may not work correctly. If you have any problems, or if you have any improvements to suggest, please contact the authors.\ \ Unlike the original MacCRO, this is free software. It is distributed under the terms of the GNU General Public License; for further information, start MacCRO and select "Show License" from the Help menu or read the License.rtf file included in this package.\ *************** *** 24,27 **** --- 24,35 ---- \ MacCRO X is an application which allows you to use your computer's sound input device as an audio-frequency oscilloscope and spectrum analyser. As the name suggests, it runs only on Mac OS X (though an X11 port using GNUstep is in the works).\ + \ + + \f0\b Contacting the Authors + \f1\b0 \ + \ + If you have any questions, comments, or suggestions about MacCRO X, or if you wish to contribute in some way, please tell us. For general questions about MacCRO X, contact Philip Derrin at na...@us.... For questions about the GNUstep port (Scope.app), contact Rafal Kolanski at xap...@us....\ + \ + Alternatively, you can use the bug report, support request and feature request tracking services at SourceForge, where MacCRO X is hosted. These can be found at http://sourceforge.net/projects/scopeapp/ (click on the "Bugs", "Support" or "RFE" links at the top of the page). New releases of MacCRO X, and the latest development version (via CVS), can be found on the same page.\ \ |
|
From: <sco...@li...> - 2003-02-02 06:35:11
|
Update of /cvsroot/scopeapp/scopeapp In directory sc8-pr-cvs1:/tmp/cvs-serv24235 Added Files: ChangeLog Log Message: Added ChangeLog (generated with rcs2log); this should be updated at the same time cvs checkins are done in future. Only list changes to source files; documentation / interface changes are irrelevant. --- NEW FILE: ChangeLog --- 2003-02-01 Philip Derrin <na...@us...> * src/ScopeView.m (-updateControls), src/SpectrumView.m (-updateControls), src/XYPlotView.m (-updateControls): Implement -updateControls methods to set states from controls before starting to draw * src/ScopeController.m (-tabView:didSelectTabViewItem:tabViewItem:): Resize trace views to occupy entire window when switching view, in case it's been resized 2003-01-21 Philip Derrin <na...@us...> * src/SpectrumView.m: Don't include FFTW headers (MacOSX code uses vDSP framework instead) 2003-01-20 Philip Derrin <na...@us...> * src/ScopeController.h, src/ScopeController.m: Enable SpectrumView * src/SpectrumView.h, src/SpectrumView.m: Initial implementation of spectrum analyser * English.lproj/ScopeWindow.nib/classes.nib, English.lproj/ScopeWindow.nib/info.nib, English.lproj/ScopeWindow.nib/objects.nib: Add SpectrumView to main window * src/ScopeView.m: Start & stop drawing only when necessary; do not start the drawing thread in UI functions if it wasn't running already * src/TraceView.h (-drawing): Add a method that returns YES when this TraceView is drawing * src/TraceView.m (-clearData): Fix -clearData: to handle changed buffer sizes. 2003-01-10 Philip Derrin <na...@us...> * MacCRO X.pbproj/project.pbxproj, src/ScopeView.m, src/TracePath.h, src/TracePath.m, src/TraceView.h, src/TraceView.m, src/XYPlotView.m: Replace NSBezierCurve with TracePath to allow alternative methods of drawing. Currently draws one segment at a time, to work around Quartz performance issue. 2003-01-09 Philip Derrin <na...@us...> * src/ScopeView.m, src/TraceView.h, src/TraceView.m, src/XYPlotView.m: Improve handling of changes to display settings; fix possible deadlock in draw thread 2002-12-10 Philip Derrin <na...@us...> * src/ScopeAppDelegate.h, src/ScopeAppDelegate.m (-orderFrontLicensePanel:): Add code to show license window. 2002-12-08 xaphiosis <xap...@us...> * src/ScopeController.m: Added copyright, removed debugging messages. * src/TraceView.m (-display): New display method executable as main thread. The call is still commented out (gnustep bug?) 2002-12-07 xaphiosis <xap...@us...> * src/ScopeAppGlobals.h: Redefinition of "_" is not necessary on GNUstep. Already in NSBundle.h 2002-12-06 xaphiosis <xap...@us...> * src/ScopeController.m: Fixed problems with badly initialised and strangely sized tabs and TabViewItems. * src/ScopeView.m: Fixed the problem with badly initialized views in TabViewItems. * src/ScopeView.h: Fixed header so it doesn't break OSX. 2002-12-05 Philip Derrin <na...@us...> * src/ScopeAppDelegate.m (-applicationDidFinishLaunching): Now uses the real sound input by default * src/InputSampler.h, src/ScopeView.h, src/ScopeView.m, src/TestSampler.m, src/TraceView.h, src/TraceView.m: InputHandler's processData method now requires interleaved audio data rather than one array per channel (changed all callers) * src/PortAudioSampler.m, src/PortAudioSampler.h: Add new InputSampler using the PortAudio library 2002-11-12 xaphiosis <xap...@us...> * src/ScopeView.m: Branch broke some stuff. First try at fixing. 2002-10-29 Philip Derrin <na...@us...> * src/ScopeAppDelegate.h, src/ScopeAppDelegate.m, src/ScopeView.m: Still more gnustep code removed. * src/ScopeAppDelegate.m: Removed gnustep-specific code from non-branch revision * src/ScopeController.m, src/ScopeView.h, src/ScopeView.m, src/TraceView.m, src/XYPlotView.h, src/XYPlotView.m: Remove gnustep-specific code (will be merged back in when gnustep version works properly) * src/ScopeController.m, src/ScopeView.m, src/SpectrumView.h, src/SpectrumView.m: Update implementation of control creation functions (still incomplete!) * src/SpectrumView.h, src/SpectrumView.m: Initial checkin of (incomplete) spectrum view code (currently skeleton only) 2002-08-02 Philip Derrin <na...@us...> * src/ScopeController.m: Save position of control panel window 2002-07-31 Philip Derrin <na...@us...> * src/ScopeAppDelegate.m: Remove unnecessary call to -autorelease * English.lproj/Localizable.strings, src/ScopeAppDelegate.m: Localise menu items (gnustep only, for now) 2002-07-31 xaphiosis <xap...@us...> * src/ScopeAppDelegate.m, src/ScopeAppDelegate.h: Added simplest of menus. 2002-07-30 Philip Derrin <na...@us...> * src/ScopeView.m, src/TraceView.m, src/XYPlotView.m: Use myDataStored[] in trace classes 2002-07-29 Philip Derrin <na...@us...> * src/ScopeAppDelegate.m: Add comments to clarify the roles of ScopeAppDelegate and ScopeController * src/ScopeAppDelegate.h, src/ScopeAppDelegate.m: Remove myController from the delegate, because the delegate does not own the ScopeController object(s). 2002-07-29 xaphiosis <xap...@us...> * src/ScopeAppDelegate.m: Changed controller to myController. * src/ScopeAppDelegate.h: Added myController var so Delegate class remembers the controller it's using. * src/TraceView.m: Added temporary override of the [self display] crash. 2002-07-22 xaphiosis <xap...@us...> * src/GNUmakefile: Oops. Had wrong slash. Fixed. * src/GNUmakefile: Fixed location of English.proj * src/ScopeView.m, src/XYPlotView.m, src/ScopeController.m: Added empty line at end of file (one less warning). 2002-07-22 Philip Derrin <na...@us...> * src/main.m: Manually create delegate object and load MainMenu.nib * src/ScopeAppDelegate.h, src/ScopeAppDelegate.m: Remove unnecessary notification from delegate, move code from awakeFromNib to applicationDidFinishLaunching to prevent it being called twice on macosx 2002-07-21 xaphiosis <xap...@us...> * src/GNUmakefile: Small fix in comments. * src/ScopeAppDelegate.m: Removed applicationDidFinishLaunching-related things. * src/ScopeAppDelegate.m: Implemented applicationWillFinishLaunching as a way for scopeapp to display a window on the screen. * src/ScopeAppDelegate.h: Added methods to respond to applicationWillFinishLaunching and applicationDidFinishLaunching * src/main.m: Used ScopeAppDelegate as application delegate to get something on the screen(quick fix). 2002-07-21 Philip Derrin <na...@us...> * src/TestSampler.m, src/TestSampler.h: Fix boolean confusion 2002-07-20 xaphiosis <xap...@us...> * src/TestSampler.h: Defined true to be YES and false to be NO for GNUstep to compile it. 2002-07-19 Philip Derrin <na...@us...> * src/ScopeView.h, src/ScopeView.m, src/XYPlotView.h, src/XYPlotView.m: Add stubs for functions to create display controls * src/GNUmakefile: Add new header file, localised files * src/ScopeController.h, src/ScopeController.m: ScopeController now programatically creates its windows, to avoid the nib vs. gmodel problem * English.lproj/Localizable.strings, src/QuicktimeSampler.m, src/ScopeAppGlobals.h: Use new macro (borrowed from GNUMail) to mark localizable strings in source code * update-l10n.pl: Add script to auto-generate Localizable.strings 2002-07-18 xaphiosis <xap...@us...> * src/GNUmakefile: Initial makefile (nearly works) * GNUmakefile: Makefile moved into src * src/GNUmakefile: A bare version of a makefile (doesn't work yet) 2002-07-18 Philip Derrin <na...@us...> * src/TestSampler.m, src/XYPlotView.m, src/ScopeView.m: Minor fixes for compiling on linux * src/InputSampler.h: Work around forward reference bug in GCC * src/main.m: moved from top level, changed #import to work in gnustep too * main.m: Moved to src directory 2002-07-17 xaphiosis <xap...@us...> * GNUmakefile: A bare version of a makefile (doesn't work yet) 2002-07-15 Philip Derrin <na...@us...> * MacCRO X.pbproj/project.pbxproj: Added XYPlotView.[mh] * src/XYPlotView.h, src/XYPlotView.m: Initial X/Y plot implementation * src/ScopeController.h, src/ScopeController.m: Update for new interface layout and to react to switching mode tabs * src/ScopeView.h, src/ScopeView.m: Make previously internal triggering function public (it's called by TraceView) * src/TraceView.h, src/TraceView.m: Fix copyright notice, add stub for trigger function which is called by processData but only really used by the oscilloscope 2002-06-29 Philip Derrin <na...@us...> * src/ScopeView.h, src/ScopeView.m, src/TraceView.h, src/TraceView.m: Moved non-oscilloscope-specific functions into TraceView.m, new parent class of ScopeView 2002-06-25 Philip Derrin <na...@us...> * src/CoreAudioSampler.h, src/CoreAudioSampler.m, src/InputSampler.h, src/QuicktimeSampler.h, src/QuicktimeSampler.m, src/ScopeAppDelegate.h, src/ScopeAppDelegate.m, src/ScopeController.h, src/ScopeController.m, src/ScopeView.h, src/ScopeView.m, src/TestSampler.h, src/TestSampler.m: Fixed several race conditions, defined type for data samples (currently a float), fixed a few bugs in ScopeView, cleaned up the samplers 2002-06-19 Philip Derrin <ph...@cs...> * src/ScopeAppDelegate.h, src/ScopeController.h, src/ScopeView.h, src/TestSampler.h, License.rtf, Readme.rtf, src/CoreAudioSampler.h, src/CoreAudioSampler.m, src/InputSampler.h, src/QuicktimeSampler.h, src/QuicktimeSampler.m, src/ScopeAppDelegate.m, src/ScopeController.m, src/ScopeView.m, src/TestSampler.m: Changed license to GPL; updated headers and License.rtf to reflect this. * src/ScopeView.m: Fixed race condition in ScopeView's drawing thread; fixed minor interface bugs * src/ScopeView.h: Fixed race condition in ScopeView's drawing thread * src/TestSampler.h: Fixed race condition which prevented new thread from starting * src/TestSampler.m: Fixed race condition which prevented new thread from starting; removed useless paused state 2002-06-18 Philip Derrin <ph...@cs...> * .cvsignore: Added OSX Finder's .DS_Store files * .cvsignore: Ignore nib backup files |
Update of /cvsroot/scopeapp/scopeapp/src
In directory sc8-pr-cvs1:/tmp/cvs-serv12511
Modified Files:
ScopeAppDelegate.m ScopeController.h ScopeController.m
SpectrumView.h TraceView.h TraceView.m
Log Message:
Updated copyright notices
Index: ScopeAppDelegate.m
===================================================================
RCS file: /cvsroot/scopeapp/scopeapp/src/ScopeAppDelegate.m,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** ScopeAppDelegate.m 10 Dec 2002 15:01:11 -0000 1.17
--- ScopeAppDelegate.m 2 Feb 2003 05:28:07 -0000 1.18
***************
*** 4,8 ****
//
// Created by narge on Wed Nov 28 2001.
! // Copyright (c) 2001, 2002 Philip Derrin.
//
// This file is part of MacCRO X.
--- 4,8 ----
//
// Created by narge on Wed Nov 28 2001.
! // Copyright (c) 2001, 2002, 2003 Philip Derrin.
//
// This file is part of MacCRO X.
Index: ScopeController.h
===================================================================
RCS file: /cvsroot/scopeapp/scopeapp/src/ScopeController.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ScopeController.h 20 Jan 2003 14:29:14 -0000 1.7
--- ScopeController.h 2 Feb 2003 05:28:08 -0000 1.8
***************
*** 4,8 ****
//
// Created by narge on Tue Nov 27 2001.
! // Copyright (c) 2001, 2002 Philip Derrin.
//
// This file is part of MacCRO X.
--- 4,8 ----
//
// Created by narge on Tue Nov 27 2001.
! // Copyright (c) 2001, 2002, 2003 Philip Derrin.
//
// This file is part of MacCRO X.
Index: ScopeController.m
===================================================================
RCS file: /cvsroot/scopeapp/scopeapp/src/ScopeController.m,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ScopeController.m 1 Feb 2003 06:15:14 -0000 1.11
--- ScopeController.m 2 Feb 2003 05:28:08 -0000 1.12
***************
*** 4,8 ****
//
// Created by narge on Tue Nov 27 2001.
! // Copyright (c) 2001, 2002 Philip Derrin.
//
// This file is part of MacCRO X.
--- 4,8 ----
//
// Created by narge on Tue Nov 27 2001.
! // Copyright (c) 2001, 2002, 2003 Philip Derrin.
//
// This file is part of MacCRO X.
***************
*** 111,115 ****
{
int newTab = [tabView indexOfTabViewItem: tabViewItem];
! TraceView* newView;
// assert that the tab view that has been switched is the mode tabs
--- 111,115 ----
{
int newTab = [tabView indexOfTabViewItem: tabViewItem];
! TraceView* newView = nil;
// assert that the tab view that has been switched is the mode tabs
Index: SpectrumView.h
===================================================================
RCS file: /cvsroot/scopeapp/scopeapp/src/SpectrumView.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SpectrumView.h 20 Jan 2003 14:28:31 -0000 1.2
--- SpectrumView.h 2 Feb 2003 05:28:08 -0000 1.3
***************
*** 4,8 ****
//
// Created by Philip Derrin on Sun Jul 14 2002.
! // Copyright (c) 2002 Philip Derrin.
//
// This file is part of MacCRO X.
--- 4,8 ----
//
// Created by Philip Derrin on Sun Jul 14 2002.
! // Copyright (c) 2002, 2003 Philip Derrin.
//
// This file is part of MacCRO X.
Index: TraceView.h
===================================================================
RCS file: /cvsroot/scopeapp/scopeapp/src/TraceView.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** TraceView.h 20 Jan 2003 14:16:22 -0000 1.7
--- TraceView.h 2 Feb 2003 05:28:08 -0000 1.8
***************
*** 4,8 ****
//
// Created by Philip Derrin on Sat Jun 29 2002.
! // Copyright (c) 2002 Philip Derrin.
//
// This file is part of MacCRO X.
--- 4,8 ----
//
// Created by Philip Derrin on Sat Jun 29 2002.
! // Copyright (c) 2002, 2003 Philip Derrin.
//
// This file is part of MacCRO X.
Index: TraceView.m
===================================================================
RCS file: /cvsroot/scopeapp/scopeapp/src/TraceView.m,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** TraceView.m 20 Jan 2003 14:14:46 -0000 1.10
--- TraceView.m 2 Feb 2003 05:28:08 -0000 1.11
***************
*** 4,8 ****
//
// Created by Philip Derrin on Sat Jun 29 2002.
! // Copyright (c) 2002 Philip Derrin.
//
// This file is part of MacCRO X.
--- 4,8 ----
//
// Created by Philip Derrin on Sat Jun 29 2002.
! // Copyright (c) 2002, 2003 Philip Derrin.
//
// This file is part of MacCRO X.
|
|
From: <sco...@li...> - 2003-02-02 05:21:22
|
Update of /cvsroot/scopeapp/scopeapp In directory sc8-pr-cvs1:/tmp/cvs-serv10857 Modified Files: Todo.rtf Log Message: Remove some bugs that have been fixed; add a couple of features planned for beta release Index: Todo.rtf =================================================================== RCS file: /cvsroot/scopeapp/scopeapp/Todo.rtf,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Todo.rtf 1 Feb 2003 07:01:03 -0000 1.3 --- Todo.rtf 2 Feb 2003 05:21:19 -0000 1.4 *************** *** 11,16 **** \f0\b Bugs to fix\ ! \f1\b0 \'a5 Initial states of traces don't correspond to controls (implement -updateControls)\ ! \'a5 PortAudio fails to set the buffer size the first time MacCRO runs (on my system, using iMic).\ \ --- 11,16 ---- \f0\b Bugs to fix\ ! \f1\b0 \'a5 PortAudio fails to set the buffer size the first time MacCRO runs (on my system, using iMic).\ ! \'a5 Speed up display further if possible.\ \ *************** *** 18,24 **** \f1\b0 \'a5 Grids, time and scale displays.\ - \'a5 Speed up display further if possible.\ \'a5 Spectrum analyser: accumulation, windowing\ \'a5 Preferences for trace colour; maybe also to disable metal appearance for people who dislike it\ \ --- 18,25 ---- \f1\b0 \'a5 Grids, time and scale displays.\ \'a5 Spectrum analyser: accumulation, windowing\ \'a5 Preferences for trace colour; maybe also to disable metal appearance for people who dislike it\ + \'a5 Triggering code. Do this in InputSampler classes rather than TraceView if possible; UI might have to be changed to make this work well.\ + \'a5 Icon\ \ *************** *** 27,31 **** \f1\b0 \'a5 InputSampler objects for audio files. Also need a UI for seeking in files.\ \'a5 Multiple trace windows.\ ! \'a5 Triggering code. Do this in InputSampler classes rather than TraceView if possible; UI might have to be changed to make this work well.\ \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural --- 28,33 ---- \f1\b0 \'a5 InputSampler objects for audio files. Also need a UI for seeking in files.\ \'a5 Multiple trace windows.\ ! \'a5 Image, text, and sound-file capture.\ ! \'a5 Save control settings between runss\ \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural |
|
From: <sco...@li...> - 2003-02-02 05:19:10
|
Update of /cvsroot/scopeapp/scopeapp In directory sc8-pr-cvs1:/tmp/cvs-serv10363 Added Files: MacCRO X Package.pmsp Log Message: PackageMaker file to create alpha release pkg --- NEW FILE: MacCRO X Package.pmsp --- (This appears to be a binary file; contents omitted.) |
|
From: <sco...@li...> - 2003-02-02 05:18:01
|
Update of /cvsroot/scopeapp/scopeapp/MacCRO X.pbproj In directory sc8-pr-cvs1:/tmp/cvs-serv10120/MacCRO X.pbproj Modified Files: project.pbxproj Log Message: Add script to copy resource files for PackageMaker; fix some build settings for alpha release |
|
From: <sco...@li...> - 2003-02-02 05:16:38
|
Update of /cvsroot/scopeapp/scopeapp
In directory sc8-pr-cvs1:/tmp/cvs-serv9805
Modified Files:
License.rtf
Log Message:
Change to a more suitable typeface (looks better in installer)
Index: License.rtf
===================================================================
RCS file: /cvsroot/scopeapp/scopeapp/License.rtf,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** License.rtf 5 Dec 2002 15:14:55 -0000 1.5
--- License.rtf 2 Feb 2003 05:16:35 -0000 1.6
***************
*** 1,24 ****
{\rtf1\mac\ansicpg10000\cocoartf102
! {\fonttbl\f0\fswiss\fcharset77 Optima-Regular;\f1\fswiss\fcharset77 Optima-Bold;\f2\fmodern\fcharset77 Courier;
! \f3\fswiss\fcharset77 Helvetica;\f4\fmodern\fcharset77 Courier-Oblique;}
{\colortbl;\red255\green255\blue255;}
\pard\tx0\tx1120\tx2240\tx3360\tx4480\tx5600\tx6720\tx7840\tx8960\tx10080\tx11200\tx12320\tx13440\tx14560\tx15680\tx16800\tx17920\tx19040\tx20160\tx21280\tx22400\tx23520\tx24640\tx25760\tx26880\tx28000\tx29120\tx30240\tx31360\tx32480\tx33600\tx34720\ql\qnatural
! \f0\fs28 \cf0 MacCRO X is released under the GNU General Public License (GPL). However, it includes some components of PortAudio (http://www.portaudio.com/), which is distributed under a slightly modified version of the Expat license. The texts of both licenses follow.\
\
The PortAudio license applies to the files stored in the src/portaudio subdirectory of the source distribution. All other files are covered by the GPL.\
\pard\tx0\tx1120\tx2240\tx3360\tx4480\tx5600\tx6720\tx7840\tx8960\tx10080\tx11200\tx12320\tx13440\tx14560\tx15680\tx16800\tx17920\tx19040\tx20160\tx21280\tx22400\tx23520\tx24640\tx25760\tx26880\tx28000\tx29120\tx30240\tx31360\tx32480\tx33600\tx34720\ql\qnatural
! \f1\b\fs42 \cf0 \ul \
GNU GENERAL PUBLIC LICENSE\ulnone \
\pard\tx0\tx1120\tx2240\tx3360\tx4480\tx5600\tx6720\tx7840\tx8960\tx10080\tx11200\tx12320\tx13440\tx14560\tx15680\tx16800\tx17920\tx19040\tx20160\tx21280\tx22400\tx23520\tx24640\tx25760\tx26880\tx28000\tx29120\tx30240\tx31360\tx32480\tx33600\tx34720\ql\qnatural
! \f0\b0\fs28 \cf0 \
Version 2, June 1991\
\pard\tx0\tx1120\tx2240\tx3360\tx4480\tx5600\tx6720\tx7840\tx8960\tx10080\tx11200\tx12320\tx13440\tx14560\tx15680\tx16800\tx17920\tx19040\tx20160\tx21280\tx22400\tx23520\tx24640\tx25760\tx26880\tx28000\tx29120\tx30240\tx31360\tx32480\tx33600\tx34720\ql\qnatural
!
! \f2 \cf0 \CocoaLigature0 \
\
! Copyright (C) 1989, 1991 Free Software Foundation, Inc. \
59 Temple Place - Suite 330, Boston, MA 02111-1307, USA\
\
--- 1,24 ----
{\rtf1\mac\ansicpg10000\cocoartf102
! {\fonttbl\f0\fnil\fcharset77 LucidaGrande;\f1\fnil\fcharset77 LucidaGrande-Bold;\f2\fmodern\fcharset77 Courier;
! \f3\fmodern\fcharset77 Courier-Oblique;}
{\colortbl;\red255\green255\blue255;}
\pard\tx0\tx1120\tx2240\tx3360\tx4480\tx5600\tx6720\tx7840\tx8960\tx10080\tx11200\tx12320\tx13440\tx14560\tx15680\tx16800\tx17920\tx19040\tx20160\tx21280\tx22400\tx23520\tx24640\tx25760\tx26880\tx28000\tx29120\tx30240\tx31360\tx32480\tx33600\tx34720\ql\qnatural
! \f0\fs24 \cf0 MacCRO X is released under the GNU General Public License (GPL). However, it includes some components of PortAudio (http://www.portaudio.com/), which is distributed under a slightly modified version of the Expat license. The texts of both licenses follow.\
\
The PortAudio license applies to the files stored in the src/portaudio subdirectory of the source distribution. All other files are covered by the GPL.\
\pard\tx0\tx1120\tx2240\tx3360\tx4480\tx5600\tx6720\tx7840\tx8960\tx10080\tx11200\tx12320\tx13440\tx14560\tx15680\tx16800\tx17920\tx19040\tx20160\tx21280\tx22400\tx23520\tx24640\tx25760\tx26880\tx28000\tx29120\tx30240\tx31360\tx32480\tx33600\tx34720\ql\qnatural
! \f1\b\fs38 \cf0 \ul \
GNU GENERAL PUBLIC LICENSE\ulnone \
\pard\tx0\tx1120\tx2240\tx3360\tx4480\tx5600\tx6720\tx7840\tx8960\tx10080\tx11200\tx12320\tx13440\tx14560\tx15680\tx16800\tx17920\tx19040\tx20160\tx21280\tx22400\tx23520\tx24640\tx25760\tx26880\tx28000\tx29120\tx30240\tx31360\tx32480\tx33600\tx34720\ql\qnatural
! \f0\b0\fs24 \cf0 \
Version 2, June 1991\
\pard\tx0\tx1120\tx2240\tx3360\tx4480\tx5600\tx6720\tx7840\tx8960\tx10080\tx11200\tx12320\tx13440\tx14560\tx15680\tx16800\tx17920\tx19040\tx20160\tx21280\tx22400\tx23520\tx24640\tx25760\tx26880\tx28000\tx29120\tx30240\tx31360\tx32480\tx33600\tx34720\ql\qnatural
! \cf0 \CocoaLigature0 \
\
!
! \f2 Copyright (C) 1989, 1991 Free Software Foundation, Inc. \
59 Temple Place - Suite 330, Boston, MA 02111-1307, USA\
\
***************
*** 27,37 ****
\pard\tx0\tx1120\tx2240\tx3360\tx4480\tx5600\tx6720\tx7840\tx8960\tx10080\tx11200\tx12320\tx13440\tx14560\tx15680\tx16800\tx17920\tx19040\tx20160\tx21280\tx22400\tx23520\tx24640\tx25760\tx26880\tx28000\tx29120\tx30240\tx31360\tx32480\tx33600\tx34720\ql\qnatural
! \f3 \cf0 \CocoaLigature1 \
\pard\tx0\tx1120\tx2240\tx3360\tx4480\tx5600\tx6720\tx7840\tx8960\tx10080\tx11200\tx12320\tx13440\tx14560\tx15680\tx16800\tx17920\tx19040\tx20160\tx21280\tx22400\tx23520\tx24640\tx25760\tx26880\tx28000\tx29120\tx30240\tx31360\tx32480\tx33600\tx34720\ql\qnatural
! \f1\b\fs42 \cf0 \ul Preamble\ulnone \
\pard\tx0\tx1120\tx2240\tx3360\tx4480\tx5600\tx6720\tx7840\tx8960\tx10080\tx11200\tx12320\tx13440\tx14560\tx15680\tx16800\tx17920\tx19040\tx20160\tx21280\tx22400\tx23520\tx24640\tx25760\tx26880\tx28000\tx29120\tx30240\tx31360\tx32480\tx33600\tx34720\ql\qnatural
! \f0\b0\fs28 \cf0 \
The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs, too.\
\
--- 27,37 ----
\pard\tx0\tx1120\tx2240\tx3360\tx4480\tx5600\tx6720\tx7840\tx8960\tx10080\tx11200\tx12320\tx13440\tx14560\tx15680\tx16800\tx17920\tx19040\tx20160\tx21280\tx22400\tx23520\tx24640\tx25760\tx26880\tx28000\tx29120\tx30240\tx31360\tx32480\tx33600\tx34720\ql\qnatural
! \f0 \cf0 \CocoaLigature1 \
\pard\tx0\tx1120\tx2240\tx3360\tx4480\tx5600\tx6720\tx7840\tx8960\tx10080\tx11200\tx12320\tx13440\tx14560\tx15680\tx16800\tx17920\tx19040\tx20160\tx21280\tx22400\tx23520\tx24640\tx25760\tx26880\tx28000\tx29120\tx30240\tx31360\tx32480\tx33600\tx34720\ql\qnatural
! \f1\b\fs38 \cf0 \ul Preamble\ulnone \
\pard\tx0\tx1120\tx2240\tx3360\tx4480\tx5600\tx6720\tx7840\tx8960\tx10080\tx11200\tx12320\tx13440\tx14560\tx15680\tx16800\tx17920\tx19040\tx20160\tx21280\tx22400\tx23520\tx24640\tx25760\tx26880\tx28000\tx29120\tx30240\tx31360\tx32480\tx33600\tx34720\ql\qnatural
! \f0\b0\fs24 \cf0 \
The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs, too.\
\
***************
*** 49,61 ****
\
The precise terms and conditions for copying, distribution and modification follow.\
\pard\tx0\tx1120\tx2240\tx3360\tx4480\tx5600\tx6720\tx7840\tx8960\tx10080\tx11200\tx12320\tx13440\tx14560\tx15680\tx16800\tx17920\tx19040\tx20160\tx21280\tx22400\tx23520\tx24640\tx25760\tx26880\tx28000\tx29120\tx30240\tx31360\tx32480\tx33600\tx34720\ql\qnatural
! \f3 \cf0 \
! \pard\tx0\tx1120\tx2240\tx3360\tx4480\tx5600\tx6720\tx7840\tx8960\tx10080\tx11200\tx12320\tx13440\tx14560\tx15680\tx16800\tx17920\tx19040\tx20160\tx21280\tx22400\tx23520\tx24640\tx25760\tx26880\tx28000\tx29120\tx30240\tx31360\tx32480\tx33600\tx34720\ql\qnatural
!
! \f1\b\fs42 \cf0 \ul TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\ulnone \
\pard\tx0\tx1120\tx2240\tx3360\tx4480\tx5600\tx6720\tx7840\tx8960\tx10080\tx11200\tx12320\tx13440\tx14560\tx15680\tx16800\tx17920\tx19040\tx20160\tx21280\tx22400\tx23520\tx24640\tx25760\tx26880\tx28000\tx29120\tx30240\tx31360\tx32480\tx33600\tx34720\ql\qnatural
! \fs28 \cf0 \
0.
\f0\b0 This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you".\
--- 49,59 ----
\
The precise terms and conditions for copying, distribution and modification follow.\
+ \
\pard\tx0\tx1120\tx2240\tx3360\tx4480\tx5600\tx6720\tx7840\tx8960\tx10080\tx11200\tx12320\tx13440\tx14560\tx15680\tx16800\tx17920\tx19040\tx20160\tx21280\tx22400\tx23520\tx24640\tx25760\tx26880\tx28000\tx29120\tx30240\tx31360\tx32480\tx33600\tx34720\ql\qnatural
! \f1\b\fs38 \cf0 \ul TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\ulnone \
\pard\tx0\tx1120\tx2240\tx3360\tx4480\tx5600\tx6720\tx7840\tx8960\tx10080\tx11200\tx12320\tx13440\tx14560\tx15680\tx16800\tx17920\tx19040\tx20160\tx21280\tx22400\tx23520\tx24640\tx25760\tx26880\tx28000\tx29120\tx30240\tx31360\tx32480\tx33600\tx34720\ql\qnatural
! \fs24 \cf0 \
0.
\f0\b0 This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you".\
***************
*** 158,191 ****
12.
\f0\b0 IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.\
\pard\tx0\tx1120\tx2240\tx3360\tx4480\tx5600\tx6720\tx7840\tx8960\tx10080\tx11200\tx12320\tx13440\tx14560\tx15680\tx16800\tx17920\tx19040\tx20160\tx21280\tx22400\tx23520\tx24640\tx25760\tx26880\tx28000\tx29120\tx30240\tx31360\tx32480\tx33600\tx34720\ql\qnatural
! \f3 \cf0 \
! \pard\tx0\tx1120\tx2240\tx3360\tx4480\tx5600\tx6720\tx7840\tx8960\tx10080\tx11200\tx12320\tx13440\tx14560\tx15680\tx16800\tx17920\tx19040\tx20160\tx21280\tx22400\tx23520\tx24640\tx25760\tx26880\tx28000\tx29120\tx30240\tx31360\tx32480\tx33600\tx34720\ql\qnatural
!
! \f1\b\fs42 \cf0 END OF TERMS AND CONDITIONS\
\pard\tx0\tx1120\tx2240\tx3360\tx4480\tx5600\tx6720\tx7840\tx8960\tx10080\tx11200\tx12320\tx13440\tx14560\tx15680\tx16800\tx17920\tx19040\tx20160\tx21280\tx22400\tx23520\tx24640\tx25760\tx26880\tx28000\tx29120\tx30240\tx31360\tx32480\tx33600\tx34720\ql\qnatural
! \f3\b0\fs26 \cf0 \
\pard\tx0\tx1120\tx2240\tx3360\tx4480\tx5600\tx6720\tx7840\tx8960\tx10080\tx11200\tx12320\tx13440\tx14560\tx15680\tx16800\tx17920\tx19040\tx20160\tx21280\tx22400\tx23520\tx24640\tx25760\tx26880\tx28000\tx29120\tx30240\tx31360\tx32480\tx33600\tx34720\ql\qnatural
! \f1\b\fs42 \cf0 \ul How to Apply These Terms to Your New Programs\ulnone \
\pard\tx0\tx1120\tx2240\tx3360\tx4480\tx5600\tx6720\tx7840\tx8960\tx10080\tx11200\tx12320\tx13440\tx14560\tx15680\tx16800\tx17920\tx19040\tx20160\tx21280\tx22400\tx23520\tx24640\tx25760\tx26880\tx28000\tx29120\tx30240\tx31360\tx32480\tx33600\tx34720\ql\qnatural
! \f0\b0\fs28 \cf0 \
If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms.\
\
To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found.\
\pard\tx0\tx1120\tx2240\tx3360\tx4480\tx5600\tx6720\tx7840\tx8960\tx10080\tx11200\tx12320\tx13440\tx14560\tx15680\tx16800\tx17920\tx19040\tx20160\tx21280\tx22400\tx23520\tx24640\tx25760\tx26880\tx28000\tx29120\tx30240\tx31360\tx32480\tx33600\tx34720\ql\qnatural
!
! \f2 \cf0 \CocoaLigature0 \
\pard\tx0\tx1120\tx2240\tx3360\tx4480\tx5600\tx6720\tx7840\tx8960\tx10080\tx11200\tx12320\tx13440\tx14560\tx15680\tx16800\tx17920\tx19040\tx20160\tx21280\tx22400\tx23520\tx24640\tx25760\tx26880\tx28000\tx29120\tx30240\tx31360\tx32480\tx33600\tx34720\ql\qnatural
! \f4\i \cf0 \
one line to give the program's name and an idea of what it does.
\f2\i0 \
Copyright (C)
! \f4\i yyyy
\f2\i0
! \f4\i name of author
\f2\i0 \
\
--- 156,186 ----
12.
\f0\b0 IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.\
+ \
\pard\tx0\tx1120\tx2240\tx3360\tx4480\tx5600\tx6720\tx7840\tx8960\tx10080\tx11200\tx12320\tx13440\tx14560\tx15680\tx16800\tx17920\tx19040\tx20160\tx21280\tx22400\tx23520\tx24640\tx25760\tx26880\tx28000\tx29120\tx30240\tx31360\tx32480\tx33600\tx34720\ql\qnatural
! \f1\b\fs38 \cf0 END OF TERMS AND CONDITIONS\
\pard\tx0\tx1120\tx2240\tx3360\tx4480\tx5600\tx6720\tx7840\tx8960\tx10080\tx11200\tx12320\tx13440\tx14560\tx15680\tx16800\tx17920\tx19040\tx20160\tx21280\tx22400\tx23520\tx24640\tx25760\tx26880\tx28000\tx29120\tx30240\tx31360\tx32480\tx33600\tx34720\ql\qnatural
! \f0\b0\fs22 \cf0 \
\pard\tx0\tx1120\tx2240\tx3360\tx4480\tx5600\tx6720\tx7840\tx8960\tx10080\tx11200\tx12320\tx13440\tx14560\tx15680\tx16800\tx17920\tx19040\tx20160\tx21280\tx22400\tx23520\tx24640\tx25760\tx26880\tx28000\tx29120\tx30240\tx31360\tx32480\tx33600\tx34720\ql\qnatural
! \f1\b\fs38 \cf0 \ul How to Apply These Terms to Your New Programs\ulnone \
\pard\tx0\tx1120\tx2240\tx3360\tx4480\tx5600\tx6720\tx7840\tx8960\tx10080\tx11200\tx12320\tx13440\tx14560\tx15680\tx16800\tx17920\tx19040\tx20160\tx21280\tx22400\tx23520\tx24640\tx25760\tx26880\tx28000\tx29120\tx30240\tx31360\tx32480\tx33600\tx34720\ql\qnatural
! \f0\b0\fs24 \cf0 \
If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms.\
\
To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found.\
\pard\tx0\tx1120\tx2240\tx3360\tx4480\tx5600\tx6720\tx7840\tx8960\tx10080\tx11200\tx12320\tx13440\tx14560\tx15680\tx16800\tx17920\tx19040\tx20160\tx21280\tx22400\tx23520\tx24640\tx25760\tx26880\tx28000\tx29120\tx30240\tx31360\tx32480\tx33600\tx34720\ql\qnatural
! \cf0 \CocoaLigature0 \
\pard\tx0\tx1120\tx2240\tx3360\tx4480\tx5600\tx6720\tx7840\tx8960\tx10080\tx11200\tx12320\tx13440\tx14560\tx15680\tx16800\tx17920\tx19040\tx20160\tx21280\tx22400\tx23520\tx24640\tx25760\tx26880\tx28000\tx29120\tx30240\tx31360\tx32480\tx33600\tx34720\ql\qnatural
! \f3\i \cf0 \
one line to give the program's name and an idea of what it does.
\f2\i0 \
Copyright (C)
! \f3\i yyyy
\f2\i0
! \f3\i name of author
\f2\i0 \
\
***************
*** 210,228 ****
If the program is interactive, make it output a short notice like this when it starts in an interactive mode:\
\pard\tx0\tx1120\tx2240\tx3360\tx4480\tx5600\tx6720\tx7840\tx8960\tx10080\tx11200\tx12320\tx13440\tx14560\tx15680\tx16800\tx17920\tx19040\tx20160\tx21280\tx22400\tx23520\tx24640\tx25760\tx26880\tx28000\tx29120\tx30240\tx31360\tx32480\tx33600\tx34720\ql\qnatural
!
! \f2 \cf0 \CocoaLigature0 \
\
! Gnomovision version 69, Copyright (C)
! \f4\i year
\f2\i0
! \f4\i name of author
\f2\i0 \
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details\
type `show w'. This is free software, and you are welcome\
to redistribute it under certain conditions; type `show c' \
! for details.\
\pard\tx0\tx1120\tx2240\tx3360\tx4480\tx5600\tx6720\tx7840\tx8960\tx10080\tx11200\tx12320\tx13440\tx14560\tx15680\tx16800\tx17920\tx19040\tx20160\tx21280\tx22400\tx23520\tx24640\tx25760\tx26880\tx28000\tx29120\tx30240\tx31360\tx32480\tx33600\tx34720\ql\qnatural
!
! \f0 \cf0 \CocoaLigature1 \
The hypothetical commands
\f2 `show w'
--- 205,223 ----
If the program is interactive, make it output a short notice like this when it starts in an interactive mode:\
\pard\tx0\tx1120\tx2240\tx3360\tx4480\tx5600\tx6720\tx7840\tx8960\tx10080\tx11200\tx12320\tx13440\tx14560\tx15680\tx16800\tx17920\tx19040\tx20160\tx21280\tx22400\tx23520\tx24640\tx25760\tx26880\tx28000\tx29120\tx30240\tx31360\tx32480\tx33600\tx34720\ql\qnatural
! \cf0 \CocoaLigature0 \
\
!
! \f2 Gnomovision version 69, Copyright (C)
! \f3\i year
\f2\i0
! \f3\i name of author
\f2\i0 \
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details\
type `show w'. This is free software, and you are welcome\
to redistribute it under certain conditions; type `show c' \
! for details.
! \f0 \
\pard\tx0\tx1120\tx2240\tx3360\tx4480\tx5600\tx6720\tx7840\tx8960\tx10080\tx11200\tx12320\tx13440\tx14560\tx15680\tx16800\tx17920\tx19040\tx20160\tx21280\tx22400\tx23520\tx24640\tx25760\tx26880\tx28000\tx29120\tx30240\tx31360\tx32480\tx33600\tx34720\ql\qnatural
! \cf0 \CocoaLigature1 \
The hypothetical commands
\f2 `show w'
***************
*** 237,244 ****
You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names:\
\pard\tx0\tx1120\tx2240\tx3360\tx4480\tx5600\tx6720\tx7840\tx8960\tx10080\tx11200\tx12320\tx13440\tx14560\tx15680\tx16800\tx17920\tx19040\tx20160\tx21280\tx22400\tx23520\tx24640\tx25760\tx26880\tx28000\tx29120\tx30240\tx31360\tx32480\tx33600\tx34720\ql\qnatural
!
! \f2 \cf0 \CocoaLigature0 \
\
! Yoyodyne, Inc., hereby disclaims all copyright\
interest in the program `Gnomovision'\
(which makes passes at compilers) written \
--- 232,239 ----
You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names:\
\pard\tx0\tx1120\tx2240\tx3360\tx4480\tx5600\tx6720\tx7840\tx8960\tx10080\tx11200\tx12320\tx13440\tx14560\tx15680\tx16800\tx17920\tx19040\tx20160\tx21280\tx22400\tx23520\tx24640\tx25760\tx26880\tx28000\tx29120\tx30240\tx31360\tx32480\tx33600\tx34720\ql\qnatural
! \cf0 \CocoaLigature0 \
\
!
! \f2 Yoyodyne, Inc., hereby disclaims all copyright\
interest in the program `Gnomovision'\
(which makes passes at compilers) written \
***************
*** 247,264 ****
\pard\tx0\tx1120\tx2240\tx3360\tx4480\tx5600\tx6720\tx7840\tx8960\tx10080\tx11200\tx12320\tx13440\tx14560\tx15680\tx16800\tx17920\tx19040\tx20160\tx21280\tx22400\tx23520\tx24640\tx25760\tx26880\tx28000\tx29120\tx30240\tx31360\tx32480\tx33600\tx34720\ql\qnatural
! \f4\i \cf0 signature of Ty Coon
\f2\i0 , 1 April 1989\
! Ty Coon, President of Vice\
\pard\tx0\tx1120\tx2240\tx3360\tx4480\tx5600\tx6720\tx7840\tx8960\tx10080\tx11200\tx12320\tx13440\tx14560\tx15680\tx16800\tx17920\tx19040\tx20160\tx21280\tx22400\tx23520\tx24640\tx25760\tx26880\tx28000\tx29120\tx30240\tx31360\tx32480\tx33600\tx34720\ql\qnatural
!
! \f0 \cf0 \CocoaLigature1 \
This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Library General Public License instead of this License. \
\
\pard\tx0\tx1120\tx2240\tx3360\tx4480\tx5600\tx6720\tx7840\tx8960\tx10080\tx11200\tx12320\tx13440\tx14560\tx15680\tx16800\tx17920\tx19040\tx20160\tx21280\tx22400\tx23520\tx24640\tx25760\tx26880\tx28000\tx29120\tx30240\tx31360\tx32480\tx33600\tx34720\ql\qnatural
! \f1\b\fs42 \cf0 \ul PORTAUDIO LICENSE\ulnone \
\pard\tx0\tx1120\tx2240\tx3360\tx4480\tx5600\tx6720\tx7840\tx8960\tx10080\tx11200\tx12320\tx13440\tx14560\tx15680\tx16800\tx17920\tx19040\tx20160\tx21280\tx22400\tx23520\tx24640\tx25760\tx26880\tx28000\tx29120\tx30240\tx31360\tx32480\tx33600\tx34720\ql\qnatural
! \f0\b0\fs28 \cf0 \
PortAudio Portable Real-Time Audio Library\
Copyright (c) 1999-2000 Ross Bencina and Phil Burk \
--- 242,259 ----
\pard\tx0\tx1120\tx2240\tx3360\tx4480\tx5600\tx6720\tx7840\tx8960\tx10080\tx11200\tx12320\tx13440\tx14560\tx15680\tx16800\tx17920\tx19040\tx20160\tx21280\tx22400\tx23520\tx24640\tx25760\tx26880\tx28000\tx29120\tx30240\tx31360\tx32480\tx33600\tx34720\ql\qnatural
! \f3\i \cf0 signature of Ty Coon
\f2\i0 , 1 April 1989\
! Ty Coon, President of Vice
! \f0 \
\pard\tx0\tx1120\tx2240\tx3360\tx4480\tx5600\tx6720\tx7840\tx8960\tx10080\tx11200\tx12320\tx13440\tx14560\tx15680\tx16800\tx17920\tx19040\tx20160\tx21280\tx22400\tx23520\tx24640\tx25760\tx26880\tx28000\tx29120\tx30240\tx31360\tx32480\tx33600\tx34720\ql\qnatural
! \cf0 \CocoaLigature1 \
This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Library General Public License instead of this License. \
\
\pard\tx0\tx1120\tx2240\tx3360\tx4480\tx5600\tx6720\tx7840\tx8960\tx10080\tx11200\tx12320\tx13440\tx14560\tx15680\tx16800\tx17920\tx19040\tx20160\tx21280\tx22400\tx23520\tx24640\tx25760\tx26880\tx28000\tx29120\tx30240\tx31360\tx32480\tx33600\tx34720\ql\qnatural
! \f1\b\fs38 \cf0 \ul PORTAUDIO LICENSE\ulnone \
\pard\tx0\tx1120\tx2240\tx3360\tx4480\tx5600\tx6720\tx7840\tx8960\tx10080\tx11200\tx12320\tx13440\tx14560\tx15680\tx16800\tx17920\tx19040\tx20160\tx21280\tx22400\tx23520\tx24640\tx25760\tx26880\tx28000\tx29120\tx30240\tx31360\tx32480\tx33600\tx34720\ql\qnatural
! \f0\b0\fs24 \cf0 \
PortAudio Portable Real-Time Audio Library\
Copyright (c) 1999-2000 Ross Bencina and Phil Burk \
***************
*** 275,278 ****
\pard\tx0\tx1120\tx2240\tx3360\tx4480\tx5600\tx6720\tx7840\tx8960\tx10080\tx11200\tx12320\tx13440\tx14560\tx15680\tx16800\tx17920\tx19040\tx20160\tx21280\tx22400\tx23520\tx24640\tx25760\tx26880\tx28000\tx29120\tx30240\tx31360\tx32480\tx33600\tx34720\ql\qnatural
! \f2\fs24 \cf0 $Header$\
}
--- 270,273 ----
\pard\tx0\tx1120\tx2240\tx3360\tx4480\tx5600\tx6720\tx7840\tx8960\tx10080\tx11200\tx12320\tx13440\tx14560\tx15680\tx16800\tx17920\tx19040\tx20160\tx21280\tx22400\tx23520\tx24640\tx25760\tx26880\tx28000\tx29120\tx30240\tx31360\tx32480\tx33600\tx34720\ql\qnatural
! \f2\fs20 \cf0 $Header$\
}
|
|
From: <sco...@li...> - 2003-02-01 09:21:13
|
Update of /cvsroot/scopeapp/scopeapp/English.lproj In directory sc8-pr-cvs1:/tmp/cvs-serv14392/English.lproj Modified Files: InfoPlist.strings Log Message: Removed version numbers from InfoPlist Index: InfoPlist.strings =================================================================== RCS file: /cvsroot/scopeapp/scopeapp/English.lproj/InfoPlist.strings,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 Binary files /tmp/cvsnI01LG and /tmp/cvs6GIWkd differ |
|
From: <sco...@li...> - 2003-02-01 09:19:50
|
Update of /cvsroot/scopeapp/scopeapp/MacCRO X.pbproj In directory sc8-pr-cvs1:/tmp/cvs-serv14140/MacCRO X.pbproj Modified Files: project.pbxproj Log Message: Add new readme file; change build settings slightly preparing for alpha release |
|
From: <sco...@li...> - 2003-02-01 09:15:14
|
Update of /cvsroot/scopeapp/scopeapp/src
In directory sc8-pr-cvs1:/tmp/cvs-serv12944/src
Modified Files:
XYPlotView.m ScopeView.m SpectrumView.m
Log Message:
Implement -updateControls methods to set states from controls before starting
to draw
Index: XYPlotView.m
===================================================================
RCS file: /cvsroot/scopeapp/scopeapp/src/XYPlotView.m,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** XYPlotView.m 10 Jan 2003 10:49:27 -0000 1.9
--- XYPlotView.m 1 Feb 2003 09:15:10 -0000 1.10
***************
*** 4,8 ****
//
// Created by Philip Derrin on Sun Jul 14 2002.
! // Copyright (c) 2002 Philip Derrin.
//
// This file is part of MacCRO X.
--- 4,8 ----
//
// Created by Philip Derrin on Sun Jul 14 2002.
! // Copyright (c) 2002, 2003 Philip Derrin.
//
// This file is part of MacCRO X.
***************
*** 77,83 ****
}
! // FIXME implement this function to set the controls appropriately from
! // default / saved values
! -(id) updateControls { return self; }
- (id)updateDisplay: (int) inTrace
--- 77,86 ----
}
! -(id) updateControls
! {
! [self changedScale: self];
! [self changedDisplaySettings: self];
! return self;
! }
- (id)updateDisplay: (int) inTrace
***************
*** 122,124 ****
@end
! // vim:syn=objc:nocin:si:
--- 125,127 ----
@end
! // vim:syn=objc:inde=:
Index: ScopeView.m
===================================================================
RCS file: /cvsroot/scopeapp/scopeapp/src/ScopeView.m,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** ScopeView.m 20 Jan 2003 14:18:32 -0000 1.17
--- ScopeView.m 1 Feb 2003 09:15:11 -0000 1.18
***************
*** 4,8 ****
//
// Created by narge on Tue Nov 27 2001.
! // Copyright (c) 2001, 2002 Philip Derrin.
//
// This file is part of MacCRO X.
--- 4,8 ----
//
// Created by narge on Tue Nov 27 2001.
! // Copyright (c) 2001, 2002, 2003 Philip Derrin.
//
// This file is part of MacCRO X.
***************
*** 28,33 ****
#import "ScopeAppGlobals.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
--- 28,33 ----
#import "ScopeAppGlobals.h"
! static double gTimeScales[] = {0.001,0.002,0.005,0.01,0.02,0.05,0.1};
! static double gVoltScales[] = {0.01,0.02,0.05,0.1,0.2,0.5,1};
// trigger channel settings
***************
*** 238,245 ****
}
- // FIXME implement this function to set the controls appropriately from
- // default / saved values
-(id) updateControls
{
return self;
}
--- 238,248 ----
}
-(id) updateControls
{
+ [self changedXScale: self];
+ [self changedYAScale: self];
+ [self changedYBScale: self];
+ [self changedTriggerSettings: self];
+ [self changedDisplaySettings: self];
return self;
}
Index: SpectrumView.m
===================================================================
RCS file: /cvsroot/scopeapp/scopeapp/src/SpectrumView.m,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SpectrumView.m 21 Jan 2003 14:58:59 -0000 1.3
--- SpectrumView.m 1 Feb 2003 09:15:11 -0000 1.4
***************
*** 4,8 ****
//
// Created by Philip Derrin on Sun Jul 14 2002.
! // Copyright (c) 2002 Philip Derrin.
//
// This file is part of MacCRO X.
--- 4,8 ----
//
// Created by Philip Derrin on Sun Jul 14 2002.
! // Copyright (c) 2002, 2003 Philip Derrin.
//
// This file is part of MacCRO X.
***************
*** 168,171 ****
--- 168,177 ----
}
[myFreqResolutionMenu selectItemAtIndex: oldselection];
+
+ [self changedDisplaySettings: self];
+ [self changedFreqScale: myFreqResolutionMenu];
+ [self changedFreqScale: self];
+ [self changedVoltScale: self];
+ [self changedAccumulationSettings: self];
return self;
|
