Changeset 54 in Sophya

Timestamp:

Aug 13, 1997, 6:13:59 PM (28 years ago)

Author:

ansari

Message:

Petites corrections/ ameliorations Reza 13/08/97

Location:

trunk/SophyaPI/PI

Files:

• pilistgen.h (modified) (2 diffs)
• pilistx.cc (modified) (11 diffs)
• pilistx.h (modified) (3 diffs)
• piscdrawwdg.cc (modified) (1 diff)
• piscdrawwdg.h (modified) (1 diff)
• psfile.cc (modified) (2 diffs)
• psfile.h (modified) (1 diff)

trunk/SophyaPI/PI/pilistgen.h

@@ -14 +14 @@
                      ~PIListGen();
                                    
-  virtual void       AppendItem(char* item, PIMessage msg)=0;
-  virtual void       DeleteItem(char *item)=0;
+  virtual void       AppendItem(const char * item, PIMessage msg)=0;
+  virtual void       DeleteItem(const char *item)=0;
   virtual void       DeleteItem(PIMessage msg)=0;
   
@@ -24 +24 @@
   virtual string     GetSelectionStr(int num=0)=0;
 
-  virtual void       SelectItem(char *item)=0;
+  virtual void       SelectItem(const char * item)=0;
   virtual void       SelectItem(PIMessage msg)=0;
-  virtual void       ClearSelItem(char *item)=0;
+  virtual void       ClearSelItem(const char * item)=0;
   virtual void       ClearSelItem(PIMessage msg)=0;
 

trunk/SophyaPI/PI/pilistx.cc

@@ -22 +22 @@
 
 pil = (PIListX *)usd ;
-pil->ToggleSel(isel->item_position, true);
-//printf("list_action/Debug: reason=%d itemPos= %d \n", 
-//isel->reason, isel->item_position);
+//  printf("list_action/Debug: reason=%d itemPos= %d \n", 
+//          isel->reason, isel->item_position);
+pil->ToggleSel(isel->item_position-1, true);
 return;
 }
@@ -82 +82 @@
 
 /* --Methode-- */
-void PIListX::AppendItem(char* item, PIMessage msg)
+void PIListX::AppendItem(const char * item, PIMessage msg)
 {
 
@@ -114 +114 @@
 
 /* --Methode-- */
-void PIListX::DeleteItem(char *item)
+void PIListX::DeleteItem(const char * item)
 {
 int n;
@@ -155 +155 @@
 PIMessage PIListX::GetSelection(int num)
 {
+if ( (num < 0) || (num >= mNbSel) ) return(0); 
 return(ItemMsg(mSelNum[num]));
 }
@@ -161 +162 @@
 string PIListX::GetSelectionStr(int num)
 {
+if ( (num < 0) || (num >= mNbSel) ) return(""); 
 string s(ItemStr(mSelNum[num]));
 return(s);
@@ -166 +168 @@
 
 /* --Methode-- */
-void PIListX::SelectItem(char * item)
+void PIListX::SelectItem(const char * item)
 {
 int n;
 if ((n=GetNumItem(item)) < 0)  return;
-if ((!mMultSel) && (mNbSel > 0) && (mSelNum[0] != n))
-  ClrSItem(mSelNum[0], false, true);  
+if ((!mMultSel) && (mNbSel > 0))
+  if  (mSelNum[0] != n)  ClrSItem(mSelNum[0], false, true);  
 SelItem(n, false, true);
 return;
@@ -181 +183 @@
 int n;
 if ((n=GetNumItemMsg(msg)) < 0)  return;
-if ((!mMultSel) && (mNbSel > 0) && (mSelNum[0] != n))
-  ClrSItem(mSelNum[0], false, true);  
+if ((!mMultSel) && (mNbSel > 0))
+  if  (mSelNum[0] != n)  ClrSItem(mSelNum[0], false, true);  
 SelItem(n, false, true);
 return;
@@ -189 +191 @@
 
 /* --Methode-- */
-void PIListX::ClearSelItem(char * item)
+void PIListX::ClearSelItem(const char * item)
 {
 int n;
@@ -231 +233 @@
 {
 Arg  warg[2];
-XmString *xmst;
+XmString *xmst=NULL;
 
 if ( (n < 0) || (n >= mNItem))  { mSItem[0] = '\0'; return(mSItem); }
-
+mSItem[0] = '\0';
 XtSetArg(warg[0], XmNitems, &xmst);  
 XtGetValues(mlist, warg, 1);
@@ -242 +244 @@
 
 /* --Methode-- */
-int PIListX::GetNumItem(char *it)
+int PIListX::GetNumItem(const char *it)
 {
 for(int i=0; i<mNItem; i++)
@@ -343 +345 @@
   XmListDeselectPos(mlist, n+1);
 
-delete[] mSelNum;
+if (mSelNum) delete[] mSelNum;
 if (mNbSel <= 0)
   { mNSelMax = mNbSel = 0;  mSelNum = NULL; }

trunk/SophyaPI/PI/pilistx.h

@@ -10 +10 @@
                      ~PIListX();
                                    
-  virtual void       AppendItem(char* item, PIMessage msg);
-  virtual void       DeleteItem(char *item);
+  virtual void       AppendItem(const char * item, PIMessage msg);
+  virtual void       DeleteItem(const char *item);
   virtual void       DeleteItem(PIMessage msg);
 
@@ -20 +20 @@
   virtual string     GetSelectionStr(int num=0);
 
-  virtual void       SelectItem(char * item);
+  virtual void       SelectItem(const char * item);
   virtual void       SelectItem(PIMessage msg);
-  virtual void       ClearSelItem(char * item);
+  virtual void       ClearSelItem(const char * item);
   virtual void       ClearSelItem(PIMessage msg);
 
@@ -31 +31 @@
   PIMessage          ItemMsg(int n);
   char *             ItemStr(int n);
-  int                GetNumItem(char *nom);
+  int                GetNumItem(const char * nom);
   int                GetNumItemMsg(PIMessage msg);
   void               DelItem(int n);

trunk/SophyaPI/PI/piscdrawwdg.cc

@@ -134 +134 @@
   vector<PIScDrawer*>::iterator drw;
   for(drw = mScDrawers.begin(); drw != mScDrawers.end(); drw++) {
+    SaveGraphicAtt();
     (*drw)->SelGraAtt();
     (*drw)->Draw(xmin, ymin, xmax, ymax);
+    RestoreGraphicAtt();
   }
 }

trunk/SophyaPI/PI/piscdrawwdg.h

@@ -16 +16 @@
 class PIScDrawWdg : public PIBaseWdg {
 public:
+  enum {ClassId = 5300};
+
                      PIScDrawWdg(PIContainerGen *par, char *nom,
                                    int sx=10, int sy=10, int px=0, int py=0);
-  virtual           ~PIScDrawWdg();
+  virtual            ~PIScDrawWdg();
+
+  virtual long       kind() {return ClassId; }
 
   virtual void       Resize();

trunk/SophyaPI/PI/psfile.cc

@@ -256 +256 @@
  *
  */
-PSFile::PSFile(char * FileName, float sc) 
+PSFile::PSFile(const char * FileName, float sc) 
     : mPSFileName(FileName==NULL? "unnamed.eps" : FileName),
       Tw (-1.), Th(-1.),         /* Non specifies pour du eps  */
@@ -313 +313 @@
  *
  */
-PSFile::PSFile(char *FileName,
+PSFile::PSFile(const char *FileName,
                PIOrientation orientation,
                PIPaperSize   paperSize,

trunk/SophyaPI/PI/psfile.h

@@ -69 +69 @@
 public:
     /* Production fichier eps */
-    PSFile (char * FileName, float sc = 1.0);
+    PSFile (const char * FileName, float sc = 1.0);
     /* Production fichier ps  */
-    PSFile (char * FileName, PIOrientation orientation, 
+    PSFile (const char * FileName, PIOrientation orientation, 
             PIPaperSize paperSize= PI_A4, 
             float marginX = 1.0, float marginY = 1.0 ) ;