X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fcoordcache.C;h=b55b296ef13b4adc000914b06f43c6fa0d84de83;hb=3f8fa07c6ed38218d6a4048f2993a512aa942c96;hp=69db4d349b01bc7510de027587959bde85be239b;hpb=aabd481ab63fd50606dd0d984c0b407e4b27e6a7;p=lyx.git

diff --git a/src/coordcache.C b/src/coordcache.C
index 69db4d349b..b55b296ef1 100644
--- a/src/coordcache.C
+++ b/src/coordcache.C
@@ -14,13 +14,21 @@
 
 #include "lyxtext.h"
 
-#include "mathed/math_data.h"
 #include "insets/insetbase.h"
 
 #include <boost/assert.hpp>
 
 
-CoordCache theCoords;
+namespace lyx {
+
+Point::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);
+}
 
 // just a helper to be able to set a breakpoint
 void lyxbreaker(void const * data, const char * hint, int size)
@@ -33,28 +41,48 @@ void lyxbreaker(void const * data, const char * hint, int size)
 
 void CoordCache::clear()
 {
-	BOOST_ASSERT(updating);
 	arrays_.clear();
 	insets_.clear();
 	pars_.clear();
-}
-
-void CoordCache::startUpdating() {
-	BOOST_ASSERT(!updating);
-	updating = true;
+	slices0_.clear();
+	slices1_.clear();
 }
 
 
-void CoordCache::doneUpdating() {
-	BOOST_ASSERT(updating);
-	updating = false;
-}
-
-Point CoordCache::get(LyXText const * text, lyx::pit_type pit)
+Point CoordCache::get(LyXText const * text, pit_type pit) const
 {
-	ParPosCache::iterator const it = pars_.find(text);
+	ParPosCache::const_iterator const it = pars_.find(text);
 	BOOST_ASSERT(it != pars_.end());
-	InnerParPosCache::iterator const posit = it->second.find(pit);
+	InnerParPosCache::const_iterator const posit = it->second.find(pit);
 	BOOST_ASSERT(posit != it->second.end());
 	return posit->second;
 }
+
+void
+CoordCache::dump() const {
+	lyxerr << "ParPosCache contains:" << std::endl;
+	for (ParPosCache::const_iterator i = getParPos().begin(); i != getParPos().end(); ++i) {
+		LyXText const * lt = (*i).first;
+		InnerParPosCache const & cache = (*i).second;
+		lyxerr << "LyXText:" << lt << std::endl;
+		for (InnerParPosCache::const_iterator j = cache.begin(); j != cache.end(); ++j) {
+			pit_type pit = (*j).first;
+			Paragraph const & par = lt->getPar(pit);
+			Point p = (*j).second;
+			lyxerr << "Paragraph " << pit << ": \"";
+			for (int k = 0; k < std::min(static_cast<lyx::pos_type>(10), par.size()); ++k) {
+				lyxerr << to_utf8(docstring(1,par.getChar(k)));
+			}
+			lyxerr << "\" has point " << p.x_ << "," << p.y_ << std::endl;
+		}
+	}
+
+	lyxerr << "InsetCache contains:" << std::endl;
+	for (CoordCacheBase<InsetBase>::cache_type::const_iterator i = getInsets().getData().begin(); i != getInsets().getData().end(); ++i) {
+		InsetBase const * inset = (*i).first;
+		Point p = (*i).second;
+		lyxerr << "Inset " << inset << "(" << to_utf8(inset->getInsetName()) << ") has point " << p.x_ << "," << p.y_ << std::endl;
+	}
+}
+
+} // namespace lyx