Changeset 25034

Timestamp:

Aug 10, 2009, 3:45:16 AM (17 years ago)

Author:

eugene

Message:

adding function to relocate kapa window

Location:

branches/eam_branches/20090715/Ohana/src

Files:

• kapa2/Makefile (modified) (1 diff)
• kapa2/include/prototypes.h (modified) (1 diff)
• kapa2/src/CheckPipe.c (modified) (1 diff)
• kapa2/src/Relocate.c (added)
• libkapa/include/kapa.h (modified) (1 diff)
• libkapa/src/KapaWindow.c (modified) (1 diff)
• opihi/cmd.data/init.c (modified) (2 diffs)
• opihi/cmd.data/relocate.c (added)

branches/eam_branches/20090715/Ohana/src/kapa2/Makefile

@@ -48 +48 @@
 $(SRC)/Layout.$(ARCH).o                   $(SRC)/Sections.$(ARCH).o           \
 $(SRC)/Graphs.$(ARCH).o                   $(SRC)/SetGraphSize.$(ARCH).o       \
-$(SRC)/Resize.$(ARCH).o                   $(SRC)/ErasePlots.$(ARCH).o         \
+$(SRC)/Resize.$(ARCH).o                   $(SRC)/Relocate.$(ARCH).o                   $(SRC)/ErasePlots.$(ARCH).o         \
 $(SRC)/EraseImage.$(ARCH).o               $(SRC)/SetToolbox.$(ARCH).o         \
 $(SRC)/EraseCurrentPlot.$(ARCH).o         $(SRC)/EraseSections.$(ARCH).o      \

branches/eam_branches/20090715/Ohana/src/kapa2/include/prototypes.h

@@ -55 +55 @@
 int           LoadTextlines       PROTO((int sock));
 int           Resize              PROTO((int sock));
+int           Relocate            PROTO((int sock));
 int           GetLimits           PROTO((int sock));
 int           SetLimits           PROTO((int sock));

branches/eam_branches/20090715/Ohana/src/kapa2/src/CheckPipe.c

@@ -131 +131 @@
   }
 
+  if (!strcmp (word, "MOVE")) {
+    status = Relocate (sock);
+    KiiSendCommand (sock, 4, "DONE");
+    FINISHED (status);
+  }
+
   if (!strcmp (word, "GLIM")) {
     GetLimits (sock);

branches/eam_branches/20090715/Ohana/src/libkapa/include/kapa.h

@@ -154 +154 @@
 /* KapaWindow.c */
 int KiiResize (int fd, int Nx, int Ny);
+int KiiRelocate (int fd, int x, int y);
 int KiiCenter (int fd, double x, double y, int zoom);
 int KiiParity (int fd, int xflip, int yflip);

branches/eam_branches/20090715/Ohana/src/libkapa/src/KapaWindow.c

@@ -23 +23 @@
   KiiSendCommand (fd, 4, "RSIZ");
   KiiSendMessage (fd, "%d %d", Nx, Ny); 
+  KiiWaitAnswer (fd, "DONE");
+  return (TRUE);
+}
+
+int KiiRelocate (int fd, int x, int y) {
+
+  KiiSendCommand (fd, 4, "MOVE");
+  KiiSendMessage (fd, "%d %d", x, y); 
   KiiWaitAnswer (fd, "DONE");
   return (TRUE);

branches/eam_branches/20090715/Ohana/src/opihi/cmd.data/init.c

@@ -85 +85 @@
 int rebin            PROTO((int, char **));
 int resize           PROTO((int, char **));
+int relocate         PROTO((int, char **));
 int roll             PROTO((int, char **));
 int rotate           PROTO((int, char **));
@@ -220 +221 @@
   {1, "rebin",        rebin,            "rebin image data by factor of N"},
   {1, "resize",       resize,           "set graphics/image window size"},
+  {1, "relocate",     relocate,         "set graphics/image window position"},
   {1, "roll",         roll,             "roll image to new start point"},
   {1, "rotate",       rotate,           "rotate image"},