Thread: [brlcad-commits] SF.net SVN: brlcad:[32307] brlcad/trunk/include/ged.h
Open Source Solid Modeling CAD
Brought to you by:
brlcad
From: <bo...@us...> - 2008-08-06 18:44:56
|
Revision: 32307 http://brlcad.svn.sourceforge.net/brlcad/?rev=32307&view=rev Author: bob1961 Date: 2008-08-06 18:45:03 +0000 (Wed, 06 Aug 2008) Log Message: ----------- wdb_binary_cmd has changed to wdb_bo_cmd Modified Paths: -------------- brlcad/trunk/include/ged.h Modified: brlcad/trunk/include/ged.h =================================================================== --- brlcad/trunk/include/ged.h 2008-08-06 18:37:05 UTC (rev 32306) +++ brlcad/trunk/include/ged.h 2008-08-06 18:45:03 UTC (rev 32307) @@ -649,7 +649,7 @@ Tcl_Interp *interp, int argc, char *argv[])); -GED_EXPORT BU_EXTERN(int wdb_binary_cmd, +GED_EXPORT BU_EXTERN(int wdb_bo_cmd, (struct rt_wdb *wdbp, Tcl_Interp *interp, int argc, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2008-08-22 02:09:54
|
Revision: 32499 http://brlcad.svn.sourceforge.net/brlcad/?rev=32499&view=rev Author: brlcad Date: 2008-08-22 02:10:03 +0000 (Fri, 22 Aug 2008) Log Message: ----------- ws Modified Paths: -------------- brlcad/trunk/include/ged.h Modified: brlcad/trunk/include/ged.h =================================================================== --- brlcad/trunk/include/ged.h 2008-08-20 20:58:59 UTC (rev 32498) +++ brlcad/trunk/include/ged.h 2008-08-22 02:10:03 UTC (rev 32499) @@ -95,14 +95,14 @@ #endif /* Check if the object is a combination */ -#define GED_CHECK_COMB(_gedp,_dp,_ret) \ +#define GED_CHECK_COMB(_gedp, _dp, _ret) \ if (((_dp)->d_flags & DIR_COMB) == 0) { \ bu_vls_printf(&(_gedp)->ged_result_str, "%s: not a combination", (_dp)->d_namep); \ return (_ret); \ } /* Check if a database is open */ -#define GED_CHECK_DATABASE_OPEN(_gedp,_ret) \ +#define GED_CHECK_DATABASE_OPEN(_gedp, _ret) \ if ((_gedp) == GED_NULL || (_gedp)->ged_wdbp == RT_WDB_NULL || (_gedp)->ged_wdbp->dbip == DBI_NULL) { \ if ((_gedp) != GED_NULL) \ bu_vls_printf(&(_gedp)->ged_result_str, "A database is not open!"); \ @@ -112,62 +112,62 @@ } /* Check if a drawable exists */ -#define GED_CHECK_DRAWABLE(_gedp,_ret) \ +#define GED_CHECK_DRAWABLE(_gedp, _ret) \ if (_gedp->ged_gdp == GED_DRAWABLE_NULL) { \ bu_vls_printf(&(_gedp)->ged_result_str, "A drawable does not exist!"); \ return (_ret); \ } /* Check if a view exists */ -#define GED_CHECK_VIEW(_gedp,_ret) \ +#define GED_CHECK_VIEW(_gedp, _ret) \ if (_gedp->ged_gvp == GED_VIEW_NULL) { \ bu_vls_printf(&(_gedp)->ged_result_str, "A view does not exist!"); \ return (_ret); \ } /* Lookup database object */ -#define GED_CHECK_EXISTS(_gedp,_name,_noisy,_ret) \ +#define GED_CHECK_EXISTS(_gedp, _name, _noisy, _ret) \ if (db_lookup((_gedp)->ged_wdbp->dbip, (_name), (_noisy)) != DIR_NULL) { \ bu_vls_printf(&(_gedp)->ged_result_str, "%s already exists", (_name)); \ return (_ret); \ } /* Check if the database is read only */ -#define GED_CHECK_READ_ONLY(_gedp,_ret) \ +#define GED_CHECK_READ_ONLY(_gedp, _ret) \ if ((_gedp)->ged_wdbp->dbip->dbi_read_only) { \ bu_vls_printf(&(_gedp)->ged_result_str, "Sorry, this database is READ-ONLY"); \ return (_ret); \ } /* Check if the object is a region */ -#define GED_CHECK_REGION(_gedp,_dp,_ret) \ +#define GED_CHECK_REGION(_gedp, _dp, _ret) \ if (((_dp)->d_flags & DIR_REGION) == 0) { \ bu_vls_printf(&(_gedp)->ged_result_str, "%s: not a region", (_dp)->d_namep); \ return (_ret); \ } -#define GED_DB_DIRADD(_gedp,_dp,_name,_laddr,_len,_flags,_ptr,_ret) \ +#define GED_DB_DIRADD(_gedp, _dp, _name, _laddr, _len, _flags, _ptr, _ret) \ if (((_dp) = db_diradd((_gedp)->ged_wdbp->dbip, (_name), (_laddr), (_len), (_flags), (_ptr))) == DIR_NULL) { \ bu_vls_printf(&(_gedp)->ged_result_str, "An error has occured while adding a new object to the database."); \ return (_ret); \ } /* Lookup database object */ -#define GED_DB_LOOKUP(_gedp,_dp,_name,_noisy,_ret) \ +#define GED_DB_LOOKUP(_gedp, _dp, _name, _noisy, _ret) \ if (((_dp) = db_lookup((_gedp)->ged_wdbp->dbip, (_name), (_noisy))) == DIR_NULL) { \ bu_vls_printf(&(_gedp)->ged_result_str, "%s: not found", (_name)); \ return (_ret); \ } /* Get internal representation */ -#define GED_DB_GET_INTERNAL(_gedp,_intern,_dp,_mat,_resource,_ret) \ +#define GED_DB_GET_INTERNAL(_gedp, _intern, _dp, _mat, _resource, _ret) \ if (rt_db_get_internal((_intern), (_dp), (_gedp)->ged_wdbp->dbip, (_mat), (_resource)) < 0) { \ bu_vls_printf(&(_gedp)->ged_result_str, "Database read error, aborting"); \ return (_ret); \ } /* Put internal representation */ -#define GED_DB_PUT_INTERNAL(_gedp,_dp,_intern,_resource,_ret) \ +#define GED_DB_PUT_INTERNAL(_gedp, _dp, _intern, _resource, _ret) \ if (rt_db_put_internal((_dp), (_gedp)->ged_wdbp->dbip, (_intern), (_resource)) < 0) { \ bu_vls_printf(&(_gedp)->ged_result_str, "Database write error, aborting"); \ return (_ret); \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2008-08-22 02:11:43
|
Revision: 32500 http://brlcad.svn.sourceforge.net/brlcad/?rev=32500&view=rev Author: brlcad Date: 2008-08-22 02:11:53 +0000 (Fri, 22 Aug 2008) Log Message: ----------- doxygenify the macros Modified Paths: -------------- brlcad/trunk/include/ged.h Modified: brlcad/trunk/include/ged.h =================================================================== --- brlcad/trunk/include/ged.h 2008-08-22 02:10:03 UTC (rev 32499) +++ brlcad/trunk/include/ged.h 2008-08-22 02:11:53 UTC (rev 32500) @@ -94,14 +94,14 @@ } #endif -/* Check if the object is a combination */ +/** Check if the object is a combination */ #define GED_CHECK_COMB(_gedp, _dp, _ret) \ if (((_dp)->d_flags & DIR_COMB) == 0) { \ bu_vls_printf(&(_gedp)->ged_result_str, "%s: not a combination", (_dp)->d_namep); \ return (_ret); \ } -/* Check if a database is open */ +/** Check if a database is open */ #define GED_CHECK_DATABASE_OPEN(_gedp, _ret) \ if ((_gedp) == GED_NULL || (_gedp)->ged_wdbp == RT_WDB_NULL || (_gedp)->ged_wdbp->dbip == DBI_NULL) { \ if ((_gedp) != GED_NULL) \ @@ -111,35 +111,35 @@ return (_ret); \ } -/* Check if a drawable exists */ +/** Check if a drawable exists */ #define GED_CHECK_DRAWABLE(_gedp, _ret) \ if (_gedp->ged_gdp == GED_DRAWABLE_NULL) { \ bu_vls_printf(&(_gedp)->ged_result_str, "A drawable does not exist!"); \ return (_ret); \ } -/* Check if a view exists */ +/** Check if a view exists */ #define GED_CHECK_VIEW(_gedp, _ret) \ if (_gedp->ged_gvp == GED_VIEW_NULL) { \ bu_vls_printf(&(_gedp)->ged_result_str, "A view does not exist!"); \ return (_ret); \ } -/* Lookup database object */ +/** Lookup database object */ #define GED_CHECK_EXISTS(_gedp, _name, _noisy, _ret) \ if (db_lookup((_gedp)->ged_wdbp->dbip, (_name), (_noisy)) != DIR_NULL) { \ bu_vls_printf(&(_gedp)->ged_result_str, "%s already exists", (_name)); \ return (_ret); \ } -/* Check if the database is read only */ +/** Check if the database is read only */ #define GED_CHECK_READ_ONLY(_gedp, _ret) \ if ((_gedp)->ged_wdbp->dbip->dbi_read_only) { \ bu_vls_printf(&(_gedp)->ged_result_str, "Sorry, this database is READ-ONLY"); \ return (_ret); \ } -/* Check if the object is a region */ +/** Check if the object is a region */ #define GED_CHECK_REGION(_gedp, _dp, _ret) \ if (((_dp)->d_flags & DIR_REGION) == 0) { \ bu_vls_printf(&(_gedp)->ged_result_str, "%s: not a region", (_dp)->d_namep); \ @@ -152,21 +152,21 @@ return (_ret); \ } -/* Lookup database object */ +/** Lookup database object */ #define GED_DB_LOOKUP(_gedp, _dp, _name, _noisy, _ret) \ if (((_dp) = db_lookup((_gedp)->ged_wdbp->dbip, (_name), (_noisy))) == DIR_NULL) { \ bu_vls_printf(&(_gedp)->ged_result_str, "%s: not found", (_name)); \ return (_ret); \ } -/* Get internal representation */ +/** Get internal representation */ #define GED_DB_GET_INTERNAL(_gedp, _intern, _dp, _mat, _resource, _ret) \ if (rt_db_get_internal((_intern), (_dp), (_gedp)->ged_wdbp->dbip, (_mat), (_resource)) < 0) { \ bu_vls_printf(&(_gedp)->ged_result_str, "Database read error, aborting"); \ return (_ret); \ } -/* Put internal representation */ +/** Put internal representation */ #define GED_DB_PUT_INTERNAL(_gedp, _dp, _intern, _resource, _ret) \ if (rt_db_put_internal((_dp), (_gedp)->ged_wdbp->dbip, (_intern), (_resource)) < 0) { \ bu_vls_printf(&(_gedp)->ged_result_str, "Database write error, aborting"); \ @@ -272,10 +272,10 @@ struct bu_list l; struct rt_wdb *ged_wdbp; - /* for catching log messages */ + /** for catching log messages */ struct bu_vls ged_log; - /* for setting results */ + /** for setting results */ void *ged_result; struct bu_vls ged_result_str; unsigned int ged_result_flags; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2008-08-22 04:25:27
|
Revision: 32501 http://brlcad.svn.sourceforge.net/brlcad/?rev=32501&view=rev Author: brlcad Date: 2008-08-22 04:25:37 +0000 (Fri, 22 Aug 2008) Log Message: ----------- add a GED_CHECK_ARGC_GT_0 macro to make sure argc is > 0 on all commands. this really belongs in a wrapper function for categories of commands, but it'll do fo r now and is better than having the replication throughout. Modified Paths: -------------- brlcad/trunk/include/ged.h Modified: brlcad/trunk/include/ged.h =================================================================== --- brlcad/trunk/include/ged.h 2008-08-22 02:11:53 UTC (rev 32500) +++ brlcad/trunk/include/ged.h 2008-08-22 04:25:37 UTC (rev 32501) @@ -62,6 +62,13 @@ #define GED_DRAWABLE_NULL (struct ged_drawable *)0 #define GED_VIEW_NULL (struct ged_view *)0 +#define GED_VIEW_OBJ_NULL ((struct view_obj *)0) +#define GED_RESULT_NULL ((void *)0) +#define GED_RESULT_FLAGS_HELP_BIT 0x1 + +#define GED_FUNC_PTR_NULL (ged_func_ptr)0 + + /*XXX This macro is temporary */ #define GED_INIT(_gedp, _wdbp) { \ bu_vls_init(&(_gedp)->ged_log); \ @@ -146,6 +153,14 @@ return (_ret); \ } +/** make sure there is a command name given */ +#define GED_CHECK_ARGC_GT_0(_gedp, _argc, _ret) \ + if ((_argc) < 1) { \ + bu_vls_printf(&(_gedp)->ged_result_str, "ERROR: command name not provided (%s:%d)", __FILE__, __LINE__); \ + return (_ret); \ + } + +/** add a new directory entry to the currently open database */ #define GED_DB_DIRADD(_gedp, _dp, _name, _laddr, _len, _flags, _ptr, _ret) \ if (((_dp) = db_diradd((_gedp)->ged_wdbp->dbip, (_name), (_laddr), (_len), (_flags), (_ptr))) == DIR_NULL) { \ bu_vls_printf(&(_gedp)->ged_result_str, "An error has occured while adding a new object to the database."); \ @@ -294,7 +309,9 @@ #endif }; +typedef int (*ged_func_ptr)(struct ged *, int, const char *[]); + /** * V I E W _ O B J * @@ -326,13 +343,7 @@ int vo_zclip; }; -typedef int (*ged_func_ptr)(struct ged *, int, const char *[]); -#define GED_FUNC_PTR_NULL (ged_func_ptr)0 -#define GED_VIEW_OBJ_NULL ((struct view_obj *)0) -#define GED_RESULT_NULL ((void *)0) -#define GED_RESULT_FLAGS_HELP_BIT 0x1 - /* defined in ged.c */ GED_EXPORT BU_EXTERN(struct ged *ged_open, (const char *dbtype, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2008-09-06 23:58:28
|
Revision: 32592 http://brlcad.svn.sourceforge.net/brlcad/?rev=32592&view=rev Author: brlcad Date: 2008-09-06 23:58:38 +0000 (Sat, 06 Sep 2008) Log Message: ----------- have GED_INIT() call ged_init() since it does almost everything we need Modified Paths: -------------- brlcad/trunk/include/ged.h Modified: brlcad/trunk/include/ged.h =================================================================== --- brlcad/trunk/include/ged.h 2008-09-06 23:57:55 UTC (rev 32591) +++ brlcad/trunk/include/ged.h 2008-09-06 23:58:38 UTC (rev 32592) @@ -76,10 +76,7 @@ /*XXX This macro is temporary */ #define GED_INIT(_gedp, _wdbp) { \ - bu_vls_init(&(_gedp)->ged_log); \ - bu_vls_init(&(_gedp)->ged_result_str); \ - bu_vls_extend(&(_gedp)->ged_log, 1); \ - bu_vls_extend(&(_gedp)->ged_result_str, 1); \ + ged_init((_gedp)); \ (_gedp)->ged_wdbp = (_wdbp); \ } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2008-09-18 21:17:21
|
Revision: 32675 http://brlcad.svn.sourceforge.net/brlcad/?rev=32675&view=rev Author: brlcad Date: 2008-09-19 04:17:30 +0000 (Fri, 19 Sep 2008) Log Message: ----------- missing declaration of wdb_stub_cmd for windows (it's used by mged) Modified Paths: -------------- brlcad/trunk/include/ged.h Modified: brlcad/trunk/include/ged.h =================================================================== --- brlcad/trunk/include/ged.h 2008-09-19 04:13:01 UTC (rev 32674) +++ brlcad/trunk/include/ged.h 2008-09-19 04:17:30 UTC (rev 32675) @@ -735,6 +735,11 @@ Tcl_Interp *interp, int argc, char *argv[])); +GED_EXPORT BU_EXTERN(int wdb_stub_cmd, + (struct rt_wdb *wdbp, + Tcl_Interp *interp, + int argc, + char *argv[])); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bo...@us...> - 2008-12-23 19:24:33
|
Revision: 33431 http://brlcad.svn.sourceforge.net/brlcad/?rev=33431&view=rev Author: bob1961 Date: 2008-12-23 19:24:17 +0000 (Tue, 23 Dec 2008) Log Message: ----------- Exposing ged_view_update(). Modified Paths: -------------- brlcad/trunk/include/ged.h Modified: brlcad/trunk/include/ged.h =================================================================== --- brlcad/trunk/include/ged.h 2008-12-22 22:35:07 UTC (rev 33430) +++ brlcad/trunk/include/ged.h 2008-12-23 19:24:17 UTC (rev 33431) @@ -108,7 +108,7 @@ bu_vls_trunc(&(_gedp)->ged_result_str, 0); \ bu_vls_printf(&(_gedp)->ged_result_str, "A database is not open!"); \ } else \ - bu_log("A database is not open!"); \ + bu_log("A database is not open!\n"); \ return (_ret); \ } @@ -1059,6 +1059,8 @@ const fastf_t *l, const fastf_t *h, const fastf_t *eye)); +GED_EXPORT BU_EXTERN(void ged_view_update, + (struct ged_view *gvp)); /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bo...@us...> - 2008-12-31 20:04:03
|
Revision: 33437 http://brlcad.svn.sourceforge.net/brlcad/?rev=33437&view=rev Author: bob1961 Date: 2008-12-31 20:03:49 +0000 (Wed, 31 Dec 2008) Log Message: ----------- Activate struct ged's gv_callback and gv_clientData members. Added a few function declarations. Modified Paths: -------------- brlcad/trunk/include/ged.h Modified: brlcad/trunk/include/ged.h =================================================================== --- brlcad/trunk/include/ged.h 2008-12-31 20:00:26 UTC (rev 33436) +++ brlcad/trunk/include/ged.h 2008-12-31 20:03:49 UTC (rev 33437) @@ -347,9 +347,9 @@ mat_t gv_pmat; /**< @brief perspective matrix */ #if 0 struct bu_observer gv_observers; - void (*gv_callback)(); /**< @brief called in vo_update with gv_clientData and gvp */ +#endif + void (*gv_callback)(); /**< @brief called in ged_view_update with gvp and gv_clientData */ genptr_t gv_clientData; /**< @brief passed to gv_callback */ -#endif fastf_t gv_prevMouseX; fastf_t gv_prevMouseY; fastf_t gv_minMouseDelta; @@ -449,6 +449,10 @@ /* defined in ged.c */ GED_EXPORT BU_EXTERN(void ged_close, (struct ged *gedp)); +GED_EXPORT BU_EXTERN(void ged_drawable_close, + (struct ged_drawable *gdp)); +GED_EXPORT BU_EXTERN(void ged_free, + (struct ged *gedp)); GED_EXPORT BU_EXTERN(void ged_init, (struct ged *gedp)); GED_EXPORT BU_EXTERN(struct ged *ged_open, @@ -1152,6 +1156,7 @@ * Usage: * arot x y z angle */ +GED_EXPORT BU_EXTERN(int ged_arot_args, (struct ged *gedp, int argc, const char *argv[], mat_t rmat)); GED_EXPORT BU_EXTERN(int ged_arot, (struct ged *gedp, int argc, const char *argv[])); /** @@ -2246,6 +2251,7 @@ * Usage: * rot [-m|-v] x y z */ +GED_EXPORT BU_EXTERN(int ged_rot_args, (struct ged *gedp, int argc, const char *argv[], char *coord, mat_t rmat)); GED_EXPORT BU_EXTERN(int ged_rot, (struct ged *gedp, int argc, const char *argv[])); /** @@ -2326,6 +2332,7 @@ * Usage: * sca sf */ +GED_EXPORT BU_EXTERN(int ged_scale_args, (struct ged *gedp, int argc, const char *argv[], fastf_t *sf)); GED_EXPORT BU_EXTERN(int ged_scale, (struct ged *gedp, int argc, const char *argv[])); /** @@ -2491,6 +2498,7 @@ * Usage: * tra x y z */ +GED_EXPORT BU_EXTERN(int ged_tra_args, (struct ged *gedp, int argc, const char *argv[], char *coord, vect_t tvec)); GED_EXPORT BU_EXTERN(int ged_tra, (struct ged *gedp, int argc, const char *argv[])); /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bo...@us...> - 2009-02-24 20:25:42
|
Revision: 33896 http://brlcad.svn.sourceforge.net/brlcad/?rev=33896&view=rev Author: bob1961 Date: 2009-02-24 20:25:24 +0000 (Tue, 24 Feb 2009) Log Message: ----------- Added a declaration for ged_build_tops. Modified Paths: -------------- brlcad/trunk/include/ged.h Modified: brlcad/trunk/include/ged.h =================================================================== --- brlcad/trunk/include/ged.h 2009-02-24 19:30:24 UTC (rev 33895) +++ brlcad/trunk/include/ged.h 2009-02-24 20:25:24 UTC (rev 33896) @@ -462,6 +462,12 @@ GED_EXPORT BU_EXTERN(void ged_view_init, (struct ged_view *gvp)); +/* defined in rt.c */ +GED_EXPORT BU_EXTERN(int ged_build_tops, + (struct ged *gedp, + char **start, + register char **end)); + /* defined in wdb_comb_std.c */ GED_EXPORT BU_EXTERN(int wdb_comb_std_cmd, (struct rt_wdb *gedp, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2009-06-02 11:58:03
|
Revision: 34628 http://brlcad.svn.sourceforge.net/brlcad/?rev=34628&view=rev Author: brlcad Date: 2009-06-02 11:57:57 +0000 (Tue, 02 Jun 2009) Log Message: ----------- put the new GED_QUIET to use. if caller requests QUIET, then the ged_result_str should not be modified. Modified Paths: -------------- brlcad/trunk/include/ged.h Modified: brlcad/trunk/include/ged.h =================================================================== --- brlcad/trunk/include/ged.h 2009-06-02 11:38:41 UTC (rev 34627) +++ brlcad/trunk/include/ged.h 2009-06-02 11:57:57 UTC (rev 34628) @@ -113,95 +113,120 @@ } /** Check if the object is a combination */ -#define GED_CHECK_COMB(_gedp, _dp, _ret) \ +#define GED_CHECK_COMB(_gedp, _dp, _flags) \ if (((_dp)->d_flags & DIR_COMB) == 0) { \ - bu_vls_printf(&(_gedp)->ged_result_str, "%s: not a combination", (_dp)->d_namep); \ - return (_ret); \ + if (!((_flags) & GED_QUIET)) { \ + bu_vls_printf(&(_gedp)->ged_result_str, "%s: not a combination", (_dp)->d_namep); \ + } \ + return (_flags); \ } /** Check if a database is open */ -#define GED_CHECK_DATABASE_OPEN(_gedp, _ret) \ +#define GED_CHECK_DATABASE_OPEN(_gedp, _flags) \ if ((_gedp) == GED_NULL || (_gedp)->ged_wdbp == RT_WDB_NULL || (_gedp)->ged_wdbp->dbip == DBI_NULL) { \ - if ((_gedp) != GED_NULL) { \ - bu_vls_trunc(&(_gedp)->ged_result_str, 0); \ - bu_vls_printf(&(_gedp)->ged_result_str, "A database is not open!"); \ - } else \ - bu_log("A database is not open!\n"); \ - return (_ret); \ + if (!((_flags) & GED_QUIET)) { \ + if ((_gedp) != GED_NULL) { \ + bu_vls_trunc(&(_gedp)->ged_result_str, 0); \ + bu_vls_printf(&(_gedp)->ged_result_str, "A database is not open!"); \ + } else {\ + bu_log("A database is not open!\n"); \ + } \ + } \ + return (_flags); \ } /** Check if a drawable exists */ -#define GED_CHECK_DRAWABLE(_gedp, _ret) \ +#define GED_CHECK_DRAWABLE(_gedp, _flags) \ if (_gedp->ged_gdp == GED_DRAWABLE_NULL) { \ - bu_vls_trunc(&(_gedp)->ged_result_str, 0); \ - bu_vls_printf(&(_gedp)->ged_result_str, "A drawable does not exist!"); \ - return (_ret); \ + if (!((_flags) & GED_QUIET)) { \ + bu_vls_trunc(&(_gedp)->ged_result_str, 0); \ + bu_vls_printf(&(_gedp)->ged_result_str, "A drawable does not exist!"); \ + } \ + return (_flags); \ } /** Check if a view exists */ -#define GED_CHECK_VIEW(_gedp, _ret) \ +#define GED_CHECK_VIEW(_gedp, _flags) \ if (_gedp->ged_gvp == GED_VIEW_NULL) { \ - bu_vls_trunc(&(_gedp)->ged_result_str, 0); \ - bu_vls_printf(&(_gedp)->ged_result_str, "A view does not exist!"); \ - return (_ret); \ + if (!((_flags) & GED_QUIET)) { \ + bu_vls_trunc(&(_gedp)->ged_result_str, 0); \ + bu_vls_printf(&(_gedp)->ged_result_str, "A view does not exist!"); \ + } \ + return (_flags); \ } /** Lookup database object */ -#define GED_CHECK_EXISTS(_gedp, _name, _noisy, _ret) \ +#define GED_CHECK_EXISTS(_gedp, _name, _noisy, _flags) \ if (db_lookup((_gedp)->ged_wdbp->dbip, (_name), (_noisy)) != DIR_NULL) { \ - bu_vls_printf(&(_gedp)->ged_result_str, "%s already exists", (_name)); \ - return (_ret); \ + if (!((_flags) & GED_QUIET)) { \ + bu_vls_printf(&(_gedp)->ged_result_str, "%s already exists", (_name)); \ + } \ + return (_flags); \ } /** Check if the database is read only */ -#define GED_CHECK_READ_ONLY(_gedp, _ret) \ +#define GED_CHECK_READ_ONLY(_gedp, _flags) \ if ((_gedp)->ged_wdbp->dbip->dbi_read_only) { \ - bu_vls_trunc(&(_gedp)->ged_result_str, 0); \ - bu_vls_printf(&(_gedp)->ged_result_str, "Sorry, this database is READ-ONLY"); \ - return (_ret); \ + if (!((_flags) & GED_QUIET)) { \ + bu_vls_trunc(&(_gedp)->ged_result_str, 0); \ + bu_vls_printf(&(_gedp)->ged_result_str, "Sorry, this database is READ-ONLY"); \ + } \ + return (_flags); \ } /** Check if the object is a region */ -#define GED_CHECK_REGION(_gedp, _dp, _ret) \ +#define GED_CHECK_REGION(_gedp, _dp, _flags) \ if (((_dp)->d_flags & DIR_REGION) == 0) { \ - bu_vls_printf(&(_gedp)->ged_result_str, "%s: not a region", (_dp)->d_namep); \ - return (_ret); \ + if (!((_flags) & GED_QUIET)) { \ + bu_vls_printf(&(_gedp)->ged_result_str, "%s: not a region", (_dp)->d_namep); \ + } \ + return (_flags); \ } /** make sure there is a command name given */ -#define GED_CHECK_ARGC_GT_0(_gedp, _argc, _ret) \ +#define GED_CHECK_ARGC_GT_0(_gedp, _argc, _flags) \ if ((_argc) < 1) { \ - bu_vls_trunc(&(_gedp)->ged_result_str, 0); \ - bu_vls_printf(&(_gedp)->ged_result_str, "ERROR: command name not provided (%s:%d)", __FILE__, __LINE__); \ - return (_ret); \ + if (!((_flags) & GED_QUIET)) { \ + bu_vls_trunc(&(_gedp)->ged_result_str, 0); \ + bu_vls_printf(&(_gedp)->ged_result_str, "ERROR: command name not provided (%s:%d)", __FILE__, __LINE__); \ + } \ + return (_flags); \ } /** add a new directory entry to the currently open database */ -#define GED_DB_DIRADD(_gedp, _dp, _name, _laddr, _len, _flags, _ptr, _ret) \ - if (((_dp) = db_diradd((_gedp)->ged_wdbp->dbip, (_name), (_laddr), (_len), (_flags), (_ptr))) == DIR_NULL) { \ - bu_vls_printf(&(_gedp)->ged_result_str, "An error has occurred while adding a new object to the database."); \ - return (_ret); \ +#define GED_DB_DIRADD(_gedp, _dp, _name, _laddr, _len, _dirflags, _ptr, _flags) \ + if (((_dp) = db_diradd((_gedp)->ged_wdbp->dbip, (_name), (_laddr), (_len), (_dirflags), (_ptr))) == DIR_NULL) { \ + if (!((_flags) & GED_QUIET)) { \ + bu_vls_printf(&(_gedp)->ged_result_str, "An error has occurred while adding a new object to the database."); \ + } \ + return (_flags); \ } /** Lookup database object */ -#define GED_DB_LOOKUP(_gedp, _dp, _name, _noisy, _ret) \ +#define GED_DB_LOOKUP(_gedp, _dp, _name, _noisy, _flags) \ if (((_dp) = db_lookup((_gedp)->ged_wdbp->dbip, (_name), (_noisy))) == DIR_NULL) { \ - bu_vls_printf(&(_gedp)->ged_result_str, "%s: not found", (_name)); \ - return (_ret); \ + if (!((_flags) & GED_QUIET)) { \ + bu_vls_printf(&(_gedp)->ged_result_str, "%s: not found", (_name)); \ + } \ + return (_flags); \ } /** Get internal representation */ -#define GED_DB_GET_INTERNAL(_gedp, _intern, _dp, _mat, _resource, _ret) \ +#define GED_DB_GET_INTERNAL(_gedp, _intern, _dp, _mat, _resource, _flags) \ if (rt_db_get_internal((_intern), (_dp), (_gedp)->ged_wdbp->dbip, (_mat), (_resource)) < 0) { \ - bu_vls_printf(&(_gedp)->ged_result_str, "Database read error, aborting"); \ - return (_ret); \ + if (!((_flags) & GED_QUIET)) { \ + bu_vls_printf(&(_gedp)->ged_result_str, "Database read error, aborting"); \ + } \ + return (_flags); \ } /** Put internal representation */ -#define GED_DB_PUT_INTERNAL(_gedp, _dp, _intern, _resource, _ret) \ +#define GED_DB_PUT_INTERNAL(_gedp, _dp, _intern, _resource, _flags) \ if (rt_db_put_internal((_dp), (_gedp)->ged_wdbp->dbip, (_intern), (_resource)) < 0) { \ - bu_vls_printf(&(_gedp)->ged_result_str, "Database write error, aborting"); \ - return (_ret); \ + if (!((_flags) & GED_QUIET)) { \ + bu_vls_printf(&(_gedp)->ged_result_str, "Database write error, aborting"); \ + } \ + return (_flags); \ } struct ged_adc_state { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2009-06-02 12:02:20
|
Revision: 34629 http://brlcad.svn.sourceforge.net/brlcad/?rev=34629&view=rev Author: brlcad Date: 2009-06-02 12:02:19 +0000 (Tue, 02 Jun 2009) Log Message: ----------- document the four command failure return codes Modified Paths: -------------- brlcad/trunk/include/ged.h Modified: brlcad/trunk/include/ged.h =================================================================== --- brlcad/trunk/include/ged.h 2009-06-02 11:57:57 UTC (rev 34628) +++ brlcad/trunk/include/ged.h 2009-06-02 12:02:19 UTC (rev 34629) @@ -59,10 +59,10 @@ * possible maskable return codes from ged functions. callers should * not rely on the actual values but should instead test via masking. */ -#define GED_ERROR 0x0001 -#define GED_HELP 0x0002 -#define GED_MORE 0x0004 -#define GED_QUIET 0x0008 +#define GED_ERROR 0x0001 /**< something went wrong, the action was not performed */ +#define GED_HELP 0x0002 /**< invalid specification, result contains usage */ +#define GED_MORE 0x0004 /**< incomplete specification, can specify again interactively */ +#define GED_QUIET 0x0008 /**< don't set or modify the result string */ #define GED_VMIN -2048.0 #define GED_VMAX 2047.0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2009-06-06 02:25:04
|
Revision: 34686 http://brlcad.svn.sourceforge.net/brlcad/?rev=34686&view=rev Author: brlcad Date: 2009-06-06 02:24:58 +0000 (Sat, 06 Jun 2009) Log Message: ----------- say the name of the object we couldn't add, but don't call it an error Modified Paths: -------------- brlcad/trunk/include/ged.h Modified: brlcad/trunk/include/ged.h =================================================================== --- brlcad/trunk/include/ged.h 2009-06-06 02:24:19 UTC (rev 34685) +++ brlcad/trunk/include/ged.h 2009-06-06 02:24:58 UTC (rev 34686) @@ -197,7 +197,7 @@ #define GED_DB_DIRADD(_gedp, _dp, _name, _laddr, _len, _dirflags, _ptr, _flags) \ if (((_dp) = db_diradd((_gedp)->ged_wdbp->dbip, (_name), (_laddr), (_len), (_dirflags), (_ptr))) == DIR_NULL) { \ if (!((_flags) & GED_QUIET)) { \ - bu_vls_printf(&(_gedp)->ged_result_str, "An error has occurred while adding a new object to the database."); \ + bu_vls_printf(&(_gedp)->ged_result_str, "Unable to add %s to the database.", (_name)); \ } \ return (_flags); \ } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2009-06-06 02:29:39
|
Revision: 34687 http://brlcad.svn.sourceforge.net/brlcad/?rev=34687&view=rev Author: brlcad Date: 2009-06-06 02:29:38 +0000 (Sat, 06 Jun 2009) Log Message: ----------- result message consistency Modified Paths: -------------- brlcad/trunk/include/ged.h Modified: brlcad/trunk/include/ged.h =================================================================== --- brlcad/trunk/include/ged.h 2009-06-06 02:24:58 UTC (rev 34686) +++ brlcad/trunk/include/ged.h 2009-06-06 02:29:38 UTC (rev 34687) @@ -116,7 +116,7 @@ #define GED_CHECK_COMB(_gedp, _dp, _flags) \ if (((_dp)->d_flags & DIR_COMB) == 0) { \ if (!((_flags) & GED_QUIET)) { \ - bu_vls_printf(&(_gedp)->ged_result_str, "%s: not a combination", (_dp)->d_namep); \ + bu_vls_printf(&(_gedp)->ged_result_str, "%s is not a combination", (_dp)->d_namep); \ } \ return (_flags); \ } @@ -140,7 +140,7 @@ if (_gedp->ged_gdp == GED_DRAWABLE_NULL) { \ if (!((_flags) & GED_QUIET)) { \ bu_vls_trunc(&(_gedp)->ged_result_str, 0); \ - bu_vls_printf(&(_gedp)->ged_result_str, "A drawable does not exist!"); \ + bu_vls_printf(&(_gedp)->ged_result_str, "A drawable does not exist."); \ } \ return (_flags); \ } @@ -150,7 +150,7 @@ if (_gedp->ged_gvp == GED_VIEW_NULL) { \ if (!((_flags) & GED_QUIET)) { \ bu_vls_trunc(&(_gedp)->ged_result_str, 0); \ - bu_vls_printf(&(_gedp)->ged_result_str, "A view does not exist!"); \ + bu_vls_printf(&(_gedp)->ged_result_str, "A view does not exist."); \ } \ return (_flags); \ } @@ -178,7 +178,7 @@ #define GED_CHECK_REGION(_gedp, _dp, _flags) \ if (((_dp)->d_flags & DIR_REGION) == 0) { \ if (!((_flags) & GED_QUIET)) { \ - bu_vls_printf(&(_gedp)->ged_result_str, "%s: not a region", (_dp)->d_namep); \ + bu_vls_printf(&(_gedp)->ged_result_str, "%s is not a region.", (_dp)->d_namep); \ } \ return (_flags); \ } @@ -188,7 +188,7 @@ if ((_argc) < 1) { \ if (!((_flags) & GED_QUIET)) { \ bu_vls_trunc(&(_gedp)->ged_result_str, 0); \ - bu_vls_printf(&(_gedp)->ged_result_str, "ERROR: command name not provided (%s:%d)", __FILE__, __LINE__); \ + bu_vls_printf(&(_gedp)->ged_result_str, "Command name not provided (%s:%d)", __FILE__, __LINE__); \ } \ return (_flags); \ } @@ -206,7 +206,7 @@ #define GED_DB_LOOKUP(_gedp, _dp, _name, _noisy, _flags) \ if (((_dp) = db_lookup((_gedp)->ged_wdbp->dbip, (_name), (_noisy))) == DIR_NULL) { \ if (!((_flags) & GED_QUIET)) { \ - bu_vls_printf(&(_gedp)->ged_result_str, "%s: not found", (_name)); \ + bu_vls_printf(&(_gedp)->ged_result_str, "Unable to find %s in the database.", (_name)); \ } \ return (_flags); \ } @@ -215,7 +215,7 @@ #define GED_DB_GET_INTERNAL(_gedp, _intern, _dp, _mat, _resource, _flags) \ if (rt_db_get_internal((_intern), (_dp), (_gedp)->ged_wdbp->dbip, (_mat), (_resource)) < 0) { \ if (!((_flags) & GED_QUIET)) { \ - bu_vls_printf(&(_gedp)->ged_result_str, "Database read error, aborting"); \ + bu_vls_printf(&(_gedp)->ged_result_str, "Database read failure."); \ } \ return (_flags); \ } @@ -224,7 +224,7 @@ #define GED_DB_PUT_INTERNAL(_gedp, _dp, _intern, _resource, _flags) \ if (rt_db_put_internal((_dp), (_gedp)->ged_wdbp->dbip, (_intern), (_resource)) < 0) { \ if (!((_flags) & GED_QUIET)) { \ - bu_vls_printf(&(_gedp)->ged_result_str, "Database write error, aborting"); \ + bu_vls_printf(&(_gedp)->ged_result_str, "Database write failure."); \ } \ return (_flags); \ } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2009-06-06 02:32:22
|
Revision: 34688 http://brlcad.svn.sourceforge.net/brlcad/?rev=34688&view=rev Author: brlcad Date: 2009-06-06 02:32:21 +0000 (Sat, 06 Jun 2009) Log Message: ----------- missed a couple punctuation consistencies Modified Paths: -------------- brlcad/trunk/include/ged.h Modified: brlcad/trunk/include/ged.h =================================================================== --- brlcad/trunk/include/ged.h 2009-06-06 02:29:38 UTC (rev 34687) +++ brlcad/trunk/include/ged.h 2009-06-06 02:32:21 UTC (rev 34688) @@ -159,7 +159,7 @@ #define GED_CHECK_EXISTS(_gedp, _name, _noisy, _flags) \ if (db_lookup((_gedp)->ged_wdbp->dbip, (_name), (_noisy)) != DIR_NULL) { \ if (!((_flags) & GED_QUIET)) { \ - bu_vls_printf(&(_gedp)->ged_result_str, "%s already exists", (_name)); \ + bu_vls_printf(&(_gedp)->ged_result_str, "%s already exists.", (_name)); \ } \ return (_flags); \ } @@ -169,7 +169,7 @@ if ((_gedp)->ged_wdbp->dbip->dbi_read_only) { \ if (!((_flags) & GED_QUIET)) { \ bu_vls_trunc(&(_gedp)->ged_result_str, 0); \ - bu_vls_printf(&(_gedp)->ged_result_str, "Sorry, this database is READ-ONLY"); \ + bu_vls_printf(&(_gedp)->ged_result_str, "Sorry, this database is READ-ONLY."); \ } \ return (_flags); \ } @@ -188,7 +188,7 @@ if ((_argc) < 1) { \ if (!((_flags) & GED_QUIET)) { \ bu_vls_trunc(&(_gedp)->ged_result_str, 0); \ - bu_vls_printf(&(_gedp)->ged_result_str, "Command name not provided (%s:%d)", __FILE__, __LINE__); \ + bu_vls_printf(&(_gedp)->ged_result_str, "Command name not provided on (%s:%d).", __FILE__, __LINE__); \ } \ return (_flags); \ } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2009-09-17 11:34:21
|
Revision: 35934 http://brlcad.svn.sourceforge.net/brlcad/?rev=35934&view=rev Author: brlcad Date: 2009-09-17 11:34:13 +0000 (Thu, 17 Sep 2009) Log Message: ----------- begin providing means to dig into the gedp without the user needing to know the internal structure directly. provide a GED_INITIALIZED() which checks for a non-null wdbp. provide GED_LOCAL2BASE() and GED_BASE2LOCAL() that return the database conversion factors. Modified Paths: -------------- brlcad/trunk/include/ged.h Modified: brlcad/trunk/include/ged.h =================================================================== --- brlcad/trunk/include/ged.h 2009-09-17 08:01:14 UTC (rev 35933) +++ brlcad/trunk/include/ged.h 2009-09-17 11:34:13 UTC (rev 35934) @@ -113,6 +113,10 @@ (_gedp)->ged_wdbp = (_wdbp); \ } +#define GED_INITIALIZED(_gedp) ((_gedp)->ged_wdbp != RT_WDB_NULL) +#define GED_LOCAL2BASE(_gedp) ((_gedp)->ged_wdbp->dbip->dbi_local2base) +#define GED_BASE2LOCAL(_gedp) ((_gedp)->ged_wdbp->dbip->dbi_base2local) + /** Check if the object is a combination */ #define GED_CHECK_COMB(_gedp, _dp, _flags) \ if (((_dp)->d_flags & DIR_COMB) == 0) { \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2009-09-17 11:42:16
|
Revision: 35936 http://brlcad.svn.sourceforge.net/brlcad/?rev=35936&view=rev Author: brlcad Date: 2009-09-17 11:42:08 +0000 (Thu, 17 Sep 2009) Log Message: ----------- ugh, ged_internal_call? really? this needs to die. Modified Paths: -------------- brlcad/trunk/include/ged.h Modified: brlcad/trunk/include/ged.h =================================================================== --- brlcad/trunk/include/ged.h 2009-09-17 11:35:15 UTC (rev 35935) +++ brlcad/trunk/include/ged.h 2009-09-17 11:42:08 UTC (rev 35936) @@ -444,6 +444,7 @@ void (*ged_output_handler)(); /**< @brief function for handling output */ char *ged_output_script; /**< @brief script for use by the outputHandler */ + /* FIXME -- this ugly hack needs to die. the result string should be stored before the call. */ int ged_internal_call; }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2009-10-29 11:30:46
|
Revision: 36313 http://brlcad.svn.sourceforge.net/brlcad/?rev=36313&view=rev Author: brlcad Date: 2009-10-29 11:30:35 +0000 (Thu, 29 Oct 2009) Log Message: ----------- declare ged_annotate() Modified Paths: -------------- brlcad/trunk/include/ged.h Modified: brlcad/trunk/include/ged.h =================================================================== --- brlcad/trunk/include/ged.h 2009-10-29 11:29:57 UTC (rev 36312) +++ brlcad/trunk/include/ged.h 2009-10-29 11:30:35 UTC (rev 36313) @@ -1227,6 +1227,14 @@ GED_EXPORT BU_EXTERN(int ged_analyze, (struct ged *gedp, int argc, const char *argv[])); /** + * Creates an annotation. + * + * Usage: + * annotate [object(s)] [-n name] [-p x y z] [-t type] [-m message] + */ +GED_EXPORT BU_EXTERN(int ged_annotate, (struct ged *gedp, int argc, const char *argv[])); + +/** * Allow editing of the matrix, etc., along an arc. * * Usage: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bo...@us...> - 2009-11-24 17:35:28
|
Revision: 36615 http://brlcad.svn.sourceforge.net/brlcad/?rev=36615&view=rev Author: bob1961 Date: 2009-11-24 17:35:20 +0000 (Tue, 24 Nov 2009) Log Message: ----------- Added gas_num_data_points and gas_data_points members to struct ged_axes_state. Also added gv_data_axes member to struct ged_view. Modified Paths: -------------- brlcad/trunk/include/ged.h Modified: brlcad/trunk/include/ged.h =================================================================== --- brlcad/trunk/include/ged.h 2009-11-24 17:32:42 UTC (rev 36614) +++ brlcad/trunk/include/ged.h 2009-11-24 17:35:20 UTC (rev 36615) @@ -276,6 +276,8 @@ int gas_tick_threshold; int gas_tick_color[3]; int gas_tick_major_color[3]; + int gas_num_data_points; + point_t *gas_data_points; /* in view coordinates */ }; struct ged_grid_state { @@ -415,6 +417,7 @@ int gv_mode; int gv_zclip; struct ged_adc_state gv_adc; + struct ged_axes_state gv_data_axes; struct ged_axes_state gv_model_axes; struct ged_axes_state gv_view_axes; struct ged_grid_state gv_grid; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bo...@us...> - 2010-01-29 23:03:13
|
Revision: 37505 http://brlcad.svn.sourceforge.net/brlcad/?rev=37505&view=rev Author: bob1961 Date: 2010-01-29 23:03:06 +0000 (Fri, 29 Jan 2010) Log Message: ----------- Added a declaration for dbot_dump. Modified Paths: -------------- brlcad/trunk/include/ged.h Modified: brlcad/trunk/include/ged.h =================================================================== --- brlcad/trunk/include/ged.h 2010-01-29 23:01:56 UTC (rev 37504) +++ brlcad/trunk/include/ged.h 2010-01-29 23:03:06 UTC (rev 37505) @@ -1382,6 +1382,14 @@ GED_EXPORT BU_EXTERN(int ged_bot_dump, (struct ged *gedp, int argc, const char *argv[])); /** + * Dump displayed bots to the specified format. + * + * Usage: + * dbot_dump [-b] [-m directory] [-o file] [-t dxf|obj|sat|stl] [-u units]"; + */ +GED_EXPORT BU_EXTERN(int ged_dbot_dump, (struct ged *gedp, int argc, const char *argv[])); + +/** * Create new_bot by fusing faces in old_bot * * Usage: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bo...@us...> - 2010-03-16 17:57:31
|
Revision: 38075 http://brlcad.svn.sourceforge.net/brlcad/?rev=38075&view=rev Author: bob1961 Date: 2010-03-16 17:57:24 +0000 (Tue, 16 Mar 2010) Log Message: ----------- Added an abort parameter to the gd_rtCmdNotify member of struct ged_drawable. Modified Paths: -------------- brlcad/trunk/include/ged.h Modified: brlcad/trunk/include/ged.h =================================================================== --- brlcad/trunk/include/ged.h 2010-03-16 17:49:05 UTC (rev 38074) +++ brlcad/trunk/include/ged.h 2010-03-16 17:57:24 UTC (rev 38075) @@ -399,7 +399,7 @@ int gd_rt_cmd_len; struct ged_run_rt gd_headRunRt; /**< @brief head of forked rt processes */ - void (*gd_rtCmdNotify)(); /**< @brief function called when rt command completes */ + void (*gd_rtCmdNotify)(int abort); /**< @brief function called when rt command completes */ int gd_uplotOutputMode; /**< @brief output mode for unix plots */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2010-03-23 23:48:40
|
Revision: 38144 http://brlcad.svn.sourceforge.net/brlcad/?rev=38144&view=rev Author: brlcad Date: 2010-03-23 23:48:34 +0000 (Tue, 23 Mar 2010) Log Message: ----------- quell compilation warning, change abort to aborted to not hide abort(). Modified Paths: -------------- brlcad/trunk/include/ged.h Modified: brlcad/trunk/include/ged.h =================================================================== --- brlcad/trunk/include/ged.h 2010-03-23 20:42:27 UTC (rev 38143) +++ brlcad/trunk/include/ged.h 2010-03-23 23:48:34 UTC (rev 38144) @@ -399,7 +399,7 @@ int gd_rt_cmd_len; struct ged_run_rt gd_headRunRt; /**< @brief head of forked rt processes */ - void (*gd_rtCmdNotify)(int abort); /**< @brief function called when rt command completes */ + void (*gd_rtCmdNotify)(int aborted); /**< @brief function called when rt command completes */ int gd_uplotOutputMode; /**< @brief output mode for unix plots */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2010-05-05 01:45:05
|
Revision: 38970 http://brlcad.svn.sourceforge.net/brlcad/?rev=38970&view=rev Author: brlcad Date: 2010-05-05 01:44:58 +0000 (Wed, 05 May 2010) Log Message: ----------- there is no apparent reason the ged.h interface header should include windows i/o headers. Modified Paths: -------------- brlcad/trunk/include/ged.h Modified: brlcad/trunk/include/ged.h =================================================================== --- brlcad/trunk/include/ged.h 2010-05-05 00:33:08 UTC (rev 38969) +++ brlcad/trunk/include/ged.h 2010-05-05 01:44:58 UTC (rev 38970) @@ -29,12 +29,6 @@ #ifndef __GED_H__ #define __GED_H__ -#if defined(_WIN32) && !defined(__CYGWIN__) -# define NOMINMAX -# include <windows.h> -# include <io.h> -#endif - #include "raytrace.h" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <d_r...@us...> - 2010-05-05 08:41:39
|
Revision: 38972 http://brlcad.svn.sourceforge.net/brlcad/?rev=38972&view=rev Author: d_rossberg Date: 2010-05-05 08:41:32 +0000 (Wed, 05 May 2010) Log Message: ----------- unfortunately there is a reason why the ged.h interface header includes windows.h: struct ged_run_rt needs it for HANDLE and DWORD Modified Paths: -------------- brlcad/trunk/include/ged.h Modified: brlcad/trunk/include/ged.h =================================================================== --- brlcad/trunk/include/ged.h 2010-05-05 01:53:52 UTC (rev 38971) +++ brlcad/trunk/include/ged.h 2010-05-05 08:41:32 UTC (rev 38972) @@ -29,6 +29,11 @@ #ifndef __GED_H__ #define __GED_H__ +#if defined(_WIN32) && !defined(__CYGWIN__) +# define NOMINMAX +# include <windows.h> +#endif + #include "raytrace.h" @@ -1340,7 +1345,7 @@ * For input, source is a file name and dest is an object name. * For output source is an object name and dest is a file name. * Only uniform array binary objects (major_type=u) are currently supported}} - * + * * Usage: * binary {-i major_type minor_type | -o} dest source */ @@ -1577,7 +1582,7 @@ * * Usage: * debugbu [hex_code] - * + * */ GED_EXPORT BU_EXTERN(int ged_debugbu, (struct ged *gedp, int argc, const char *argv[])); @@ -1586,7 +1591,7 @@ * * Usage: * debugdir - * + * */ GED_EXPORT BU_EXTERN(int ged_debugdir, (struct ged *gedp, int argc, const char *argv[])); @@ -1595,7 +1600,7 @@ * * Usage: * debuglib [hex_code] - * + * */ GED_EXPORT BU_EXTERN(int ged_debuglib, (struct ged *gedp, int argc, const char *argv[])); @@ -1604,7 +1609,7 @@ * * Usage: * debugmem - * + * */ GED_EXPORT BU_EXTERN(int ged_debugmem, (struct ged *gedp, int argc, const char *argv[])); @@ -1613,7 +1618,7 @@ * * Usage: * debugnmg [hex_code] - * + * */ GED_EXPORT BU_EXTERN(int ged_debugnmg, (struct ged *gedp, int argc, const char *argv[])); @@ -1814,7 +1819,7 @@ * Get object attributes * * Usage: - * get object ?attr? + * get object ?attr? */ GED_EXPORT BU_EXTERN(int ged_get, (struct ged *gedp, int argc, const char *argv[])); @@ -1859,8 +1864,8 @@ GED_EXPORT BU_EXTERN(int ged_glob, (struct ged *gedp, int argc, const char *argv[])); /** - * * + * * Usage: * gqa args */ @@ -2274,7 +2279,7 @@ GED_EXPORT BU_EXTERN(int ged_orient, (struct ged *gedp, int argc, const char *argv[])); /** - * Rotate obj about the keypoint by + * Rotate obj about the keypoint by * * Usage: * orotate obj rX rY rZ [kX kY kZ] @@ -2747,8 +2752,8 @@ GED_EXPORT BU_EXTERN(int ged_size, (struct ged *gedp, int argc, const char *argv[])); /** - * * + * * Usage: * solids_on_ray */ @@ -2857,8 +2862,8 @@ #if 0 /** - * * + * * Usage: * tracker [-fh] [# links] [increment] [spline.iges] [link...] */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2010-05-14 03:49:45
|
Revision: 39212 http://brlcad.svn.sourceforge.net/brlcad/?rev=39212&view=rev Author: brlcad Date: 2010-05-14 03:49:39 +0000 (Fri, 14 May 2010) Log Message: ----------- stash the quiet flag value into a variable so we can quell warnings about the expression evaluating to a constant when the macro param itself is a constant. Modified Paths: -------------- brlcad/trunk/include/ged.h Modified: brlcad/trunk/include/ged.h =================================================================== --- brlcad/trunk/include/ged.h 2010-05-14 03:26:58 UTC (rev 39211) +++ brlcad/trunk/include/ged.h 2010-05-14 03:49:39 UTC (rev 39212) @@ -119,7 +119,8 @@ /** Check if the object is a combination */ #define GED_CHECK_COMB(_gedp, _dp, _flags) \ if (((_dp)->d_flags & DIR_COMB) == 0) { \ - if (!((_flags) & GED_QUIET)) { \ + int ged_check_comb_quiet = (_flags) & GED_QUIET; \ + if (!ged_check_comb_quiet) { \ bu_vls_printf(&(_gedp)->ged_result_str, "%s is not a combination", (_dp)->d_namep); \ } \ return (_flags); \ @@ -128,7 +129,8 @@ /** Check if a database is open */ #define GED_CHECK_DATABASE_OPEN(_gedp, _flags) \ if ((_gedp) == GED_NULL || (_gedp)->ged_wdbp == RT_WDB_NULL || (_gedp)->ged_wdbp->dbip == DBI_NULL) { \ - if (!((_flags) & GED_QUIET)) { \ + int ged_check_database_open_quiet = (_flags) & GED_QUIET; \ + if (!ged_check_database_open_quiet) { \ if ((_gedp) != GED_NULL) { \ bu_vls_trunc(&(_gedp)->ged_result_str, 0); \ bu_vls_printf(&(_gedp)->ged_result_str, "A database is not open!"); \ @@ -142,7 +144,8 @@ /** Check if a drawable exists */ #define GED_CHECK_DRAWABLE(_gedp, _flags) \ if (_gedp->ged_gdp == GED_DRAWABLE_NULL) { \ - if (!((_flags) & GED_QUIET)) { \ + int ged_check_drawable_quiet = (_flags) & GED_QUIET; \ + if (!ged_check_drawable_quiet) { \ bu_vls_trunc(&(_gedp)->ged_result_str, 0); \ bu_vls_printf(&(_gedp)->ged_result_str, "A drawable does not exist."); \ } \ @@ -152,7 +155,8 @@ /** Check if a view exists */ #define GED_CHECK_VIEW(_gedp, _flags) \ if (_gedp->ged_gvp == GED_VIEW_NULL) { \ - if (!((_flags) & GED_QUIET)) { \ + int ged_check_view_quiet = (_flags) & GED_QUIET; \ + if (!ged_check_view_quiet) { \ bu_vls_trunc(&(_gedp)->ged_result_str, 0); \ bu_vls_printf(&(_gedp)->ged_result_str, "A view does not exist."); \ } \ @@ -162,7 +166,8 @@ /** Lookup database object */ #define GED_CHECK_EXISTS(_gedp, _name, _noisy, _flags) \ if (db_lookup((_gedp)->ged_wdbp->dbip, (_name), (_noisy)) != DIR_NULL) { \ - if (!((_flags) & GED_QUIET)) { \ + int ged_check_exists_quiet = (_flags) & GED_QUIET; \ + if (!ged_check_exists_quiet) { \ bu_vls_printf(&(_gedp)->ged_result_str, "%s already exists.", (_name)); \ } \ return (_flags); \ @@ -171,7 +176,8 @@ /** Check if the database is read only */ #define GED_CHECK_READ_ONLY(_gedp, _flags) \ if ((_gedp)->ged_wdbp->dbip->dbi_read_only) { \ - if (!((_flags) & GED_QUIET)) { \ + int ged_check_read_only_quiet = (_flags) & GED_QUIET; \ + if (!ged_check_read_only_quiet) { \ bu_vls_trunc(&(_gedp)->ged_result_str, 0); \ bu_vls_printf(&(_gedp)->ged_result_str, "Sorry, this database is READ-ONLY."); \ } \ @@ -181,7 +187,8 @@ /** Check if the object is a region */ #define GED_CHECK_REGION(_gedp, _dp, _flags) \ if (((_dp)->d_flags & DIR_REGION) == 0) { \ - if (!((_flags) & GED_QUIET)) { \ + int ged_check_region_quiet = (_flags) & GED_QUIET; \ + if (!ged_check_region_quiet) { \ bu_vls_printf(&(_gedp)->ged_result_str, "%s is not a region.", (_dp)->d_namep); \ } \ return (_flags); \ @@ -190,7 +197,8 @@ /** make sure there is a command name given */ #define GED_CHECK_ARGC_GT_0(_gedp, _argc, _flags) \ if ((_argc) < 1) { \ - if (!((_flags) & GED_QUIET)) { \ + int ged_check_argc_gt_0_quiet = (_flags) & GED_QUIET; \ + if (!ged_check_argc_gt_0_quiet) { \ bu_vls_trunc(&(_gedp)->ged_result_str, 0); \ bu_vls_printf(&(_gedp)->ged_result_str, "Command name not provided on (%s:%d).", __FILE__, __LINE__); \ } \ @@ -200,7 +208,8 @@ /** add a new directory entry to the currently open database */ #define GED_DB_DIRADD(_gedp, _dp, _name, _laddr, _len, _dirflags, _ptr, _flags) \ if (((_dp) = db_diradd((_gedp)->ged_wdbp->dbip, (_name), (_laddr), (_len), (_dirflags), (_ptr))) == DIR_NULL) { \ - if (!((_flags) & GED_QUIET)) { \ + int ged_db_diradd_quiet = (_flags) & GED_QUIET; \ + if (!ged_db_diradd_quiet) { \ bu_vls_printf(&(_gedp)->ged_result_str, "Unable to add %s to the database.", (_name)); \ } \ return (_flags); \ @@ -209,7 +218,8 @@ /** Lookup database object */ #define GED_DB_LOOKUP(_gedp, _dp, _name, _noisy, _flags) \ if (((_dp) = db_lookup((_gedp)->ged_wdbp->dbip, (_name), (_noisy))) == DIR_NULL) { \ - if (!((_flags) & GED_QUIET)) { \ + int ged_db_lookup_quiet = (_flags) & GED_QUIET; \ + if (!ged_db_lookup_quiet) { \ bu_vls_printf(&(_gedp)->ged_result_str, "Unable to find %s in the database.", (_name)); \ } \ return (_flags); \ @@ -218,7 +228,8 @@ /** Get internal representation */ #define GED_DB_GET_INTERNAL(_gedp, _intern, _dp, _mat, _resource, _flags) \ if (rt_db_get_internal((_intern), (_dp), (_gedp)->ged_wdbp->dbip, (_mat), (_resource)) < 0) { \ - if (!((_flags) & GED_QUIET)) { \ + int ged_db_get_internal_quiet = (_flags) & GED_QUIET; \ + if (!ged_db_get_internal_quiet) { \ bu_vls_printf(&(_gedp)->ged_result_str, "Database read failure."); \ } \ return (_flags); \ @@ -227,7 +238,8 @@ /** Put internal representation */ #define GED_DB_PUT_INTERNAL(_gedp, _dp, _intern, _resource, _flags) \ if (rt_db_put_internal((_dp), (_gedp)->ged_wdbp->dbip, (_intern), (_resource)) < 0) { \ - if (!((_flags) & GED_QUIET)) { \ + int ged_db_put_internal_quiet = (_flags) & GED_QUIET; \ + if (!ged_db_put_internal_quiet) { \ bu_vls_printf(&(_gedp)->ged_result_str, "Database write failure."); \ } \ return (_flags); \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bo...@us...> - 2010-06-22 19:43:41
|
Revision: 39660 http://brlcad.svn.sourceforge.net/brlcad/?rev=39660&view=rev Author: bob1961 Date: 2010-06-22 19:43:35 +0000 (Tue, 22 Jun 2010) Log Message: ----------- Added a declaration for combmem. Modified Paths: -------------- brlcad/trunk/include/ged.h Modified: brlcad/trunk/include/ged.h =================================================================== --- brlcad/trunk/include/ged.h 2010-06-22 19:41:04 UTC (rev 39659) +++ brlcad/trunk/include/ged.h 2010-06-22 19:43:35 UTC (rev 39660) @@ -1542,6 +1542,14 @@ GED_EXPORT BU_EXTERN(int ged_comb_std, (struct ged *gedp, int argc, const char *argv[])); /** + * Set/get comb's members. + * + * Usage: + * combmem comb_name <az el tw tx ty tz sa sx sy sz ...> + */ +GED_EXPORT BU_EXTERN(int ged_combmem, (struct ged *gedp, int argc, const char *argv[])); + +/** * Import a database into the current database using an auto-incrementing or custom affix * * Usage: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |