* CoordCache:
- startUpdating(), doneUpdating(): deleted because the screen drawing
is now done at one place (WorkArea::redraw()) and cannot be called
for within itself. Those debug methods are then not useful.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14382
a592a061-630c-0410-9148-
cb99ea01b6c8
<< "] buffer: " << buffer_ << endl;
}
<< "] buffer: " << buffer_ << endl;
}
- // This, together with doneUpdating(), verifies (using
- // asserts) that screen redraw is not called from
- // within itself.
- theCoords.startUpdating();
-
// Check needed to survive LyX startup
if (buffer_) {
// Update macro store
// Check needed to survive LyX startup
if (buffer_) {
// Update macro store
owner_->redrawWorkArea();
owner_->view_state_changed();
owner_->redrawWorkArea();
owner_->view_state_changed();
-
- // Abort updating of the coord
- // cache - just restore the old one
- theCoords.doneUpdating();
void CoordCache::clear()
{
void CoordCache::clear()
{
- BOOST_ASSERT(updating);
arrays_.clear();
insets_.clear();
pars_.clear();
arrays_.clear();
insets_.clear();
pars_.clear();
-void CoordCache::startUpdating()
-{
- BOOST_ASSERT(!updating);
- updating = true;
-}
-
-
-void CoordCache::doneUpdating()
-{
- BOOST_ASSERT(updating);
- updating = false;
-}
-
-
Point CoordCache::get(LyXText const * text, lyx::pit_type pit)
{
ParPosCache::iterator const it = pars_.find(text);
Point CoordCache::get(LyXText const * text, lyx::pit_type pit)
{
ParPosCache::iterator const it = pars_.find(text);
*/
class CoordCache {
public:
*/
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);
void clear();
Point get(LyXText const *, lyx::pit_type);
typedef std::map<LyXText const *, InnerParPosCache> SliceCache;
/// A map from MathArray to position on the screen
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<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
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)
{
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_;
}
SliceCache const & getSlice(bool boundary) const
SliceCache slices0_;
/// Used with boundary == 1
SliceCache slices1_;
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;
};
extern CoordCache theCoords;