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

[Clipboard] Changed the general copy/paste

Browse Source 
Fixed issues due to copy/paste of empty formulas. When pasted, empty
formulas are now recognized by the parser and apear with the
correct layout

Without this process, copying an empty integral then pasting it gives :
int((), x, (), ()) instead of drawing an empty integral

Change-Id: I680aaf4eea953149e2d57efa8153ab4d3f93e2a7
This commit is contained in:
Arthur Camouseigt
2020-09-07 16:18:49 +02:00
committed by Émilie Feral
parent 8f97a332f6
commit ea36c6e5d7
3 changed files with 54 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
escher/include/escher/clipboard.h
View File

@@ -9,7 +9,7 @@ class Clipboard {
public:
static Clipboard * sharedClipboard();
void store(const char * storedText, int length = -1);
const char * storedText() { return m_textBuffer; }
const char * storedText();
void reset();
void enterPython() { replaceCharForPython(true); }
void exitPython() { replaceCharForPython(false); }

25
escher/src/clipboard.cpp
View File

@@ -12,6 +12,31 @@ void Clipboard::store(const char * storedText, int length) {
strlcpy(m_textBuffer, storedText, length == -1 ? TextField::maxBufferSize() : std::min(TextField::maxBufferSize(), length + 1));
}
const char * Clipboard::storedText() {
/* In order to allow copy/paste of empty formulas, we need to add empty
* layouts between empty system parenthesis. This way, when the expression
* is parsed, it is recognized as a proper formula and appears with the correct
* visual layout.
* Without this process, copying an empty integral then pasting it gives :
* int((), x, (), ()) instead of drawing an empty integral.
*
* Furthermore, in case the user switches from linear to natural writing mode
* we need to add an empty layout between parenthesis to allow proper layout
* construction. */
constexpr int numberOfPairs = 6;
constexpr UTF8Helper::TextPair textPairs[numberOfPairs] = {
UTF8Helper::TextPair("()", "(\x11)"),
UTF8Helper::TextPair("[]", "[\x11]"),
UTF8Helper::TextPair("[,", "[\x11,"),
UTF8Helper::TextPair(",,", ",\x11,"),
UTF8Helper::TextPair(",]", ",\x11]"),
UTF8Helper::TextPair("\x12\x13", "\x12\x11\x13"),
};
UTF8Helper::tryAndReplacePatternsInStringByPatterns(m_textBuffer, TextField::maxBufferSize(), (UTF8Helper::TextPair *) &textPairs, numberOfPairs, true);
return m_textBuffer;
}
void Clipboard::reset() {
strlcpy(m_textBuffer, "", 1);
}

28
escher/test/clipboard.cpp
View File

@@ -1,5 +1,7 @@
#include <quiz.h>
#include <string.h>
#include <poincare_layouts.h>
#include <poincare/expression.h>
#include <escher/clipboard.h>
void assert_clipboard_enters_and_exits_python(const char * string, const char * stringResult) {
@@ -19,3 +21,29 @@ QUIZ_CASE(escher_clipboard_enters_and_exits_python) {
assert_clipboard_enters_and_exits_python("1×𝐢^2", "1*1j**2");
assert_clipboard_enters_and_exits_python("12^(1/4)×(π/6)×(12×π)^(1/4)", "12**(1/4)*(pi/6)*(12*pi)**(1/4)");
}
using namespace Poincare;
void assert_stored_text_is_parseable(Poincare::Layout layout) {
constexpr int bufferSize = 500;
char buffer[bufferSize];
layout.serializeForParsing(buffer, bufferSize);
Clipboard * clipboard = Clipboard::sharedClipboard();
clipboard->store(buffer);
Expression e = Expression::Parse(clipboard->storedText(), nullptr, false);
Layout result = e.createLayout(Preferences::sharedPreferences()->displayMode(), Poincare::PrintFloat::k_numberOfStoredSignificantDigits);
quiz_assert(layout.isIdenticalTo(result));
}
QUIZ_CASE(escher_clipboard_stored_text_is_parseable) {
Layout l = IntegralLayout::Builder(EmptyLayout::Builder(), CodePointLayout::Builder('x'), EmptyLayout::Builder(), EmptyLayout::Builder());
assert_stored_text_is_parseable(l);
l = NthRootLayout::Builder(EmptyLayout::Builder());
assert_stored_text_is_parseable(l);
l = MatrixLayout::Builder(CodePointLayout::Builder('1'), EmptyLayout::Builder(), EmptyLayout::Builder(), CodePointLayout::Builder('2'));
assert_stored_text_is_parseable(l);
l = SumLayout::Builder(EmptyLayout::Builder(), CodePointLayout::Builder('n'), EmptyLayout::Builder(), EmptyLayout::Builder());
assert_stored_text_is_parseable(l);
l = SumLayout::Builder(EmptyLayout::Builder(), CodePointLayout::Builder('n'), EmptyLayout::Builder(), EmptyLayout::Builder());
assert_stored_text_is_parseable(l);;
}