[brlcad-commits] SF.net SVN: brlcad:[44439] brlcad/trunk/src/libged/annotate.c
Revision: 44439
http://brlcad.svn.sourceforge.net/brlcad/?rev=44439view=rev
Author: brlcad
Date: 2011-04-19 06:03:26 + (Tue, 19 Apr 2011)
Log Message:
---
lied, lil more thinking
Modified Paths:
--
brlcad/trunk/src/libged/annotate.c
Modified: brlcad/trunk/src/libged/annotate.c
===
--- brlcad/trunk/src/libged/annotate.c 2011-04-19 05:42:19 UTC (rev 44438)
+++ brlcad/trunk/src/libged/annotate.c 2011-04-19 06:03:26 UTC (rev 44439)
@@ -25,11 +25,12 @@
*
* annotate
*[text {string}]
- *[as label|leader|angular|radial|dimension|table|note|box [named
{name}]]
+ *[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}]]
- *[positioned auto|fixed|absolute|relative]]
*[align auto|model|view]
+ *[position auto|fixed|absolute|relative]
+ *[visible always|never|rendering|wireframe]
*
*[help]
*[list {name}]
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
[brlcad-commits] SF.net SVN: brlcad:[44440] brlcad/trunk/misc/win32-msvc8/librt/librt.vcproj
Revision: 0 http://brlcad.svn.sourceforge.net/brlcad/?rev=0view=rev Author: erikgreenwald Date: 2011-04-19 11:50:12 + (Tue, 19 Apr 2011) Log Message: --- add db_fullpath.c Modified Paths: -- brlcad/trunk/misc/win32-msvc8/librt/librt.vcproj Modified: brlcad/trunk/misc/win32-msvc8/librt/librt.vcproj === --- brlcad/trunk/misc/win32-msvc8/librt/librt.vcproj2011-04-19 06:03:26 UTC (rev 44439) +++ brlcad/trunk/misc/win32-msvc8/librt/librt.vcproj2011-04-19 11:50:12 UTC (rev 0) @@ -396,6 +396,10 @@ /File File + RelativePath=..\..\..\src\librt\db_fullpath.c + + /File + File RelativePath=..\..\..\src\librt\db_inmem.c /File 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
[brlcad-commits] SF.net SVN: brlcad:[44441] brlcad/trunk/misc/win32-msvc8/libtclcad/ libtclcad.vcproj
Revision: 1 http://brlcad.svn.sourceforge.net/brlcad/?rev=1view=rev Author: erikgreenwald Date: 2011-04-19 11:55:24 + (Tue, 19 Apr 2011) Log Message: --- ged_obj.c is now tclcad_obj.c Modified Paths: -- brlcad/trunk/misc/win32-msvc8/libtclcad/libtclcad.vcproj Modified: brlcad/trunk/misc/win32-msvc8/libtclcad/libtclcad.vcproj === --- brlcad/trunk/misc/win32-msvc8/libtclcad/libtclcad.vcproj2011-04-19 11:50:12 UTC (rev 0) +++ brlcad/trunk/misc/win32-msvc8/libtclcad/libtclcad.vcproj2011-04-19 11:55:24 UTC (rev 1) @@ -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 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
[brlcad-commits] SF.net SVN: brlcad:[44442] brlcad/branches/cmake/src/librt/uvpoints.cpp
Revision: 2
http://brlcad.svn.sourceforge.net/brlcad/?rev=2view=rev
Author: starseeker
Date: 2011-04-19 14:45:07 + (Tue, 19 Apr 2011)
Log Message:
---
Make the tree depth to uvpoints a variable
Modified Paths:
--
brlcad/branches/cmake/src/librt/uvpoints.cpp
Modified: brlcad/branches/cmake/src/librt/uvpoints.cpp
===
--- brlcad/branches/cmake/src/librt/uvpoints.cpp2011-04-19 11:55:24 UTC
(rev 1)
+++ brlcad/branches/cmake/src/librt/uvpoints.cpp2011-04-19 14:45:07 UTC
(rev 2)
@@ -36,7 +36,7 @@
using namespace std;
/* Number of subdivisions to perform */
-#define MAX_TREE_DEPTH 6
+/*#define MAX_TREE_DEPTH 6*/
#define TREE_DEBUG 0
int rejected = 0;
int counting = 0;
@@ -140,9 +140,9 @@
class QuadNode {
public:
- void SubDivide();
+ void SubDivide(int MAX_TREE_DEPTH);
setUVKey, UVKeyComp *keys;
- void AppendKeys(set UVKey, UVKeyComp *keys);
+ void AppendKeys(set UVKey, UVKeyComp *keys, int
MAX_TREE_DEPTH);
size_t PU[9];
size_t PV[9];
int depth;
@@ -157,7 +157,7 @@
}
};
-int ints_to_key(string *cppstr, int left, int right)
+int ints_to_key(string *cppstr, int left, int right, int MAX_TREE_DEPTH)
{
char formatstring[20];
char maxkeystr[20];
@@ -172,7 +172,7 @@
}
-void QuadNode::AppendKeys(set UVKey, UVKeyComp *keys)
+void QuadNode::AppendKeys(set UVKey, UVKeyComp *keys, int MAX_TREE_DEPTH)
{
UVKey *point;
setUVKey, UVKeyComp::iterator item;
@@ -180,7 +180,7 @@
int i;
for( int i = 0; i 9; i++ ) {
counting++;
- ints_to_key(keystring, PU[i], PV[i]);
+ ints_to_key(keystring, PU[i], PV[i], MAX_TREE_DEPTH);
item = keys-find(keystring);
if(item == keys-end()) {
point = new UVKey(keystring);
@@ -221,7 +221,7 @@
*Quadrant 0Quadrant 1
*/
-void QuadNode::SubDivide()
+void QuadNode::SubDivide(int MAX_TREE_DEPTH)
{
int i;
/* Quadrant 0 */
@@ -246,7 +246,7 @@
Children[0]-PV[7] = Children[0]-PV[5];
Children[0]-PU[8] = Children[0]-PU[7];
Children[0]-PV[8] = Children[0]-PV[6];
- Children[0]-AppendKeys(keys);
+ Children[0]-AppendKeys(keys, MAX_TREE_DEPTH);
#if TREE_DEBUG
cout Q0 Depth: depth + 1 \n;
cout PU: {;
@@ -261,7 +261,7 @@
cout }\n;
#endif
if (Children[0]-depth MAX_TREE_DEPTH)
- Children[0]-SubDivide();
+ Children[0]-SubDivide(MAX_TREE_DEPTH);
/* Quadrant 1 */
@@ -286,7 +286,7 @@
Children[1]-PV[7] = Children[1]-PV[5];
Children[1]-PU[8] = Children[1]-PU[7];
Children[1]-PV[8] = Children[1]-PV[6];
- Children[1]-AppendKeys(keys);
+ Children[1]-AppendKeys(keys, MAX_TREE_DEPTH);
#if TREE_DEBUG
cout Q1 Depth: depth + 1 \n;
cout PU: {;
@@ -301,7 +301,7 @@
cout }\n;
#endif
if (Children[1]-depth MAX_TREE_DEPTH)
- Children[1]-SubDivide();
+ Children[1]-SubDivide(MAX_TREE_DEPTH);
/* Quadrant 2 */
Children[2] = new QuadNode();
@@ -325,7 +325,7 @@
Children[2]-PV[7] = Children[2]-PV[5];
Children[2]-PU[8] = Children[2]-PU[7];
Children[2]-PV[8] = Children[2]-PV[6];
- Children[2]-AppendKeys(keys);
+ Children[2]-AppendKeys(keys, MAX_TREE_DEPTH);
#if TREE_DEBUG
cout Q2 Depth: depth + 1 \n;
cout PU: {;
@@ -341,7 +341,7 @@
#endif
if (Children[2]-depth MAX_TREE_DEPTH)
- Children[2]-SubDivide();
+ Children[2]-SubDivide(MAX_TREE_DEPTH);
/* Quadrant 3 */
Children[3] = new QuadNode();
@@ -365,7 +365,7 @@
Children[3]-PV[7] = Children[3]-PV[5];
Children[3]-PU[8] = Children[3]-PU[7];
Children[3]-PV[8] = Children[3]-PV[6];
- Children[3]-AppendKeys(keys);
+ Children[3]-AppendKeys(keys, MAX_TREE_DEPTH);
#if TREE_DEBUG
cout Q3 Depth: depth + 1 \n;
cout PU: {;
@@ -381,7 +381,7 @@
#endif
if (Children[3]-depth MAX_TREE_DEPTH)
- Children[3]-SubDivide();
+ Children[3]-SubDivide(MAX_TREE_DEPTH);
}
@@ -393,11 +393,11 @@
*/
class UVKeyQuadTree {
public:
-
[brlcad-commits] SF.net SVN: brlcad:[44443] geomcore/trunk/include/NetMsg.h
Revision: 3 http://brlcad.svn.sourceforge.net/brlcad/?rev=3view=rev Author: erikgreenwald Date: 2011-04-19 14:48:27 + (Tue, 19 Apr 2011) Log Message: --- include NetMsgTypes.h to propogate the defines to the implementation Modified Paths: -- geomcore/trunk/include/NetMsg.h Modified: geomcore/trunk/include/NetMsg.h === --- geomcore/trunk/include/NetMsg.h 2011-04-19 14:45:07 UTC (rev 2) +++ geomcore/trunk/include/NetMsg.h 2011-04-19 14:48:27 UTC (rev 3) @@ -34,6 +34,7 @@ #include GSUuid.h #include ByteBuffer.h +#include NetMsgTypes.h class Portal; 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
[brlcad-commits] SF.net SVN: brlcad:[44444] brlcad/trunk/src/librt/uvpoints.cpp
Revision: 4
http://brlcad.svn.sourceforge.net/brlcad/?rev=4view=rev
Author: starseeker
Date: 2011-04-19 15:53:50 + (Tue, 19 Apr 2011)
Log Message:
---
Oops, that should have been in trunk.
Modified Paths:
--
brlcad/trunk/src/librt/uvpoints.cpp
Modified: brlcad/trunk/src/librt/uvpoints.cpp
===
--- brlcad/trunk/src/librt/uvpoints.cpp 2011-04-19 14:48:27 UTC (rev 3)
+++ brlcad/trunk/src/librt/uvpoints.cpp 2011-04-19 15:53:50 UTC (rev 4)
@@ -36,7 +36,7 @@
using namespace std;
/* Number of subdivisions to perform */
-#define MAX_TREE_DEPTH 6
+/*#define MAX_TREE_DEPTH 6*/
#define TREE_DEBUG 0
int rejected = 0;
int counting = 0;
@@ -140,9 +140,9 @@
class QuadNode {
public:
- void SubDivide();
+ void SubDivide(int MAX_TREE_DEPTH);
setUVKey, UVKeyComp *keys;
- void AppendKeys(set UVKey, UVKeyComp *keys);
+ void AppendKeys(set UVKey, UVKeyComp *keys, int
MAX_TREE_DEPTH);
size_t PU[9];
size_t PV[9];
int depth;
@@ -157,7 +157,7 @@
}
};
-int ints_to_key(string *cppstr, int left, int right)
+int ints_to_key(string *cppstr, int left, int right, int MAX_TREE_DEPTH)
{
char formatstring[20];
char maxkeystr[20];
@@ -172,7 +172,7 @@
}
-void QuadNode::AppendKeys(set UVKey, UVKeyComp *keys)
+void QuadNode::AppendKeys(set UVKey, UVKeyComp *keys, int MAX_TREE_DEPTH)
{
UVKey *point;
setUVKey, UVKeyComp::iterator item;
@@ -180,7 +180,7 @@
int i;
for( int i = 0; i 9; i++ ) {
counting++;
- ints_to_key(keystring, PU[i], PV[i]);
+ ints_to_key(keystring, PU[i], PV[i], MAX_TREE_DEPTH);
item = keys-find(keystring);
if(item == keys-end()) {
point = new UVKey(keystring);
@@ -221,7 +221,7 @@
*Quadrant 0Quadrant 1
*/
-void QuadNode::SubDivide()
+void QuadNode::SubDivide(int MAX_TREE_DEPTH)
{
int i;
/* Quadrant 0 */
@@ -246,7 +246,7 @@
Children[0]-PV[7] = Children[0]-PV[5];
Children[0]-PU[8] = Children[0]-PU[7];
Children[0]-PV[8] = Children[0]-PV[6];
- Children[0]-AppendKeys(keys);
+ Children[0]-AppendKeys(keys, MAX_TREE_DEPTH);
#if TREE_DEBUG
cout Q0 Depth: depth + 1 \n;
cout PU: {;
@@ -261,7 +261,7 @@
cout }\n;
#endif
if (Children[0]-depth MAX_TREE_DEPTH)
- Children[0]-SubDivide();
+ Children[0]-SubDivide(MAX_TREE_DEPTH);
/* Quadrant 1 */
@@ -286,7 +286,7 @@
Children[1]-PV[7] = Children[1]-PV[5];
Children[1]-PU[8] = Children[1]-PU[7];
Children[1]-PV[8] = Children[1]-PV[6];
- Children[1]-AppendKeys(keys);
+ Children[1]-AppendKeys(keys, MAX_TREE_DEPTH);
#if TREE_DEBUG
cout Q1 Depth: depth + 1 \n;
cout PU: {;
@@ -301,7 +301,7 @@
cout }\n;
#endif
if (Children[1]-depth MAX_TREE_DEPTH)
- Children[1]-SubDivide();
+ Children[1]-SubDivide(MAX_TREE_DEPTH);
/* Quadrant 2 */
Children[2] = new QuadNode();
@@ -325,7 +325,7 @@
Children[2]-PV[7] = Children[2]-PV[5];
Children[2]-PU[8] = Children[2]-PU[7];
Children[2]-PV[8] = Children[2]-PV[6];
- Children[2]-AppendKeys(keys);
+ Children[2]-AppendKeys(keys, MAX_TREE_DEPTH);
#if TREE_DEBUG
cout Q2 Depth: depth + 1 \n;
cout PU: {;
@@ -341,7 +341,7 @@
#endif
if (Children[2]-depth MAX_TREE_DEPTH)
- Children[2]-SubDivide();
+ Children[2]-SubDivide(MAX_TREE_DEPTH);
/* Quadrant 3 */
Children[3] = new QuadNode();
@@ -365,7 +365,7 @@
Children[3]-PV[7] = Children[3]-PV[5];
Children[3]-PU[8] = Children[3]-PU[7];
Children[3]-PV[8] = Children[3]-PV[6];
- Children[3]-AppendKeys(keys);
+ Children[3]-AppendKeys(keys, MAX_TREE_DEPTH);
#if TREE_DEBUG
cout Q3 Depth: depth + 1 \n;
cout PU: {;
@@ -381,7 +381,7 @@
#endif
if (Children[3]-depth MAX_TREE_DEPTH)
- Children[3]-SubDivide();
+ Children[3]-SubDivide(MAX_TREE_DEPTH);
}
@@ -393,11 +393,11 @@
*/
class UVKeyQuadTree {
public:
- UVKeyQuadTree(setUVKey, UVKeyComp *keys);
+
[brlcad-commits] SF.net SVN: brlcad:[44445] brlcad/branches/cmake
Revision: 5
http://brlcad.svn.sourceforge.net/brlcad/?rev=5view=rev
Author: starseeker
Date: 2011-04-19 16:18:20 + (Tue, 19 Apr 2011)
Log Message:
---
MFC r4
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 4)
+++ brlcad/branches/cmake/misc/win32-msvc8/librt/librt.vcproj 2011-04-19
16:18:20 UTC (rev 5)
@@ -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 4)
+++ brlcad/branches/cmake/misc/win32-msvc8/libtclcad/libtclcad.vcproj
2011-04-19 16:18:20 UTC (rev 5)
@@ -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
4)
+++ brlcad/branches/cmake/src/libged/annotate.c 2011-04-19 16:18:20 UTC (rev
5)
@@ -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
[brlcad-commits] SF.net SVN: brlcad:[44446] brlcad/trunk/include/ged.h
Revision: 6 http://brlcad.svn.sourceforge.net/brlcad/?rev=6view=rev Author: bob1961 Date: 2011-04-19 18:03:28 + (Tue, 19 Apr 2011) Log Message: --- Added GED_DM_VIEW_NULL. Modified Paths: -- brlcad/trunk/include/ged.h Modified: brlcad/trunk/include/ged.h === --- brlcad/trunk/include/ged.h 2011-04-19 16:18:20 UTC (rev 5) +++ brlcad/trunk/include/ged.h 2011-04-19 18:03:28 UTC (rev 6) @@ -74,6 +74,7 @@ #define GED_DISPLAY_LIST_NULL (struct ged_display_list *)0 #define GED_DRAWABLE_NULL (struct ged_drawable *)0 #define GED_VIEW_NULL (struct ged_view *)0 +#define GED_DM_VIEW_NULL (struct ged_dm_view *)0 #define GED_OBJ_NULL (struct ged_obj *)0 #define GED_VIEW_OBJ_NULL ((struct view_obj *)0) 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
