From 50c692cc2b963a2c5d008d7186ee18b3c38895dd Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Thu, 31 Mar 2022 17:21:55 +0000 Subject: [PATCH] wait #5190 --- .../tools/fwstk/.idea/runConfigurations.xml | 10 ----- fluidbook/tools/fwstk/.idea/workspace.xml | 37 +++++++++++++----- .../fwstk/out/artifacts/fwstk_jar/fwstk.jar | Bin 3179206 -> 3179314 bytes inc/ws/Metier/class.ws.book.parametres.php | 4 +- inc/ws/Metier/class.ws.document.php | 1 + inc/ws/Util/class.ws.exporter.php | 8 ++-- inc/ws/Util/class.ws.pdf.convert.php | 4 +- 7 files changed, 36 insertions(+), 28 deletions(-) delete mode 100644 fluidbook/tools/fwstk/.idea/runConfigurations.xml diff --git a/fluidbook/tools/fwstk/.idea/runConfigurations.xml b/fluidbook/tools/fwstk/.idea/runConfigurations.xml deleted file mode 100644 index 93e4b17ca..000000000 --- a/fluidbook/tools/fwstk/.idea/runConfigurations.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/fluidbook/tools/fwstk/.idea/workspace.xml b/fluidbook/tools/fwstk/.idea/workspace.xml index c342875b5..df16269d7 100644 --- a/fluidbook/tools/fwstk/.idea/workspace.xml +++ b/fluidbook/tools/fwstk/.idea/workspace.xml @@ -7,9 +7,10 @@ - - + + + + + + + + + + + + + + + + + @@ -410,24 +426,24 @@ @@ -475,6 +491,7 @@ + 1487172253077 diff --git a/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/fwstk.jar b/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/fwstk.jar index 3dd089ab5796dcb1de058241e7b15fae7dee5723..757f7c1d2ebda94c14f83c24638ff64f7d2780ff 100644 GIT binary patch delta 18300 zcmZv@1zc4@*SAeKNQ0zw!=W3bk?!sgL>g)2NO#Ak8zdzJX^=)h8l}6WO9Tb^Ho|k? z&-;EavVLb>|5>y4?3uNPbCBr|>4vQf?S{otQ-nvrhe1I>f$^$%tCfItjd1^(gbqvb z;IP5cJ~-O2jQ^aV0NAhq*n5Km4IVUv#sFAE>&1Vqz}^z#LmWW3jL424QT|q|QGOXw z5aFRYWF3+FL2O$`d=LNN+H51vAU(Lx4-xHQA3|%65P2WOA4iB*s1L6C72*NxgDdeH z@!3PK25Tf4#D5~-gn`7;IERRo_?QpmD6EJ0za&WC9=ZZxLY78&a-^(B{?}`i0;&1o zDgZeL5^ZBOBa$5w!b@;A?wJd!H8Uf&v&?_KtYkun1c#9cUl+_8%)5%9{>kiJFdZw> zcdGRG09rf-JVM09&*koo?5nXBmF`lsy#=N2jRqAB4d1G&3_KmGbku3@1b?-sj|9U? z7DHbzw;q4k$?;7+Ui1wky1ez_hl!r)cFba8UUF{Jvj|UGT(@$Gq*8H*N>vGb#eRP- zY!+VZs7_aoiNhm}scXC)N~r!iJf13*)FOmx4@2E497!q|b7HrE#D#-Y#%LmeBf}PWWYmp%&WBWH!A4++85pVuJ zjq{;;&%Qp;r*tsZyiUjN0xfGA!3J9U2-X#(jQR+wzx8n}LL`iO;$C07kdJNqIMzf^ zW?s7lu{&-yu76g(X-cPT++Ek6BDy!azDy�r^K=8aY09MR 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 delta 18258 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

)9>3CIth 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 LirC8q0r~$2>MmP_ diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php index 803f35ff3..94295b0de 100644 --- a/inc/ws/Metier/class.ws.book.parametres.php +++ b/inc/ws/Metier/class.ws.book.parametres.php @@ -284,6 +284,7 @@ class wsBookParametres extends wsParametres ); $this->fields['forceWhiteBackground'] = ['type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Ajouter un fond blanc aux pages')]; $this->fields['rasterizePages'] = array('type' => 'textarea', 'default' => '', 'editable' => true, 'label' => __('Ecraser les pages'), 'hint' => '1-3,5 = 1,2,3,5', 'grade' => 1); + $this->fields['vectorPages'] = array('type' => 'textarea', 'default' => '', 'editable' => true, 'label' => __('Conserver les pages en vecteur'), 'hint' => '1-3,5 = 1,2,3,5', 'grade' => 1); $this->fields['extraXSpace'] = array('type' => 'integer', 'default' => 0, 'editable' => true, 'label' => __('Marge supplémentaire horizontale'), 'grade' => 3); $this->fields['mobileExtraXSpace'] = array('type' => 'integer', 'default' => 0, 'editable' => true, 'label' => __('Marge supplémentaire horizontale'), 'grade' => 3); @@ -296,13 +297,14 @@ class wsBookParametres extends wsParametres 'JPEG' => 'jpg', 'PNG' => 'png'), 'grade' => 2, 'label' => __('Format des images')); $this->fields['svgToCanvas'] = ['type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Activer le rendu svgtocanvas')]; $this->fields['svgToCanvasUpscale'] = ['type' => 'float', 'default' => 1, 'editable' => true, 'label' => __('Upscale de la fonction svgtocanvas')]; + $this->fields['svgTextMethod'] = ['type' => 'combo', 'default' => 'pdftocairo', 'editable' => true, 'label' => __('Méthode d\'extraction des textes en SVG'), 'datas' => [__('Cairo') => 'pdf', __('Mu') => 'mu']]; $this->fields['textsThickness'] = ['type' => 'float', 'default' => 1, 'editable' => true, 'label' => __('Epaisseur des textes')]; $this->fields['textsThicknessPages'] = ['type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Appliquer l\'épaisseur des texte sur les pages')]; $this->fields['dynamicBackgroundColor'] = ['type' => 'textarea', 'default' => '', 'editable' => true, 'label' => 'Couleur de fond dynamique', 'grade' => 3]; $this->forms['3d_mode'] = array('label' => __('Options de visualisation'), - 'fieldsnames' => array('mobileNavigationType', '|', 'mobileTransitions', 'mobileTransitionDuration', '|', 'forceWhiteBackground', 'rasterizePages', 'vectorPages', 'visualisationMode', 'antialiasReading', 'correctCenter', 'pagesBaseAngle', 'centerBook', '|', 'extraXSpace', 'mobileExtraXSpace', 'extraYSpace', '|', 'viewMode', '|', 'dynamicBackgroundColor', '|', 'svgToCanvas', 'svgToCanvasUpscale', 'textsThickness', 'textsThicknessPages', '|', 'imageFormat', 'maxResolution', 'JPEGQuality')); + 'fieldsnames' => array('mobileNavigationType', '|', 'mobileTransitions', 'mobileTransitionDuration', '|', 'forceWhiteBackground', 'rasterizePages', 'vectorPages', 'visualisationMode', 'antialiasReading', 'correctCenter', 'pagesBaseAngle', 'centerBook', '|', 'extraXSpace', 'mobileExtraXSpace', 'extraYSpace', '|', 'viewMode', '|', 'dynamicBackgroundColor', '|', 'svgToCanvas', 'svgToCanvasUpscale', 'svgTextMethod', 'textsThickness', 'textsThicknessPages', '|', 'imageFormat', 'maxResolution', 'JPEGQuality')); $this->fields['rasterizeOnSafari'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Ecraser les pages pour Safari (Mac OS)'), 'grade' => 1); $this->fields['performance3DMode'] = array('type' => 'combo', 'datas' => [__('Tester la machine') => 'auto', diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php index ebe652bcc..5117d6073 100644 --- a/inc/ws/Metier/class.ws.document.php +++ b/inc/ws/Metier/class.ws.document.php @@ -442,6 +442,7 @@ class wsDocument extends cubeMetier public function _getFile($page, $format = 'jpg', $resolution = 150, $withText = true, $withGraphics = true, $version = 'html', $force = false) { + if ($format === 'jpeg') { $format = 'jpg'; } diff --git a/inc/ws/Util/class.ws.exporter.php b/inc/ws/Util/class.ws.exporter.php index 5ebbc1750..20c6dcd7b 100644 --- a/inc/ws/Util/class.ws.exporter.php +++ b/inc/ws/Util/class.ws.exporter.php @@ -18,8 +18,6 @@ class wsExporter const VINCENT = "paris.cubedesigners.com"; - //const VINCENT = "tortuga.enhydra.fr"; - public function exportCollection($collectionId, $os) { global $core; @@ -99,15 +97,13 @@ class wsExporter } $phonegap->setPreference('show-splash-screen-spinner', false); - $phonegap->setPreference('auto-hide-splash-screen', false); + $phonegap->setPreference('auto-hide-splash-screen', $os==='ios'); $phonegap->setPreference('ios-statusbarstyle', CubeIT_Mobile_Phonegap::BARSTYLE_TRANSLUCENT); $phonegap->setPreference('iosPersistentFileLocation', 'Library'); $phonegap->setPreference('EnableViewportScale', true); $phonegap->addFeatures(array( CubeIT_Mobile_Phonegap::FEATURE_CONNECTION, CubeIT_Mobile_Phonegap::FEATURE_DEVICE, - CubeIT_Mobile_Phonegap::FEATURE_FILE, - CubeIT_Mobile_Phonegap::FEATURE_FILETRANSFER, CubeIT_Mobile_Phonegap::FEATURE_STORAGE, CubeIT_Mobile_Phonegap::FEATURE_NOTIFICATION_DIALOG, CubeIT_Mobile_Phonegap::FEATURE_INAPPBROWSER, @@ -122,6 +118,8 @@ class wsExporter $phonegap->addFeature(CubeIT_Mobile_Phonegap::FEATURE_STATUSBAR); //$phonegap->addFeature(CubeIT_Mobile_Phonegap_IOS::FEATURE_WKWEBVIEW); } else if ($os == 'android') { + $phonegap->addFeatures([CubeIT_Mobile_Phonegap::FEATURE_FILE, + CubeIT_Mobile_Phonegap::FEATURE_FILETRANSFER]); $phonegap->addFeature(CubeIT_Mobile_Phonegap::FEATURE_WEBINTENT); } diff --git a/inc/ws/Util/class.ws.pdf.convert.php b/inc/ws/Util/class.ws.pdf.convert.php index e308f63cc..4984f8475 100644 --- a/inc/ws/Util/class.ws.pdf.convert.php +++ b/inc/ws/Util/class.ws.pdf.convert.php @@ -133,7 +133,7 @@ no-reuse-images $mu = new CubeIT_CommandLine('mutool'); $mu->setArg(null, 'convert'); - $mu->setArg('O', 'text=text'); + $mu->setArg('O', 'text=path'); $mu->setArg('F', 'svg'); $mu->setArg('o', $out); $mu->setArg(null, $in); @@ -220,7 +220,7 @@ no-reuse-images } } } - $res = $svg->saveXML(); + $res = $svg->saveXML(); $res = preg_replace('//', '', $res); while (true) { $res = preg_replace('/<\/g>/', '', $res, -1, $count); -- 2.39.5