Changeset 2780 in Sophya for trunk

Timestamp:

May 30, 2005, 9:41:30 AM (20 years ago)

Author:

ansari

Message:

1/ Suite corrections liees a l'appel de FinishCreate() (la bonne methode et au bon moment) dans les PIContainer (picontainergen/xx.cc)
2/ Corrections diverses liees au trace des axes / titre (piaxes.h pieldrw.cc)
3/ Ajout possibilite de faire Refresh() du widget a partir du drawer et bouton Refresh ds PIDrwOptionStringWindow - (pidrawer.h .cc pidrwtools.h .cc)
4/ Petites corrections de gestions des attributs graphiques (pigratt.cc piyfxdrw.cc ...)
5/ Amelioration/corrections PIBarGraph et PITextDrawer

Reza 30 Mai 2005

Location:

trunk/SophyaPI/PI

Files:

• piaxes.h (modified) (1 diff)
• pibargraph.cc (modified) (1 diff)
• pibwdggen.cc (modified) (2 diffs)
• picontainergen.cc (modified) (1 diff)
• picontainerx.cc (modified) (2 diffs)
• pidrawer.cc (modified) (2 diffs)
• pidrawer.h (modified) (1 diff)
• pidrwtools.cc (modified) (5 diffs)
• pidrwtools.h (modified) (1 diff)
• pieldrw.cc (modified) (1 diff)
• pigratt.cc (modified) (1 diff)
• pitxtdrw.cc (modified) (4 diffs)
• piyfxdrw.cc (modified) (2 diffs)

trunk/SophyaPI/PI/piaxes.h

@@ -19 +19 @@
   kIntTicks    = 0x0010,
   kExtTicks    = 0x0020,
-  kMajTicks    = 0x0030,
-  kMinTicks    = 0x0040,
+  kMajTicks    = 0x0040,
+  kMinTicks    = 0x0080,
 
   kLabelsH     = 0x1000,

trunk/SophyaPI/PI/pibargraph.cc

@@ -44 +44 @@
   fgValLabel = false;
   packFrac = 0.5;
+  GetGraphicAtt().SetColAtt(PI_Black, PI_White);
+  GetGraphicAtt().SetFontAtt(PI_DefaultFont, PI_NormalSizeFont, PI_RomanFont);
+  GetGraphicAtt().SetLineAtt(PI_NormalLine);
   SetName("BarGraph");
 } 

trunk/SophyaPI/PI/pibwdggen.cc

@@ -743 +743 @@
 
 PIGraphic* g = WindowGraphic();
+g->SaveGraphicAtt();
 
 if (mDrElastic) { 
@@ -789 +790 @@
     break;
   }
+g->RestoreGraphicAtt();
 return;
 }

trunk/SophyaPI/PI/picontainergen.cc

@@ -202 +202 @@
 if (stfcr)  return;
 PIWdg::FinishCreate();    
+if (!stvis) return;
 for(int k=0; k<NbChilds(); k++)  GetChild(k)->FinishCreate();
 stfcr = true;

trunk/SophyaPI/PI/picontainerx.cc

@@ -33 +33 @@
 // Pour gerer le probleme de l'appel a FinishCreate() 
 // lorsque celui du parent est deja appele
-if (finishDone)  FinishCreate(); 
+//--- les container sont cree dans l'etat inactif/invisible - FinishCreate() est 
+// donc desormais appele par PIContainerGen::Show() --- Mai 2005 ----
+//--- plus appele ici  if (finishDone)  FinishCreate(); ----
 }
 
@@ -55 +57 @@
 // *************** Reza - Fev 2005 ***************
 // Probleme lie a la table des fonctions virtuelles - voir ci-dessus
-if (finishDone)  FinishCreate();
+//--- les container sont cree dans l'etat inactif/invisible - FinishCreate() est 
+// donc desormais appele par PIContainerGen::Show() --- Mai 2005 ----
+//--- plus appele ici  if (finishDone)  FinishCreate(); ----
 }
 

trunk/SophyaPI/PI/pidrawer.cc

@@ -214 +214 @@
 //      définie par "xmin-xmax" , "ymin-ymax" dans le système de coordonnées du
 //      PIDrawer.
-//  void  Refresh()
-//      Rafraîchit le dessin du PIDrawer sur tous les PIBaseWdg auxquel il est attaché.
+//  void  Refresh(bool refwdg=false)
+//      "refwdg==false": Rafraîchit le dessin du PIDrawer sur tous les PIBaseWdg auxquel il est attaché.
+//      "refwdg==true": Appelle *Refresh()* sur tous les PIBaseWdg auxquel il est attaché.
 //  void  HighLight(bool fgh)
 //      Rafraichit le dessin du PIDrawer sur tous les PIBaseWdg auxquel il est attaché,
@@ -229 +230 @@
 
 void
-PIDrawer::Refresh()
+PIDrawer::Refresh(bool refwdg)
 {
   list<DrwBWId>::iterator it;
-  for(it = mBWdgList.begin(); it != mBWdgList.end(); it++)
-         (*it).wdg->CallDrawer((*it).id);
+  if (refwdg) {
+    for(it = mBWdgList.begin(); it != mBWdgList.end(); it++)
+      (*it).wdg->Refresh();
+  }
+  else {
+    for(it = mBWdgList.begin(); it != mBWdgList.end(); it++)
+      (*it).wdg->CallDrawer((*it).id);
+  }
 
 }

trunk/SophyaPI/PI/pidrawer.h

@@ -47 +47 @@
   virtual double     GetDistanceToPoint(double x, double y);
 
-  virtual void       Refresh();      // Recalcule les limites et reaffiche
+  virtual void       Refresh(bool refwdg=false);      // Recalcule les limites et reaffiche
   virtual void       UpdateLimits();   // Calcule et change les limites  
 

trunk/SophyaPI/PI/pidrwtools.cc

@@ -755 +755 @@
   PIApplicationPrefCompSize(bsx, bsy);
   spx = bsx/8;   spy = bsy/6;
-  tsx = 6*bsx+2*spx;  tsy = 6*bsy+4*spy;
+  tsx = 7.5*bsx+2*spx;  tsy = 6*bsy+4*spy;
   SetSize(tsx,tsy);
   int cpx = spx;
   int cpy = spy;
-  mTxt[0] = new PIText(this, "drwoshelp", true, true, bsx*6.0, 4*bsy, cpx, cpy);  
+  mTxt[0] = new PIText(this, "drwoshelp", true, true, bsx*7.5, 4*bsy, cpx, cpy);  
   mTxt[0]->SetTextEditable(false);
   mTxt[0]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
   mTxt[0]->SetText("");
   cpy += 4*bsy+spy;
-  mTxt[1] = new PIText(this, "drwosset", bsx*6.0, bsy, cpx, cpy);  
+  mTxt[1] = new PIText(this, "drwosset", bsx*7.5, bsy, cpx, cpy);  
   mTxt[1]->SetTextEditable(true);
   mTxt[1]->SetMsg(5555);
@@ -770 +770 @@
   mTxt[1]->SetText("");
   cpy += bsy+spy;
-  mLab = new PILabel(this, "drwntyp", bsx*2.2, bsy, cpx, cpy);
+  int lsx = tsx-4.8*bsx-6*spx;
+  mLab = new PILabel(this, "drwntyp", lsx, bsy, cpx, cpy);
   mLab->SetBorderWidth(1);
   mLab->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
   mLab->SetLabel("");
-  cpx += 2.3*bsx;
+  cpx += lsx+spx;
   mBut[0] = new PIButton(this, "SetOption", 555, bsx*1.2, bsy, cpx, cpy);
   mBut[0]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
-  cpx += 1.25*bsx;
+  cpx += (1.2*bsx+spx);
   mBut[1] = new PIButton(this, "GetOption", 666, bsx*1.2, bsy, cpx, cpy);
   mBut[1]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
-  cpx += 1.25*bsx;
-  mBut[2] = new PIButton(this, "Dimiss", 777, bsx*1.2, bsy, cpx, cpy);
+  cpx += (1.2*bsx+spx);
+  mBut[2] = new PIButton(this, "Refresh", 500, bsx*1.2, bsy, cpx, cpy);
   mBut[2]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
+  cpx += (1.2*bsx+spx);
+  mBut[3] = new PIButton(this, "Dimiss", 777, bsx*1.2, bsy, cpx, cpy);
+  mBut[3]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
 }
 
@@ -794 +798 @@
   delete mBut[1];
   delete mBut[2];
+  delete mBut[3];
 }
 /* --Methode-- */
@@ -824 +829 @@
     break;
   case 555:
+  case 500:
   case 5555:
     if (mDrw) {
@@ -843 +849 @@
       //        cout << " DBG-C[" << kk << "] " << vops[kk] << endl; 
       mDrw->DecodeOptionString(vops, false);
-      ops = "<< " + ops + " >> Decoded";
+      //      ops = "<< " + ops + " >> Decoded";
+      ops = "";
       mTxt[1]->SetText(ops);
-      mDrw->Refresh();
+      if (msg == 500) mDrw->Refresh(true);
+      else mDrw->Refresh(false);
     }
     break;

trunk/SophyaPI/PI/pidrwtools.h

@@ -77 +77 @@
   PIText* mTxt[2]; 
   PILabel* mLab;
-  PIButton* mBut[3];
+  PIButton* mBut[4];
   PIDrawer* mDrw;
 };

trunk/SophyaPI/PI/pieldrw.cc

@@ -682 +682 @@
                    
 //  fh = g->GetFontHeightUC(gas, gds);
-  fh = 0.075*(YMax()-YMin());
   if ( titleT.length() > 0) {
+    fh = 0.04*(YMax()-YMin());
     if (g->isAxeYDirUpDown()) fy = g->DeltaUCY(YMin(), -fh);
     else fy = g->DeltaUCY(YMax(), fh);
-    g->DrawString(fx, fy, titleT.c_str(), PI_HorizontalCenter | PI_VerticalCenter);
+    g->DrawString(fx, fy, titleT.c_str(), PI_HorizontalCenter | PI_VerticalBottom);
     //      printf(" PIElDrawer::Draw()/DBG (%g , %g) %s  - %g \n", fx, fy, titleT.c_str(), fh);
   }
   if ( titleB.length() > 0) {
-    fx = g->CalcStringWidth(titleB.c_str());
-    if(aXdir) fx = g->DeltaUCX(XMax(), -(XMax()-XMin()-fx)/2.);
-    else fx = g->DeltaUCX(XMin(), (XMax()-XMin()-fx)/2.);
-    if (g->isAxeYDirUpDown()) fy =  g->DeltaUCY(YMax(), fh*1.5);
-    else fy = g->DeltaUCY(YMin(), -fh*1.5);
-    g->DrawString(fx, fy, titleB.c_str(), PI_HorizontalCenter | PI_VerticalCenter);
+    fh = 0.075*(YMax()-YMin());
+    if (g->isAxeYDirUpDown()) fy =  g->DeltaUCY(YMax(), fh);
+    else fy = g->DeltaUCY(YMin(), -fh);
+    g->DrawString(fx, fy, titleB.c_str(), PI_HorizontalCenter | PI_VerticalTop);
     //      printf(" PIElDrawer::Draw()/DBG (%g , %g) %s  - %g \n", fx, fy, titleT.c_str(), fh);
   }

trunk/SophyaPI/PI/pigratt.cc

@@ -662 +662 @@
   // A FAIRE - Reza->CMV  Mars 2004
   // On ne vide pas (ne met pas a zero) att, mais on ajoute derriere.
-  att.push_back("A FAIRE - Reza->CMV  Mars 2004");
+  att.push_back("??GraphicAtt??");
   return 1;
 }

trunk/SophyaPI/PI/pitxtdrw.cc

@@ -40 +40 @@
 {
   fgFrame = fgframe;
+  GetGraphicAtt().SetColAtt(PI_Black, PI_White);
+  GetGraphicAtt().SetFontAtt(PI_DefaultFont, PI_NormalSizeFont, PI_RomanFont);
+  GetGraphicAtt().SetLineAtt(PI_NormalLine);
   SetName("TextDrw");
 } 
@@ -81 +84 @@
 void PITextDrawer::Draw(PIGraphicUC* g, double xmin, double ymin, double xmax, double ymax)
 {
-  if (mLines.size() < 1) return;
+  if ((mLines.size() < 1) && !fgFrame) return;
   PIGraphicAtt siatt = GetGraphicAtt();
   PIGraphicAtt catt;
@@ -90 +93 @@
     catt = siatt;
     catt.UpdateFrom(mLines[k].att);
+    SetGraphicAtt(catt);
     SelGraAtt(g);
     if (mLines[k].att.GetMarker() != PI_NotDefMarker) {
-      x = 0.03;
       ym = (double)y-(double)(g->GetFontHeight(fa, fd))*0.5;
       g->DrawMarker(x, ym);
@@ -100 +103 @@
       x = (double)x+dxu+0.02;
     }
-    else x = 0.05;
     // Trace des lignes de texte
     g->DrawString(x,y,mLines[k].line.c_str(),PI_VerticalTop);
     y = (double)y-(double)(g->GetFontHeight(fa, fd))*1.1;
   }
+  SetGraphicAtt(siatt);
   if (fgFrame) {   // Trace de cadre
-    SetGraphicAtt(siatt);
     SelGraAtt(g);
     x = y = 0.;

trunk/SophyaPI/PI/piyfxdrw.cc

@@ -107 +107 @@
   PIAxes::ReSizeMinMax(isLogScaleY(),ymin,ymax);
   SetLimits(xmin,xmax,ymin,ymax);
-  SetAxesFlags(kBoxAxes | kExtTicks | kLabels);
+  // NE PAS FAIRE - Reza Mai 2005  SetAxesFlags(kBoxAxes | kExtTicks | kLabels);
 }
 
@@ -116 +116 @@
   double xp,yp;
   int i;
+
+  if (axesFlags != kAxesNone) DrawAxes(g);
 
   if ((mAx == NULL))  mSz = 0;