Changeset 134 in Sophya for trunk/SophyaPI

Timestamp:

Aug 12, 1998, 5:22:49 PM (27 years ago)

Author:

ercodmgr

Message:

Amelioration Display StackWin Reza 12/08/98

Location:

trunk/SophyaPI/PI

Files:

• piscdrawwdg.cc (modified) (1 diff)
• pistzwin.cc (modified) (4 diffs)
• pistzwin.h (modified) (1 diff)

trunk/SophyaPI/PI/piscdrawwdg.cc

@@ -274 +274 @@
   float xmin, xmax, ymin, ymax;
   int i=0;
-  xmin = xmax = mAx->Value(i);
-  ymin = ymax = mAy->Value(i);
   float cv;
-  if (mAy) for(i=0; i<mSz; i++) {
-    cv = mAx->Value(i); 
-    if (cv < xmin)  xmin = cv;
-    if (cv > xmax)  xmax = cv;
-    cv = mAy->Value(i); 
-    if (cv < ymin)  ymin = cv;
-    if (cv > ymax)  ymax = cv;
-    }
-  else  for(i=0; i<mSz; i++) {
-    cv = mAx->X(i); 
-    if (cv < xmin)  xmin = cv;
-    if (cv > xmax)  xmax = cv;
-    cv = mAx->Value(i); 
-    if (cv < ymin)  ymin = cv;
-    if (cv > ymax)  ymax = cv;
+  if (mAy) {
+    xmin = xmax = mAx->Value(0);
+    ymin = ymax = mAy->Value(0);
+    for(i=1; i<mSz; i++) {
+      cv = mAx->Value(i); 
+      if (cv < xmin)  xmin = cv;
+      if (cv > xmax)  xmax = cv;
+      cv = mAy->Value(i); 
+      if (cv < ymin)  ymin = cv;
+      if (cv > ymax)  ymax = cv;
+      }
+    }
+  else {
+    xmin = xmax = mAx->X(0);
+    ymin = ymax = mAx->Value(0);
+    for(i=1; i<mSz; i++) {
+      cv = mAx->X(i); 
+      if (cv < xmin)  xmin = cv;
+      if (cv > xmax)  xmax = cv;
+      cv = mAx->Value(i); 
+      if (cv < ymin)  ymin = cv;
+      if (cv > ymax)  ymax = cv;
+      }
     }
 

trunk/SophyaPI/PI/pistzwin.cc

@@ -73 +73 @@
 {
 if (NbChilds() < 1) return;
+mCurdisp = (mCurdisp+1)%NbChilds();
+PIWdg* wc = GetChild(mCurdisp);
+wc->Manage();
 int k;
-for(k=0; k<NbChilds(); k++) GetChild(k)->UnManage();
-mCurdisp = (mCurdisp+1)%NbChilds();
-GetChild(mCurdisp)->Manage();
+for(k=0; k<NbChilds(); k++) 
+  if (k != mCurdisp) GetChild(k)->UnManage();
 return;
 }
@@ -99 +101 @@
         : PIWindow(par, nom, k, sx, sy, px, py)
 {
-if (nzx < 1) nzx = 1;
-if (nzy < 1) nzy = 1;
-if (nzx > 50) nzx = 50;
-if (nzx > 50) nzx = 50;
-mZx = nzx;  mZy = nzy;   mZc = 0;
-
-mZWdg = new PIWdgGen*[nzx*nzy];
-int i;
-for(i=0; i<mZx*mZy; i++) mZWdg[i] = NULL; 
+mZWdg = NULL;
+SetZone(nzx, nzy);
 }
 
@@ -115 +110 @@
 delete[] mZWdg;
 }
+
+/* --Methode-- */
+void PIZoneWindow::SetZone(int nzx, int nzy)
+{
+if (nzx < 1) nzx = 1;
+if (nzy < 1) nzy = 1;
+if (nzx > 50) nzx = 50;
+if (nzx > 50) nzx = 50;
+mZx = nzx;  mZy = nzy;   mZc = 0;
+
+int i;
+if (mZWdg) {
+  for(i=0; i<mZx*mZy; i++) 
+    if (mZWdg[i]) delete mZWdg[i];  
+  delete[]  mZWdg;
+  }
+mZWdg = new PIWdgGen*[nzx*nzy];
+for(i=0; i<mZx*mZy; i++) mZWdg[i] = NULL; 
+}
+
 
 /* --Methode-- */
@@ -146 +161 @@
 
 /* --Methode-- */
-void PIZoneWindow::NZones(int& nzx, int& nzy)
+void PIZoneWindow::NbZone(int& nzx, int& nzy)
 {
 nzx = mZx;   nzy = mZy;

trunk/SophyaPI/PI/pistzwin.h

@@ -46 +46 @@
   virtual void  ChildAdd(PIWdgGen * child);
   virtual void  ChildDel(PIWdgGen * child);
-  virtual void  NZones(int& nzx, int& nzy);
+  virtual void  SetZone(int nzx, int nzy);
+  virtual void  NbZone(int& nzx, int& nzy);
   virtual void  NextChildPosSize(int& px, int& py, int& sx, int& sy);