diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/bltGrElem.C | 29 | ||||
| -rw-r--r-- | src/bltGrElem.h | 69 | ||||
| -rw-r--r-- | src/bltGrElemBar.C | 2 | ||||
| -rw-r--r-- | src/bltGrElemLine.C | 2 | ||||
| -rw-r--r-- | src/bltGrElemOp.C | 1 | ||||
| -rw-r--r-- | src/bltGrElemOp.h | 33 | ||||
| -rw-r--r-- | src/bltGrPen.h | 40 | ||||
| -rw-r--r-- | src/bltGrPenOp.h | 40 |
8 files changed, 183 insertions, 33 deletions
diff --git a/src/bltGrElem.C b/src/bltGrElem.C new file mode 100644 index 0000000..d798d38 --- /dev/null +++ b/src/bltGrElem.C @@ -0,0 +1,29 @@ +/* + * Smithsonian Astrophysical Observatory, Cambridge, MA, USA + * This code has been modified under the terms listed below and is made + * available under the same terms. + */ + +/* + * Copyright 1993-2004 George A Howlett. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + diff --git a/src/bltGrElem.h b/src/bltGrElem.h new file mode 100644 index 0000000..05f0e73 --- /dev/null +++ b/src/bltGrElem.h @@ -0,0 +1,69 @@ +/* + * Smithsonian Astrophysical Observatory, Cambridge, MA, USA + * This code has been modified under the terms listed below and is made + * available under the same terms. + */ + +/* + * Copyright 1993-2004 George A Howlett. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +#ifndef __bltgrelem_h__ +#define __bltgrelem_h__ + +#include "bltGrElemOp.h" + +#include <iostream> +#include <sstream> +#include <iomanip> +using namespace std; + +struct _Element { + GraphObj obj; + unsigned int flags; + int hide; + Tcl_HashEntry *hashPtr; + + // Fields specific to elements + const char *label; + unsigned short row; + unsigned short col; + int legendRelief; + Axis2d axes; + ElemCoords coords; + ElemValues* w; + int *activeIndices; + int nActiveIndices; + ElementProcs *procsPtr; + Tk_OptionTable optionTable; + Pen *activePenPtr; + Pen *normalPenPtr; + Pen *builtinPenPtr; + Blt_Chain stylePalette; + int scaleSymbols; + double xRange; + double yRange; + int state; + Blt_ChainLink link; +}; + +#endif diff --git a/src/bltGrElemBar.C b/src/bltGrElemBar.C index 302242e..d64004f 100644 --- a/src/bltGrElemBar.C +++ b/src/bltGrElemBar.C @@ -39,7 +39,7 @@ extern "C" { }; #include "bltConfig.h" -#include "bltGrElem.h" +#include "bltGrElemOp.h" #define CLAMP(x,l,h) ((x) = (((x)<(l))? (l) : ((x)>(h)) ? (h) : (x))) diff --git a/src/bltGrElemLine.C b/src/bltGrElemLine.C index fa5a72b..789a4b6 100644 --- a/src/bltGrElemLine.C +++ b/src/bltGrElemLine.C @@ -40,7 +40,7 @@ extern "C" { } #include "bltConfig.h" -#include "bltGrElem.h" +#include "bltGrElemOp.h" #define PointInRegion(e,x,y) (((x) <= (e)->right) && ((x) >= (e)->left) && ((y) <= (e)->bottom) && ((y) >= (e)->top)) diff --git a/src/bltGrElemOp.C b/src/bltGrElemOp.C index ffd1d43..81b51a3 100644 --- a/src/bltGrElemOp.C +++ b/src/bltGrElemOp.C @@ -40,6 +40,7 @@ extern "C" { #include "bltOp.h" }; +#include "bltGrElemOp.h" #include "bltGrElem.h" // Defs diff --git a/src/bltGrElemOp.h b/src/bltGrElemOp.h index 359c1d4..b2c9db4 100644 --- a/src/bltGrElemOp.h +++ b/src/bltGrElemOp.h @@ -27,8 +27,8 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef _BLT_GR_ELEM_H -#define _BLT_GR_ELEM_H +#ifndef __bltgrelemop_h__ +#define __bltgrelemop_h__ extern "C" { #include <bltVector.h> @@ -159,35 +159,6 @@ typedef struct { ElemValues* y; } ElemCoords; -struct _Element { - GraphObj obj; - unsigned int flags; - int hide; - Tcl_HashEntry *hashPtr; - - // Fields specific to elements - const char *label; - unsigned short row; - unsigned short col; - int legendRelief; - Axis2d axes; - ElemCoords coords; - ElemValues* w; - int *activeIndices; - int nActiveIndices; - ElementProcs *procsPtr; - Tk_OptionTable optionTable; - Pen *activePenPtr; - Pen *normalPenPtr; - Pen *builtinPenPtr; - Blt_Chain stylePalette; - int scaleSymbols; - double xRange; - double yRange; - int state; - Blt_ChainLink link; -}; - extern const char* fillObjOption[]; extern Tk_CustomOptionSetProc StyleSetProc; extern Tk_CustomOptionGetProc StyleGetProc; diff --git a/src/bltGrPen.h b/src/bltGrPen.h new file mode 100644 index 0000000..fb59b2a --- /dev/null +++ b/src/bltGrPen.h @@ -0,0 +1,40 @@ +/* + * Smithsonian Astrophysical Observatory, Cambridge, MA, USA + * This code has been modified under the terms listed below and is made + * available under the same terms. + */ + +/* + * Copyright 1993-2004 George A Howlett. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +#ifndef __bltgrpen_h__ +#define __bltgrpen_h__ + +#include <iostream> +#include <sstream> +#include <iomanip> +using namespace std; + +}; + +#endif diff --git a/src/bltGrPenOp.h b/src/bltGrPenOp.h new file mode 100644 index 0000000..7ef7df0 --- /dev/null +++ b/src/bltGrPenOp.h @@ -0,0 +1,40 @@ +/* + * Smithsonian Astrophysical Observatory, Cambridge, MA, USA + * This code has been modified under the terms listed below and is made + * available under the same terms. + */ + +/* + * Copyright 1993-2004 George A Howlett. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +#ifndef __bltgrpenop_h__ +#define __bltgrpenop_h__ + +#include <iostream> +#include <sstream> +#include <iomanip> +using namespace std; + +}; + +#endif |