comments and some improvements

This commit is contained in:
jorenchik
2024-11-23 23:06:44 +02:00
parent 8367e17381
commit 7facd5c2a1
5 changed files with 626 additions and 370 deletions

View File

@@ -8,7 +8,7 @@
Result<ParseInfo> transpile(std::string fileContent); Result<ParseInfo> transpile(std::string fileContent);
std::string escapeText(std::string text); std::string escapeText(std::string text);
std::string wrapText(std::string text, size_t width); std::string wrapLine(std::string text, size_t width);
extern std::chrono::high_resolution_clock::time_point start; extern std::chrono::high_resolution_clock::time_point start;

View File

@@ -73,7 +73,7 @@
#include "parser.h" #include "parser.h"
#include "qscilexer.h" #include "qscilexer.h"
// Memorybase. // Atmiņas bāze.
QString currentPath = ""; QString currentPath = "";
std::string currentMdem = ""; std::string currentMdem = "";
QFileSystemModel *model; QFileSystemModel *model;
@@ -81,7 +81,7 @@ QTreeView *mdemList;
std::map<std::string, MdemBuffer*> buffers; std::map<std::string, MdemBuffer*> buffers;
MdemBuffer *currentMdemBuffer; MdemBuffer *currentMdemBuffer;
// Mdem list. // Atmiņas kaartīšu saraksts.
std::vector<Mdem*> mdems = std::vector<Mdem*>(); std::vector<Mdem*> mdems = std::vector<Mdem*>();
QVBoxLayout *hMdemScroll; QVBoxLayout *hMdemScroll;
QSpacerItem *mdemSpacer; QSpacerItem *mdemSpacer;
@@ -89,17 +89,20 @@ ErrorView *errorView;
Pagination *pagination; Pagination *pagination;
int perPage; int perPage;
// Editor // Redaktors.
QsciScintilla *editor; QsciScintilla *editor;
QMainWindow *editorWindow; QMainWindow *editorWindow;
Mdem *editMdem; Mdem *editMdem;
// Top labels. // Augšēja informācija.
QLabel *membaseLabel; QLabel *membaseLabel;
QLabel *mdemLabel; QLabel *mdemLabel;
QLabel *lastPracticeLabel; QLabel *lastPracticeLabel;
QMainWindow *trainWindow; QMainWindow *trainWindow;
/*
* Atmiņas kartītei parāda visus slēptos elementus.
* */
void showBacklabels(Mdem *mdem) { void showBacklabels(Mdem *mdem) {
for (size_t i = 0; i < mdem->backLabels.size(); ++i) { for (size_t i = 0; i < mdem->backLabels.size(); ++i) {
if (i < mdem->labelCount) { if (i < mdem->labelCount) {
@@ -114,14 +117,19 @@ void showBacklabels(Mdem *mdem) {
} }
} }
/*
* Izveido jautājuma kartīšu pirmkodu ar norādītu trenešanas laiku.
* Papildus konfigurācijai var norādīt platumu pirms jaunas rindas un laika zonu.
*/
std::string outputMdem( std::string outputMdem(
std::vector<Question*> questions, std::vector<Question*> questions,
time_t time = 0, time_t time = 0,
const int wrap_width = 80, const int wrapWidth = 80,
const int timezoneOffset = 0 const int timezoneOffset = 0
) { ) {
std::stringstream ss; std::stringstream ss;
// Ja ir saistīts laiks, ja tāds ir.
if (time > 0) { if (time > 0) {
std::tm* tm = std::localtime(&time); std::tm* tm = std::localtime(&time);
char buffer[100]; char buffer[100];
@@ -130,18 +138,25 @@ std::string outputMdem(
ss << time << std::endl; ss << time << std::endl;
} }
// Detranspilē katru jautājumu.
for (auto question: questions) { for (auto question: questions) {
// Pārtraukums.
ss << std::endl; ss << std::endl;
std::string cooldownPart; std::string cooldownPart;
if (question->cooldown != 0) { if (question->cooldown != 0) {
cooldownPart = std::format(" [{:.2f}]", question->cooldown); cooldownPart = std::format(" [{:.2f}]", question->cooldown);
} }
ss << wrapText(
// Jautājuma teksts.
ss << wrapLine(
std::format("-{}{} >\n", std::format("-{}{} >\n",
cooldownPart, cooldownPart,
" " + escapeText(question->questionText)), " " + escapeText(question->questionText)),
wrap_width wrapWidth
); );
// Detranspilē atbilstoši veidam.
if (MultiElementQuestion* mw = dynamic_cast<MultiElementQuestion*>(question)) { if (MultiElementQuestion* mw = dynamic_cast<MultiElementQuestion*>(question)) {
for (auto choice: mw->choices) { for (auto choice: mw->choices) {
char opener; char opener;
@@ -155,30 +170,32 @@ std::string outputMdem(
orderModifier = "^"; orderModifier = "^";
} }
ss << ss <<
wrapText( wrapLine(
std::format( std::format(
"\t{}{} {}\n", "\t{}{} {}\n",
opener, opener,
orderModifier, orderModifier,
escapeText(choice.answer) escapeText(choice.answer)
) )
, wrap_width); , wrapWidth);
} }
} else if (GroupQuestion* gq = dynamic_cast<GroupQuestion*>(question)) { } else if (GroupQuestion* gq = dynamic_cast<GroupQuestion*>(question)) {
for (auto group: gq->groups) { for (auto group: gq->groups) {
ss << wrapText( ss << wrapLine(
std::format( std::format(
"\t- {}:\n", "\t- {}:\n",
escapeText(group.name) escapeText(group.name)
) )
, wrap_width); , wrapWidth);
for (auto element: group.elements) { for (auto element: group.elements) {
ss << wrapText( ss << wrapLine(
std::format( std::format(
"\t\t- {}\n", "\t\t- {}\n",
escapeText(element) escapeText(element)
) )
, wrap_width); , wrapWidth);
} }
} }
} }
@@ -186,14 +203,21 @@ std::string outputMdem(
return ss.str(); return ss.str();
} }
/*
* Izveido lappušu objektus atbilstoši jautājumu skaitam vienā lapā.
* */
void makePages() { void makePages() {
pagination->pages.clear(); pagination->pages.clear();
auto len = currentMdemBuffer->questions.size(); auto len = currentMdemBuffer->questions.size();
perPage = settings->value(SETTING_PER_PAGE).toInt(); perPage = settings->value(SETTING_PER_PAGE).toInt();
auto pageAmount = len / perPage; auto pageAmount = len / perPage;
// Papildus lapa, ja objektu skaits nedalās tieši un paliek papildus kartītes.
if (len % perPage != 0) { if (len % perPage != 0) {
pageAmount += 1; pageAmount += 1;
} }
// Veido lappuses objektus.
for (size_t i = 0; i < pageAmount; i++) { for (size_t i = 0; i < pageAmount; i++) {
size_t startingIndex = perPage * i ; size_t startingIndex = perPage * i ;
size_t amount = perPage; size_t amount = perPage;
@@ -204,9 +228,20 @@ void makePages() {
Page{startingIndex, startingIndex + amount} Page{startingIndex, startingIndex + amount}
); );
} }
// Ja tiek noņemts pēdējais lappuses elements, pārliek lappusi uz iepriekšējo.
if (pagination->pages.size() > 1 && pagination->currentPage >= pagination->pages.size()) {
--pagination->currentPage;
}
} }
/*
* Uzstāda atmiņas kartīti ar jebkura veida jautājuma.
* Uzstāda jautājuma tekstu un pievieno/uzstāda atbildes elementus.
* */
void setupMdem(Mdem *mdem, Question *question) { void setupMdem(Mdem *mdem, Question *question) {
// Priekšas teksts.
std::stringstream ss; std::stringstream ss;
if (question->cooldown > 0) { if (question->cooldown > 0) {
ss << std::format("[{:.2f}] ", question->cooldown); ss << std::format("[{:.2f}] ", question->cooldown);
@@ -215,10 +250,15 @@ void setupMdem(Mdem *mdem, Question *question) {
mdem->wFrontText.setText( mdem->wFrontText.setText(
QString::fromStdString(ss.str()) QString::fromStdString(ss.str())
); );
if (MultiElementQuestion* mw = dynamic_cast<MultiElementQuestion*>(question)) { if (MultiElementQuestion* mw = dynamic_cast<MultiElementQuestion*>(question)) {
auto choices = mw->choices; auto choices = mw->choices;
// Pievieno vairākus elementus atbilstoši veidam.
for (size_t k = 0; k < choices.size(); ++k) { for (size_t k = 0; k < choices.size(); ++k) {
auto answer = choices[k].answer; auto answer = choices[k].answer;
// Sagatavo elementu.
switch (mw->type) { switch (mw->type) {
case MultiElementType::Order: case MultiElementType::Order:
answer = std::format("{}. {}", k + 1, answer); answer = std::format("{}. {}", k + 1, answer);
@@ -234,6 +274,8 @@ void setupMdem(Mdem *mdem, Question *question) {
answer = std::format("- {}", answer); answer = std::format("- {}", answer);
break; break;
} }
// Pievieno elementu.
if (k < mdem->backLabels.size()) { if (k < mdem->backLabels.size()) {
mdem->backLabels[k]->setText(QString::fromStdString(answer)); mdem->backLabels[k]->setText(QString::fromStdString(answer));
} else { } else {
@@ -243,10 +285,13 @@ void setupMdem(Mdem *mdem, Question *question) {
mdem->wBack.layout()->addWidget(label); mdem->wBack.layout()->addWidget(label);
} }
} }
mdem->labelCount = choices.size(); mdem->labelCount = choices.size();
} else if (GroupQuestion* mw = dynamic_cast<GroupQuestion*>(question)) { } else if (GroupQuestion* mw = dynamic_cast<GroupQuestion*>(question)) {
auto groups = mw->groups; auto groups = mw->groups;
std::vector<std::string> elements; std::vector<std::string> elements;
// Sagatovo grupas un elementus.
for (size_t k = 0; k < groups.size(); ++k) { for (size_t k = 0; k < groups.size(); ++k) {
auto answer = groups[k].name; auto answer = groups[k].name;
elements.push_back(std::format("- {}:", answer)); elements.push_back(std::format("- {}:", answer));
@@ -254,6 +299,8 @@ void setupMdem(Mdem *mdem, Question *question) {
elements.push_back(std::format(" - {}", groups[k].elements[l])); elements.push_back(std::format(" - {}", groups[k].elements[l]));
} }
} }
// Pievieno grupas un elementus.
for (size_t k = 0; k < elements.size(); ++k) { for (size_t k = 0; k < elements.size(); ++k) {
if (k < mdem->backLabels.size()) { if (k < mdem->backLabels.size()) {
mdem->backLabels[k]->setText(QString::fromStdString(elements[k])); mdem->backLabels[k]->setText(QString::fromStdString(elements[k]));
@@ -264,12 +311,16 @@ void setupMdem(Mdem *mdem, Question *question) {
mdem->wBack.layout()->addWidget(label); mdem->wBack.layout()->addWidget(label);
} }
} }
mdem->labelCount = elements.size(); mdem->labelCount = elements.size();
} }
} }
void switchPage(int pageIdx); void switchPage(int pageIdx);
/*
* Iegūst faila nosaukumu no faila ceļa.
*/
std::string getFilename(std::string path) { std::string getFilename(std::string path) {
static const std::regex lastPathElementExp = std::regex("(.+\\/)*(.+)"); static const std::regex lastPathElementExp = std::regex("(.+\\/)*(.+)");
std::smatch matches; std::smatch matches;
@@ -277,6 +328,9 @@ std::string getFilename(std::string path) {
return matches[2].str(); return matches[2].str();
} }
/*
* Atjauno atmiņas kartīšu faila augšējo informāciju.
* */
void updateMdemInfo(std::string filename, bool isChanged) { void updateMdemInfo(std::string filename, bool isChanged) {
currentMdemBuffer->isModified = isChanged; currentMdemBuffer->isModified = isChanged;
if (filename.length() > 0) { if (filename.length() > 0) {
@@ -301,14 +355,16 @@ void updateMdemInfo(std::string filename, bool isChanged) {
} }
} }
/*
* Izveido atmiņas kartīti un visus tās elementus.
* */
Mdem* makeMdem() { Mdem* makeMdem() {
auto mdem = new Mdem; auto mdem = new Mdem;
mdem->wMdem.setLayout(&mdem->vMdem); mdem->wMdem.setLayout(&mdem->vMdem);
// Priekša.
QString id = QString("mdem_%1").arg(1); QString id = QString("mdem_%1").arg(1);
mdem->wMdem.setObjectName(id); mdem->wMdem.setObjectName(id);
// Front
mdem->wFront.setMinimumHeight(70); mdem->wFront.setMinimumHeight(70);
mdem->wFront.setLayout(&mdem->hFront); mdem->wFront.setLayout(&mdem->hFront);
mdem->wFront.setProperty("first", "true"); mdem->wFront.setProperty("first", "true");
@@ -324,7 +380,7 @@ Mdem* makeMdem() {
"}" "}"
).arg(id, MDEM_BACKGROUND)); ).arg(id, MDEM_BACKGROUND));
// Add Front Content // Saturs.
mdem->wFrontText.setWordWrap(true); mdem->wFrontText.setWordWrap(true);
mdem->wFrontText.setSizePolicy( mdem->wFrontText.setSizePolicy(
QSizePolicy::Expanding, QSizePolicy::Expanding,
@@ -332,6 +388,7 @@ Mdem* makeMdem() {
); );
mdem->hFront.addWidget(&mdem->wFrontText); mdem->hFront.addWidget(&mdem->wFrontText);
// Rediģēšanas poga.
mdem->editButton.setText("Rediģēt"); mdem->editButton.setText("Rediģēt");
QObject::connect( QObject::connect(
&mdem->editButton, &mdem->editButton,
@@ -355,6 +412,7 @@ Mdem* makeMdem() {
); );
mdem->hFront.addWidget(&mdem->editButton); mdem->hFront.addWidget(&mdem->editButton);
// Dzēšanas poga.
mdem->deleteButton.setText("Dzēst"); mdem->deleteButton.setText("Dzēst");
QObject::connect( QObject::connect(
&mdem->deleteButton, &mdem->deleteButton,
@@ -381,14 +439,11 @@ Mdem* makeMdem() {
); );
mdem->hFront.addWidget(&mdem->deleteButton); mdem->hFront.addWidget(&mdem->deleteButton);
mdem->toggleVisibility.setText("Parādīt"); // Aizmugura.
mdem->hFront.addWidget(&mdem->toggleVisibility);
// Back
mdem->wBack.setLayout(&mdem->hBack); mdem->wBack.setLayout(&mdem->hBack);
mdem->vMdem.addWidget(&mdem->wBack); mdem->vMdem.addWidget(&mdem->wBack);
// Add Back Content // Aizmuguras saturs.
for (size_t i = 0; i < 20; ++i) { for (size_t i = 0; i < 20; ++i) {
// @Improve: back label pooling // @Improve: back label pooling
QLabel *elBackText = new QLabel(); QLabel *elBackText = new QLabel();
@@ -404,7 +459,9 @@ Mdem* makeMdem() {
mdem->wBack.hide(); mdem->wBack.hide();
mdem->wMdem.hide(); mdem->wMdem.hide();
// Connect button to toggle view // Atbildes parādīšanas poga.
mdem->toggleVisibility.setText("Parādīt");
mdem->hFront.addWidget(&mdem->toggleVisibility);
QObject::connect(&mdem->toggleVisibility, &QToolButton::clicked, [mdem]() { QObject::connect(&mdem->toggleVisibility, &QToolButton::clicked, [mdem]() {
if (mdem->wBack.isVisible()) { if (mdem->wBack.isVisible()) {
mdem->wBack.hide(); mdem->wBack.hide();
@@ -418,17 +475,22 @@ Mdem* makeMdem() {
return mdem; return mdem;
} }
/*
* Izveido rādāmās kartītes (argumentam nedrīkst pārniegt maksimāli iespējamo daudzumu lapā).
* */
void createMdems(std::vector<Question*>& questions) {
void CreateMdems(std::vector<Question*>& questions) {
hMdemScroll->removeItem(mdemSpacer); hMdemScroll->removeItem(mdemSpacer);
// Paslēp visas atmiņas kartītes.
for (Mdem *mdem : mdems) { for (Mdem *mdem : mdems) {
if (mdem->wMdem.isVisible()) { if (mdem->wMdem.isVisible()) {
mdem->wMdem.hide(); mdem->wMdem.hide();
} }
} }
perPage = settings->value(SETTING_PER_PAGE).toInt(); // Pievieno atmiņas kartītes, ja nepieciešamais daudzums pārsniedz esošo.
perPage = settings->value(SETTING_PER_PAGE).toInt();
if (perPage > mdems.size()) { if (perPage > mdems.size()) {
for (size_t i = mdems.size(); i < perPage; i++) { for (size_t i = mdems.size(); i < perPage; i++) {
if (i >= mdems.size()) { if (i >= mdems.size()) {
@@ -439,6 +501,7 @@ void CreateMdems(std::vector<Question*>& questions) {
} }
} }
// Parāda nepieciešamās atmiņas kartītes.
for (size_t i = 0; i < questions.size(); ++i) { for (size_t i = 0; i < questions.size(); ++i) {
mdems[i]->question = questions[i]; mdems[i]->question = questions[i];
setupMdem(mdems[i], questions[i]); setupMdem(mdems[i], questions[i]);
@@ -450,6 +513,9 @@ void CreateMdems(std::vector<Question*>& questions) {
hMdemScroll->addItem(mdemSpacer); hMdemScroll->addItem(mdemSpacer);
} }
/*
* Atjauno sarakstu un tā informāciju.
*/
void update(bool isChanged) { void update(bool isChanged) {
if (pagination->currentPage > -1) { if (pagination->currentPage > -1) {
switchPage(pagination->currentPage); switchPage(pagination->currentPage);
@@ -460,9 +526,10 @@ void update(bool isChanged) {
} }
void switchPage(int pageIdx) { void switchPage(int pageIdx) {
pagination->currentPage = pageIdx; pagination->currentPage = pageIdx;
// Hide all pagination buttons // Paslēp visas lappušu pogas.
for (auto& button : pagination->paginationButtons) { for (auto& button : pagination->paginationButtons) {
button->hide(); button->hide();
} }
@@ -472,7 +539,7 @@ void switchPage(int pageIdx) {
snprintf(buffer, sizeof(buffer), "Lappuse: %d", pageIdx + 1); snprintf(buffer, sizeof(buffer), "Lappuse: %d", pageIdx + 1);
pagination->paginationLabel.setText(buffer); pagination->paginationLabel.setText(buffer);
// Adjust mdem amount, hide widgets in mdems // Paslēp atbilžu elementus.
for (auto& mdem : mdems) { for (auto& mdem : mdems) {
if (mdem->wBack.isVisible()) { if (mdem->wBack.isVisible()) {
mdem->wBack.hide(); mdem->wBack.hide();
@@ -480,7 +547,7 @@ void switchPage(int pageIdx) {
} }
} }
// Update pagination buttons // Atjauno lappušu pogas.
for (int k = -DISTANCE; k <= DISTANCE; ++k) { for (int k = -DISTANCE; k <= DISTANCE; ++k) {
if (pageIdx + k >= 0 && pageIdx + k < pagination->pages.size()) { if (pageIdx + k >= 0 && pageIdx + k < pagination->pages.size()) {
auto button = pagination->paginationButtons[l]; auto button = pagination->paginationButtons[l];
@@ -496,50 +563,51 @@ void switchPage(int pageIdx) {
} }
} }
// Handle first and last buttons // Pirmās un pēdējās pogas redzamība.
if (pageIdx > 0 && pagination->pages.size() > 1) { if (pageIdx > 0 && pagination->pages.size() > 1) {
pagination->firstButton.show(); pagination->firstButton.show();
} else { } else {
pagination->firstButton.hide(); pagination->firstButton.hide();
} }
if (pageIdx < pagination->pages.size() - 1 && pagination->pages.size() > 1) { if (pageIdx < pagination->pages.size() - 1 && pagination->pages.size() > 1) {
pagination->lastButton.show(); pagination->lastButton.show();
} else { } else {
pagination->lastButton.hide(); pagination->lastButton.hide();
} }
// Handle next and previous buttons // Iepriekšējās pogas redzamība.
if (!pagination->pages.empty() && pagination->currentPage < pagination->pages.size() - 1) {
pagination->nextButton.show();
} else {
pagination->nextButton.hide();
}
if (!pagination->pages.empty() && pagination->currentPage >= 1) { if (!pagination->pages.empty() && pagination->currentPage >= 1) {
pagination->prevButton.show(); pagination->prevButton.show();
} else { } else {
pagination->prevButton.hide(); pagination->prevButton.hide();
} }
// Nākamās pogas redzamība.
if (!pagination->pages.empty() && pagination->currentPage < pagination->pages.size() - 1) {
pagination->nextButton.show();
} else {
pagination->nextButton.hide();
}
Page page; Page page;
// Samazina lappuses numuru, ja pēdējai lappusei nepietiek atmiņas kartīšu.
if (pagination->pages.size() <= 0) { if (pagination->pages.size() <= 0) {
// Nav lapu -> veidojam tukšu lapu.
page = Page(); page = Page();
} else if (pageIdx < pagination->pages.size()){ } else if (pageIdx < pagination->pages.size()){
page = pagination->pages[pageIdx]; // Pieprasītā lapa eksistē -> atgriežam to.
page = pagination->pages[pageIdx];
} else { } else {
if (pageIdx - 1 < pagination->pages.size()) { // Pieprasītā lapa eksistē -> atgriežam iepriekšējo.
page = pagination->pages[pageIdx -1]; page = pagination->pages[pageIdx - 1];
} else {
page = pagination->pages[0];
}
} }
// Izveido lappusi.
std::vector<Question*> pageSlice( std::vector<Question*> pageSlice(
currentMdemBuffer->questions.begin() + page.start, currentMdemBuffer->questions.begin() + page.start,
currentMdemBuffer->questions.begin() + page.end currentMdemBuffer->questions.begin() + page.end
); );
CreateMdems(pageSlice); createMdems(pageSlice);
} }
void reloadMdem(std::string path) { void reloadMdem(std::string path) {
@@ -586,7 +654,7 @@ void reloadMdem(std::string path) {
auto file = std::ifstream(path); auto file = std::ifstream(path);
std::string content; std::string content;
// Reset the mdem list. // Atiestata atmiņas kartīšu sarakstu.
for (auto mdem: mdems) { for (auto mdem: mdems) {
mdem->wMdem.hide(); mdem->wMdem.hide();
} }
@@ -631,7 +699,7 @@ void reloadMdem(std::string path) {
delete question; delete question;
} }
// Show errors. // Parāda kļūdu.
hMdemScroll->removeItem(mdemSpacer); hMdemScroll->removeItem(mdemSpacer);
errorView->label.setText( errorView->label.setText(
QString::fromStdString( QString::fromStdString(
@@ -680,7 +748,7 @@ void pickDirectory(QString directory) {
currentPath = directory; currentPath = directory;
// Update tree view. // Atjauno failu sarakstu.
if (directory.length() <= 0) { if (directory.length() <= 0) {
membaseLabel->setText(directory); membaseLabel->setText(directory);
return; return;
@@ -688,7 +756,7 @@ void pickDirectory(QString directory) {
mdemList->setRootIndex(model->setRootPath(directory)); mdemList->setRootIndex(model->setRootPath(directory));
std::smatch matches; std::smatch matches;
// Update label. // Atjauno teksta elementu.
membaseLabel->setText(QString::fromStdString( membaseLabel->setText(QString::fromStdString(
std::format( std::format(
"Atmiņas bāze: {}", "Atmiņas bāze: {}",
@@ -794,17 +862,20 @@ void saveMdem() {
} }
} }
/*
* Inicializē visus atmiņas kartīšu saraksta elementus un izvēlni.
*/
QMainWindow *initMdemListWindow() { QMainWindow *initMdemListWindow() {
QMainWindow* window = new QMainWindow; QMainWindow* window = new QMainWindow;
pagination = new Pagination; pagination = new Pagination;
auto *toolbar = new Toolbar(); auto *toolbar = new Toolbar();
// Setup the related windows. // Saistīti logi.
auto *settingsWindow = initSettings(); auto *settingsWindow = initSettings();
trainWindow = initTrainWindow(); trainWindow = initTrainWindow();
QMainWindow *guideWindow = new QMainWindow; QMainWindow *guideWindow = new QMainWindow;
{ // Guide window. { // Apmācības logs.
auto guideWidget = new QWidget; auto guideWidget = new QWidget;
auto *layout = new QVBoxLayout; auto *layout = new QVBoxLayout;
auto *textBrowser = new QTextBrowser; auto *textBrowser = new QTextBrowser;
@@ -818,13 +889,13 @@ QMainWindow *initMdemListWindow() {
QAction *actionOpen; QAction *actionOpen;
QAction *openSettings; QAction *openSettings;
QAction *actionHelp; QAction *actionHelp;
{ // Menu bar. { // Izvēlne.
QMenuBar *menuBar = new QMenuBar; QMenuBar *menuBar = new QMenuBar;
QFileDialog *fileDialog = new QFileDialog; QFileDialog *fileDialog = new QFileDialog;
QMenu *menu = new QMenu("Fails"); QMenu *menu = new QMenu("Fails");
menu->setStyleSheet("font-size: 15px;"); menu->setStyleSheet("font-size: 15px;");
actionOpen = menu->addAction("Atvērt atmņas bāzi (Ctrl+O)"); actionOpen = menu->addAction("Atvērt atmiņas bāzi (Ctrl+O)");
QObject::connect( QObject::connect(
actionOpen, actionOpen,
&QAction::triggered, &QAction::triggered,
@@ -862,7 +933,7 @@ QMainWindow *initMdemListWindow() {
window->setMenuBar(menuBar); window->setMenuBar(menuBar);
} }
{ // Editor. { // Redaktors.
editorWindow = new QMainWindow; editorWindow = new QMainWindow;
editorWindow->setWindowTitle("Jautājumu redaktors"); editorWindow->setWindowTitle("Jautājumu redaktors");
@@ -905,26 +976,26 @@ QMainWindow *initMdemListWindow() {
} }
auto *wTop = new QWidget(); auto *wTop = new QWidget();
{ // Top. { // Augša.
// Main top layout. // Pamata augšējais izklājums.
QHBoxLayout *hlTop = new QHBoxLayout(); QHBoxLayout *hlTop = new QHBoxLayout();
wTop->setLayout(hlTop); wTop->setLayout(hlTop);
// Labels // Teksta elementi.
auto *wLabels = new QWidget(); auto *wLabels = new QWidget();
auto *vlLeftTop = new QVBoxLayout(); auto *vlLeftTop = new QVBoxLayout();
wLabels->setLayout(vlLeftTop); wLabels->setLayout(vlLeftTop);
wLabels->setMinimumSize(0, 40); wLabels->setMinimumSize(0, 40);
// Atmiņas bāzes teksta elements.
QString labelStyle = "font-size: 20px; font-weight: 400;"; QString labelStyle = "font-size: 20px; font-weight: 400;";
// Memorybase label. membaseLabel = new QLabel();
membaseLabel = new QLabel();
membaseLabel->setStyleSheet(labelStyle); membaseLabel->setStyleSheet(labelStyle);
vlLeftTop->addWidget(membaseLabel); vlLeftTop->addWidget(membaseLabel);
// Memorybase label. // Atmiņas kartīšu faila teksta elements.
mdemLabel = new QLabel(); mdemLabel = new QLabel();
mdemLabel->setStyleSheet(labelStyle); mdemLabel->setStyleSheet(labelStyle);
vlLeftTop->addWidget(mdemLabel); vlLeftTop->addWidget(mdemLabel);
@@ -932,9 +1003,9 @@ QMainWindow *initMdemListWindow() {
lastPracticeLabel->setStyleSheet(labelStyle); lastPracticeLabel->setStyleSheet(labelStyle);
vlLeftTop->addWidget(lastPracticeLabel); vlLeftTop->addWidget(lastPracticeLabel);
// Button layout. // Pogu izklājums.
auto buttons = new QWidget(); auto buttons = new QWidget();
auto vlButtons = new QVBoxLayout(); auto vlButtons = new QVBoxLayout();
buttons->setLayout(vlButtons); buttons->setLayout(vlButtons);
buttons->setStyleSheet("font-size: 15px;"); buttons->setStyleSheet("font-size: 15px;");
@@ -946,8 +1017,7 @@ QMainWindow *initMdemListWindow() {
auto hlButtonsBottom = new QHBoxLayout(); auto hlButtonsBottom = new QHBoxLayout();
buttonsBottom->setLayout(hlButtonsBottom); buttonsBottom->setLayout(hlButtonsBottom);
// Define buttons. // Pogu definēšana.
QObject::connect(&toolbar->btnAdd, &QToolButton::clicked, []() { QObject::connect(&toolbar->btnAdd, &QToolButton::clicked, []() {
editMdem = nullptr; editMdem = nullptr;
editorWindow->show(); editorWindow->show();
@@ -976,7 +1046,7 @@ QMainWindow *initMdemListWindow() {
} }
); );
// Button content. // Pogu saturs.
toolbar->btnAdd.setText("Pievienot"); toolbar->btnAdd.setText("Pievienot");
toolbar->btnSave.setText("Saglabāt"); toolbar->btnSave.setText("Saglabāt");
toolbar->btnLoad.setText("Ielādēt"); toolbar->btnLoad.setText("Ielādēt");
@@ -987,7 +1057,7 @@ QMainWindow *initMdemListWindow() {
toolbar->cbAlgorithm.addItem("Primārais", PRIMARY); toolbar->cbAlgorithm.addItem("Primārais", PRIMARY);
toolbar->btnPractice.setText("Mācīties"); toolbar->btnPractice.setText("Mācīties");
// Add buttons. // Pievieno pogas.
hlButtonsTop->addWidget(&toolbar->btnAdd); hlButtonsTop->addWidget(&toolbar->btnAdd);
hlButtonsTop->addWidget(&toolbar->btnSave); hlButtonsTop->addWidget(&toolbar->btnSave);
hlButtonsTop->addWidget(&toolbar->btnLoad); hlButtonsTop->addWidget(&toolbar->btnLoad);
@@ -1008,8 +1078,8 @@ QMainWindow *initMdemListWindow() {
hlTop->addWidget(buttons); hlTop->addWidget(buttons);
} }
QWidget *leftWidget = new QWidget(); QWidget *leftWidget = new QWidget();
{ // Left side. { // Kreisā puse.
QVBoxLayout *leftLayout = new QVBoxLayout(); QVBoxLayout *leftLayout = new QVBoxLayout();
leftWidget->setLayout(leftLayout); leftWidget->setLayout(leftLayout);
@@ -1032,7 +1102,6 @@ QMainWindow *initMdemListWindow() {
if (currentPath.size() > 0) { if (currentPath.size() > 0) {
pickDirectory(currentPath); pickDirectory(currentPath);
} }
/*leftLayout->addWidget(leftTop);*/
QObject::connect( QObject::connect(
mdemList, mdemList,
@@ -1049,14 +1118,13 @@ QMainWindow *initMdemListWindow() {
for (int col = 1; col < model->columnCount(); ++col) { for (int col = 1; col < model->columnCount(); ++col) {
mdemList->hideColumn(col); mdemList->hideColumn(col);
} }
// TODO: name -> nosaukums in HEADER
leftLayout->addWidget(mdemList); leftLayout->addWidget(mdemList);
} }
auto wMain = new QWidget; auto wMain = new QWidget;
auto *rightWidget = new QWidget(); auto *rightWidget = new QWidget();
auto *rightLayout = new QVBoxLayout(); auto *rightLayout = new QVBoxLayout();
{ // Main layout. { // Pamata izklājums.
auto vlMain = new QVBoxLayout; auto vlMain = new QVBoxLayout;
wMain->setLayout(vlMain); wMain->setLayout(vlMain);
@@ -1072,7 +1140,7 @@ QMainWindow *initMdemListWindow() {
vlMain->addWidget(hSplitter); vlMain->addWidget(hSplitter);
} }
{ // Error. { // Kļūda.
errorView = new ErrorView; errorView = new ErrorView;
errorView->box.setObjectName("error-box"); errorView->box.setObjectName("error-box");
errorView->box.setLayout(&errorView->layout); errorView->box.setLayout(&errorView->layout);
@@ -1089,7 +1157,7 @@ QMainWindow *initMdemListWindow() {
errorView->label.setWordWrap(true); errorView->label.setWordWrap(true);
} }
{ // Mdems { // Atmiņas kartītes.
QScrollArea *mdemScroll = new QScrollArea(); QScrollArea *mdemScroll = new QScrollArea();
QWidget *mdemContainer = new QWidget(); QWidget *mdemContainer = new QWidget();
hMdemScroll = new QVBoxLayout(); hMdemScroll = new QVBoxLayout();
@@ -1104,10 +1172,9 @@ QMainWindow *initMdemListWindow() {
QSizePolicy::Minimum, QSizePolicy::Minimum,
QSizePolicy::Expanding QSizePolicy::Expanding
); );
/*hMdemScroll->addItem(mdemSpacer);*/
} }
{ // Pagination { // Lappušu pogas.
auto wPagination = new QWidget(); auto wPagination = new QWidget();
auto hPagination = new QHBoxLayout(); auto hPagination = new QHBoxLayout();
@@ -1171,7 +1238,7 @@ QMainWindow *initMdemListWindow() {
rightLayout->addWidget(wPagination); rightLayout->addWidget(wPagination);
} }
{ // Setup shortcuts. { // Uzstāda īsceļus.
auto addShortcut = [window](QString key, std::function<void()> func) { auto addShortcut = [window](QString key, std::function<void()> func) {
QShortcut* shortcut = new QShortcut(QKeySequence(key), window); QShortcut* shortcut = new QShortcut(QKeySequence(key), window);
QObject::connect(shortcut, &QShortcut::activated, [func]() { QObject::connect(shortcut, &QShortcut::activated, [func]() {

View File

@@ -63,19 +63,25 @@
QSettings *settings; QSettings *settings;
/*
* Inicializē uzstādījumu logu.
* */
QWidget *initSettings () { QWidget *initSettings () {
QString configDir = QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation);
// Uzstādījumu fails - paņem standarta atrašanās vietu operētājsistēmā.
auto configDir = QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation);
QDir().mkpath(configDir); QDir().mkpath(configDir);
QString settingsFile = configDir + "/mdem.ini"; QString settingsFile = configDir + "/mdem.ini";
settings = new QSettings(settingsFile, QSettings::IniFormat); settings = new QSettings(settingsFile, QSettings::IniFormat);
auto* settingsWindow = new QWidget;
// Logs.
auto* settingsWindow = new QWidget;
settingsWindow->setWindowTitle("Iestatījumi"); settingsWindow->setWindowTitle("Iestatījumi");
// Augšējais izklājums.
auto top = new QWidget; auto top = new QWidget;
auto hlTop = new QVBoxLayout; auto hlTop = new QVBoxLayout;
top->setLayout(hlTop); top->setLayout(hlTop);
auto settingsLabel = new QLabel; auto settingsLabel = new QLabel;
settingsLabel->setText("Iestatījumi"); settingsLabel->setText("Iestatījumi");
settingsLabel->setStyleSheet( settingsLabel->setStyleSheet(
@@ -83,62 +89,67 @@ QWidget *initSettings () {
); );
hlTop->addWidget(settingsLabel); hlTop->addWidget(settingsLabel);
// Forma.
auto wForm = new QWidget; auto wForm = new QWidget;
auto formLayout = new QFormLayout; auto formLayout = new QFormLayout;
wForm->setLayout(formLayout);
auto mbaseInput = new QLineEdit; auto mbaseInput = new QLineEdit;
auto browseButton = new QPushButton("Izvēlēties"); auto browseButton = new QPushButton("Izvēlēties");
auto pathLayout = new QHBoxLayout; auto pathLayout = new QHBoxLayout;
wForm->setLayout(formLayout);
pathLayout->addWidget(mbaseInput); pathLayout->addWidget(mbaseInput);
pathLayout->addWidget(browseButton); pathLayout->addWidget(browseButton);
wForm->setStyleSheet("font-size: 15px;"); wForm->setStyleSheet("font-size: 15px;");
formLayout->addRow("Noklusējuma memorybase:", pathLayout); // Lauki.
QObject::connect(browseButton, &QPushButton::clicked, [mbaseInput]() {
QString dir = QFileDialog::getExistingDirectory(
nullptr,
"Izvēlēties noklusēto direktoriju",
mbaseInput->text()
);
if (!dir.isEmpty()) {
mbaseInput->setText(dir);
}
});
auto perPage = new QSpinBox; auto perPage = new QSpinBox;
perPage->setRange(5, 50);
formLayout->addRow("Mdems per page [5-50]:", perPage);
auto characterWrap = new QSpinBox; auto characterWrap = new QSpinBox;
characterWrap->setRange(30, 150);
formLayout->addRow("Rindas pārnešanas platums jautājumu teksta ģenerēšanā [30-150]:", characterWrap);
auto* timezone = new QSpinBox; auto* timezone = new QSpinBox;
timezone->setRange(-12, 12);
formLayout->addRow("Laika zona (e.g. +2 as 2):", timezone);
auto* notRemembered = new QDoubleSpinBox; auto* notRemembered = new QDoubleSpinBox;
notRemembered->setRange(0, 100);
formLayout->addRow("Neatcerējos:", notRemembered);
auto* hard = new QDoubleSpinBox; auto* hard = new QDoubleSpinBox;
hard->setRange(0, 100);
formLayout->addRow("Grūti:", hard);
auto* medium = new QDoubleSpinBox; auto* medium = new QDoubleSpinBox;
medium->setRange(0, 100);
formLayout->addRow("Vidēji:", medium);
auto* easy = new QDoubleSpinBox; auto* easy = new QDoubleSpinBox;
easy->setRange(0, 100);
formLayout->addRow("Viegli:", easy);
auto* debug = new QCheckBox; auto* debug = new QCheckBox;
formLayout->addRow("Atkļūdošana:", debug);
auto* showTimes = new QCheckBox; auto* showTimes = new QCheckBox;
formLayout->addRow("Rādīt laikus komandrindā:", showTimes); { // Uzstāda uzstādījumu laukus.
formLayout->addRow("Noklusējuma atmiņas bāze:", pathLayout);
QObject::connect(browseButton, &QPushButton::clicked, [mbaseInput]() {
QString dir = QFileDialog::getExistingDirectory(
nullptr,
"Izvēlēties noklusēto direktoriju",
mbaseInput->text()
);
if (!dir.isEmpty()) {
mbaseInput->setText(dir);
}
});
perPage->setRange(5, 50);
formLayout->addRow("Mdems per page [5-50]:", perPage);
characterWrap->setRange(30, 150);
formLayout->addRow("Rindas pārnešanas platums jautājumu teksta ģenerēšanā [30-150]:", characterWrap);
timezone->setRange(-12, 12);
formLayout->addRow("Laika zona (e.g. +2 as 2):", timezone);
notRemembered->setRange(0, 100);
formLayout->addRow("Neatcerējos:", notRemembered);
hard->setRange(0, 100);
formLayout->addRow("Grūti:", hard);
medium->setRange(0, 100);
formLayout->addRow("Vidēji:", medium);
easy->setRange(0, 100);
formLayout->addRow("Viegli:", easy);
formLayout->addRow("Atkļūdošana:", debug);
formLayout->addRow("Rādīt laikus komandrindā:", showTimes);
}
// Uzstādījumu pogas.
auto wButtons = new QWidget; auto wButtons = new QWidget;
auto btnLayout = new QHBoxLayout; auto btnLayout = new QHBoxLayout;
wButtons->setLayout(btnLayout); wButtons->setLayout(btnLayout);
@@ -149,7 +160,7 @@ QWidget *initSettings () {
btnLayout->addWidget(btnLoad); btnLayout->addWidget(btnLoad);
wButtons->setStyleSheet("font-size: 15px;"); wButtons->setStyleSheet("font-size: 15px;");
// @Improve: validate setting values // Uzstāda lauku vērtības no uzstādījumu vērtībām.
auto setSettingInputs = [ auto setSettingInputs = [
perPage, perPage,
mbaseInput, mbaseInput,
@@ -174,6 +185,7 @@ QWidget *initSettings () {
showTimes->setChecked(settings->value(SETTING_SHOW_TIMES).toBool() == true); showTimes->setChecked(settings->value(SETTING_SHOW_TIMES).toBool() == true);
}; };
// Parāda izmaiņas indikatoru.
auto updateSettingsLabel = [settingsLabel](bool isChanged) { auto updateSettingsLabel = [settingsLabel](bool isChanged) {
if (isChanged) { if (isChanged) {
settingsLabel->setText("Iestatījumi *"); settingsLabel->setText("Iestatījumi *");
@@ -182,6 +194,7 @@ QWidget *initSettings () {
} }
}; };
// Pievieno klausītāju atbilstoši izmantotam lauku tipam.
auto attachChangeListener = [settingsLabel, updateSettingsLabel](QObject *input, QString key) { auto attachChangeListener = [settingsLabel, updateSettingsLabel](QObject *input, QString key) {
if (QLineEdit *lineInput = qobject_cast<QLineEdit*>(input)) { if (QLineEdit *lineInput = qobject_cast<QLineEdit*>(input)) {
QObject::connect( QObject::connect(
@@ -224,6 +237,7 @@ QWidget *initSettings () {
} }
}; };
// Izmaiņas laukos parāda indikatoros.
attachChangeListener(perPage, SETTING_PER_PAGE); attachChangeListener(perPage, SETTING_PER_PAGE);
attachChangeListener(mbaseInput, SETTING_MEMORYBASE); attachChangeListener(mbaseInput, SETTING_MEMORYBASE);
attachChangeListener(characterWrap, SETTING_CHARACTER_WRAP); attachChangeListener(characterWrap, SETTING_CHARACTER_WRAP);
@@ -235,6 +249,7 @@ QWidget *initSettings () {
attachChangeListener(debug, SETTING_DEBUG); attachChangeListener(debug, SETTING_DEBUG);
attachChangeListener(showTimes, SETTING_SHOW_TIMES); attachChangeListener(showTimes, SETTING_SHOW_TIMES);
// Atjauno uzstādījumus no lauku vērtībām.
auto saveSettings = [ auto saveSettings = [
perPage, perPage,
mbaseInput, mbaseInput,
@@ -260,7 +275,6 @@ QWidget *initSettings () {
settings->setValue(SETTING_SHOW_TIMES, showTimes->isChecked()); settings->setValue(SETTING_SHOW_TIMES, showTimes->isChecked());
updateSettingsLabel(false); updateSettingsLabel(false);
}; };
auto loadSettings = [setSettingInputs, updateSettingsLabel]() { auto loadSettings = [setSettingInputs, updateSettingsLabel]() {
settings->sync(); settings->sync();
setSettingInputs(); setSettingInputs();
@@ -274,6 +288,17 @@ QWidget *initSettings () {
saveSettings(); saveSettings();
} }
); );
auto shortcutSave = new QShortcut(
QKeySequence("Ctrl+S"),
settingsWindow
);
QObject::connect(
shortcutSave,
&QShortcut::activated,
[saveSettings]() {
saveSettings();
}
);
QObject::connect( QObject::connect(
btnLoad, btnLoad,
&QPushButton::clicked, &QPushButton::clicked,
@@ -283,11 +308,7 @@ QWidget *initSettings () {
); );
loadSettings(); loadSettings();
QShortcut* shortcutSave = new QShortcut(QKeySequence("Ctrl+S"), settingsWindow); // Lai pogas ir lejā.
QObject::connect(shortcutSave, &QShortcut::activated, [saveSettings]() {
saveSettings();
});
auto spacer = new QSpacerItem( auto spacer = new QSpacerItem(
50, 50,
50, 50,
@@ -295,6 +316,7 @@ QWidget *initSettings () {
QSizePolicy::Expanding QSizePolicy::Expanding
); );
// Pievieno elementus.
mainLayout->addWidget(top); mainLayout->addWidget(top);
mainLayout->addWidget(wForm); mainLayout->addWidget(wForm);
mainLayout->addItem(spacer); mainLayout->addItem(spacer);

File diff suppressed because it is too large Load Diff

View File

@@ -16,11 +16,17 @@ bool showTimes = false;
std::chrono::high_resolution_clock::time_point start; std::chrono::high_resolution_clock::time_point start;
std::chrono::high_resolution_clock::time_point end; std::chrono::high_resolution_clock::time_point end;
std::string wrapText(std::string text, size_t width) { /*
* Pārveido teksta rindu tā, lai teksts nepārsniegtu doto
* platumu. Pievieno nākamās rindās atstarpi ar platumu kurā sākas pirmās rindas
* teksts.
* */
std::string wrapLine(std::string text, size_t width) {
std::string result; std::string result;
size_t currentLineLength = 0; size_t currentLineLength = 0;
size_t wordStart = 0; size_t wordStart = 0;
// Nosaka, cik tālu no rindas sākuma atrodas teksts pirmā rindā.
size_t preservedSpaceCount = 0; size_t preservedSpaceCount = 0;
for (size_t i = 0; i < text.length(); ++i) { for (size_t i = 0; i < text.length(); ++i) {
if (text[i] == '\t') { if (text[i] == '\t') {
@@ -37,13 +43,15 @@ std::string wrapText(std::string text, size_t width) {
for (size_t i = wordStart; i < text.length(); ++i) { for (size_t i = wordStart; i < text.length(); ++i) {
if (text[i] == ' ' || i == text.length() - 1) { if (text[i] == ' ' || i == text.length() - 1) {
size_t wordEnd = (i == text.length() - 1) ? i + 1 : i; // Handle the last word // Ja vārds pārsniedz norādīto platumu, pievieno
size_t wordLength = wordEnd - wordStart; // jaunās rindas simbolu un turpina no iepriekš noteiktā attāluma.
if (currentLineLength + wordLength > width) { size_t wordEnd = (i == text.length() - 1) ? i + 1 : i;
result += '\n'; size_t wordLength = wordEnd - wordStart;
result.append(preservedSpaceCount / TABWIDTH, '\t'); if (currentLineLength + wordLength > width) {
result.append(preservedSpaceCount % TABWIDTH, ' '); result += '\n';
currentLineLength = preservedSpaceCount; result.append(preservedSpaceCount / TABWIDTH, '\t');
result.append(preservedSpaceCount % TABWIDTH, ' ');
currentLineLength = preservedSpaceCount;
} }
result += text.substr(wordStart, wordLength) + ' '; result += text.substr(wordStart, wordLength) + ' ';
currentLineLength += wordLength + 1; currentLineLength += wordLength + 1;
@@ -53,6 +61,9 @@ std::string wrapText(std::string text, size_t width) {
return result; return result;
} }
/*
* Tekstā katram rezervētam tekstvienību simbolam pievieno '\' pirms simbola.
*/
std::string escapeText(std::string text) { std::string escapeText(std::string text) {
std::stringstream ss; std::stringstream ss;
for (auto c: text) { for (auto c: text) {
@@ -89,6 +100,10 @@ std::string escapeText(std::string text) {
return ss.str(); return ss.str();
} }
/*
* Transpilē tekstu jautājumos un metadatos.
* Veic leksisko analīzi un parsēšanu.
* */
Result<ParseInfo> transpile(std::string fileContent) { Result<ParseInfo> transpile(std::string fileContent) {
start = std::chrono::high_resolution_clock::now(); start = std::chrono::high_resolution_clock::now();
end = std::chrono::high_resolution_clock::now(); end = std::chrono::high_resolution_clock::now();
@@ -125,7 +140,9 @@ Result<ParseInfo> transpile(std::string fileContent) {
return {questions}; return {questions};
} }
/*
* Parāda nomērīta laika sekundes un milisekundes.
*/
std::string showTime(std::string label) { std::string showTime(std::string label) {
auto duration = std::chrono::duration_cast<std::chrono::microseconds>(end - start); auto duration = std::chrono::duration_cast<std::chrono::microseconds>(end - start);
double_t seconds = (double_t) duration.count() / 1000000; double_t seconds = (double_t) duration.count() / 1000000;