fix typo that put too many include paths for most people

[lyx.git] / src / mathed / math_xyarrowinset.C

diff --git a/src/mathed/math_xyarrowinset.C b/src/mathed/math_xyarrowinset.C
index b582a2b58b19faa151fbcb4c48ca8011d806f965..5f3489f3e3631cca333df6a07ce361334277baa3 100644 (file)
--- a/src/mathed/math_xyarrowinset.C
+++ b/src/mathed/math_xyarrowinset.C
@@ -5,12 +5,19 @@
 #endif
 
 #include "math_xyarrowinset.h"
+#include "math_xymatrixinset.h"
 #include "math_mathmlstream.h"
 #include "math_streamstr.h"
+#include "math_support.h"
+#include "Painter.h"
+#include "debug.h"
+
+
+using std::max;
 
 
 MathXYArrowInset::MathXYArrowInset()
-       : MathNestInset(1)
+       : MathNestInset(2)
 {}
 
 
@@ -20,17 +27,103 @@ MathInset * MathXYArrowInset::clone() const
 }
 
 
+MathXYMatrixInset const * MathXYArrowInset::targetMatrix() const
+{
+       return target_;
+}
+
+
+MathXArray const & MathXYArrowInset::targetCell() const
+{
+       MathXYMatrixInset const * p = targetMatrix();
+       int x = 0;
+       int y = 0;
+       MathArray const & t = cell(0);
+       for (MathArray::const_iterator it = t.begin(); it != t.end(); ++it) {
+               switch ((*it)->getChar()) {
+                       case 'l': --x; break;
+                       case 'r': ++x; break;
+                       case 'u': --y; break;
+                       case 'd': ++y; break;
+               }
+       }
+       //lyxerr << "target: x: " << x << " y: " << y << "\n";
+       MathInset::idx_type n = mi_.idx + p->ncols() * y + x;
+       if (n >= p->nargs()) {
+               lyxerr << "source: n: " << mi_.idx << "\n";
+               lyxerr << "target: n: " << n << " out of range\n";
+               n = 0;
+       }
+  return p->xcell(n);
+}
+
+
+MathXArray const & MathXYArrowInset::sourceCell() const
+{
+  return targetMatrix()->xcell(mi_.idx);
+}
+
+
 void MathXYArrowInset::metrics(MathMetricsInfo const & mi) const
 {
        MathNestInset::metrics(mi);
+       mi_ = mi;
+       whichFont(font_, LM_TC_TEXTRM, mi);
+       target_ = mi.inset ? mi.inset->asXYMatrixInset() : 0;
+
+       if (editing()) {
+               int w    = mathed_string_width(font_, "target: ");
+               width_   = w + max(xcell(0).width(), xcell(1).width());
+               ascent_  = xcell(0).ascent();
+               descent_ = xcell(0).descent() + xcell(1).height() + 10;
+       } else {
+               width_   = 0;
+               ascent_  = 0;
+               descent_ = 0;
+               //mathed_string_dim(font_, "X", ascent_, descent_, width_);
+       }
+}
+
+
+void MathXYArrowInset::draw(Painter & pain, int x, int y) const
+{
+       metrics(mi_);
+
+       if (editing()) {
+
+               int lasc;
+               int ldes;
+               int lwid;
+               mathed_string_dim(font_, "target: ", lasc, ldes, lwid);
+
+               xcell(0).draw(pain, x + lwid, y);
+               drawStr(pain, font_, x + 3, y, "target");
+               y += max(xcell(0).descent(), ldes) + 5;
+
+               y += max(xcell(1).ascent(), lasc) + 5;
+               xcell(1).draw(pain, x + lwid, y);
+               drawStr(pain, font_, x + 3, y, "label");
+
+       } else {
+
+               //drawStr(pain, font_, x, y, "X");
+               MathXArray const & s = sourceCell();
+               MathXArray const & t = targetCell();
+               pain.line(s.xm(), s.ym(), t.xm(), t.ym(), LColor::math);
+               xcell(1).draw(pain, (s.xm() + t.xm())/2, (s.ym() + t.ym())/2);
+
+       }
 }
 
 
 void MathXYArrowInset::write(WriteStream & os) const
 {
-       os << "\\ar{";
-       MathNestInset::write(os);
-       os << "}\n";
+       os << "\\ar";
+       if (cell(0).size())
+               os << "[" << cell(0) << "]";
+       if (cell(1).size())
+               os << (up_ ? "^" : "_") << "{" << cell(1) << "}";
+       os << " ";
 }