Skip to content

Pdf text phase1 the framework #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
olivetthered wants to merge 15 commits into
base: origin/master
Choose a base branch
from
Open

Pdf text phase1 the framework #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
8a7f185
Merge remote-tracking branch 'origin/pdf-text-import-phase1-layout-fr…
olivetthered Jun 7, 2020
6bb0f3a
Merge branch 'pdf-text-import-phase1-layout-framework' into pdf-text-…
olivetthered Jun 7, 2020
58e1d4f
initial codse cleanup and fixes following first review
olivetthered Jun 9, 2020
873d9e6
Update slaoutput.h
olivetthered Jun 9, 2020
d5cbdfe
move the enums into their own class
olivetthered Jun 9, 2020
bdac89d
fix { positions
olivetthered Jun 9, 2020
e5f390c
replace addChar classes with textFrame function pointers
olivetthered Jun 11, 2020
824594d
fix regression, don't set lastxy if were adding the first char
olivetthered Jun 11, 2020
4a0752b
makje addchar private and implement a public caller
olivetthered Jun 11, 2020
dd32abf
fixed regression bug in text import
olivetthered Jun 11, 2020
abb6bee
all the changes following the review
olivetthered Jun 11, 2020
34ba5ef
rename textFramework and tidyup AaddChar function poiinters
olivetthered Jun 11, 2020
b3f57a4
replace addcghar function pointers with a awiutch statement
olivetthered Jun 18, 2020
05d4386
comments, tidyups and seperate pdftextrecognition has regersion in ma…
olivetthered Jun 21, 2020
3925017
fixed layout regression, made qDebug output conditional, added niotes…
olivetthered Jun 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions scribus/plugins/import/pdf/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ set(IMPORTPDF_PLUGIN_SOURCES
importpdfplugin.cpp
pdfimportoptions.cpp
slaoutput.cpp
pdftextrecognition.cpp
)

if(HAVE_POPPLER)
Expand Down
3 changes: 3 additions & 0 deletions scribus/plugins/import/pdf/importpdf.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,7 @@ bool PdfPlug::convert(const QString& fn)
else if (getCBox(Art_Box, 1) != mediaRect)
boxesAreDifferent = true;
bool cropped = false;
bool importTextAsVectors = true;
int contentRect = Media_Box;
if (((interactive) || (importerFlags & LoadSavePlugin::lfCreateDoc)) && ((lastPage > 1) || boxesAreDifferent))
{
Expand All @@ -455,6 +456,7 @@ bool PdfPlug::convert(const QString& fn)
cropped = optImp->croppingEnabled();
if (!cropped)
crop = cropped;
importTextAsVectors = optImp->getImportAsVectors();
// When displaying pages slices, we should always set useMediaBox to true
// in order to use MediaBox (x, y) as coordinate system
if (contentRect != Media_Box)
Expand All @@ -471,6 +473,7 @@ bool PdfPlug::convert(const QString& fn)
SlaOutputDev *dev = new SlaOutputDev(m_Doc, &Elements, &importedColors, importerFlags);
if (dev->isOk())
{
dev->importTextAsVectors = importTextAsVectors;
OCGs* ocg = pdfDoc->getOptContentConfig();
if (ocg)
{
Expand Down
7 changes: 7 additions & 0 deletions scribus/plugins/import/pdf/pdfimportoptions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,11 @@ bool PdfImportOptions::croppingEnabled()
return ui->cropGroup->isChecked();
}

bool PdfImportOptions::getImportAsVectors()
{
return ui->textAsVectors->isChecked();
}

void PdfImportOptions::setUpOptions(const QString& fileName, int actPage, int numPages, bool interact, bool cropPossible, PdfPlug* plug)
{
m_plugin = plug;
Expand All @@ -71,6 +76,8 @@ void PdfImportOptions::setUpOptions(const QString& fileName, int actPage, int nu
ui->cropGroup->setVisible(cropPossible);
ui->cropGroup->setChecked(cropPossible);
ui->cropBox->setCurrentIndex(3); // Use CropBox by default
ui->textAsVectors->setChecked(true);
ui->textAsText->setChecked(false);
if (interact)
{
ui->allPages->setChecked(false);
Expand Down
1 change: 1 addition & 0 deletions scribus/plugins/import/pdf/pdfimportoptions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ class PdfImportOptions : public QDialog
QString getPagesString();
int getCropBox();
bool croppingEnabled();
bool getImportAsVectors();
void paintEvent(QPaintEvent *e);

protected:
Expand Down
35 changes: 35 additions & 0 deletions scribus/plugins/import/pdf/pdfimportoptions.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,41 @@
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_2">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string/>
</property>
<layout class="QVBoxLayout" name="verticalLayout_8">
<item>
<widget class="QRadioButton" name="textAsVectors">
<property name="enabled">
<bool>true</bool>
</property>
<property name="text">
<string>Import Text As Vectors</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="textAsText">
<property name="text">
<string>Import Text As Text</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
Expand Down
Loading