#ifndef COORDCACHE_H
#define COORDCACHE_H
-class InsetBase;
-class LyXText;
-class MathArray;
-class Paragraph;
+// It seems that MacOSX define the check macro.
+#undef check
#include "support/types.h"
-#include <boost/assert.hpp>
-
#include <map>
+namespace lyx {
+
+class InsetBase;
+class LyXText;
+class MathArray;
+class Paragraph;
+
void lyxbreaker(void const * data, const char * hint, int size);
class Point {
: x_(0), y_(0)
{}
- Point(int x, int y)
- : x_(x), y_(y)
- {
- BOOST_ASSERT(x > -1000000);
- BOOST_ASSERT(x < 1000000);
- BOOST_ASSERT(y > -1000000);
- BOOST_ASSERT(y < 1000000);
- }
+ Point(int x, int y);
int x_, y_;
};
data_.clear();
}
+ bool const empty() const
+ {
+ return data_.empty();
+ }
+
void add(T const * thing, int x, int y)
{
data_[thing] = Point(x, y);
typedef std::map<T const *, Point> cache_type;
cache_type data_;
+
+public:
+ cache_type const & getData() const { return data_; }
};
/**
* A global cache that allows us to come from a paragraph in a document
* to a position point on the screen.
* All points cached in this cache are only valid between subsequent
- * updated. (x,y) == (0,0) is the upper left screen corner, x increases
+ * updates. (x,y) == (0,0) is the upper left screen corner, x increases
* to the right, y increases downwords.
- * The cache is built in BufferView::Pimpl::metrics which is called
- * from BufferView::Pimpl::update. The individual points are added
+ * The cache is built in BufferView::updateMetrics which is called
+ * from BufferView::update. The individual points are added
* while we paint them. See for instance paintPar in RowPainter.C.
*/
class CoordCache {
public:
- CoordCache() : updating(false) { }
- /// In order to find bugs, we record when we start updating the cache
- void startUpdating();
- /// When we are done, we record that to help find bugs
- void doneUpdating();
-
void clear();
- Point get(LyXText const *, lyx::pit_type);
+ Point get(LyXText const *, pit_type) const;
/// A map from paragraph index number to screen point
- typedef std::map<lyx::pit_type, Point> InnerParPosCache;
+ typedef std::map<pit_type, Point> InnerParPosCache;
/// A map from a LyXText to the map of paragraphs to screen points
typedef std::map<LyXText const *, InnerParPosCache> ParPosCache;
/// A map from a CursorSlice to screen points
typedef std::map<LyXText const *, InnerParPosCache> SliceCache;
/// A map from MathArray to position on the screen
- CoordCacheBase<MathArray> & arrays() { BOOST_ASSERT(updating); return arrays_; }
+ CoordCacheBase<MathArray> & arrays() { return arrays_; }
CoordCacheBase<MathArray> const & getArrays() const { return arrays_; }
/// A map from insets to positions on the screen
- CoordCacheBase<InsetBase> & insets() { BOOST_ASSERT(updating); return insets_; }
+ CoordCacheBase<InsetBase> & insets() { return insets_; }
CoordCacheBase<InsetBase> const & getInsets() const { return insets_; }
/// A map from (LyXText, paragraph) pair to screen positions
- ParPosCache & parPos() { BOOST_ASSERT(updating); return pars_; }
+ ParPosCache & parPos() { return pars_; }
ParPosCache const & getParPos() const { return pars_; }
///
SliceCache & slice(bool boundary)
{
- BOOST_ASSERT(updating);
return boundary ? slices1_ : slices0_;
}
SliceCache const & getSlice(bool boundary) const
{
return boundary ? slices1_ : slices0_;
}
-
+
+ /// Dump the contents of the cache to lyxerr in debugging form
+ void dump() const;
private:
/// MathArrays
CoordCacheBase<MathArray> arrays_;
SliceCache slices0_;
/// Used with boundary == 1
SliceCache slices1_;
-
- /**
- * Debugging flag only: Set to true while the cache is being built.
- * No changes to the structure are allowed unless we are updating.
- */
- bool updating;
};
-extern CoordCache theCoords;
+} // namespace lyx
#endif