feat(dataset_caption): support caption display

IDEA-Research · Sep 25, 2023 · 13a942d · 13a942d
1 parent 6b69a3d
commit 13a942d
Show file tree

Hide file tree

Showing 12 changed files with 91 additions and 74 deletions.
diff --git a/deepdataspace/server/static/index.html b/deepdataspace/server/static/index.html
@@ -9,6 +9,6 @@
 </head>
 <body>
 <div id="root"></div>
-<script src="/static/umi.910c5012.js"></script>
+<script src="/static/umi.d0ec6102.js"></script>
 
 </body></html>
diff --git a/...tatic/p__Dataset__index.020ca2a8.async.js → ...tatic/p__Dataset__index.3ddc5261.async.js b/...tatic/p__Dataset__index.020ca2a8.async.js → ...tatic/p__Dataset__index.3ddc5261.async.js
diff --git a/...p__Lab__FlagTool__index.036a40dd.async.js → ...p__Lab__FlagTool__index.8182d4fa.async.js b/...p__Lab__FlagTool__index.036a40dd.async.js → ...p__Lab__FlagTool__index.8182d4fa.async.js
diff --git a/deepdataspace/server/static/umi.910c5012.js → deepdataspace/server/static/umi.d0ec6102.js b/deepdataspace/server/static/umi.910c5012.js → deepdataspace/server/static/umi.d0ec6102.js
diff --git a/...taspace/server/static/umi.910c5012.js.map → ...taspace/server/static/umi.d0ec6102.js.map b/...taspace/server/static/umi.910c5012.js.map → ...taspace/server/static/umi.d0ec6102.js.map
diff --git a/deepdataspace/server/templates/index.html b/deepdataspace/server/templates/index.html
@@ -9,6 +9,6 @@
 </head>
 <body>
 <div id="root"></div>
-<script src="/static/umi.910c5012.js"></script>
+<script src="/static/umi.d0ec6102.js"></script>
 
 </body></html>
diff --git a/packages/app/src/pages/Dataset/index.tsx b/packages/app/src/pages/Dataset/index.tsx
@@ -131,7 +131,10 @@ const Page: React.FC = () => {
                     />
                   )}
                   {displayOptionsResult.showImgDesc && (
-                    <div className={styles.label}> {item.desc} </div>
+                    <div className={styles.label}>
+                      {' '}
+                      {item.caption || item.desc}{' '}
+                    </div>
                   )}
                   {flagTools && item.selected ? (
                     <div className={styles.itemSelectedMask} />

diff --git a/packages/app/src/pages/Lab/FlagTool/index.tsx b/packages/app/src/pages/Lab/FlagTool/index.tsx
@@ -128,7 +128,10 @@ const Page: React.FC = () => {
                     />
                   )}
                   {displayOptionsResult.showImgDesc && (
-                    <div className={styles.label}> {item.desc} </div>
+                    <div className={styles.label}>
+                      {' '}
+                      {item.caption || item.desc}{' '}
+                    </div>
                   )}
                   {flagTools && item.selected ? (
                     <div className={styles.itemSelectedMask} />

diff --git a/packages/app/src/types/dataset.ts b/packages/app/src/types/dataset.ts
@@ -28,6 +28,7 @@ export namespace NsDataSet {
 
   export interface DataSetImg extends BaseImage {
     desc: string;
+    caption?: string;
     metadata: Record<string, string>;
     objects: Array<DatasetObject>;
     /** 0/1/2 */

diff --git a/packages/components/src/Annotator/preview.tsx b/packages/components/src/Annotator/preview.tsx
@@ -430,6 +430,15 @@ const Preview: React.FC<PreviewProps> = (props) => {
                   : metadata[key]}
               </div>
             ))}
+            {
+              list[current]?.caption ? (
+                <div className="item">
+                  {'caption'}
+                  <br />
+                  {list[current].caption}
+                </div>
+              ) : null
+            }
           </div>
           <div className="bottom-mask" />
           <div className="hide-info-btn" onClick={changeShowInfo}>

diff --git a/packages/components/src/Annotator/tools/useSkeleton.ts b/packages/components/src/Annotator/tools/useSkeleton.ts
@@ -40,8 +40,8 @@ const renderKeypoints = (
     for (let i = 0; i * 2 < lines.length; i++) {
       const [index1, index2] = [lines[i * 2], lines[i * 2 + 1]];
       if (
-        points[index1].visible === KEYPOINTS_VISIBLE_TYPE.labeledVisible &&
-        points[index2].visible === KEYPOINTS_VISIBLE_TYPE.labeledVisible
+        points[index1]?.visible === KEYPOINTS_VISIBLE_TYPE.labeledVisible &&
+        points[index2]?.visible === KEYPOINTS_VISIBLE_TYPE.labeledVisible
       ) {
         drawLine(
           canvas,

diff --git a/packages/components/src/Annotator/type.ts b/packages/components/src/Annotator/type.ts
@@ -47,6 +47,7 @@ export interface DrawImageData {
   urlFullRes: string;
   objects: DrawObject[];
   metadata?: Record<string, string>;
+  caption?: string;
 }
 
 export enum EObjectStatus {