Changeset 141 in Sophya for trunk/SophyaPI

Timestamp:

Sep 2, 1998, 6:38:21 PM (27 years ago)

Author:

ercodmgr

Message:

Dashed-line et petite corrrection ds ApplX Reza 02/09/98

Location:

trunk/SophyaPI/PI

Files:

• piapplx.cc (modified) (1 diff)
• pidrwtools.cc (modified) (3 diffs)
• pigraphgen.h (modified) (1 diff)
• pigraphx.cc (modified) (2 diffs)

trunk/SophyaPI/PI/piapplx.cc

@@ -141 +141 @@
 
 // Pour appeler FinishCreate() des objets dans la fenetre principale 
-MBCont()->FinishCreate();
+if (mStop) MBCont()->FinishCreate();   // C'est la premiere fois
+else mStop = true;   // On rerentre apres un stop 
 while (mStop)
   {

trunk/SophyaPI/PI/pidrwtools.cc

@@ -198 +198 @@
 mOpt[5]->AppendItem("Normal-Line", 602);
 mOpt[5]->AppendItem("Thick-Line", 603);
+mOpt[5]->AppendItem("ThinDashed-Line", 604);
+mOpt[5]->AppendItem("Dashed-Line", 605);
+mOpt[5]->AppendItem("ThickDashed-Line", 606);
 mOpt[5]->SetValue(600);
 mOpt[5]->SetBinding(PIBK_elastic, PIBK_elastic, PIBK_elastic, PIBK_elastic);
@@ -298 +301 @@
                      PI_TriangleMarker, PI_FTriangleMarker,
                      PI_StarMarker, PI_FStarMarker };
-PILineAtt line[4] = { PI_NotDefLineAtt, PI_ThinLine, PI_NormalLine, PI_ThickLine};
+PILineAtt line[7] = { PI_NotDefLineAtt, PI_ThinLine, PI_NormalLine, PI_ThickLine, 
+                                        PI_ThinDashedLine, PI_DashedLine, PI_ThickDashedLine};
 
 PIFontAtt fntatt[4] = { PI_NotDefFontAtt, PI_RomanFont, PI_BoldFont, PI_ItalicFont };
@@ -354 +358 @@
     drw->SetFontAtt(fntsz[kk], fntatt[kkk]);
     k =  mOpt[5]->GetValue()-600;
-    if ( (k < 0) || (k > 3) )  k = 0;
+    if ( (k < 0) || (k > 6) )  k = 0;
     drw->SetLineAtt(line[k]);
     if (msg == 2800) drw->Refresh();

trunk/SophyaPI/PI/pigraphgen.h

@@ -27 +27 @@
 
 enum PILineAtt { PI_NotDefLineAtt = -1,
-                 PI_NormalLine = 0, PI_ThinLine = 1, PI_ThickLine = 2 };
+                 PI_NormalLine = 0, PI_ThinLine = 1, PI_ThickLine = 2 ,
+                 PI_DashedLine = 128, PI_ThinDashedLine = 129, PI_ThickDashedLine = 130 };
 
 enum PIMarker  { PI_NotDefMarker = -1,

trunk/SophyaPI/PI/pigraphx.cc

@@ -395 +395 @@
 void PIGraphicX::SelLine(PILineAtt att)
 {
-unsigned int lt;
+unsigned int lt=0;
+int lstyle=LineSolid;
 
 if (att == mLAtt)  return;
@@ -403 +404 @@
   case PI_NormalLine :
     lt = 2;
+    lstyle = LineSolid;
     break;
   case PI_ThickLine :
     lt = 4;
+    lstyle = LineSolid;
     break;
   case  PI_ThinLine :
     lt = 0;
-    break;
+    lstyle = LineSolid;
+    break;
+  case PI_DashedLine :
+    lt = 2;
+    lstyle = LineOnOffDash;
+    break;
+  case PI_ThickDashedLine :
+    lt = 4;
+    lstyle = LineOnOffDash;
+    break;
+  case  PI_ThinDashedLine :
+    lt = 0;
+    lstyle = LineOnOffDash;
+    break;
+
   default:
     lt = 0;
+    lstyle=LineSolid;
     break;
   }
     
-XSetLineAttributes(XtDisplay(MyWdg()), DefGC(), lt, LineSolid, CapButt, JoinMiter);
+XSetLineAttributes(XtDisplay(MyWdg()), DefGC(), lt, lstyle, CapButt, JoinMiter);
 mLAtt = att;
 return;