Changeset 1921 in Sophya

Timestamp:

Mar 6, 2002, 5:53:29 PM (24 years ago)

Author:

perderos

Message:

1) modifs ds pidrwtools pour setter les attributs des fleches
2) modif ds pigrahuc pour les porpager

OP/RZ 06-03-22002

Location:

trunk/SophyaPI/PI

Files:

• pidrwtools.cc (modified) (7 diffs)
• pidrwtools.h (modified) (1 diff)
• pigraphuc.cc (modified) (3 diffs)
• pigraphuc.h (modified) (3 diffs)

trunk/SophyaPI/PI/pidrwtools.cc

@@ -2 +2 @@
 // Outils de manipulation des PIDrawer  R. Ansari 06/98
 // LAL (Orsay) / IN2P3-CNRS  DAPNIA/SPP (Saclay) / CEA
-
+// modifs pour 
 #include <stdlib.h>
 
@@ -103 +103 @@
 
 int wszx = 5*spx+3.5*bsx; 
-int wszy = (2+5*0.85)*bsy+(7+5*0.85)*spy;
+int wszy = (2+6*0.85)*bsy+(7+6*0.85)*spy;
 SetSize(wszx, wszy);
 
@@ -254 +254 @@
 mOpt[7]->SetBinding(PIBK_elastic, PIBK_elastic, PIBK_elastic, PIBK_elastic);
 
-int kb;
 cpx = 2*spx;
 cpy += spy+bsyo;
+// OP 03/2002
+
+mOpt[8] = new PIOptMenu(this, "bwt-opt-8", bsx*1.75, bsy, cpx, cpy);
+mOpt[8]->AppendItem("Def.ArrowMrk", 900);
+mOpt[8]->AppendItem("Basic-Arrow", 901);
+mOpt[8]->AppendItem("Triangle-Arrow", 902);
+mOpt[8]->AppendItem("FTriangle-Arrow", 903);
+mOpt[8]->AppendItem("ShapedArrow", 904);
+mOpt[8]->AppendItem("FShapedArrow", 905);
+mOpt[8]->SetValue(900);
+mOpt[8]->SetBinding(PIBK_elastic, PIBK_elastic, PIBK_elastic, PIBK_elastic);
+
+cpx += spx+1.75*bsx; 
+mOpt[9] = new PIOptMenu(this, "bwt-opt-9", bsx*1.75, bsy, cpx, cpy);
+mOpt[9]->AppendItem("Arrow-1pt  ", 951);
+mOpt[9]->AppendItem("Arrow-3pt ", 952);
+mOpt[9]->AppendItem("Arrow-5pt", 953);
+mOpt[9]->AppendItem("Arrow-7pt", 954);
+mOpt[9]->AppendItem("Arrow-9pt", 955);
+mOpt[9]->AppendItem("Arrow-11pt", 956);
+mOpt[9]->AppendItem("Arrow-13pt", 957);
+mOpt[9]->AppendItem("Arrow-15pt", 958);
+mOpt[9]->AppendItem("Arrow-17pt", 959);
+mOpt[9]->SetValue(952 );
+mOpt[9]->SetBinding(PIBK_elastic, PIBK_elastic, PIBK_elastic, PIBK_elastic);
+
+cpx = 2*spx;
+cpy += spy+bsyo;
+
+// end OP
+int kb;
 bsy = bsyo; spy = spyo;
 mButdr[0] = new PIButton(this, "-", 1501, bsy, bsy, cpx, cpy);
@@ -315 +345 @@
 for(i=0; i<6; i++) delete mButcf[i]; 
 for(i=0; i<2; i++) delete mButdr[i]; 
-for(i=0; i<8; i++)  delete mOpt[i];
+for(i=0; i<10 ; i++)  delete mOpt[i];
 for(i=0; i<2; i++)  delete mCasc[i];
 delete mNlb;
@@ -349 +379 @@
 static PIFontSize fntsz[6] = { PI_NotDefFontSize, PI_TinySizeFont, PI_SmallSizeFont, 
                                PI_NormalSizeFont, PI_LargeSizeFont, PI_HugeSizeFont };
+
+static PIArrowMarker arrmrk[6]= { PI_NotDefArrowMarker, PI_BasicArrowMarker, 
+                     PI_TriangleArrowMarker, PI_FTriangleArrowMarker,
+                     PI_ArrowShapedArrowMarker, PI_FArrowShapedArrowMarker };
+
 
 /* --Methode-- */
@@ -475 +510 @@
 for(kk=0; kk<13; kk++)
   if (lat == line[kk])   { mOpt[5]->SetValue(600+kk);  break; }
+
+PIArrowMarker arr = gratt.GetArrowMarker();
+for(kk==0 ; kk<6 ; kk++)
+  if(arr == arrmrk[kk]) {mOpt[8]->SetValue(900+kk);}
+     
+kk = gratt.GetArrowMarkerSize();
+if(kk<1) kk=1;
+if(kk>17) kk=17;
+ kk = (kk+1)/2;
+mOpt[9]->SetValue(950 + kk);
 
 return;
@@ -511 +556 @@
   if ( (k < 0) || (k > 12) )  k = 0;
   gratt.SetLineAtt(PILineAtt(line[k]));
+
+  ii=mOpt[8]->GetValue()-900;
+  jj=mOpt[9]->GetValue()-950;
+  
+  gratt.SetArrowMarkerAtt(2*jj-1,arrmrk[ii]);
+  
   drw->SetGraphicAtt(gratt);
+
   if (fgref)  mCurBW->Refresh();
   else drw->Refresh();

trunk/SophyaPI/PI/pidrwtools.h

@@ -39 +39 @@
 private:
 // Pour couleur, fontes, etc 
-  PIOptMenu* mOpt[8];
+  PIOptMenu* mOpt[10];
   PIMenu* mCasc[5];
   PILabel* mNlb;

trunk/SophyaPI/PI/pigraphuc.cc

@@ -806 +806 @@
 
 /* --Methode-- */
+void PIGraphicUC::SelArrowMarker(int arrsz, PIArrowMarker arrmrk)
+{
+  if (!mGrC) return;
+  mGrC->SelArrowMarker(arrsz, arrmrk);
+}
+
+/* --Methode-- */
 void PIGraphicUC::SelFontSz(PIGrCoord sz)
 {
@@ -837 +844 @@
 
 /* --Methode-- */
+void PIGraphicUC::SelArrowMarkerSz(PIGrCoord arrsz, PIArrowMarker arrmrk)
+{
+  if (!mGrC) return;
+  double fx, fy;
+  DUC2GrC((double)arrsz, (double)arrsz, fx, fy);
+  int asz = int(0.5*(fx+fy+1));
+  mGrC->SelArrowMarker(asz, arrmrk);
+}
+
+/* --Methode-- */
 void PIGraphicUC::SetClipRectangle(PIGrCoord x0, PIGrCoord y0, PIGrCoord dx, PIGrCoord dy)
 {
@@ -891 +908 @@
   return(mGrC->GetMarkerSize());
 }
+
+/* --Methode-- */
+PIArrowMarker PIGraphicUC::GetArrowMarker()
+{
+  if (!mGrC) return(PI_NotDefArrowMarker);
+  return(mGrC->GetArrowMarker());
+}
+
+/* --Methode-- */
+int PIGraphicUC::GetArrowMarkerSize()
+{
+  if (!mGrC) return(0);
+  return(mGrC->GetArrowMarkerSize());
+}
+
+
 /* --Methode-- */
 PIGrCoord PIGraphicUC::GetFontHeight(PIGrCoord& asc, PIGrCoord& desc)

trunk/SophyaPI/PI/pigraphuc.h

@@ -84 +84 @@
   virtual void       SelLine(PILineAtt const& att);
   virtual void       SelMarker(int msz=3, PIMarker mrk=PI_DotMarker);
+  virtual void       SelArrowMarker(int arrsz=5, 
+                                    PIArrowMarker arrmrk=PI_BasicArrowMarker);
 
 // Modification de fonte
@@ -94 +96 @@
   virtual void       SelFontSz(PIGrCoord sz, PIFontAtt att);
   virtual void       SelMarkerSz(PIGrCoord msz, PIMarker mrk=PI_DotMarker);
+  virtual void       SelArrowMarkerSz(PIGrCoord arrsz, 
+                                      PIArrowMarker arrmrk=PI_BasicArrowMarker);
 
 // Selection de zone de trace (clip)
@@ -106 +110 @@
   virtual PIMarker   GetMarker();
   virtual int        GetMarkerSize();
+  virtual PIArrowMarker    GetArrowMarker();
+  virtual int        GetArrowMarkerSize();
 
+
+  inline  PIFont     GetFont() { return (mGrC->GetFont()) ; }
   virtual PIGrCoord  GetFontHeight(PIGrCoord& asc, PIGrCoord& desc);
   virtual PIGrCoord  CalcStringWidth(char const* s);