![(please configure the [header_logo] section in trac.ini)](/PI/chrome/site/your_project_logo.png){kind=logo}
Changeset 112 in Sophya
- Timestamp:
- Jun 20, 1998, 6:19:33 PM (27 years ago)
- Location:
- trunk/SophyaPI/PI
- Files:
-
- 4 added
- 8 edited
-
Makefile (modified) (4 diffs)
-
picmapx.cc (modified) (8 diffs)
-
picmapx.h (modified) (1 diff)
-
pidrwtools.cc (added)
-
pidrwtools.h (added)
-
pihisto2d.cc (modified) (1 diff)
-
piimage.cc (modified) (1 diff)
-
piimgtools.cc (added)
-
piimgtools.h (added)
-
pioptmenux.cc (modified) (2 diffs)
-
sc_sample.cc (modified) (2 diffs)
-
sc_sample.h (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/SophyaPI/PI/Makefile
r111 r112 4 4 5 5 all: $(LIB)libPI.a 6 $(LIB)libPI.a : $(OBJ)lut.o $(OBJ)pi3ddrw.o $(OBJ)piapplgen.o $(OBJ)piapplx.o $(OBJ)pibwdggen.o $(OBJ)pibwdgx.o $(OBJ)picmap.o $(OBJ)picmapgen.o $(OBJ)picmapx.o $(OBJ)picons.o $(OBJ)picontainergen.o $(OBJ)picontainerx.o $(OBJ)pidrawer.o $(OBJ)pidrawwin.o $(OBJ)pi filechogen.o $(OBJ)pifilechox.o $(OBJ)pigraph3d.o $(OBJ)pigraphgen.o $(OBJ)pigraphps.o $(OBJ)pigraphuc.o $(OBJ)pigraphx.o $(OBJ)pihisto.o $(OBJ)pihisto2d.o $(OBJ)piimage.o $(OBJ)piimgtools.o $(OBJ)piinit.o $(OBJ)pilistgen.o $(OBJ)pilistx.o $(OBJ)pimenubargen.o $(OBJ)pimenubarx.o $(OBJ)pimenugen.o $(OBJ)pimenux.o $(OBJ)pimsghandler.o $(OBJ)pintuple.o $(OBJ)pioptmenugen.o $(OBJ)pioptmenux.o $(OBJ)piperiodx.o $(OBJ)pipixmapgen.o $(OBJ)pipixmapx.o $(OBJ)piscdrawwdg.o $(OBJ)pistdwdggen.o $(OBJ)pistdwdgx.o $(OBJ)pistlist.o $(OBJ)piup.o $(OBJ)piwdggen.o $(OBJ)piwdgx.o $(OBJ)piwindowgen.o $(OBJ)piwindowx.o $(OBJ)pixtbase.o $(OBJ)psfile.o6 $(LIB)libPI.a : $(OBJ)lut.o $(OBJ)pi3ddrw.o $(OBJ)piapplgen.o $(OBJ)piapplx.o $(OBJ)pibwdggen.o $(OBJ)pibwdgx.o $(OBJ)picmap.o $(OBJ)picmapgen.o $(OBJ)picmapx.o $(OBJ)picons.o $(OBJ)picontainergen.o $(OBJ)picontainerx.o $(OBJ)pidrawer.o $(OBJ)pidrawwin.o $(OBJ)pidrwtools.o $(OBJ)pifilechogen.o $(OBJ)pifilechox.o $(OBJ)pigraph3d.o $(OBJ)pigraphgen.o $(OBJ)pigraphps.o $(OBJ)pigraphuc.o $(OBJ)pigraphx.o $(OBJ)pihisto.o $(OBJ)pihisto2d.o $(OBJ)piimage.o $(OBJ)piimgtools.o $(OBJ)piinit.o $(OBJ)pilistgen.o $(OBJ)pilistx.o $(OBJ)pimenubargen.o $(OBJ)pimenubarx.o $(OBJ)pimenugen.o $(OBJ)pimenux.o $(OBJ)pimsghandler.o $(OBJ)pintuple.o $(OBJ)pioptmenugen.o $(OBJ)pioptmenux.o $(OBJ)piperiodx.o $(OBJ)pipixmapgen.o $(OBJ)pipixmapx.o $(OBJ)piscdrawwdg.o $(OBJ)pistdwdggen.o $(OBJ)pistdwdgx.o $(OBJ)pistlist.o $(OBJ)piup.o $(OBJ)piwdggen.o $(OBJ)piwdgx.o $(OBJ)piwindowgen.o $(OBJ)piwindowx.o $(OBJ)pixtbase.o $(OBJ)psfile.o 7 7 $(AR) $(ARFLAGS) $@ $? 8 8 ifeq ($(CXX),cxx) … … 12 12 13 13 $(OBJ)lut.o: lut.cc $(EROSDEVREP)/Include/defs.h lut.h 14 $(OBJ)pi3ddrw.o: pi3ddrw.cc pi3ddrw.h 14 $(OBJ)pi3ddrw.o: pi3ddrw.cc pi3ddrw.h pidrawer.h pibwdggen.h pisysdep.h \ 15 piwdgx.h piwdggen.h pimsghandler.h picmap.h picmapx.h picmapgen.h \ 16 pigraphx.h pigraphgen.h pigraphuc.h psfile.h \ 17 $(EROSDEVREP)/Include/defs.h 15 18 $(OBJ)piapplgen.o: piapplgen.cc piapplgen.h pimsghandler.h pisysdep.h \ 16 19 picontainerx.h picontainergen.h piwdgx.h piwdggen.h pimenubarx.h \ … … 55 58 $(EROSDEVREP)/Include/defs.h pigraphps.h pistdwdgx.h pistdwdggen.h \ 56 59 pidrawer.h 60 $(OBJ)pidrwtools.o: pidrwtools.cc pidrwtools.h pisysdep.h pimenux.h \ 61 pimenugen.h piwdgx.h piwdggen.h pimsghandler.h piapplx.h piapplgen.h \ 62 picontainerx.h picontainergen.h pimenubarx.h pimenubargen.h picons.h \ 63 pistdwdgx.h pistdwdggen.h pibwdgx.h pibwdggen.h picmap.h picmapx.h \ 64 picmapgen.h pigraphx.h pigraphgen.h pigraphuc.h psfile.h \ 65 $(EROSDEVREP)/Include/defs.h pigraphps.h pioptmenux.h \ 66 pioptmenugen.h piscdrawwdg.h piwindowx.h piwindowgen.h pidrawer.h 57 67 $(OBJ)pifilechogen.o: pifilechogen.cc pifilechogen.h pisysdep.h piwdgx.h \ 58 68 piwdggen.h pimsghandler.h … … 104 114 pigraphuc.h psfile.h pipixmapx.h pipixmapgen.h pibwdgx.h pigraphps.h \ 105 115 pistdwdgx.h pistdwdggen.h piwindowx.h piwindowgen.h picontainerx.h \ 106 picontainergen.h $(EROSDEVREP)/Include/imageop.h \ 107 $(EROSDEVREP)/Include/cimage.h $(EROSDEVREP)/Include/rzimage.h \ 108 $(EROSDEVREP)/Include/rzvect.h \ 109 $(EROSDEVREP)/Include/exceptions.h \ 110 $(EROSDEVREP)/Include/peidainit.h \ 111 $(EROSDEVREP)/Include/perrors.h \ 112 $(EROSDEVREP)/Include/imaginit.h \ 113 $(EROSDEVREP)/Include/datatypes.h \ 114 $(EROSDEVREP)/Include/ppersist.h \ 115 $(EROSDEVREP)/Include/pclassids.h \ 116 $(EROSDEVREP)/Include/dvlist.h \ 117 $(EROSDEVREP)/Include/fitsimage.h \ 118 $(EROSDEVREP)/Include/fitsheader.h \ 119 $(EROSDEVREP)/Include/erosio.h $(EROSDEVREP)/Include/fitskeys.h \ 120 $(EROSDEVREP)/Include/erostape.h \ 121 $(EROSDEVREP)/Include/strutil.h \ 122 $(EROSDEVREP)/Include/ptrarray.h \ 123 $(EROSDEVREP)/Include/voidptrarray.h \ 124 $(EROSDEVREP)/Include/basearray.h $(EROSDEVREP)/Include/peida.h \ 125 $(EROSDEVREP)/Include/utils.h $(EROSDEVREP)/Include/fmath.h \ 126 $(EROSDEVREP)/Include/array.h $(EROSDEVREP)/Include/lockfile.h \ 127 $(EROSDEVREP)/Include/erostarfile.h \ 128 $(EROSDEVREP)/Include/xstrstream.h \ 129 $(EROSDEVREP)/Include/dates.h $(EROSDEVREP)/Include/tarlib.h 130 $(OBJ)piimgtools.o: piimgtools.cc pisysdep.h pistdwdgx.h pistdwdggen.h \ 131 piwdgx.h piwdggen.h pimsghandler.h pimenux.h pimenugen.h pioptmenux.h \ 132 pioptmenugen.h piapplx.h piapplgen.h picontainerx.h picontainergen.h \ 133 pimenubarx.h pimenubargen.h picons.h pibwdgx.h pibwdggen.h picmap.h \ 134 picmapx.h picmapgen.h pigraphx.h pigraphgen.h pigraphuc.h psfile.h \ 135 $(EROSDEVREP)/Include/defs.h pigraphps.h piimage.h parradapter.h \ 116 picontainergen.h 117 $(OBJ)piimgtools.o: piimgtools.cc piimgtools.h pisysdep.h pimenux.h \ 118 pimenugen.h piwdgx.h piwdggen.h pimsghandler.h piapplx.h piapplgen.h \ 119 picontainerx.h picontainergen.h pimenubarx.h pimenubargen.h picons.h \ 120 pistdwdgx.h pistdwdggen.h pibwdgx.h pibwdggen.h picmap.h picmapx.h \ 121 picmapgen.h pigraphx.h pigraphgen.h pigraphuc.h psfile.h \ 122 $(EROSDEVREP)/Include/defs.h pigraphps.h pioptmenux.h \ 123 pioptmenugen.h piimage.h parradapter.h \ 136 124 $(EROSDEVREP)/Include/machine.h lut.h pidrawer.h pipixmapx.h \ 137 pipixmapgen.h piwindowx.h piwindowgen.h piimgtools.h125 pipixmapgen.h piwindowx.h piwindowgen.h 138 126 $(OBJ)piinit.o: piinit.cc $(EROSDEVREP)/Include/defs.h piinit.h \ 139 127 $(EROSDEVREP)/Include/strecinit.h \ -
trunk/SophyaPI/PI/picmapx.cc
r72 r112 14 14 mColors = NULL; 15 15 mColRGB = NULL; 16 mNewCol = NULL; 16 17 } 17 18 … … 24 25 mColors = new PIXColor[n]; 25 26 mColRGB = new PIColor[n]; 26 {for(int i=0; i<n; i++) 27 mNewCol = new bool[n]; 28 int i; 29 for(i=0; i<n; i++) 27 30 { mColors[i] = BlackPixel(PIXDisplay(), PIXScreen()); 28 mColRGB[i].red = mColRGB[i].green = mColRGB[i].blue = 0; } 29 }// printf("PIColorMapX::PIColorMapX(CMapId, int) %d %d \n", mNCol, Type()); 30 31 return; 31 mColRGB[i].red = mColRGB[i].green = mColRGB[i].blue = 0; 32 mNewCol[i] = false; } 33 // printf("PIColorMapX::PIColorMapX(CMapId, int) %d %d \n", mNCol, Type()); 32 34 } 33 35 … … 38 40 if (mColors) delete[] mColors; 39 41 if (mColRGB) delete[] mColRGB; 42 if (mNewCol) delete[] mNewCol; 40 43 } 41 44 … … 72 75 } 73 76 74 if ( (index < 0) || (index > mNCol) ) return(false);77 if ( (index < 0) || (index >= mNCol) ) return(false); 75 78 76 79 if ( (col.red == 0) && (col.green == 0) && (col.blue == 0) ) … … 78 81 mColors[index] = BlackPixel(PIXDisplay(), PIXScreen()); 79 82 mColRGB[index] = col; 83 mNewCol[index] = false; 80 84 return(true); 81 85 } 82 86 87 // Pour diminuer les requetes X, on verifie si la couleur 88 // ne se trouve pas deja dans la table Reza 19/05/98 89 int kc; 90 for(kc=0; kc<mNCol; kc++) 91 if ( (col.red == mColRGB[kc].red) && (col.green == mColRGB[kc].green) && (col.blue == mColRGB[kc].blue) ) 92 { mColors[index] = mColors[kc]; mColRGB[index] = mColRGB[kc]; 93 mNewCol[index] = false; return(true); } 94 95 83 96 myxcol.red = col.red; 84 97 myxcol.blue = col.blue; … … 89 102 mColors[index] = myxcol.pixel; 90 103 mColRGB[index] = col; 104 mNewCol[index] = true; 91 105 // printf("PIColorMapX::AllocColor() RGB= %d %d %d \n", 92 106 // (int) col.red, (int) col.blue, (int) col.green); … … 120 134 121 135 for (int i=0; i<mNCol; i++) 122 if ( (mColRGB[i].red != 0) && (mColRGB[i].blue != 0) && (mColRGB[i].green != 0) ) 123 XFreeColors(PIXDisplay(), defxcmap, mColors+i, 1, 0); 136 if ( mNewCol[i] ) XFreeColors(PIXDisplay(), defxcmap, mColors+i, 1, 0); 124 137 125 138 bpix = BlackPixel(PIXDisplay(), PIXScreen()); 126 139 blc.red = blc.green = blc.blue = 0; 127 140 {for (int i=0; i<mNCol; i++) 128 { mColors[i] = bpix; mColRGB[i] = blc; }141 { mColors[i] = bpix; mColRGB[i] = blc; mNewCol[i] = false; } 129 142 } 130 143 printf("PIColorMapX::FreeColors() Type= %d mNCol= %d \n", … … 166 179 if (mColors) delete mColors; 167 180 if (mColRGB) delete mColRGB; 181 if (mNewCol) delete mNewCol; 168 182 CopyFromGen(x); 169 183 mColors = new PIXColor[mNCol]; 170 184 mColRGB = new PIColor[mNCol]; 185 mNewCol = new bool[mNCol]; 171 186 for (int i=0; i<mNCol; i++) 172 187 { mColors[i] = ((PIColorMapX *)x)->mColors[i]; 173 mColRGB[i] = ((PIColorMapX *)x)->mColRGB[i]; } 188 mColRGB[i] = ((PIColorMapX *)x)->mColRGB[i]; 189 mNewCol[i] = ((PIColorMapX *)x)->mNewCol[i]; } 174 190 } -
trunk/SophyaPI/PI/picmapx.h
r64 r112 28 28 PIXColor * mColors; // La table des couleurs ... 29 29 PIColor * mColRGB; // Composantes RGB 30 bool * mNewCol; // Nouvelle couleur dans table ou pas 30 31 }; 31 32 -
trunk/SophyaPI/PI/pihisto2d.cc
r110 r112 545 545 mBut[2] = new PIButton(this, "Get" , 6003, 50, 20, 150,60); 546 546 mBut[3] = new PIButton(this, "Print", 6004, 50, 20, 150,85); 547 FinishCreate();547 // FinishCreate(); 548 548 } 549 549 -
trunk/SophyaPI/PI/piimage.cc
r111 r112 10 10 11 11 #include "piimage.h" 12 #include "imageop.h"13 12 14 13 // -------------------------------------------------------------------------------- -
trunk/SophyaPI/PI/pioptmenux.cc
r110 r112 50 50 XtSetArg(warg[n],XmNmarginLeft,rsy*3); n++; 51 51 XtSetValues(XtWdg(), warg, n); 52 XtUninstallTranslations(XtWdg()); 52 XtTranslations trans = XtParseTranslationTable( 53 "<Btn1Down>: \n <Btn1Up>: \n <Btn2Down>: \n <Btn2Up>: \n <Btn3Down>: \n <Btn3Up>:"); 54 XtOverrideTranslations(XtWdg(), trans); 53 55 XtAddEventHandler( XtWdg(), ButtonPressMask|ExposureMask, FALSE, mouse_handler_optmenux, this); 54 SetBinding(PIBK_fixed, PIBK_fixed, PIBK_free, PIBK_fixed);55 56 mgc = 0; 56 57 char buff[128]; … … 72 73 void PIOptMenuX::FinishCreate() 73 74 { 75 printf("PIOptMenuX::FinishCreate()/DBG %s \n", Nom().c_str()); 74 76 if (mSmsg == 0) SetValue(mMen->ItemMsg(0)); 75 77 } -
trunk/SophyaPI/PI/sc_sample.cc
r107 r112 1 #include <stdio.h> 1 2 #include "sc_sample.h" 2 3 3 static double f(double x) {return x*x;} 4 5 ScSample::ScSample(PIContainerGen *par, char *nom, 6 int sx, int sy, int px, int py) 7 :PIScDrawWdg(par, nom, sx, sy, px, py) 8 4 static int nscd = 0; 5 ScSampleDrawer::ScSampleDrawer() 6 : PIDrawer() 9 7 { 10 PIFuncDrawer * mfd; 11 mfd = new PIFuncDrawer(f); 12 SetLimits(-3,3,-4,4); 13 AddScDrawer(mfd); 14 SetAxesFlags(kAxesDflt); 8 nscd++; 9 printf(" ScSampleDrawer::ScSampleDrawer() NScDrw= %d \n", nscd); 15 10 } 16 11 17 ScSample ::~ScSample()12 ScSampleDrawer::~ScSampleDrawer() 18 13 { 19 DeleteDrawers(); 14 nscd--; 15 printf("Delete/ScSampleDrawer::~ScSampleDrawer() NScDrw= %d \n", nscd); 20 16 } 21 17 22 23 18 void 24 ScSample ::DrawSelf(PIGraphicUC* g)19 ScSampleDrawer::Draw(PIGraphicUC* g, float, float, float, float) 25 20 { 26 21 PIGrCoord x[5] = {-2, -1., 1., 1.7, 2.2}; … … 45 40 } 46 41 42 static double f(double x) {return x*x;} 43 44 ScSample::ScSample(PIContainerGen *par, char *nom, 45 int sx, int sy, int px, int py) 46 :PIScDrawWdg(par, nom, sx, sy, px, py) 47 48 { 49 PIFuncDrawer * mfd; 50 mfd = new PIFuncDrawer(f); 51 SetLimits(-3,3,-4,4); 52 AddScDrawer(mfd,true); 53 ScSampleDrawer* msd = new ScSampleDrawer; 54 AddScDrawer((PIDrawer*)msd,true); 55 SetAxesFlags(kAxesDflt); 56 } 57 58 ScSample::~ScSample() 59 { 60 DeleteDrawers(); 61 } 62 63 64 -
trunk/SophyaPI/PI/sc_sample.h
r107 r112 2 2 3 3 #include "piscdrawwdg.h" 4 5 class ScSampleDrawer : PIDrawer { 6 public: 7 ScSampleDrawer(); 8 virtual ~ScSampleDrawer(); 9 virtual void Draw(PIGraphicUC* g, float xmin, float ymin, float xmax, float ymax); 10 }; 4 11 5 12 class ScSample : public PIScDrawWdg { … … 7 14 ScSample(PIContainerGen *par, char *nom, 8 15 int sx=10, int sy=10, int px=0, int py=0); 9 ~ScSample(); 10 11 12 virtual void DrawSelf(PIGraphicUC* g); 16 virtual ~ScSample(); 13 17 14 18 }; 19
Note:
See TracChangeset
for help on using the changeset viewer.
