From: vincent@cubedesigners.com Date: Thu, 31 Mar 2022 17:21:55 +0000 (+0000) Subject: wait #5190 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=50c692cc2b963a2c5d008d7186ee18b3c38895dd;p=cubeextranet.git wait #5190 --- 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 3dd089ab5..757f7c1d2 100644 Binary files a/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/fwstk.jar and b/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/fwstk.jar differ 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);