Changeset 194 in Sophya

Timestamp:

Feb 11, 1999, 5:52:48 PM (27 years ago)

Author:

ercodmgr

Message:

Petites erreurs Reza 11/02/99

Location:

trunk/SophyaPI

Files:

• PI/Tests/pitgr.cc (modified) (1 diff)
• PI/pi3ddrw.cc (modified) (1 diff)
• PI/picmapx.cc (modified) (2 diffs)
• PIext/pistdimgapp.cc (modified) (1 diff)
• PIext/pistdimgapp.h (modified) (1 diff)
• PIext/servnobjm.cc (modified) (1 diff)

trunk/SophyaPI/PI/Tests/pitgr.cc

@@ -394 +394 @@
 PIApplicationScreenSize(sx, sy);
 printf("##### pit-main() ScreenSize= %d %d ##### \n", sx, sy);
+PIColorMap* cmap = new PIColorMap(CMAP_GREY32);
+printf("##### pit-main() NbTotColors=%d Already Allocated= %d ##### \n", 
+       cmap->TotNbColors(), cmap->NbAllocColors());
 app->Run();
 
+delete cmap;
 delete app;
 exit(0);

trunk/SophyaPI/PI/pi3ddrw.cc

@@ -141 +141 @@
 {
   if (mLAtt == PI_NotDefLineAtt)    g3->SelLine(PI_ThinLine);
+  if (mFSz == PI_NotDefFontSize)    g3->SelFontSz((YMax()-YMin())/150.);
 
   PIGrCoord x1,y1,z1,x2,y2,z2;

trunk/SophyaPI/PI/picmapx.cc

@@ -142 +142 @@
   { mColors[i] = bpix;   mColRGB[i] = blc;  mNewCol[i] = false; }
 }
-printf("PIColorMapX::FreeColors()  Type= %d mNCol= %d \n",
-       Type(), NCol());
+// printf("PIColorMapX::FreeColors()  Type= %d mNCol= %d \n",
+//        Type(), NCol());
 
 }
@@ -188 +188 @@
     { mColors[i] = ((PIColorMapX *)x)->mColors[i];
     mColRGB[i] = ((PIColorMapX *)x)->mColRGB[i]; 
-    mNewCol[i] = ((PIColorMapX *)x)->mNewCol[i]; }
+// C'est la table de couleur originale qui est responsable de liberer les couleurs - Reza 8/2/98
+    mNewCol[i] = false; }  
 }

trunk/SophyaPI/PIext/pistdimgapp.cc

@@ -319 +319 @@
 }
 
-
+/* --Methode-- */
+void PIStdImgApp::SetReady()
+{
+mCons->SetSensitive();
+gimv->SetSensitive();
+PIApplication::SetReady();
+}
+
+/* --Methode-- */
+void PIStdImgApp::SetBusy()
+{
+mCons->SetUnSensitive();
+gimv->SetUnSensitive();
+PIApplication::SetBusy();
+}
+
+/* --Methode-- */
+void PIStdImgApp::SetBlocked()
+{
+mCons->SetUnSensitive();
+gimv->SetUnSensitive();
+PIApplication::SetBlocked();
+}
 
 

trunk/SophyaPI/PIext/pistdimgapp.h

@@ -42 +42 @@
 
      virtual void   Process(PIMessage msg, PIMsgHandler* sender, void* data=NULL);
+     virtual void   SetReady();
+     virtual void   SetBusy(); 
+     virtual void   SetBlocked();
 
      int  DispImage(P2DArrayAdapter* nouv, string const & name, int opt);

trunk/SophyaPI/PIext/servnobjm.cc

@@ -370 +370 @@
 char tsep[2] = {'.', '\0'};
 size_t p = fn.find_last_of(fsep);
-size_t q = fn.find_last_of(tsep);
-if (p < 0)  p = 0;
-p++;
-if (q < p) q = fn.length();
+size_t l = fn.length();
+if (p >= l)  p = 0;
+else p++;
+size_t q = fn.find_first_of(tsep,p);
+if (q < p) q = l;
 return(fn.substr(p,q-p));
 }