v7.8

fmidev · Jan 8, 2024 · 44a7aa1 · 44a7aa1
1 parent 7241597
commit 44a7aa1
Show file tree

Hide file tree

Showing 26 changed files with 606 additions and 140 deletions.
diff --git a/demo/make-image-product.sh b/demo/make-image-product.sh
@@ -81,7 +81,8 @@ eval $cmd
 #if [ ! -f $OUTFILE_LEGEND ]; then
 echo "# Creating legend..."
 #cmd="convert tmp.svg  $OUTFILE_LEGEND"
-cmd="inkscape -z --export-png $OUTFILE_LEGEND tmp.svg"
+#cmd="inkscape -z --export-png $OUTFILE_LEGEND tmp.svg"
+cmd="convert tmp.svg  $OUTFILE_LEGEND"  # -filter point -resize 400 
 echo $cmd
 eval $cmd
 #fi

diff --git a/demo/test-content.sh b/demo/test-content.sh
@@ -57,6 +57,7 @@ REQUIRE dataset1
 # Technical tests only (not commands)
 
 START example-select-test.inc
+INFILE='volume.h5'
 OUTFILE='volume-select.txt'
 
 TITLE "Index range: select dataset3, including its subgroups. "

diff --git a/src/andre/DetectorOp.cpp b/src/andre/DetectorOp.cpp
@@ -139,10 +139,10 @@ void DetectorOp::runDetection(const DataSetMap<PolarSrc> & srcVolume, DataSetMap
 
 		// PROBABILITY OF THE CLASS APPROXIMATED BY THIS DETECTOR
 		PlainData<PolarDst> & dstProb = (SUPPORT_UNIVERSAL && UNIVERSAL) ? dstDataSet.getQualityData(CLASSNAME) : dstData.getQualityData(CLASSNAME);
-		//dstProb.tree.data.noSave = !DetectorOp::STORE;
+		//dstProb.tree.data.exclude = !DetectorOp::STORE;
 		initDataDst(srcData, dstProb);
 		mout.debug("outputDataVerbosity ", outputDataVerbosity);
-		dstProb.setNoSave(outputDataVerbosity==0);
+		dstProb.setExcluded(outputDataVerbosity==0);
 
 		//mout.warn("dstProb: " , dstProb );
 		/// MAIN COMMAND
@@ -214,10 +214,10 @@ void DetectorOp::runDetection(const DataSetMap<PolarSrc> & srcVolume, DataSetMap
 
 			// PROBABILITY OF THE CLASS APPROXIMATED BY THIS DETECTOR
 			PlainData<PolarDst> & dstProb = (SUPPORT_UNIVERSAL && UNIVERSAL) ? dstDataSet.getQualityData(CLASSNAME) : dstData.getQualityData(CLASSNAME);
-			//dstProb.tree.data.noSave = !DetectorOp::STORE;
+			//dstProb.tree.data.exclude = !DetectorOp::STORE;
 			initDataDst(srcData, dstProb);
 			mout.debug("outputDataVerbosity ", outputDataVerbosity);
-			dstProb.setNoSave(outputDataVerbosity==0);
+			dstProb.setExcluded(outputDataVerbosity==0);
 			// mout.debug2("dstProb: ", dstProb);
 
 			/// MAIN COMMAND

diff --git a/src/data/Data.h b/src/data/Data.h
@@ -185,8 +185,8 @@ class TreeWrapper {
 
 	// Mark this data temporary so that it will not be save by Hi5::write().
 	inline
-	void setNoSave(bool noSave = true){
-		this->tree.data.noSave = noSave;
+	void setExcluded(bool exclude = true){
+		this->tree.data.exclude = exclude;
 	};
 
 
@@ -215,7 +215,7 @@ class TreeWrapper {
 	~TreeWrapper(){
 		/*
 		drain::Logger mout("TreeWrapper", __FUNCTION__);
-		if (this->tree.data.noSave){
+		if (this->tree.data.exclude){
 			mout.note("deleting (children only?)" );
 			this->tree.clear();
 		}
@@ -746,7 +746,7 @@ class DataGroup : public TreeWrapper<typename DT::datatype_t>, public std::map<s
 	inline
 	void updateTree3(const typename datatype_t::odim_t & odim){  //
 		//odim.copyToDataSet(this->tree);
-		//if (!DataTools::removeIfNoSave(this->tree))
+		//if (!DataTools::removeIfExcluded(this->tree))
 		ODIM::copyToH5<ODIMPathElem::DATASET>(odim, this->tree);
 		DataTools::updateInternalAttributes(this->tree); // images, including DataSet.data, TODO: skip children
 	}
@@ -1153,7 +1153,7 @@ class DataSet : public DataGroup<Data<DT>,ODIMPathElem::DATA>, public QualityDat
 	inline
 	void updateTree3(const typename DT::odim_t & odim){  //
 		//odim.copyToDataSet(this->tree);
-		//if (!DataTools::removeIfNoSave(this->tree))
+		//if (!DataTools::removeIfExcluded(this->tree))
 		ODIM::copyToH5<ODIMPathElem::DATASET>(odim, this->tree);
 		DataTools::updateInternalAttributes(this->tree); // TEST2019/09 // images, including DataSet.data, TODO: skip children
 		//DataTools::updateInternalAttributes(this->tree, drain::FlexVariableMap()); // TEST2019/09 // images, including DataSet.data, TODO: skip children