Export tab functional

glyptodon/_modidx.py

@@ -9,14 +9,17 @@
                                                                                        'glyptodon/annotation.py'),
                                       'glyptodon.annotation.createAnnotationTextArea': ( 'annotation.html#createannotationtextarea',
                                                                                          'glyptodon/annotation.py'),
+                                      'glyptodon.annotation.createNextTab': ('annotation.html#createnexttab', 'glyptodon/annotation.py'),
                                       'glyptodon.annotation.createPageSelector': ( 'annotation.html#createpageselector',
                                                                                    'glyptodon/annotation.py'),
                                       'glyptodon.annotation.createSaveAnnotation': ( 'annotation.html#createsaveannotation',
                                                                                      'glyptodon/annotation.py'),
                                       'glyptodon.annotation.createSaveShapes': ( 'annotation.html#createsaveshapes',
                                                                                  'glyptodon/annotation.py')},
-            'glyptodon.app': { 'glyptodon.app.finalizeSelectionCallback': ('app.html#finalizeselectioncallback', 'glyptodon/app.py'),
+            'glyptodon.app': { 'glyptodon.app.exportManuscriptCallback': ('app.html#exportmanuscriptcallback', 'glyptodon/app.py'),
+                               'glyptodon.app.finalizeSelectionCallback': ('app.html#finalizeselectioncallback', 'glyptodon/app.py'),
                                'glyptodon.app.lineNumberCallback': ('app.html#linenumbercallback', 'glyptodon/app.py'),
+                               'glyptodon.app.nextTabCallback': ('app.html#nexttabcallback', 'glyptodon/app.py'),
                                'glyptodon.app.pageSelectorCallback': ('app.html#pageselectorcallback', 'glyptodon/app.py'),
                                'glyptodon.app.saveAnnotationCallback': ('app.html#saveannotationcallback', 'glyptodon/app.py'),
                                'glyptodon.app.saveNContinuteCallback': ('app.html#savencontinutecallback', 'glyptodon/app.py'),

glyptodon/annotation.py

@@ -1,7 +1,8 @@
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/04_annotation.ipynb.
 
 # %% auto 0
-__all__ = ['createAnnotationTextArea', 'createPageSelector', 'createSaveShapes', 'createSaveAnnotation', 'createAnnotationFigure']
+__all__ = ['createAnnotationTextArea', 'createPageSelector', 'createSaveShapes', 'createSaveAnnotation', 'createNextTab',
+           'createAnnotationFigure']
 
 # %% ../nbs/04_annotation.ipynb 5
 from dash import dcc, html
@@ -25,6 +26,10 @@ def createSaveAnnotation():
     return html.Button("Save Annotation", id="save-annotation")
 
 # %% ../nbs/04_annotation.ipynb 17
+def createNextTab():
+    return html.Button("Next Tab", id="next-tab")
+
+# %% ../nbs/04_annotation.ipynb 19
 def createAnnotationFigure(path):
     img = cv2.imread(path)
     # This reorders the color channels (the first two indices relate to the intensity values of individual colors while the last index indicates what

glyptodon/app.py

@@ -3,10 +3,11 @@
 # %% auto 0
 __all__ = ['selectionKey', 'manuscriptSelect', 'selectionInfo', 'finalizeSelection', 'metadata', 'inputObjects', 'centuries',
            'centuriesSlider', 'uploadImages', 'uploadManuscripts', 'informationInfo', 'saveNContinue',
-           'annotationTextArea', 'pageSelector', 'saveShapes', 'saveAnnotation', 'exportInfo', 'exportName',
+           'annotationTextArea', 'pageSelector', 'saveShapes', 'saveAnnotation', 'nextTab', 'exportInfo', 'exportName',
            'directoryOptions', 'exportButton', 'exportDownload', 'app', 'newManuscript', 'selectedManuscript',
-           'testVar', 'selectManuscript', 'finalizeSelectionCallback', 'pageSelectorCallback', 'saveShapesCallback',
-           'lineNumberCallback', 'saveAnnotationCallback', 'saveNContinuteCallback']
+           'selectManuscript', 'finalizeSelectionCallback', 'pageSelectorCallback', 'saveShapesCallback',
+           'lineNumberCallback', 'saveAnnotationCallback', 'saveNContinuteCallback', 'nextTabCallback',
+           'exportManuscriptCallback']
 
 # %% ../nbs/07_app.ipynb 4
 from dash import Dash, State, Input, Output, callback, dcc, html
@@ -47,6 +48,7 @@
 pageSelector = createPageSelector()
 saveShapes = createSaveShapes()
 saveAnnotation = createSaveAnnotation()
+nextTab = createNextTab()
 
 
 ##############
@@ -130,6 +132,7 @@
                                 saveShapes,
                                 annotationTextArea,
                                 saveAnnotation,
+                                nextTab,
                             ]
                         )
                     ],
@@ -179,6 +182,7 @@
     suppress_callback_exceptions=True,
 )
 def selectManuscript(work):
+    global selectedManuscript
     if work == "Create New Manuscript":
         newManuscript = True
         selectedManuscript = None
@@ -218,6 +222,7 @@ def selectManuscript(work):
     prevent_initial_call=True,
 )
 def finalizeSelectionCallback(clicks):
+    global selectedManuscript
     dropdownOptions = []
     relativePaths = manuscriptImages(selectedManuscript[0])
 
@@ -237,6 +242,7 @@ def finalizeSelectionCallback(clicks):
     prevent_initial_call=True,
 )
 def pageSelectorCallback(path):
+    global selectedManuscript
     fig = createAnnotationFigure(path)
 
     imageName = path.split("/")[-1]  # This takes the file name in the directory
@@ -293,6 +299,7 @@ def pageSelectorCallback(path):
     prevent_initial_call=True,
 )
 def saveShapesCallback(clicks, shapes, path):
+    global selectedManuscript
     dictLines = []
     dictBBoxes = []
     for shape in shapes["shapes"]:
@@ -394,6 +401,7 @@ def lineNumberCallback(shapes, currentText):
     prevent_initial_call=True,
 )
 def saveAnnotationCallback(clicks, shapes, path, currentText):
+    global selectedManuscript
     dictLines = []
     dictBBoxes = []
     for shape in shapes["shapes"]:
@@ -466,8 +474,6 @@ def saveAnnotationCallback(clicks, shapes, path, currentText):
     return dummy
 
 # %% ../nbs/07_app.ipynb 22
-print(selectedManuscript)
-testVar = 1
 @callback(
     Output("tabs-object", "value", allow_duplicate=True),
     Input("save-and-continue", "n_clicks"),
@@ -503,8 +509,7 @@ def saveNContinuteCallback(
     #    manFilenames,
     manSelect, # State manuscript-select
 ):
-    print(testVar)
-    print(selectedManuscript)
+    global selectedManuscript
     centuriesData = ""
     if centuriesValue[0] == centuriesValue[1]:
         centuriesData = centuries[centuriesValue[0]] + " Century"
@@ -535,5 +540,27 @@ def saveNContinuteCallback(
     return "annotation"
 
 # %% ../nbs/07_app.ipynb 24
+@callback(
+    Output("tabs-object", "value", allow_duplicate=True),
+    Input("next-tab", "n_clicks"),
+    prevent_initial_call=True,
+)
+def nextTabCallback(clicks):
+    return "export"
+
+# %% ../nbs/07_app.ipynb 26
+@callback(
+    Output("export-download", "data"),
+    Input("export-button", "n_clicks"),
+    State("export-name", "value"),
+    State("directory-options", "value"),
+    prevent_initial_call=True,
+)
+def exportManuscriptCallback(clicks, name, options):
+    global selectedManuscript
+    path = zipManuscript(options, selectedManuscript[0], name)
+    return dcc.send_file(path)
+
+# %% ../nbs/07_app.ipynb 28
 if __name__ == "__main__":
     app.run(debug=True)

glyptodon/export.py

@@ -11,7 +11,7 @@
 def createExportInfo():
     return dcc.Markdown(
         """
-    # Information
+    # Export
     
     This menu allows you to export the manuscript and transcriptions you've worked on as a zipped folder.
     

glyptodon/manuscriptFiles.py

@@ -124,12 +124,16 @@ def directoryNameClean(string):
     return string.lower()
 
 # %% ../nbs/01_manuscriptFiles.ipynb 16
-def saveImages(contents: list, filenames: list, targetDirectory):
+def saveImages(contents, filenames, targetDirectory):
     # This function saves content from memory into storage using the keys in the passed files dict (from a FileUpload widget)
     # This
     baseDirectory = os.getcwd()
     os.chdir(os.path.join(targetDirectory, "images"))
-
+
+    if type(contents) != list:
+        contents = [contents]
+        filenames = [filenames]
+
     for i in range(0, len(contents)):
         string64 = contents[i].encode("utf8").split(b";base64,")[1]
         imdata = base64.b64decode(string64)
@@ -177,18 +181,30 @@ def zipManuscript(directoryOptions: list, manuscriptDirectory, name: str):
     import zipfile
     # standard call here to avoid getting the system lost in directories
     baseDirectory = os.getcwd()
-
+
+    lowerOptions = []
+    for option in directoryOptions:
+        lowerOptions.append(option.lower())
+
     files = []
     for path in os.listdir(manuscriptDirectory):
         # this deletes any currently zipped folder
         if path.endswith(".zip"):
             os.remove(os.path.join(manuscriptDirectory, path))
 
         # this collects all the files inside option folders
-        if path in directoryOptions:
-            tempDirectory = os.path.join(manuscriptDirectory, path)
-            for file in os.listdir(tempDirectory):
-                files.append(os.path.join(tempDirectory, file))
+        if path in lowerOptions:
+            if path == "states":
+                tempDirectoryStates = os.path.join(manuscriptDirectory, path)
+                for statesPath in os.listdir(tempDirectoryStates):
+                    if statesPath in ["bboxes","lines"]:
+                        tempDirectory = os.path.join(tempDirectoryStates, statesPath)
+                        for file in os.listdir(tempDirectory):
+                            files.append(os.path.join(tempDirectory, file))
+            else:
+                tempDirectory = os.path.join(manuscriptDirectory, path)
+                for file in os.listdir(tempDirectory):
+                    files.append(os.path.join(tempDirectory, file))
 
     # this zips the collected files
     os.chdir(manuscriptDirectory)
@@ -215,7 +231,6 @@ def updateMetadata(directory, information):
             f = open(file, 'w')
             printable = dictToList(information)
             for data in printable:
-                print(data)
                 f.write(data + '\n')
 
     os.chdir(baseDirectory)

nbs/01_manuscriptFiles.ipynb

@@ -30,7 +30,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 1,
+   "execution_count": 8,
    "metadata": {
     "tags": []
    },
@@ -368,12 +368,16 @@
    "outputs": [],
    "source": [
     "#| export\n",
-    "def saveImages(contents: list, filenames: list, targetDirectory):\n",
+    "def saveImages(contents, filenames, targetDirectory):\n",
     "    # This function saves content from memory into storage using the keys in the passed files dict (from a FileUpload widget)\n",
     "    # This\n",
     "    baseDirectory = os.getcwd()\n",
     "    os.chdir(os.path.join(targetDirectory, \"images\"))\n",
-    "\n",
+    "    \n",
+    "    if type(contents) != list:\n",
+    "        contents = [contents]\n",
+    "        filenames = [filenames]\n",
+    "    \n",
     "    for i in range(0, len(contents)):\n",
     "        string64 = contents[i].encode(\"utf8\").split(b\";base64,\")[1]\n",
     "        imdata = base64.b64decode(string64)\n",
@@ -689,7 +693,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 37,
+   "execution_count": 15,
    "metadata": {
     "tags": []
    },
@@ -700,18 +704,30 @@
     "    import zipfile\n",
     "    # standard call here to avoid getting the system lost in directories\n",
     "    baseDirectory = os.getcwd()\n",
-    "\n",
+    "    \n",
+    "    lowerOptions = []\n",
+    "    for option in directoryOptions:\n",
+    "        lowerOptions.append(option.lower())\n",
+    "    \n",
     "    files = []\n",
     "    for path in os.listdir(manuscriptDirectory):\n",
     "        # this deletes any currently zipped folder\n",
     "        if path.endswith(\".zip\"):\n",
     "            os.remove(os.path.join(manuscriptDirectory, path))\n",
     "        \n",
     "        # this collects all the files inside option folders\n",
-    "        if path in directoryOptions:\n",
-    "            tempDirectory = os.path.join(manuscriptDirectory, path)\n",
-    "            for file in os.listdir(tempDirectory):\n",
-    "                files.append(os.path.join(tempDirectory, file))\n",
+    "        if path in lowerOptions:\n",
+    "            if path == \"states\":\n",
+    "                tempDirectoryStates = os.path.join(manuscriptDirectory, path)\n",
+    "                for statesPath in os.listdir(tempDirectoryStates):\n",
+    "                    if statesPath in [\"bboxes\",\"lines\"]:\n",
+    "                        tempDirectory = os.path.join(tempDirectoryStates, statesPath)\n",
+    "                        for file in os.listdir(tempDirectory):\n",
+    "                            files.append(os.path.join(tempDirectory, file))\n",
+    "            else:\n",
+    "                tempDirectory = os.path.join(manuscriptDirectory, path)\n",
+    "                for file in os.listdir(tempDirectory):\n",
+    "                    files.append(os.path.join(tempDirectory, file))\n",
     "    \n",
     "    # this zips the collected files\n",
     "    os.chdir(manuscriptDirectory)\n",
@@ -779,7 +795,6 @@
     "            f = open(file, 'w')\n",
     "            printable = dictToList(information)\n",
     "            for data in printable:\n",
-    "                print(data)\n",
     "                f.write(data + '\\n')\n",
     "    \n",
     "    os.chdir(baseDirectory)"

nbs/04_annotation.ipynb

@@ -182,6 +182,26 @@
     "    return html.Button(\"Save Annotation\", id=\"save-annotation\")"
    ]
   },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "## createNextTab\n",
+    "\n",
+    "To keep users able to move on to the next tab without using the tab object, this button is created. It's not a complicated button."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "#| export\n",
+    "def createNextTab():\n",
+    "    return html.Button(\"Next Tab\", id=\"next-tab\")"
+   ]
+  },
   {
    "cell_type": "markdown",
    "metadata": {},

nbs/06_export.ipynb

@@ -80,7 +80,7 @@
     "def createExportInfo():\n",
     "    return dcc.Markdown(\n",
     "        \"\"\"\n",
-    "    # Information\n",
+    "    # Export\n",
     "    \n",
     "    This menu allows you to export the manuscript and transcriptions you've worked on as a zipped folder.\n",
     "    \n",