From f6ac7ad1dcb55726c4178305a1ade82c60b72115 Mon Sep 17 00:00:00 2001 From: Roy Qu Date: Sat, 16 Apr 2022 20:39:09 +0800 Subject: [PATCH] - enhancement: batch set cases ( in problem case table's context menu ) --- NEWS.md | 1 + RedPandaIDE/RedPandaIDE_pt.ts | 16 + RedPandaIDE/RedPandaIDE_zh_CN.ts | 602 +++++++++++----------- RedPandaIDE/mainwindow.cpp | 38 +- RedPandaIDE/mainwindow.h | 2 + RedPandaIDE/widgets/ojproblemsetmodel.cpp | 7 + RedPandaIDE/widgets/ojproblemsetmodel.h | 1 + 7 files changed, 378 insertions(+), 289 deletions(-) diff --git a/NEWS.md b/NEWS.md index 71966c61..2e5893a0 100644 --- a/NEWS.md +++ b/NEWS.md @@ -9,6 +9,7 @@ Red Panda C++ Version 1.0.4 - fix: parenthesis skip doesn't work when editing non-c/c++ files - enhancement: prefer local headers over system headers when complete #include header path - fix: tab/shift+tab not correctly handled in options dialog's code template page + - enhancement: batch set cases ( in problem case table's context menu ) Red Panda C++ Version 1.0.3 - fix: when oj problem grabbed by competitive companion received, diff --git a/RedPandaIDE/RedPandaIDE_pt.ts b/RedPandaIDE/RedPandaIDE_pt.ts index 5890314d..8aaeccdc 100644 --- a/RedPandaIDE/RedPandaIDE_pt.ts +++ b/RedPandaIDE/RedPandaIDE_pt.ts @@ -4424,6 +4424,22 @@ Line %1 + + Batch Set Cases + + + + Choose input files + + + + Input data files (*.in) + + + + This operation will remove all cases for the current problem. + + NewClassDialog diff --git a/RedPandaIDE/RedPandaIDE_zh_CN.ts b/RedPandaIDE/RedPandaIDE_zh_CN.ts index ddedf111..ccf87abd 100644 --- a/RedPandaIDE/RedPandaIDE_zh_CN.ts +++ b/RedPandaIDE/RedPandaIDE_zh_CN.ts @@ -1267,13 +1267,13 @@ Are you really want to continue? 失败 - - - - - - - + + + + + + + Error 错误 @@ -1282,44 +1282,44 @@ Are you really want to continue? 无法写入文件"%1" - + Save As 另存为 - + File %1 already openned! 文件%1已经被打开！ - + The text to be copied exceeds count limit! 要复制的内容超过了行数限制！ - + The text to be copied exceeds character limit! 要复制的内容超过了字符数限制！ - + The text to be cut exceeds count limit! 要剪切的内容超过了行数限制！ - + The text to be cut exceeds character limit! 要剪切的内容超过了字符数限制！ - + Print Document 打印文档 - - - + + + Ctrl+click for more info Ctrl+单击以获取更多信息 @@ -1328,27 +1328,27 @@ Are you really want to continue? 未找到符号'%1'! - + astyle not found 找不到astyle程序 - + Can't find astyle in "%1". 找不到astyle程序"%1". - + Break point condition 断点条件 - + Enter the condition of the breakpoint: 输入当前断点的生效条件: - + Readonly 只读 @@ -3809,18 +3809,18 @@ Are you really want to continue? MainWindow - + Red Panda C++ 小熊猫C++ - - - - - + + + + + Issues 编译器 @@ -3894,7 +3894,7 @@ Are you really want to continue? - + Debug Console 调试主控台 @@ -4028,8 +4028,8 @@ Are you really want to continue? - - + + Compile 编译 @@ -4102,9 +4102,9 @@ Are you really want to continue? - - - + + + Copy 复制 @@ -4115,7 +4115,7 @@ Are you really want to continue? - + Paste 粘贴 @@ -4126,8 +4126,8 @@ Are you really want to continue? - - + + Select All 选择全部 @@ -4253,7 +4253,7 @@ Are you really want to continue? - + New Problem Set 新建试题集 @@ -4272,14 +4272,14 @@ Are you really want to continue? - + Save Problem Set 保存试题集 - + Load Problem Set 载入试题集 @@ -4340,7 +4340,7 @@ Are you really want to continue? - + Run All Cases Run Current Case 运行所有案例 @@ -4618,7 +4618,7 @@ Are you really want to continue? - + Clear all breakpoints 删除所有断点 @@ -4719,7 +4719,7 @@ Are you really want to continue? Ctrl+Shift+Down - + New File 新建文件 @@ -4760,7 +4760,7 @@ Are you really want to continue? - + Rename Symbol 重命名符号 @@ -4781,13 +4781,13 @@ Are you really want to continue? - + Export As RTF 导出为RTF - + Export As HTML 导出为HTML @@ -4978,7 +4978,7 @@ Are you really want to continue? 删除当前行 - + Ctrl+D Ctrl+D @@ -4988,7 +4988,7 @@ Are you really want to continue? 复制当前行 - + Ctrl+E Ctrl+E @@ -5056,7 +5056,7 @@ Are you really want to continue? 运行参数... - + File Encoding 文件编码 @@ -5066,32 +5066,32 @@ Are you really want to continue? 文件历史 - - - - - - + + + + + + Debugging 正在调试 - - - - - - + + + + + + Running 正在运行 - - - - - - + + + + + + Compiling 正在编译 @@ -5100,171 +5100,177 @@ Are you really want to continue? 行:%1 列:%2 已选择:%3 总行数:%4 总长度:%5 - + Line:%1 Col:%2 Selected:%3 Lines:%4 Length:%5 Line: %1 Col: %2 Selected: %3 Lines: %4 Length: %5 行: %1 列: %2 已选择 :%3 总行数: %4 总长度: %5 - + Read Only 只读 - + Insert 插入 - + Overwrite 覆写 - + Close project 关闭项目 - + Are you sure you want to close %1? 你确定要关闭'%1'吗？ - - + + Confirm 确认 - - - + + + Source file is not compiled. 源文件尚未编译。 - - + + Compile now? 现在编译？ - - + + Source file is more recent than executable. 源文件比可执行程序新。 - + Recompile now? 重新编译？ - + No compiler set 无编译器设置 - + No compiler set is configured. 没有配置编译器设置。 - + Can't start debugging. 无法启动调试器 - - + + Enable debugging 启用调试参数 - - + + You have not enabled debugging info (-g3) and/or stripped it from the executable (-s) in Compiler Options.<BR /><BR />Do you want to correct this now? 当前编译设置中未启用调试选项(-g3)，或启用了信息剥除选项(-s)<br /><br/>是否纠正这一问题？ - + Project not built 项目尚未构建 - + Project hasn't been built. Build it now? 项目尚未构建。是否构建？ - + Host applcation missing 宿主程序不存在 - + DLL project needs a host application to run. 动态链接库（DLL）需要一个宿主程序来运行。 - + But it's missing. 但它不存在。 - + Host application not exists 宿主程序不存在 - + Host application file '%1' doesn't exist. 宿主程序'%1'不存在。 - + Recompile? 重新编译？ - - + + Save last open info error 保存上次打开信息失败 - + Can't remove old last open information file '%1' 无法删除旧上次打开信息文件'%1' - + Can't save last open info file '%1' 无法保存上次打开信息文件'%1' - + Load last open info error 载入上次打开信息失败 - + Can't load last open info file '%1' 无法载入上次打开信息文件'%1' - + Open Source File 打开源代码文件 - + + + Batch Set Cases + 批量设置案例 + + + Show detail debug logs 显示详细调试器日志 - + Copy all 全部复制 @@ -5272,9 +5278,9 @@ Are you really want to continue? - - - + + + Clear 清除 @@ -5290,7 +5296,7 @@ Are you really want to continue? - + Problem Set %1 试题集%1 @@ -5311,68 +5317,68 @@ Are you really want to continue? 或者选择使用其他的网络端口。 - - + + Rebuild Project 重新构建项目 - - + + Project has been modified, do you want to rebuild it? 项目已经被修改过，是否需要重新构建？ - + Auto Save Error 自动保存出错 - + Auto save "%1" to "%2" failed:%3 自动保存"%1"到"%2"失败：%3 - + Properties... 试题属性... - + Set Problem Set Name 设置试题集名称 - + Problem Set Name: 试题集名称： - + Remove 删除 - + Remove All Bookmarks 删除全部书签 - + Modify Description 修改描述 - - + + Bookmark Description 书签描述 - - + + Description: 描述： @@ -5381,173 +5387,173 @@ Are you really want to continue? 在调试主控台中显示调试器输出 - + Remove this search 清除这次搜索 - + Clear all searches 删除所有搜索 - + Breakpoint condition... 断点条件... - + Break point condition 断点条件 - + Enter the condition of the breakpoint: 输入当前断点的生效条件: - + Remove All Breakpoints Remove all breakpoints 删除所有断点 - + Remove Breakpoint 删除当前断点 - + Rename File 重命名文件 - - + + Add Folder 添加文件夹 - + New folder 新文件夹 - + Folder name: 文件夹： - + Rename Folder 重命名 - + Run Current Case 运行当前案例 - + Remove Folder 删除文件夹 - + Switch to normal view 切换为普通视图 - + Switch to custom view 切换为自定义视图 - + Sort By Type 按类型排序 - + Sort alphabetically 按名称排序 - + Show inherited members 显示继承的成员 - + Goto declaration 跳转到声明处 - + Goto definition 跳转到定义处 - - + + New Folder 新建文件夹 - - - - + + + + Delete 删除 - + Open in Editor 在编辑器中打开 - + Open in External Program 使用外部程序打开 - + Open in Terminal 在终端中打开 - + Open in Windows Explorer 在Windows浏览器中打开 - + Character sets 字符集 - + Convert to %1 转换为%1编码 - + %1 files autosaved 已自动保存%1个文件 - + Set answer to... 设置答案源代码... - + select other file... 选择其他文件... - + Select Answer Source File 选择答案源代码文件 @@ -5557,241 +5563,256 @@ Are you really want to continue? C/C++源代码文件 (*.c *.cpp *.cc *.cxx) - + New Folder %1 新建文件夹%1 - + Untitled 无标题 - + Untitled %1 无标题%1 - + Do you really want to delete %1? 你真的要删除%1吗？ - + Do you really want to delete %1 files? 你真的要删除%1个文件吗？ - + Save project 保存项目 - + The project '%1' has modifications. 项目'%1'有改动。 - - + + Do you want to save it? 需要保存吗？ - - + + File Changed 文件已发生变化 - + New Project File? 新建项目文件? - + Do you want to add the new file to the project? 您是否要将新建的文件加入项目? - - - - + + + + Save Error 保存失败 - + Change Project Compiler Set 改变项目编译器配置集 - + Change the project's compiler set will lose all custom compiler set options. 改变项目的编译器配置集会导致所有的自定义编译器选项被重置。 - + + Do you really want to do that? - 你真的想要做那些吗？ + 你真的想要那么做吗？ - + Batch set cases + 批量设置案例 + + + + Choose input files + 选择输入数据文件 + + + + Input data files (*.in) + 输入数据文件 (*.in) + + + Do you really want to clear all breakpoints in this file? 您真的要清除该文件的所有断点吗？ - + New project 新建项目 - + Close %1 and start new project? 关闭'%1'以打开新项目? - + Folder not exist 文件夹不存在 - + Folder '%1' doesn't exist. Create it now? 文件夹'%1'不存在。是否创建？ - + Can't create folder 无法创建文件夹 - + Failed to create folder '%1'. 创建文件夹'%1'失败。 - + Save new project as - + Folder %1 is not empty. 文件夹%1不是空的。 - + Do you really want to delete it? 你真的要删除它吗？ - + Change working folder 改变工作文件夹 - + File '%1' is not in the current working folder. File '%1' is not in the current working folder 文件'%1'不在当前工作文件夹中。 - + Do you want to change working folder to '%1'? 是否将工作文件夹改设为'%1'? - + Can't Commit 无法提交 - + Git needs user info to commit. Git需要用信息进行提交。 - + Choose Input Data File 选择输入数据文件 - - + + All files (*.*) 所有文件 (*.*) - + Choose Expected Output Data File Choose Expected Input Data File 选择期望输出文件 - - - + + + Line %1 第%1行 - + Choose Working Folder 选择工作文件夹 - - + + Header Exists 头文件已存在 - - + + Header file "%1" already exists! 头文件"%1"已存在！ - + Source Exists 源文件已存在！ - + Source file "%1" already exists! 源文件"%1"已存在！ - + Can't commit! 无法提交！ - + The following files are in conflicting: 下列文件处于冲突状态，请解决后重新添加和提交： - + Commit Message 提交信息 - + Commit Message: 提交信息： - + Commit Failed 提交失败 - + Commit message shouldn't be empty! 提交信息不能为空！ @@ -5800,130 +5821,135 @@ Are you really want to continue? 小熊猫Dev-C++项目文件 (*.dev) - + New project fail 新建项目失败 - + Can't assign project template 无法使用模板创建项目 - + Remove file 删除文件 - + Remove the file from disk? 同时从硬盘上删除文件？ - + untitled 无标题 - + New Project File Name 新的项目文件名 - + File Name: 文件名： - + File Already Exists! 文件已存在！ - + File '%1' already exists! 文件'%1'已经存在！ - + Add to project 添加到项目 - + C/C++ Source Files (*.c *.cpp *.cc *.cxx) C/C++源代码文件 (*.c *.cpp *.cc *.cxx) - + + This operation will remove all cases for the current problem. + 本操作会删除此试题的所有案例。 + + + Red Panda C++ project file (*.dev) 小熊猫C++项目文件(*.dev) - + Rename Error 重命名出错 - + Symbol '%1' is defined in system header. 符号'%1'在系统头文件中定义，无法修改。 - + New Name 新名称 - - + + Replace Error 替换出错 - + Can't open file '%1' for replace! 无法打开文件'%1'进行替换！ - + Contents has changed since last search! 内容和上次查找时不一致。 - + Rich Text Format Files (*.rtf) RTF格式文件 (*.rtf) - + HTML Files (*.html) HTML文件 (*.html) - + The current problem set is not empty. 当前的试题集不是空的。 - + Problem %1 试题%1 - - + + Problem Set Files (*.pbs) 试题集文件 (*.pbs) - + Load Error 载入失败 - - + + Problem Case %1 试题案例%1 @@ -5934,15 +5960,15 @@ Are you really want to continue? - - - - - - - - - + + + + + + + + + Error 错误 @@ -5952,94 +5978,94 @@ Are you really want to continue? 项目历史 - + Load Theme Error 载入主题失败 - - + + Clear History 清除历史 - - + + Version Control 版本控制 - + File '%1' was changed. 磁盘文件'%1'已被修改。 - + Reload its content from disk? 是否重新读取它的内容？ - + File '%1' was removed. 磁盘文件'%1'已被删除。 - + Keep it open? 是否保持它在小熊猫C++中打开的编辑窗口？ - + Open 打开 - + Compile Failed 编译失败 - + Run Failed 运行失败 - - - + + + Confirm Convertion 确认转换 - - - + + + The editing file will be saved using %1 encoding. <br />This operation can't be reverted. <br />Are you sure to continue? 当前编辑器中的文件将会使用%1编码保存。<br />这项操作无法被撤回。<br />你确定要继续吗？ - + New Watch Expression 新监视表达式 - + Enter Watch Expression (it is recommended to use 'this->' for class members): 输入监视表达式 - + Parsing file %1 of %2: "%3" （%1/%2）正在解析文件"%3" - - + + Done parsing %1 files in %2 seconds 完成%1个文件的解析,用时%2秒 - + (%1 files per second) (每秒%1个文件） @@ -6286,12 +6312,12 @@ Are you really want to continue? OJProblemModel - + Name 名称 - + Time(sec) 时间(秒) @@ -8258,7 +8284,7 @@ Are you really want to continue? 自动链接 - + @@ -8334,15 +8360,15 @@ Are you really want to continue? 杂项 - - + + Program Runner 程序运行 - + Problem Set 试题集 diff --git a/RedPandaIDE/mainwindow.cpp b/RedPandaIDE/mainwindow.cpp index 7b647e40..7d368552 100644 --- a/RedPandaIDE/mainwindow.cpp +++ b/RedPandaIDE/mainwindow.cpp @@ -2273,6 +2273,11 @@ void MainWindow::buildContextMenus() ); connect(mProblem_RunCurrentCase, &QAction::triggered, this, &MainWindow::onProblemRunCurrentCase); + mProblem_batchSetCases = createActionFor( + tr("Batch Set Cases"), + ui->tblProblemCases); + connect(mProblem_batchSetCases, &QAction::triggered, this, + &MainWindow::onProblemBatchSetCases); //context menu signal for the Problem Set lable ui->lblProblemSet->setContextMenuPolicy(Qt::CustomContextMenu); @@ -3142,6 +3147,8 @@ void MainWindow::onLstProblemSetContextMenu(const QPoint &pos) void MainWindow::onTableProblemCasesContextMenu(const QPoint &pos) { QMenu menu(this); + menu.addAction(mProblem_batchSetCases); + menu.addSeparator(); QModelIndex idx = ui->tblProblemCases->currentIndex(); menu.addAction(mProblem_RunAllCases); menu.addAction(mProblem_RunCurrentCase); @@ -3255,6 +3262,35 @@ void MainWindow::onProblemRunCurrentCase() runExecutable(RunType::CurrentProblemCase); } +void MainWindow::onProblemBatchSetCases() +{ + if (QMessageBox::question(this,tr("Batch Set Cases"), + tr("This operation will remove all cases for the current problem.") + +"
" + +tr("Do you really want to do that?"), + QMessageBox::Yes| QMessageBox::No, + QMessageBox::No)!=QMessageBox::Yes) + return; + QStringList files = QFileDialog::getOpenFileNames( + this, + tr("Choose input files"), + QDir::currentPath(), + tr("Input data files (*.in)")); + if (files.isEmpty()) + return; + mOJProblemModel.removeCases(); + foreach (const QString& filename, files) { + POJProblemCase problemCase = std::make_shared(); + problemCase->name = QFileInfo(filename).baseName(); + problemCase->testState = ProblemCaseTestState::NotTested; + problemCase->inputFileName = filename; + QString expectedFileName = filename.mid(0,filename.length()-2)+"out"; + if (fileExists(expectedFileName)) + problemCase->expectedOutputFileName = expectedFileName; + mOJProblemModel.addCase(problemCase); + } +} + void MainWindow::onNewProblemConnection() { QTcpSocket* clientConnection = mTcpServer.nextPendingConnection(); @@ -4694,7 +4730,7 @@ void MainWindow::onOJProblemCaseNewOutputGetted(const QString &/* id */, const Q ui->txtProblemCaseOutput->appendPlainText(line); } -void MainWindow::onOJProblemCaseResetOutput(const QString &id, const QString &line) +void MainWindow::onOJProblemCaseResetOutput(const QString &/* id */, const QString &line) { ui->txtProblemCaseOutput->setPlainText(line); } diff --git a/RedPandaIDE/mainwindow.h b/RedPandaIDE/mainwindow.h index 8a62ef32..4d804e86 100644 --- a/RedPandaIDE/mainwindow.h +++ b/RedPandaIDE/mainwindow.h @@ -283,6 +283,7 @@ private slots: void onProblemCaseIndexChanged(const QModelIndex ¤t, const QModelIndex &previous); void onProblemNameChanged(int index); void onProblemRunCurrentCase(); + void onProblemBatchSetCases(); void onNewProblemConnection(); void updateProblemTitle(); void onEditorClosed(); @@ -793,6 +794,7 @@ private: //action for problem QAction * mProblem_RunCurrentCase; QAction * mProblem_RunAllCases; + QAction * mProblem_batchSetCases; //action for tools output QAction * mToolsOutput_Clear; diff --git a/RedPandaIDE/widgets/ojproblemsetmodel.cpp b/RedPandaIDE/widgets/ojproblemsetmodel.cpp index c44ca7f9..a59464c1 100644 --- a/RedPandaIDE/widgets/ojproblemsetmodel.cpp +++ b/RedPandaIDE/widgets/ojproblemsetmodel.cpp @@ -284,6 +284,13 @@ void OJProblemModel::removeCase(int index) endRemoveRows(); } +void OJProblemModel::removeCases() +{ + beginRemoveRows(QModelIndex(),0,mProblem->cases.count()); + mProblem->cases.clear(); + endRemoveRows(); +} + POJProblemCase OJProblemModel::getCase(int index) { if (mProblem==nullptr) diff --git a/RedPandaIDE/widgets/ojproblemsetmodel.h b/RedPandaIDE/widgets/ojproblemsetmodel.h index ea7e1d8d..f6f5eb2a 100644 --- a/RedPandaIDE/widgets/ojproblemsetmodel.h +++ b/RedPandaIDE/widgets/ojproblemsetmodel.h @@ -29,6 +29,7 @@ public: void setProblem(const POJProblem &newProblem); void addCase(POJProblemCase problemCase); void removeCase(int index); + void removeCases(); POJProblemCase getCase(int index); POJProblemCase getCaseById(const QString& id); int getCaseIndexById(const QString& id);