UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[shared] Rename ZoomParameterController

Browse Source 
Change-Id: I64a6500b66db4455217920a1e73efd5848216411
This commit is contained in:
Gabriel Ozouf
2020-10-16 16:07:01 +02:00
committed by Émilie Feral
parent f491be2db5
commit 0e4de43b8f
4 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/shared/Makefile
View File

@@ -43,6 +43,7 @@ app_shared_src = $(addprefix apps/shared/,\
function_list_controller.cpp \
function_store.cpp \
function_title_cell.cpp \
function_zoom_and_pan_curve_view_controller.cpp \
go_to_parameter_controller.cpp \
hideable_even_odd_buffer_text_cell.cpp \
hideable_even_odd_cell.cpp \
@@ -89,7 +90,6 @@ app_shared_src = $(addprefix apps/shared/,\
values_parameter_controller.cpp \
vertical_cursor_view.cpp \
xy_banner_view.cpp\
zoom_parameter_controller.cpp \
)
app_shared_src += $(app_shared_test_src)

36
apps/shared/zoom_parameter_controller.cpp → apps/shared/function_zoom_and_pan_curve_view_controller.cpp
View File

@@ -1,21 +1,21 @@
#include "zoom_parameter_controller.h"
#include "function_zoom_and_pan_curve_view_controller.h"
#include <assert.h>
#include <cmath>
namespace Shared {
ZoomParameterController::ZoomParameterController(Responder * parentResponder, InteractiveCurveViewRange * interactiveRange, CurveView * curveView) :
FunctionZoomAndPanCurveViewController::FunctionZoomAndPanCurveViewController(Responder * parentResponder, InteractiveCurveViewRange * interactiveRange, CurveView * curveView) :
ZoomAndPanCurveViewController(parentResponder),
m_contentView(curveView),
m_interactiveRange(interactiveRange)
{
}
const char * ZoomParameterController::title() {
const char * FunctionZoomAndPanCurveViewController::title() {
return I18n::translate(I18n::Message::Navigate);
}
void ZoomParameterController::viewWillAppear() {
void FunctionZoomAndPanCurveViewController::viewWillAppear() {
ViewController::viewWillAppear();
m_contentView.curveView()->setOkView(nullptr);
/* We need to change the curve range to keep the same visual aspect of the
@@ -23,16 +23,16 @@ void ZoomParameterController::viewWillAppear() {
adaptCurveRange(true);
}
void ZoomParameterController::viewDidDisappear() {
void FunctionZoomAndPanCurveViewController::viewDidDisappear() {
// Restore the curve range
adaptCurveRange(false);
}
void ZoomParameterController::didBecomeFirstResponder() {
void FunctionZoomAndPanCurveViewController::didBecomeFirstResponder() {
m_contentView.layoutSubviews();
}
void ZoomParameterController::adaptCurveRange(bool viewWillAppear) {
void FunctionZoomAndPanCurveViewController::adaptCurveRange(bool viewWillAppear) {
float currentYMin = m_interactiveRange->yMin();
float currentRange = m_interactiveRange->yMax() - m_interactiveRange->yMin();
float newYMin = 0;
@@ -47,16 +47,16 @@ void ZoomParameterController::adaptCurveRange(bool viewWillAppear) {
/* Content View */
ZoomParameterController::ContentView::ContentView(CurveView * curveView) :
FunctionZoomAndPanCurveViewController::ContentView::ContentView(CurveView * curveView) :
m_curveView(curveView)
{
}
int ZoomParameterController::ContentView::numberOfSubviews() const {
int FunctionZoomAndPanCurveViewController::ContentView::numberOfSubviews() const {
return 2;
}
View * ZoomParameterController::ContentView::subviewAtIndex(int index) {
View * FunctionZoomAndPanCurveViewController::ContentView::subviewAtIndex(int index) {
assert(index >= 0 && index < 2);
/* The order of subviews matters here: redrawing curve view can be long and
* if it was redraw before the legend view, you could see noise when
@@ -67,19 +67,19 @@ View * ZoomParameterController::ContentView::subviewAtIndex(int index) {
return m_curveView;
}
void ZoomParameterController::ContentView::layoutSubviews(bool force) {
assert(bounds().height() == ZoomParameterController::k_standardViewHeight);
void FunctionZoomAndPanCurveViewController::ContentView::layoutSubviews(bool force) {
assert(bounds().height() == FunctionZoomAndPanCurveViewController::k_standardViewHeight);
m_curveView->setFrame(KDRect(0, 0, bounds().width(), bounds().height() - k_legendHeight), force);
m_legendView.setFrame(KDRect(0, bounds().height() - k_legendHeight, bounds().width(), k_legendHeight), force);
}
CurveView * ZoomParameterController::ContentView::curveView() {
CurveView * FunctionZoomAndPanCurveViewController::ContentView::curveView() {
return m_curveView;
}
/* Legend View */
ZoomParameterController::ContentView::LegendView::LegendView()
FunctionZoomAndPanCurveViewController::ContentView::LegendView::LegendView()
{
I18n::Message messages[k_numberOfLegends] = {I18n::Message::Move, I18n::Message::ToZoom, I18n::Message::Or};
float horizontalAlignments[k_numberOfLegends] = {1.0f, 1.0f, 0.5f};
@@ -95,15 +95,15 @@ ZoomParameterController::ContentView::LegendView::LegendView()
}
}
void ZoomParameterController::ContentView::LegendView::drawRect(KDContext * ctx, KDRect rect) const {
void FunctionZoomAndPanCurveViewController::ContentView::LegendView::drawRect(KDContext * ctx, KDRect rect) const {
ctx->fillRect(KDRect(0, bounds().height() - k_legendHeight, bounds().width(), k_legendHeight), Palette::GrayBright);
}
int ZoomParameterController::ContentView::LegendView::numberOfSubviews() const {
int FunctionZoomAndPanCurveViewController::ContentView::LegendView::numberOfSubviews() const {
return k_numberOfLegends+k_numberOfTokens;
}
View * ZoomParameterController::ContentView::LegendView::subviewAtIndex(int index) {
View * FunctionZoomAndPanCurveViewController::ContentView::LegendView::subviewAtIndex(int index) {
assert(index >= 0 && index < k_numberOfTokens+k_numberOfLegends);
if (index < k_numberOfLegends) {
return &m_legends[index];
@@ -111,7 +111,7 @@ View * ZoomParameterController::ContentView::LegendView::subviewAtIndex(int inde
return &m_legendPictograms[index-k_numberOfLegends];
}
void ZoomParameterController::ContentView::LegendView::layoutSubviews(bool force) {
void FunctionZoomAndPanCurveViewController::ContentView::LegendView::layoutSubviews(bool force) {
KDCoordinate height = bounds().height();
KDCoordinate xOrigin = 0;
KDCoordinate legendWidth = m_legends[0].minimalSizeForOptimalDisplay().width();

8
apps/shared/zoom_parameter_controller.h → apps/shared/function_zoom_and_pan_curve_view_controller.h
View File

@@ -1,14 +1,14 @@
#ifndef SHARED_ZOOM_PARAMETER_CONTROLLER_H
#define SHARED_ZOOM_PARAMETER_CONTROLLER_H
#ifndef SHARED_FUNCTION_ZOOM_AND_PAN_CURVE_VIEW_CONTROLLER_H
#define SHARED_FUNCTION_ZOOM_AND_PAN_CURVE_VIEW_CONTROLLER_H
#include "zoom_and_pan_curve_view_controller.h"
#include <apps/i18n.h>
namespace Shared {
class ZoomParameterController : public ZoomAndPanCurveViewController {
class FunctionZoomAndPanCurveViewController : public ZoomAndPanCurveViewController {
public:
ZoomParameterController(Responder * parentResponder, InteractiveCurveViewRange * interactiveCurveViewRange, CurveView * curveView);
FunctionZoomAndPanCurveViewController(Responder * parentResponder, InteractiveCurveViewRange * interactiveCurveViewRange, CurveView * curveView);
const char * title() override;
View * view() override { return &m_contentView; }
void viewWillAppear() override;

4
apps/shared/interactive_curve_view_controller.h
View File

@@ -5,7 +5,7 @@
#include "cursor_view.h"
#include "ok_view.h"
#include "range_parameter_controller.h"
#include "zoom_parameter_controller.h"
#include "function_zoom_and_pan_curve_view_controller.h"
#include <poincare/coordinate_2D.h>
namespace Shared {
@@ -77,7 +77,7 @@ private:
uint32_t * m_rangeVersion;
RangeParameterController m_rangeParameterController;
ZoomParameterController m_zoomParameterController;
FunctionZoomAndPanCurveViewController m_zoomParameterController;
InteractiveCurveViewRange * m_interactiveRange;
Button m_autoButton;
Button m_normalizeButton;