Changeset 9 in Sophya for trunk/SophyaPI/PI/pidemo.cc

Timestamp:

Mar 6, 1996, 11:52:37 PM (30 years ago)

Author:

eros

Message:

Version debuggee avec SharedLibraries, et gestion correcte de fontes ds
pibwdgx.cc, Version MAc ramene de Saclay (6/3/96) - link dynamique ds
pidemo.cc (Reza)

File:

• trunk/SophyaPI/PI/pidemo.cc (modified) (8 diffs)

trunk/SophyaPI/PI/pidemo.cc

@@ -1 +1 @@
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
+#include <dlfcn.h>
 
 #include "perrors.h"
@@ -6 +8 @@
 
 #include "pidemo.h"
-#include "pidemoup.h"
-
-
-
+#include "piup.h"
+
+
+/*  Pour le link dynamique  */
+typedef FitsImageR4 * (* UsPrFunc) (FitsImageR4 * myimg, int xp, int yp,
+                                    char * arg1, char * arg2);
+static UsPrFunc  userFunc[3] = { NULL, NULL, NULL };
+static void *dlhandle = NULL;
+
+static char userlibname[256];
+
+static int DynLink(char *usln);
+
+int DynLink(char *usln)
+{
+UsPrFunc uf;
+int i, rc;
+
+if (usln != NULL)  strncpy(userlibname, usln, 255);  userlibname[255] = '\0';
+
+printf("PIDemo_DynLink(): Relinking from %s \n", userlibname);
+if (dlhandle != NULL)  dlclose(dlhandle);
+for(i=0; i<3; i++)  userFunc[i] = NULL;
+dlhandle =  dlopen(userlibname, RTLD_NOW);
+if (dlhandle == NULL)  
+  { printf("PIDemo_DynLink(), Erreur d'ouverture UserShLib %s \n", userlibname);
+  return(100); }
+rc = 0;
+printf("PIDemo_DynLink(): Searching for PIUserProc_1 (Rc=%d) \n", rc);
+uf = dlsym(dlhandle, "PIUserProc_1__FPt9FitsImage1ZfiiPcT3");
+if (uf != NULL)  userFunc[0] = uf;
+else rc += 2;
+printf("PIDemo_DynLink(): Searching for PIUserProc_3 (Rc=%d) \n", rc);
+uf = dlsym(dlhandle, "PIUserProc_2__FPt9FitsImage1ZfiiPcT3");
+if (uf != NULL)  userFunc[1] = uf;
+else rc += 4;
+printf("PIDemo_DynLink(): Searching for PIUserProc_3 (Rc=%d) \n", rc);
+uf = dlsym(dlhandle, "PIUserProc_3__FPt9FitsImage1ZfiiPcT3");
+if (uf != NULL)  userFunc[2] = uf;
+else rc += 8;
+
+if (rc != 0)  printf("PIDemo_DynLink() / Erreur, Rc = %d \n", rc);
+return(rc);
+}
 
 /* ........................................................... */
@@ -28 +70 @@
 m[0]->AppendItem("Close", 10102);
 m[0]->AppendItem("Save", 10103);
-m[0]->AppendItem("Exit", 10104);
+m[0]->AppendItem("Relink", 10104);
+m[0]->AppendItem("Exit", 10105);
 
 m[1] = new PIPDMenu((PIMsgHandler *)Menubar(),"Image");
@@ -188 +231 @@
 
     case 10104:
+      SetBusy();
+      DynLink(NULL);
+      SetReady();
+      break;
+
+    case 10105:
       Stop();
       break;
@@ -407 +456 @@
 int n;
 if ((n=GetNumCurrent()) < 0)  return;
+zoom->SetPixmap(NULL,0,0);
+zoom->EraseWindow();
+labimg->SetLabel("");
 wpii[n]->Hide();
 delete pii[n];
 delete img[n];
 delete wpii[n];
-zoom->EraseWindow();
-labimg->SetLabel("");
-pii[n] = pii[mNimg];
-wpii[n] = wpii[mNimg];
-img[n] = img[mNimg];
+pii[n] = pii[mNimg-1];
+wpii[n] = wpii[mNimg-1];
+img[n] = img[mNimg-1];
 mNimg--;
 mCur = NULL;
@@ -648 +698 @@
       {
       case 1 :
-        oimg = PIUserProc_1(mimg, xp, yp, 
+      case 2 :
+      case 3 :
+        oimg = userFunc[mUpr-1] (mimg, xp, yp, 
                             (char *) (mText[1]->GetText().c_str()), 
                             (char *) (mText[2]->GetText().c_str()));
         break;
-
+/*
       case 2 :
         oimg = PIUserProc_2(mimg, xp, yp, 
@@ -664 +716 @@
                             (char *) (mText[2]->GetText().c_str()));
         break;
-
+*/
       }    
     if (oimg)  dap->AddImage(oimg,mText[0]->GetText());
@@ -680 +732 @@
 
 char *path;
+int rc;
   
 if (narg > 1)  path = arg[1];
 else path = NULL;
 
+if (narg > 2)  rc = DynLink(arg[2]);
+else rc = DynLink("piup.so");
+if (rc != 0)
+  {
+  printf("PIApp:: Erreur d'ouverture UserProcFunc Shared-Object ... \n");
+  exit(0);
+  }
+
 PIDemoApp app(path);
 
 app.Run();
 
+dlclose(dlhandle);
 exit(0);
 }