Changeset 629:e36bf3226fde in documentViewer

Timestamp:

May 26, 2015, 8:58:27 AM (9 years ago)

Author:

dwinter

Branch:

default

Children:

630:25295ceb11b1, 631:0c3aab828864

Message:

text image viewer eingecheckt

Files:

• css/docuviewer.css (modified) (1 diff)
• documentViewer.py (modified) (2 diffs)
• zpt/viewer/common_template.zpt (modified) (1 diff)
• zpt/viewer/layer_text_image_dict.zpt (added)
• zpt/viewer/viewer_text.zpt (modified) (2 diffs)
• zpt/viewer/viewer_text_image.zpt (added)

css/docuviewer.css

@@ -75 +75 @@
     vertical-align: top;
 }
+
+
+
+/*
+* two colomn stype for image - text
+*/
+div.two-column {
+        display: table;
+}
+
+div.two-column-row {
+        display: table-row;
+}
+
+div.two-column-left {
+        display: table-cell;
+        vertical-align: top;
+}
+
+div.two-column-right {
+        display: table-cell;
+        vertical-align: top;
+}
+
+
 
 /*

documentViewer.py

@@ -96 +96 @@
     viewer_thumbs = PageTemplateFile('zpt/viewer/viewer_thumbs', globals())
     viewer_indexonly = PageTemplateFile('zpt/viewer/viewer_indexonly', globals())
+    viewer_text_image = PageTemplateFile('zpt/viewer/viewer_text_image', globals())
     # available layer types (annotator not default)
     builtinLayers = {'text': ['dict','search','gis'],
-                     'xml': None, 'image': None, 'index': ['extended']}
+                     'xml': None, 'image': None, 'index': ['extended'],'text_image': ['dict'],}
     availableLayers = builtinLayers;
     # layer templates
     layer_text_dict = PageTemplateFile('zpt/viewer/layer_text_dict', globals())
+    layer_text_image_dict = PageTemplateFile('zpt/viewer/layer_text_image_dict', globals())
     layer_text_search = PageTemplateFile('zpt/viewer/layer_text_search', globals())
     layer_text_annotator = PageTemplateFile('zpt/viewer/layer_text_annotator', globals())
@@ -977 +979 @@
         pageinfo['pageBatch'] = self.getPageBatch(start=start, rows=rows, cols=cols, pageFlowLtr=pageFlowLtr, pageZero=pageZero, minIdx=minPageNo, maxIdx=np)
         # more page parameters
-        pageinfo['characterNormalization'] = self.REQUEST.get('characterNormalization','reg')
+        #pageinfo['characterNormalization'] = self.REQUEST.get('characterNormalization','reg')
+        #becuase it is buggy this currently disabled and set to orig.
+        pageinfo['characterNormalization'] = 'orig'
         if docinfo.get('pageNumbers'):
             # get original page numbers

zpt/viewer/common_template.zpt

@@ -31 +31 @@
         <li tal:condition="docpath" tal:attributes="class python:here.getStyle(viewMode, 'text')"><a
           tal:omit-tag="python:viewMode=='text'" tal:attributes="href python:here.getLink('viewMode','text')">Text</a></li>
+        <li tal:condition="docpath" tal:attributes="class python:here.getStyle(viewMode, 'text')"><a
+          tal:omit-tag="python:viewMode=='text_image'" tal:attributes="href python:here.getLink('viewMode','text_image')">Text Image</a></li>  
         <li tal:condition="python:docinfo.get('imagePath',None)" tal:attributes="class python:here.getStyle(viewMode, 'image')"><a
           tal:omit-tag="python:viewMode=='image'" tal:attributes="href python:here.getLink('viewMode','image')">Image</a></li>

zpt/viewer/viewer_text.zpt

@@ -109 +109 @@
           <h4>Text normalization</h4>
           <form tal:attributes="action viewerUrl" class="autosubmit"
-            tal:define="norm python:pageinfo.get('characterNormalization','regPlusNorm');">
+            tal:define="norm python:pageinfo.get('characterNormalization','orig');">
             <input type="hidden"
               tal:define="params python:here.getParams(params={'characterNormalization':None, 'viewLayer':viewLayer})"
@@ -116 +116 @@
               <li><input type="radio" class="autosubmit" name="characterNormalization" value="orig"
                 tal:attributes="checked python:norm=='orig'" /> Original</li>
-              <li><input type="radio" class="autosubmit" name="characterNormalization" value="reg"
+              <!--<li><input type="radio" class="autosubmit" name="characterNormalization" value="reg"
                 tal:attributes="checked python:norm=='reg'" /> Regularized</li>
               <li><input type="radio" class="autosubmit" name="characterNormalization" value="regPlusNorm"
-                tal:attributes="checked python:norm=='regPlusNorm'" /> Normalized</li>
+                tal:attributes="checked python:norm=='regPlusNorm'" /> Normalized</li>-->
             </ul>
             <input type="submit" value="Go!" />