(no commit message)

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 3130b3fb7cd1e2dc7486916357b28aae1cd1ddfd..051dfc85aa159d5ef5308289f88bf84f6893eb52 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -621,8 +621,12 @@ class wsDAOBook extends commonDAO {
                $flex->addVariable('index', $index, false, true, 'JSONObject');\r
                $flex->addVariable('textes', $textes, false, true, 'JSONObject');\r
 \r
+               $rasterized = array();\r
+               $sizes = array();\r
+\r
                foreach ($pages as $i => $infos) {\r
                        $base = WS_DOCS . '/' . $infos['document_id'] . '/p' . $infos['document_page'];\r
+                       $baset = WS_DOCS . '/' . $infos['document_id'] . '/t' . $infos['document_page'];\r
                        $swffile = $base . '.swf';\r
                        if (file_exists($swffile)) {\r
                                $fsize = filesize($swffile);\r
@@ -634,17 +638,25 @@ class wsDAOBook extends commonDAO {
                                $flex->addSWF($swffile, 'page' . $i);\r
                        } else {\r
                                $filesToCopy['data/p' . $i . '.swf'] = $swffile;\r
+                               if ($infos['method'] >= wsDocument::BARBARE_PNM) {\r
+                                       $rasterized[$i] = true;\r
+                                       $filesToCopy['data/t' . $i . '.swf'] = $baset . '.swf';\r
+                               } else {\r
+                                       $rasterized[$i] = false;\r
+                               }\r
                        }\r
 \r
                        if ($i == 1) {\r
                                $flexLight->addBitmap($base . '.jpg', 'thumb1');\r
-                               $flexLight->addVariable('size_p_' . $i, $fsize, false, true, 'Number');\r
                        } else {\r
                                $flex->addBitmap($base . '.jpg', 'thumb' . $i);\r
-                               $flexLight->addVariable('size_p_' . $i, $fsize, false, true, 'Number');\r
                        }\r
+                       $sizes[$i] = $fsize;\r
                }\r
 \r
+               $flexLight->addVariable('rasterized', $rasterized, false, true, 'JSONObject');\r
+               $flexLight->addVariable('sizes', $sizes, false, true, 'JSONObject');\r
+\r
                if ($book->parametres->soundTheme != '') {\r
                        $flex->addSound(WS_SOUNDS . '/' . $book->parametres->soundTheme . '/corner-drag.mp3', 'soundDragCorner');\r
                        $flex->addSound(WS_SOUNDS . '/' . $book->parametres->soundTheme . '/corner-release.mp3', 'soundReleaseCorner');\r
@@ -681,7 +693,7 @@ class wsDAOBook extends commonDAO {
                $flexLight->addVariable('datasSize', filesize($compilerDir . '/FluidbookDatas.swf'));\r
                $res .= $flexLight->compile();\r
                // Basket\r
-               if ($book->parametres->basket) {        \r
+               if ($book->parametres->basket) {\r
                        $formats = array('jpg', 'png', 'jpeg');\r
                        $referencesFile = $workingDir . '/' . $book->parametres->basketReferences;\r
                        $references = array();\r

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index f7793d9010380a50c0141a9e7303ad129629b46d..8d454c67e7bf93ee8b9a335352bce3241cce566c 100644 (file)
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -47,7 +47,7 @@ class wsBookParametres extends wsParametres {
                                __('Mode 2D (caméra fixe et pages à plat)') => '1',\r
                                __("Laisser le choix à l'utilisateur (mode 3D par défaut)") => '2',\r
                                __("Laisser le choix à l'utilisateur (mode 2D par défaut)") => '3'));\r
-               $this->fields['viewMode'] = array('type' => 'combo', 'default' => '0', 'editable' => true, 'label' => __("Mode de visualisation (beta)"),\r
+               $this->fields['viewMode'] = array('type' => 'combo', 'default' => '3', 'editable' => true, 'label' => __("Mode de visualisation (beta)"),\r
                        'datas' => array(__('Classique') => '0',\r
                                __("Diaporama") => '1'), 'grade' => 5);\r
                $this->fields['pagesBaseAngle'] = array('type' => 'integer', 'default' => '2', 'editable' => true, 'label' => __('Angle de base entre les pages'), 'grade' => 3,\r

diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index 262f28dc2d719756d2413dfd275e40d65877c894..2b409549a65c76f28f61e217b7cffdf2b3823d30 100644 (file)
--- a/inc/ws/Metier/class.ws.document.php
+++ b/inc/ws/Metier/class.ws.document.php
@@ -802,13 +802,18 @@ class wsDocument extends cubeMetier {
                } elseif ($method == self::BARBARE_GS) {\r
                        $this->makeShot($page, 'barbare', $resolution, $quality, 4, 'GS');\r
                }\r
+\r
+               $dim = getimagesize($this->out . 'barbare' . $page . '.jpg');\r
+\r
                // A partir des images, on crée les swf\r
                $jpeg2swf = new cubeCommandLine('jpeg2swf');\r
                $jpeg2swf->setPath(CONVERTER_PATH);\r
                $jpeg2swf->setArg('--quality', $quality);\r
                $jpeg2swf->setArg('--output', $this->out . 'p' . $page . '.swf');\r
-               //$jpeg2swf->setArg('--fit-to-movie');\r
                $jpeg2swf->setArg('--flashversion', 10);\r
+               $jpeg2swf->setArg('--width', $dim[0] * (72 / $resolution));\r
+               $jpeg2swf->setArg('--height', $dim[1] * (72 / $resolution));\r
+               $jpeg2swf->setArg('--fit-to-movie');\r
                $jpeg2swf->setArg(null, $this->out . 'barbare' . $page . '.jpg');\r
                $jpeg2swf->execute();\r
                $this->addToLog($jpeg2swf, true, $page);\r