Changeset 2426 in Sophya for trunk/SophyaPI/PI/pigraphgen.cc

Timestamp:

Sep 5, 2003, 5:32:47 PM (22 years ago)

Author:

ansari

Message:

1/ Ajouter caractere d'echappement \ pour les parentheses dans les
chaines de caracteres postscript (fichier psfile.cc)
2/ Ajout variable d'environnement PIXKBMODMASK pour choix touche Alt1
et/ou Alt2 (fichier pixtbase.cc)
3) Correction/implementation trace CompString en vertical (pigraphgen.cc)

Reza - 5 Septembre 2003

File:

• trunk/SophyaPI/PI/pigraphgen.cc (modified) (3 diffs)

trunk/SophyaPI/PI/pigraphgen.cc

@@ -163 +163 @@
 //--
 
+inline void compstring_swapcoord( unsigned long txtdir, PIGrCoord& x, PIGrCoord& y)
+{
+  if (txtdir != PI_TextDirectionHorizontal) {
+    PIGrCoord tmp = x;
+    x = y; y = tmp;
+  }
+  return;
+}
+
+inline void compstring_chksgn_dyud( unsigned long txtdir, int & dyu, int & dyd)
+{
+  if (txtdir == PI_TextDirectionVerticalDown) {
+    dyu = -dyu;
+    dyd = -dyd;
+  }
+}
+inline void compstring_chksgn_dx( unsigned long txtdir, int & dx)
+{
+  if (txtdir == PI_TextDirectionVerticalUp)  dx = -dx;
+}
+
 /* --Methode-- */
 void 
@@ -188 +209 @@
   if (s_dn != NULL) sw_sdn = fnt_ss.GetStringWidth(s_dn);
 
-  PIGrCoord xs,ys; 
+  PIGrCoord xs,ys,xss,yss; 
   int posh = pos & PI_HorizontalPosition;
   int posv = pos & PI_VerticalPosition;
+  unsigned long txtdir = pos&PI_TextDirection;
 
   int dyu, dyd;
@@ -209 +231 @@
   int deltaposx = ((fh/8) > 0) ? fh/8 : 1;
 
+  // Pour gerer les traces de texte verticaux 
+  compstring_swapcoord(txtdir, x, y);
+  compstring_chksgn_dyud( txtdir, dyu, dyd);
+  compstring_chksgn_dx( txtdir, deltaposx); 
+  compstring_chksgn_dx( txtdir, sw_s); 
+  compstring_chksgn_dx( txtdir, sw_sup); 
+  compstring_chksgn_dx( txtdir, sw_sdn); 
 
   if ((pos == 0) || ((posh == PI_HorizontalLeft) && (posv == PI_VerticalBaseLine))) {
     xs = (int)x+sw_s;
-    if (s != NULL)  DrawString(xs, y, s, PI_HorizontalRight);
+    ys = y;
+    compstring_swapcoord(txtdir, xs, ys);    
+    if (s != NULL)  DrawString(xs, ys, s, txtdir | PI_HorizontalRight);
     xs = (int)x+sw_s+deltaposx;
     ys = (int)y+dyu;
     SelFont(fnt_ss);
-    if (s_up != NULL) DrawString(xs, ys, s_up, PI_HorizontalLeft);
+    compstring_swapcoord(txtdir, xs, ys);    
+    if (s_up != NULL) DrawString(xs, ys, s_up, txtdir | PI_HorizontalLeft);
+    xs = (int)x+sw_s+deltaposx;
     ys = (int)y+dyd;
-    if (s_dn != NULL) DrawString(xs, ys, s_dn, PI_HorizontalLeft);
+    compstring_swapcoord(txtdir, xs, ys);    
+    if (s_dn != NULL) DrawString(xs, ys, s_dn, txtdir | PI_HorizontalLeft);
   }
   else {
     if (posh == PI_HorizontalRight) {
       int sw_ss_max = ( sw_sup > sw_sdn ) ? sw_sup : sw_sdn;
-      xs = (int)x-sw_ss_max-deltaposx;
-      if (s != NULL)  DrawString(xs, y, s, PI_HorizontalRight | posv);
+      xss = xs = (int)x-sw_ss_max-deltaposx;
+      ys = y;
+      compstring_swapcoord(txtdir, xs, ys);    
+      if (s != NULL)  DrawString(xs, ys, s, txtdir | PI_HorizontalRight | posv);
       SelFont(fnt_ss);
-      xs = (int)xs+deltaposx;
+      xs = (int)xss+deltaposx;
       ys = (int)y+dyu;
-      if (s_up != NULL) DrawString(xs, ys, s_up, PI_HorizontalLeft);
+      compstring_swapcoord(txtdir, xs, ys);    
+      if (s_up != NULL) DrawString(xs, ys, s_up, txtdir | PI_HorizontalLeft);
+      xs = (int)xss+deltaposx;
       ys = (int)y+dyd;
-      if (s_dn != NULL) DrawString(xs, ys, s_dn, PI_HorizontalLeft);      
+      compstring_swapcoord(txtdir, xs, ys);    
+      if (s_dn != NULL) DrawString(xs, ys, s_dn, txtdir | PI_HorizontalLeft);      
     }
     else if (posh == PI_HorizontalCenter) {
       int sw_tot = sw_sup+sw_sdn+sw_s+deltaposx;
-      xs = (int)x-sw_tot/2+sw_s; 
-      if (s != NULL)  DrawString(xs, y, s, PI_HorizontalRight | posv);
+      xss = xs = (int)x-sw_tot/2+sw_s; 
+      ys = y;
+      compstring_swapcoord(txtdir, xs, ys);    
+      if (s != NULL)  DrawString(xs, ys, s, txtdir | PI_HorizontalRight | posv);
       SelFont(fnt_ss);
-      xs = (int)xs+deltaposx;
+      xs = (int)xss+deltaposx;
       ys = (int)y+dyu;
-      if (s_up != NULL) DrawString(xs, ys, s_up, PI_HorizontalLeft);
+      compstring_swapcoord(txtdir, xs, ys);    
+      if (s_up != NULL) DrawString(xs, ys, s_up, txtdir | PI_HorizontalLeft);
+      xs = (int)xss+deltaposx;
       ys = (int)y+dyd;
-      if (s_dn != NULL) DrawString(xs, ys, s_dn, PI_HorizontalLeft);            
+      compstring_swapcoord(txtdir, xs, ys);    
+      if (s_dn != NULL) DrawString(xs, ys, s_dn, txtdir | PI_HorizontalLeft);            
     }
     else {
       xs = (int)x+sw_s;
-      if (s != NULL)  DrawString(xs, y, s, PI_HorizontalRight | posv);
+      ys = y;
+      compstring_swapcoord(txtdir, xs, ys);    
+      if (s != NULL)  DrawString(xs, ys, s, txtdir | PI_HorizontalRight | posv);
       SelFont(fnt_ss);
       xs = (int)x+sw_s+deltaposx;
       ys = (int)y+dyu;
-      if (s_up != NULL) DrawString(xs, ys, s_up, PI_HorizontalLeft);
+      compstring_swapcoord(txtdir, xs, ys);    
+      if (s_up != NULL) DrawString(xs, ys, s_up, txtdir | PI_HorizontalLeft);
+      xs = (int)x+sw_s+deltaposx;
       ys = (int)y+dyd;
-      if (s_dn != NULL) DrawString(xs, ys, s_dn, PI_HorizontalLeft);
+      compstring_swapcoord(txtdir, xs, ys);    
+      if (s_dn != NULL) DrawString(xs, ys, s_dn, txtdir | PI_HorizontalLeft);
     }
   }