Changeset 114 in Sophya

Timestamp:

Jul 3, 1998, 12:02:54 PM (27 years ago)

Author:

ansari

Message:

Meilleure gestion des tailles de fontes X Reza 03/07/98

Location:

trunk/SophyaPI/PI

Files:

• Makefile (modified) (2 diffs)
• parradapter.cc (modified) (1 diff)
• piapplx.cc (modified) (4 diffs)
• pigraphx.cc (modified) (3 diffs)
• piimgtools.cc (modified) (1 diff)
• pioptmenux.cc (modified) (1 diff)
• piperiodx.cc (modified) (2 diffs)
• piwdgx.cc (modified) (2 diffs)
• piwdgx.h (modified) (1 diff)
• piwindowx.cc (modified) (1 diff)

trunk/SophyaPI/PI/Makefile

@@ -18 +18 @@
  
 $(OBJ)lut.o: lut.cc $(EROSDEVREP)/Include/defs.h lut.h
-$(OBJ)parradapter.o: parradapter.cc $(EROSDEVREP)/Include/ctimer.h \
- $(EROSDEVREP)/Include/peida.h $(EROSDEVREP)/Include/defs.h \
- $(EROSDEVREP)/Include/utils.h $(EROSDEVREP)/Include/machine.h \
- $(EROSDEVREP)/Include/perrors.h \
- $(EROSDEVREP)/Include/exceptions.h \
- $(EROSDEVREP)/Include/peidainit.h $(EROSDEVREP)/Include/fmath.h \
- parradapter.h lut.h
+$(OBJ)parradapter.o: parradapter.cc parradapter.h \
+ $(EROSDEVREP)/Include/defs.h $(EROSDEVREP)/Include/machine.h \
+ lut.h
 $(OBJ)pi3ddrw.o: pi3ddrw.cc pi3ddrw.h pisysdep.h pidrawer.h pibwdggen.h \
  piwdgx.h piwdggen.h pimsghandler.h picmap.h picmapx.h picmapgen.h \
@@ -241 +237 @@
  $(EROSDEVREP)/Include/pixelmap.h \
  $(EROSDEVREP)/Include/transfo.h $(EROSDEVREP)/Include/poly.h \
- $(EROSDEVREP)/Include/zfidu.h pidrawer.h pibwdggen.h pisysdep.h \
- piwdgx.h piwdggen.h pimsghandler.h picmap.h picmapx.h picmapgen.h \
- pigraphx.h pigraphgen.h pigraphuc.h psfile.h
+ $(EROSDEVREP)/Include/zfidu.h $(EROSDEVREP)/Include/imgalig.h \
+ $(EROSDEVREP)/Include/fitsimage.h \
+ $(EROSDEVREP)/Include/fitsheader.h \
+ $(EROSDEVREP)/Include/erosio.h $(EROSDEVREP)/Include/fitskeys.h \
+ $(EROSDEVREP)/Include/erostape.h \
+ $(EROSDEVREP)/Include/strutil.h \
+ $(EROSDEVREP)/Include/ptrarray.h \
+ $(EROSDEVREP)/Include/voidptrarray.h \
+ $(EROSDEVREP)/Include/basearray.h $(EROSDEVREP)/Include/array.h \
+ $(EROSDEVREP)/Include/lockfile.h \
+ $(EROSDEVREP)/Include/erostarfile.h \
+ $(EROSDEVREP)/Include/xstrstream.h \
+ $(EROSDEVREP)/Include/dates.h $(EROSDEVREP)/Include/tarlib.h \
+ pidrawer.h pibwdggen.h pisysdep.h piwdgx.h piwdggen.h pimsghandler.h \
+ picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h pigraphuc.h \
+ psfile.h
 $(OBJ)pisurfdr.o: pisurfdr.cc pisurfdr.h parradapter.h \
  $(EROSDEVREP)/Include/defs.h $(EROSDEVREP)/Include/machine.h \

trunk/SophyaPI/PI/parradapter.cc

@@ -6 +6 @@
 #include <math.h>
 
-#include "ctimer.h"
+// #include "ctimer.h"   Pour mesure TCPU 
 #include "parradapter.h"
 

trunk/SophyaPI/PI/piapplx.cc

@@ -101 +101 @@
 topwdg->SetSize(MBCont()->XSize(), MBCont()->YSize());
 
-int szx, szy;
-XtAppContext * appctx = PIXtAppCtx(szx, szy);
+int szx, szy, szf;
+XtAppContext * appctx = PIXtAppCtx(szx, szy, szf);
 
 // Pour appeler FinishCreate() des objets dans la fenetre principale 
@@ -163 +163 @@
 void PIApplicationX::PrefCompSz(int& szx, int& szy)
 {
-PIXtAppCtx(szx, szy);
+int szf;
+PIXtAppCtx(szx, szy, szf);
 return;
 }
@@ -214 +215 @@
 setlinebuf(stdout);
 
-int szx, szy;
-XtAppContext * appctx = PIXtAppCtx(szx, szy);
+int szx, szy, szf;
+XtAppContext * appctx = PIXtAppCtx(szx, szy, szf);
 XtAppAddInput(*appctx, p[0], (XtPointer) XtInputReadMask, redirectstream_callback, (XtPointer) streamno);
 }
@@ -236 +237 @@
 setlinebuf(stderr);
 
-int szx, szy;
-XtAppContext * appctx = PIXtAppCtx(szx, szy);
+int szx, szy, szf;
+XtAppContext * appctx = PIXtAppCtx(szx, szy, szf);
 XtAppAddInput(*appctx, p[0], (XtPointer) XtInputReadMask, redirectstream_callback, (XtPointer) (streamno+1));
 }

trunk/SophyaPI/PI/pigraphx.cc

@@ -15 +15 @@
 static XFontStruct * fntst[NMAXFONTSZ][3];
 static int fntsz[NMAXFONTSZ] = {8,10,12,14,16,20,24};
+static int SmallFontIndex = 1; 
+static int NormalFontIndex = 3;
+static int BigFontIndex = 5;
 static  PIFontAtt fntatt[3] = { PI_RomanFont, PI_BoldFont, PI_ItalicFont }; 
 #define NMAXCOL  10
@@ -366 +369 @@
   {
   case PI_SmallSizeFont:
-    i = 1;
+    i = SmallFontIndex;
     break;
   case PI_NormalSizeFont:
-    i = 3;
+    i = NormalFontIndex;
     break;
   case PI_BigSizeFont:
-    i = 5;
+    i = BigFontIndex;
     break;
   default:
-    i=2;
+    i = NormalFontIndex;
     break;
   }
@@ -642 +645 @@
   for (j=0; j<3; j++)  fntst[i][j] = NULL;
 
- 
+// Choix des trois tailles de fontes standard en fonction de 
+// la taille de fonte par defaut des composantes standard
+int szx, szy, szf;
+PIXtAppCtx(szx, szy, szf);
+int kkk, kkj, kksel, kkdsz = 9999;  
+kksel = NMAXFONTSZ/2;
+for(kkk=NMAXFONTSZ-1; kkk>=0; kkk--) {
+  kkj = szf - fntsz[kkk];   if (kkj < 0)  kkj = -kkj;
+  if (kkj < kkdsz)  {  kksel = kkk;  kkdsz = kkj; }
+  }
+NormalFontIndex = kksel;
+SmallFontIndex = (kksel > 1) ? kksel-2 : 0 ;
+BigFontIndex = (kksel < NMAXFONTSZ-2) ? kksel+2 : NMAXFONTSZ-1 ;
+
+printf("PIGraphicX::Init()-DBG- FontIndex= %d %d %d (%d) \n", 
+       SmallFontIndex, NormalFontIndex, BigFontIndex, szf);
+
 /*  Les couleurs  */
 cmap = XDefaultColormap (mdsp, scr);

trunk/SophyaPI/PI/piimgtools.cc

@@ -15 +15 @@
 /* --Methode-- */
 PIImgLutWind::PIImgLutWind(PIApplication* par)
-: PIWindow((PIMsgHandler*)par, "PIImg-ChangeLut", PIWK_dialog, 240, 240, 150, 150)
-{
-
+: PIWindow((PIMsgHandler*)par, "PIImageTools", PIWK_dialog, 240, 240, 150, 150)
+{
+int bsx, bsy;
+
+// On definit la taille a partir de la taille par defaut des composantes 
+// PIApplicationPrefCompSize(bsx, bsy);
+par->PrefCompSz(bsx, bsy);
 mLab[0] = new PILabel(this, "MinPixel", 60, 35, 30, 20); 
 mLab[1] = new PILabel(this, "MaxPixel", 60, 35, 30, 65); 

trunk/SophyaPI/PI/pioptmenux.cc

@@ -73 +73 @@
 void PIOptMenuX::FinishCreate()
 {
-printf("PIOptMenuX::FinishCreate()/DBG  %s \n", Nom().c_str());
+// printf("PIOptMenuX::FinishCreate()/DBG  %s \n", Nom().c_str());
 if (mSmsg == 0)  SetValue(mMen->ItemMsg(0)); 
 }

trunk/SophyaPI/PI/piperiodx.cc

@@ -9 +9 @@
 pip = (PIPeriodX *)usd;
 pip->DoPeriodic();
-int szx, szy;
-XtAppContext * appctx = PIXtAppCtx(szx, szy);
+int szx, szy, szf;
+XtAppContext * appctx = PIXtAppCtx(szx, szy, szf);
 id = XtAppAddTimeOut(*appctx, pip->Interval()*1000, xttimer_action, pip);
 pip->SetTimerId(id);
@@ -35 +35 @@
 if (dt > 0)  mDt = dt;
 
-int szx,szy;
-XtAppContext * appctx = PIXtAppCtx(szx, szy);
+int szx,szy,szf;
+XtAppContext * appctx = PIXtAppCtx(szx, szy, szf);
 mTId = XtAppAddTimeOut(*appctx, mDt*1000, xttimer_action, this);
 mFgact = true;

trunk/SophyaPI/PI/piwdgx.cc

@@ -27 +27 @@
 static int appSzX = 10;
 static int appSzY = 10;
+static int appSzFont = 10;
 static XFontStruct * stdfnt = NULL;
 
 /* Nouvelle-Fonction */
-XtAppContext* PIXtAppCtx(int& szx, int& szy)
+XtAppContext* PIXtAppCtx(int& szx, int& szy, int& szf)
 {
 szx = appSzX;  szy = appSzY;
+szf = appSzFont;
 return(&appctx);
 }
@@ -561 +563 @@
 appSzY = (float)(fa+fd)*1.4+10;  // pour les shadow
 appSzX = (float)len*1.5;
+appSzFont = fa+fd;
 // Taille multiple de 5 pixels 
 if ( (appSzX % 5) != 0 )   appSzX = 5*(appSzX/5 + 1);

trunk/SophyaPI/PI/piwdgx.h

@@ -85 +85 @@
 // Utile pour avoir acces au Display et Screen X ...
 SysDWdg   PIXtTopWdg();
-XtAppContext* PIXtAppCtx(int& szx, int& szy);
+XtAppContext* PIXtAppCtx(int& szx, int& szy, int& szf);
 Display * PIXDisplay();
 #define  PIXScreen()  DefaultScreen(PIXDisplay()) 

trunk/SophyaPI/PI/piwindowx.cc

@@ -79 +79 @@
     { 
     XtActionsRec desact = {"CloseWindow" ,CloseWindow};
-    int szx, szy;
-    XtAppContext * appctx = PIXtAppCtx(szx, szy);
+    int szx, szy, szf;
+    XtAppContext * appctx = PIXtAppCtx(szx, szy, szf);
     XtAppAddActions(*appctx, &desact, 1);  fgactl = 1; 
     }