aquaterm-commit Mailing List for AquaTerm (Mac OS X graphics terminal)
Brought to you by:
persquare
You can subscribe to this list here.
2002 |
Jan
|
Feb
(39) |
Mar
(14) |
Apr
(33) |
May
(10) |
Jun
|
Jul
|
Aug
(5) |
Sep
(2) |
Oct
(26) |
Nov
|
Dec
(4) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2003 |
Jan
|
Feb
(15) |
Mar
(1) |
Apr
|
May
|
Jun
(15) |
Jul
(20) |
Aug
(45) |
Sep
(8) |
Oct
(53) |
Nov
(58) |
Dec
(45) |
2004 |
Jan
|
Feb
(25) |
Mar
(60) |
Apr
|
May
(29) |
Jun
(8) |
Jul
|
Aug
(2) |
Sep
(46) |
Oct
(22) |
Nov
(12) |
Dec
(3) |
2005 |
Jan
(18) |
Feb
(23) |
Mar
(12) |
Apr
|
May
(1) |
Jun
|
Jul
(34) |
Aug
|
Sep
(1) |
Oct
|
Nov
(2) |
Dec
|
2006 |
Jan
|
Feb
(6) |
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
(7) |
Aug
(1) |
Sep
|
Oct
(1) |
Nov
|
Dec
|
2007 |
Jan
|
Feb
|
Mar
(14) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(2) |
Jun
(3) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: Marius Amado-A. <ama...@us...> - 2008-06-03 14:01:58
|
Update of /cvsroot/aquaterm/adapters/ada In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv29574 Modified Files: aquaterm.adb aquaterm.ads demo.adb Added Files: hello.adb Log Message: added text handling to the thick binding; advanced Demo; created Hello; renamed Put_Line to Draw_Line (to avoid confusion with the many Ada standard Put_Line functions) --- NEW FILE: hello.adb --- with AquaTerm; procedure Hello is use AquaTerm; Plot : Plot_Type; begin Create_Plot (Plot, Size => (600.0, 400.0)); Put_Text (Plot => Plot, Base => (300.0, 200.0), Text => "HelloAquaTerm! (Ada)", Align => (Horizontal => Left, Vertical => Default_Vertical_Alignment)); Show_Plot; Close_Plot; end; -- (C) 2008 Marius Amado-Alves -- Built with: gnatmake hello -largs -framework AquaTerm Index: aquaterm.adb =================================================================== RCS file: /cvsroot/aquaterm/adapters/ada/aquaterm.adb,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- aquaterm.adb 3 Jun 2008 10:12:03 -0000 1.1 +++ aquaterm.adb 3 Jun 2008 14:01:59 -0000 1.2 @@ -13,6 +13,18 @@ Round => C_AQTRoundLineCapStyle, Square => C_AQTSquareLineCapStyle); + Horizontal_Alignment_Code : array (Horizontal_Alignment) of C_INT := + (Left => C_AQTAlignLeft, + Center => C_AQTAlignCenter, + Centre => C_AQTAlignCenter, + Right => C_AQTAlignRight); + + Vertical_Alignment_Code : array (Vertical_Alignment) of C_INT := + (Middle => C_AQTAlignMiddle, + Baseline => C_AQTAlignBaseline, + Bottom => C_AQTAlignBottom, + Top => C_AQTAlignTop); + ------------------- -- Abbreviations -- ------------------- @@ -157,7 +169,7 @@ -- Line drawing -- ------------------ - procedure Put_Line + procedure Draw_Line (Plot : in out Plot_Type; Vertices : Vector_Array; Color : RGB_Color := Default_Color; @@ -166,7 +178,7 @@ is V : array (1 .. 2, Vertices'Range) of C_FLOAT; begin - Check (Plot, "Put_Line"); + Check (Plot, "Draw_Line"); aqtSelectPlot (Plot.Nr); aqtSetColor (Style.Color); C_aqtSetLinewidth (C_FLOAT(Style.Thickness)); @@ -178,7 +190,7 @@ C_aqtAddPolyline (V (1, V'First(1))'Address, V (2, V'First(2))'Address, - C_INT (V'Length)); + C_INT (Vertices'Length)); if Show then Show_Plot (Plot); end if; end; @@ -206,14 +218,42 @@ Close_Plot (Default_Plot); end; - procedure Put_Line + procedure Draw_Line (Vertices : Vector_Array; Color : RGB_Color := Default_Color; Style : Line_Style := Default_Line_Style; Show : Boolean := True) is begin - Put_Line (Default_Plot, Vertices, Color, Style, Show); + Draw_Line (Default_Plot, Vertices, Color, Style, Show); + end; + + procedure Put_Text + (Plot : in out Plot_Type; + Text : String; + Base : Vector; + Angle: Real := 0.0; + Align: Alignment := Default_Alignment; + Color: RGB_Color := Default_Color; + Font : String := To_String (Default_Font_Name); + Size : Font_Size := Default_Font_Size; + Show : Boolean := True) + is + use Interfaces.C.Strings; + use type Interfaces.C.int; + begin + aqtSelectPlot (Plot.Nr); + C_aqtSetFontname (New_String (Font & Character'Val(0))); + C_aqtSetFontsize (C_FLOAT(Size)); + C_aqtAddLabel + (text => New_String (Text), + x => C_FLOAT (Base.Re), + y => C_FLOAT (Base.Im), + angle => C_FLOAT (Angle), + align => Horizontal_Alignment_Code (Align.Horizontal) + + Vertical_Alignment_Code (Align.Vertical)); + if Show then Show_Plot (Plot); end if; end; + begin Initialize_Package; Index: aquaterm.ads =================================================================== RCS file: /cvsroot/aquaterm/adapters/ada/aquaterm.ads,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- aquaterm.ads 3 Jun 2008 10:12:03 -0000 1.2 +++ aquaterm.ads 3 Jun 2008 14:01:59 -0000 1.3 @@ -1,11 +1,13 @@ with Ada.Numerics.Generic_Complex_Types; +with Ada.Strings.Unbounded; with AquaTerm_C; with Interfaces.C.Strings; package AquaTerm is - -- This package approximates Ada.Text_IO in structure - + + use Ada.Strings.Unbounded; + type Plot_Type is limited private; -- "plot" is AquaTerm parlance for window, canvas; -- a plot is either created or closed; @@ -42,8 +44,8 @@ -- Alignment types -- --------------------- - type Horizontal_Alignment is (Left, Center, Right); - type Vertical_Alignment is (Top, Middle, Bottom); + type Horizontal_Alignment is (Left, Center, Centre, Right); + type Vertical_Alignment is (Top, Middle, Bottom, Baseline); type Alignment is record Horizontal : Horizontal_Alignment; @@ -61,6 +63,13 @@ Color : RGB_Color; Cap : Line_Cap; end record; + + ------------------------ + -- Font-related types -- + ------------------------ + + subtype Font_Name is Unbounded_String; + subtype Font_Size is Real; -------------------- -- Default values -- @@ -71,7 +80,7 @@ Default_Color : RGB_Color := (0.0, 0.0, 0.0); Default_Horizontal_Alignment : Horizontal_Alignment := Left; - Default_Vertical_Alignment : Vertical_Alignment := Top; + Default_Vertical_Alignment : Vertical_Alignment := Middle; Default_Alignment : Alignment := (Horizontal => Default_Horizontal_Alignment, Vertical => Default_Vertical_Alignment); @@ -83,6 +92,9 @@ Thickness => Default_Line_Thickness, Color => Default_Color); + Default_Font_Size : Real := 10.0; + Default_Font_Name : Unbounded_String := To_Unbounded_String ("Roman"); + ---------------------- -- Plot management -- ---------------------- @@ -124,7 +136,7 @@ -- Line drawing -- ------------------ - procedure Put_Line + procedure Draw_Line (Plot : in out Plot_Type; Vertices : Vector_Array; Color : RGB_Color := Default_Color; @@ -133,12 +145,27 @@ -- flag Show controls whether Show_Plot (Plot) -- is called automatically after the new drawing - procedure Put_Line + procedure Draw_Line (Vertices : Vector_Array; Color : RGB_Color := Default_Color; Style : Line_Style := Default_Line_Style; Show : Boolean := True); + ---------- + -- Text -- + ---------- + + procedure Put_Text + (Plot : in out Plot_Type; + Text : String; + Base : Vector; + Angle: Real := 0.0; + Align: Alignment := Default_Alignment; + Color: RGB_Color := Default_Color; + Font : String := To_String (Default_Font_Name); + Size : Font_Size := Default_Font_Size; + Show : Boolean := True); + ---------------- -- Exceptions -- ---------------- Index: demo.adb =================================================================== RCS file: /cvsroot/aquaterm/adapters/ada/demo.adb,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- demo.adb 3 Jun 2008 10:12:04 -0000 1.1 +++ demo.adb 3 Jun 2008 14:02:00 -0000 1.2 @@ -25,8 +25,26 @@ Yellow => (1.0, 1.0, 0.5), Dark_Green => (0.0, 0.5, 0.5) ); begin - Create_Plot (Plot); - Put_Line (Plot, ((0.0,0.0), (10.0,10.0))); + Create_Plot + (Plot, + Size => (620.0,420.0), + Title => "Testview (using the thick Ada binding)"); + Put_Text + (Plot => Plot, + Text => "Testview 620x420 pt", + Font => "Helvetica", + Base => (4.0, 412.0), + Align => (Horizontal => Left, + Vertical => Default_Vertical_Alignment), + Size => 12.0); + Draw_Line + (Plot => Plot, + Vertices => (( 20.0, 20.0), + (600.0, 20.0), + (600.0, 400.0), + ( 20.0, 400.0), + ( 20.0, 20.0)), + Color => (0.0, 0.0, 0.0)); Show_Plot; Close_Plot; end; |
From: Marius Amado-A. <ama...@us...> - 2008-06-03 10:24:32
|
Update of /cvsroot/aquaterm/adapters/ada In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv24793 Modified Files: demo_thin.adb Log Message: minor bug fix (renamed C interface) Index: demo_thin.adb =================================================================== RCS file: /cvsroot/aquaterm/adapters/ada/demo_thin.adb,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- demo_thin.adb 3 May 2008 02:12:18 -0000 1.1 +++ demo_thin.adb 3 Jun 2008 10:24:35 -0000 1.2 @@ -1,6 +1,6 @@ with Ada.Numerics; with Ada.Numerics.Elementary_Functions; -with Aquaterm.C_Interface; +with Aquaterm_C; with Interfaces.C; with Interfaces.C.Strings; @@ -29,7 +29,7 @@ --: #include "aquaterm/aquaterm.h" --: #include <math.h> - use AquaTerm.C_Interface; + use AquaTerm_C; use type Interfaces.C.int; use type Interfaces.C.C_Float; use Interfaces.C.Strings; @@ -221,8 +221,8 @@ --: xPtr[i] = 340.0+r*cos(radians); --: yPtr[i] = 255.0+r*sin(radians); radians := double(i)*pi/2.0; - xPtr (i) := AquaTerm.C_Interface.C_FLOAT (340.0+Float(r)*cos(Float(radians))); - yPtr (i) := AquaTerm.C_Interface.C_FLOAT (255.0+Float(r)*sin(Float(radians))); + xPtr (i) := AquaTerm_C.C_FLOAT (340.0+Float(r)*cos(Float(radians))); + yPtr (i) := AquaTerm_C.C_FLOAT (255.0+Float(r)*sin(Float(radians))); end loop; C_aqtTakeColorFromColormapEntry(2); C_aqtAddPolygon(xPtr(0)'Address, yPtr(0)'Address, 4); @@ -232,8 +232,8 @@ --: xPtr[i] = 400.0+r*cos(radians); --: yPtr[i] = 255.0+r*sin(radians); radians := double(i)*pi*0.8; - xPtr (i) := AquaTerm.C_Interface.C_FLOAT (400.0+Float(r)*cos(Float(radians))); - yPtr (i) := AquaTerm.C_Interface.C_FLOAT (255.0+Float(r)*sin(Float(radians))); + xPtr (i) := AquaTerm_C.C_FLOAT (400.0+Float(r)*cos(Float(radians))); + yPtr (i) := AquaTerm_C.C_FLOAT (255.0+Float(r)*sin(Float(radians))); end loop; C_aqtTakeColorFromColormapEntry(3); C_aqtAddPolygon(xPtr(0)'Address, yPtr(0)'Address, 5); @@ -248,8 +248,8 @@ --: xPtr[i] = 460.0+r*cos(radians); --: yPtr[i] = 255.0+r*sin(radians); radians := double(i)*pi/4.0; - xPtr (i) := AquaTerm.C_Interface.C_FLOAT (460.0+Float(r)*cos(Float(radians))); - yPtr (i) := AquaTerm.C_Interface.C_FLOAT (255.0+Float(r)*sin(Float(radians))); + xPtr (i) := AquaTerm_C.C_FLOAT (460.0+Float(r)*cos(Float(radians))); + yPtr (i) := AquaTerm_C.C_FLOAT (255.0+Float(r)*sin(Float(radians))); end loop; C_aqtTakeColorFromColormapEntry(4); C_aqtAddPolygon(xPtr(0)'Address, yPtr(0)'Address, 8); @@ -259,8 +259,8 @@ --: xPtr[i] = 520.0+r*cos(radians); --: yPtr[i] = 255.0+r*sin(radians); radians := double(i)*pi/16.0; - xPtr (i) := AquaTerm.C_Interface.C_FLOAT (520.0+Float(r)*cos(Float(radians))); - yPtr (i) := AquaTerm.C_Interface.C_FLOAT (255.0+Float(r)*sin(Float(radians))); + xPtr (i) := AquaTerm_C.C_FLOAT (520.0+Float(r)*cos(Float(radians))); + yPtr (i) := AquaTerm_C.C_FLOAT (255.0+Float(r)*sin(Float(radians))); end loop; C_aqtTakeColorFromColormapEntry(5); C_aqtAddPolygon(xPtr(0)'Address, yPtr(0)'Address, 32); |
From: Marius Amado-A. <ama...@us...> - 2008-06-03 10:12:05
|
Update of /cvsroot/aquaterm/adapters/ada In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv20148 Modified Files: aquaterm.ads dump_c_interface.adb Added Files: aquaterm.adb aquaterm_c.ads demo.adb Removed Files: aquaterm-c_interface.ads Log Message: renamed the c interface; added thick binding (work in progress) ------------ --- NEW FILE: aquaterm.adb --- with ada.text_io; use ada.text_io; with Ada.Finalization; package body AquaTerm is Init_Called : Boolean := False; Init_Result : C_INT; Plot_Count : Natural := 0; Default_Plot : Plot_Type; Cap_Code : array (Line_Cap) of C_INT := (Butt => C_AQTButtLineCapStyle, Round => C_AQTRoundLineCapStyle, Square => C_AQTSquareLineCapStyle); ------------------- -- Abbreviations -- ------------------- procedure Inc (X : in out Integer) is begin X := X + 1; end; procedure Check (Plot : Plot_Type; Message : String) is begin if not Is_Created (Plot) then raise Status_Error with Message; end if; end; procedure aqtSelectPlot (refNum : C_INT) is Result : C_INT; begin Result := AquaTerm_C.C_aqtSelectPlot (refNum); end; procedure aqtSetColor (Color : RGB_Color) is begin C_aqtSetColor (C_FLOAT (Color (1)), C_FLOAT (Color (2)), C_FLOAT (Color (3))); end; pragma Inline (Inc); pragma Inline (Check); pragma Inline (aqtSelectPlot); pragma Inline (aqtSetColor); ------------------------------------------------------- -- Package initialization and finalization (private) -- ------------------------------------------------------- procedure Initialize_Package is begin if not Init_Called then Init_Result := C_aqtInit; Init_Called := True; end if; end; procedure Finalize_Package is begin C_aqtTerminate; end; type Dummy_Controlled_Type is new Ada.Finalization.Controlled with null record; Dummy : Dummy_Controlled_Type; procedure Finalize (Dummy : in out Dummy_Controlled_Type) is begin Finalize_Package; end; --------------------- -- Plot management -- --------------------- procedure Create_Plot (Plot : in out Plot_Type; Size : Vector := Default_Plot_Size; Title : String := ""; Set_As_Default : Boolean := True) is begin if Is_Created (Plot) then raise Status_Error with "Create_Plot"; end if; if Plot = null then Plot := new Plot_Record; end if; Inc (Plot_Count); Plot.Nr := C_INT (Plot_Count); C_aqtOpenPlot (Plot.Nr); Plot.Created := True; Set_Plot_Size (Plot, Size); Set_Plot_Title (Plot, Title); if Set_As_Default then Set_Default_Plot (Plot); end if; end; procedure Reuse_Plot (Plot : in out Plot_Type; Size : Vector := Default_Plot_Size; Title : String := ""; Set_As_Default : Boolean := True) is begin if Is_Created (Plot) then Close_Plot (Plot); end if; Create_Plot (Plot, Size, Title, Set_As_Default); end; procedure Close_Plot (Plot : in out Plot_Type) is begin Check (Plot, "Close_Plot"); aqtSelectPlot(Plot.Nr); C_aqtClosePlot; Interfaces.C.Strings.Free (Plot.Title_ptr); Plot.Created := False; end; procedure Set_Plot_Size (Plot : in out Plot_Type; Size : Vector) is begin Check (Plot, "Set_Plot_Size"); aqtSelectPlot(Plot.Nr); C_aqtSetPlotSize (C_FLOAT(Size.Re), C_FLOAT(Size.Im)); end; procedure Set_Plot_Title (Plot : in out Plot_Type; Title : String) is use Interfaces.C.Strings; begin Free (Plot.Title_ptr); Plot.Title_ptr := New_String (Title & Character'Val(0)); aqtSelectPlot (Plot.Nr); C_aqtSetPlotTitle (Plot.Title_ptr); end; procedure Show_Plot (Plot : in out Plot_Type) is begin Check (Plot, "Show_Plot"); aqtSelectPlot(Plot.Nr); C_aqtRenderPlot; end; ---------------------------------- -- Is_Created, Set_Default_Plot -- ---------------------------------- function Is_Created (Plot : in Plot_Type) return Boolean is begin return Plot /= null and then Plot.Created; end; procedure Set_Default_Plot (Plot : in out Plot_Type) is begin Default_Plot := Plot; end; ------------------ -- Line drawing -- ------------------ procedure Put_Line (Plot : in out Plot_Type; Vertices : Vector_Array; Color : RGB_Color := Default_Color; Style : Line_Style := Default_Line_Style; Show : Boolean := True) is V : array (1 .. 2, Vertices'Range) of C_FLOAT; begin Check (Plot, "Put_Line"); aqtSelectPlot (Plot.Nr); aqtSetColor (Style.Color); C_aqtSetLinewidth (C_FLOAT(Style.Thickness)); C_aqtSetLineCapStyle(Cap_Code (Style.Cap)); for I in Vertices'Range loop V (1, I) := C_FLOAT (Vertices (I).Re); V (2, I) := C_FLOAT (Vertices (I).Im); end loop; C_aqtAddPolyline (V (1, V'First(1))'Address, V (2, V'First(2))'Address, C_INT (V'Length)); if Show then Show_Plot (Plot); end if; end; ----------------------------------------- -- Default plot variants of operations -- ----------------------------------------- procedure Set_Plot_Size (Size : Vector) is begin Set_Plot_Size (Default_Plot, Size); end; procedure Set_Plot_Title (Title : String) is begin Set_Plot_Title (Default_Plot, Title); end; procedure Show_Plot is begin Show_Plot (Default_Plot); end; procedure Close_Plot is begin Close_Plot (Default_Plot); end; procedure Put_Line (Vertices : Vector_Array; Color : RGB_Color := Default_Color; Style : Line_Style := Default_Line_Style; Show : Boolean := True) is begin Put_Line (Default_Plot, Vertices, Color, Style, Show); end; begin Initialize_Package; end; --- NEW FILE: aquaterm_c.ads --- with Interfaces.C; with Interfaces.C.Strings; with System; package AquaTerm_C is -- thin binding to the AquaTerm C API -- this is the output of Dump_C_Interface -- consider editing that to make changes to this subtype C_CHAR_PTR is Interfaces.C.Strings.chars_ptr; subtype C_CONST_CHAR_PTR is Interfaces.C.Strings.chars_ptr; subtype C_CONST_VOID_PTR is System.Address; subtype C_FLOAT is Interfaces.C.C_float; subtype C_FLOAT_PTR is System.Address; subtype C_INT is Interfaces.C.int; subtype C_PROC_PTR is System.Address; C_AQT_EVENTBUF_SIZE : constant := 128; -- Constants that specify linecap styles. C_AQTButtLineCapStyle : constant := 0; C_AQTRoundLineCapStyle : constant := 1; C_AQTSquareLineCapStyle : constant := 2; -- Constants that specify horizontal alignment for labels. C_AQTAlignLeft : constant := 0; C_AQTAlignCenter : constant := 1; C_AQTAlignRight : constant := 2; -- Constants that specify vertical alignment for labels. C_AQTAlignMiddle : constant := 0; C_AQTAlignBaseline : constant := 4; C_AQTAlignBottom : constant := 8; C_AQTAlignTop : constant := 16; -- Class initialization etc. function C_aqtInit return C_INT; pragma Import (C, C_aqtInit, "aqtInit"); procedure C_aqtTerminate; pragma Import (C, C_aqtTerminate, "aqtTerminate"); procedure C_aqtSetEventHandler (func : C_PROC_PTR); pragma Import (C, C_aqtSetEventHandler, "aqtSetEventHandler"); -- Control operations procedure C_aqtOpenPlot (refNum : C_INT); pragma Import (C, C_aqtOpenPlot, "aqtOpenPlot"); function C_aqtSelectPlot (refNum : C_INT) return C_INT; pragma Import (C, C_aqtSelectPlot, "aqtSelectPlot"); procedure C_aqtSetPlotSize (width : C_FLOAT; height : C_FLOAT); pragma Import (C, C_aqtSetPlotSize, "aqtSetPlotSize"); procedure C_aqtSetPlotTitle (title : C_CONST_CHAR_PTR); pragma Import (C, C_aqtSetPlotTitle, "aqtSetPlotTitle"); procedure C_aqtRenderPlot; pragma Import (C, C_aqtRenderPlot, "aqtRenderPlot"); procedure C_aqtClearPlot; pragma Import (C, C_aqtClearPlot, "aqtClearPlot"); procedure C_aqtClosePlot; pragma Import (C, C_aqtClosePlot, "aqtClosePlot"); -- Event handling procedure C_aqtSetAcceptingEvents (flag : C_INT); pragma Import (C, C_aqtSetAcceptingEvents, "aqtSetAcceptingEvents"); function C_aqtGetLastEvent (buffer : C_CHAR_PTR) return C_INT; pragma Import (C, C_aqtGetLastEvent, "aqtGetLastEvent"); function C_aqtWaitNextEvent (buffer : C_CHAR_PTR) return C_INT; pragma Import (C, C_aqtWaitNextEvent, "aqtWaitNextEvent"); -- Plotting related commands -- Clip rect, applies to all objects procedure C_aqtSetClipRect (originX : C_FLOAT; originY : C_FLOAT; width : C_FLOAT; height : C_FLOAT); pragma Import (C, C_aqtSetClipRect, "aqtSetClipRect"); procedure C_aqtSetDefaultClipRect; pragma Import (C, C_aqtSetDefaultClipRect, "aqtSetDefaultClipRect"); -- Colormap (utility) function C_aqtColormapSize return C_INT; pragma Import (C, C_aqtColormapSize, "aqtColormapSize"); procedure C_aqtSetColormapEntry (entryIndex : C_INT; r : C_FLOAT; g : C_FLOAT; b : C_FLOAT); pragma Import (C, C_aqtSetColormapEntry, "aqtSetColormapEntry"); procedure C_aqtGetColormapEntry (entryIndex : C_INT; r : C_FLOAT_PTR; g : C_FLOAT_PTR; b : C_FLOAT_PTR); pragma Import (C, C_aqtGetColormapEntry, "aqtGetColormapEntry"); procedure C_aqtTakeColorFromColormapEntry (index : C_INT); pragma Import (C, C_aqtTakeColorFromColormapEntry, "aqtTakeColorFromColormapEntry"); procedure C_aqtTakeBackgroundColorFromColormapEntry (index : C_INT); pragma Import (C, C_aqtTakeBackgroundColorFromColormapEntry, "aqtTakeBackgroundColorFromColormapEntry"); -- Color handling procedure C_aqtSetColor (r : C_FLOAT; g : C_FLOAT; b : C_FLOAT); pragma Import (C, C_aqtSetColor, "aqtSetColor"); procedure C_aqtSetBackgroundColor (r : C_FLOAT; g : C_FLOAT; b : C_FLOAT); pragma Import (C, C_aqtSetBackgroundColor, "aqtSetBackgroundColor"); procedure C_aqtGetColor (r : C_FLOAT_PTR; g : C_FLOAT_PTR; b : C_FLOAT_PTR); pragma Import (C, C_aqtGetColor, "aqtGetColor"); procedure C_aqtGetBackgroundColor (r : C_FLOAT_PTR; g : C_FLOAT_PTR; b : C_FLOAT_PTR); pragma Import (C, C_aqtGetBackgroundColor, "aqtGetBackgroundColor"); -- Text handling procedure C_aqtSetFontname (newFontname : C_CONST_CHAR_PTR); pragma Import (C, C_aqtSetFontname, "aqtSetFontname"); procedure C_aqtSetFontsize (newFontsize : C_FLOAT); pragma Import (C, C_aqtSetFontsize, "aqtSetFontsize"); procedure C_aqtAddLabel (text : C_CONST_CHAR_PTR; x : C_FLOAT; y : C_FLOAT; angle : C_FLOAT; align : C_INT); pragma Import (C, C_aqtAddLabel, "aqtAddLabel"); procedure C_aqtAddShearedLabel (text : C_CONST_CHAR_PTR; x : C_FLOAT; y : C_FLOAT; angle : C_FLOAT; shearAngle : C_FLOAT; align : C_INT); pragma Import (C, C_aqtAddShearedLabel, "aqtAddShearedLabel"); -- Line handling procedure C_aqtSetLinewidth (newLinewidth : C_FLOAT); pragma Import (C, C_aqtSetLinewidth, "aqtSetLinewidth"); procedure C_aqtSetLinestylePattern (newPattern : C_FLOAT_PTR; newCount : C_INT; newPhase : C_FLOAT); pragma Import (C, C_aqtSetLinestylePattern, "aqtSetLinestylePattern"); procedure C_aqtSetLinestyleSolid; pragma Import (C, C_aqtSetLinestyleSolid, "aqtSetLinestyleSolid"); procedure C_aqtSetLineCapStyle (capStyle : C_INT); pragma Import (C, C_aqtSetLineCapStyle, "aqtSetLineCapStyle"); procedure C_aqtMoveTo (x : C_FLOAT; y : C_FLOAT); pragma Import (C, C_aqtMoveTo, "aqtMoveTo"); procedure C_aqtAddLineTo (x : C_FLOAT; y : C_FLOAT); pragma Import (C, C_aqtAddLineTo, "aqtAddLineTo"); procedure C_aqtAddPolyline (x : C_FLOAT_PTR; y : C_FLOAT_PTR; pointCount : C_INT); pragma Import (C, C_aqtAddPolyline, "aqtAddPolyline"); -- Rect and polygon handling procedure C_aqtMoveToVertex (x : C_FLOAT; y : C_FLOAT); pragma Import (C, C_aqtMoveToVertex, "aqtMoveToVertex"); procedure C_aqtAddEdgeToVertex (x : C_FLOAT; y : C_FLOAT); pragma Import (C, C_aqtAddEdgeToVertex, "aqtAddEdgeToVertex"); procedure C_aqtAddPolygon (x : C_FLOAT_PTR; y : C_FLOAT_PTR; pointCount : C_INT); pragma Import (C, C_aqtAddPolygon, "aqtAddPolygon"); procedure C_aqtAddFilledRect (originX : C_FLOAT; originY : C_FLOAT; width : C_FLOAT; height : C_FLOAT); pragma Import (C, C_aqtAddFilledRect, "aqtAddFilledRect"); procedure C_aqtEraseRect (originX : C_FLOAT; originY : C_FLOAT; width : C_FLOAT; height : C_FLOAT); pragma Import (C, C_aqtEraseRect, "aqtEraseRect"); -- Image handling procedure C_aqtSetImageTransform (m11 : C_FLOAT; m12 : C_FLOAT; m21 : C_FLOAT; m22 : C_FLOAT; tX : C_FLOAT; tY : C_FLOAT); pragma Import (C, C_aqtSetImageTransform, "aqtSetImageTransform"); procedure C_aqtResetImageTransform; pragma Import (C, C_aqtResetImageTransform, "aqtResetImageTransform"); procedure C_aqtAddImageWithBitmap (bitmap : C_CONST_VOID_PTR; pixWide : C_INT; pixHigh : C_INT; destX : C_FLOAT; destY : C_FLOAT; destWidth : C_FLOAT; destHeight : C_FLOAT); pragma Import (C, C_aqtAddImageWithBitmap, "aqtAddImageWithBitmap"); procedure C_aqtAddTransformedImageWithBitmap (bitmap : C_CONST_VOID_PTR; pixWide : C_INT; pixHigh : C_INT; clipX : C_FLOAT; clipY : C_FLOAT; clipWidth : C_FLOAT; clipHeight : C_FLOAT); pragma Import (C, C_aqtAddTransformedImageWithBitmap, "aqtAddTransformedImageWithBitmap"); end; -- (C) 2008 Marius Amado-Alves --- NEW FILE: demo.adb --- --with Ada.Numerics; --with Ada.Numerics.Generic_Elementary_Functions; with ada.text_io;use ada.text_io; with AquaTerm; procedure Demo is -- The 'standard' Aquaterm demo using the thick Ada binding and in Ada style. -- Standard = "demo.c" by Per Persson. -- Executable built with: gnatmake demo -largs -laquaterm use AquaTerm; Plot : Plot_Type; type Colors is (White, Black, Red, Green, Blue, Purple, Yellow, Dark_Green); Color : array (Colors) of RGB_Color := ( White => (1.0, 1.0, 1.0), Black => (0.0, 0.0, 0.0), Red => (1.0, 0.0, 0.0), Green => (0.0, 1.0, 0.0), Blue => (0.0, 0.0, 1.0), Purple => (1.0, 0.0, 1.0), Yellow => (1.0, 1.0, 0.5), Dark_Green => (0.0, 0.5, 0.5) ); begin Create_Plot (Plot); Put_Line (Plot, ((0.0,0.0), (10.0,10.0))); Show_Plot; Close_Plot; end; -- (C) 2008 Marius Amado-Alves Index: aquaterm.ads =================================================================== RCS file: /cvsroot/aquaterm/adapters/ada/aquaterm.ads,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- aquaterm.ads 3 May 2008 02:12:18 -0000 1.1 +++ aquaterm.ads 3 Jun 2008 10:12:03 -0000 1.2 @@ -1,7 +1,158 @@ +with Ada.Numerics.Generic_Complex_Types; +with AquaTerm_C; +with Interfaces.C.Strings; + package AquaTerm is - -- later the the thick binding will be here; - -- for now use the thin binding AquaTerm.C_Interface + -- This package approximates Ada.Text_IO in structure -end; --- (C) 2008 Marius Amado-Alves \ No newline at end of file + type Plot_Type is limited private; + -- "plot" is AquaTerm parlance for window, canvas; + -- a plot is either created or closed; + -- only created plots can be drawn on or shown + -- (we avoid the word "open" for its ambiguity between created or shown) + + type Real is digits 5; + + package Complex_Types is new Ada.Numerics.Generic_Complex_Types (Real); + use Complex_Types; + + subtype Vector is Complex; + -- a 2D vector, used for position or size; + -- we reuse the standard complex type for ready-made 2D arithmetic; + -- a rectangle is specified by 2 vectors Base and Size: + -- Base = bottom left position of the rectangle, + -- Base + Size = top right position of the rectangle + + -- We follow standard mathematics. Just to clarify: + -- the real part Re corresponds to the horizontal axis X, + -- the imaginary part Im corresponds to the vertical axis Y, + -- and the origin (0,0) is the bottom left point of a plot. + + type Vector_Array is array (Positive range <>) of Vector; + + subtype Fraction is Real range 0.0 .. 1.0; + + type RGB_Color is array (1 .. 3) of Fraction; + -- AquaTerm uses the ubiquitous Red, Green, Blue scheme for color; + -- we make it a type so it can be passed around en bloque; + -- naturally, index 1 corresponds to Red, 2 to Green, 3 to Blue + + --------------------- + -- Alignment types -- + --------------------- + + type Horizontal_Alignment is (Left, Center, Right); + type Vertical_Alignment is (Top, Middle, Bottom); + + type Alignment is record + Horizontal : Horizontal_Alignment; + Vertical : Vertical_Alignment; + end record; + + ---------------- + -- Line style -- + ---------------- + + type Line_Cap is (Butt, Round, Square); + + type Line_Style is record + Thickness : Real; + Color : RGB_Color; + Cap : Line_Cap; + end record; + + -------------------- + -- Default values -- + -------------------- + + Default_Plot_Size : Vector := (500.0, 500.0); + + Default_Color : RGB_Color := (0.0, 0.0, 0.0); + + Default_Horizontal_Alignment : Horizontal_Alignment := Left; + Default_Vertical_Alignment : Vertical_Alignment := Top; + Default_Alignment : Alignment := + (Horizontal => Default_Horizontal_Alignment, + Vertical => Default_Vertical_Alignment); + + Default_Line_Cap : Line_Cap := Butt; + Default_Line_Thickness : Real := 1.0; + Default_Line_Style : Line_Style := + (Cap => Default_Line_Cap, + Thickness => Default_Line_Thickness, + Color => Default_Color); + + ---------------------- + -- Plot management -- + ---------------------- + + procedure Create_Plot + (Plot : in out Plot_Type; + Size : Vector := Default_Plot_Size; + Title : String := ""; + Set_As_Default : Boolean := True); + -- if Plot is already created then Status_Error is propagated; + -- flag Set_As_Default controls whether Set_Default_Plot (Plot) is + -- automatically called upon a successfull creation or reuse + + procedure Reuse_Plot + (Plot : in out Plot_Type; + Size : Vector := Default_Plot_Size; + Title : String := ""; + Set_As_Default : Boolean := True); + -- intended to facilitate the reuse of variable Plot; + -- equivalent to Close_Plot (Plot) followed by Create_Plot with the same arguments + + procedure Close_Plot (Plot : in out Plot_Type); + procedure Close_Plot; + + procedure Set_Plot_Size (Plot : in out Plot_Type; Size : Vector); + procedure Set_Plot_Size (Size : Vector); + + procedure Set_Plot_Title (Plot : in out Plot_Type; Title : String); + procedure Set_Plot_Title (Title : String); + + procedure Show_Plot (Plot : in out Plot_Type); + procedure Show_Plot; + + function Is_Created (Plot : in Plot_Type) return Boolean; + + procedure Set_Default_Plot (Plot : in out Plot_Type); + + ------------------ + -- Line drawing -- + ------------------ + + procedure Put_Line + (Plot : in out Plot_Type; + Vertices : Vector_Array; + Color : RGB_Color := Default_Color; + Style : Line_Style := Default_Line_Style; + Show : Boolean := True); + -- flag Show controls whether Show_Plot (Plot) + -- is called automatically after the new drawing + + procedure Put_Line + (Vertices : Vector_Array; + Color : RGB_Color := Default_Color; + Style : Line_Style := Default_Line_Style; + Show : Boolean := True); + + ---------------- + -- Exceptions -- + ---------------- + + Status_Error : exception; + +private + use AquaTerm_C; + + type Plot_Record is record + Nr : C_INT; + Created : Boolean := False; + Title_ptr : Interfaces.C.Strings.chars_ptr; + end record; + + type Plot_Type is access all Plot_Record; +end; \ No newline at end of file Index: dump_c_interface.adb =================================================================== RCS file: /cvsroot/aquaterm/adapters/ada/dump_c_interface.adb,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- dump_c_interface.adb 3 May 2008 02:12:18 -0000 1.1 +++ dump_c_interface.adb 3 Jun 2008 10:12:04 -0000 1.2 @@ -3,7 +3,7 @@ procedure Dump_C_Interface is --- This program is used to generate Aquaterm.C_Interface +-- This program is used to generate Aquaterm_C -- The main part is an edit of "aquaterm.h" use Ada.Strings.Unbounded; @@ -23,11 +23,11 @@ Put_Line ("with Interfaces.C.Strings;"); Put_Line ("with System;"); New_Line; - Put_Line ("package AquaTerm.C_Interface is"); + Put_Line ("package AquaTerm_C is"); New_Line; - Put_Line (" -- thin binding to the AquaTerm C API"); - Put_Line (" -- this is the output of Dump_C_Interface"); - Put_Line (" -- consider editing that to make changes to this"); + Put_Line (" -- thin binding to the AquaTerm C API;"); + Put_Line (" -- this is the output of Dump_C_Interface;"); + Put_Line (" -- consider editing that to make changes to this"); New_Line; Put_Line (" subtype C_CHAR_PTR is Interfaces.C.Strings.chars_ptr;"); Put_Line (" subtype C_CONST_CHAR_PTR is Interfaces.C.Strings.chars_ptr;"); --- aquaterm-c_interface.ads DELETED --- |
From: hbabcock <hba...@us...> - 2008-05-03 02:12:14
|
Update of /cvsroot/aquaterm/adapters/ada In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv8935 Added Files: aquaterm-c_interface.ads aquaterm.ads demo_thin.adb dump_c_interface.adb Log Message: Initial commit of a Ada adapter to AquaTerm courtesy of Marius Amado-Alves. --- NEW FILE: aquaterm-c_interface.ads --- with Interfaces.C; with Interfaces.C.Strings; with System; package AquaTerm.C_Interface is subtype C_CHAR_PTR is Interfaces.C.Strings.chars_ptr; subtype C_CONST_CHAR_PTR is Interfaces.C.Strings.chars_ptr; subtype C_CONST_VOID_PTR is System.Address; subtype C_FLOAT is Interfaces.C.C_float; subtype C_FLOAT_PTR is System.Address; subtype C_INT is Interfaces.C.int; subtype C_PROC_PTR is System.Address; C_AQT_EVENTBUF_SIZE : constant := 128; -- Constants that specify linecap styles. C_AQTButtLineCapStyle : constant := 0; C_AQTRoundLineCapStyle : constant := 1; C_AQTSquareLineCapStyle : constant := 2; -- Constants that specify horizontal alignment for labels. C_AQTAlignLeft : constant := 0; C_AQTAlignCenter : constant := 1; C_AQTAlignRight : constant := 2; -- Constants that specify vertical alignment for labels. C_AQTAlignMiddle : constant := 0; C_AQTAlignBaseline : constant := 4; C_AQTAlignBottom : constant := 8; C_AQTAlignTop : constant := 16; -- Class initialization etc. function C_aqtInit return C_INT; pragma Import (C, C_aqtInit, "aqtInit"); procedure C_aqtTerminate; pragma Import (C, C_aqtTerminate, "aqtTerminate"); procedure C_aqtSetEventHandler (func : C_PROC_PTR); pragma Import (C, C_aqtSetEventHandler, "aqtSetEventHandler"); -- Control operations procedure C_aqtOpenPlot (refNum : C_INT); pragma Import (C, C_aqtOpenPlot, "aqtOpenPlot"); function C_aqtSelectPlot (refNum : C_INT) return C_INT; pragma Import (C, C_aqtSelectPlot, "aqtSelectPlot"); procedure C_aqtSetPlotSize (width : C_FLOAT; height : C_FLOAT); pragma Import (C, C_aqtSetPlotSize, "aqtSetPlotSize"); procedure C_aqtSetPlotTitle (title : C_CONST_CHAR_PTR); pragma Import (C, C_aqtSetPlotTitle, "aqtSetPlotTitle"); procedure C_aqtRenderPlot; pragma Import (C, C_aqtRenderPlot, "aqtRenderPlot"); procedure C_aqtClearPlot; pragma Import (C, C_aqtClearPlot, "aqtClearPlot"); procedure C_aqtClosePlot; pragma Import (C, C_aqtClosePlot, "aqtClosePlot"); -- Event handling procedure C_aqtSetAcceptingEvents (flag : C_INT); pragma Import (C, C_aqtSetAcceptingEvents, "aqtSetAcceptingEvents"); function C_aqtGetLastEvent (buffer : C_CHAR_PTR) return C_INT; pragma Import (C, C_aqtGetLastEvent, "aqtGetLastEvent"); function C_aqtWaitNextEvent (buffer : C_CHAR_PTR) return C_INT; pragma Import (C, C_aqtWaitNextEvent, "aqtWaitNextEvent"); -- Plotting related commands -- Clip rect, applies to all objects procedure C_aqtSetClipRect (originX : C_FLOAT; originY : C_FLOAT; width : C_FLOAT; height : C_FLOAT); pragma Import (C, C_aqtSetClipRect, "aqtSetClipRect"); procedure C_aqtSetDefaultClipRect; pragma Import (C, C_aqtSetDefaultClipRect, "aqtSetDefaultClipRect"); -- Colormap (utility) function C_aqtColormapSize return C_INT; pragma Import (C, C_aqtColormapSize, "aqtColormapSize"); procedure C_aqtSetColormapEntry (entryIndex : C_INT; r : C_FLOAT; g : C_FLOAT; b : C_FLOAT); pragma Import (C, C_aqtSetColormapEntry, "aqtSetColormapEntry"); procedure C_aqtGetColormapEntry (entryIndex : C_INT; r : C_FLOAT_PTR; g : C_FLOAT_PTR; b : C_FLOAT_PTR); pragma Import (C, C_aqtGetColormapEntry, "aqtGetColormapEntry"); procedure C_aqtTakeColorFromColormapEntry (index : C_INT); pragma Import (C, C_aqtTakeColorFromColormapEntry, "aqtTakeColorFromColormapEntry"); procedure C_aqtTakeBackgroundColorFromColormapEntry (index : C_INT); pragma Import (C, C_aqtTakeBackgroundColorFromColormapEntry, "aqtTakeBackgroundColorFromColormapEntry"); -- Color handling procedure C_aqtSetColor (r : C_FLOAT; g : C_FLOAT; b : C_FLOAT); pragma Import (C, C_aqtSetColor, "aqtSetColor"); procedure C_aqtSetBackgroundColor (r : C_FLOAT; g : C_FLOAT; b : C_FLOAT); pragma Import (C, C_aqtSetBackgroundColor, "aqtSetBackgroundColor"); procedure C_aqtGetColor (r : C_FLOAT_PTR; g : C_FLOAT_PTR; b : C_FLOAT_PTR); pragma Import (C, C_aqtGetColor, "aqtGetColor"); procedure C_aqtGetBackgroundColor (r : C_FLOAT_PTR; g : C_FLOAT_PTR; b : C_FLOAT_PTR); pragma Import (C, C_aqtGetBackgroundColor, "aqtGetBackgroundColor"); -- Text handling procedure C_aqtSetFontname (newFontname : C_CONST_CHAR_PTR); pragma Import (C, C_aqtSetFontname, "aqtSetFontname"); procedure C_aqtSetFontsize (newFontsize : C_FLOAT); pragma Import (C, C_aqtSetFontsize, "aqtSetFontsize"); procedure C_aqtAddLabel (text : C_CONST_CHAR_PTR; x : C_FLOAT; y : C_FLOAT; angle : C_FLOAT; align : C_INT); pragma Import (C, C_aqtAddLabel, "aqtAddLabel"); procedure C_aqtAddShearedLabel (text : C_CONST_CHAR_PTR; x : C_FLOAT; y : C_FLOAT; angle : C_FLOAT; shearAngle : C_FLOAT; align : C_INT); pragma Import (C, C_aqtAddShearedLabel, "aqtAddShearedLabel"); -- Line handling procedure C_aqtSetLinewidth (newLinewidth : C_FLOAT); pragma Import (C, C_aqtSetLinewidth, "aqtSetLinewidth"); procedure C_aqtSetLinestylePattern (newPattern : C_FLOAT_PTR; newCount : C_INT; newPhase : C_FLOAT); pragma Import (C, C_aqtSetLinestylePattern, "aqtSetLinestylePattern"); procedure C_aqtSetLinestyleSolid; pragma Import (C, C_aqtSetLinestyleSolid, "aqtSetLinestyleSolid"); procedure C_aqtSetLineCapStyle (capStyle : C_INT); pragma Import (C, C_aqtSetLineCapStyle, "aqtSetLineCapStyle"); procedure C_aqtMoveTo (x : C_FLOAT; y : C_FLOAT); pragma Import (C, C_aqtMoveTo, "aqtMoveTo"); procedure C_aqtAddLineTo (x : C_FLOAT; y : C_FLOAT); pragma Import (C, C_aqtAddLineTo, "aqtAddLineTo"); procedure C_aqtAddPolyline (x : C_FLOAT_PTR; y : C_FLOAT_PTR; pointCount : C_INT); pragma Import (C, C_aqtAddPolyline, "aqtAddPolyline"); -- Rect and polygon handling procedure C_aqtMoveToVertex (x : C_FLOAT; y : C_FLOAT); pragma Import (C, C_aqtMoveToVertex, "aqtMoveToVertex"); procedure C_aqtAddEdgeToVertex (x : C_FLOAT; y : C_FLOAT); pragma Import (C, C_aqtAddEdgeToVertex, "aqtAddEdgeToVertex"); procedure C_aqtAddPolygon (x : C_FLOAT_PTR; y : C_FLOAT_PTR; pointCount : C_INT); pragma Import (C, C_aqtAddPolygon, "aqtAddPolygon"); procedure C_aqtAddFilledRect (originX : C_FLOAT; originY : C_FLOAT; width : C_FLOAT; height : C_FLOAT); pragma Import (C, C_aqtAddFilledRect, "aqtAddFilledRect"); procedure C_aqtEraseRect (originX : C_FLOAT; originY : C_FLOAT; width : C_FLOAT; height : C_FLOAT); pragma Import (C, C_aqtEraseRect, "aqtEraseRect"); -- Image handling procedure C_aqtSetImageTransform (m11 : C_FLOAT; m12 : C_FLOAT; m21 : C_FLOAT; m22 : C_FLOAT; tX : C_FLOAT; tY : C_FLOAT); pragma Import (C, C_aqtSetImageTransform, "aqtSetImageTransform"); procedure C_aqtResetImageTransform; pragma Import (C, C_aqtResetImageTransform, "aqtResetImageTransform"); procedure C_aqtAddImageWithBitmap (bitmap : C_CONST_VOID_PTR; pixWide : C_INT; pixHigh : C_INT; destX : C_FLOAT; destY : C_FLOAT; destWidth : C_FLOAT; destHeight : C_FLOAT); pragma Import (C, C_aqtAddImageWithBitmap, "aqtAddImageWithBitmap"); procedure C_aqtAddTransformedImageWithBitmap (bitmap : C_CONST_VOID_PTR; pixWide : C_INT; pixHigh : C_INT; clipX : C_FLOAT; clipY : C_FLOAT; clipWidth : C_FLOAT; clipHeight : C_FLOAT); pragma Import (C, C_aqtAddTransformedImageWithBitmap, "aqtAddTransformedImageWithBitmap"); end; --- NEW FILE: aquaterm.ads --- package AquaTerm is -- later the the thick binding will be here; -- for now use the thin binding AquaTerm.C_Interface end; -- (C) 2008 Marius Amado-Alves --- NEW FILE: demo_thin.adb --- with Ada.Numerics; with Ada.Numerics.Elementary_Functions; with Aquaterm.C_Interface; with Interfaces.C; with Interfaces.C.Strings; procedure Demo_Thin is -- Thin translation, by Marius Amado-Alves, of "demo.c" by Per Persson. -- Original text reproduced in comments of the form --: ... -- Executable built with: gnatmake demo_thin -largs -laquaterm --: demo.c --: AquaTerm --: --: Created by Per Persson on Fri Nov 07 2003. --: Copyright (c) 2003 __MyCompanyName__. All rights reserved. --: --: --: This file contains an example of what can be done with --: AquaTerm and the corresponding library: libaqt.dylib --: --: This code can be build as a stand-alone executable (tool) --: from the command line: --: gcc -o demo demo.c -laquaterm -lobjc -- No, don't use the -objc option (or the executable will burst) --: #include "aquaterm/aquaterm.h" --: #include <math.h> use AquaTerm.C_Interface; use type Interfaces.C.int; use type Interfaces.C.C_Float; use Interfaces.C.Strings; function "+" (Str : in String) return chars_ptr is Z : String := Str & Character'Val(0); begin return Interfaces.C.Strings.New_String (Z); end; function Img (X : Natural) return String is Z : String := Natural'Image(X); begin return Z (2 .. Z'Last); end; i : C_INT; --: int i; --: char strBuf[256]; (not needed in Ada) xPtr, yPtr : array (0 .. 127) of C_FLOAT; --: float xPtr[128], yPtr[128]; x, y, f : C_FLOAT; --: double pi = 4.0*atan(1.0); (not needed; using Ada's pi) rgbImage : array (0 .. 11) of Interfaces.C.unsigned_char := ( 255, 0, 0, 0, 255, 0, 0, 0, 255, 0, 0, 0 ); --: unsigned char rgbImage[12]={ --: --: 255, 0, 0, --: --: 0, 255, 0, --: --: 0, 0, 255, --: --: 0, 0, 0 --: }; begin --: --: Initialize. Do it or fail miserably... i := C_aqtInit; --: aqtInit(); --: --: Open up a plot for drawing C_aqtOpenPlot(1); C_aqtSetPlotSize(620.0,420.0); C_aqtSetPlotTitle(+"Testview"); --: --: Set colormap C_aqtSetColormapEntry(0, 1.0, 1.0, 1.0); --: white C_aqtSetColormapEntry(1, 0.0, 0.0, 0.0); --: black C_aqtSetColormapEntry(2, 1.0, 0.0, 0.0); --: red C_aqtSetColormapEntry(3, 0.0, 1.0, 0.0); --: green C_aqtSetColormapEntry(4, 0.0, 0.0, 1.0); --: blue C_aqtSetColormapEntry(5, 1.0, 0.0, 1.0); --: purple C_aqtSetColormapEntry(6, 1.0, 1.0, 0.5); --: yellow C_aqtSetColormapEntry(7, 0.0, 0.5, 0.5); --: dark green --: --: Set color explicitly C_aqtSetColor(0.0, 0.0, 0.0); C_aqtSetFontname(+"Helvetica"); C_aqtSetFontsize(12.0); C_aqtAddLabel(+"Testview 620x420 pt", 4.0, 412.0, 0.0, C_AQTAlignLeft); --: --: Frame plot C_aqtMoveTo(20.0, 20.0); C_aqtAddLineTo(600.0,20.0); C_aqtAddLineTo(600.0,400.0); C_aqtAddLineTo(20.0,400.0); C_aqtAddLineTo(20.0,20.0); C_aqtAddLabel(+"Frame 600x400 pt", 24.0, 30.0, 0.0, C_AQTAlignLeft); --: --: Colormap C_aqtAddLabel(+"Custom colormap (8 out of 256)", 30.0, 390.0, 0.0, C_AQTAlignLeft); --: --: Display the colormap, but first create a background for the white box... C_aqtSetColor(0.8, 0.8, 0.8); C_aqtAddFilledRect(28.0, 348.0, 24.0, 24.0); for i in 0 .. 7 loop --: for (i=0; i<8; i++) C_aqtTakeColorFromColormapEntry(C_INT(i)); C_aqtAddFilledRect(C_FLOAT(30+i*30), 350.0, 20.0, 20.0); --: --: --: Print the color index C_aqtSetColor(0.5, 0.5, 0.5); --: --: sprintf(strBuf, "%d", i); --: --: aqtAddLabel(strBuf, 40+i*30, 360, 0.0, (AQTAlignCenter | AQTAlignMiddle)); C_aqtAddLabel(New_String(Img(i)), C_FLOAT(40+i*30), 360.0, 0.0, C_AQTAlignCenter + C_AQTAlignMiddle); end loop; --: --: Continuos colors C_aqtTakeColorFromColormapEntry(1); C_aqtAddLabel(+"""Any color you like""", 320.0, 390.0, 0.0, C_AQTAlignLeft); C_aqtSetLinewidth(1.0); for i in 0 .. 255 loop --: for (i=0; i<256; i++) f := C_FLOAT(i)/255.0; --: --: f = (float)i/255.0; C_aqtSetColor(1.0, f, f/2.0); C_aqtAddFilledRect(C_FLOAT(320+i), 350.0, 1.0, 20.0); C_aqtSetColor(0.0, f, (1.0-f)); C_aqtAddFilledRect(C_FLOAT(320+i), 328.0, 1.0, 20.0); C_aqtSetColor((1.0-f), (1.0-f), (1.0-f)); C_aqtAddFilledRect(C_FLOAT(320+i), 306.0, 1.0, 20.0); end loop; --: --: Lines C_aqtTakeColorFromColormapEntry(1); f := 1.0; while f < 13.0 loop --: for (f=1.0; f<13.0; f+=2.0) declare lw : C_FLOAT := f/2.0; type Decimal is delta 0.1 digits 4; begin C_aqtSetLinewidth(lw); C_aqtMoveTo(30.0, 200.5+f*10.0); C_aqtAddLineTo(200.0, 200.5+f*10.0); --: sprintf(strBuf, "linewidth %3.1f", lw); --: aqtAddLabel(strBuf, 210, 201.5+f*10, 0.0, AQTAlignLeft); C_aqtAddLabel(+Decimal'Image(Decimal(lw)), 210.0, 201.5+f*10.0, 0.0, C_AQTAlignLeft); end; f := f + 2.0; end loop; --: --: linecap styles C_aqtSetLinewidth(11.0); C_aqtTakeColorFromColormapEntry(1); C_aqtSetLineCapStyle(C_AQTButtLineCapStyle); C_aqtMoveTo(40.5, 170.5); C_aqtAddLineTo(150.5, 170.5); C_aqtAddLabel(+"AQTButtLineCapStyle", 160.5, 170.5, 0.0, C_AQTAlignLeft); C_aqtSetLinewidth(1.0); C_aqtTakeColorFromColormapEntry(6); C_aqtMoveTo(40.5, 170.5); C_aqtAddLineTo(150.5, 170.5); C_aqtSetLinewidth(11.0); C_aqtTakeColorFromColormapEntry(1); C_aqtSetLineCapStyle(C_AQTRoundLineCapStyle); C_aqtMoveTo(40.5, 150.5); C_aqtAddLineTo(150.5, 150.5); C_aqtAddLabel(+"AQTRoundLineCapStyle", 160.5, 150.5, 0.0, C_AQTAlignLeft); C_aqtSetLinewidth(1.0); C_aqtTakeColorFromColormapEntry(6); C_aqtMoveTo(40.5, 150.5); C_aqtAddLineTo(150.5, 150.5); C_aqtSetLinewidth(11.0); C_aqtTakeColorFromColormapEntry(1); C_aqtSetLineCapStyle(C_AQTSquareLineCapStyle); C_aqtMoveTo(40.5, 130.5); C_aqtAddLineTo(150.5, 130.5); C_aqtAddLabel(+"AQTSquareLineCapStyle", 160.5, 130.5, 0.0, C_AQTAlignLeft); C_aqtSetLinewidth(1.0); C_aqtTakeColorFromColormapEntry(6); C_aqtMoveTo(40.5, 130.5); C_aqtAddLineTo(150.5, 130.5); --: --: line joins C_aqtTakeColorFromColormapEntry(1); C_aqtAddLabel(+"Line joins:", 40.0, 90.0, 0.0, C_AQTAlignLeft); C_aqtSetLinewidth(11.0); C_aqtSetLineCapStyle(C_AQTButtLineCapStyle); C_aqtMoveTo(40.0, 50.0); C_aqtAddLineTo(75.0, 70.0); C_aqtAddLineTo(110.0, 50.0); C_aqtSetLinewidth(1.0); C_aqtTakeColorFromColormapEntry(6); C_aqtMoveTo(40.0, 50.0); C_aqtAddLineTo(75.0, 70.0); C_aqtAddLineTo(110.0, 50.0); C_aqtSetLinewidth(11.0); C_aqtTakeColorFromColormapEntry(1); C_aqtMoveTo(130.0, 50.0); C_aqtAddLineTo(150.0, 70.0); C_aqtAddLineTo(170.0, 50.0); C_aqtSetLinewidth(1.0); C_aqtTakeColorFromColormapEntry(6); C_aqtMoveTo(130.0, 50.0); C_aqtAddLineTo(150.0, 70.0); C_aqtAddLineTo(170.0, 50.0); C_aqtSetLinewidth(11.0); C_aqtTakeColorFromColormapEntry(1); C_aqtSetLineCapStyle(C_AQTButtLineCapStyle); C_aqtMoveTo(190.0, 50.0); C_aqtAddLineTo(200.0, 70.0); C_aqtAddLineTo(210.0, 50.0); C_aqtSetLinewidth(1.0); C_aqtTakeColorFromColormapEntry(6); C_aqtMoveTo(190.0, 50.0); C_aqtAddLineTo(200.0, 70.0); C_aqtAddLineTo(210.0, 50.0); --: --: Polygons C_aqtTakeColorFromColormapEntry(1); C_aqtAddLabel(+"Polygons", 320.0, 290.0, 0.0, C_AQTAlignLeft); declare use Interfaces.C; use Ada.Numerics; use Ada.Numerics.Elementary_Functions; radians : double; r : double := 20.0; begin for i in 0 .. 3 loop --: for (i=0; i<4; i++) --: double radians=(double)i*pi/2.0, r=20.0; --: xPtr[i] = 340.0+r*cos(radians); --: yPtr[i] = 255.0+r*sin(radians); radians := double(i)*pi/2.0; xPtr (i) := AquaTerm.C_Interface.C_FLOAT (340.0+Float(r)*cos(Float(radians))); yPtr (i) := AquaTerm.C_Interface.C_FLOAT (255.0+Float(r)*sin(Float(radians))); end loop; C_aqtTakeColorFromColormapEntry(2); C_aqtAddPolygon(xPtr(0)'Address, yPtr(0)'Address, 4); -- for i in 0 .. 4 loop --: for (i=0; i<5; i++) --: double radians=(double)i*pi*0.8, r=20.0; --: xPtr[i] = 400.0+r*cos(radians); --: yPtr[i] = 255.0+r*sin(radians); radians := double(i)*pi*0.8; xPtr (i) := AquaTerm.C_Interface.C_FLOAT (400.0+Float(r)*cos(Float(radians))); yPtr (i) := AquaTerm.C_Interface.C_FLOAT (255.0+Float(r)*sin(Float(radians))); end loop; C_aqtTakeColorFromColormapEntry(3); C_aqtAddPolygon(xPtr(0)'Address, yPtr(0)'Address, 5); -- C_aqtTakeColorFromColormapEntry(1); xPtr(5) := xPtr(0); yPtr(5) := yPtr(0); C_aqtAddPolyline(xPtr(0)'Address, yPtr(0)'Address, 6); --: --: Overlay a polyline -- for i in 0 .. 7 loop --: for (i=0; i<8; i++) --: double radians=(double)i*pi/4.0, r=20.0; --: xPtr[i] = 460.0+r*cos(radians); --: yPtr[i] = 255.0+r*sin(radians); radians := double(i)*pi/4.0; xPtr (i) := AquaTerm.C_Interface.C_FLOAT (460.0+Float(r)*cos(Float(radians))); yPtr (i) := AquaTerm.C_Interface.C_FLOAT (255.0+Float(r)*sin(Float(radians))); end loop; C_aqtTakeColorFromColormapEntry(4); C_aqtAddPolygon(xPtr(0)'Address, yPtr(0)'Address, 8); -- for i in 0 .. 31 loop --: for (i=0; i<32; i++) --: double radians=(double)i*pi/16.0, r=20.0; --: xPtr[i] = 520.0+r*cos(radians); --: yPtr[i] = 255.0+r*sin(radians); radians := double(i)*pi/16.0; xPtr (i) := AquaTerm.C_Interface.C_FLOAT (520.0+Float(r)*cos(Float(radians))); yPtr (i) := AquaTerm.C_Interface.C_FLOAT (255.0+Float(r)*sin(Float(radians))); end loop; C_aqtTakeColorFromColormapEntry(5); C_aqtAddPolygon(xPtr(0)'Address, yPtr(0)'Address, 32); end; --: --: Images C_aqtTakeColorFromColormapEntry(1); C_aqtAddLabel(+"Images", 320.0, 220.0, 0.0, C_AQTAlignLeft); C_aqtAddImageWithBitmap(rgbImage(0)'Address, 2, 2, 328.0, 200.0, 4.0, 4.0); C_aqtAddLabel(+"bits", 330.0, 180.0, 0.0, C_AQTAlignCenter); C_aqtAddImageWithBitmap(rgbImage(0)'Address, 2,2, 360.0, 190.0, 40.0, 15.0); C_aqtAddLabel(+"fit bounds", 380.0, 180.0, 0.0, C_AQTAlignCenter); C_aqtSetImageTransform(9.23880, 3.82683, -3.82683, 9.23880, 494.6, 186.9); C_aqtAddTransformedImageWithBitmap(rgbImage(0)'Address, 2,2, 0.0, 0.0, 600.0, 400.0); C_aqtAddLabel(+"scale, rotate & translate", 500.0, 180.0, 0.0, C_AQTAlignCenter); C_aqtResetImageTransform; --: --: Text C_aqtTakeColorFromColormapEntry(1); C_aqtSetFontname(+"Times-Roman"); C_aqtSetFontsize(16.0); C_aqtAddLabel(+"Times-Roman 16pt", 320.0, 150.0, 0.0, C_AQTAlignLeft); C_aqtTakeColorFromColormapEntry(2); C_aqtSetFontname(+"Times-Italic"); C_aqtSetFontsize(16.0); C_aqtAddLabel(+"Times-Italic 16pt", 320.0, 130.0, 0.0, C_AQTAlignLeft); C_aqtTakeColorFromColormapEntry(4); C_aqtSetFontname(+"Zapfino"); C_aqtSetFontsize(12.0); C_aqtAddLabel(+"Zapfino 12pt", 320.0, 104.0, 0.0, C_AQTAlignLeft); C_aqtTakeColorFromColormapEntry(2); C_aqtSetLinewidth(0.5); C_aqtMoveTo(510.5, 160.0); C_aqtAddLineTo(510.5, 100.0); x := 540.5; y := 75.5; C_aqtMoveTo(x+5.0, y); C_aqtAddLineTo(x-5.0, y); C_aqtMoveTo(x, y+5.0); C_aqtAddLineTo(x, y-5.0); C_aqtTakeColorFromColormapEntry(1); C_aqtSetFontname(+"Verdana"); C_aqtSetFontsize(10.0); C_aqtAddLabel(+"left aligned", 510.5, 150.0, 0.0, C_AQTAlignLeft); C_aqtAddLabel(+"centered", 510.5, 130.0, 0.0, C_AQTAlignCenter); C_aqtAddLabel(+"right aligned", 510.5, 110.0, 0.0, C_AQTAlignRight); C_aqtSetFontname(+"Times-Roman"); C_aqtSetFontsize(14.0); C_aqtAddLabel(+"-rotate", x, y, 90.0, C_AQTAlignLeft); C_aqtAddLabel(+"-rotate", x, y, 45.0, C_AQTAlignLeft); C_aqtAddLabel(+"-rotate", x, y, -30.0, C_AQTAlignLeft); C_aqtAddLabel(+"-rotate", x, y, -60.0, C_AQTAlignLeft); C_aqtAddLabel(+"-rotate", x, y, -90.0, C_AQTAlignLeft); --: --: String styling is _not_ possible from pure C C_aqtSetFontsize(12.0); C_aqtAddLabel(+"No underline, sub- or superscript from ""C""", 320.0, 75.0, 0.0, C_AQTAlignLeft); C_aqtTakeColorFromColormapEntry(2); C_aqtSetLinewidth(0.5); C_aqtMoveTo(320.0, 45.5); C_aqtAddLineTo(520.0, 45.5); C_aqtTakeColorFromColormapEntry(1); C_aqtSetFontname(+"Times-Italic"); C_aqtSetFontsize(14.0); C_aqtAddLabel(+"Top", 330.0, 45.5, 0.0, (C_AQTAlignLeft + C_AQTAlignTop)); C_aqtAddLabel(+"Bottom", 360.0, 45.5, 0.0, (C_AQTAlignLeft + C_AQTAlignBottom)); C_aqtAddLabel(+"Middle", 410.0, 45.5, 0.0, (C_AQTAlignLeft + C_AQTAlignMiddle)); C_aqtAddLabel(+"Baseline", 460.0, 45.5, 0.0, (C_AQTAlignLeft + C_AQTAlignBaseline)); --: --: Draw it C_aqtRenderPlot; --: --: Let go of plot _when done_ C_aqtClosePlot; C_aqtTerminate; end; -- (C) 2008 Marius Amado-Alves --- NEW FILE: dump_c_interface.adb --- with Ada.Text_IO; with Ada.Strings.Unbounded; procedure Dump_C_Interface is -- This program is used to generate Aquaterm.C_Interface -- The main part is an edit of "aquaterm.h" use Ada.Strings.Unbounded; use Ada.Text_IO; type Types is (Type_char_ptr, Type_const_char_ptr, Type_const_void_ptr, Type_float, Type_float_ptr, Type_int, Type_Proc_Ptr); procedure Start is begin Put_Line ("with Interfaces.C;"); Put_Line ("with Interfaces.C.Strings;"); Put_Line ("with System;"); New_Line; Put_Line ("package AquaTerm.C_Interface is"); New_Line; Put_Line (" -- thin binding to the AquaTerm C API"); Put_Line (" -- this is the output of Dump_C_Interface"); Put_Line (" -- consider editing that to make changes to this"); New_Line; Put_Line (" subtype C_CHAR_PTR is Interfaces.C.Strings.chars_ptr;"); Put_Line (" subtype C_CONST_CHAR_PTR is Interfaces.C.Strings.chars_ptr;"); Put_Line (" subtype C_CONST_VOID_PTR is System.Address;"); Put_Line (" subtype C_FLOAT is Interfaces.C.C_float;"); Put_Line (" subtype C_FLOAT_PTR is System.Address;"); Put_Line (" subtype C_INT is Interfaces.C.int;"); Put_Line (" subtype C_PROC_PTR is System.Address;"); New_Line; end; procedure Define (Name : String; Number : Integer) is begin Put_Line (" C_" & Name & " : constant :=" & Integer'Image (Number) & ";"); end; procedure Comment (Text : String) is begin New_Line; Put_Line ("-- " & Text); New_Line; end; procedure Extern_Const_Int (Name : String; Value : Integer := Integer'First) is begin Put_Line (" C_" & Name & " : constant :=" & Integer'Image (Value) & ";"); end; procedure Import (Name : String) is begin Put_Line (" pragma Import (C, C_" & Name & ", """ & Name & """);"); end; type Typed_Name is record The_Type : Types; Name : Unbounded_String; end record; function Type_Of (X : Typed_Name) return String is Z : String := Types'Image (X.The_Type); begin return "C_" & Z (6 .. Z'Last); end; function Name_Of (X : Typed_Name) return String is begin return To_String (X.Name); end; type Typed_Name_Series is array (Positive range <>) of Typed_Name; Null_Series : Typed_Name_Series (1 .. 0); procedure Put_Parameters (X : Typed_Name_Series) is begin if X'Length > 0 then Put (" ("); for I in X'Range loop if I > X'First then Put ("; "); end if; Put (Name_Of (X(I)) & " : " & Type_Of (X(I))); end loop; Put (")"); end if; end; procedure Proc (Name : String; Parameters : Typed_Name_Series := Null_Series) is begin Put (" procedure C_" & Name); Put_Parameters (Parameters); Put_Line (";"); Import (Name); end; procedure Func (X : Typed_Name_Series) is begin Put (" function C_" & Name_Of (X(X'First))); Put_Parameters (X(X'First + 1 .. X'Last)); Put_Line (" return " & Type_Of(X(X'First)) & ";"); Import (Name_Of (X(X'First))); end; -- SYNTAX SUGAR function char_ptr (Name : String) return Typed_Name is begin return (Name => To_Unbounded_String (Name), The_Type => Type_char_ptr); end; function const_char_ptr (Name : String) return Typed_Name is begin return (Name => To_Unbounded_String (Name), The_Type => Type_const_char_ptr); end; function const_void_ptr (Name : String) return Typed_Name is begin return (Name => To_Unbounded_String (Name), The_Type => Type_const_void_ptr); end; function float (Name : String) return Typed_Name is begin return (Name => To_Unbounded_String (Name), The_Type => Type_float); end; function float_ptr (Name : String) return Typed_Name is begin return (Name => To_Unbounded_String (Name), The_Type => Type_float_ptr); end; function int (Name : String) return Typed_Name is begin return (Name => To_Unbounded_String (Name), The_Type => Type_int); end; function Proc_Ptr (Name : String) return Typed_Name is begin return (Name => To_Unbounded_String (Name), The_Type => Type_Proc_Ptr); end; procedure Func (X1 : Typed_Name) is begin Func (Typed_Name_Series'(1 => X1)); end; procedure Proc (Name : String; X1 : Typed_Name) is begin Proc (Name,Typed_Name_Series'(1 => X1)); end; -- MAIN PROGRAM begin Start; Define ("AQT_EVENTBUF_SIZE", 128); Comment (" Constants that specify linecap styles. "); Extern_Const_Int ("AQTButtLineCapStyle",0); Extern_Const_Int ("AQTRoundLineCapStyle",1); Extern_Const_Int ("AQTSquareLineCapStyle",2); Comment (" Constants that specify horizontal alignment for labels. "); Extern_Const_Int ("AQTAlignLeft",0); Extern_Const_Int ("AQTAlignCenter",1); Extern_Const_Int ("AQTAlignRight",2); Comment (" Constants that specify vertical alignment for labels. "); Extern_Const_Int ("AQTAlignMiddle",0); Extern_Const_Int ("AQTAlignBaseline",4); Extern_Const_Int ("AQTAlignBottom",8); Extern_Const_Int ("AQTAlignTop",16); Comment (" Class initialization etc."); Func (int ("aqtInit")); Proc ("aqtTerminate"); Proc ("aqtSetEventHandler", Proc_Ptr ("func")); --(void (*func)(int ref, const char *event)); Comment (" Control operations "); Proc ("aqtOpenPlot", int ("refNum")); Func (int ("aqtSelectPlot") & int ("refNum")); Proc ("aqtSetPlotSize", float ("width") & float ("height")); Proc ("aqtSetPlotTitle", const_char_ptr ("title")); Proc ("aqtRenderPlot"); Proc ("aqtClearPlot"); Proc ("aqtClosePlot"); Comment (" Event handling "); Proc ("aqtSetAcceptingEvents", int ("flag")); Func (int ("aqtGetLastEvent") & char_ptr ("buffer")); Func (int ("aqtWaitNextEvent") & char_ptr ("buffer")); Comment (" Plotting related commands "); Comment (" Clip rect, applies to all objects "); Proc ("aqtSetClipRect", float ("originX") & float ("originY") & float ("width") & float ("height")); Proc ("aqtSetDefaultClipRect"); Comment (" Colormap (utility) "); Func (int ("aqtColormapSize")); Proc ("aqtSetColormapEntry", int ("entryIndex") & float ("r") & float ("g") & float ("b")); Proc ("aqtGetColormapEntry", int ("entryIndex") & float_ptr ("r") & float_ptr ("g") & float_ptr ("b")); Proc ("aqtTakeColorFromColormapEntry", int ("index")); Proc ("aqtTakeBackgroundColorFromColormapEntry", int ("index")); Comment (" Color handling "); Proc ("aqtSetColor", float ("r") & float ("g") & float ("b")); Proc ("aqtSetBackgroundColor", float("r") & float("g") & float("b")); Proc ("aqtGetColor", float_ptr("r") & float_ptr("g") & float_ptr("b")); Proc ("aqtGetBackgroundColor", float_ptr("r") & float_ptr("g") & float_ptr("b")); Comment (" Text handling "); Proc ("aqtSetFontname", const_char_ptr ("newFontname")); Proc ("aqtSetFontsize", float ("newFontsize")); Proc ("aqtAddLabel", const_char_ptr("text") & float("x") & float("y") & float("angle") & int("align")); Proc ("aqtAddShearedLabel", const_char_ptr("text") & float("x") & float("y") & float("angle") & float ("shearAngle") & int ("align")); Comment (" Line handling "); Proc ("aqtSetLinewidth", float ("newLinewidth")); Proc ("aqtSetLinestylePattern", float_ptr ("newPattern") & int ("newCount") & float ("newPhase")); Proc ("aqtSetLinestyleSolid"); Proc ("aqtSetLineCapStyle", int ("capStyle")); Proc ("aqtMoveTo", float ("x") & float ("y")); Proc ("aqtAddLineTo", float("x") & float("y")); Proc ("aqtAddPolyline", float_ptr("x") & float_ptr("y") & int("pointCount")); Comment(" Rect and polygon handling"); Proc ("aqtMoveToVertex", float ("x") & float ("y")); Proc ("aqtAddEdgeToVertex", float ("x") & float ("y")); Proc ("aqtAddPolygon", float_ptr("x") & float_ptr("y") & int ("pointCount")); Proc ("aqtAddFilledRect", float ("originX") & float ("originY") & float("width") & float("height")); Proc ("aqtEraseRect", float ("originX") & float("originY") & float("width") & float("height")); Comment (" Image handling "); Proc ("aqtSetImageTransform", float ("m11") & float ("m12") & float ("m21") & float ("m22") & float ("tX") & float ("tY")); Proc ("aqtResetImageTransform"); Proc ("aqtAddImageWithBitmap", const_void_ptr ("bitmap") & int ("pixWide") & int ("pixHigh") & float ("destX") & float ("destY") & float ("destWidth") & float ("destHeight")); Proc ("aqtAddTransformedImageWithBitmap", const_void_ptr("bitmap") & int ("pixWide") & int ("pixHigh") & float ("clipX") & float ("clipY") & float ("clipWidth") & float ("clipHeight")); Put_Line ("end;"); Put_Line ("-- (C) 2008 Marius Amado-Alves"); end; -- (C) 2008 Marius Amado-Alves |
From: hbabcock <hba...@us...> - 2008-05-03 02:06:29
|
Update of /cvsroot/aquaterm/adapters/ada In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv6570/ada Log Message: Directory /cvsroot/aquaterm/adapters/ada added to the repository |
From: Per P. <per...@us...> - 2007-03-22 18:54:48
|
Update of /cvsroot/aquaterm/aquaterm/AquaTerm.xcodeproj In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv5161 Modified Files: project.pbxproj Log Message: Final changes before 1.1.0 release. Index: project.pbxproj =================================================================== RCS file: /cvsroot/aquaterm/aquaterm/AquaTerm.xcodeproj/project.pbxproj,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- project.pbxproj 31 Jul 2006 21:49:13 -0000 1.3 +++ project.pbxproj 22 Mar 2007 18:54:37 -0000 1.4 @@ -46,6 +46,12 @@ CB9B70CD065A0AD100563010 /* Preferences.nib in Resources */ = {isa = PBXBuildFile; fileRef = CB9B70CB065A0AD100563010 /* Preferences.nib */; }; CB9B70D3065A0B9C00563010 /* AQTPrefController.h in Headers */ = {isa = PBXBuildFile; fileRef = CB9B70D1065A0B9C00563010 /* AQTPrefController.h */; }; CB9B70D4065A0B9C00563010 /* AQTPrefController.m in Sources */ = {isa = PBXBuildFile; fileRef = CB9B70D2065A0B9C00563010 /* AQTPrefController.m */; }; + CB9C491B0BB1C3D700FDF03C /* crossBlack.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CB9C490F0BB1C3D700FDF03C /* crossBlack.tiff */; }; + CB9C491C0BB1C3D700FDF03C /* crossBlue.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CB9C49110BB1C3D700FDF03C /* crossBlue.tiff */; }; + CB9C491D0BB1C3D700FDF03C /* crossGreen.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CB9C49130BB1C3D700FDF03C /* crossGreen.tiff */; }; + CB9C491E0BB1C3D700FDF03C /* crossRed.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CB9C49150BB1C3D700FDF03C /* crossRed.tiff */; }; + CB9C491F0BB1C3D700FDF03C /* crossWhite.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CB9C49170BB1C3D700FDF03C /* crossWhite.tiff */; }; + CB9C49200BB1C3D700FDF03C /* crossYellow.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CB9C49190BB1C3D700FDF03C /* crossYellow.tiff */; }; CBB800C80723A4740068A0C9 /* AQTStringDrawingAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = CBB800C60723A4740068A0C9 /* AQTStringDrawingAdditions.h */; }; CBB800C90723A4740068A0C9 /* AQTStringDrawingAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB800C70723A4740068A0C9 /* AQTStringDrawingAdditions.m */; }; CBC4B42A05E4C784001BE8D7 /* AQTView.h in Headers */ = {isa = PBXBuildFile; fileRef = F5E3AFA9026D80D2012F88DF /* AQTView.h */; }; @@ -62,7 +68,6 @@ CBC4B43705E4C784001BE8D7 /* ExtendSavePanel.nib in Resources */ = {isa = PBXBuildFile; fileRef = F54B0FE601FF5CDC014110A7 /* ExtendSavePanel.nib */; }; CBC4B43805E4C784001BE8D7 /* AQTWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = F5E70370026D8645012F88DF /* AQTWindow.nib */; }; CBC4B43905E4C784001BE8D7 /* AquaTerm.icns in Resources */ = {isa = PBXBuildFile; fileRef = F55BA2E303589FD301D20925 /* AquaTerm.icns */; }; - CBC4B43A05E4C784001BE8D7 /* Cross.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CB05377C04DEA3A300EBD329 /* Cross.tiff */; }; CBC4B43C05E4C784001BE8D7 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; }; CBC4B43D05E4C784001BE8D7 /* AQTView.m in Sources */ = {isa = PBXBuildFile; fileRef = F5E3AFAA026D80D2012F88DF /* AQTView.m */; }; CBC4B43E05E4C784001BE8D7 /* AQTController.m in Sources */ = {isa = PBXBuildFile; fileRef = CB5B187204A9A49E00EBD329 /* AQTController.m */; }; @@ -105,7 +110,6 @@ 29B97319FDCFA39411CA2CEA /* MainMenu1.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = MainMenu1.nib; path = English.lproj/MainMenu1.nib; sourceTree = "<group>"; }; 29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; }; 29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; }; - CB05377C04DEA3A300EBD329 /* Cross.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = Cross.tiff; path = English.lproj/Cross.tiff; sourceTree = SOURCE_ROOT; }; CB0C496E065ABF7C00AC22F7 /* INSTALL */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = INSTALL; sourceTree = "<group>"; }; CB12640507CB5F5A00EF1763 /* AquaTerm.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = AquaTerm.framework; sourceTree = BUILT_PRODUCTS_DIR; }; CB2CC10D0677017B0042863D /* AQTModelAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AQTModelAdditions.h; sourceTree = "<group>"; }; @@ -132,6 +136,12 @@ CB9B70CC065A0AD100563010 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/Preferences.nib; sourceTree = "<group>"; }; CB9B70D1065A0B9C00563010 /* AQTPrefController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = AQTPrefController.h; sourceTree = "<group>"; }; CB9B70D2065A0B9C00563010 /* AQTPrefController.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = AQTPrefController.m; sourceTree = "<group>"; }; + CB9C49100BB1C3D700FDF03C /* English */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = English; path = English.lproj/crossBlack.tiff; sourceTree = "<group>"; }; + CB9C49120BB1C3D700FDF03C /* English */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = English; path = English.lproj/crossBlue.tiff; sourceTree = "<group>"; }; + CB9C49140BB1C3D700FDF03C /* English */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = English; path = English.lproj/crossGreen.tiff; sourceTree = "<group>"; }; + CB9C49160BB1C3D700FDF03C /* English */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = English; path = English.lproj/crossRed.tiff; sourceTree = "<group>"; }; + CB9C49180BB1C3D700FDF03C /* English */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = English; path = English.lproj/crossWhite.tiff; sourceTree = "<group>"; }; + CB9C491A0BB1C3D700FDF03C /* English */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = English; path = English.lproj/crossYellow.tiff; sourceTree = "<group>"; }; CBAA608305E7AFF0009B33CD /* distroMakefile */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 30; path = distroMakefile; sourceTree = "<group>"; }; CBB06FE805740EB900D208BA /* AQTFunctions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AQTFunctions.h; sourceTree = "<group>"; }; CBB06FE905740EB900D208BA /* AQTFunctions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AQTFunctions.m; sourceTree = "<group>"; }; @@ -275,13 +285,18 @@ 29B97317FDCFA39411CA2CEA /* Resources */ = { isa = PBXGroup; children = ( + CB9C490F0BB1C3D700FDF03C /* crossBlack.tiff */, + CB9C49110BB1C3D700FDF03C /* crossBlue.tiff */, + CB9C49130BB1C3D700FDF03C /* crossGreen.tiff */, + CB9C49150BB1C3D700FDF03C /* crossRed.tiff */, + CB9C49170BB1C3D700FDF03C /* crossWhite.tiff */, + CB9C49190BB1C3D700FDF03C /* crossYellow.tiff */, F5FEAC2701A7219B0143D50D /* Credits.rtf */, 29B97318FDCFA39411CA2CEA /* MainMenu1.nib */, F51551CC01FE762E01000102 /* ColorInspector.nib */, F54B0FE601FF5CDC014110A7 /* ExtendSavePanel.nib */, F5E70370026D8645012F88DF /* AQTWindow.nib */, F55BA2E303589FD301D20925 /* AquaTerm.icns */, - CB05377C04DEA3A300EBD329 /* Cross.tiff */, CB9B70CB065A0AD100563010 /* Preferences.nib */, ); name = Resources; @@ -559,12 +574,17 @@ CBC4B43705E4C784001BE8D7 /* ExtendSavePanel.nib in Resources */, CBC4B43805E4C784001BE8D7 /* AQTWindow.nib in Resources */, CBC4B43905E4C784001BE8D7 /* AquaTerm.icns in Resources */, - CBC4B43A05E4C784001BE8D7 /* Cross.tiff in Resources */, CB72184906072CF6008DCEAD /* ReleaseNotes in Resources */, CB9B70CD065A0AD100563010 /* Preferences.nib in Resources */, CB58A20006F9A60900AF8A5E /* AQTAdapter.html in Resources */, CB58A20106F9A60900AF8A5E /* help.html in Resources */, CB58A23B06FA0FB600AF8A5E /* ReadMe.rtf in Resources */, + CB9C491B0BB1C3D700FDF03C /* crossBlack.tiff in Resources */, + CB9C491C0BB1C3D700FDF03C /* crossBlue.tiff in Resources */, + CB9C491D0BB1C3D700FDF03C /* crossGreen.tiff in Resources */, + CB9C491E0BB1C3D700FDF03C /* crossRed.tiff in Resources */, + CB9C491F0BB1C3D700FDF03C /* crossWhite.tiff in Resources */, + CB9C49200BB1C3D700FDF03C /* crossYellow.tiff in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -636,6 +656,54 @@ name = Preferences.nib; sourceTree = "<group>"; }; + CB9C490F0BB1C3D700FDF03C /* crossBlack.tiff */ = { + isa = PBXVariantGroup; + children = ( + CB9C49100BB1C3D700FDF03C /* English */, + ); + name = crossBlack.tiff; + sourceTree = "<group>"; + }; + CB9C49110BB1C3D700FDF03C /* crossBlue.tiff */ = { + isa = PBXVariantGroup; + children = ( + CB9C49120BB1C3D700FDF03C /* English */, + ); + name = crossBlue.tiff; + sourceTree = "<group>"; + }; + CB9C49130BB1C3D700FDF03C /* crossGreen.tiff */ = { + isa = PBXVariantGroup; + children = ( + CB9C49140BB1C3D700FDF03C /* English */, + ); + name = crossGreen.tiff; + sourceTree = "<group>"; + }; + CB9C49150BB1C3D700FDF03C /* crossRed.tiff */ = { + isa = PBXVariantGroup; + children = ( + CB9C49160BB1C3D700FDF03C /* English */, + ); + name = crossRed.tiff; + sourceTree = "<group>"; + }; + CB9C49170BB1C3D700FDF03C /* crossWhite.tiff */ = { + isa = PBXVariantGroup; + children = ( + CB9C49180BB1C3D700FDF03C /* English */, + ); + name = crossWhite.tiff; + sourceTree = "<group>"; + }; + CB9C49190BB1C3D700FDF03C /* crossYellow.tiff */ = { + isa = PBXVariantGroup; + children = ( + CB9C491A0BB1C3D700FDF03C /* English */, + ); + name = crossYellow.tiff; + sourceTree = "<group>"; + }; F55BA2E303589FD301D20925 /* AquaTerm.icns */ = { isa = PBXVariantGroup; children = ( |
From: Per P. <per...@us...> - 2007-03-22 18:54:14
|
Update of /cvsroot/aquaterm/aquaterm/English.lproj In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv4764 Modified Files: Credits.rtf Log Message: Final changes before 1.1.0 release. Index: Credits.rtf =================================================================== RCS file: /cvsroot/aquaterm/aquaterm/English.lproj/Credits.rtf,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- Credits.rtf 31 Jul 2006 21:51:04 -0000 1.7 +++ Credits.rtf 22 Mar 2007 18:54:03 -0000 1.8 @@ -1,10 +1,9 @@ {\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf410 {\fonttbl\f0\froman\fcharset77 Times-Roman;} {\colortbl;\red255\green255\blue255;} -\vieww9000\viewh8400\viewkind0 \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 Copyright (c) 2001-2006, The AquaTerm project\ +\f0\fs24 \cf0 Copyright (c) 2001-2007, The AquaTerm project\ All rights reserved.\ \ Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:\ |
From: Per P. <per...@us...> - 2007-03-22 18:54:12
|
Update of /cvsroot/aquaterm/aquaterm/installer In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv5094 Modified Files: installer.packproj postflight preflight Log Message: Final changes before 1.1.0 release. Index: installer.packproj =================================================================== RCS file: /cvsroot/aquaterm/aquaterm/installer/installer.packproj,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- installer.packproj 31 Jul 2006 21:27:56 -0000 1.7 +++ installer.packproj 22 Mar 2007 18:54:10 -0000 1.8 @@ -366,6 +366,54 @@ <key>Split Forks</key> <true/> </dict> + <key>Plugins</key> + <dict> + <key>PluginsList</key> + <array> + <dict> + <key>Path</key> + <string>Introduction</string> + <key>Type</key> + <integer>0</integer> + </dict> + <dict> + <key>Path</key> + <string>ReadMe</string> + <key>Type</key> + <integer>0</integer> + </dict> + <dict> + <key>Path</key> + <string>License</string> + <key>Type</key> + <integer>0</integer> + </dict> + <dict> + <key>Path</key> + <string>Target</string> + <key>Type</key> + <integer>0</integer> + </dict> + <dict> + <key>Path</key> + <string>PackageSelection</string> + <key>Type</key> + <integer>0</integer> + </dict> + <dict> + <key>Path</key> + <string>Install</string> + <key>Type</key> + <integer>0</integer> + </dict> + <dict> + <key>Path</key> + <string>FinishUp</string> + <key>Type</key> + <integer>0</integer> + </dict> + </array> + </dict> <key>Scripts</key> <dict> <key>Additional Resources</key> @@ -434,17 +482,17 @@ <key>IFPkgDescriptionDeleteWarning</key> <string></string> <key>IFPkgDescriptionDescription</key> - <string>This package will install AquaTerm 1.0.1, including supporting library and header files.</string> + <string>This package will install AquaTerm 1.1.0, including supporting library and header files.</string> <key>IFPkgDescriptionTitle</key> <string>AquaTerm</string> <key>IFPkgDescriptionVersion</key> - <string>1.0.1</string> + <string>1.1.0</string> </dict> </dict> <key>Display Information</key> <dict> <key>CFBundleGetInfoString</key> - <string>AquaTerm 1.0.1 Copyrights © 2006 Aquaterm Project</string> + <string>AquaTerm 1.1.0 Copyrights © 2007 Aquaterm Project</string> <key>CFBundleIconFile</key> <string></string> <key>CFBundleIconFile Path Type</key> @@ -454,7 +502,7 @@ <key>CFBundleName</key> <string>AquaTerm</string> <key>CFBundleShortVersionString</key> - <string>1.0.1</string> + <string>1.1.0</string> </dict> <key>Options</key> <dict> @@ -464,8 +512,6 @@ <integer>2</integer> <key>IFPkgFlagFollowLinks</key> <true/> - <key>IFPkgFlagInstallFat</key> - <false/> <key>IFPkgFlagIsRequired</key> <false/> <key>IFPkgFlagOverwritePermissions</key> @@ -484,7 +530,7 @@ <key>IFMajorVersion</key> <integer>1</integer> <key>IFMinorVersion</key> - <integer>0</integer> + <integer>1</integer> </dict> </dict> </dict> Index: postflight =================================================================== RCS file: /cvsroot/aquaterm/aquaterm/installer/postflight,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- postflight 31 Oct 2006 21:05:17 -0000 1.5 +++ postflight 22 Mar 2007 18:54:10 -0000 1.6 @@ -7,6 +7,7 @@ ln -s /Library/Frameworks/AquaTerm.framework/Versions/A/AquaTerm /usr/local/lib/libaquaterm.dylib ln -s /Library/Frameworks/AquaTerm.framework/Versions/A/AquaTerm /usr/local/lib/libaquaterm.1.0.0.dylib ln -s /Library/Frameworks/AquaTerm.framework/Versions/A/AquaTerm /usr/local/lib/libaquaterm.1.0.1.dylib +ln -s /Library/Frameworks/AquaTerm.framework/Versions/A/AquaTerm /usr/local/lib/libaquaterm.1.1.0.dylib ## Symlinks to framework in /usr/local/include/aquaterm if [ ! -e /usr/local/include/aquaterm ]; then mkdir -p /usr/local/include/aquaterm Index: preflight =================================================================== RCS file: /cvsroot/aquaterm/aquaterm/installer/preflight,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- preflight 31 Jul 2006 21:27:56 -0000 1.4 +++ preflight 22 Mar 2007 18:54:10 -0000 1.5 @@ -8,6 +8,9 @@ if [ -e /usr/local/lib/libaquaterm.1.0.1.dylib ]; then rm /usr/local/lib/libaquaterm.1.0.1.dylib fi +if [ -e /usr/local/lib/libaquaterm.1.1.0.dylib ]; then + rm /usr/local/lib/libaquaterm.1.1.0.dylib +fi if [ -e /usr/local/include/aquaterm/aquaterm.h ]; then rm /usr/local/include/aquaterm/aquaterm.h fi |
Update of /cvsroot/aquaterm/aquaterm In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv4714 Modified Files: AQTController.m AquaTerm.app-Info.plist AquaTerm.framework-Info.plist ChangeLog Demo.m distroMakefile ReadMe.rtf ReleaseNotes Log Message: Final changes before 1.1.0 release. Index: AQTController.m =================================================================== RCS file: /cvsroot/aquaterm/aquaterm/AQTController.m,v retrieving revision 1.50 retrieving revision 1.51 diff -u -d -r1.50 -r1.51 --- AQTController.m 21 Mar 2007 20:46:13 -0000 1.50 +++ AQTController.m 22 Mar 2007 18:53:36 -0000 1.51 @@ -190,8 +190,8 @@ - (void)getServerVersionMajor:(int *)major minor:(int *)minor rev:(int *)rev { *major = 1; - *minor = 0; - *rev = 1; + *minor = 1; + *rev = 0; } -(id)addAQTClient:(id)client name:(NSString *)name pid:(int)procId @@ -373,7 +373,7 @@ -(NSString *)_aqtBugMsg { - NSString *bugString = @"Bug report for AquaTerm 1.0.1\n\n\ + NSString *bugString = @"Bug report for AquaTerm 1.1.0\n\n\ Description:\n-----------------------\n\n\ *\tPlease replace this item with a detailed description of the \n\ \tproblem. Suggestions or general comments are also welcome.\n\n\ @@ -401,7 +401,7 @@ -(NSString *)_aqtMailMsg { - return @"Feedback report for AquaTerm 1.0.1\n\n\ + return @"Feedback report for AquaTerm 1.1.0\n\n\ Feedback:\n-----------------------\n\n\ *\tPlease replace this item with suggestions or general comments.\n\n"; } Index: AquaTerm.app-Info.plist =================================================================== RCS file: /cvsroot/aquaterm/aquaterm/AquaTerm.app-Info.plist,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- AquaTerm.app-Info.plist 31 Jul 2006 21:27:55 -0000 1.9 +++ AquaTerm.app-Info.plist 22 Mar 2007 18:53:36 -0000 1.10 @@ -1,13 +1,13 @@ <?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.1"> +<plist version="1.0"> <dict> <key>CFBundleDevelopmentRegion</key> <string>English</string> <key>CFBundleExecutable</key> <string>AquaTerm</string> <key>CFBundleGetInfoString</key> - <string>AquaTerm v1.0.1</string> + <string>AquaTerm v1.1.0</string> <key>CFBundleIconFile</key> <string>AquaTerm.icns</string> <key>CFBundleIdentifier</key> @@ -19,11 +19,11 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>AquaTerm v1.0.1</string> + <string>AquaTerm v1.1.0</string> <key>CFBundleSignature</key> <string>AqTS</string> <key>CFBundleVersion</key> - <string>1.0.1</string> + <string>1.1.0</string> <key>NSHumanReadableCopyright</key> <string>The AquaTerm Project http://aquaterm.sourceforge.net</string> Index: AquaTerm.framework-Info.plist =================================================================== RCS file: /cvsroot/aquaterm/aquaterm/AquaTerm.framework-Info.plist,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- AquaTerm.framework-Info.plist 31 Jul 2006 21:27:55 -0000 1.3 +++ AquaTerm.framework-Info.plist 22 Mar 2007 18:53:36 -0000 1.4 @@ -15,6 +15,6 @@ <key>CFBundleSignature</key> <string>AqTS</string> <key>CFBundleVersion</key> - <string>1.0.1</string> + <string>1.1.0</string> </dict> </plist> Index: ChangeLog =================================================================== RCS file: /cvsroot/aquaterm/aquaterm/ChangeLog,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- ChangeLog 26 Jul 2005 00:02:14 -0000 1.7 +++ ChangeLog 22 Mar 2007 18:53:36 -0000 1.8 @@ -1,3 +1,115 @@ +2007-03-22 18:26 persquare + + * aquaterm.h, aquaterm.m: Add the RGBA methods to C API too. + +2007-03-21 21:46 persquare + + * AQTController.m: Make landscape printing the default. + +2007-03-21 21:27 persquare + + * AQTView.m: Removing log statements. + +2007-03-21 21:20 persquare + + * AQTController.m, AQTPrefController.h, AQTPrefController.m, + AQTView.m, English.lproj/crossBlack.tiff, + English.lproj/crossBlue.tiff, English.lproj/crossGreen.tiff, + English.lproj/crossRed.tiff, English.lproj/crossWhite.tiff, + English.lproj/crossYellow.tiff, + English.lproj/Preferences.nib/classes.nib, + English.lproj/Preferences.nib/info.nib, + English.lproj/Preferences.nib/objects.nib: Make crosshair color a + user pref. + +2007-03-21 21:18 persquare + + * English.lproj/Cross.tiff: Not used. + +2007-03-21 19:40 persquare + + * aquaterm.m: Release temp string. + +2007-03-21 19:38 persquare + + * AQTView.m, aquaterm.m: Better handling of event strings. Add + keyCode to event string for key presses. + +2007-03-21 18:35 persquare + + * AQTAdapter.h, AQTAdapter.m, AQTFunctions.h, AQTGraphic.h, + AQTGraphic.m, AQTGraphicDrawingMethods.m, AQTPlotBuilder.m, + Demo.m: Adding alpha channel handling. + +2006-10-31 22:05 persquare + + * installer/postflight: Adding the missing link. Time to deprecate + libaquaterm altogether. + +2006-08-23 20:01 persquare + + * AQTPlotBuilder.m: Fixing size method left out when renaming size + to canvasSize, reported by Will Ware. Only affected debug builds. + +2006-08-01 00:59 persquare + + * AquaTerm.xcodeproj/: per.mode1, per.pbxuser: Preparing for source + release. + +2006-08-01 00:55 persquare + + * distroMakefile: hdiutil is wreaking havoc on the installer + package, using DropDMG as a fix. + +2006-07-31 23:49 persquare + + * AquaTerm.xcodeproj/per.mode1, AquaTerm.xcodeproj/per.pbxuser, + AquaTerm.xcodeproj/project.pbxproj, ReadMe.rtf, + English.lproj/Credits.rtf: Targeting Universal Binary. Bumping + version to 1.0.1 + +2006-07-31 23:27 persquare + + * AQTController.m, AquaTerm.app-Info.plist, + AquaTerm.framework-Info.plist, INSTALL, ReadMe.rtf, ReleaseNotes, + distroMakefile, installer/installer.packproj, + installer/postflight, installer/preflight: Targeting Universal + Binary. Bumping version to 1.0.1 + +2005-11-10 22:07 persquare + + * AQTGraphicDrawingMethods.m: Try to be smart about paths that + should have been closed. + +2005-11-10 22:05 persquare + + * AQTPlotBuilder.m: Changing line cap style implies end of current + path. + +2005-09-14 17:56 persquare + + * installer/postflight: Fixing broken script. + +2005-07-26 03:03 persquare + + * AquaTerm.xcodeproj/project.pbxproj: Turn off debug logging. + +2005-07-26 03:02 persquare + + * AQTController.m: Minor changes pending 1.0.0 release. + +2005-07-26 02:24 persquare + + * distroMakefile: Minor changes pending 1.0.0 release. + +2005-07-26 02:03 persquare + + * Help/AQTAdapter.html: Some developer documentation. + +2005-07-26 02:02 persquare + + * ChangeLog, AQTAdapter.m: Minor changes pending 1.0.0 release. + 2005-07-26 00:04 persquare * Help/DevDocs.rtfd/: Pasted Graphic.tiff, TXT.rtf: Some developer Index: Demo.m =================================================================== RCS file: /cvsroot/aquaterm/aquaterm/Demo.m,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- Demo.m 21 Mar 2007 17:35:46 -0000 1.17 +++ Demo.m 22 Mar 2007 18:53:36 -0000 1.18 @@ -58,6 +58,7 @@ [adapter openPlotWithIndex:1]; [adapter setPlotSize:NSMakeSize(620,420)]; [adapter setPlotTitle:@"Testview"]; +[adapter setAcceptingEvents:YES]; // Set colormap [adapter setColormapEntry:0 red:1.0 green:1.0 blue:1.0]; // white [adapter setColormapEntry:1 red:0.0 green:0.0 blue:0.0]; // black Index: distroMakefile =================================================================== RCS file: /cvsroot/aquaterm/aquaterm/distroMakefile,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- distroMakefile 31 Jul 2006 22:55:52 -0000 1.16 +++ distroMakefile 22 Mar 2007 18:53:36 -0000 1.17 @@ -3,7 +3,7 @@ endif PACKAGE=AquaTerm -VERSION=1.0.1 +VERSION=1.1.0 ##RELEASENAME=AquaTerm1.0.b3 RELEASENAME=$(PACKAGE)$(VERSION) @@ -18,16 +18,19 @@ APPSRCDIR=$(SRCROOT) HELPDIR=$(SRCROOT)/Help ADAPTSRCDIR=$(SRCROOT)/../adapters +## Tools +## -------------------------- +FREEZE=/usr/local/bin/freeze all:pre dmg post pkg: app lib fwk headers - freeze -v $(APPSRCDIR)/installer/installer.packproj + $(FREEZE) -v $(APPSRCDIR)/installer/installer.packproj dmg: adapters info doc pkg #hdiutil create -volname AquaTerm -fs HFS+ -srcfolder $(DMG_ROOT) $(BUILD_DIR)/$(RELEASENAME).dmg - #hdiutil create -volname $(RELEASENAME) -fs HFS+ -srcfolder $(DMG_ROOT) $(BUILD_DIR)/$(RELEASENAME).dmg - dropdmg -v $(RELEASENAME) -b $(RELEASENAME) -o $(BUILD_DIR) $(DMG_ROOT) + hdiutil create -verbose -volname $(RELEASENAME) -fs HFS+ -srcfolder $(DMG_ROOT) $(BUILD_DIR)/$(RELEASENAME).dmg + #dropdmg -v $(RELEASENAME) -b $(RELEASENAME) -o $(BUILD_DIR) $(DMG_ROOT) pre: clean @echo "SYMROOT is " $(SYMROOT) ", cleaning out..." Index: ReadMe.rtf =================================================================== RCS file: /cvsroot/aquaterm/aquaterm/ReadMe.rtf,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- ReadMe.rtf 31 Jul 2006 21:50:56 -0000 1.9 +++ ReadMe.rtf 22 Mar 2007 18:53:36 -0000 1.10 @@ -1,16 +1,22 @@ {\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf410 -{\fonttbl\f0\fnil\fcharset77 Monaco;} -{\colortbl;\red255\green255\blue255;\red201\green233\blue243;} -\vieww9000\viewh8400\viewkind0 -\pard\tx480\tx960\tx1440\tx1920\tx2400\tx2880\tx3360\tx3840\tx4320\tx4800\tx5280\tx5760\tx6240\tx6720\tx7200\tx7680\tx8160\tx8640\tx9120\tx9600\tx10080\tx10560\tx11040\tx11520\tx12000\tx12480\tx12960\tx13440\tx13920\tx14400\tx14880\tx15360\tx15840\tx16320\tx16800\tx17280\tx17760\tx18240\tx18720\tx19200\tx19680\tx20160\tx20640\tx21120\tx21600\tx22080\tx22560\tx23040\tx23520\tx24000\tx24480\tx24960\tx25440\tx25920\tx26400\tx26880\tx27360\tx27840\tx28320\tx28800\tx29280\tx29760\tx30240\tx30720\tx31200\tx31680\tx32160\tx32640\tx33120\tx33600\tx34080\tx34560\tx35040\tx35520\tx36000\tx36480\tx36960\tx37440\tx37920\tx38400\tx38880\tx39360\tx39840\tx40320\tx40800\tx41280\tx41760\tx42240\tx42720\tx43200\tx43680\tx44160\tx44640\tx45120\tx45600\tx46080\tx46560\tx47040\tx47520\tx48000\ql\qnatural\pardirnatural +{\fonttbl\f0\fswiss\fcharset77 Optima-Regular;\f1\fswiss\fcharset77 Optima-Bold;\f2\froman\fcharset77 Times-Roman; +\f3\fswiss\fcharset77 Optima-Italic;} +{\colortbl;\red255\green255\blue255;\red255\green0\blue0;} +\vieww12380\viewh11100\viewkind0 +\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural -\f0\fs20 \cf0 \CocoaLigature0 AquaTerm\ -your friendly plotting front-end\ -\ -Table of cExamples ofCopyright \'a9 2001-2006, The AquaTerm project\ -how to use AquaTerm from C, Python, and Fortran as well as Lisp bindings, a Perl module and an adapter for PGPLOT can be found in the adapters folder.\ -ntents\ -1 What is AquaTerm?\ +\f0\fs36 \cf0 AquaTerm +\f1\b\fs24 \ +\pard\tx565\tx1133\tx1700\tx2266\tx2833\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural + +\f0\b0 \cf0 your friendly plotting front-end\ +\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural + +\f1\b \cf0 \ +Table of contents\ +\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural + +\f0\b0 \cf0 1 What is AquaTerm?\ 2 Who would use AquaTerm?\ 3 How do I install AquaTerm?\ 4 What gets installed where?\ @@ -19,57 +25,112 @@ 7 How can I find out more?\ 8 How can I help in improving AquaTerm?\ 9 License terms\ -\ -1 What is AquaTerm?\ -It is a small application that acts as an output device for other programs (command line applications, CLI) that need to render vector and bitmap graphics in windows. In order for that to work, the CLI need to be compiled with support for AquaTerm.\ +\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural + +\f1\b \cf0 \ +\pard\tx285\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural +\cf0 1 What is AquaTerm?\ +\pard\tx285\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural + +\f0\b0 \cf0 It is a small application that acts as an output device for other programs (command line applications, CLI) that need to render vector and bitmap graphics in windows. In order for that to work, the CLI need to be compiled with support for AquaTerm.\ \ Currently Gnuplot 4.x and programs based on PGPLOT and PLplot are or can be made AquaTerm aware.\ \ -2 Who would use AquaTerm?\ -A user of plotting applications such as Gnuplot (directly or indirectly) who would like a native display option with PDF and EPS export functionality.\ +\pard\tx285\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural + +\f1\b \cf0 2 Who would use AquaTerm? +\f0\b0 \ +First and foremost, AquaTerm is of no or very little use by itself\'c9 you need another application to provide input data.\ +\ +The target audience is a user of plotting applications such as Gnuplot (directly or indirectly) or homebrew command line tools who would like a native Mac OS X display option with PDF and EPS export functionality\ \ A developer who would like to provide graphics output on OS X for their application. The API is designed to fit well with procedural code, rather than OO-code.\ \ -3 How do I install AquaTerm?\ + +\f1\b 3 How do I install AquaTerm? +\f0\b0 \ An end user only need to double-click the installer package and follow the instructions. \ \ Developers also need the stuff in the Developer Extras folder, which can be dragged to a convenient location.\ \ -4 What gets installed where?\ + +\f1\b 4 What gets installed where? +\f0\b0 \ The installer will install the application AquaTerm in /Applications.\ It will place AquaTerm.framework in /Library/Frameworks. \ For backwards compatibility symlinks to shared lib and headers (located inside AquaTerm.framework) will be placed in /usr/local/lib and /usr/local/include/aquaterm.\ -\ -5 Is AquaTerm and clients aware of the environment?\ -Certainly. The following environment variables may be of interest:\ -\ +\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural +\cf0 \ +\pard\tx285\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural + +\f1\b \cf0 5 Is AquaTerm and clients aware of the environment?\ +\pard\tx285\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural + +\f0\b0 \cf0 Certainly. The following environment variables may be of interest:\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural +\cf0 \ General:\ - AQUATERM_LOGLEVEL \'d1 set in the range 0-4 to have increasing levels of logging to stdout, zero means no logging.\ - AQUATERM_PATH \'d1 set this to have a specific copy of AquaTerm.app e.g. /Users/you/source/build/AquaTerm.app launched automatically from clients.\ -\ +\pard\tx285\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural + +\f1\b \cf0 +\f0\b0 AQUATERM_LOGLEVEL \'d1 set in the range 0-4 to have increasing levels of logging to stdout, zero means no logging.\ + +\f1\b +\f0\b0 AQUATERM_PATH \'d1 set this to have a specific copy of AquaTerm.app e.g. /Users/you/source/build/AquaTerm.app launched automatically from clients.\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural +\cf0 \ Clients:\ - GNUTERM \'d1 set this to "aqua" to make AquaTerm the default terminal in Gnuplot\super \'a0\nosupersub \ - PGPLOT_DEV \'d1 set this to "/AQT" to make AquaTerm default output in PGPLOT\ +\pard\tx285\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural + +\f1\b \cf0 +\f0\b0 GNUTERM \'d1 set this to "aqua" to make AquaTerm the default terminal in Gnuplot +\f2\fs20 \super \'a0 +\f0\fs24 \nosupersub \ + +\f1\b +\f0\b0 PGPLOT_DEV \'d1 set this to "/AQT" to make AquaTerm default output in PGPLOT\ \ - \super \'a0\nosupersub Aquaterm is already the default terminal in Gnuplot as of version 4.1, if it was built with aquaterm support. \ + +\f2\fs20 \super \'a0 +\f0 \nosupersub Aquaterm is already the default terminal in Gnuplot as of version 4.1, if it was built with aquaterm support. +\fs24 \ \ -6 What is in the Developer Extras folder?\ + +\f1\b 6 What is in the Developer Extras folder?\ +\pard\tx285\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural + +\f3\i\b0 \cf2 The developer documentation is out of date, please use to the source code and mailing lists at http://sourceforge.net/mail/?group_id=39915 if you want the latest information.\ + +\f0\i0 \cf0 \ Documentation for the Obj-C API is in AQTAdapter.html. \ \ The C API is unfortunately only documented by the header file aquaterm.h, but the calls are very similar to the methods described in AQTAdapter.html and it as a reference together with the C and Fortran examples should be enough to get you started. \ \ -Examples of how to use AquaTerm from C, Python, and Fortran as well as Lisp bindings, a Perl module and an adapter for PGPLOT can be found in the adapters folder.\ +Examples of how to use AquaTerm from C, Python, and Fortran as well as a Perl module and an adapter for PGPLOT can be found in the adapters folder.\ \ -NB. The gnuplot adapter is part of gnuplot 4.x sources and the PLplot adapter is part of PLplot as of version 5.5.3.\ +\pard\tx285\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural + +\f3\i \cf0 NB. The gnuplot adapter is part of gnuplot 4.x sources and the PLplot adapter is part of PLplot as of version 5.5.3 +\f0\i0 .\ \ -7 How can I find out more?\ +\pard\tx285\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural + +\f1\b \cf0 7 How can I find out more? +\f0\b0 \ Use the mailing lists and/or trackers at the project website: http://aquaterm.sourceforge.net\ \ -8 How can I help in improving AquaTerm?\ -In many ways! Write code (core or adapters), write documentation, improve the website, test and report bugs, write supporting notes in email or sponsor the project with cash. \ + +\f1\b 8 How can I help in improving AquaTerm?\ +\pard\tx285\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural + +\f0\b0 \cf0 In many ways! Write code (core or adapters), write documentation, improve the website, test and report bugs, write supporting notes in email or sponsor the project with cash. \ \ -9 License terms\ -Copyright \'a9 2001-\cb2 2006\cb1 , The AquaTerm project\ +\pard\tx285\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural + +\f1\b \cf0 9 License terms\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural + +\f0\b0 \cf0 Copyright \'a9 2001-2004, Per Persson, The AquaTerm project\ All rights reserved.\ \ Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:\ Index: ReleaseNotes =================================================================== RCS file: /cvsroot/aquaterm/aquaterm/ReleaseNotes,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- ReleaseNotes 31 Jul 2006 21:27:55 -0000 1.14 +++ ReleaseNotes 22 Mar 2007 18:53:36 -0000 1.15 @@ -1,3 +1,13 @@ +AquaTerm 1.1.0 + Added alpha channel handling to API, see AQTAdapter.h and aquaterm.h. (#1605002) + Made crosshair color user selectable in Preferences. (Michael Buzzi) + Appended virtual keycode enumerator to event string for key presses. (Michael Buzzi) + Non-printing and non-ASCII key events will return an empty string, e.g.: + Pressing 'q' will return event string "2:{58, 170}:q:12" whereas + pressing right arrow will return event string "2:{66, 162}::124", where + 12 and 124 are the virtual keycodes for 'q' and right arrow, respectively. + Made landscape printing the default layout. (Jeremy Conlin) + AquaTerm 1.0.1 AquaTerm is now a universal binary. Added Lisp bindings contributed by Hazen Babcock. |
From: Per P. <per...@us...> - 2007-03-22 17:26:45
|
Update of /cvsroot/aquaterm/aquaterm In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv31699 Modified Files: aquaterm.h aquaterm.m Log Message: Add the RGBA methods to C API too. Index: aquaterm.h =================================================================== RCS file: /cvsroot/aquaterm/aquaterm/aquaterm.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- aquaterm.h 17 Feb 2005 10:21:34 -0000 1.7 +++ aquaterm.h 22 Mar 2007 17:26:40 -0000 1.8 @@ -53,12 +53,18 @@ /*" Colormap (utility "*/ int aqtColormapSize(void); +void aqtSetColormapEntryRGBA(int entryIndex, float r, float g, float b, float a); +void aqtGetColormapEntryRGBA(int entryIndex, float *r, float *g, float *b, float *a); void aqtSetColormapEntry(int entryIndex, float r, float g, float b); void aqtGetColormapEntry(int entryIndex, float *r, float *g, float *b); void aqtTakeColorFromColormapEntry(int index); void aqtTakeBackgroundColorFromColormapEntry(int index); /*" Color handling "*/ +void aqtSetColorRGBA(float r, float g, float b, float a); +void aqtSetBackgroundColorRGBA(float r, float g, float b, float a); +void aqtGetColorRGBA(float *r, float *g, float *b, float *a); +void aqtGetBackgroundColorRGBA(float *r, float *g, float *b, float *a); void aqtSetColor(float r, float g, float b); void aqtSetBackgroundColor(float r, float g, float b); void aqtGetColor(float *r, float *g, float *b); Index: aquaterm.m =================================================================== RCS file: /cvsroot/aquaterm/aquaterm/aquaterm.m,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- aquaterm.m 21 Mar 2007 18:40:00 -0000 1.10 +++ aquaterm.m 22 Mar 2007 17:26:40 -0000 1.11 @@ -163,6 +163,16 @@ return [_adapter colormapSize]; } +void aqtSetColormapEntryRGBA(int entryIndex, float r, float g, float b, float a) +{ + [_adapter setColormapEntry:entryIndex red:r green:g blue:b alpha:a]; +} + +void aqtGetColormapEntryRGBA(int entryIndex, float *r, float *g, float *b, float *a) +{ + [_adapter getColormapEntry:entryIndex red:r green:g blue:b alpha:a]; +} + void aqtSetColormapEntry(int entryIndex, float r, float g, float b) { [_adapter setColormapEntry:entryIndex red:r green:g blue:b]; @@ -184,6 +194,26 @@ } /*" Color handling "*/ +void aqtSetColorRGBA(float r, float g, float b, float a) +{ + [_adapter setColorRed:r green:g blue:b alpha:a]; +} + +void aqtSetBackgroundColorRGBA(float r, float g, float b, float a) +{ + [_adapter setBackgroundColorRed:r green:g blue:b alpha:a]; +} + +void aqtGetColorRGBA(float *r, float *g, float *b, float *a) +{ + [_adapter getColorRed:r green:g blue:b alpha:a]; +} + +void aqtGetBackgroundColorRGBA(float *r, float *g, float *b, float *a) +{ + [_adapter getBackgroundColorRed:r green:g blue:b alpha:a]; +} + void aqtSetColor(float r, float g, float b) { [_adapter setColorRed:r green:g blue:b]; |
From: Per P. <per...@us...> - 2007-03-21 20:47:09
|
Update of /cvsroot/aquaterm/aquaterm In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv19484 Modified Files: AQTController.m Log Message: Make landscape printing the default. Index: AQTController.m =================================================================== RCS file: /cvsroot/aquaterm/aquaterm/AQTController.m,v retrieving revision 1.49 retrieving revision 1.50 diff -u -d -r1.49 -r1.50 --- AQTController.m 21 Mar 2007 20:20:32 -0000 1.49 +++ AQTController.m 21 Mar 2007 20:46:13 -0000 1.50 @@ -61,6 +61,11 @@ @"ConfirmCloseWindowWhenClosingPlot", nil]]; [defaults registerDefaults:appDefaults]; + + // Make landscape printing the default + NSPrintInfo *pi = [NSPrintInfo sharedPrintInfo]; + [pi setOrientation:NSLandscapeOrientation]; + [NSPrintInfo setSharedPrintInfo:pi]; } -(id)init |
From: Per P. <per...@us...> - 2007-03-21 20:27:07
|
Update of /cvsroot/aquaterm/aquaterm In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv12148 Modified Files: AQTView.m Log Message: Removing log statements. Index: AQTView.m =================================================================== RCS file: /cvsroot/aquaterm/aquaterm/AQTView.m,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- AQTView.m 21 Mar 2007 20:20:32 -0000 1.42 +++ AQTView.m 21 Mar 2007 20:27:02 -0000 1.43 @@ -17,7 +17,7 @@ { NSString *cursorImageName; int cursorIndex = [[NSUserDefaults standardUserDefaults] integerForKey:@"CrosshairCursorColor"]; - NSLog(@"cursorIndex = %d", cursorIndex); + switch (cursorIndex) { case 0: cursorImageName = @"crossRed"; @@ -38,7 +38,6 @@ cursorImageName = @"crossWhite"; break; default: - NSLog(@"Using default cursor"); cursorImageName = @"crossRed"; break; } |
From: Per P. <per...@us...> - 2007-03-21 20:22:09
|
Update of /cvsroot/aquaterm/aquaterm/English.lproj In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv9714 Added Files: crossBlack.tiff crossBlue.tiff crossGreen.tiff crossRed.tiff crossWhite.tiff crossYellow.tiff Log Message: Make crosshair color a user pref. --- NEW FILE: crossBlack.tiff --- MM <rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:iX='http://ns.adobe.com/iX/1.0/'> </rdf:RDF> </x:xmpmeta> <?xpacket end='w'?> --- NEW FILE: crossBlue.tiff --- MM <rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:iX='http://ns.adobe.com/iX/1.0/'> </rdf:RDF> </x:xmpmeta> <?xpacket end='w'?> --- NEW FILE: crossGreen.tiff --- MM <rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:iX='http://ns.adobe.com/iX/1.0/'> </rdf:RDF> </x:xmpmeta> <?xpacket end='w'?> --- NEW FILE: crossRed.tiff --- MM <rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:iX='http://ns.adobe.com/iX/1.0/'> </rdf:RDF> </x:xmpmeta> <?xpacket end='w'?> --- NEW FILE: crossWhite.tiff --- MM <rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:iX='http://ns.adobe.com/iX/1.0/'> </rdf:RDF> </x:xmpmeta> <?xpacket end='w'?> --- NEW FILE: crossYellow.tiff --- MM <rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:iX='http://ns.adobe.com/iX/1.0/'> </rdf:RDF> </x:xmpmeta> <?xpacket end='w'?> |
From: Per P. <per...@us...> - 2007-03-21 20:22:09
|
Update of /cvsroot/aquaterm/aquaterm/English.lproj/Preferences.nib In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv9714/Preferences.nib Modified Files: classes.nib info.nib objects.nib Log Message: Make crosshair color a user pref. Index: classes.nib =================================================================== RCS file: /cvsroot/aquaterm/aquaterm/English.lproj/Preferences.nib/classes.nib,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- classes.nib 12 Feb 2005 21:18:27 -0000 1.5 +++ classes.nib 21 Mar 2007 20:21:51 -0000 1.6 @@ -14,6 +14,7 @@ closeWindowSwitch = NSButton; confirmCloseWindowSwitch = NSButton; convertSymbolFontSwitch = NSButton; + crosshairCursorColor = NSPopUpButton; imageInterpolateLevel = NSPopUpButton; linewidthDisplay = NSTextField; minimumLinewidthSlider = NSSlider; Index: info.nib =================================================================== RCS file: /cvsroot/aquaterm/aquaterm/English.lproj/Preferences.nib/info.nib,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- info.nib 12 Feb 2005 21:18:27 -0000 1.4 +++ info.nib 21 Mar 2007 20:21:51 -0000 1.5 @@ -3,14 +3,14 @@ <plist version="1.0"> <dict> <key>IBDocumentLocation</key> - <string>274 183 356 240 0 0 1280 1002 </string> + <string>321 153 356 240 0 0 1440 878 </string> <key>IBFramework Version</key> - <string>364.0</string> + <string>446.1</string> <key>IBOpenObjects</key> <array> <integer>5</integer> </array> <key>IBSystem Version</key> - <string>7S215</string> + <string>8P135</string> </dict> </plist> Index: objects.nib =================================================================== RCS file: /cvsroot/aquaterm/aquaterm/English.lproj/Preferences.nib/objects.nib,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 Binary files /tmp/cvsc1Ceti and /tmp/cvsVXwYQh differ |
From: Per P. <per...@us...> - 2007-03-21 20:20:42
|
Update of /cvsroot/aquaterm/aquaterm In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv9676 Modified Files: AQTController.m AQTPrefController.h AQTPrefController.m AQTView.m Log Message: Make crosshair color a user pref. Index: AQTController.m =================================================================== RCS file: /cvsroot/aquaterm/aquaterm/AQTController.m,v retrieving revision 1.48 retrieving revision 1.49 diff -u -d -r1.48 -r1.49 --- AQTController.m 31 Jul 2006 21:27:55 -0000 1.48 +++ AQTController.m 21 Mar 2007 20:20:32 -0000 1.49 @@ -44,6 +44,7 @@ [NSNumber numberWithInt:1], [NSNumber numberWithInt:1], [NSNumber numberWithInt:0], + [NSNumber numberWithInt:0], [NSNumber numberWithInt:1], nil] forKeys:[NSArray arrayWithObjects: @@ -55,6 +56,7 @@ @"ShouldConvertSymbolFont", @"ShouldAntialiasDrawing", @"ImageInterpolationLevel", + @"CrosshairCursorColor", @"CloseWindowWhenClosingPlot", @"ConfirmCloseWindowWhenClosingPlot", nil]]; Index: AQTPrefController.h =================================================================== RCS file: /cvsroot/aquaterm/aquaterm/AQTPrefController.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- AQTPrefController.h 12 Feb 2005 21:18:17 -0000 1.5 +++ AQTPrefController.h 21 Mar 2007 20:20:32 -0000 1.6 @@ -8,6 +8,7 @@ { IBOutlet NSWindow *prefWindow; IBOutlet NSPopUpButton *imageInterpolateLevel; + IBOutlet NSPopUpButton *crosshairCursorColor; IBOutlet NSButton *shouldAntialiasSwitch; IBOutlet NSSlider *minimumLinewidthSlider; IBOutlet NSButton *convertSymbolFontSwitch; Index: AQTPrefController.m =================================================================== RCS file: /cvsroot/aquaterm/aquaterm/AQTPrefController.m,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- AQTPrefController.m 12 Feb 2005 21:18:17 -0000 1.6 +++ AQTPrefController.m 21 Mar 2007 20:20:32 -0000 1.7 @@ -26,6 +26,7 @@ - (void)showPrefs { float lw = [preferences floatForKey:@"MinimumLinewidth"]; [imageInterpolateLevel selectItemAtIndex:[preferences integerForKey:@"ImageInterpolationLevel"]]; + [crosshairCursorColor selectItemAtIndex:[preferences integerForKey:@"CrosshairCursorColor"]]; [shouldAntialiasSwitch setIntValue:[preferences integerForKey:@"ShouldAntialiasDrawing"]]; [minimumLinewidthSlider setFloatValue:lw]; [linewidthDisplay setStringValue:(lw < 0.04)?@"off":[NSString stringWithFormat:@"%4.2f", lw]]; @@ -59,6 +60,7 @@ - (IBAction)OKButtonPressed:(id)sender { [preferences setInteger:[imageInterpolateLevel indexOfSelectedItem] forKey:@"ImageInterpolationLevel"]; + [preferences setInteger:[crosshairCursorColor indexOfSelectedItem] forKey:@"CrosshairCursorColor"]; [preferences setInteger:[shouldAntialiasSwitch intValue] forKey:@"ShouldAntialiasDrawing"]; [preferences setFloat:[minimumLinewidthSlider floatValue] forKey:@"MinimumLinewidth"]; [preferences setInteger:[convertSymbolFontSwitch intValue] forKey:@"ShouldConvertSymbolFont"]; Index: AQTView.m =================================================================== RCS file: /cvsroot/aquaterm/aquaterm/AQTView.m,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- AQTView.m 21 Mar 2007 18:38:09 -0000 1.41 +++ AQTView.m 21 Mar 2007 20:20:32 -0000 1.42 @@ -12,11 +12,45 @@ #import "AQTGraphicDrawingMethods.h" @implementation AQTView + +-(void)setCrosshairCursorColor +{ + NSString *cursorImageName; + int cursorIndex = [[NSUserDefaults standardUserDefaults] integerForKey:@"CrosshairCursorColor"]; + NSLog(@"cursorIndex = %d", cursorIndex); + switch (cursorIndex) { + case 0: + cursorImageName = @"crossRed"; + break; + case 1: + cursorImageName = @"crossYellow"; + break; + case 2: + cursorImageName = @"crossBlue"; + break; + case 3: + cursorImageName = @"crossGreen"; + break; + case 4: + cursorImageName = @"crossBlack"; + break; + case 5: + cursorImageName = @"crossWhite"; + break; + default: + NSLog(@"Using default cursor"); + cursorImageName = @"crossRed"; + break; + } + NSImage *curImg = [[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:cursorImageName ofType:@"tiff"]]; + [crosshairCursor autorelease]; + crosshairCursor = [[NSCursor alloc] initWithImage:curImg hotSpot:NSMakePoint(7,7)]; + [curImg release]; +} + -(void)awakeFromNib { - NSImage *curImg = [[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Cross" ofType:@"tiff"]]; - crosshairCursor = [[NSCursor alloc] initWithImage:curImg hotSpot:NSMakePoint(7,7)]; - [curImg release]; + [self setCrosshairCursorColor]; [self setIsProcessingEvents:NO]; } @@ -62,6 +96,7 @@ { // Change in state _isProcessingEvents = flag; + [self setCrosshairCursorColor]; [[self window] invalidateCursorRectsForView:self]; } } |
From: Per P. <per...@us...> - 2007-03-21 20:18:51
|
Update of /cvsroot/aquaterm/aquaterm/English.lproj In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv8809 Removed Files: Cross.tiff Log Message: Not used. --- Cross.tiff DELETED --- |
From: Per P. <per...@us...> - 2007-03-21 18:40:01
|
Update of /cvsroot/aquaterm/aquaterm In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv2953 Modified Files: aquaterm.m Log Message: Release temp string. Index: aquaterm.m =================================================================== RCS file: /cvsroot/aquaterm/aquaterm/aquaterm.m,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- aquaterm.m 21 Mar 2007 18:38:09 -0000 1.9 +++ aquaterm.m 21 Mar 2007 18:40:00 -0000 1.10 @@ -119,6 +119,7 @@ int copyLen = MIN(AQT_EVENTBUF_SIZE - 1, strlen(cStr)); strncpy(buffer, cStr, copyLen); buffer[copyLen] = '\0'; + [eventStr release]; return 0; } @@ -132,6 +133,7 @@ int copyLen = MIN(AQT_EVENTBUF_SIZE - 1, strlen(cStr)); strncpy(buffer, cStr, copyLen); buffer[copyLen] = '\0'; + [eventStr release]; return 0; } |
From: Per P. <per...@us...> - 2007-03-21 18:38:22
|
Update of /cvsroot/aquaterm/aquaterm In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv2443 Modified Files: AQTView.m aquaterm.m Log Message: Better handling of event strings. Add keyCode to event string for key presses. Index: AQTView.m =================================================================== RCS file: /cvsroot/aquaterm/aquaterm/AQTView.m,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- AQTView.m 12 Dec 2004 20:01:29 -0000 1.40 +++ AQTView.m 21 Mar 2007 18:38:09 -0000 1.41 @@ -135,7 +135,6 @@ NSString *eventString; NSPoint pos = [self convertPoint:[[self window] mouseLocationOutsideOfEventStream] fromView:nil]; NSRect viewBounds = [self bounds]; - char aKey = [[theEvent characters] UTF8String][0];; if (!NSPointInRect(pos, viewBounds)) { // Just crop it to be inside [self bounds]; @@ -148,7 +147,10 @@ else if (pos.y > NSHeight(viewBounds)) pos.y = NSHeight(viewBounds); } - eventString = [NSString stringWithFormat:@"2:%@:%c", NSStringFromPoint([self convertPointToCanvasCoordinates:pos]), aKey]; + eventString = [NSString stringWithFormat:@"2:%@:%@:%d", + NSStringFromPoint([self convertPointToCanvasCoordinates:pos]), + [theEvent characters], + [theEvent keyCode]]; [[[self window] delegate] processEvent:eventString]; } } Index: aquaterm.m =================================================================== RCS file: /cvsroot/aquaterm/aquaterm/aquaterm.m,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- aquaterm.m 17 Feb 2005 10:21:34 -0000 1.8 +++ aquaterm.m 21 Mar 2007 18:38:09 -0000 1.9 @@ -112,18 +112,27 @@ int aqtGetLastEvent(char *buffer) // FIXME: retval? { NSString *event = [_adapter lastEvent]; - strncpy(buffer, [event UTF8String], MIN(AQT_EVENTBUF_SIZE - 1, [event length])); - buffer[MIN(AQT_EVENTBUF_SIZE - 1, [event length])] = '\0'; + // Perform a lossy conversion from UTF8 to ASCII + NSString *eventStr = [[NSString alloc] initWithData:[event dataUsingEncoding:NSASCIIStringEncoding allowLossyConversion:YES] + encoding:NSASCIIStringEncoding]; + const char *cStr = [eventStr cStringUsingEncoding:NSASCIIStringEncoding]; + int copyLen = MIN(AQT_EVENTBUF_SIZE - 1, strlen(cStr)); + strncpy(buffer, cStr, copyLen); + buffer[copyLen] = '\0'; return 0; } int aqtWaitNextEvent(char *buffer) // FIXME: retval? { NSString *event = [_adapter waitNextEvent]; - - strncpy(buffer, [event UTF8String], MIN(AQT_EVENTBUF_SIZE - 1, [event length])); - buffer[MIN(AQT_EVENTBUF_SIZE - 1, [event length])] = '\0'; - return 0; + // Perform a lossy conversion from UTF8 to ASCII + NSString *eventStr = [[NSString alloc] initWithData:[event dataUsingEncoding:NSASCIIStringEncoding allowLossyConversion:YES] + encoding:NSASCIIStringEncoding]; + const char *cStr = [eventStr cStringUsingEncoding:NSASCIIStringEncoding]; + int copyLen = MIN(AQT_EVENTBUF_SIZE - 1, strlen(cStr)); + strncpy(buffer, cStr, copyLen); + buffer[copyLen] = '\0'; + return 0; } void aqtEventProcessingMode() |
Update of /cvsroot/aquaterm/aquaterm In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv11566 Modified Files: AQTAdapter.h AQTAdapter.m AQTFunctions.h AQTGraphic.h AQTGraphic.m AQTGraphicDrawingMethods.m AQTPlotBuilder.m Demo.m Log Message: Adding alpha channel handling. Index: AQTAdapter.h =================================================================== RCS file: /cvsroot/aquaterm/aquaterm/AQTAdapter.h,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- AQTAdapter.h 14 Feb 2005 21:50:14 -0000 1.43 +++ AQTAdapter.h 21 Mar 2007 17:35:45 -0000 1.44 @@ -62,12 +62,18 @@ /*" Colormap (utility) "*/ - (int)colormapSize; +- (void)setColormapEntry:(int)entryIndex red:(float)r green:(float)g blue:(float)b alpha:(float)a; +- (void)getColormapEntry:(int)entryIndex red:(float *)r green:(float *)g blue:(float *)b alpha:(float *)a; - (void)setColormapEntry:(int)entryIndex red:(float)r green:(float)g blue:(float)b; - (void)getColormapEntry:(int)entryIndex red:(float *)r green:(float *)g blue:(float *)b; - (void)takeColorFromColormapEntry:(int)index; - (void)takeBackgroundColorFromColormapEntry:(int)index; /*" Color handling "*/ +- (void)setColorRed:(float)r green:(float)g blue:(float)b alpha:(float)a; +- (void)setBackgroundColorRed:(float)r green:(float)g blue:(float)b alpha:(float)a; +- (void)getColorRed:(float *)r green:(float *)g blue:(float *)b alpha:(float *)a; +- (void)getBackgroundColorRed:(float *)r green:(float *)g blue:(float *)b alpha:(float *)a; - (void)setColorRed:(float)r green:(float)g blue:(float)b; - (void)setBackgroundColorRed:(float)r green:(float)g blue:(float)b; - (void)getColorRed:(float *)r green:(float *)g blue:(float *)b; Index: AQTAdapter.m =================================================================== RCS file: /cvsroot/aquaterm/aquaterm/AQTAdapter.m,v retrieving revision 1.62 retrieving revision 1.63 diff -u -d -r1.62 -r1.63 --- AQTAdapter.m 26 Jul 2005 00:03:13 -0000 1.62 +++ AQTAdapter.m 21 Mar 2007 17:35:46 -0000 1.63 @@ -238,24 +238,39 @@ } /*" Set an RGB entry in the colormap, at the position given by entryIndex. "*/ -- (void)setColormapEntry:(int)entryIndex red:(float)r green:(float)g blue:(float)b +- (void)setColormapEntry:(int)entryIndex red:(float)r green:(float)g blue:(float)b alpha:(float)a { AQTColor tmpColor; tmpColor.red = r; tmpColor.green = g; tmpColor.blue = b; + tmpColor.alpha = a; [_selectedBuilder setColor:tmpColor forColormapEntry:entryIndex]; } +- (void)setColormapEntry:(int)entryIndex red:(float)r green:(float)g blue:(float)b +{ + [self setColormapEntry:entryIndex red:r green:g blue:b alpha:1.0]; +} + + /*" Set an RGB entry in the colormap, at the position given by entryIndex. "*/ -- (void)getColormapEntry:(int)entryIndex red:(float *)r green:(float *)g blue:(float *)b +- (void)getColormapEntry:(int)entryIndex red:(float *)r green:(float *)g blue:(float *)b alpha:(float *)a { AQTColor tmpColor = [_selectedBuilder colorForColormapEntry:entryIndex]; *r = tmpColor.red; *g = tmpColor.green; *b = tmpColor.blue; + *a = tmpColor.alpha; +} + +- (void)getColormapEntry:(int)entryIndex red:(float *)r green:(float *)g blue:(float *)b +{ + float dummyAlpha; + [self getColormapEntry:entryIndex red:r green:g blue:b alpha:&dummyAlpha]; } + /*" Set the current color, used for all subsequent items, using the color stored at the position given by index in the colormap. "*/ - (void)takeColorFromColormapEntry:(int)index { @@ -269,43 +284,67 @@ } /*" Set the current color, used for all subsequent items, using explicit RGB components. "*/ -- (void)setColorRed:(float)r green:(float)g blue:(float)b +- (void)setColorRed:(float)r green:(float)g blue:(float)b alpha:(float)a { - AQTColor newColor; - newColor.red = r; - newColor.green = g; - newColor.blue = b; + AQTColor newColor = (AQTColor){r, g, b, a}; [_selectedBuilder setColor:newColor]; } +- (void)setColorRed:(float)r green:(float)g blue:(float)b +{ + [self setColorRed:r green:g blue:b alpha:1.0]; +} + + /*" Set the background color, overriding any previous color, using explicit RGB components. "*/ -- (void)setBackgroundColorRed:(float)r green:(float)g blue:(float)b +- (void)setBackgroundColorRed:(float)r green:(float)g blue:(float)b alpha:(float)a { - AQTColor newColor; - newColor.red = r; - newColor.green = g; - newColor.blue = b; + AQTColor newColor = (AQTColor){r, g, b, a}; [_selectedBuilder setBackgroundColor:newColor]; } +- (void)setBackgroundColorRed:(float)r green:(float)g blue:(float)b +{ + [self setBackgroundColorRed:r green:g blue:b alpha:1.0]; +} + + /*" Get current RGB color components by reference. "*/ -- (void)getColorRed:(float *)r green:(float *)g blue:(float *)b +- (void)getColorRed:(float *)r green:(float *)g blue:(float *)b alpha:(float *)a { AQTColor tmpColor = [_selectedBuilder color]; *r = tmpColor.red; *g = tmpColor.green; *b = tmpColor.blue; + *a = tmpColor.alpha; } -/*" Get background color components by reference. "*/ -- (void)getBackgroundColorRed:(float *)r green:(float *)g blue:(float *)b + +- (void)getColorRed:(float *)r green:(float *)g blue:(float *)b { - AQTColor tmpColor = [_selectedBuilder backgroundColor]; + AQTColor tmpColor = [_selectedBuilder color]; *r = tmpColor.red; *g = tmpColor.green; *b = tmpColor.blue; } +/*" Get background color components by reference. "*/ +- (void)getBackgroundColorRed:(float *)r green:(float *)g blue:(float *)b alpha:(float *)a +{ + AQTColor tmpColor = [_selectedBuilder backgroundColor]; + *r = tmpColor.red; + *g = tmpColor.green; + *b = tmpColor.blue; + *a = tmpColor.alpha; +} + + +- (void)getBackgroundColorRed:(float *)r green:(float *)g blue:(float *)b +{ + float dummyAlpha; + [self getBackgroundColorRed:r green:g blue:b alpha:&dummyAlpha]; +} + /*" Set the font to be used. Applies to all future operations. Default is Times-Roman."*/ - (void)setFontname:(NSString *)newFontname Index: AQTFunctions.h =================================================================== RCS file: /cvsroot/aquaterm/aquaterm/AQTFunctions.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- AQTFunctions.h 12 Dec 2004 18:56:52 -0000 1.4 +++ AQTFunctions.h 21 Mar 2007 17:35:46 -0000 1.5 @@ -23,7 +23,7 @@ /* Color utilities */ static inline BOOL AQTEqualColors(AQTColor c1, AQTColor c2) { // return (c1.red == c2.red && c1.green == c2.green && c1.blue == c2.blue); - return (EQ(c1.red, c2.red) && EQ(c1.green, c2.green) && EQ(c1.blue, c2.blue)); + return (EQ(c1.red, c2.red) && EQ(c1.green, c2.green) && EQ(c1.blue, c2.blue) && EQ(c1.alpha, c2.alpha)); } /* Geometry extensions */ Index: AQTGraphic.h =================================================================== RCS file: /cvsroot/aquaterm/aquaterm/AQTGraphic.h,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- AQTGraphic.h 11 Feb 2005 22:52:48 -0000 1.18 +++ AQTGraphic.h 21 Mar 2007 17:35:46 -0000 1.19 @@ -14,6 +14,7 @@ float red; float green; float blue; + float alpha; } AQTColor; @interface AQTGraphic : NSObject <NSCoding> Index: AQTGraphic.m =================================================================== RCS file: /cvsroot/aquaterm/aquaterm/AQTGraphic.m,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- AQTGraphic.m 11 Feb 2005 22:52:48 -0000 1.18 +++ AQTGraphic.m 21 Mar 2007 17:35:46 -0000 1.19 @@ -8,6 +8,12 @@ #import "AQTGraphic.h" +typedef struct _AQTColor_v100 { + float red; + float green; + float blue; +} AQTColor_v100; + @implementation AQTGraphic /**" *** An abstract class to derive model objects from @@ -27,6 +33,7 @@ _color.red = 1.; _color.green = 1.; _color.blue = 1.; + _color.alpha = 1.; } return self; } @@ -51,12 +58,20 @@ -(id)initWithCoder:(NSCoder *)coder { - self = [super init]; - [coder decodeValueOfObjCType:@encode(AQTColor) at:&_color]; - [coder decodeValueOfObjCType:@encode(NSRect) at:&_bounds]; - [coder decodeValueOfObjCType:@encode(NSRect) at:&_clipRect]; - [coder decodeValueOfObjCType:@encode(BOOL) at:&_isClipped]; - return self; + self = [super init]; +#if 1 + [coder decodeValueOfObjCType:@encode(AQTColor) at:&_color]; +#else + { + AQTColor_v100 color_v100; + [coder decodeValueOfObjCType:@encode(AQTColor) at:&color_v100]; + _color = (AQTColor){color_v100.red, color_v100.green, color_v100.blue, 1.0}; + } +#endif + [coder decodeValueOfObjCType:@encode(NSRect) at:&_bounds]; + [coder decodeValueOfObjCType:@encode(NSRect) at:&_clipRect]; + [coder decodeValueOfObjCType:@encode(BOOL) at:&_isClipped]; + return self; } -(AQTColor)color Index: AQTGraphicDrawingMethods.m =================================================================== RCS file: /cvsroot/aquaterm/aquaterm/AQTGraphicDrawingMethods.m,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- AQTGraphicDrawingMethods.m 10 Nov 2005 21:07:20 -0000 1.34 +++ AQTGraphicDrawingMethods.m 21 Mar 2007 17:35:46 -0000 1.35 @@ -26,7 +26,7 @@ [[NSColor colorWithCalibratedRed:_color.red green:_color.green blue:_color.blue - alpha:1.0] set]; + alpha:_color.alpha] set]; currentColor = _color; } } Index: AQTPlotBuilder.m =================================================================== RCS file: /cvsroot/aquaterm/aquaterm/AQTPlotBuilder.m,v retrieving revision 1.54 retrieving revision 1.55 diff -u -d -r1.54 -r1.55 --- AQTPlotBuilder.m 23 Aug 2006 18:01:01 -0000 1.54 +++ AQTPlotBuilder.m 21 Mar 2007 17:35:46 -0000 1.55 @@ -142,7 +142,8 @@ - (void)setColor:(AQTColor)newColor { - if ((newColor.red != _color.red) || (newColor.green != _color.green) || (newColor.blue != _color.blue)) + // FIXME: Use AQTEqualColor instead + if ((newColor.red != _color.red) || (newColor.green != _color.green) || (newColor.blue != _color.blue) || (newColor.alpha != _color.alpha)) { [self _flushBuffers]; _color = newColor; @@ -152,7 +153,8 @@ - (void)setBackgroundColor:(AQTColor)newColor { AQTColor oldColor = [_model color]; - if ((newColor.red != oldColor.red) || (newColor.green != oldColor.green) || (newColor.blue != oldColor.blue)) + // FIXME: Use AQTEqualColor instead + if ((newColor.red != oldColor.red) || (newColor.green != oldColor.green) || (newColor.blue != oldColor.blue) || (newColor.alpha != oldColor.alpha)) { [_model setColor:newColor]; [self _aqtPlotBuilderSetModelIsDirty:YES]; Index: Demo.m =================================================================== RCS file: /cvsroot/aquaterm/aquaterm/Demo.m,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- Demo.m 25 Jul 2005 16:13:36 -0000 1.16 +++ Demo.m 21 Mar 2007 17:35:46 -0000 1.17 @@ -251,14 +251,27 @@ } [adapter takeColorFromColormapEntry:4]; [adapter addPolygonWithVertexPoints:points pointCount:8]; -for (i=0; i<32; i++) + +// Circles with alpha transparency +[adapter takeColorFromColormapEntry:1]; +[adapter addLabel:@"Alpha channel" atPoint:NSMakePoint(530, 290) angle:0.0 align:AQTAlignCenter]; { - double radians=(double)i*pi/16.0, r=20.0; - points[i]=NSMakePoint(520.0+r*cos(radians), 255.0+r*sin(radians)); + float x[] = {520.0, 540.0, 540.0}; + float y[] = {255.0, 245.0, 265.0}; + float red[] = {1.0, 0.0, 0.0}; + float green[] = {0.0, 1.0, 0.0}; + float blue[] = {0.0, 0.0, 1.0}; + int j; + + for (j=0; j<3; j++) { + for (i=0; i<32; i++) { + double radians=(double)i*pi/16.0, r=20.0; + points[i]=NSMakePoint(x[j]+r*cos(radians), y[j]+r*sin(radians)); + } + [adapter setColorRed:red[j] green:green[j] blue:blue[j] alpha:0.5]; + [adapter addPolygonWithVertexPoints:points pointCount:32]; + } } -[adapter takeColorFromColormapEntry:5]; -[adapter addPolygonWithVertexPoints:points pointCount:32]; - // Images [adapter takeColorFromColormapEntry:1]; [adapter addLabel:@"Images" atPoint:NSMakePoint(320, 220) angle:0.0 align:AQTAlignLeft]; |
From: Per P. <per...@us...> - 2006-10-31 21:05:22
|
Update of /cvsroot/aquaterm/aquaterm/installer In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv16830/installer Modified Files: postflight Log Message: Adding the missing link. Time to deprecate libaquaterm altogether. Index: postflight =================================================================== RCS file: /cvsroot/aquaterm/aquaterm/installer/postflight,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- postflight 31 Jul 2006 21:27:56 -0000 1.4 +++ postflight 31 Oct 2006 21:05:17 -0000 1.5 @@ -5,6 +5,7 @@ mkdir -p /usr/local/lib fi ln -s /Library/Frameworks/AquaTerm.framework/Versions/A/AquaTerm /usr/local/lib/libaquaterm.dylib +ln -s /Library/Frameworks/AquaTerm.framework/Versions/A/AquaTerm /usr/local/lib/libaquaterm.1.0.0.dylib ln -s /Library/Frameworks/AquaTerm.framework/Versions/A/AquaTerm /usr/local/lib/libaquaterm.1.0.1.dylib ## Symlinks to framework in /usr/local/include/aquaterm if [ ! -e /usr/local/include/aquaterm ]; then |
From: Per P. <per...@us...> - 2006-08-23 18:01:17
|
Update of /cvsroot/aquaterm/aquaterm In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv2531 Modified Files: AQTPlotBuilder.m Log Message: Fixing size method left out when renaming size to canvasSize, reported by Will Ware. Only affected debug builds. Index: AQTPlotBuilder.m =================================================================== RCS file: /cvsroot/aquaterm/aquaterm/AQTPlotBuilder.m,v retrieving revision 1.53 retrieving revision 1.54 diff -u -d -r1.53 -r1.54 --- AQTPlotBuilder.m 10 Nov 2005 21:05:59 -0000 1.53 +++ AQTPlotBuilder.m 23 Aug 2006 18:01:01 -0000 1.54 @@ -38,7 +38,7 @@ // It ain't dirty until the fat lady has a size _modelIsDirty = isDirty && _hasSize; #ifdef DEBUG - if (_modelIsDirty && NSEqualSizes(NSZeroSize, [_model size])) + if (_modelIsDirty && NSEqualSizes(NSZeroSize, [_model canvasSize])) { [NSException raise:@"AQTDebugException" format:NSStringFromSelector(_cmd)]; } |
From: Per P. <per...@us...> - 2006-07-31 22:59:49
|
Update of /cvsroot/aquaterm/aquaterm/AquaTerm.xcodeproj In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv12708 Modified Files: per.mode1 per.pbxuser Log Message: Preparing for source release. Index: per.mode1 =================================================================== RCS file: /cvsroot/aquaterm/aquaterm/AquaTerm.xcodeproj/per.mode1,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- per.mode1 31 Jul 2006 21:49:13 -0000 1.2 +++ per.mode1 31 Jul 2006 22:59:46 -0000 1.3 @@ -218,6 +218,8 @@ <key>Layout</key> <array> <dict> + <key>BecomeActive</key> + <true/> <key>ContentConfiguration</key> <dict> <key>PBXBottomSmartGroupGIDs</key> @@ -254,17 +256,10 @@ <key>PBXSmartGroupTreeModuleOutlineStateExpansionKey</key> <array> <string>29B97314FDCFA39411CA2CEA</string> - <string>F57C16A102506DE3010D3DE4</string> <string>1C37FABC05509CD000000102</string> </array> <key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key> - <array> - <array> - <integer>23</integer> - <integer>10</integer> - <integer>0</integer> - </array> - </array> + <array/> <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key> <string>{{0, 0}, {186, 739}}</string> </dict> @@ -285,7 +280,7 @@ <real>186</real> </array> <key>RubberWindowFrame</key> - <string>117 80 1136 798 0 0 1440 878 </string> + <string>120 80 1136 798 0 0 1440 878 </string> </dict> <key>Module</key> <string>PBXSmartGroupTreeModule</string> @@ -296,8 +291,6 @@ <key>Dock</key> <array> <dict> - <key>BecomeActive</key> - <true/> <key>ContentConfiguration</key> <dict> <key>PBXProjectModuleGUID</key> @@ -315,7 +308,7 @@ <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> - <string>CB9619680A7EB22E005DE397</string> + <string>CB28207F0A7EC2A7001DCA49</string> <key>history</key> <array> <string>CB699CA608953D2200C4B248</string> @@ -323,7 +316,7 @@ <string>CB5718900A7EA39700FF8E2F</string> <string>CB5718910A7EA39700FF8E2F</string> <string>CB5718920A7EA39700FF8E2F</string> - <string>CB9619670A7EB22E005DE397</string> + <string>CB2820720A7EC181001DCA49</string> </array> <key>prevStack</key> <array> @@ -348,7 +341,7 @@ <key>Frame</key> <string>{{0, 0}, {928, 497}}</string> <key>RubberWindowFrame</key> - <string>117 80 1136 798 0 0 1440 878 </string> + <string>120 80 1136 798 0 0 1440 878 </string> </dict> <key>Module</key> <string>PBXNavigatorGroup</string> @@ -368,7 +361,7 @@ <key>Frame</key> <string>{{0, 502}, {928, 255}}</string> <key>RubberWindowFrame</key> - <string>117 80 1136 798 0 0 1440 878 </string> + <string>120 80 1136 798 0 0 1440 878 </string> </dict> <key>Module</key> <string>XCDetailModule</string> @@ -392,9 +385,9 @@ </array> <key>TableOfContents</key> <array> - <string>CB9619690A7EB22E005DE397</string> + <string>CB28207D0A7EC2A7001DCA49</string> <string>1CE0B1FE06471DED0097A5F4</string> - <string>CB96196A0A7EB22E005DE397</string> + <string>CB28207E0A7EC2A7001DCA49</string> <string>1CE0B20306471E060097A5F4</string> <string>1CE0B20506471E060097A5F4</string> </array> @@ -528,11 +521,10 @@ <integer>5</integer> <key>WindowOrderList</key> <array> - <string>CB699C9F08953B5400C4B248</string> <string>/Volumes/Ior/Source/live/aquaterm/AquaTerm.xcodeproj</string> </array> <key>WindowString</key> - <string>117 80 1136 798 0 0 1440 878 </string> + <string>120 80 1136 798 0 0 1440 878 </string> <key>WindowTools</key> <array> <dict> @@ -562,7 +554,7 @@ <key>Frame</key> <string>{{0, 0}, {974, 100}}</string> <key>RubberWindowFrame</key> - <string>130 -39 974 488 0 0 1440 878 </string> + <string>3 390 974 488 0 0 1440 878 </string> </dict> <key>Module</key> <string>PBXNavigatorGroup</string> @@ -570,6 +562,8 @@ <string>100pt</string> </dict> <dict> + <key>BecomeActive</key> + <true/> <key>ContentConfiguration</key> <dict> <key>PBXBuildLogShowsTranscriptDefaultKey</key> @@ -588,7 +582,7 @@ <key>Frame</key> <string>{{0, 105}, {974, 342}}</string> <key>RubberWindowFrame</key> - <string>130 -39 974 488 0 0 1440 878 </string> + <string>3 390 974 488 0 0 1440 878 </string> </dict> <key>Module</key> <string>PBXBuildResultsModule</string> @@ -611,14 +605,14 @@ <key>TableOfContents</key> <array> <string>CB699C9F08953B5400C4B248</string> - <string>CB96196B0A7EB22E005DE397</string> + <string>CB2820700A7EC17D001DCA49</string> <string>1CD0528F0623707200166675</string> <string>XCMainBuildResultsModuleGUID</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.build</string> <key>WindowString</key> - <string>130 -39 974 488 0 0 1440 878 </string> + <string>3 390 974 488 0 0 1440 878 </string> <key>WindowToolGUID</key> <string>CB699C9F08953B5400C4B248</string> <key>WindowToolIsVisible</key> Index: per.pbxuser =================================================================== RCS file: /cvsroot/aquaterm/aquaterm/AquaTerm.xcodeproj/per.pbxuser,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- per.pbxuser 31 Jul 2006 21:49:13 -0000 1.2 +++ per.pbxuser 31 Jul 2006 22:59:46 -0000 1.3 @@ -3,7 +3,7 @@ 29B97313FDCFA39411CA2CEA /* Project object */ = { activeBuildConfigurationName = Deployment; activeExecutable = CB699C6708953A9400C4B248 /* AquaTerm */; - activeTarget = CBAA608105E7AFA7009B33CD /* Distro */; + activeTarget = CBC4B42705E4C784001BE8D7 /* AquaTerm */; codeSenseManager = CB699C9208953AAD00C4B248 /* Code sense */; executables = ( CB699C6708953A9400C4B248 /* AquaTerm */, @@ -81,10 +81,12 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 176074490; - PBXWorkspaceStateSaveDate = 176074490; + PBXPerProjectTemplateStateSaveDate = 176079510; + PBXWorkspaceStateSaveDate = 176079510; }; perUserProjectItems = { + CB2820720A7EC181001DCA49 /* PBXTextBookmark */ = CB2820720A7EC181001DCA49 /* PBXTextBookmark */; + CB28207F0A7EC2A7001DCA49 /* PBXTextBookmark */ = CB28207F0A7EC2A7001DCA49 /* PBXTextBookmark */; CB5718850A7EA04D00FF8E2F /* PBXTextBookmark */ = CB5718850A7EA04D00FF8E2F /* PBXTextBookmark */; CB5718870A7EA04D00FF8E2F /* PBXTextBookmark */ = CB5718870A7EA04D00FF8E2F /* PBXTextBookmark */; CB5718880A7EA04D00FF8E2F /* PBXTextBookmark */ = CB5718880A7EA04D00FF8E2F /* PBXTextBookmark */; @@ -98,8 +100,6 @@ CB699CA608953D2200C4B248 /* PBXTextBookmark */ = CB699CA608953D2200C4B248 /* PBXTextBookmark */; CB699CA908953D2200C4B248 /* PBXTextBookmark */ = CB699CA908953D2200C4B248 /* PBXTextBookmark */; CB699CBF08953D8E00C4B248 /* PBXTextBookmark */ = CB699CBF08953D8E00C4B248 /* PBXTextBookmark */; - CB9619670A7EB22E005DE397 /* PBXTextBookmark */ = CB9619670A7EB22E005DE397 /* PBXTextBookmark */; - CB9619680A7EB22E005DE397 /* PBXTextBookmark */ = CB9619680A7EB22E005DE397 /* PBXTextBookmark */; }; sourceControlManager = CB699C9108953AAD00C4B248 /* Source Control */; userBuildSettings = { @@ -112,6 +112,26 @@ sepNavVisRect = "{{0, 66}, {776, 480}}"; }; }; + CB2820720A7EC181001DCA49 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = CBAA608305E7AFF0009B33CD /* distroMakefile */; + name = "distroMakefile: 30"; + rLen = 0; + rLoc = 873; + rType = 0; + vrLen = 996; + vrLoc = 59; + }; + CB28207F0A7EC2A7001DCA49 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = CBAA608305E7AFF0009B33CD /* distroMakefile */; + name = "distroMakefile: 30"; + rLen = 0; + rLoc = 873; + rType = 0; + vrLen = 996; + vrLoc = 59; + }; CB2CC10D0677017B0042863D /* AQTModelAdditions.h */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1064, 594}}"; @@ -141,7 +161,7 @@ fRef = CBAA608305E7AFF0009B33CD /* distroMakefile */; name = "distroMakefile: 36"; rLen = 0; - rLoc = 869; + rLoc = 1048; rType = 0; vrLen = 952; vrLoc = 1295; @@ -386,26 +406,6 @@ sepNavVisRect = "{{0, 0}, {1080, 551}}"; }; }; - CB9619670A7EB22E005DE397 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = CBAA608305E7AFF0009B33CD /* distroMakefile */; - name = "distroMakefile: 27"; - rLen = 0; - rLoc = 605; - rType = 0; - vrLen = 952; - vrLoc = 1296; - }; - CB9619680A7EB22E005DE397 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = CBAA608305E7AFF0009B33CD /* distroMakefile */; - name = "distroMakefile: 29"; - rLen = 0; - rLoc = 706; - rType = 0; - vrLen = 892; - vrLoc = 527; - }; CB9B70D1065A0B9C00563010 /* AQTPrefController.h */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1064, 594}}"; @@ -425,9 +425,9 @@ }; CBAA608305E7AFF0009B33CD /* distroMakefile */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {881, 1470}}"; - sepNavSelRange = "{706, 0}"; - sepNavVisRect = "{{0, 344}, {881, 480}}"; + sepNavIntBoundsRect = "{{0, 0}, {881, 1498}}"; + sepNavSelRange = "{873, 0}"; + sepNavVisRect = "{{0, 56}, {881, 480}}"; }; }; CBB06FE805740EB900D208BA /* AQTFunctions.h */ = { |
From: Per P. <per...@us...> - 2006-07-31 22:55:56
|
Update of /cvsroot/aquaterm/aquaterm In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv11188 Modified Files: distroMakefile Log Message: hdiutil is wreaking havoc on the installer package, using DropDMG as a fix. Index: distroMakefile =================================================================== RCS file: /cvsroot/aquaterm/aquaterm/distroMakefile,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- distroMakefile 31 Jul 2006 21:27:55 -0000 1.15 +++ distroMakefile 31 Jul 2006 22:55:52 -0000 1.16 @@ -25,7 +25,9 @@ freeze -v $(APPSRCDIR)/installer/installer.packproj dmg: adapters info doc pkg - hdiutil create -volname AquaTerm -fs HFS+ -srcfolder $(DMG_ROOT) $(BUILD_DIR)/$(RELEASENAME).dmg + #hdiutil create -volname AquaTerm -fs HFS+ -srcfolder $(DMG_ROOT) $(BUILD_DIR)/$(RELEASENAME).dmg + #hdiutil create -volname $(RELEASENAME) -fs HFS+ -srcfolder $(DMG_ROOT) $(BUILD_DIR)/$(RELEASENAME).dmg + dropdmg -v $(RELEASENAME) -b $(RELEASENAME) -o $(BUILD_DIR) $(DMG_ROOT) pre: clean @echo "SYMROOT is " $(SYMROOT) ", cleaning out..." |
From: Per P. <per...@us...> - 2006-07-31 21:51:08
|
Update of /cvsroot/aquaterm/aquaterm/English.lproj In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv19849 Modified Files: Credits.rtf Log Message: Targeting Universal Binary. Bumping version to 1.0.1 Index: Credits.rtf =================================================================== RCS file: /cvsroot/aquaterm/aquaterm/English.lproj/Credits.rtf,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- Credits.rtf 25 Jul 2005 19:02:49 -0000 1.6 +++ Credits.rtf 31 Jul 2006 21:51:04 -0000 1.7 @@ -1,9 +1,10 @@ -{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf100 +{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf410 {\fonttbl\f0\froman\fcharset77 Times-Roman;} {\colortbl;\red255\green255\blue255;} +\vieww9000\viewh8400\viewkind0 \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 Copyright (c) 2001-2005, The AquaTerm project\ +\f0\fs24 \cf0 Copyright (c) 2001-2006, The AquaTerm project\ All rights reserved.\ \ Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:\ |
From: Per P. <per...@us...> - 2006-07-31 21:50:58
|
Update of /cvsroot/aquaterm/aquaterm In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv19829 Modified Files: ReadMe.rtf Log Message: Targeting Universal Binary. Bumping version to 1.0.1 Index: ReadMe.rtf =================================================================== RCS file: /cvsroot/aquaterm/aquaterm/ReadMe.rtf,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- ReadMe.rtf 31 Jul 2006 21:27:55 -0000 1.8 +++ ReadMe.rtf 31 Jul 2006 21:50:56 -0000 1.9 @@ -1,9 +1,10 @@ {\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf410 {\fonttbl\f0\fnil\fcharset77 Monaco;} -{\colortbl;\red255\green255\blue255;\red0\green0\blue0;\red201\green233\blue243;} +{\colortbl;\red255\green255\blue255;\red201\green233\blue243;} +\vieww9000\viewh8400\viewkind0 \pard\tx480\tx960\tx1440\tx1920\tx2400\tx2880\tx3360\tx3840\tx4320\tx4800\tx5280\tx5760\tx6240\tx6720\tx7200\tx7680\tx8160\tx8640\tx9120\tx9600\tx10080\tx10560\tx11040\tx11520\tx12000\tx12480\tx12960\tx13440\tx13920\tx14400\tx14880\tx15360\tx15840\tx16320\tx16800\tx17280\tx17760\tx18240\tx18720\tx19200\tx19680\tx20160\tx20640\tx21120\tx21600\tx22080\tx22560\tx23040\tx23520\tx24000\tx24480\tx24960\tx25440\tx25920\tx26400\tx26880\tx27360\tx27840\tx28320\tx28800\tx29280\tx29760\tx30240\tx30720\tx31200\tx31680\tx32160\tx32640\tx33120\tx33600\tx34080\tx34560\tx35040\tx35520\tx36000\tx36480\tx36960\tx37440\tx37920\tx38400\tx38880\tx39360\tx39840\tx40320\tx40800\tx41280\tx41760\tx42240\tx42720\tx43200\tx43680\tx44160\tx44640\tx45120\tx45600\tx46080\tx46560\tx47040\tx47520\tx48000\ql\qnatural\pardirnatural -\f0\fs20 \cf2 \CocoaLigature0 AquaTerm\ +\f0\fs20 \cf0 \CocoaLigature0 AquaTerm\ your friendly plotting front-end\ \ Table of cExamples ofCopyright \'a9 2001-2006, The AquaTerm project\ @@ -57,7 +58,7 @@ \ The C API is unfortunately only documented by the header file aquaterm.h, but the calls are very similar to the methods described in AQTAdapter.html and it as a reference together with the C and Fortran examples should be enough to get you started. \ \ -Examples of how to use AquaTerm from C, Python, and Fortran as well as \cb3 Lisp bindings, \cb1 a Perl module and an adapter for PGPLOT can be found in the adapters folder.\ +Examples of how to use AquaTerm from C, Python, and Fortran as well as Lisp bindings, a Perl module and an adapter for PGPLOT can be found in the adapters folder.\ \ NB. The gnuplot adapter is part of gnuplot 4.x sources and the PLplot adapter is part of PLplot as of version 5.5.3.\ \ @@ -68,7 +69,7 @@ In many ways! Write code (core or adapters), write documentation, improve the website, test and report bugs, write supporting notes in email or sponsor the project with cash. \ \ 9 License terms\ -Copyright \'a9 2001-\cb3 2006\cb1 , The AquaTerm project\ +Copyright \'a9 2001-\cb2 2006\cb1 , The AquaTerm project\ All rights reserved.\ \ Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:\ |