Changeset 14590 for trunk/Ohana/src/kapa2

Timestamp:

Aug 21, 2007, 2:10:20 PM (19 years ago)

Author:

eugene

Message:

convert str_to_time and related functions to ohana_...; various cleanups for -Wall -Werror

Location:

trunk/Ohana/src/kapa2

Files:

• include/icons.h (modified) (3 diffs)
• include/prototypes.h (modified) (3 diffs)
• include/structures.h (modified) (1 diff)
• src/CheckGeometry.c (modified) (1 diff)
• src/CheckPipe.c (modified) (1 diff)
• src/CreateZoom8.c (modified) (1 diff)
• src/DefineSection.c (modified) (1 diff)
• src/DrawButton.c (modified) (1 diff)
• src/EraseImage.c (modified) (1 diff)
• src/EraseOverlay.c (modified) (1 diff)
• src/EventLoop.c (modified) (1 diff)
• src/GetPixelCount.c (modified) (1 diff)
• src/InterpretKeys.c (modified) (2 diffs)
• src/InterpretPresses.c (modified) (1 diff)
• src/JPEGit24.c (modified) (1 diff)
• src/LoadFrame.c (modified) (1 diff)
• src/LoadObject.c (modified) (1 diff)
• src/LoadOverlay.c (modified) (1 diff)
• src/SetImageData.c (modified) (2 diffs)
• src/SetImageSize.c (modified) (1 diff)

trunk/Ohana/src/kapa2/include/icons.h

@@ +1 @@
+
+#define icon_width 29
+#define icon_height 29
+static unsigned char icon_bits[] = {
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xff, 0xff, 0x07,
+   0x04, 0x41, 0x10, 0x04, 0x04, 0x41, 0x10, 0x04, 0x04, 0x41, 0x10, 0x04,
+   0x04, 0x41, 0x10, 0x04, 0x04, 0x41, 0x10, 0x04, 0xfc, 0xff, 0xff, 0x07,
+   0x04, 0x41, 0x10, 0x04, 0x04, 0x41, 0x10, 0x04, 0x04, 0x41, 0x10, 0x04,
+   0x04, 0x41, 0x10, 0x04, 0x04, 0x41, 0x10, 0x04, 0xfc, 0xff, 0xff, 0x07,
+   0x04, 0x41, 0x10, 0x04, 0x04, 0x41, 0x10, 0x04, 0x04, 0x41, 0x10, 0x04,
+   0x04, 0x41, 0x10, 0x04, 0x04, 0x41, 0x10, 0x04, 0xfc, 0xff, 0xff, 0x07,
+   0x04, 0x41, 0x10, 0x04, 0x04, 0x41, 0x10, 0x04, 0x04, 0x41, 0x10, 0x04,
+   0x04, 0x41, 0x10, 0x04, 0x04, 0x41, 0x10, 0x04, 0xfc, 0xff, 0xff, 0x07,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+
+/* *** icons for buttons, not used ***
 #define arrow_width 6
 #define arrow_height 9
@@ -19 +35 @@
    0xfc, 0x0f, 0xfc, 0x3f, 0xfc, 0x3f, 0xfc, 0x0f, 0xfc, 0x03, 0xfc, 0x00,
    0x3c, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00};
-#define icon_width 29
-#define icon_height 29
-static unsigned char icon_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xff, 0xff, 0x07,
-   0x04, 0x41, 0x10, 0x04, 0x04, 0x41, 0x10, 0x04, 0x04, 0x41, 0x10, 0x04,
-   0x04, 0x41, 0x10, 0x04, 0x04, 0x41, 0x10, 0x04, 0xfc, 0xff, 0xff, 0x07,
-   0x04, 0x41, 0x10, 0x04, 0x04, 0x41, 0x10, 0x04, 0x04, 0x41, 0x10, 0x04,
-   0x04, 0x41, 0x10, 0x04, 0x04, 0x41, 0x10, 0x04, 0xfc, 0xff, 0xff, 0x07,
-   0x04, 0x41, 0x10, 0x04, 0x04, 0x41, 0x10, 0x04, 0x04, 0x41, 0x10, 0x04,
-   0x04, 0x41, 0x10, 0x04, 0x04, 0x41, 0x10, 0x04, 0xfc, 0xff, 0xff, 0x07,
-   0x04, 0x41, 0x10, 0x04, 0x04, 0x41, 0x10, 0x04, 0x04, 0x41, 0x10, 0x04,
-   0x04, 0x41, 0x10, 0x04, 0x04, 0x41, 0x10, 0x04, 0xfc, 0xff, 0xff, 0x07,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 #define stop_width 16
 #define stop_height 16
@@ -38 +41 @@
    0xf8, 0x1f, 0xf8, 0x1f, 0xf8, 0x1f, 0xf8, 0x1f, 0xf8, 0x1f, 0xf8, 0x1f,
    0xf8, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+*/

trunk/Ohana/src/kapa2/include/prototypes.h

@@ -23 +23 @@
 void          NameWindow          PROTO((Graphic *graphic, char *name));
 void          MapWindow           PROTO((Graphic *graphic));
+void CheckVisual (Graphic *graphic, int *argc, char **argv);
 
 /* X drawing utilities */
@@ -85 +86 @@
 int           SetActiveSectionByNumber PROTO((int N));
 int           ListSection         PROTO((int sock));
+void SetSectionSizes (Section *section);
 
 KapaGraphWidget *InitGraph        PROTO(());
@@ -188 +190 @@
 int           Overlay3            PROTO((Graphic *graphic, KapaImageWidget *image));
 int           PSfunction          PROTO((Graphic *graphic, KapaImageWidget *image));
+
+/* misc functions */
+void SetToolbox (int sock);
+int EraseOverlay (int sock);
+int LoadOverlay (int sock);
+int SaveOverlay (int sock);
+int CSaveOverlay (int sock);
+int JPEGit24 (int sock);
+
+int UpdatePointer (Graphic *graphic, XMotionEvent *event);
+int InterpretPresses (Graphic *graphic, XButtonEvent *event);
+int InterpretKeys (Graphic *graphic, XKeyEvent *event);
+void InitPipe (char *namedSocket);
+void EraseGraph (KapaGraphWidget *graph);
+void StatusBox (Graphic *graphic, KapaImageWidget *image);
+
+void CreatePicture (KapaImageWidget *image, Graphic *graphic);
+void CreateColorbar (KapaImageWidget *image, Graphic *graphic);
+void CreateZoom (KapaImageWidget *image, Graphic *graphic, double x, double y);
+void UpdateStatusBox (Graphic *graphic, KapaImageWidget *image, double x, double y, double z, int mode);
+
+void CreateZoom8  (KapaImageWidget *image, Graphic *graphic, double x, double y);
+void CreateZoom16 (KapaImageWidget *image, Graphic *graphic, double x, double y);
+void CreateZoom24 (KapaImageWidget *image, Graphic *graphic, double x, double y);
+void CreateZoom32 (KapaImageWidget *image, Graphic *graphic, double x, double y);
+
+int GetActiveSocket ();
+void InvertButton (Graphic *graphic, Button *button);
+void bDrawOverlay (KapaImageWidget *image, int N);

trunk/Ohana/src/kapa2/include/structures.h

@@ -13 +13 @@
   Cursor         cursor;
   int            x,  y;
-  int            dx, dy;
+  unsigned int   dx, dy;
   XColor         cmap[256];
   Colormap       colormap;

trunk/Ohana/src/kapa2/src/CheckGeometry.c

@@ -4 +4 @@
 void CheckGeometry (Graphic *graphic, int *argc, char **argv) {
 
-  int status, x, y, N;
-  unsigned int dx, dy;
-  int X, Y, dX, dY;
+  int status, N;
   char *temp_name;
   

trunk/Ohana/src/kapa2/src/CheckPipe.c

@@ -186 +186 @@
   
   if (!strcmp (word, "TOOL")) {
-    status = SetToolbox (sock);
+    SetToolbox (sock);
     KiiSendCommand (sock, 4, "DONE");
     FINISHED (TRUE);

trunk/Ohana/src/kapa2/src/CreateZoom8.c

@@ -68 +68 @@
   if ((i_end - i_start) % expand_out == 0) dropback = 0;
 
-  out_pix = (char *) image[0].zoom.data;
+  out_pix = (unsigned char *) image[0].zoom.data;
   imdata  = (float *) image[0].matrix.buffer;
   in_pix  = &imdata[DX*(int)MAX(Ry,0) + (int)MAX(Rx,0)];

trunk/Ohana/src/kapa2/src/DefineSection.c

@@ -4 +4 @@
 int DefineSection (int sock) {
   
-  int i, N, MoveSection;
+  int N, MoveSection;
   char name[128];
   double x, y, dx, dy;

trunk/Ohana/src/kapa2/src/DrawButton.c

@@ -2 +2 @@
 
 void DrawButton (Graphic *graphic, Button *button) {
-  
-  int y, dX;
   
   XSetForeground (graphic[0].display, graphic[0].gc, graphic[0].back);

trunk/Ohana/src/kapa2/src/EraseImage.c

@@ -3 +3 @@
 int EraseImage () {
 
-  char buffer[256];
-  int i, status, N;
   Graphic *graphic;
   Section *section;

trunk/Ohana/src/kapa2/src/EraseOverlay.c

@@ -3 +3 @@
 int EraseOverlay (int sock) {
 
-  char buffer[256];
-  int i, status, N;
+  int i, N;
   Graphic *graphic;
   Section *section;

trunk/Ohana/src/kapa2/src/EventLoop.c

@@ -50 +50 @@
     if (LastEvent (display, MotionNotify,    &event)) UpdatePointer (graphic, (XMotionEvent *) &event);
     if (LastEvent (display, ButtonPress,     &event)) InterpretPresses (graphic, (XButtonEvent *) &event);
-    if (LastEvent (display, KeyPress,        &event)) InterpretKeys (graphic, &event);
+    if (LastEvent (display, KeyPress,        &event)) InterpretKeys (graphic, (XKeyEvent *) &event);
 
     /* drop and ignore the following StructureNotifyMask events */

trunk/Ohana/src/kapa2/src/GetPixelCount.c

@@ -3 +3 @@
 int GetPixelCount (int sock) {
   
-  int i;
-  double xmin, xmax, ymin, ymax;
   Graphic *graphic;
 

trunk/Ohana/src/kapa2/src/InterpretKeys.c

@@ -6 +6 @@
   double           X, Y, Z, R, D, offset;
   int              sock, DX, DY, modstate;
-  char            *name, string[16], line[40];
+  char            *name, string[16];
   KeySym           keysym;
   XComposeStatus   composestatus;
@@ -134 +134 @@
     case XK_Tab:
       image[0].MovePointer = image[0].MovePointer ^ TRUE;
-      if (image[0].MovePointer) UpdatePointer (graphic, image, (XMotionEvent *)event);
+      if (image[0].MovePointer) UpdatePointer (graphic, (XMotionEvent *)event);
       break;
   }

trunk/Ohana/src/kapa2/src/InterpretPresses.c

@@ -3 +3 @@
 int InterpretPresses (Graphic *graphic, XButtonEvent *event) {
 
-  int              sock, DX, DY, status, done, this_button, old_cursor;
-  char             name[16], line[40];
+  int              sock, DX, DY, status, done, this_button;
+  char             name[16];
   double           X, Y, Z, R, D;
   float           *imdata;
-  KeySym           keysym;
   Button          *button;
   Section         *section;

trunk/Ohana/src/kapa2/src/JPEGit24.c

@@ -33 +33 @@
   int dropback;  /* this is a bit of a kludge... */
   int dx, dy, DX, DY, pixelN;
-  int status, Nbytes, quality;
+  int quality;
   int expand_in, expand_out;
   double expand, Rx, Ry, X, Y;

trunk/Ohana/src/kapa2/src/LoadFrame.c

@@ -3 +3 @@
 int LoadFrame (int sock) {
   
-  int i, status;
+  int i;
   char Axis[16], Labels[16], Ticks[16];
   Section *section;

trunk/Ohana/src/kapa2/src/LoadObject.c

@@ -123 +123 @@
   }
   if (Nbytes_send != Npts_send*sizeof(float)) {
-    fprintf (stderr, "Kapa Communication error: unexpected data size %d vs %d\n", Nbytes_send, Npts_send*sizeof(float));
+    fprintf (stderr, "Kapa Communication error: unexpected data size %d vs %ld\n", Nbytes_send, Npts_send*sizeof(float));
   }
 

trunk/Ohana/src/kapa2/src/LoadOverlay.c

@@ -4 +4 @@
   
   int i, j, Ntotal, Nbytes, Nread, Nfound, Ntext, Nobjects, overnum;
-  int Noverlay, NOVERLAY, Ntextdata;
+  int Noverlay, Ntextdata;
   char *textdata, *buffer, *p, *q;
   Section *section;

trunk/Ohana/src/kapa2/src/SetImageData.c

@@ -3 +3 @@
 int SetImageData (int sock) {
   
-  int i;
-  double xmin, xmax, ymin, ymax;
   Graphic *graphic;
   Section *section;
@@ -55 +53 @@
 int SetImageCoords (int sock) {
   
-  int i;
-  double xmin, xmax, ymin, ymax;
   Graphic *graphic;
   Section *section;

trunk/Ohana/src/kapa2/src/SetImageSize.c

@@ -7 +7 @@
 void SetImageSize (Section *section) {
 
-  int Xs, Ys, Xe, Ye, dX, dY;
+  int Xs, Ys, dX, dY;
   int textpad, textdY, WdY; 
   KapaImageWidget *image;