diff options
author | joye <joye> | 2014-07-10 16:14:42 (GMT) |
---|---|---|
committer | joye <joye> | 2014-07-10 16:14:42 (GMT) |
commit | 9e05fd7640c1815d2567f16f490730ac7af7dc40 (patch) | |
tree | 94e9eb589b92e31c9dd3eb445957f48b3f553c51 /src | |
parent | e8f7d5d9c556871a7800f444f4231ea140216bee (diff) | |
download | blt-9e05fd7640c1815d2567f16f490730ac7af7dc40.zip blt-9e05fd7640c1815d2567f16f490730ac7af7dc40.tar.gz blt-9e05fd7640c1815d2567f16f490730ac7af7dc40.tar.bz2 |
*** empty log message ***
Diffstat (limited to 'src')
-rw-r--r-- | src/bltChain.C | 12 | ||||
-rw-r--r-- | src/bltChain.h | 2 | ||||
-rw-r--r-- | src/bltGrAxis.C | 9 | ||||
-rw-r--r-- | src/bltGrLegd.C | 7 |
4 files changed, 10 insertions, 20 deletions
diff --git a/src/bltChain.C b/src/bltChain.C index 3000b15..345bf23 100644 --- a/src/bltChain.C +++ b/src/bltChain.C @@ -192,15 +192,3 @@ ChainLink* Chain::prepend(void* clientData) linkBefore(link, NULL); return link; } - - -int Blt::Chain_IsBefore(ChainLink* firstPtr, ChainLink* lastPtr) -{ - for (ChainLink* linkPtr = firstPtr; linkPtr; linkPtr = linkPtr->next()) - if (linkPtr == lastPtr) - return 1; - - return 0; -} - - diff --git a/src/bltChain.h b/src/bltChain.h index 2969d55..6e254f9 100644 --- a/src/bltChain.h +++ b/src/bltChain.h @@ -86,8 +86,6 @@ namespace Blt { ChainLink* append(void* clientData); ChainLink* prepend(void* clientData); }; - - extern int Chain_IsBefore(ChainLink* first, ChainLink* last); }; #endif diff --git a/src/bltGrAxis.C b/src/bltGrAxis.C index 8edaac5..ab58544 100644 --- a/src/bltGrAxis.C +++ b/src/bltGrAxis.C @@ -421,19 +421,18 @@ void Axis::mapStacked(int count, int margin) AxisOptions* ops = (AxisOptions*)ops_; GraphOptions* gops = (GraphOptions*)graphPtr_->ops_; - if ((gops->margins[margin_].axes->nLinks() > 1) || - (ops->reqNumMajorTicks <= 0)) { + if (Chain_GetLength(gops->margins[margin_].axes) > 1 + || ops->reqNumMajorTicks <= 0) ops->reqNumMajorTicks = 4; - } unsigned int slice; if (isHorizontal()) { - slice = graphPtr_->hRange_ / gops->margins[margin].axes->nLinks(); + slice = graphPtr_->hRange_ / Chain_GetLength(gops->margins[margin].axes); screenMin_ = graphPtr_->hOffset_; width_ = slice; } else { - slice = graphPtr_->vRange_ / gops->margins[margin].axes->nLinks(); + slice = graphPtr_->vRange_ / Chain_GetLength(gops->margins[margin].axes); screenMin_ = graphPtr_->vOffset_; height_ = slice; } diff --git a/src/bltGrLegd.C b/src/bltGrLegd.C index a46b50a..ed4cb4b 100644 --- a/src/bltGrLegd.C +++ b/src/bltGrLegd.C @@ -780,7 +780,12 @@ void Legend::deselectElement(Element* elemPtr) int Legend::selectRange(Element *fromPtr, Element *toPtr) { - if (Chain_IsBefore(fromPtr->link, toPtr->link)) { + int isBefore=0; + for (ChainLink* linkPtr = fromPtr->link; linkPtr; linkPtr = linkPtr->next()) + if (linkPtr == toPtr->link) + isBefore =1; + + if (isBefore) { for (ChainLink* link = fromPtr->link; link; link = Chain_NextLink(link)) { Element* elemPtr = (Element*)Chain_GetValue(link); selectEntry(elemPtr); |