Merge pull request #4 from moserle/master

add new 'createImagesAction'
piximi · Jun 16, 2019 · ccce0d7 · ccce0d7
2 parents 6da82bc + adf687a
commit ccce0d7
Show file tree

Hide file tree

Showing 5 changed files with 149 additions and 0 deletions.
diff --git a/src/actions/classifier.ts b/src/actions/classifier.ts
@@ -18,6 +18,10 @@ export const createImageAction = createAction(
   'create-image'
 );
 
+export const createImagesAction = createAction(
+  'create-images'
+);
+
 export const createImageScoreAction = createAction(
   'create-image-score'
 );

diff --git a/src/actions/index.ts b/src/actions/index.ts
@@ -1,6 +1,7 @@
 import {
   createCategoryAction,
   createImageAction,
+  createImagesAction,
   createImageScoreAction,
   createClassifierAction,
   openClassifierAction,
@@ -20,6 +21,7 @@ import {
 export {
   createCategoryAction,
   createImageAction,
+  createImagesAction,
   createImageScoreAction,
   createClassifierAction,
   openClassifierAction,

diff --git a/src/index.ts b/src/index.ts
@@ -1,6 +1,7 @@
 import {
   createCategoryAction,
   createImageAction,
+  createImagesAction,
   createImageScoreAction,
   createClassifierAction,
   deleteImageAction,
@@ -26,6 +27,7 @@ export {
   createCategoryAction,
   createClassifierAction,
   createImageAction,
+  createImagesAction,
   createImageScoreAction,
   deleteCategoryAction,
   deleteImageAction,

diff --git a/src/reducers/classifier.test.ts b/src/reducers/classifier.test.ts
@@ -3,6 +3,7 @@ import {
   createClassifierAction,
   openClassifierAction,
   createImageAction,
+  createImagesAction,
   createImageScoreAction,
   deleteCategoryAction,
   deleteImageAction,
@@ -334,6 +335,140 @@ describe('classifierReducer', () => {
     expect(reducer).toEqual(expected);
   });
 
+  it('createImagesAction', () => {
+    const state: Classifier = {
+      categories: [
+        {
+          description: 'Unknown',
+          identifier: '00000000-0000-0000-0000-000000000000',
+          index: 0,
+          visualization: {
+            color: 'rgb(233, 165, 177)',
+            visible: true
+          }
+        }
+      ],
+      images: [
+        {
+          categoryIdentifier: '00000000-0000-0000-0000-000000000000',
+          checksum: '',
+          data: '',
+          identifier: '11111111-1111-1111-1111-11111111111',
+          partition: Partition.Training,
+          scores: [],
+          visualization: {
+            brightness: 0,
+            contrast: 0,
+            visible: true,
+            visibleChannels: []
+          }
+        }
+      ],
+      name: 'Untitled classifier'
+    };
+
+    const images: Image[] = [
+      {
+        categoryIdentifier: '00000000-0000-0000-0000-000000000000',
+        checksum: '',
+        data: '',
+        identifier: '11111111-1111-1111-2222-11111111111',
+        partition: Partition.Training,
+        scores: [],
+        visualization: {
+          brightness: 0,
+          contrast: 0,
+          visible: true,
+          visibleChannels: []
+        }
+      },
+      {
+        categoryIdentifier: '00000000-0000-0000-0000-000000000000',
+        checksum: '',
+        data: '',
+        identifier: '11111111-1111-1111-333-11111111111',
+        partition: Partition.Training,
+        scores: [],
+        visualization: {
+          brightness: 0,
+          contrast: 0,
+          visible: true,
+          visibleChannels: []
+        }
+      }
+    ];
+
+    const payload = {
+      images: images
+    };
+
+    const action = createImagesAction(payload);
+
+    const reducer = classifierReducer(state, action);
+
+    const expected: Classifier = {
+      categories: [
+        {
+          description: 'Unknown',
+          identifier: '00000000-0000-0000-0000-000000000000',
+          index: 0,
+          visualization: {
+            color: 'rgb(233, 165, 177)',
+            visible: true
+          }
+        }
+      ],
+      images: [
+        {
+          categoryIdentifier: '00000000-0000-0000-0000-000000000000',
+          checksum: '',
+          data: '',
+          identifier: '11111111-1111-1111-1111-11111111111',
+          partition: Partition.Training,
+          scores: [],
+          visualization: {
+            brightness: 0,
+            contrast: 0,
+            visible: true,
+            visibleChannels: []
+          }
+        },
+        {
+          categoryIdentifier: '00000000-0000-0000-0000-000000000000',
+          checksum: '',
+          data: '',
+          identifier: '11111111-1111-1111-2222-11111111111',
+          partition: Partition.Training,
+          scores: [],
+          visualization: {
+            brightness: 0,
+            contrast: 0,
+            visible: true,
+            visibleChannels: []
+          }
+        },
+        {
+          categoryIdentifier: '00000000-0000-0000-0000-000000000000',
+          checksum: '',
+          data: '',
+          identifier: '11111111-1111-1111-333-11111111111',
+          partition: Partition.Training,
+          scores: [],
+          visualization: {
+            brightness: 0,
+            contrast: 0,
+            visible: true,
+            visibleChannels: []
+          }
+        }
+      ],
+      name: 'Untitled classifier'
+    };
+
+    expect(reducer).toEqual(expected);
+  });
+
+
   it('createImageScoreAction', () => {
     const state: Classifier = {
       categories: [

diff --git a/src/reducers/classifier.ts b/src/reducers/classifier.ts
@@ -7,6 +7,7 @@ import {
   createClassifierAction,
   openClassifierAction,
   createImageAction,
+  createImagesAction,
   createImageScoreAction,
   deleteCategoryAction,
   deleteImageAction,
@@ -89,6 +90,11 @@ export const classifierReducer = createReducer(initialState, {
 
     state.images.push(image);
   },
+  [createImagesAction.toString()]: (state, action) => {
+    const { images } = action.payload;
+
+    images.forEach( (image: Image) => state.images.push(image));
+  },
   [createImageScoreAction.toString()]: (state, action) => {
     const { identifier, score } = action.payload;