UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-21 23:00:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps/graph/graph] Make the cursor position belong to th emodel

Browse Source 
"GraphWindow"

Change-Id: I8cdcda85f0e29e4b678829f39b8bd212cd8d1086
This commit is contained in:
Émilie Feral
2016-12-28 13:27:03 +01:00
parent 6753974724
commit b8eba2c42a
16 changed files with 252 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

202
apps/graph/graph/graph_view.cpp
View File

@@ -8,10 +8,9 @@ namespace Graph {
constexpr KDColor GraphView::k_gridColor;
GraphView::GraphView(FunctionStore * functionStore, GraphWindow * graphWindow) :
CurveView(graphWindow),
CurveView(graphWindow, 0.0f, 0.0f, 0.2f, 0.0f),
m_bannerView(BannerView(graphWindow)),
m_cursorView(CursorView()),
m_xCursorPosition(-1.0f),
m_yCursorPosition(-1.0f),
m_visibleCursor(true),
m_graphWindow(graphWindow),
m_functionStore(functionStore),
@@ -19,10 +18,65 @@ GraphView::GraphView(FunctionStore * functionStore, GraphWindow * graphWindow) :
{
}
BannerView * GraphView::bannerView() {
View * GraphView::bannerView() {
return &m_bannerView;
}
void GraphView::drawRect(KDContext * ctx, KDRect rect) const {
ctx->fillRect(rect, KDColorWhite);
drawGrid(ctx, rect);
drawAxes(ctx, rect, Axis::Horizontal);
drawAxes(ctx, rect, Axis::Vertical);
drawLabels(ctx, rect, Axis::Horizontal, true);
drawLabels(ctx, rect, Axis::Vertical, true);
for (int i = 0; i < m_functionStore->numberOfActiveFunctions(); i++) {
Function * f = m_functionStore->activeFunctionAtIndex(i);
drawCurve(ctx, rect, f, f->color());
}
}
void GraphView::setCursorVisible(bool visibleCursor) {
m_visibleCursor = visibleCursor;
reloadCursor();
}
void GraphView::setContext(Context * context) {
m_context = context;
}
Context * GraphView::context() const {
return m_context;
}
void GraphView::reload() {
markRectAsDirty(bounds());
layoutSubviews();
computeLabels(Axis::Horizontal);
computeLabels(Axis::Vertical);
m_bannerView.reload();
}
void GraphView::reloadCursor() {
KDCoordinate xCursorPixelPosition = roundf(floatToPixel(Axis::Horizontal, m_graphWindow->xCursorPosition()));
KDCoordinate yCursorPixelPosition = roundf(floatToPixel(Axis::Vertical, m_graphWindow->yCursorPosition()));
markRectAsDirty(KDRect(KDPoint(xCursorPixelPosition- k_cursorSize/2, yCursorPixelPosition - k_cursorSize/2), k_cursorSize, k_cursorSize));
layoutSubviews();
m_bannerView.reload();
}
void GraphView::layoutSubviews() {
KDCoordinate xCursorPixelPosition = roundf(floatToPixel(Axis::Horizontal, m_graphWindow->xCursorPosition()));
KDCoordinate yCursorPixelPosition = roundf(floatToPixel(Axis::Vertical, m_graphWindow->yCursorPosition()));
KDRect cursorFrame(xCursorPixelPosition - k_cursorSize/2, yCursorPixelPosition - k_cursorSize/2, k_cursorSize, k_cursorSize);
KDRect bannerFrame(KDRect(0, bounds().height()- k_bannerHeight, bounds().width(), k_bannerHeight));
if (!m_visibleCursor) {
cursorFrame = KDRectZero;
bannerFrame = KDRectZero;
}
m_cursorView.setFrame(cursorFrame);
m_bannerView.setFrame(bannerFrame);
}
int GraphView::numberOfSubviews() const {
return 2;
};
@@ -35,145 +89,10 @@ View * GraphView::subviewAtIndex(int index) {
return &m_bannerView;
}
void GraphView::setContext(Context * context) {
m_context = context;
m_bannerView.setContext(context);
}
Context * GraphView::context() const {
return m_context;
}
int GraphView::indexFunctionSelectedByCursor() {
return m_indexFunctionSelectedByCursor;
}
void GraphView::reload() {
markRectAsDirty(bounds());
layoutSubviews();
computeLabels(Axis::Horizontal);
computeLabels(Axis::Vertical);
}
void GraphView::reloadCursor() {
markRectAsDirty(KDRect(KDPoint(roundf(m_xCursorPosition) - k_cursorSize/2, roundf(m_yCursorPosition)- k_cursorSize/2), k_cursorSize, k_cursorSize));
layoutSubviews();
}
char * GraphView::label(Axis axis, int index) const {
return (axis == Axis::Horizontal ? (char *)m_xLabels[index] : (char *)m_yLabels[index]);
}
float GraphView::xPixelCursorPosition() {
return m_xCursorPosition;
}
float GraphView::xCursorPosition() {
return min(Axis::Horizontal) + m_xCursorPosition*(max(Axis::Horizontal)-min(Axis::Horizontal))/pixelLength(Axis::Horizontal);
}
void GraphView::goToAbscissaOnFunction(float abscissa, Function * function) {
m_graphWindow->centerAxisAround(GraphWindow::Axis::X, abscissa);
m_xCursorPosition = floatToPixel(Axis::Horizontal, abscissa);
float ordinate = function->evaluateAtAbscissa(abscissa, m_context);
m_graphWindow->centerAxisAround(GraphWindow::Axis::Y, ordinate);
m_yCursorPosition = floatToPixel(Axis::Vertical, ordinate);
updateBannerView(function);
reload();
}
void GraphView::setCursorVisible(bool visibleCursor) {
m_visibleCursor = visibleCursor;
layoutSubviews();
}
void GraphView::initCursorPosition() {
float center = (min(Axis::Horizontal)+max(Axis::Horizontal))/2.0f;
m_indexFunctionSelectedByCursor = 0;
Function * firstFunction = m_functionStore->activeFunctionAtIndex(0);
float fCenter = firstFunction->evaluateAtAbscissa(center, m_context);
m_xCursorPosition = (bounds().width()-1.0f)/2.0f;
m_yCursorPosition = floatToPixel(Axis::Vertical, fCenter);
updateBannerView(firstFunction);
}
void GraphView::moveCursorHorizontally(KDCoordinate xOffset) {
markRectAsDirty(KDRect(KDPoint(roundf(m_xCursorPosition) - k_cursorSize/2, roundf(m_yCursorPosition)- k_cursorSize/2), k_cursorSize, k_cursorSize));
m_xCursorPosition = m_xCursorPosition + xOffset;
float x = pixelToFloat(Axis::Horizontal, m_xCursorPosition);
Function * f = m_functionStore->activeFunctionAtIndex(m_indexFunctionSelectedByCursor);
float y = f->evaluateAtAbscissa(x, m_context);
float xMargin = pixelToFloat(Axis::Horizontal, k_cursorMarginToBorder) - pixelToFloat(Axis::Horizontal, 0);
float yMargin = pixelToFloat(Axis::Vertical, 0) - pixelToFloat(Axis::Vertical, k_cursorMarginToBorder);
bool windowHasMoved = m_graphWindow->panToMakePointVisible(x, y, xMargin, yMargin);
m_xCursorPosition = floatToPixel(Axis::Horizontal, x);
m_yCursorPosition = floatToPixel(Axis::Vertical, y);
updateBannerView(f);
if (windowHasMoved) {
reload();
} else {
reloadCursor();
}
}
Function * GraphView::moveCursorVertically(int direction) {
float x = pixelToFloat(Axis::Horizontal, m_xCursorPosition);
Function * actualFunction = m_functionStore->activeFunctionAtIndex(m_indexFunctionSelectedByCursor);
float y = actualFunction->evaluateAtAbscissa(x, m_context);
Function * nextFunction = actualFunction;
float nextY = direction > 0 ? FLT_MAX : -FLT_MAX;
for (int i = 0; i < m_functionStore->numberOfActiveFunctions(); i++) {
Function * f = m_functionStore->activeFunctionAtIndex(i);
float newY = f->evaluateAtAbscissa(x, m_context);
bool isNextFunction = direction > 0 ? (newY > y && newY < nextY) : (newY < y && newY > nextY);
if (isNextFunction) {
m_indexFunctionSelectedByCursor = i;
nextY = newY;
nextFunction = f;
}
}
if (nextFunction == actualFunction) {
return nullptr;
}
float xMargin = pixelToFloat(Axis::Horizontal, k_cursorMarginToBorder) - pixelToFloat(Axis::Horizontal, 0);
float yMargin = pixelToFloat(Axis::Vertical, 0) - pixelToFloat(Axis::Vertical, k_cursorMarginToBorder);
bool windowHasMoved = m_graphWindow->panToMakePointVisible(x, nextY, xMargin, yMargin);
markRectAsDirty(KDRect(KDPoint(roundf(m_xCursorPosition) - k_cursorSize/2, roundf(m_yCursorPosition)- k_cursorSize/2), k_cursorSize, k_cursorSize));
m_xCursorPosition = floatToPixel(Axis::Horizontal, x);
m_yCursorPosition = floatToPixel(Axis::Vertical, nextY);
updateBannerView(nextFunction);
if (windowHasMoved) {
reload();
} else {
reloadCursor();
}
return nextFunction;
}
void GraphView::layoutSubviews() {
KDRect cursorFrame(roundf(m_xCursorPosition) - k_cursorSize/2, roundf(m_yCursorPosition) - k_cursorSize/2, k_cursorSize, k_cursorSize);
KDRect bannerFrame(KDRect(0, bounds().height()- k_bannerHeight, bounds().width(), k_bannerHeight));
if (!m_visibleCursor) {
cursorFrame = KDRectZero;
bannerFrame = KDRectZero;
}
m_cursorView.setFrame(cursorFrame);
m_bannerView.setFrame(bannerFrame);
}
void GraphView::drawRect(KDContext * ctx, KDRect rect) const {
ctx->fillRect(rect, KDColorWhite);
drawGrid(ctx, rect);
drawAxes(ctx, rect, Axis::Horizontal);
drawAxes(ctx, rect, Axis::Vertical);
drawLabels(ctx, rect, Axis::Horizontal, true);
drawLabels(ctx, rect, Axis::Vertical, true);
for (int i = 0; i < m_functionStore->numberOfActiveFunctions(); i++) {
Function * f = m_functionStore->activeFunctionAtIndex(i);
drawCurve(ctx, rect, f, f->color());
}
}
void GraphView::drawGridLines(KDContext * ctx, KDRect rect, Axis axis, float step, KDColor color) const {
float rectMin = pixelToFloat(Axis::Horizontal, rect.left());
float rectMax = pixelToFloat(Axis::Horizontal, rect.right());
@@ -200,9 +119,4 @@ float GraphView::evaluateModelWithParameter(Model * curve, float abscissa) const
return f->evaluateAtAbscissa(abscissa, m_context);
}
void GraphView::updateBannerView(Function * function) {
m_bannerView.setAbscissa(xCursorPosition());
m_bannerView.setFunction(function);
}
}