Revert "release 20230419-0818 (#35)"

This reverts commit 667ec55.

src/assets/icons/index.js

@@ -6,5 +6,4 @@ export { ReactComponent as Eye } from './bi_eye.svg'
 export { ReactComponent as MoveIcon } from './MoveIcon.svg'
 export { ReactComponent as Package } from './package.svg'
 export { ReactComponent as ChevronRightBlack } from './chevron-right-black.svg'
-export { ReactComponent as ChevronRightWhite } from './chevron-right-white.svg'
-export { ReactComponent as FlagIcon } from './flag-svgrepo-com.svg'
+export { ReactComponent as ChevronRightWhite } from './chevron-right-white.svg'

src/data/enums/ItemType.ts

@@ -8,12 +8,7 @@ export enum ATTRIBUTE_TYPE {
     SUB_CATEGORY = 'SUB_CATEGORY',
     ITEM_COLOR = 'ITEM_COLOR',
     ITEM_PATTERN = 'ITEM_PATTERN',
-    HUMAN_ID = 'HUMAN_ID',
-    GENDER_SCORE = 'GENDER_SCORE',
-    STYLE_SCORE = 'STYLE_SCORE',
-    ITEM_SCORE = 'ITEM_SCORE',
-    COLOR_SCORE = 'COLOR_SCORE',
-    PATTERN_SCORE = 'PATTERN_SCORE',
+    HUMAN_ID = 'HUMAN_ID'
 }
 
 export const GENDER = {
@@ -473,7 +468,6 @@ export enum ITEM_COLOR {
     GOLD,
     SILVER,
     CYAN,
-    MAGENTA,
     UNKNOWN = -1
 }
 

src/lang.ts

@@ -133,7 +133,6 @@ export const vi = {
         GOLD: 'màu vàng đồng',
         SILVER: 'màu bạc',
         CYAN: 'xanh ngọc',
-        MAGENTA: 'màu hồng nóng',
         UNKNOWN: 'KHÔNG XÁC ĐỊNH'
     },
     ITEM_PATTERN: {

src/logic/import/MJ/MJImporter.ts

@@ -141,7 +141,7 @@ export class MJImporter extends AnnotationImporter {
         imageData.humans = humans;
         imageData.items = items;
 
-        // console.log('imageData = ', imageData);
+        console.log('imageData = ', imageData);
         return imageData;
     }
     public static applyAnnotationsFromFile(

src/logic/import/MJ/MJUtils.ts

@@ -121,8 +121,6 @@ export class MJUtils {
                 gender: parseInt(gender),
                 type: parseInt(type),
                 styles: human.style,
-                styleScore: human.style_score?.split(":").map((score, i) => ({style: human.style_candidates.split(":")[i], score: parseFloat(score)})),
-                genderScore: human.gender_score,
                 qc_comment: human.qc_comment,
                 qc_status: human.qc_status
             };
@@ -149,9 +147,6 @@ export class MJUtils {
                 color: parseInt(color),
                 pattern: parseInt(pattern),
                 styles: item.style,
-                colorScore: item.color_score?.split(":").map((score, i) => ({color: parseInt(item.colors.split(":")[i]), score: parseFloat(score)})),
-                patternScore: item.pattern_score?.split(":").map((score, i) => ({pattern: parseInt(item.patterns.split(":")[i]), score: parseFloat(score)})),
-                itemScore: item.item_score,
                 qc_comment: item.qc_comment,
                 qc_status: item.qc_status
             };

src/store/Actions.ts

@@ -5,7 +5,6 @@ export enum Action {
     UPDATE_OBJECT_DETECTOR_STATUS = '@@UPDATE_OBJECT_DETECTOR_STATUS',
     UPDATE_POSE_DETECTOR_STATUS = '@@UPDATE_POSE_DETECTOR_STATUS',
     UPDATE_DISABLED_AI_FLAG = '@@UPDATE_DISABLED_AI_FLAG',
-    UPDATE_SCORE_CRITERIA = '@@UPDATE_SCORE_CRITERIA',
 
     // GENERAL
     UPDATE_PROJECT_DATA = '@@UPDATE_PROJECT_DATA',

src/store/ai/actionCreators.ts

@@ -44,13 +44,4 @@ export function updateDisabledAIFlag(isAIDisabled: boolean): AIActionTypes {
             isAIDisabled,
         }
     }
-}
-
-export function updateScoreCriteria(scoreCriteria: any): AIActionTypes {
-    return {
-        type: Action.UPDATE_SCORE_CRITERIA,
-        payload: {
-            scoreCriteria,
-        }
-    }
-}
+}

src/store/ai/reducer.ts

@@ -6,28 +6,14 @@ const initialState: AIState = {
     rejectedSuggestedLabelList: [],
     isObjectDetectorLoaded: false,
     isPoseDetectorLoaded: false,
-    isAIDisabled: false,
-    scoreCriteria: {
-        gender: 0.8,
-        style: 0.8,
-        color: 0.8,
-        pattern: 0.8,
-        item: 0.8
-    }
+    isAIDisabled: false
 };
 
 export function aiReducer(
     state = initialState,
     action: AIActionTypes
 ): AIState {
     switch (action.type) {
-        case Action.UPDATE_SCORE_CRITERIA: {
-            console.log('Action.UPDATE_SCORE_CRITERIA ', action.payload)
-            return {
-                ...state,
-                scoreCriteria: action.payload.scoreCriteria
-            }
-        }
         case Action.UPDATE_SUGGESTED_LABEL_LIST: {
             return {
                 ...state,

src/store/ai/types.ts

@@ -11,15 +11,6 @@ export type AIState = {
     suggestedLabelList: string[];
     rejectedSuggestedLabelList: string[];
     isAIDisabled: boolean;
-
-    // SHOWNIQ Vision AI Criteria
-    scoreCriteria: {
-        gender: number,
-        style: number,
-        color: number,
-        pattern: number,
-        item: number
-    }
 }
 
 interface UpdateSuggestedLabelList {
@@ -57,22 +48,8 @@ interface UpdateDisabledAIFlag {
     }
 }
 
-interface UpdateScoreCriteria {
-    type: typeof Action.UPDATE_SCORE_CRITERIA;
-    payload: {
-        scoreCriteria: {
-            gender: number,
-            style: number,
-            color: number,
-            pattern: number,
-            item: number    
-        }
-    }
-}
-
 export type AIActionTypes = UpdateSuggestedLabelList
     | UpdateRejectedSuggestedLabelList
     | UpdateObjectDetectorStatus
     | UpdatePoseDetectorStatus
     | UpdateDisabledAIFlag
-    | UpdateScoreCriteria

src/store/labels/types.ts

@@ -60,8 +60,6 @@ export type HumanInfo = {
     gender: number;
     type: number;
     styles: string[];
-    styleScore?: { style: string, score: number }[];
-    genderScore?: number;
     qc_status?: string;
     qc_comment?: string
 };
@@ -76,9 +74,6 @@ export type ItemInfo = {
     color: number;
     pattern: number;
     styles: string[];
-    patternScore?: { pattern: number, score: number }[];
-    colorScore?: {color: number, score: number}[];
-    itemScore?: number;
     qc_status?: string;
     qc_comment?: string;
 };
@@ -120,9 +115,6 @@ export type RectJSON = {
             rb_y: number;
         };
         style: string[];
-        gender_score?: number;
-        style_candidates?: string;
-        style_score?: string;
         qc_status?: string;
         qc_comment?: string;
     }[];
@@ -135,11 +127,6 @@ export type RectJSON = {
             rb_y: number;
         };
         style: string[];
-        colors?: string;
-        color_score?: string;
-        item_score?: number;
-        patterns?: string;
-        pattern_score?: string;
         qc_status?: string;
         qc_comment?: string;
     }[];

src/store/selectors/AISelector.ts

@@ -1,15 +1,6 @@
 import {store} from '../..';
 
 export class AISelector {
-    public static getScoreCriteria(): {
-        gender: number,
-        style: number,
-        color: number,
-        pattern: number,
-        item: number    
-    } {
-        return store.getState().ai.scoreCriteria;
-    }
     public static getSuggestedLabelList(): string[] {
         return store.getState().ai.suggestedLabelList;
     }

src/views/EditorView/SideNavigationBar/LabelInputField/LabelInputField.tsx

@@ -38,8 +38,7 @@ interface IProps {
     updateActiveHumanID: (humanId: string) => any;
     imageStatus?: string ;
     qcStatus?: string;
-    qcComment?: string;
-    scoreFlag?: boolean;
+    qcComment?: string
 }
 
 interface IState {
@@ -171,7 +170,7 @@ class LabelInputField extends React.Component<IProps, IState> {
     };
 
     public render() {
-        const {size, id, value, onDelete, onSelectInfo, mode, description, qcStatus, scoreFlag} =
+        const {size, id, value, onDelete, onSelectInfo, mode, description, qcStatus} =
             this.props;
 
         return (
@@ -226,7 +225,7 @@ class LabelInputField extends React.Component<IProps, IState> {
                         </div> */}
                         <div className="ContentWrapper">
                             <ImageButton
-                                externalClassName={`info ${qcStatus === "R" || scoreFlag ? "danger" : qcStatus === "P" ? "success" : ""}`}
+                                externalClassName={`info ${qcStatus === "R" ? "danger" : qcStatus === "P" ? "success" : ""}`}
                                 image={'ico/info.png'}
                                 imageAlt={'info'}
                                 buttonSize={{width: 30, height: 30}}

src/views/EditorView/SideNavigationBar/LabelsToolkit/LabelsToolkit.scss

@@ -131,8 +131,4 @@
         align-items: center;
         align-content: center;
     }
-
-    .Flag {
-        margin-left: 10px;
-    }
 }

src/views/EditorView/SideNavigationBar/LabelsToolkit/LabelsToolkit.tsx

@@ -30,8 +30,6 @@ import {ImageButton} from '../../../Common/ImageButton/ImageButton';
 import {Fade, Tooltip} from '@material-ui/core';
 import withStyles from '@material-ui/core/styles/withStyles';
 import {LabelActions} from '../../../../logic/actions/LabelActions';
-import { FlagIcon } from 'assets/icons';
-import { AISelector } from 'store/selectors/AISelector';
 
 const BUTTON_SIZE: ISize = {width: 30, height: 30};
 const BUTTON_PADDING: number = 10;
@@ -165,29 +163,6 @@ class LabelsToolkit extends React.Component<IProps, IState> {
                         active: isActive
                     });
 
-                const flagCount = ():number => {
-                    const criteria = AISelector.getScoreCriteria()
-                    const humanFlagCount = imagesData[activeImageIndex].humans.filter(
-                        human => 
-                            human.genderScore < criteria.gender 
-                            || (
-                                human.styleScore?.length > 0 
-                                && human.styleScore[0].score < criteria.style
-                            )).length
-                    const itemFlagCount = imagesData[activeImageIndex].items.filter(
-                        item => 
-                            item.itemScore < criteria.item
-                            || (
-                                item.colorScore?.length > 0
-                                && item.colorScore[0].score < criteria.color
-                            )
-                            || (
-                                item.patternScore?.length > 0
-                                && item.patternScore[0].score < criteria.pattern
-                            )
-                    ).length
-                    return humanFlagCount + itemFlagCount;
-                }
                 const header = (
                     <div
                         key={'Header_' + index}
@@ -203,10 +178,6 @@ class LabelsToolkit extends React.Component<IProps, IState> {
                                 alt={tabData.imageAlt}
                             />
                             {tabData.headerText}
-                            {flagCount() > 0 && <div className="Flag">
-                                <FlagIcon fill='red' fontSize={"10px"} width={20} height={20} />
-                                <span style={{color: 'red', fontWeight: 'bold'}}>({flagCount()})</span>
-                            </div>}
                         </div>
                         <div className="HeaderGroupWrapper">
                             <img

src/views/EditorView/SideNavigationBar/RectLabelsList/RectLabelsList.tsx

@@ -36,7 +36,6 @@ import {
 import {Settings} from '../../../../settings/Settings';
 import {Fade, Tooltip, withStyles} from '@material-ui/core';
 import {ImageButton} from '../../../Common/ImageButton/ImageButton';
-import { AISelector } from 'store/selectors/AISelector';
 
 const BUTTON_SIZE: ISize = {width: 30, height: 30};
 const BUTTON_PADDING: number = 10;
@@ -98,7 +97,6 @@ const RectLabelsList: React.FC<IProps> = ({
         width: size.width,
         height: size.height
     };
-
     const listStyleContent: React.CSSProperties = {
         width: size.width,
         height: imageData.labelRects.length * labelInputFieldHeight
@@ -136,32 +134,6 @@ const RectLabelsList: React.FC<IProps> = ({
         updateActiveLabelId(null);
     };
 
-    const checkScore = (labelRect: LabelRect): boolean => {
-        const criteria = AISelector.getScoreCriteria();
-
-        if (labelRect.mode === LabelModeType.HUMAN) {
-            const found = _.find(imageData.humans, {uuid: labelRect.id});
-            if(found?.genderScore < criteria.gender) {
-                return true;
-            }
-            if(found?.styleScore?.length > 0 && found?.styleScore[0].score < criteria.style) {
-                return true;
-            }
-        } else {
-            const found = _.find(imageData.items, {uuid: labelRect.id});
-            if(found?.colorScore?.length > 0 && found?.colorScore[0].score < criteria.color) {
-                return true;
-            }
-            if(found?.itemScore < criteria.item) {
-                return true;
-            }
-            if(found?.patternScore?.length > 0 && found?.patternScore[0].score < criteria.pattern) {
-                return true;
-            }
-        }
-        return false;
-    }
-
     const getDescription = (labelRect: LabelRect) => {
         if (labelRect.mode === LabelModeType.HUMAN) {
             const found = _.find(imageData.humans, {uuid: labelRect.id});
@@ -352,7 +324,7 @@ const RectLabelsList: React.FC<IProps> = ({
                     labelRect.status === LabelStatus.ACCEPTED
             )
             .map((labelRect: LabelRect) => {
-                const isFlagged = checkScore(labelRect)
+
                 return (
                     <LabelInputField
                         size={{
@@ -377,7 +349,6 @@ const RectLabelsList: React.FC<IProps> = ({
                         imageStatus={imageData.image_status}
                         qcStatus={labelRect.qc_status}
                         qcComment={labelRect.qc_comment}
-                        scoreFlag={isFlagged}
                     />
                 );
             });