Changeset 1640 in Sophya for trunk

Timestamp:

Aug 16, 2001, 2:16:42 PM (24 years ago)

Author:

ansari

Message:

1/ Correction gestion des attributs graphiques ds PIElDrawer::Draw()
2/ Ajout de 4 couleurs violettes (picolist.h pigraphx.cc pidrwtools.cc

et psfile.cc)

3/ Methode PIImage::BaseDrawer() alias de MyElDrawer()
4/ Gestion de copie/Coller avec plusieurs lignes ds PIConsole

Reza 16/8/2001

Location:

trunk/SophyaPI/PI

Files:

• picolist.h (modified) (1 diff)
• picons.cc (modified) (3 diffs)
• picons.h (modified) (1 diff)
• pidrawer.cc (modified) (1 diff)
• pidrwtools.cc (modified) (5 diffs)
• pigraphx.cc (modified) (2 diffs)
• piimage.h (modified) (1 diff)
• psfile.cc (modified) (2 diffs)

trunk/SophyaPI/PI/picolist.h

@@ -15 +15 @@
                  PI_Orange = 11, PI_SiennaRed = 12, PI_Purple = 13,  
                  PI_LimeGreen = 14, PI_Gold = 15,
-                 PI_ColorAllBits0 = 16, PI_ColorAllBits1 = 17 };
+                 PI_Violet = 16, PI_VioletRed = 17, 
+                 PI_BlueViolet = 18, PI_DarkViolet = 19, 
+                 PI_ColorAllBits0 = 19, PI_ColorAllBits1 = 20 };
 
 #endif

trunk/SophyaPI/PI/picons.cc

@@ -461 +461 @@
     case PIK_Return :    
     case PIK_Enter :
-      mCmdStr[mCLC] = '\0';
-//      printf("Keyb()-Debug- <CR/Enter> CmdStr= %s (L=%d)\n", mCmdStr, strlen(mCmdStr) );
-// Gestion de rappel des commandes 
-      if (mCLC > 0) {
-        mRStr[mRCindx] = mCmdStr;
-        mRCindx++;  mNComm++;
-        if (mRCindx >= NMxRecall)  mRCindx = 0;
-        mRindx = mRCindx;
-        }
-      mChangeFg = false;
-      mCmd = mCmdStr;
-      ClrCmd();
-      Send( Msg(), PIMsg_OK, NULL);
+      SendCmd();
       break;
 
@@ -583 +571 @@
 int i;
 char *pc = (char *)pdata;
-for(i=0; i<l; i++) CmdAddChar(pc[i]);
+for(i=0; i<l; i++) {
+  if ((i > 0) && (pc[i] == '\n'))  SendCmd();
+  else CmdAddChar(pc[i]);
+}
 UpdCmdLine();
 }
@@ -831 +822 @@
 
 /* --Methode-- */
+void PIConsole::SendCmd() 
+{ 
+  mCmdStr[mCLC] = '\0';
+  //      printf("Keyb()-Debug- <CR/Enter> CmdStr= %s (L=%d)\n", mCmdStr, strlen(mCmdStr) );
+  // Gestion de rappel des commandes 
+  if (mCLC > 0) {
+    mRStr[mRCindx] = mCmdStr;
+    mRCindx++;  mNComm++;
+    if (mRCindx >= NMxRecall)  mRCindx = 0;
+    mRindx = mRCindx;
+  }
+  mChangeFg = false;
+  mCmd = mCmdStr;
+  ClrCmd();
+  Send( Msg(), PIMsg_OK, NULL);
+  return;
+}
+
+/* --Methode-- */
 void PIConsole::CmdAddChar(int key)
 {

trunk/SophyaPI/PI/picons.h

@@ -71 +71 @@
           void       UpdCmdLine();
           void       ClrCmd();
+          void       SendCmd();
           void       CmdAddChar(int key);
           void       SelFgBgCol(PIColors fc=PI_Black, PIColors bc=PI_White);

trunk/SophyaPI/PI/pidrawer.cc

@@ -779 +779 @@
 SelGraAtt(g);   // DrawAxes change certains attributs graphiques
 DrawAxes(g);   // Trace des axes 
+g->SelFont(PI_NormalSizeFont, mFAtt);
 SelGraAtt(g);   // DrawAxes change certains attributs graphiques
 
-if (mFSz == PI_NotDefFontSize) g->SelFont(PI_NormalSizeFont);
 // Trace des titres 
 if ( (titleT.length() > 0) || (titleB.length() > 0) ) {

trunk/SophyaPI/PI/pidrwtools.cc

@@ -134 +134 @@
 mOpt[0]->AppendItem("LimeGreen", 115);
 mOpt[0]->AppendItem("Gold", 116);
+mOpt[0]->AppendItem("Violet", 117);
+mOpt[0]->AppendItem("VioletRed", 118);
+mOpt[0]->AppendItem("BlueViolet", 119);
+mOpt[0]->AppendItem("DarkViolet", 120);
 mOpt[0]->SetValue(100);
 mOpt[0]->SetBinding(PIBK_elastic, PIBK_elastic, PIBK_elastic, PIBK_elastic);
@@ -295 +299 @@
 
 //  Declaration des differents attributs graphiques 
-static PIColors cols[17] = { PI_NotDefColor, 
+#define MYNMXCOLORS 21
+static PIColors cols[MYNMXCOLORS] = { PI_NotDefColor, 
                      PI_Black, PI_White, PI_Grey, 
                      PI_Red, PI_Blue, PI_Green, 
@@ -301 +306 @@
                      PI_Cyan , PI_Turquoise, PI_NavyBlue, 
                      PI_Orange, PI_SiennaRed, PI_Purple, 
-                     PI_LimeGreen, PI_Gold };
+                     PI_LimeGreen, PI_Gold, PI_Violet, PI_VioletRed,
+                     PI_BlueViolet, PI_DarkViolet };
 
 static PIMarker mrk[12] = { PI_NotDefMarker, PI_DotMarker, 
@@ -360 +366 @@
 int ii,jj,kk;
 PIColors fc = dr->GetFgColAtt();
-for(kk=0; kk<17; kk++) 
+for(kk=0; kk<MYNMXCOLORS; kk++) 
   if (fc == cols[kk])  { mOpt[0]->SetValue(100+kk);  break; }    
 CMapId cmi = dr->GetColMapId();
@@ -406 +412 @@
   int k,ii,jj,kk;
   k = mOpt[0]->GetValue()-100;
-  if ( (k < 0) || (k > 16) )  k = 0;
+  if ( (k < 0) || (k >= MYNMXCOLORS) )  k = 0;
   drw->SetColAtt(cols[k]);
   k = mOpt[1]->GetValue()-200;

trunk/SophyaPI/PI/pigraphx.cc

@@ -13 +13 @@
 
 /*  Variables globales pour modifier les GC  */
-#define NMAXCOL  18
+#define NMAXCOL  24
 static  PIXColor colpix[NMAXCOL];
 
@@ -699 +699 @@
 if ( XAllocNamedColor (mdsp, cmap, "gold", &mycol, &exact) )
   colpix[PI_Gold] = mycol.pixel;
+if ( XAllocNamedColor (mdsp, cmap, "violet", &mycol, &exact) )
+  colpix[PI_Violet] = mycol.pixel;
+if ( XAllocNamedColor (mdsp, cmap, "VioletRed", &mycol, &exact) )
+  colpix[PI_VioletRed] = mycol.pixel;
+if ( XAllocNamedColor (mdsp, cmap, "BlueViolet", &mycol, &exact) )
+  colpix[PI_BlueViolet] = mycol.pixel;
+if ( XAllocNamedColor (mdsp, cmap, "DarkViolet", &mycol, &exact) )
+  colpix[PI_DarkViolet] = mycol.pixel;
 
 

trunk/SophyaPI/PI/piimage.h

@@ -81 +81 @@
 
   inline PIElDrawer* MyElDrawer() { return (mdrw); }
+  inline PIElDrawer* BaseDrawer() { return (mdrw); }
 
 // Rafraichissement des widgets auxiliaires (zoom, ...)

trunk/SophyaPI/PI/psfile.cc

@@ -54 +54 @@
   PI_Cyan, PI_Turquoise, PI_NavyBlue,\
   PI_Orange, PI_SiennaRed, PI_Purple,\
-  PI_LimeGreen, PI_Gold,\
+  PI_LimeGreen, PI_Gold, PI_Violet, PI_VioletRed, PI_BlueViolet, PI_DarkViolet, \
   \
   PI_RomanFont, PI_BoldFont, PI_ItalicFont, PI_NotDefFontAtt,\
@@ -83 +83 @@
 /C%-2d  {0.195 0.800 0.195 setrgbcolor} bind def %% PI_LimeGreen\n\
 /C%-2d  {0.996 0.840 0.0   setrgbcolor} bind def %% PI_Gold\n\
+/C%-2d  {0.933 0.510 0.933 setrgbcolor} bind def %% PI_Violet\n\
+/C%-2d  {0.816 0.125 0.565 setrgbcolor} bind def %% PI_VioletRed\n\
+/C%-2d  {0.541 0.167 0.886 setrgbcolor} bind def %% PI_BlueViolet\n\
+/C%-2d  {0.580 0.000 0.827 setrgbcolor} bind def %% PI_DarkViolet\n\
 /F%-2d  {/Courier   findfont} bind def           %% PI_RomanFont\n\
 /F%-2d  {/Courier-Bold    findfont} bind def     %% PI_BoldFont\n\