UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-18 16:27:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into omega-hotfix

Browse Source
This commit is contained in:
Quentin Guidée
2020-02-25 15:21:24 +01:00
parent 88f202c4e7 383aafcc55
commit b26a35a200
4 changed files with 37 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/shared/interactive_curve_view_range.cpp
View File

@@ -131,9 +131,9 @@ void InteractiveCurveViewRange::setDefault() {
return;
}
if (!m_delegate->defautRangeIsNormalized()) {
m_yAuto = true;
m_xRange.setMax(m_delegate->interestingXHalfRange(), k_lowerMaxFloat, k_upperMaxFloat);
setXMin(-xMax());
m_yAuto = true;
return;
}

2
apps/statistics/histogram_controller.cpp
View File

@@ -42,7 +42,7 @@ const char * HistogramController::title() {
bool HistogramController::handleEvent(Ion::Events::Event event) {
assert(selectedSeriesIndex() >= 0);
if (event == Ion::Events::OK) {
if (event == Ion::Events::OK || event == Ion::Events::EXE) {
stackController()->push(histogramParameterController());
return true;
}

71
ion/src/simulator/web/simulator.html
View File

@@ -38,8 +38,8 @@ body.fullscreen .col-calculator {
a.action {
display: block;
width: 3%;
padding: 1% 2%;
width: 4%;
padding: 1.5% 3%;
border: 1px solid black;
border-radius: 100px;
cursor: pointer;
@@ -55,20 +55,6 @@ a.action svg {
display: block;
}
.actions {
position: absolute;
bottom: 2%;
text-align: left;
left: 0;
right: 0;
margin-left: 20px; /* Center the buttons - compensate the 10px margin below */
}
.actions a {
display: inline-block;
margin-right: 10px;
}
.calculator {
margin: 0 auto;
position: relative;
@@ -76,7 +62,7 @@ a.action svg {
text-align: left; }
.calculator > img {
/* Rely on the img content to set the dimensions */
max-height: 100vh;
max-height: 92.0vh;
max-width: 100%;
display: block; }
.calculator .screen {
@@ -86,6 +72,18 @@ a.action svg {
width: 67.5%;
height: 26.3%;
border: 0 none; }
.calculator .actions {
position: absolute;
top: 94.0vh;
text-align: center;
left: 0;
right: 0;
margin-left: 20px; /* Center the buttons - compensate the 10px margin below */
}
.calculator .actions a {
display: inline-block;
margin-right: 10px;
}
.calculator .keyboard {
position: absolute;
top: 38.5%;
@@ -110,7 +108,7 @@ a.action svg {
position: absolute; }
.calculator .keyboard .nav .left {
top: 36%;
left: 3%;
left: 2%;
width: 15%;
height: 28%; }
.calculator .keyboard .nav .right {
@@ -120,17 +118,17 @@ a.action svg {
height: 28%; }
.calculator .keyboard .nav .top {
top: 7%;
left: 12.5%;
left: 12%;
width: 10%;
height: 40%; }
.calculator .keyboard .nav .bottom {
top: 53%;
left: 12.5%;
left: 12%;
width: 10%;
height: 40%; }
.calculator .keyboard .nav .home {
top: 12%;
left: 42%;
top: 15%;
left: 41%;
width: 16%;
height: 33%; }
.calculator .keyboard .nav .power {
@@ -139,19 +137,19 @@ a.action svg {
width: 16%;
height: 33%; }
.calculator .keyboard .nav .ok {
top: 30%;
left: 68%;
top: 31%;
left: 67%;
width: 13%;
height: 38%; }
.calculator .keyboard .nav .back {
top: 30%;
top: 31%;
left: 84%;
width: 13%;
height: 38%; }
.calculator .keyboard .functions {
position: absolute;
top: 26.75%;
left: 1%;
left: 0.5%;
width: 98%; }
.calculator .keyboard .functions span {
margin: 1.7% 1%;
@@ -160,14 +158,14 @@ a.action svg {
padding-top: 10%; }
.calculator .keyboard .digits {
position: absolute;
top: 57%;
top: 56.5%;
left: 0.5%;
width: 98%; }
.calculator .keyboard .digits span {
margin: 1.8% 2%;
width: 16%;
height: 0;
padding-top: 11%; }
padding-top: 11.3%; }
</style>
</head>
<body>
@@ -230,20 +228,19 @@ a.action svg {
<span data-key="52"></span>
</div>
</div>
<div class="actions">
<a id="action-fullscreen" class="action">
<svg viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"><g fill="#434343"><path d="M5.075,6.95 L6.918,5.088 L3.938,2.062 L5.955,0.018 L0.052,0.018 L0.052,6.004 L2.098,3.928 L5.075,6.95 Z" class="si-glyph-fill"></path><path d="M16.0034788,9.916 L13.832,12.013 L10.799,8.96 L8.918,10.841 L11.957,13.897 L9.961,15.9813842 L16.0034788,15.9813842 L16.0034788,9.916 Z"></path></g></g></svg>
</a>
<a id="action-screenshot" class="action">
<svg viewBox="0 1.5 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><title>871</title><defs></defs><g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"><g transform="translate(0.995000, 2.980000)" fill="#434343"><circle cx="7.958" cy="6.958" r="2.958" class="si-glyph-fill"></circle><path d="M14.666,2.042 L10.953,2.042 L9.937,0.031 L6,0.031 L5,2.042 L1.333,2.042 C0.597,2.042 0,2.639 0,3.375 L0,10.625 C0,11.361 0.597,11.959 1.333,11.959 L14.666,11.959 C15.402,11.959 16,11.361 16,10.625 L16,3.375 C16,2.639 15.402,2.042 14.666,2.042 L14.666,2.042 Z M6.953,0.969 L9.047,0.969 L9.047,2.031 L6.953,2.031 L6.953,0.969 L6.953,0.969 Z M8.002,11.033 C5.764,11.033 3.947,9.221 3.947,6.985 C3.947,4.749 5.763,2.937 8.002,2.937 C10.242,2.937 12.057,4.749 12.057,6.985 C12.057,9.221 10.242,11.033 8.002,11.033 L8.002,11.033 Z M14,4.031 L11.953,4.031 L11.953,2.969 L14,2.969 L14,4.031 L14,4.031 Z" class="si-glyph-fill"></path></g></g></svg>
</a>
</div>
</div>
</div>
<div class="col-fullscreen">
<canvas class="screen-magnified" width="320" height="240"></canvas>
</div>
<div class="actions">
<a id="action-fullscreen" class="action">
<svg viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"><g fill="#434343"><path d="M5.075,6.95 L6.918,5.088 L3.938,2.062 L5.955,0.018 L0.052,0.018 L0.052,6.004 L2.098,3.928 L5.075,6.95 Z" class="si-glyph-fill"></path><path d="M16.0034788,9.916 L13.832,12.013 L10.799,8.96 L8.918,10.841 L11.957,13.897 L9.961,15.9813842 L16.0034788,15.9813842 L16.0034788,9.916 Z"></path></g></g></svg>
</a>
<a id="action-screenshot" class="action">
<svg viewBox="0 1.5 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><title>871</title><defs></defs><g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"><g transform="translate(0.995000, 2.980000)" fill="#434343"><circle cx="7.958" cy="6.958" r="2.958" class="si-glyph-fill"></circle><path d="M14.666,2.042 L10.953,2.042 L9.937,0.031 L6,0.031 L5,2.042 L1.333,2.042 C0.597,2.042 0,2.639 0,3.375 L0,10.625 C0,11.361 0.597,11.959 1.333,11.959 L14.666,11.959 C15.402,11.959 16,11.361 16,10.625 L16,3.375 C16,2.639 15.402,2.042 14.666,2.042 L14.666,2.042 Z M6.953,0.969 L9.047,0.969 L9.047,2.031 L6.953,2.031 L6.953,0.969 L6.953,0.969 Z M8.002,11.033 C5.764,11.033 3.947,9.221 3.947,6.985 C3.947,4.749 5.763,2.937 8.002,2.937 C10.242,2.937 12.057,4.749 12.057,6.985 C12.057,9.221 10.242,11.033 8.002,11.033 L8.002,11.033 Z M14,4.031 L11.953,4.031 L11.953,2.969 L14,2.969 L14,4.031 L14,4.031 Z" class="si-glyph-fill"></path></g></g></svg>
</a>
</div>
</div>
<script src="epsilon.js"></script>
<script>

1
python/port/mod/ion/modion.cpp
View File

@@ -9,5 +9,6 @@ extern "C" {
mp_obj_t modion_keyboard_keydown(mp_obj_t key_o) {
Ion::Keyboard::Key key = static_cast<Ion::Keyboard::Key>(mp_obj_get_int(key_o));
Ion::Keyboard::State state = Ion::Keyboard::scan();
micropython_port_interrupt_if_needed();
return mp_obj_new_bool(state.keyDown(key));
}