O-2.7 Convert table into graph

diff --git a/src/Qtx/QtxTable.cxx b/src/Qtx/QtxTable.cxx
index 097a6593482e4508f095a51fa0ef8fbbdb46d3b9..3ed5417d4bb00f237572b7afc17036a7579e813f 100644 (file)
--- a/src/Qtx/QtxTable.cxx
+++ b/src/Qtx/QtxTable.cxx
@@ -66,6 +66,7 @@ public:
 
   QRect         indexRect( const int, int* = 0 );
   void          swapSections( const int, const int );
+  int           spanedSection( const int index );
 
   virtual QSize sizeHint() const;
 
@@ -506,6 +507,12 @@ QRect QtxTable::Header::indexRect( const int index, int* start )
   return r;
 }
 
+int QtxTable::Header::spanedSection( const int index )
+{
+  SpanRange range = findSpanRange( index );
+  return range.first;
+}
+
 QHeader* QtxTable::Header::mainHeader() const
 {
   if ( !table() )
@@ -1958,4 +1965,13 @@ void QtxTable::updateSelectAllButton()
     mySelectAll->setGeometry( frameWidth(), frameWidth(), leftMargin(), topMargin() );
 }
 
+int QtxTable::headerSpanedSection( const Orientation o, const int headIdx, const int index )
+{
+  Header* hdr = (Header*)(headIdx < 0 ? header( o ) : header( o, headIdx ));
+  if ( hdr )
+    return hdr->spanedSection( index );
+  else
+    return index;
+}
+
 #endif

diff --git a/src/Qtx/QtxTable.h b/src/Qtx/QtxTable.h
index e95dfc1550b22e2a3c23266fff0154a5f279b548..ce7bb38f210c914d29c1ab829f29b7a4fa070f0c 100644 (file)
--- a/src/Qtx/QtxTable.h
+++ b/src/Qtx/QtxTable.h
@@ -82,6 +82,8 @@ public:
   void             setVerticalSpan( const Orientation, const int, const int, const int );
   void             setHorizontalSpan( const Orientation, const int, const int, const int );
 
+  int              headerSpanedSection( const Orientation, const int headIdx, const int index );
+
   QColor           headerForegroundColor( const Orientation, const int, const int ) const;
   QColor           headerBackgroundColor( const Orientation, const int, const int ) const;
   void             setHeaderForegroundColor( const Orientation, const int, const int, const QColor& );