ravl-commits Mailing List for RAVL, Recognition And Vision Library. (Page 3)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Revision: 8037
          http://ravl.svn.sourceforge.net/ravl/?rev=8037&view=rev
Author:   craftit
Date:     2011-04-27 20:47:13 +0000 (Wed, 27 Apr 2011)

Log Message:
-----------
Add LayoutGridC

Modified Paths:
--------------
    main/Ravl/Contrib/OpenSceneGraph/MustLinkGtkGlExtInit.cc
    main/Ravl/Contrib/OpenSceneGraph/defs.mk
    main/Ravl/Contrib/OpenSceneGraph/exOpenSceneGraph.xml

Added Paths:
-----------
    main/Ravl/Contrib/OpenSceneGraph/LayoutGrid.cc
    main/Ravl/Contrib/OpenSceneGraph/LayoutGrid.hh

Added: main/Ravl/Contrib/OpenSceneGraph/LayoutGrid.cc
===================================================================

--- main/Ravl/Contrib/OpenSceneGraph/LayoutGrid.cc	                        (rev 0)
+++ main/Ravl/Contrib/OpenSceneGraph/LayoutGrid.cc	2011-04-27 20:47:13 UTC (rev 8037)
@@ -0,0 +1,117 @@
+
+#include "Ravl/OpenSceneGraph/LayoutGrid.hh"
+#include "Ravl/OpenSceneGraph/TypeConvert.hh"
+#include "Ravl/XMLFactoryRegister.hh"
+#include "Ravl/RLog.hh"
+
+namespace RavlOSGN {
+
+  //: Constructor
+  
+  LayoutGridC::LayoutGridC(bool create)
+   : LayoutC(create),
+     m_stackAxis1(0),
+     m_stackAxis2(1)
+  {
+  }
+  
+  //: XML factory constructor
+  
+  LayoutGridC::LayoutGridC(const XMLFactoryContextC &factory)
+   : LayoutC(true)
+  {
+    Setup(factory);
+  }
+  
+  //: Update the layout
+  
+  bool LayoutGridC::UpdateLayout()
+  {
+    rDebug("Updating layout. ");
+    
+    unsigned colMax = 1;
+    const unsigned viewSize = m_nodes.size();
+    unsigned rowMax = RavlN::Floor(RavlN::Sqrt(viewSize));
+    colMax = rowMax;
+    if(RavlN::Sqr(rowMax) < viewSize)
+      colMax++;
+    
+    // Sort out grid displays
+    Vector3dC rowStart(0,0,0);
+    unsigned at = 0;
+    
+    std::vector<float> colSizes(colMax);
+    
+    for(unsigned c = 0;c < colMax;c++) {
+      float width = 0;
+      for(unsigned r = 0;r < rowMax;r++) {
+        unsigned at = r * colMax + c;
+        if(at >= m_nodes.size())
+          break;
+        float csize = m_nodes[at]->Bounds()._max[m_stackAxis2] - m_nodes[at]->Bounds()._min[m_stackAxis2];
+        if(csize > width)
+          width = csize;
+      }
+      colSizes[c] = width;
+    }
+    
+    
+    for(unsigned r = 0;r < rowMax;r++) {
+      float hight = m_gap;
+      Vector3dC vat = rowStart;
+      
+      // Work out the row hight.
+      for(unsigned c = 0;c < colMax && at < m_nodes.size();c++,at++) {
+        float rsize = m_nodes[at]->Bounds()._max[m_stackAxis1] - m_nodes[at]->Bounds()._min[m_stackAxis1];
+        if(rsize > hight)
+          hight = rsize;
+        Vector3dC correctedPosition = vat - MakeVector3d(m_nodes[at]->Bounds()._min);
+        m_nodes[at]->SetPosition(correctedPosition);
+        rDebug("Start %s ",RavlN::StringOf(correctedPosition).data());
+        vat[m_stackAxis2] += colSizes[c] + m_gap;
+      }
+      rowStart[m_stackAxis1] += hight + m_gap;
+    }
+    
+    return true;
+  }
+  
+  //: Process a callback.
+  
+  void LayoutGridC::DoCallback()
+  {
+    LayoutC::DoCallback();
+  }
+  
+  //: Do setup from factory
+  
+  bool LayoutGridC::Setup(const XMLFactoryContextC &factory)
+  {
+    m_stackAxis1 = factory.AttributeInt("stackAxis1",0);
+    if(m_stackAxis1 < 0 || m_stackAxis1 > 2) {
+      rError("Invalid 1st stack axis %d ",m_stackAxis1);
+      throw RavlN::ExceptionBadConfigC("Invalid stack axis. ");
+    }
+    m_stackAxis2 = factory.AttributeInt("stackAxis2",1);
+    if(m_stackAxis2 < 0 || m_stackAxis2 > 2) {
+      rError("Invalid 2nd stack axis  %d ",m_stackAxis2);
+      throw RavlN::ExceptionBadConfigC("Invalid stack axis. ");
+    }
+    m_gap = factory.AttributeReal("gap",0.1);
+    LayoutC::Setup(factory);
+    return true;
+  }
+  
+  //: Called when owner handles drop to zero.
+  
+  void LayoutGridC::ZeroOwners()
+  {
+    LayoutC::ZeroOwners();
+  }
+  
+  void LinkLayoutGrid()
+  {}
+  
+  static RavlN::XMLFactoryRegisterConvertC<LayoutGridC,LayoutC> g_registerXMLFactoryLayout("RavlOSGN::LayoutGridC");
+
+}

Added: main/Ravl/Contrib/OpenSceneGraph/LayoutGrid.hh
===================================================================
--- main/Ravl/Contrib/OpenSceneGraph/LayoutGrid.hh	                        (rev 0)
+++ main/Ravl/Contrib/OpenSceneGraph/LayoutGrid.hh	2011-04-27 20:47:13 UTC (rev 8037)
@@ -0,0 +1,48 @@
+/* 
+ * File:   LayoutGrid.hh
+ * Author: charlesgalambos
+ *
+ * Created on April 25, 2011, 10:13 AM
+ */
+
+#ifndef RAVLOSGN_LayoutGrid_HH
+#define	RAVLOSGN_LayoutGrid_HH
+
+#include "Ravl/OpenSceneGraph/Layout.hh"
+
+namespace RavlOSGN {
+
+  //: Base class for automatic layouts
+  
+  class LayoutGridC
+   : public LayoutC
+  {
+  public:
+    LayoutGridC(bool create);
+    //: Constructor
+    
+    LayoutGridC(const XMLFactoryContextC &factory);
+    //: XML factory constructor
+    
+  protected:
+    virtual bool UpdateLayout();
+    //: Update the layout
+    
+    virtual void DoCallback();
+    //: Process a callback.
+    
+    bool Setup(const XMLFactoryContextC &factory);
+    //: Do setup from factory
+    
+    virtual void ZeroOwners();
+    //: Called when owner handles drop to zero.
+    
+    int m_stackAxis1;
+    int m_stackAxis2;
+    float m_gap;
+  };
+
+}
+
+#endif	/* LayoutGrid_HH */
+

Modified: main/Ravl/Contrib/OpenSceneGraph/MustLinkGtkGlExtInit.cc
===================================================================
--- main/Ravl/Contrib/OpenSceneGraph/MustLinkGtkGlExtInit.cc	2011-04-25 20:34:41 UTC (rev 8036)
+++ main/Ravl/Contrib/OpenSceneGraph/MustLinkGtkGlExtInit.cc	2011-04-27 20:47:13 UTC (rev 8037)
@@ -15,6 +15,7 @@
   extern void LinkModelFile();
   extern void LinkLayout();
   extern void LinkLayoutStack();
+  extern void LinkLayoutGrid();
   
   void LinkGtkGlExtInit()
   {
@@ -32,5 +33,6 @@
     LinkModelFile();
     LinkLayout();
     LinkLayoutStack();
+    LinkLayoutGrid();
   }
 }

Modified: main/Ravl/Contrib/OpenSceneGraph/defs.mk
===================================================================
--- main/Ravl/Contrib/OpenSceneGraph/defs.mk	2011-04-25 20:34:41 UTC (rev 8036)
+++ main/Ravl/Contrib/OpenSceneGraph/defs.mk	2011-04-27 20:47:13 UTC (rev 8037)
@@ -16,12 +16,12 @@
 HEADERS=Drawable.hh Sphere.hh Image.hh ImageByteRGBA.hh ImageByteRGB.hh Text.hh \
  TriMesh.hh TexTriMesh.hh Node.hh Geode.hh Group.hh Transform.hh ModelFile.hh \
  HUD.hh OpenSceneGraphWidget.hh Box.hh CanvasManipulator.hh TypeConvert.hh \
- Layout.hh LayoutStack.hh
+ Layout.hh LayoutStack.hh LayoutGrid.hh
 
 SOURCES=Drawable.cc Sphere.cc Image.cc ImageByteRGBA.cc ImageByteRGB.cc Text.cc \
  TriMesh.cc TexTriMesh.cc Node.cc Geode.cc Group.cc Transform.cc ModelFile.cc \
  HUD.cc OpenSceneGraphWidget.cc Box.cc CanvasManipulator.cc TypeConvert.cc \
- Layout.cc LayoutStack.cc 
+ Layout.cc LayoutStack.cc LayoutGrid.cc
 
 PLIB=RavlGUIOpenSceneGraph
 

Modified: main/Ravl/Contrib/OpenSceneGraph/exOpenSceneGraph.xml
===================================================================
--- main/Ravl/Contrib/OpenSceneGraph/exOpenSceneGraph.xml	2011-04-25 20:34:41 UTC (rev 8036)
+++ main/Ravl/Contrib/OpenSceneGraph/exOpenSceneGraph.xml	2011-04-27 20:47:13 UTC (rev 8037)
@@ -15,12 +15,13 @@
           <Node typename="RavlOSGN::ImageByteRGBAC" filename="/Users/charlesgalambos/Build/share/RAVL/pixmaps/monkey.ppm" alpha="0.75" />
         </ImageTransform>
         -->
-          <Stack typename="RavlOSGN::LayoutStackC" gap="0.1" >
+          <Stack typename="RavlOSGN::LayoutGridC" gap="0.1" >
             <Nodes>
               <Box1 typename="RavlOSGN::BoxC" colour="0.0 0.0 1.0 1.0" size="1.0 1.0 1.0" position="0 0 0" />
               <Box2 typename="RavlOSGN::BoxC" colour="0.0 1.0 0.0 1.0" size="1.0 1.0 1.0" position="0 0 0" />
-              <Box3 typename="RavlOSGN::BoxC" colour="1.0 0.0 0.0 1.0" size="1.0 2.0 1.0" position="0 0 0" />
+              <Box3 typename="RavlOSGN::BoxC" colour="1.0 0.0 0.0 1.0" size="1.0 1.0 1.0" position="0 0 0" />
               <Sphere typename="RavlOSGN::SphereC" colour="0.0 1.0 1.0 1.0" radius="0.5" />
+              <Box4 typename="RavlOSGN::BoxC" colour="1.0 0.0 1.0 1.0" size="1.0 1.0 1.0" position="0 0 0" />
             </Nodes>
           </Stack>
         <HUD typename="RavlOSGN::HUDC" coords="0 768 0 1024" >


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2001	Jan	Feb	Mar	Apr (49)	May (163)	Jun (76)	Jul (125)	Aug (54)	Sep (140)	Oct (163)	Nov (98)	Dec (33)
2002	Jan (152)	Feb (165)	Mar (122)	Apr (154)	May (259)	Jun (159)	Jul (207)	Aug (237)	Sep (125)	Oct (288)	Nov (138)	Dec (59)
2003	Jan (213)	Feb (155)	Mar (159)	Apr (223)	May (293)	Jun (227)	Jul (164)	Aug (147)	Sep (120)	Oct (152)	Nov (159)	Dec (119)
2004	Jan (59)	Feb (133)	Mar (145)	Apr (135)	May (65)	Jun (63)	Jul (64)	Aug (91)	Sep (78)	Oct (38)	Nov (58)	Dec (103)
2005	Jan (109)	Feb (24)	Mar (49)	Apr (70)	May (53)	Jun (51)	Jul (75)	Aug (38)	Sep (44)	Oct (85)	Nov (57)	Dec (224)
2006	Jan (134)	Feb (35)	Mar (68)	Apr (46)	May (24)	Jun (210)	Jul (66)	Aug (90)	Sep (64)	Oct (15)	Nov (52)	Dec (10)
2007	Jan (37)	Feb (48)	Mar (32)	Apr (20)	May (39)	Jun (72)	Jul (45)	Aug (15)	Sep (61)	Oct (44)	Nov (70)	Dec (24)
2008	Jan (28)	Feb (100)	Mar (63)	Apr (86)	May (43)	Jun (58)	Jul (19)	Aug (25)	Sep (53)	Oct (29)	Nov (35)	Dec (15)
2009	Jan (14)	Feb (43)	Mar (17)	Apr (38)	May (19)	Jun (17)	Jul (11)	Aug (13)	Sep (53)	Oct (55)	Nov (56)	Dec (56)
2010	Jan (39)	Feb (110)	Mar (70)	Apr (36)	May (35)	Jun (43)	Jul (19)	Aug (20)	Sep (27)	Oct (18)	Nov (33)	Dec (45)
2011	Jan (34)	Feb (14)	Mar (17)	Apr (24)	May (22)	Jun (16)	Jul (10)	Aug	Sep	Oct	Nov	Dec

ravl-commits Mailing List for RAVL, Recognition And Vision Library. (Page 3)

ravl-commits — CVS Commits/Checkins