Changeset 684 in Sophya

Timestamp:

Dec 13, 1999, 12:13:36 AM (26 years ago)

Author:

ercodmgr

Message:

Correction PSFile::DrawText et protection ds Drw/ImgTools - Reza 12/12/99

Location:

trunk/SophyaPI/PI

Files:

• pidrwtools.cc (modified) (3 diffs)
• piimgtools.cc (modified) (1 diff)
• psfile.cc (modified) (6 diffs)

trunk/SophyaPI/PI/pidrwtools.cc

@@ -450 +450 @@
 
 char strg[64];
-double xmin, xmax, ymin, ymax;
-int axrl = kAxeDirLtoR;
-int ayud = kAxeDirDownUp;
 int k, kk, kkk;
 
@@ -458 +455 @@
 
   case 2600 :
-    if ( mCurBW->kind() != PIScDrawWdg::ClassId ) {
+    {
+    double xmin, xmax, ymin, ymax;
+    int axrl = kAxeDirLtoR;
+    int ayud = kAxeDirDownUp;
+    PIScDrawWdg* scd=NULL;
+    scd = dynamic_cast<PIScDrawWdg*>(mCurBW);
+    if ( scd == NULL ) {
       cerr << "PIDrwTools: SetAxes applicable to PIScDrawWdg only ! " << endl;
       return;
       }
-    sscanf(mText[0]->GetText().c_str(), "%lg %lg" , &xmin, &xmax);
-    sscanf(mText[1]->GetText().c_str(), "%lg %lg" , &ymin, &ymax);
+    if (mText[0]->GetText().length() > 1) {
+      xmin = -1.;   xmax = 1.;
+      sscanf(mText[0]->GetText().c_str(), "%lg %lg" , &xmin, &xmax);
+    }
+    else {
+      xmin = scd->XMin();
+      xmax = scd->XMax();
+    }
+    if (mText[1]->GetText().length() > 1) {
+      ymin = -1.;   ymax = 1.;
+      sscanf(mText[1]->GetText().c_str(), "%lg %lg" , &ymin, &ymax);
+    }
+    else {
+      ymin = scd->YMin();
+      ymax = scd->YMax();
+    }      
     if (mCkb[0]->GetState())  axrl = kAxeDirRtoL ;
     if (mCkb[1]->GetState())  ayud = kAxeDirUpDown;
-    if ( mCurBW->kind() == PIScDrawWdg::ClassId ) { 
-      ((PIScDrawWdg*)mCurBW)->SetLimits(xmin, xmax, ymin, ymax, axrl, ayud);
-      unsigned int flags = ((PIScDrawWdg*)mCurBW)->GetAxesFlags();
-      if (mCkb[2]->GetState()) ((PIScDrawWdg*)mCurBW)->SetAxesFlags(flags | kGridOn);
-      else  ((PIScDrawWdg*)mCurBW)->SetAxesFlags(flags & ~kGridOn);
-      ((PIScDrawWdg*)mCurBW)->SetLogScale(mCkb[3]->GetState(),
-                                          mCkb[4]->GetState() );
-      }
+    scd->SetLimits(xmin, xmax, ymin, ymax, axrl, ayud);
+    unsigned int flags = scd->GetAxesFlags();
+    if (mCkb[2]->GetState()) scd->SetAxesFlags(flags | kGridOn);
+    else  scd->SetAxesFlags(flags & ~kGridOn);
+    scd->SetLogScale(mCkb[3]->GetState(), mCkb[4]->GetState() );
+      
     //    else mCurBW->SetDefaultDrawerLimits(xmin, xmax, ymin, ymax, axrl, ayud);
     mCurBW->Refresh();
+    }
     break;
 
   case 2700 :
-    if ( mCurBW->kind() == PIScDrawWdg::ClassId ) ((PIScDrawWdg*)mCurBW)->UpdateLimits();
-    else if ( mCurBW->kind() == PIDraw3DWdg::ClassId) ((PIDraw3DWdg*)mCurBW)->Update3DView();
+    {
+    PIScDrawWdg* scd=NULL;
+    scd = dynamic_cast<PIScDrawWdg*>(mCurBW);
+    if ( scd != NULL ) scd->UpdateLimits();
+    else {
+      PIDraw3DWdg* dr3 = dynamic_cast<PIDraw3DWdg *>(mCurBW);
+      if (dr3 != NULL) dr3->Update3DView();
+    }
+    }
     break;
 
@@ -502 +525 @@
     kk =  mOpt[3]->GetValue()-400;
     if ( (kk < 1) || (kk > 27) )  kk = 1;
+    if ((k > 0) && (kk < 3)) {  // Protection contre Marker taille 1 autre que Dotmarker
+      mOpt[3]->SetValue(403);
+      kk = 3;
+    }
     drw->SetMarkerAtt(kk, mrk[k]);
     k =  (mOpt[4]->GetValue()-500);

trunk/SophyaPI/PI/piimgtools.cc

@@ -320 +320 @@
   case 2800 :
     {
-    min = atof(mText[0]->GetText().c_str());
-    max = atof(mText[1]->GetText().c_str());
+    if (mText[0]->GetText().length() > 0)   
+      min = atof(mText[0]->GetText().c_str());
+    else min = mpii->Lut()->Min();
+    if (mText[1]->GetText().length() > 0)   
+      max = atof(mText[1]->GetText().c_str());
+    else max = mpii->Lut()->Max();
+
     if (msg == 2700) {
       del = max_lut-min_lut;

trunk/SophyaPI/PI/psfile.cc

@@ -274 +274 @@
 #define HEADER     "\
 %%%%Title: %s\n\
-%%%%Creator: PSFile (N.R. 07/08/99)\n\
+%%%%Creator: PI-PSFile (N.R. 07/08/99)\n\
 %%%%CreationDate: %s\
 %%%%Pages: (atend)\n\
@@ -604 +604 @@
         }
     } /* End if .ps */
+// On redefint la fonte par defaut - $CHECK$ Reza 11/12/99
+mFontAtt = PI_RomanFont;
+mFontSize = 10;
+mFontName = PI_DefaultFont;
+fprintf(mPSFile, "/Courier ff %d FS \n", mFontSize) ; 
+setFontDone = true;
 currentPage->tmp = ftell(mPSFile);
 }
@@ -662 +668 @@
             currentBloc->Tx, currentBloc->Ty,
             currentBloc->X0, currentBloc->Y0);
+    // On redefint la fonte par defaut - $CHECK$ Reza 11/12/99
+    mFontAtt = PI_RomanFont;
+    mFontSize = 10;
+    mFontName = PI_DefaultFont;
+    fprintf(mPSFile, "/Courier ff %d FS \n", mFontSize) ; 
+    setFontDone = true;
     currentBloc->tmp = ftell(mPSFile) ;
 }
@@ -710 +722 @@
                            PIFontAtt FontAtt, 
                            int FontSize) {
-    int change = 0;
+    bool change = false;
 
     /* Couleurs */
@@ -721 +733 @@
 //DBG      printf("PSFile::DrawString(%s) : FontAtt a change : %d %d \n", s, mFontAtt, FontAtt) ; 
       mFontAtt = FontAtt;
-      change = 1;
+      change = true;
     }
     if ( (FontSize != PI_NotDefFontSize) && (FontSize != mFontSize) ) {
 //DBG      printf("PSFile::DrawString(%s) : FontSize a change : %d %d \n", s, mFontSize, FontSize) ; 
-      mFontSize = (PIFontSize) FontSize;  // $CHECK$ EA ajoute le cast un peu au pif
-      change = 1;
+      mFontSize = FontSize;  
+      change = true;
     }
     if( (FontName != mFontName) ) {
 //DBG      printf("PSFile::DrawString(%s) : FontName a change : %d %d \n", s, mFontName, FontName) ; 
       mFontName = (PIFontName) FontName ; 
-      change = 1 ; 
-    }
-    if (change) { 
+      change = true ; 
+    }
+
+    if (change || !setFontDone) { // $CHECK$ setFontDone Reza 11/12/99 
       string fname ; 
       switch(mFontName) {
@@ -764 +777 @@
       } // endsw 
       fprintf(mPSFile, " ff %d FS ", FontSize) ; 
-    }
-    
-    
+      setFontDone = true ;   // $CHECK$ - doit etre fait uniquement a ce moment
+    }
+        
     fprintf(mPSFile, "gs %.2f Ux %.2f Uy m (%s) S gr\n", x, y, s) ; 
-    setFontDone = true ; 
 }