Merge pull request #165 from IITB-OpenOCRCorrect/global-replace

Global replace
UDAAN-LEAP · Aug 5, 2022 · 9f94851 · 9f94851
2 parents 7d5f9fc + d89b845
commit 9f94851
Show file tree

Hide file tree

Showing 41 changed files with 18,011 additions and 13,081 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,8 +12,10 @@
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
 *.o
+*.dll
 qpadfinal
 FrameWorkCode/.qtc_clangd/
+FrameWorkCode/application_log.txt
 
 # Build results
 [Dd]ebug/

diff --git a/FrameWorkCode/HtmlToPdfUtil b/FrameWorkCode/HtmlToPdfUtil
diff --git a/FrameWorkCode/Makefile b/FrameWorkCode/Makefile
diff --git a/FrameWorkCode/SimpleMail2Qt5.dll b/FrameWorkCode/SimpleMail2Qt5.dll
diff --git a/FrameWorkCode/application_log.txt b/FrameWorkCode/application_log.txt
diff --git a/FrameWorkCode/globalreplaceworker.cpp b/FrameWorkCode/globalreplaceworker.cpp
@@ -363,6 +363,14 @@ void GlobalReplaceWorker::saveBboxInfo(QString htmlFile){
     gfile.close();
     QString bboxfile = gfile.fileName();
     bboxfile = bboxfile.replace(".html", ".bbox");
+
+
+    if(!QDir(gDirTwoLevelUp+"/bboxf").exists())
+            QDir().mkdir(gDirTwoLevelUp+"/bboxf");
+
+        bboxfile=bboxfile.replace("CorrectorOutput","bboxf");
+
+
     QFile bbox_file(bboxfile);
     if(initial.contains("bbox") && !bbox_file.exists())
       {
@@ -546,6 +554,8 @@ void GlobalReplaceWorker::bboxInsertion(QString f){
     QRegularExpression rex2("(<p[^>]*>|<span[^>]*>)");
     QString fBbox = f;
     fBbox.replace(".html",".bbox");
+    fBbox.replace("CorrectorOutput","bboxf");
+    //qDebug()<<"file = "<<fBbox;
     QFile bbox_file(fBbox);
     if(bbox_file.exists())
     {

diff --git a/FrameWorkCode/libc.a b/FrameWorkCode/libc.a
diff --git a/FrameWorkCode/libc.so b/FrameWorkCode/libc.so
diff --git a/FrameWorkCode/libc.so.6 b/FrameWorkCode/libc.so.6
diff --git a/FrameWorkCode/main.cpp b/FrameWorkCode/main.cpp
@@ -89,7 +89,7 @@ int main(int argc, char *argv[])
     a.setWindowIcon(QIcon("./logonew.png"));             //Sets icon of the GUI window.
     a.setStyleSheet("QMessageBox{font: 15px \"Work Sans\"; background:rgb(32, 33, 72);} QMessageBox QLabel{color:white;} QMessageBox QPushButton{background-color:rgb(227, 228, 228);border:0px; color: rgb(32, 33, 72); height:26.96px; width: 113.5px; padding-top:1px; border-radius:4.8px; padding-left:1.3px; selection-color: rgb(32, 33, 72); selection-background-color: rgb(136, 138, 133);} QMessageBox QPushButton:checked{background-color: rgb(136, 138, 133);} QMessageBox QPushButton:pressed {background-color: rgb(136, 138, 133);}");
     a.setApplicationName( QStringLiteral( "OpenOCRCorrect" ) );
-    a.setApplicationVersion("v2.9.8");
+    a.setApplicationVersion("v2.9.9");
 
     //! Writing Log Files
     QFile logFile(QString::fromStdString(qApp->applicationDirPath().toStdString())+"/application_log.txt");