From a1614cef689096c71cdd8157ef5dd41802cb86ac Mon Sep 17 00:00:00 2001 From: Roy Qu Date: Tue, 29 Mar 2022 18:06:24 +0800 Subject: [PATCH] - enhancement: display problem case running time - enhancement: set problem case input/expected output file - enhancement: auto position cursor in expected with output's cursor --- NEWS.md | 3 + RedPandaIDE/RedPandaIDE_zh_CN.ts | 1080 +++++++++-------- RedPandaIDE/compiler/ojproblemcasesrunner.cpp | 18 +- RedPandaIDE/main.cpp | 2 +- RedPandaIDE/mainwindow.cpp | 164 ++- RedPandaIDE/mainwindow.h | 11 + RedPandaIDE/mainwindow.ui | 170 ++- RedPandaIDE/problems/ojproblemset.h | 3 + RedPandaIDE/utils.cpp | 14 + RedPandaIDE/widgets/ojproblemsetmodel.cpp | 94 +- RedPandaIDE/widgets/ojproblemsetmodel.h | 9 +- .../redpanda-win-git-askpass.pro | 24 +- 12 files changed, 990 insertions(+), 602 deletions(-) diff --git a/NEWS.md b/NEWS.md index 123bc1c5..1198aa61 100644 --- a/NEWS.md +++ b/NEWS.md @@ -8,6 +8,9 @@ Red Panda C++ Version 1.0.2 - enhancement: timeout for problem case test - enhancement: slightly reduce start up time - enhancement: use icon to indicate missing project files in the project view + - enhancement: display problem case running time + - enhancement: set problem case input/expected output file + - enhancement: auto position cursor in expected with output's cursor Red Panda C++ Version 1.0.1 - fix: only convert project icon file when it's filename doesn't end with ".ico" diff --git a/RedPandaIDE/RedPandaIDE_zh_CN.ts b/RedPandaIDE/RedPandaIDE_zh_CN.ts index 11c03ea5..3f653502 100644 --- a/RedPandaIDE/RedPandaIDE_zh_CN.ts +++ b/RedPandaIDE/RedPandaIDE_zh_CN.ts @@ -3807,18 +3807,18 @@ Are you really want to continue? MainWindow - + Red Panda C++ 小熊猫C++ - - - - - - + + + + + + Issues 编译器 @@ -3827,48 +3827,48 @@ Are you really want to continue? 编译日志 - + File 文件 - + Tools 工具 - - + + Run 运行 - + Edit 编辑 - - + + Project 项目 - + Watch 监视 - + Structure 结构 - + Files 文件 @@ -3878,10 +3878,10 @@ Are you really want to continue? - - - - + + + + Debug 调试 @@ -3892,7 +3892,7 @@ Are you really want to continue? - + Debug Console 调试主控台 @@ -3913,8 +3913,8 @@ Are you really want to continue? - - + + Search 查找 @@ -3939,23 +3939,23 @@ Are you really want to continue? 替换 - + Close 关闭 - + Execute 运行 - - + + Code 代码 - + Window 窗口 @@ -3968,279 +3968,290 @@ Are you really want to continue? 工具栏2 - + New 新建 - + Ctrl+N Ctrl+N - + Open... 打开... - + Ctrl+O Ctrl+O - + Save 保存 - + Ctrl+S Ctrl+S - + Save As... 另存为... - + Save As 另存为 - + Save All 全部保存 - + Ctrl+Shift+S Ctrl+Shift+S - + Options 选项 - - - - - + + + + + Compile 编译 - + Tools Output 工具输出 - + + + Choose Input File + 选择输入文件 + + + + ... + ... + + + Tool Panels 工具面板 - + Git Git - + F9 F9 - + F10 F10 - + Undo 恢复 - + Ctrl+Z Ctrl+Z - + Redo 重做 - + Ctrl+Y Ctrl+Y - + Cut 剪切 - + Ctrl+X Ctrl+X - - - - + + + + Copy 复制 - + Ctrl+C Ctrl+C - - + + Paste 粘贴 - + Ctrl+V Ctrl+V - - - + + + Select All 选择全部 - + Ctrl+A Ctrl+A - + Indent 缩进 - + UnIndent 取消缩进 - + Toggle Comment 切换注释 - + Ctrl+/ Ctrl+/ - + Collapse All 全部收起 - + Uncollapse All 全部展开 - + Encode in ANSI 使用ANSI编码 - + Encode in UTF-8 使用UTF-8编码 - + Auto Detect 自动检测 - + Convert to ANSI 转换为ANSI编码 - + Convert to UTF-8 转换为UTF-8编码 - - + + Compile & Run 编译运行 - + F11 F11 - - + + Rebuild All 全部重编译 - + F12 F12 - + Stop Execution 停止执行 - + F6 F6 - + F5 F5 - + Step Over 单步跳过 - + F7 F7 - + Step Into 单步进入 - + Problem Set 试题集 - + New Problem Set 新建试题集 @@ -4259,14 +4270,14 @@ Are you really want to continue? - + Save Problem Set 保存试题集 - + Load Problem Set 载入试题集 @@ -4288,20 +4299,20 @@ Are you really want to continue? - + TODO TODO - + Bookmark 书签 - + Problem 试题 @@ -4342,32 +4353,32 @@ Are you really want to continue? %v/%m - + Output 输出 - + Input 输入 - + Expected 期望输出 - + Help 帮助 - + Refactor 重构 - + View 视图 @@ -4376,503 +4387,503 @@ Are you really want to continue? 工具窗口 - + Main 主工具栏 - + Compiler Set 编译器配置集 - - + + New Source File 新建源代码文件 - + Tab Tab - + Shift+Tab Shift+Tab - + F8 F8 - + Step Out 单步跳出 - + Ctrl+F8 Ctrl+F8 - + Run To Cursor 执行到光标处 - + Ctrl+F5 Ctrl+F5 - + Continue 继续执行 - + F4 F4 - + Add Watch... 添加监视 - + View CPU Window... 打开CPU信息窗口... - + Exit 退出 - + Find... 查找... - + Ctrl+F Ctrl+F - + Find in Files... 在文件中查找... - + Ctrl+Shift+F Ctrl+Shift+F - + Replace... 替换 - + Ctrl+R Ctrl+R - + Find Next 查找下一个 - + F3 F3 - + Find Previous 查找前一个 - + Shift+F3 Shift+F3 - + Remove Watch 删除监视值 - + Remove All Watches Remove All 删除全部监视值 - + Modify Watch... 修改监视值 - + Reformat Code 对代码重新排版 - + Ctrl+Shift+A Ctrl+Shift+A - + Go back 前一次编辑位置 - + Ctrl+Alt+Left Ctrl+Alt+Left - + Forward 后一次编辑位置 - + Ctrl+Alt+Right Ctrl+Alt+Right - + Ctrl+W Ctrl+W - + Close All 全部关闭 - + Ctrl+Shift+W Ctrl+Shift+W - + Maximize Editor 最大化编辑器 - + Ctrl+F11 Ctrl+F11 - + Next 下一窗口 - + Ctrl+Tab Ctrl+Tab - + Previous 前一窗口 - + Ctrl+Shift+Tab Ctrl+Shift+Tab - + Toggle breakpoint 切换断点 - + Ctrl+F4 Ctrl+F4 - - + + Clear all breakpoints 删除所有断点 - + Breakpoint property... 设置断点条件... - + Goto Declaration 跳转到声明处 - + Ctrl+Shift+G Ctrl+Shift+G - + Goto Definition 跳转到定义处 - + Ctrl+G Ctrl+G - + Find references 查找符号的引用 - + Open containing folder 打开所在的文件夹 - + Ctrl+B Ctrl+B - + Open a terminal here 打开命令行窗口 - + File Properties... 文件属性... - + Close Project 关闭项目 - + Project options 项目属性 - + New Project... 新建项目... - - + + New Project File 新建项目文件 - + New File 新建文件 - + Add to project... 添加到项目... - + Remove from project 从项目删除 - + View Makefile 查看Makefile - + Clean 清理构建文件 - + Open Folder in Explorer 在浏览器中打开 - + Open In Terminal 在终端中打开 - + About 关于 - - + + Rename Symbol 重命名符号 - + Shift+F6 Shift+F6 - + Print... 打印... - + Ctrl+P Ctrl+P - - + + Export As RTF 导出为RTF - - + + Export As HTML 导出为HTML - + Move To Other View 移动到其他视图 - + Ctrl+M Ctrl+M - - + + C++ Reference C++参考手册 - + C Reference C参考手册 - + Show Tool Panels 显示全部工具面板 - + Create Git Repository Create Repository 创建Git仓库 - + Commit 提交(Commit) - + Revert 撤销(Revert) - + Reset 回滚(Reset) - + Add Files 添加文件 - + Restore 还原(Restore) - + Website 官方网站 - + Branch/Switch 分支切换（Switch） - + Merge 合并（Merge） - - + + Show Log Log 显示日志(Log) - + Remotes... 远程仓库... - + Fetch 取回(Fetch) - + Pull 拉取(Pull) - + Push 推送(Push) - + Hide Non Support Files 隐藏不支持的文件 - + Toggle Block Comment 切换块注释 - + Alt+Shift+A Alt+Shift+A - + Match Bracket 匹配当前括号 - + Ctrl+] Ctrl+] @@ -4881,50 +4892,50 @@ Are you really want to continue? 工具窗口栏 - + Status Bar 状态栏 - + Ctrl+Backspace Ctrl+Backspace - + Interrupt 中断 - - + + Delete To Word Begin 删除到单词开头 - + Ctrl+Shift+B Ctrl+Shift+B - + Delete to Word End 删除到单词结尾 - + Ctrl+Shift+E Ctrl+Shift+E - + New Class... Add Class... 新建类... - - + + New Header... New Header 新建头文件... @@ -4934,47 +4945,47 @@ Are you really want to continue? 插入行 - + Delete Line 删除当前行 - + Ctrl+D Ctrl+D - + Duplicate Line 复制当前行 - + Ctrl+E Ctrl+E - + Delete Word 删除当前单词 - + Ctrl+Shift+D Ctrl+Shift+D - + Delete to EOL 删除到行尾 - + Ctrl+Del Ctrl+Del - + Delete to BOL 删除到行首 @@ -4983,27 +4994,27 @@ Are you really want to continue? C/C++参考 - + EGE Manual EGE图形库手册 - + Add Bookmark 添加书签 - + Remove Bookmark 删除书签 - + Modify Bookmark Description 修改书签说明 - + Locate in Files View 在文件视图中定位 @@ -5012,47 +5023,47 @@ Are you really want to continue? 打开文件夹 - + Running Parameters... 运行参数... - + File Encoding 文件编码 - + Recent Files 文件历史 - - - - - - + + + + + + Debugging 正在调试 - - - - - - + + + + + + Running 正在运行 - - - - - - + + + + + + Compiling 正在编译 @@ -5061,194 +5072,197 @@ 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 打开源代码文件 - + Show detail debug logs 显示详细调试器日志 - + Copy all 全部复制 - - - + + + + + + Clear 清除 - + Export 导出 - + Insert Snippet 插入代码段 - - + + Problem Set %1 试题集%1 @@ -5269,68 +5283,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: 描述： @@ -5339,389 +5353,406 @@ 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 重命名 - + 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 选择答案源代码文件 - + C/C++Source Files (*.c *.cpp *.cc *.cxx) C/C++Source Files (*.c *.cpp *.cc *.cxx 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? 你真的想要做那些吗？ - + 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 + 选择期望输出文件 + + + + + 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! 提交信息不能为空！ @@ -5730,241 +5761,241 @@ 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 添加到项目 - + 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 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + Error 错误 - + Recent Projects 项目历史 - + 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个文件） @@ -6130,31 +6161,44 @@ Are you really want to continue? OJProblemCasesRunner - + Case Timeout 案例运行超时 - + The runner process '%1' failed to start. 无法启动程序运行进程'%1'。 - + The last waitFor...() function timed out. waitFor()函数等待超时。 - + An error occurred when attempting to write to the runner process. 在向程序运行进程写入内容时出错。 - + An error occurred when attempting to read from the runner process. 在从程序运行进程读取内容时出错。 + + OJProblemModel + + + Name + 名称 + + + + Time(sec) + 时间(秒) + + OJProblemPropertyWidget @@ -6191,14 +6235,12 @@ Are you really want to continue? Project - File Not Found - 未找到文件 + 未找到文件 - Project file '%1' can't be found! - 找不到项目文件'%1'! + 找不到项目文件'%1'! @@ -6206,93 +6248,93 @@ Are you really want to continue? 无标题 - + Can't save file 无法保存文件 - + Can't save file '%1' 无法保存文件'%1'. - + Error Load File 载入文件错误 - + File Exists 文件已存在 - + File '%1' is already in the project 文件'%1'已在项目中 - + Project Updated 项目已升级 - + Your project was succesfully updated to a newer file format! 已成功将项目升级到新的格式 - + If something has gone wrong, we kept a backup-file: '%1'... 旧项目文件备份在'%1'。 - + Headers 头文件 - + Sources 源文件 - + Others 其他文件 - + Settings need update 设置需要更新 - + The compiler settings format of Red Panda C++ has changed. The compiler settings format of Dev-C++ has changed. 小熊猫C++的编译器设置格式已发生改变。 - + Please update your settings at Project >> Project Options >> Compiler and save your project. 请在项目 >> 项目属性 >> 编译器设置中修改您的设置并保存您的项目 - + Compiler not found 未找到编译器 - + The compiler set you have selected for this project, no longer exists. 您为该项目设置的编译器不存在。 - + It will be substituted by the global compiler set. 它将会被全局编译器设置代替。 - + Developed using the Red Panda C++ IDE Developed using the Red Panda Dev-C++ IDE 使用小熊猫C++编辑器开发 @@ -6699,32 +6741,32 @@ Are you really want to continue? ProjectModel - + File exists 文件已存在 - + File '%1' already exists. Delete it now? 文件'%1'已存在。是否删除？ - + Remove failed 删除失败 - + Failed to remove file '%1' 无法删除文件'%1' - + Rename failed 改名失败 - + Failed to rename file '%1' to '%2' 无法将文件'%1'改名为'%2' @@ -7026,7 +7068,7 @@ Are you really want to continue? 无法写入配置文件夹"%1" - + Can't load autolink settings 无法载入自动链接设置 @@ -7328,22 +7370,22 @@ Are you really want to continue? 下标"%1"越界 - + bytes 字节 - + KB KB - + MB MB - + GB GB @@ -7644,8 +7686,8 @@ Are you really want to continue? - - + + Can't open file '%1' for read. 无法读取文件'%1'. @@ -7656,7 +7698,7 @@ Are you really want to continue? 无法写入文件'%1'. - + Can't parse problem set file '%1':%2 无法解析试题集文件"%1":%2 @@ -8120,7 +8162,7 @@ Are you really want to continue? 自动链接 - + @@ -8196,15 +8238,15 @@ Are you really want to continue? 杂项 - - + + Program Runner 程序运行 - + Problem Set 试题集 diff --git a/RedPandaIDE/compiler/ojproblemcasesrunner.cpp b/RedPandaIDE/compiler/ojproblemcasesrunner.cpp index 96d9188c..ed0f91a9 100644 --- a/RedPandaIDE/compiler/ojproblemcasesrunner.cpp +++ b/RedPandaIDE/compiler/ojproblemcasesrunner.cpp @@ -54,7 +54,11 @@ void OJProblemCasesRunner::runCase(int index,POJProblemCase problemCase) }); QProcess process; bool errorOccurred = false; - + QByteArray readed; + QByteArray buffer; + QByteArray output; + int noOutputTime = 0; + QElapsedTimer elapsedTimer; process.setProgram(mFilename); process.setArguments(splitProcessCommand(mArguments)); process.setWorkingDirectory(mWorkDir); @@ -84,14 +88,13 @@ void OJProblemCasesRunner::runCase(int index,POJProblemCase problemCase) process.start(); process.waitForStarted(5000); if (process.state()==QProcess::Running) { - process.write(problemCase->input.toUtf8()); + if (fileExists(problemCase->inputFileName)) + process.write(readFileToByteArray(problemCase->inputFileName)); + else + process.write(problemCase->input.toUtf8()); process.closeWriteChannel(); } - QByteArray readed; - QByteArray buffer; - QByteArray output; - int noOutputTime = 0; - QElapsedTimer elapsedTimer; + elapsedTimer.start(); while (true) { process.waitForFinished(mWaitForFinishTime); @@ -127,6 +130,7 @@ void OJProblemCasesRunner::runCase(int index,POJProblemCase problemCase) noOutputTime += mWaitForFinishTime; } } + problemCase->runningTime=elapsedTimer.elapsed(); if (mExecTimeouted) { problemCase->output = tr("Case Timeout"); emit resetOutput(problemCase->getId(), problemCase->output); diff --git a/RedPandaIDE/main.cpp b/RedPandaIDE/main.cpp index b8d5cbea..d53a410f 100644 --- a/RedPandaIDE/main.cpp +++ b/RedPandaIDE/main.cpp @@ -249,7 +249,6 @@ int main(int argc, char *argv[]) // qputenv("QT_DEVICE_PIXEL_RATIO ","auto"); // qputenv("QT_AUTO_SCREEN_SCALE_FACTOR","false"); //#endif - QApplication app(argc, argv); QFile tempFile(QDir::tempPath()+QDir::separator()+"RedPandaDevCppStartUp.lock"); { @@ -389,6 +388,7 @@ int main(int argc, char *argv[]) tempFile.close(); tempFile.remove(); } + int retCode = app.exec(); QString configDir = pSettings->dirs().config(); // save settings diff --git a/RedPandaIDE/mainwindow.cpp b/RedPandaIDE/mainwindow.cpp index eda7c97d..3c0751a9 100644 --- a/RedPandaIDE/mainwindow.cpp +++ b/RedPandaIDE/mainwindow.cpp @@ -67,7 +67,8 @@ #include #include #include -#include +#include "MainWindow.h" +#include #include "settingsdialog/settingsdialog.h" #include "compiler/compilermanager.h" @@ -277,11 +278,11 @@ MainWindow::MainWindow(QWidget *parent) mOJProblemSetNameCounter=1; mOJProblemSetModel.rename(tr("Problem Set %1").arg(mOJProblemSetNameCounter)); ui->lstProblemSet->setModel(&mOJProblemSetModel); - ui->lstProblemCases->setModel(&mOJProblemModel); + ui->tblProblemCases->setModel(&mOJProblemModel); connect(ui->lstProblemSet->selectionModel(), &QItemSelectionModel::currentRowChanged, this, &MainWindow::onProblemSetIndexChanged); - connect(ui->lstProblemCases->selectionModel(), + connect(ui->tblProblemCases->selectionModel(), &QItemSelectionModel::currentRowChanged, this, &MainWindow::onProblemCaseIndexChanged); connect(&mOJProblemSetModel, &OJProblemSetModel::problemNameChanged, @@ -1382,6 +1383,11 @@ void MainWindow::updateActionIcons() pIconsManager->setIcon(ui->btnRunAllProblemCases, IconsManager::ACTION_PROBLEM_RUN_CASES); pIconsManager->setIcon(ui->btnCaseValidateOptions, IconsManager::ACTION_MISC_GEAR); + pIconsManager->setIcon(ui->btnProblemCaseClearInputFileName, IconsManager::ACTION_MISC_CLEAN); + pIconsManager->setIcon(ui->btnProblemCaseInputFileName, IconsManager::ACTION_MISC_FOLDER); + pIconsManager->setIcon(ui->btnProblemCaseClearExpectedOutputFileName, IconsManager::ACTION_MISC_CLEAN); + pIconsManager->setIcon(ui->btnProblemCaseExpectedOutputFileName, IconsManager::ACTION_MISC_FOLDER); + mProblem_Properties->setIcon(pIconsManager->getIcon(IconsManager::ACTION_PROBLEM_PROPERTIES)); @@ -1559,7 +1565,7 @@ void MainWindow::runExecutable(const QString &exeName,const QString &filename,Ru ui->tabMessages->setCurrentWidget(ui->tabProblem); } } else if (runType == RunType::CurrentProblemCase) { - QModelIndex index = ui->lstProblemCases->currentIndex(); + QModelIndex index = ui->tblProblemCases->currentIndex(); if (index.isValid()) { POJProblemCase problemCase =mOJProblemModel.getCase(index.row()); mCompilerManager->runProblem(exeName,params,QFileInfo(exeName).absolutePath(), @@ -3141,7 +3147,7 @@ void MainWindow::onProblemSetIndexChanged(const QModelIndex ¤t, const QMod mOJProblemModel.setProblem(problem); updateProblemTitle(); if (mOJProblemModel.count()>0) { - ui->lstProblemCases->setCurrentIndex(mOJProblemModel.index(0,0)); + ui->tblProblemCases->setCurrentIndex(mOJProblemModel.index(0,0)); } else { onProblemCaseIndexChanged(QModelIndex(),QModelIndex()); } @@ -3163,18 +3169,32 @@ void MainWindow::onProblemCaseIndexChanged(const QModelIndex ¤t, const QMo if (idx.isValid()) { POJProblemCase problemCase = mOJProblemModel.getCase(idx.row()); if (problemCase) { + ui->btnProblemCaseInputFileName->setEnabled(false); + ui->txtProblemCaseInputFileName->setEnabled(false); ui->btnRemoveProblemCase->setEnabled(true); - ui->txtProblemCaseInput->setPlainText(problemCase->input); - ui->txtProblemCaseInput->setReadOnly(false); - ui->txtProblemCaseExpected->setPlainText(problemCase->expected); - ui->txtProblemCaseExpected->setReadOnly(false); + ui->btnProblemCaseInputFileName->setEnabled(true); + fillProblemCaseInputAndExpected(problemCase); ui->txtProblemCaseOutput->clear(); ui->txtProblemCaseOutput->setPlainText(problemCase->output); updateProblemCaseOutput(problemCase); return; } } + ui->btnProblemCaseClearInputFileName->setVisible(false); + ui->btnProblemCaseInputFileName->setEnabled(false); + ui->txtProblemCaseInputFileName->setEnabled(false); + ui->txtProblemCaseInputFileName->clear(); + ui->txtProblemCaseInputFileName->setToolTip(""); + + ui->btnProblemCaseClearExpectedOutputFileName->setVisible(false); + ui->btnProblemCaseExpectedOutputFileName->setEnabled(false); + ui->txtProblemCaseExpectedOutputFileName->setEnabled(false); + ui->txtProblemCaseExpectedOutputFileName->clear(); + ui->txtProblemCaseExpectedOutputFileName->setToolTip(""); + ui->btnRemoveProblemCase->setEnabled(false); + ui->txtProblemCaseInputFileName->clear(); + ui->btnProblemCaseInputFileName->setEnabled(false); ui->txtProblemCaseInput->clear(); ui->txtProblemCaseInput->setReadOnly(true); ui->txtProblemCaseExpected->clear(); @@ -4606,9 +4626,9 @@ void MainWindow::onOJProblemCaseStarted(const QString& id,int current, int total POJProblemCase problemCase = mOJProblemModel.getCase(row); problemCase->testState = ProblemCaseTestState::Testing; mOJProblemModel.update(row); - QModelIndex idx = ui->lstProblemCases->currentIndex(); + QModelIndex idx = ui->tblProblemCases->currentIndex(); if (!idx.isValid() || row != idx.row()) { - ui->lstProblemCases->setCurrentIndex(mOJProblemModel.index(row,0)); + ui->tblProblemCases->setCurrentIndex(mOJProblemModel.index(row,0)); } ui->txtProblemCaseOutput->clear(); } @@ -5922,6 +5942,38 @@ void MainWindow::newProjectUnitFile() updateProjectView(); } +void MainWindow::fillProblemCaseInputAndExpected(const POJProblemCase &problemCase) +{ + ui->btnProblemCaseInputFileName->setEnabled(true); + if (fileExists(problemCase->inputFileName)) { + ui->txtProblemCaseInput->setReadOnly(true); + ui->txtProblemCaseInput->setPlainText(readFileToByteArray(problemCase->inputFileName)); + ui->btnProblemCaseClearInputFileName->setVisible(true); + ui->txtProblemCaseInputFileName->setText(extractFileName(problemCase->inputFileName)); + ui->txtProblemCaseInputFileName->setToolTip(problemCase->inputFileName); + } else { + ui->txtProblemCaseInput->setReadOnly(false); + ui->txtProblemCaseInput->setPlainText(problemCase->input); + ui->btnProblemCaseClearInputFileName->setVisible(false); + ui->txtProblemCaseInputFileName->clear(); + ui->txtProblemCaseInputFileName->setToolTip(""); + } + ui->btnProblemCaseExpectedOutputFileName->setEnabled(true); + if (fileExists(problemCase->expectedOutputFileName)) { + ui->txtProblemCaseExpected->setReadOnly(true); + ui->txtProblemCaseExpected->setPlainText(readFileToByteArray(problemCase->expectedOutputFileName)); + ui->btnProblemCaseClearExpectedOutputFileName->setVisible(true); + ui->txtProblemCaseExpectedOutputFileName->setText(extractFileName(problemCase->expectedOutputFileName)); + ui->txtProblemCaseExpectedOutputFileName->setToolTip(problemCase->inputFileName); + } else { + ui->txtProblemCaseExpected->setReadOnly(false); + ui->txtProblemCaseExpected->setPlainText(problemCase->expected); + ui->btnProblemCaseClearExpectedOutputFileName->setVisible(false); + ui->txtProblemCaseExpectedOutputFileName->clear(); + ui->txtProblemCaseExpectedOutputFileName->setToolTip(""); + } +} + void MainWindow::doFilesViewRemoveFile(const QModelIndex &index) { if (!index.isValid()) @@ -6166,7 +6218,11 @@ void MainWindow::updateProblemCaseOutput(POJProblemCase problemCase) { if (problemCase->testState == ProblemCaseTestState::Failed) { QStringList output = textToLines(problemCase->output); - QStringList expected = textToLines(problemCase->expected); + QStringList expected; + if (fileExists(problemCase->expectedOutputFileName)) + expected = readFileToLines(problemCase->expectedOutputFileName); + else + expected = textToLines(problemCase->expected); for (int i=0;i=expected.count() || output[i]!=expected[i]) { QTextBlock block = ui->txtProblemCaseOutput->document()->findBlockByLineNumber(i); @@ -6192,11 +6248,12 @@ void MainWindow::updateProblemCaseOutput(POJProblemCase problemCase) void MainWindow::applyCurrentProblemCaseChanges() { - QModelIndex idx = ui->lstProblemCases->currentIndex(); + QModelIndex idx = ui->tblProblemCases->currentIndex(); if (idx.isValid()) { POJProblemCase problemCase = mOJProblemModel.getCase(idx.row()); if (problemCase) { - problemCase->input = ui->txtProblemCaseInput->toPlainText(); + if (!fileExists(problemCase->inputFileName)) + problemCase->input = ui->txtProblemCaseInput->toPlainText(); problemCase->expected = ui->txtProblemCaseExpected->toPlainText(); } } @@ -6495,7 +6552,7 @@ void MainWindow::on_btnAddProblem_clicked() int startCount = mOJProblemSetModel.count(); QString name; while (true) { - name = tr("Problem %1").arg(startCount); + name = tr("Problem %1").arg(startCount+1); if (!mOJProblemSetModel.problemNameUsed(name)) break; } @@ -6565,7 +6622,7 @@ void MainWindow::on_btnAddProblemCase_clicked() int startCount = mOJProblemModel.count(); QString name; while (true) { - name = tr("Problem Case %1").arg(startCount); + name = tr("Problem Case %1").arg(startCount+1); if (!mOJProblemSetModel.problemNameUsed(name)) break; } @@ -6573,7 +6630,7 @@ void MainWindow::on_btnAddProblemCase_clicked() problemCase->name = name; problemCase->testState = ProblemCaseTestState::NotTested; mOJProblemModel.addCase(problemCase); - ui->lstProblemCases->setCurrentIndex(mOJProblemModel.index(mOJProblemModel.count()-1)); + ui->tblProblemCases->setCurrentIndex(mOJProblemModel.index(mOJProblemModel.count()-1,0)); } void MainWindow::on_btnRunAllProblemCases_clicked() @@ -6595,7 +6652,7 @@ void MainWindow::on_actionC_Reference_triggered() void MainWindow::on_btnRemoveProblemCase_clicked() { - QModelIndex idx = ui->lstProblemCases->currentIndex(); + QModelIndex idx = ui->tblProblemCases->currentIndex(); if (idx.isValid()) { mOJProblemModel.removeCase(idx.row()); } @@ -7322,3 +7379,74 @@ void MainWindow::on_actionMatch_Bracket_triggered() } } + +void MainWindow::on_btnProblemCaseInputFileName_clicked() +{ + QString fileName = QFileDialog::getOpenFileName( + this, + tr("Choose Input Data File"), + QString(), + tr("All files (*.*)")); + if (!fileName.isEmpty()) { + QModelIndex idx = ui->tblProblemCases->currentIndex(); + POJProblemCase problemCase = mOJProblemModel.getCase(idx.row()); + if (!problemCase) + return; + if (problemCase->inputFileName == fileName) + return; + problemCase->inputFileName = fileName; + fillProblemCaseInputAndExpected(problemCase); + } +} + + +void MainWindow::on_btnProblemCaseClearExpectedOutputFileName_clicked() +{ + QModelIndex idx = ui->tblProblemCases->currentIndex(); + POJProblemCase problemCase = mOJProblemModel.getCase(idx.row()); + if (!problemCase) + return; + problemCase->expectedOutputFileName = ""; + fillProblemCaseInputAndExpected(problemCase); +} + + +void MainWindow::on_btnProblemCaseClearInputFileName_clicked() +{ + QModelIndex idx = ui->tblProblemCases->currentIndex(); + POJProblemCase problemCase = mOJProblemModel.getCase(idx.row()); + if (!problemCase) + return; + problemCase->inputFileName = ""; + fillProblemCaseInputAndExpected(problemCase); +} + + +void MainWindow::on_btnProblemCaseExpectedOutputFileName_clicked() +{ + QString fileName = QFileDialog::getOpenFileName( + this, + tr("Choose Expected Output Data File"), + QString(), + tr("All files (*.*)")); + if (!fileName.isEmpty()) { + QModelIndex idx = ui->tblProblemCases->currentIndex(); + POJProblemCase problemCase = mOJProblemModel.getCase(idx.row()); + if (!problemCase) + return; + if (problemCase->expectedOutputFileName == fileName) + return; + problemCase->expectedOutputFileName = fileName; + fillProblemCaseInputAndExpected(problemCase); + } +} + + +void MainWindow::on_txtProblemCaseOutput_cursorPositionChanged() +{ + QTextCursor cursor = ui->txtProblemCaseOutput->textCursor(); + int val = ui->txtProblemCaseOutput->verticalScrollBar()->value(); + ui->txtProblemCaseExpected->setTextCursor(cursor); + ui->txtProblemCaseExpected->verticalScrollBar()->setValue(val); +} + diff --git a/RedPandaIDE/mainwindow.h b/RedPandaIDE/mainwindow.h index 22717bb0..90479e7c 100644 --- a/RedPandaIDE/mainwindow.h +++ b/RedPandaIDE/mainwindow.h @@ -254,6 +254,7 @@ private: void prepareTabInfosData(); void prepareTabMessagesData(); void newProjectUnitFile(); + void fillProblemCaseInputAndExpected(const POJProblemCase &problemCase); void doFilesViewRemoveFile(const QModelIndex& index); @@ -646,6 +647,16 @@ private slots: void on_actionMatch_Bracket_triggered(); + void on_btnProblemCaseInputFileName_clicked(); + + void on_btnProblemCaseClearExpectedOutputFileName_clicked(); + + void on_btnProblemCaseClearInputFileName_clicked(); + + void on_btnProblemCaseExpectedOutputFileName_clicked(); + + void on_txtProblemCaseOutput_cursorPositionChanged(); + private: Ui::MainWindow *ui; EditorList *mEditorList; diff --git a/RedPandaIDE/mainwindow.ui b/RedPandaIDE/mainwindow.ui index 93aa83b9..7659eedc 100644 --- a/RedPandaIDE/mainwindow.ui +++ b/RedPandaIDE/mainwindow.ui @@ -1338,13 +1338,22 @@ - + true + + QAbstractItemView::SingleSelection + QAbstractItemView::SelectRows + + 200 + + + true + @@ -1363,6 +1372,80 @@ 0 + + + + QPlainTextEdit::NoWrap + + + true + + + + + + + QPlainTextEdit::NoWrap + + + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + true + + + + + + + Input + + + + + + + Choose Input File + + + Choose Input File + + + + :/icons/images/newlook24/053-open.png:/icons/images/newlook24/053-open.png + + + + + + + Clear + + + + :/icons/images/newlook24/008-close.png:/icons/images/newlook24/008-close.png + + + + + + @@ -1370,39 +1453,68 @@ - - - - Input - - - - - - - Expected - - - - - - - QPlainTextEdit::NoWrap - - - - + QPlainTextEdit::NoWrap - - - - QPlainTextEdit::NoWrap - + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Expected + + + + + + + true + + + + + + + Clear + + + Clear + + + + :/icons/images/newlook24/008-close.png:/icons/images/newlook24/008-close.png + + + + + + + ... + + + + :/icons/images/newlook24/053-open.png:/icons/images/newlook24/053-open.png + + + + @@ -1422,7 +1534,7 @@ 0 0 1114 - 25 + 26 diff --git a/RedPandaIDE/problems/ojproblemset.h b/RedPandaIDE/problems/ojproblemset.h index e6c82c4e..d9a00a72 100644 --- a/RedPandaIDE/problems/ojproblemset.h +++ b/RedPandaIDE/problems/ojproblemset.h @@ -31,8 +31,11 @@ struct OJProblemCase { QString name; QString input; QString expected; + QString inputFileName; + QString expectedOutputFileName; ProblemCaseTestState testState; // no persistence QString output; // no persistence + int runningTime; OJProblemCase(); public: diff --git a/RedPandaIDE/utils.cpp b/RedPandaIDE/utils.cpp index 881e6e3e..9809f60f 100644 --- a/RedPandaIDE/utils.cpp +++ b/RedPandaIDE/utils.cpp @@ -556,6 +556,13 @@ QStringList readFileToLines(const QString &fileName) ok=false; break; } + if (s.endsWith("\r\n")) { + s.remove(s.length()-2,2); + } else if (s.endsWith("\r")) { + s.remove(s.length()-1,1); + } else if (s.endsWith("\n")){ + s.remove(s.length()-1,1); + } result.append(s); } if (!ok) { @@ -569,6 +576,13 @@ QStringList readFileToLines(const QString &fileName) result.clear(); break; } + if (s.endsWith("\r\n")) { + s.remove(s.length()-2,2); + } else if (s.endsWith("\r")) { + s.remove(s.length()-1,1); + } else if (s.endsWith("\n")){ + s.remove(s.length()-1,1); + } result.append(s); } } diff --git a/RedPandaIDE/widgets/ojproblemsetmodel.cpp b/RedPandaIDE/widgets/ojproblemsetmodel.cpp index d174074b..2aab4439 100644 --- a/RedPandaIDE/widgets/ojproblemsetmodel.cpp +++ b/RedPandaIDE/widgets/ojproblemsetmodel.cpp @@ -112,6 +112,17 @@ void OJProblemSetModel::saveToFile(const QString &fileName) QJsonObject caseObj; caseObj["name"]=problemCase->name; caseObj["input"]=problemCase->input; + QString path = problemCase->inputFileName; + QString prefix = includeTrailingPathDelimiter(extractFileDir(fileName)); + if (path.startsWith(prefix, PATH_SENSITIVITY)) { + path = "%ProblemSetPath%/"+ path.mid(prefix.length()); + } + caseObj["input_filename"]=path; + path = problemCase->expectedOutputFileName; + if (path.startsWith(prefix, PATH_SENSITIVITY)) { + path = "%ProblemSetPath%/"+ path.mid(prefix.length()); + } + caseObj["expected_output_filename"]=path; caseObj["expected"]=problemCase->expected; cases.append(caseObj); } @@ -160,6 +171,18 @@ void OJProblemSetModel::loadFromFile(const QString &fileName) problemCase->name = caseObj["name"].toString(); problemCase->input = caseObj["input"].toString(); problemCase->expected = caseObj["expected"].toString(); + QString path = caseObj["input_filename"].toString(); + if (path.startsWith("%ProblemSetPath%/")) { + path = includeTrailingPathDelimiter(extractFileDir(fileName))+ + path.mid(QLatin1String("%ProblemSetPath%/").size()); + } + problemCase->inputFileName=path; + path = caseObj["expected_output_filename"].toString(); + if (path.startsWith("%ProblemSetPath%/")) { + path = includeTrailingPathDelimiter(extractFileDir(fileName))+ + path.mid(QLatin1String("%ProblemSetPath%/").size()); + } + problemCase->expectedOutputFileName=path; problemCase->testState = ProblemCaseTestState::NotTested; problem->cases.append(problemCase); } @@ -216,7 +239,7 @@ Qt::ItemFlags OJProblemSetModel::flags(const QModelIndex &) const return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable; } -OJProblemModel::OJProblemModel(QObject *parent): QAbstractListModel(parent) +OJProblemModel::OJProblemModel(QObject *parent): QAbstractTableModel(parent) { } @@ -348,20 +371,36 @@ QVariant OJProblemModel::data(const QModelIndex &index, int role) const return QVariant(); if (mProblem==nullptr) return QVariant(); - if (role == Qt::DisplayRole || role == Qt::EditRole) { - return mProblem->cases[index.row()]->name; - } else if (role == Qt::DecorationRole) { - switch (mProblem->cases[index.row()]->testState) { - case ProblemCaseTestState::Failed: - return pIconsManager->getIcon(IconsManager::ACTION_PROBLEM_FALIED); - case ProblemCaseTestState::Passed: - return pIconsManager->getIcon(IconsManager::ACTION_PROBLEM_PASSED); - case ProblemCaseTestState::Testing: - return pIconsManager->getIcon(IconsManager::ACTION_PROBLEM_TESTING); - default: - return QVariant(); + switch (index.column()) { + case 0: + if (role == Qt::DisplayRole || role == Qt::EditRole) { + POJProblemCase problemCase = mProblem->cases[index.row()]; + return problemCase->name; + } else if (role == Qt::DecorationRole) { + switch (mProblem->cases[index.row()]->testState) { + case ProblemCaseTestState::Failed: + return pIconsManager->getIcon(IconsManager::ACTION_PROBLEM_FALIED); + case ProblemCaseTestState::Passed: + return pIconsManager->getIcon(IconsManager::ACTION_PROBLEM_PASSED); + case ProblemCaseTestState::Testing: + return pIconsManager->getIcon(IconsManager::ACTION_PROBLEM_TESTING); + default: + return QVariant(); + } } + break; + case 1: + if (role == Qt::DisplayRole) { + POJProblemCase problemCase = mProblem->cases[index.row()]; + if (problemCase->testState == ProblemCaseTestState::Passed + || problemCase->testState == ProblemCaseTestState::Failed) + return problemCase->runningTime/1000.0; + else + return ""; + } + break; } + return QVariant(); } @@ -369,9 +408,11 @@ bool OJProblemModel::setData(const QModelIndex &index, const QVariant &value, in { if (!index.isValid()) return false; + if (index.column()!=0) + return false; if (mProblem==nullptr) return false; - if (role == Qt::DisplayRole || role == Qt::EditRole) { + if (role == Qt::EditRole ) { QString s = value.toString(); if (!s.isEmpty()) { mProblem->cases[index.row()]->name = s; @@ -381,7 +422,28 @@ bool OJProblemModel::setData(const QModelIndex &index, const QVariant &value, in return false; } -Qt::ItemFlags OJProblemModel::flags(const QModelIndex &) const +Qt::ItemFlags OJProblemModel::flags(const QModelIndex &idx) const { - return Qt::ItemIsEnabled | Qt::ItemIsEditable | Qt::ItemIsSelectable; + Qt::ItemFlags flags=Qt::ItemIsEnabled | Qt::ItemIsSelectable; + if (idx.column()==0) + flags |= Qt::ItemIsEditable ; + return flags; +} + +int OJProblemModel::columnCount(const QModelIndex &parent) const +{ + return 2; +} + +QVariant OJProblemModel::headerData(int section, Qt::Orientation orientation, int role) const +{ + if (orientation == Qt::Horizontal && role == Qt::DisplayRole) { + switch (section) { + case 0: + return tr("Name"); + case 1: + return tr("Time(sec)"); + } + } + return QVariant(); } diff --git a/RedPandaIDE/widgets/ojproblemsetmodel.h b/RedPandaIDE/widgets/ojproblemsetmodel.h index 5b4d78d4..25ae598f 100644 --- a/RedPandaIDE/widgets/ojproblemsetmodel.h +++ b/RedPandaIDE/widgets/ojproblemsetmodel.h @@ -17,11 +17,11 @@ #ifndef OJPROBLEMSETMODEL_H #define OJPROBLEMSETMODEL_H -#include +#include #include #include "../problems/ojproblemset.h" -class OJProblemModel: public QAbstractListModel { +class OJProblemModel: public QAbstractTableModel { Q_OBJECT public: explicit OJProblemModel(QObject *parent = nullptr); @@ -47,6 +47,11 @@ public: QVariant data(const QModelIndex &index, int role) const override; bool setData(const QModelIndex &index, const QVariant &value, int role) override; Qt::ItemFlags flags(const QModelIndex &index) const override; + + // QAbstractItemModel interface +public: + int columnCount(const QModelIndex &parent) const override; + QVariant headerData(int section, Qt::Orientation orientation, int role) const override; }; class OJProblemSetModel : public QAbstractListModel diff --git a/redpanda-win-git-askpass/redpanda-win-git-askpass.pro b/redpanda-win-git-askpass/redpanda-win-git-askpass.pro index 694f4c8e..ab3b798e 100644 --- a/redpanda-win-git-askpass/redpanda-win-git-askpass.pro +++ b/redpanda-win-git-askpass/redpanda-win-git-askpass.pro @@ -1,14 +1,18 @@ -win32-msvc{ - CONFIG += c++11 - CONFIG -= app_bundle - DEFINES -= UNICODE -} else { - TEMPLATE = app +#win32-msvc{ +# CONFIG += c++11 +# CONFIG -= app_bundle +#} else { +# TEMPLATE = app + +# CONFIG += windows +# CONFIG -= app_bundle +# CONFIG -= qt +#} +CONFIG += c++11 +CONFIG -= app_bundle + +DEFINES -= UNICODE - CONFIG += windows - CONFIG -= app_bundle - CONFIG -= qt -} isEmpty(APP_NAME) { APP_NAME = RedPandaCPP }