fix network name in imagenet-camera status bar

hbe72 · Nov 20, 2018 · 9181361 · 9181361
1 parent 5f62e35
commit 9181361
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/imageNet.cpp b/imageNet.cpp
@@ -31,6 +31,8 @@ imageNet::imageNet() : tensorNet()
 {
 	mCustomClasses = 0;
 	mOutputClasses = 0;
+
+	mNetworkType = CUSTOM;
 }
 
 
@@ -56,6 +58,7 @@ imageNet* imageNet::Create( imageNet::NetworkType networkType, uint32_t maxBatch
 		return NULL;
 	}
 
+	net->mNetworkType = networkType;
 	return net;
 }
 
@@ -90,6 +93,8 @@ bool imageNet::init( imageNet::NetworkType networkType, uint32_t maxBatchSize,
 		return init( "networks/googlenet.prototxt", "networks/bvlc_googlenet.caffemodel", NULL, "networks/ilsvrc12_synset_words.txt", IMAGENET_DEFAULT_INPUT, IMAGENET_DEFAULT_OUTPUT, maxBatchSize, precision, device, allowGPUFallback );
 	else if( networkType == imageNet::GOOGLENET_12 )
 		return init( "networks/GoogleNet-ILSVRC12-subset/deploy.prototxt", "networks/GoogleNet-ILSVRC12-subset/snapshot_iter_184080.caffemodel", NULL, "networks/GoogleNet-ILSVRC12-subset/labels.txt", IMAGENET_DEFAULT_INPUT, "softmax", maxBatchSize, precision, device, allowGPUFallback );
+	else
+		return NULL;
 }
 
 

diff --git a/imageNet.h b/imageNet.h
@@ -52,6 +52,7 @@ class imageNet : public tensorNet
 	 */
 	enum NetworkType
 	{
+		CUSTOM,
 		ALEXNET,		/**< 1000-class ILSVR12 */
 		GOOGLENET,	/**< 1000-class ILSVR12 */
 		GOOGLENET_12	/**< 12-class subset of ImageNet ILSVR12 from the tutorial */