Skip to content

GitLab

K
kumir2
Commit 0e6e036c authored by Victor Yacovlev's avatar Victor Yacovlev
Browse files
Options

GUI: Implemented debugger window

parent 90a09728
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1266 additions and 189 deletions
share/kumir2/translations/CoreGUI_ru.ts
View file @ 0e6e036c
......@@ -127,6 +127,40 @@ p, li { white-space: pre-wrap; }
<translation type="obsolete">Отменить выход</translation>
</message>
</context>
<context>
<name>CoreGUI::DebuggerWindow</name>
<message>
<location filename="../../../src/plugins/coregui/debuggerwindow.cpp" line="49"/>
<source>Main algorithm</source>
<translation>Главный алгоритм</translation>
</message>
<message>
<location filename="../../../src/plugins/coregui/debuggerwindow.cpp" line="50"/>
<source>Algorithm &apos;%1&apos;</source>
<translation>Алгоритм &quot;%1&quot;</translation>
</message>
<message>
<location filename="../../../src/plugins/coregui/debuggerwindow.cpp" line="88"/>
<source>Globals</source>
<translation>Глобальные величины</translation>
</message>
<message>
<location filename="../../../src/plugins/coregui/debuggerwindow.cpp" line="89"/>
<source>Globals of &apos;%1&apos;</source>
<translation>Глобальные в исполнителе &quot;%1&quot; </translation>
</message>
<message>
<location filename="../../../src/plugins/coregui/debuggerwindow.cpp" line="736"/>
<source>This variable is a reference.
Right click to navigate target</source>
<translation>Эта величина является ссылкой. Для перехода по ссылке нажмите правую кнопку мыши</translation>
</message>
<message>
<location filename="../../../src/plugins/coregui/debuggerwindow.cpp" line="785"/>
<source>Current values available only while running program in step-by-step mode</source>
<translation>Текущие значения величин отображаются при выполнении по шагам</translation>
</message>
</context>
<context>
<name>CoreGUI::KumirProgram</name>
<message>
......@@ -134,12 +168,12 @@ p, li { white-space: pre-wrap; }
<translation type="obsolete">Ускоренное выполнение</translation>
</message>
<message>
<location filename="../../../src/plugins/coregui/kumirprogram.cpp" line="32"/>
<location filename="../../../src/plugins/coregui/kumirprogram.cpp" line="34"/>
<source>Regular run</source>
<translation>Обычное выполнение</translation>
</message>
<message>
<location filename="../../../src/plugins/coregui/kumirprogram.cpp" line="42"/>
<location filename="../../../src/plugins/coregui/kumirprogram.cpp" line="44"/>
<source>Testing run</source>
<translation>Запустить тестирование</translation>
</message>
......@@ -148,7 +182,7 @@ p, li { white-space: pre-wrap; }
<translation type="obsolete">Пошаговое выполнение</translation>
</message>
<message>
<location filename="../../../src/plugins/coregui/kumirprogram.cpp" line="57"/>
<location filename="../../../src/plugins/coregui/kumirprogram.cpp" line="59"/>
<source>Step in</source>
<translation>шаг</translation>
</message>
......@@ -157,17 +191,17 @@ p, li { white-space: pre-wrap; }
<translation type="obsolete">Выход из алгоритма</translation>
</message>
<message>
<location filename="../../../src/plugins/coregui/kumirprogram.cpp" line="77"/>
<location filename="../../../src/plugins/coregui/kumirprogram.cpp" line="79"/>
<source>Stop</source>
<translation>Остановить выполнение</translation>
</message>
<message>
<location filename="../../../src/plugins/coregui/kumirprogram.cpp" line="98"/>
<location filename="../../../src/plugins/coregui/kumirprogram.cpp" line="100"/>
<source>Blind run</source>
<translation>Без показа на полях и обновления окна величин</translation>
</message>
<message>
<location filename="../../../src/plugins/coregui/kumirprogram.cpp" line="293"/>
<location filename="../../../src/plugins/coregui/kumirprogram.cpp" line="297"/>
<source>This program does not have testing algorithm</source>
<translation>У этой программы нет тестирующего алгоритма</translation>
</message>
......@@ -176,50 +210,50 @@ p, li { white-space: pre-wrap; }
<translation type="obsolete">Программа не содержит тестирующего алгоритма</translation>
</message>
<message>
<location filename="../../../src/plugins/coregui/kumirprogram.cpp" line="55"/>
<location filename="../../../src/plugins/coregui/kumirprogram.cpp" line="57"/>
<source>Do big step</source>
<translation>ШАГ</translation>
</message>
<message>
<location filename="../../../src/plugins/coregui/kumirprogram.cpp" line="65"/>
<location filename="../../../src/plugins/coregui/kumirprogram.cpp" line="67"/>
<source>Do small step</source>
<translation>шаг</translation>
</message>
<message>
<location filename="../../../src/plugins/coregui/kumirprogram.cpp" line="67"/>
<location filename="../../../src/plugins/coregui/kumirprogram.cpp" line="69"/>
<source>Step to end</source>
<translation>До конца алгоритма</translation>
</message>
<message>
<location filename="../../../src/plugins/coregui/kumirprogram.cpp" line="75"/>
<location filename="../../../src/plugins/coregui/kumirprogram.cpp" line="77"/>
<source>Run to end of algorhitm</source>
<translation>До конца алгоритма</translation>
</message>
<message>
<location filename="../../../src/plugins/coregui/kumirprogram.cpp" line="388"/>
<location filename="../../../src/plugins/coregui/kumirprogram.cpp" line="394"/>
<source>Unknown error</source>
<translation>Нераспознанная ошибка</translation>
</message>
<message>
<location filename="../../../src/plugins/coregui/kumirprogram.cpp" line="389"/>
<location filename="../../../src/plugins/coregui/kumirprogram.cpp" line="398"/>
<location filename="../../../src/plugins/coregui/kumirprogram.cpp" line="425"/>
<location filename="../../../src/plugins/coregui/kumirprogram.cpp" line="395"/>
<location filename="../../../src/plugins/coregui/kumirprogram.cpp" line="404"/>
<location filename="../../../src/plugins/coregui/kumirprogram.cpp" line="431"/>
<source>Evaluation error</source>
<translation>Ошибка выполнения</translation>
</message>
<message>
<location filename="../../../src/plugins/coregui/kumirprogram.cpp" line="398"/>
<location filename="../../../src/plugins/coregui/kumirprogram.cpp" line="433"/>
<location filename="../../../src/plugins/coregui/kumirprogram.cpp" line="404"/>
<location filename="../../../src/plugins/coregui/kumirprogram.cpp" line="439"/>
<source>Evaluation finished</source>
<translation>Выполнение завершено</translation>
</message>
<message>
<location filename="../../../src/plugins/coregui/kumirprogram.cpp" line="416"/>
<location filename="../../../src/plugins/coregui/kumirprogram.cpp" line="422"/>
<source>Evaluation terminated</source>
<translation>Выполнение прервано</translation>
</message>
<message>
<location filename="../../../src/plugins/coregui/kumirprogram.cpp" line="47"/>
<location filename="../../../src/plugins/coregui/kumirprogram.cpp" line="49"/>
<source>Step over</source>
<translation>ШАГ</translation>
</message>
......@@ -346,7 +380,7 @@ p, li { white-space: pre-wrap; }
<name>CoreGUI::MainWindow</name>
<message>
<location filename="../../../src/plugins/coregui/mainwindow.ui" line="14"/>
<location filename="../../../src/plugins/coregui/mainwindow.cpp" line="310"/>
<location filename="../../../src/plugins/coregui/mainwindow.cpp" line="321"/>
<source>Kumir</source>
<translation>Кумир</translation>
</message>
......@@ -484,8 +518,12 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<location filename="../../../src/plugins/coregui/mainwindow.ui" line="246"/>
<source>Variable Current Values</source>
<translation>Текущие значения величин</translation>
</message>
<message>
<source>Variables</source>
<translation>Величины</translation>
<translation type="obsolete">Величины</translation>
</message>
<message>
<location filename="../../../src/plugins/coregui/mainwindow.ui" line="249"/>
......@@ -523,7 +561,7 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<location filename="../../../src/plugins/coregui/mainwindow.ui" line="238"/>
<location filename="../../../src/plugins/coregui/mainwindow.cpp" line="867"/>
<location filename="../../../src/plugins/coregui/mainwindow.cpp" line="878"/>
<source>Restore previous session</source>
<translation>Восстановить предыдущий сеанс</translation>
</message>
......@@ -533,62 +571,62 @@ p, li { white-space: pre-wrap; }
<translation>Для этой вкладки нет действий</translation>
</message>
<message>
<location filename="../../../src/plugins/coregui/mainwindow.cpp" line="233"/>
<location filename="../../../src/plugins/coregui/mainwindow.cpp" line="244"/>
<source>No errors</source>
<translation>Ошибок нет</translation>
</message>
<message>
<location filename="../../../src/plugins/coregui/mainwindow.cpp" line="237"/>
<location filename="../../../src/plugins/coregui/mainwindow.cpp" line="248"/>
<source>Errors: %1</source>
<translation>Ошибок: %1</translation>
</message>
<message>
<location filename="../../../src/plugins/coregui/mainwindow.cpp" line="442"/>
<location filename="../../../src/plugins/coregui/mainwindow.cpp" line="453"/>
<source>Kumir programs (*.kum)</source>
<translation>Программы Кумир (*.kum)</translation>
</message>
<message>
<location filename="../../../src/plugins/coregui/mainwindow.cpp" line="445"/>
<location filename="../../../src/plugins/coregui/mainwindow.cpp" line="456"/>
<source>Pascal programs (*.pas *.pp</source>
<translation>Программы Паскаль (*.pas *.pp)</translation>
</message>
<message>
<location filename="../../../src/plugins/coregui/mainwindow.cpp" line="448"/>
<location filename="../../../src/plugins/coregui/mainwindow.cpp" line="459"/>
<source>Text files (*.txt)</source>
<translation>Текстовые файлы (*.txt)</translation>
</message>
<message>
<location filename="../../../src/plugins/coregui/mainwindow.cpp" line="450"/>
<location filename="../../../src/plugins/coregui/mainwindow.cpp" line="461"/>
<source>All files (*)</source>
<translation>Все файлы (*)</translation>
</message>
<message>
<location filename="../../../src/plugins/coregui/mainwindow.cpp" line="451"/>
<location filename="../../../src/plugins/coregui/mainwindow.cpp" line="462"/>
<source>Save file</source>
<translation>Сохранить файл</translation>
</message>
<message>
<location filename="../../../src/plugins/coregui/mainwindow.cpp" line="481"/>
<location filename="../../../src/plugins/coregui/mainwindow.cpp" line="492"/>
<source>Can&apos;t save file</source>
<translation>Не могу сохранить файл</translation>
</message>
<message>
<location filename="../../../src/plugins/coregui/mainwindow.cpp" line="531"/>
<location filename="../../../src/plugins/coregui/mainwindow.cpp" line="542"/>
<source>Close editor</source>
<translation>Закрытие текста</translation>
</message>
<message>
<location filename="../../../src/plugins/coregui/mainwindow.cpp" line="532"/>
<location filename="../../../src/plugins/coregui/mainwindow.cpp" line="543"/>
<source>Save current text?</source>
<translation>Сохранить текущий текст?</translation>
</message>
<message>
<location filename="../../../src/plugins/coregui/mainwindow.cpp" line="868"/>
<location filename="../../../src/plugins/coregui/mainwindow.cpp" line="879"/>
<source>Are you sure to restore previous session? All unsaved changes will be lost.</source>
<translation>Вы уверены, что хотите восстановить предыдущий сеанс? Все открытые файлы будут закрыты без сохранения.</translation>
</message>
<message>
<location filename="../../../src/plugins/coregui/mainwindow.cpp" line="990"/>
<location filename="../../../src/plugins/coregui/mainwindow.cpp" line="1001"/>
<source>The following files have changes:
%1
Save them?</source>
......@@ -597,7 +635,7 @@ Save them?</source>
Сохранить их?</translation>
</message>
<message>
<location filename="../../../src/plugins/coregui/mainwindow.cpp" line="991"/>
<location filename="../../../src/plugins/coregui/mainwindow.cpp" line="1002"/>
<source>Close Kumir</source>
<translation>Выход из Кумир</translation>
</message>
......@@ -622,7 +660,7 @@ Save them?</source>
<translation type="obsolete">Закрыть без сохранения</translation>
</message>
<message>
<location filename="../../../src/plugins/coregui/mainwindow.cpp" line="890"/>
<location filename="../../../src/plugins/coregui/mainwindow.cpp" line="901"/>
<source>Start</source>
<translation>Начало</translation>
</message>
......@@ -637,12 +675,12 @@ Using Qt version %2</source>
Использует Qt версии %2</translation>
</message>
<message>
<location filename="../../../src/plugins/coregui/mainwindow.cpp" line="1098"/>
<location filename="../../../src/plugins/coregui/mainwindow.cpp" line="1109"/>
<source>Load file...</source>
<translation>Загрузить файл...</translation>
</message>
<message>
<location filename="../../../src/plugins/coregui/mainwindow.cpp" line="1100"/>
<location filename="../../../src/plugins/coregui/mainwindow.cpp" line="1111"/>
<source>Kumir programs (*.kum);;Pascal programs (*.pas *.pp);;Web pages (*.html *.htm);;Text files (*.txt);;All files (*)</source>
<translation>Программы Кумир (*.kum);;Программы Pascal (*.pas *.pp);; Web-страницы (*.html *.htm);;Текстовые файлы (*.txt);;Все файлы (*)</translation>
</message>
......@@ -665,42 +703,43 @@ Using Qt version %2</source>
<translation type="obsolete">Область ввода/вывода</translation>
</message>
<message>
<location filename="../../../src/plugins/coregui/plugin.cpp" line="273"/>
<source>Variables</source>
<translation type="obsolete">Величины</translation>
<translation>Значения величин</translation>
</message>
<message>
<location filename="../../../src/plugins/coregui/plugin.cpp" line="196"/>
<location filename="../../../src/plugins/coregui/plugin.cpp" line="198"/>
<source>Remote Control</source>
<translation>Пульт</translation>
</message>
<message>
<location filename="../../../src/plugins/coregui/plugin.cpp" line="245"/>
<location filename="../../../src/plugins/coregui/plugin.cpp" line="247"/>
<source>Help</source>
<translation>Справка</translation>
</message>
<message>
<location filename="../../../src/plugins/coregui/plugin.cpp" line="272"/>
<location filename="../../../src/plugins/coregui/plugin.cpp" line="346"/>
<source>Editing</source>
<translation>Редактирование</translation>
</message>
<message>
<location filename="../../../src/plugins/coregui/plugin.cpp" line="278"/>
<location filename="../../../src/plugins/coregui/plugin.cpp" line="352"/>
<source>Observe</source>
<translation>Анализ</translation>
</message>
<message>
<location filename="../../../src/plugins/coregui/plugin.cpp" line="284"/>
<location filename="../../../src/plugins/coregui/plugin.cpp" line="358"/>
<source>Running</source>
<translation>Выполнение</translation>
</message>
<message>
<location filename="../../../src/plugins/coregui/plugin.cpp" line="289"/>
<location filename="../../../src/plugins/coregui/plugin.cpp" line="293"/>
<location filename="../../../src/plugins/coregui/plugin.cpp" line="363"/>
<location filename="../../../src/plugins/coregui/plugin.cpp" line="367"/>
<source>Pause</source>
<translation>Пауза</translation>
</message>
<message>
<location filename="../../../src/plugins/coregui/plugin.cpp" line="344"/>
<location filename="../../../src/plugins/coregui/plugin.cpp" line="418"/>
<source>Start</source>
<translation>Начало</translation>
</message>
......
src/plugins/coregui/CMakeLists.txt
View file @ 0e6e036c
......@@ -10,6 +10,7 @@ set(SOURCES
terminal_plane.cpp
tabbar.cpp
aboutdialog.cpp
debuggerwindow.cpp
)
set(EXTRA_LIBS
......@@ -34,6 +35,7 @@ set(MOC_HEADERS
tabbar.h
aboutdialog.h
tabwidgetelement.h
debuggerwindow.h
)
set(FORMS
......
src/plugins/coregui/debuggerwindow.cpp 0 → 100644
View file @ 0e6e036c
This diff is collapsed.
src/plugins/coregui/debuggerwindow.h 0 → 100644
View file @ 0e6e036c
#ifndef COREGUI_DEBUGGERWINDOW_H
#define COREGUI_DEBUGGERWINDOW_H
#include <QtCore>
#include <QtGui>
#include "interfaces/runinterface.h"
namespace CoreGUI {
class DebuggerWindow : public QTreeWidget
{
Q_OBJECT
public:
explicit DebuggerWindow(Shared::RunInterface * runner, QWidget *parent = 0);
signals:
public slots:
/** Clear debugger window */
void reset();
/** Set globals frame */
void setGlobals(
/** module name */ const QString & moduleName,
/** variable names */ const QStringList & names,
/** variable base types */const QStringList & baseTypes,
/** variable dimensions */ const QList<int> & dimensions
);
/** Push a new stack frame */
void pushContext(
/** context header */ const QString & contextName,
/** variable names */ const QStringList & names,
/** variable base types */const QStringList & baseTypes,
/** variable dimensions */ const QList<int> & dimensions
);
/** Pop a stack frame */
void popContext();
/** Force update values */
void updateAllValues();
/** Update scalar variable value */
void updateLocalVariable(
/** variable name */ const QString & name,
/** value */ const QString & value
);
void updateGlobalVariable(
/** module qualified name */const QString & moduleName,
/** variable name */ const QString & name,
/** value */ const QString & value
);
/** Set table variable bounds */
void updateLocalTableBounds(
/** variable name */ const QString & name,
/** a list of bound pairs */ const QList<int> & bounds
);
void updateGlobalTableBounds(
/** module name */ const QString & moduleName,
/** variable name */ const QString & name,
/** a list of bound pairs */ const QList<int> & bounds
);
void setLocalReference(
/** variable name */ const QString & name,
/** target name */ const QString & targetName,
/** target array indeces */const QList<int> & indeces,
/** stack frames back, or -1 for global */ int back,
/** global value module name */ const QString & moduleName
);
/** Marks a table to redraw shown values */
void updateLocalTableValue(
/** variable name */ const QString & name,
/** indeces */ const QList<int> & indeces
);
void updateGlobalTableValue(
/** module name */ const QString & moduleName,
/** variable name */ const QString & name,
/** indeces */ const QList<int> & indeces
);
private slots:
void handleItemExpanded(QTreeWidgetItem * item);
void handleItemCollapsed(QTreeWidgetItem * item);
private:
void paintEvent(QPaintEvent *event);
void findExpandedTableItem(
const QList<int> & indeces,
QTreeWidgetItem * & item
);
static QString boundsToText(const QList<int> & bounds);
static int optimalGroupSize(int size);
static void valuesListToString(
const QVariant & vals,
int maxItems,
int & counter,
QString & result
);
void setupTableValue(QTreeWidgetItem * item);
QMap<QString,QTreeWidgetItem *> globals;
Shared::RunInterface * runner;
};
} // namespace CoreGUI
#endif // COREGUI_DEBUGGERWINDOW_H
src/plugins/coregui/kumirprogram.cpp
View file @ 0e6e036c
......@@ -2,6 +2,7 @@
#include "extensionsystem/pluginmanager.h"
#include "interfaces/actorinterface.h"
#include "dataformats/ast_algorhitm.h"
#include "debuggerwindow.h"
namespace CoreGUI {
......@@ -26,6 +27,7 @@ KumirProgram::KumirProgram(QObject *parent)
, a_stop(0)
, gr_actions(0)
, w_mainWidget(0)
, w_debuggerWindow(0)
{
b_blind = false;
......@@ -189,6 +191,7 @@ void KumirProgram::addActor(KPlugin *a, QWidget *w)
void KumirProgram::fastRun()
{
if (w_debuggerWindow) w_debuggerWindow->reset();
b_processUserTerminated = false;
s_endStatus = "";
if (e_state!=Idle) {
......@@ -255,7 +258,7 @@ void KumirProgram::fastRun()
void KumirProgram::blindRun()
{
if (w_debuggerWindow) w_debuggerWindow->reset();
if (e_state==FastRun)
return;
b_blind = true;
......@@ -271,6 +274,7 @@ void KumirProgram::blindRun()
void KumirProgram::testingRun()
{
if (w_debuggerWindow) w_debuggerWindow->reset();
if (e_state==FastRun)
return;
b_blind = true;
......@@ -303,7 +307,7 @@ void KumirProgram::testingRun()
void KumirProgram::regularRun()
{
if (w_debuggerWindow) w_debuggerWindow->reset();
if (e_state==FastRun)
return;
b_blind = false;
......@@ -319,6 +323,7 @@ void KumirProgram::regularRun()
void KumirProgram::prepareKumirRunner(Shared::GeneratorInterface::DebugLevel debugLevel)
{
if (w_debuggerWindow) w_debuggerWindow->reset();
bool mustRegenerate = !m_ast->lastModified.isValid() ||
!plugin_bytecodeRun->loadedProgramVersion().isValid() ||
m_ast->lastModified > plugin_bytecodeRun->loadedProgramVersion();
......@@ -377,6 +382,7 @@ void KumirProgram::stop()
b_processUserTerminated = true;
m_process->kill();
}
if (w_debuggerWindow) w_debuggerWindow->reset();
}
void KumirProgram::handleProcessError(QProcess::ProcessError error)
......@@ -436,6 +442,7 @@ void KumirProgram::handleRunnerStopped(int rr)
e_state = Idle;
m_terminal->clearFocus();
plugin_editor->unhighlightLine(i_documentId);
if (w_debuggerWindow) w_debuggerWindow->reset();
}
if (e_state==Idle) {
......
src/plugins/coregui/kumirprogram.h
View file @ 0e6e036c
......@@ -34,6 +34,7 @@ public:
inline void setDocumentId(int id) { if (e_state==Idle) i_documentId = id; }
inline int documentId() const { return i_documentId; }
inline void setMainWidget(QWidget * w) { w_mainWidget = w; }
inline void setDebuggerWindow(class DebuggerWindow * w) { w_debuggerWindow = w; }
void setTerminal(Term * t, QDockWidget * w);
void setBytecodeRun(KPlugin * run);
void addActor(KPlugin * a, QWidget * w);
......@@ -91,6 +92,7 @@ private:
int i_timerId;
QWidget * w_mainWidget;
bool b_processUserTerminated;
class DebuggerWindow * w_debuggerWindow;
};
} // namespace CoreGui
......
src/plugins/coregui/mainwindow.cpp
View file @ 0e6e036c
......@@ -67,11 +67,20 @@ MainWindow::MainWindow(Plugin * p) :
setCorner(Qt::TopLeftCorner, Qt::LeftDockWidgetArea);
setCorner(Qt::TopRightCorner, Qt::RightDockWidgetArea);
statusBar()->setStyleSheet("QStatusBar { border-top: 1px solid darkgray; } ");
statusBar()->setStyleSheet(
"QStatusBar { "
" border-top: 1px solid darkgray;"
"}"
"QToolButton {"
" icon-size: 16px;"
" border: none;"
"}"
);
statusBar()->addWidget(m_plugin->m_kumirStateLabel);
statusBar()->addWidget(m_plugin->m_genericCounterLabel);
m_plugin->m_kumirStateLabel->setFixedWidth(120);
m_plugin->m_kumirStateLabel->setFixedWidth(140);
m_plugin->m_kumirStateLabel->setStyleSheet(StatusbarWidgetCSS);
m_plugin->m_kumirStateLabel->setAlignment(Qt::AlignCenter);
m_plugin->m_genericCounterLabel->setFixedWidth(120);
......@@ -116,10 +125,12 @@ MainWindow::MainWindow(Plugin * p) :
}
QString MainWindow::StatusbarWidgetCSS =
"QLabel {"
" font-size: 12px;"
" padding: 4px;"
"}"
"QLabel {"
" fon