Changeset 136 in Sophya for trunk/SophyaPI

Timestamp:

Aug 17, 1998, 11:05:05 AM (27 years ago)

Author:

ercodmgr

Message:

petit bug (PIWdgX::~PIWdgX) et amelioration trace PIHisto depuis PC-Linux Reza 17/08/98

Location:

trunk/SophyaPI/PI

Files:

• piapplx.cc (modified) (1 diff)
• pidrawer.cc (modified) (1 diff)
• pihisto.cc (modified) (2 diffs)
• pintuple.cc (modified) (1 diff)
• piwdgx.cc (modified) (1 diff)

trunk/SophyaPI/PI/piapplx.cc

@@ -222 +222 @@
 static XtInputId inputid[2];
 static int origfiledes[2]={-1, -1};   // descripteurs de fichiers de depart
-static bool firstcall[2]={true, true};    // 1er appel a Redirect
 
 static void redirectstream_callback(XtPointer cld, int * fd, XtInputId* /*iid*/)

trunk/SophyaPI/PI/pidrawer.cc

@@ -210 +210 @@
 {
   g->NoClip();
+  if (mLAtt == PI_NotDefLineAtt)  g->SelLine(PI_ThinLine);
+  else g->SelLine(mLAtt);
   unsigned int flags = axesFlags;
   if (flags & kStdAxes) {

trunk/SophyaPI/PI/pihisto.cc

@@ -29 +29 @@
 {
   if (!mHisto)  return;  
-  for (int i=0; i<mHisto->NBins(); i++) {
+  if (mLAtt != PI_NotDefLineAtt) {
+    float x1,y1, x2, y2;
+    x1 = mHisto->BinLowEdge(0);
+    y1 = 0; 
+    for (int i=0; i<mHisto->NBins(); i++) {
+      x2 = x1; 
+      y2 = (*mHisto)(i);
+      g->DrawLine(x1,y1, x2, y2);
+      y1 = y2; 
+      x2 = mHisto->BinHighEdge(i);
+      g->DrawLine(x1,y1, x2, y2);
+      x1 = x2; 
+      }
+      y2 = 0; g->DrawLine(x1,y1, x2, y2);
+    }
+  else for (int i=0; i<mHisto->NBins(); i++) {
                 float left   = mHisto->BinLowEdge(i);
                 float width  = mHisto->BinWidth();
@@ -44 +59 @@
 {
   if (!mHisto) return;
+  if (mLAtt == PI_NotDefLineAtt)  g->SelLine(PI_ThinLine);
   float cellHeight = (YMax() - YMin()) * 0.05;
   float cellWidth  = (XMax() - XMin()) * 0.23;

trunk/SophyaPI/PI/pintuple.cc

@@ -66 +66 @@
 {
 float xp,yp,xer,yer;
-char buff[128];
 int nok;
 

trunk/SophyaPI/PI/piwdgx.cc

@@ -182 +182 @@
 printf("Debug_PIWdgX::~PIWdgX()  %lx %lx \n", (long)this, (long)sdw);
 #endif
+UnManage();
 if (curselwdg == this)  { SelectionLost(); curselwdg = NULL; }
 if (!sdw)  XtDestroyWidget(sdw);