Revision: 44445
http://brlcad.svn.sourceforge.net/brlcad/?rev=44445&view=rev
Author: starseeker
Date: 2011-04-19 16:18:20 +0000 (Tue, 19 Apr 2011)
Log Message:
-----------
MFC r44444
Modified Paths:
--------------
brlcad/branches/cmake/misc/win32-msvc8/librt/librt.vcproj
brlcad/branches/cmake/misc/win32-msvc8/libtclcad/libtclcad.vcproj
brlcad/branches/cmake/src/libged/annotate.c
Modified: brlcad/branches/cmake/misc/win32-msvc8/librt/librt.vcproj
===================================================================
--- brlcad/branches/cmake/misc/win32-msvc8/librt/librt.vcproj 2011-04-19
15:53:50 UTC (rev 44444)
+++ brlcad/branches/cmake/misc/win32-msvc8/librt/librt.vcproj 2011-04-19
16:18:20 UTC (rev 44445)
@@ -396,6 +396,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\librt\db_fullpath.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\librt\db_inmem.c"
>
</File>
Modified: brlcad/branches/cmake/misc/win32-msvc8/libtclcad/libtclcad.vcproj
===================================================================
--- brlcad/branches/cmake/misc/win32-msvc8/libtclcad/libtclcad.vcproj
2011-04-19 15:53:50 UTC (rev 44444)
+++ brlcad/branches/cmake/misc/win32-msvc8/libtclcad/libtclcad.vcproj
2011-04-19 16:18:20 UTC (rev 44445)
@@ -230,11 +230,11 @@
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
>
<File
- RelativePath="..\..\..\src\libtclcad\ged_obj.c"
+ RelativePath="..\..\..\src\libtclcad\tclcad.c"
>
</File>
<File
- RelativePath="..\..\..\src\libtclcad\tclcad.c"
+
RelativePath="..\..\..\src\libtclcad\tclcad_obj.c"
>
</File>
<File
Modified: brlcad/branches/cmake/src/libged/annotate.c
===================================================================
--- brlcad/branches/cmake/src/libged/annotate.c 2011-04-19 15:53:50 UTC (rev
44444)
+++ brlcad/branches/cmake/src/libged/annotate.c 2011-04-19 16:18:20 UTC (rev
44445)
@@ -22,11 +22,27 @@
* The annotate command.
*
* Examples:
- * annotate all.g -n my.note -p 0 0 0 -m "This is a tank."
- * annotate -p 10 0 0 -m "This geometry is unclassified."
- * annotate sph.r -t leader -p 10 10 10
- * annotate all.g
*
+ * annotate
+ * [text {string}]
+ * [as
label|leader|angular|radial|dimension|table|note|box|axes|plane [named {name}]]
+ * [on|for {object1} [and {object2}] [and {...}]]
+ * [to|thru|at {point|plane} [offset {distance|vector}]]
+ * [align auto|model|view]
+ * [position auto|fixed|absolute|relative]
+ * [visible always|never|rendering|wireframe]
+ *
+ * [help]
+ * [list {name}]
+ * [get {key} from {name}]
+ * [set {key=value} on {name}]
+ *
+ * annotate help
+ * annotate text "Hello, World!"
+ * annotate for all.g
+ * annotate as label named my.note for all.g text "This is a tank."
+ * annotate as box text "This geometry is unclassified."
+ *
* DESIGN OPTIONS TO CONSIDER:
*
* Types: text (see Text), leader, angular, radial, aligned, ordinate, linear
@@ -38,10 +54,33 @@
* Align: auto, model, view
*
* Text: fontname, fontsize, fontstyle (regular, italic, bold), linespacing,
justification
+ * Justification:
+ * undefined
+ * left
+ * center
+ * right
+ * bottom
+ * middle
+ * top
+ * bottomleft
+ * bottomcenter
+ * bottomright
+ * middleleft
+ * middlecenter
+ * middleright
+ * topleft
+ * topcenter
+ * topright
*
+ * Decoration: color, leader line, box (see Box) around target, box around
annotation
+ *
* Box: empty, hatch, gradient, solid
*
- * Placement: scale, orientation/rotation/twist
+ * Placement: position (auto/fixed/relative/absolute), scale,
orientation/rotation/twist, head/tail
+ * auto is automatic static placement
+ * fixed is 2d coordinate relative to view
+ * absolute is 2d coordinate relative to world center or global 3d position
+ * relative is 2d coordinate relative to view center or 3d offset distance
from target center
*
* Leader: linelength, linewidth, type (no head, arrow head, round head,
square head)
*
@@ -53,6 +92,14 @@
* angularformat: "%.2f"
* angularunits: degrees, radians
*
+ * struct parameters:
+ * type
+ * plane
+ * point list
+ * text?
+ * color?
+ * visibility?
+ *
*/
#include "common.h"
@@ -65,7 +112,7 @@
void
annotate_help(struct bu_vls *result, const char *cmd)
{
- static const char *usage = "[object(s)] [-n name] [-p x y z] [-t type] [-m
message]";
+ static const char *usage = "[object(s)] [-n name] [-p x y z]";
bu_vls_printf(result, "Usage: %s %s", cmd, usage);
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Benefiting from Server Virtualization: Beyond Initial Workload
Consolidation -- Increasing the use of server virtualization is a top
priority.Virtualization can reduce costs, simplify management, and improve
application availability and disaster protection. Learn more about boosting
the value of server virtualization. http://p.sf.net/sfu/vmware-sfdev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
