rename method in pdf2txt

Author: xulihang

BasicCAT/BasicCAT.b4j

@@ -302,7 +302,6 @@ Sub Process_Globals
 	Type Item (UserField As String, KeyField As String, ValueField() As Byte, IdField As Long, TimeField As Long)
 	Type Task (TaskName As String, TaskItem As Item, TaskKey As String)
 	Type Range(firstIndex As Int,lastIndex As Int)
-	Private previousRange As Range
 	Private Drag As B4JDragToMe
 End Sub
 

BasicCAT/BasicCAT.b4j.meta

@@ -182,4 +182,4 @@ ModuleClosedNodes7=
 ModuleClosedNodes8=
 ModuleClosedNodes9=
 SelectedBuild=0
-VisibleModules=1,2,3,4,5,6,7,8,9,10
+VisibleModules=1,2,3,4,5,6,7,8,9,10,35,50,32

BasicCAT/Files/pdf2txt.bjl

@@ -133,16 +133,15 @@ Sub ocrButton_MouseClicked (EventData As MouseEvent)
 		Return
 	End If
 
-	Label2.Text="Convert pdf to images..."
+	Label2.Text="Converting pdf to images..."
 	Dim files As List
 	wait for (pdfbox.getImage(File.GetFileParent(label1.Text),File.GetName(label1.Text))) complete (result As List)
 	files=result
 	Label2.Text="OCRing..."
 	If IncludePageNumCheckBox.Checked Then
-
-		wait for (scanWithPagenum(files,langsParam,PageAffixTextField.Text,offsetTextField.Text)) complete (text As String)
+		wait for (ocrWithPagenum(files,langsParam,PageAffixTextField.Text,offsetTextField.Text)) complete (text As String)
 	Else
-		wait for (scan(files,langsParam)) complete (text As String)
+		wait for (ocr(files,langsParam)) complete (text As String)
 	End If
 	Label2.Text="Completed"
 	TextArea1.Text=text
@@ -190,7 +189,7 @@ Sub testTesseractPath As ResumableSub
 	Return exist
 End Sub
 
-Sub scanWithPagenum(files As List,langsParam As String,affix As String,offset As Int) As ResumableSub
+Sub ocrWithPagenum(files As List,langsParam As String,affix As String,offset As Int) As ResumableSub
 	Dim dir As String
 	dir=File.GetFileParent(label1.Text)
 	Dim pdfFilename As String
@@ -240,7 +239,7 @@ Sub scanWithPagenum(files As List,langsParam As String,affix As String,offset As
 	Return content
 End Sub
 
-Sub scan(files As List,langsParam As String) As ResumableSub
+Sub ocr(files As List,langsParam As String) As ResumableSub
 	Dim dir As String
 	dir=File.GetFileParent(label1.Text)
 	Dim pdfFilename As String
@@ -284,4 +283,4 @@ Sub IncludePageNumCheckBox_CheckedChange(Checked As Boolean)
 	FacingPageCheckBox.Enabled=Checked
 	PageAffixTextField.Enabled=Checked
 	offsetTextField.Enabled=Checked
-End Sub
+End Sub

BasicCAT/PDF2TXT.bas

@@ -60,21 +60,25 @@ Sub getImage(dir As String,filename As String) As ResumableSub
 	For i=0 To pageNum-1
 		Log(i)
 		Sleep(0)
-		Dim bi As JavaObject
-		Dim dpi As Float
-		dpi=150
-		bi=PDFRenderer.RunMethodJO("renderImageWithDPI",Array(i,dpi))
-		Dim out As OutputStream
-		out=File.OpenOutput(dir,i&".jpg",False)
-		Dim imageIO As JavaObject
-		imageIO.InitializeStatic("javax.imageio.ImageIO")
-		imageIO.RunMethod("write",Array(bi,"jpg",out))
-		out.Close
-		files.Add(File.Combine(dir,i&".jpg"))
+		renderImageToFile(PDFRenderer,files,dir,i)
 	Next
 	Return files
 End Sub
 
+Sub renderImageToFile(PDFRenderer As JavaObject,files As List,dir As String,i As Int)
+	Dim bi As JavaObject
+	Dim dpi As Float
+	dpi=150
+	bi=PDFRenderer.RunMethodJO("renderImageWithDPI",Array(i,dpi))
+	Dim out As OutputStream
+	out=File.OpenOutput(dir,i&".jpg",False)
+	Dim imageIO As JavaObject
+	imageIO.InitializeStatic("javax.imageio.ImageIO")
+	imageIO.RunMethod("write",Array(bi,"jpg",out))
+	out.Close
+	files.Add(File.Combine(dir,i&".jpg"))
+End Sub
+
 Sub getFile(path As String) As JavaObject
 	Dim fileJO As JavaObject
 	fileJO.InitializeNewInstance("java.io.File",Array(path))