Changeset 31018

Timestamp:

Mar 23, 2011, 9:56:23 AM (15 years ago)

Author:

eugene

Message:

update visual to use pmVisualInitWindow

File:

• branches/eam_branches/ipp-20110213/psphot/src/psphotVisual.c (modified) (2 diffs)

branches/eam_branches/ipp-20110213/psphot/src/psphotVisual.c

@@ -39 +39 @@
     switch (channel) {
       case 1:
-        if (kapa1 == -1) {
-            kapa1 = KapaOpenNamedSocket ("kapa", "psphot:images");
-            if (kapa1 == -1) {
-                fprintf (stderr, "failure to open kapa; visual mode disabled\n");
-                pmVisualSetVisual(false);
-            }
-        }
-        return kapa1;
+        pmVisualInitWindow (&kapa1, "psphot:images");
+        return kapa1;
       case 2:
-        if (kapa2 == -1) {
-            kapa2 = KapaOpenNamedSocket ("kapa", "psphot:plots");
-            if (kapa2 == -1) {
-                fprintf (stderr, "failure to open kapa; visual mode disabled\n");
-                pmVisualSetVisual(false);
-            }
-        }
+        pmVisualInitWindow (&kapa2, "psphot:plots");
         return kapa2;
       case 3:
-        if (kapa3 == -1) {
-            kapa3 = KapaOpenNamedSocket ("kapa", "psphot:stamps");
-            if (kapa3 == -1) {
-                fprintf (stderr, "failure to open kapa; visual mode disabled\n");
-                pmVisualSetVisual(false);
-            }
-        }
+        pmVisualInitWindow (&kapa3, "psphot:stamps");
         return kapa3;
       default:
@@ -74 +56 @@
 
     int myKapa = psphotKapaChannel (channel);
+    if (myKapa == -1) return false;
+
     if (!(strcasecmp (overlay, "all"))) {
         KiiEraseOverlay (myKapa, "red");