Made common paths output more meaningful, and greatly improved performance, various small bug fixes

Author: folterj

BioImageOperation script.md

@@ -1,4 +1,4 @@
-# Bio Image Operation script operations (v1.7.17 / 2024-03-22)
+# Bio Image Operation script operations (v1.7.19 / 2024-09-21)
 
 
 **Set** (Path, Width, Height, Fps, PixelSize, WindowSize)
@@ -39,6 +39,18 @@ Create a new image
  - Blue:	 Blue color component (numeric value between 0 and 1)
 
 
+**VideoInfo** (**Path**, API, Start, Length, Interval, Total)
+
+Open video file(s) and show info (ffmpeg formats supported)
+
+ - Path:	 File path ("path")
+ - API:	 OpenCV API code (See OpenCV API codes) (numeric value)
+ - Start:	 Start (time reference as (hours:)minutes:seconds, or frame number)
+ - Length:	 Length (time reference as (hours:)minutes:seconds, or frame number)
+ - Interval:	 Interval in number of frames (numeric value)
+ - Total:	 Total number of frames at regular interval (numeric value)
+
+
 **OpenImage** (**Path**, Start, Length, Interval, Total)
 
 Open image file(s) for processing, accepts file name pattern
@@ -430,14 +442,15 @@ Draw tracked clusters
  - DrawMode:	 Draw mode(s) (combine using | character) (None, Point, Circle, Ellipse, Box, Angle, Label, LabelArea, LabelLength, LabelAngle, Track, Tracks, Fill, ClusterDefault, TracksDefault)
 
 
-**DrawPaths** (Label, Tracker, PathDrawMode, Power, Palette)
+**DrawPaths** (Label, Tracker, PathDrawMode, Power, Offset, Palette)
 
 Draw common paths
 
  - Label:	 Label id (string)
  - Tracker:	 Tracker id (string)
- - PathDrawMode:	 Path draw mode (Age, Usage, Usage2, Usage3, Links, LinksMove)
+ - PathDrawMode:	 Path draw mode (Count, Time, Paths, Direction)
  - Power:	 Exponential power of value range (1E-[power] ... 1) (numeric value)
+ - Offset:	 Exponential offset of value range (numeric value)
  - Palette:	 Palette (GrayScale, Heat, Rainbow)
 
 

BioImageOperation/Argument.h

@@ -82,6 +82,7 @@ enum class ArgumentLabel
 	Weight,
 	Factor,
 	Power,
+	Offset,
 	Palette,
 	Tracker,
 	MinArea,
@@ -140,6 +141,7 @@ const vector<string> ArgumentLabels =
 	"Weight",
 	"Factor",
 	"Power",
+	"Offset",
 	"Palette",
 	"Tracker",
 	"MinArea",

BioImageOperation/BioImageOperation.rc

@@ -51,8 +51,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,7,17
- PRODUCTVERSION 1,7,17
+ FILEVERSION 1,7,19
+ PRODUCTVERSION 1,7,19
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -69,12 +69,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Joost de Folter"
             VALUE "FileDescription", "https://github.com/folterj/BioImageOperation"
-            VALUE "FileVersion", "1.7.17"
+            VALUE "FileVersion", "1.7.19"
             VALUE "InternalName", "BioImageOperation"
-            VALUE "LegalCopyright", "2024-03-22"
+            VALUE "LegalCopyright", "2024-09-21"
             VALUE "OriginalFilename", "BioImageOperation"
             VALUE "ProductName", "BioImageOperation"
-            VALUE "ProductVersion", "1.7.17"
+            VALUE "ProductVersion", "1.7.19"
         END
     END
     BLOCK "VarFileInfo"

BioImageOperation/BioImageOperation.vcxproj

@@ -152,7 +152,6 @@ xcopy /y C:\openh264\*.dll $(OutDir)</Command>
     <ClCompile Include="OutputStream.cpp" />
     <ClCompile Include="ParamRange.cpp" />
     <ClCompile Include="PathLink.cpp" />
-    <ClCompile Include="PathNode.cpp" />
     <ClCompile Include="ScriptOperation.cpp" />
     <ClCompile Include="ScriptOperations.cpp" />
     <ClCompile Include="ScriptProcessing.cpp" />
@@ -221,7 +220,6 @@ xcopy /y C:\openh264\*.dll $(OutDir)</Command>
     <ClInclude Include="OutputStream.h" />
     <ClInclude Include="ParamRange.h" />
     <ClInclude Include="PathLink.h" />
-    <ClInclude Include="PathNode.h" />
     <ClInclude Include="resource.h" />
   </ItemGroup>
   <ItemGroup>

BioImageOperation/BioImageOperation.vcxproj.filters

@@ -79,9 +79,6 @@
     <ClCompile Include="PathLink.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="PathNode.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="ScriptOperation.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -219,9 +216,6 @@
     <ClInclude Include="PathLink.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="PathNode.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="ScriptOperation.h">
       <Filter>Header Files</Filter>
     </ClInclude>

BioImageOperation/CMakeLists.txt

@@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 3.10)
 
 string (TIMESTAMP NOW "%Y-%m-%d")
 
-project (BioImageOperation VERSION "1.7.17" DESCRIPTION ${NOW} HOMEPAGE_URL "https://github.com/folterj/BioImageOperation")
+project (BioImageOperation VERSION "1.7.19" DESCRIPTION ${NOW} HOMEPAGE_URL "https://github.com/folterj/BioImageOperation")
 
 configure_file (
     "${PROJECT_SOURCE_DIR}/config.h.in"

BioImageOperation/ColorScale.cpp

@@ -13,6 +13,7 @@
 
 Vec<uchar, 3> ColorScale::grayTable[scaleLength];
 Vec<uchar, 3> ColorScale::heatTable[scaleLength];
+Vec<uchar, 3> ColorScale::blueWhiteRedTable[scaleLength];
 Vec<uchar, 3> ColorScale::rainbowTable[scaleLength];
 Vec<uchar, 3> ColorScale::labelTable[labelLength];
 
@@ -30,9 +31,8 @@ void ColorScale::init() {
 
 		gray = (uchar)((1 - scale) * 0xFF);
 		grayTable[i] = Vec<uchar, 3>(gray, gray, gray);
-
 		heatTable[i] = Util::floatToByteColor(Util::getHeatScale(scale));
-
+		blueWhiteRedTable[i] = Util::floatToByteColor(Util::getBlueWhiteRedScale(scale));
 		rainbowTable[i] = Util::floatToByteColor(Util::getRainbowScale(scale));
 	}
 
@@ -72,6 +72,11 @@ Vec<uchar, 3> ColorScale::getHeatScale(double scale) {
 	return heatTable[i];
 }
 
+Vec<uchar, 3> ColorScale::getBlueWhiteRedScale(double scale) {
+	int i = min(max((int)(scale * scaleLength), 0), scaleLength - 1);
+	return blueWhiteRedTable[i];
+}
+
 Vec<uchar, 3> ColorScale::getRainbowScale(double scale) {
 	int i = min(max((int)(scale * scaleLength), 0), scaleLength - 1);
 	return rainbowTable[i];

BioImageOperation/ColorScale.h

@@ -26,12 +26,14 @@ class ColorScale
 
 	static Vec<uchar, 3> grayTable[];
 	static Vec<uchar, 3> heatTable[];
+	static Vec<uchar, 3> blueWhiteRedTable[];
 	static Vec<uchar, 3> rainbowTable[];
 	static Vec<uchar, 3> labelTable[];
 
 	static void init();
 	static Vec<uchar, 3> getGrayScale(double scale);
 	static Vec<uchar, 3> getHeatScale(double scale);
+	static Vec<uchar, 3> getBlueWhiteRedScale(double scale);
 	static Vec<uchar, 3> getRainbowScale(double scale);
 	static Vec<uchar, 3> getLabelColor(int label);
 };

BioImageOperation/Constants.h

@@ -310,22 +310,18 @@ const vector<string> AccumModes =
 
 enum class PathDrawMode
 {
-	Age,
-	Usage,
-	Usage2,
-	Usage3,
-	Links,
-	LinksMove
+	Count,
+	Time,
+	Paths,
+	Direction
 };
 
 const vector<string> PathDrawModes =
 {
-	"Age",
-	"Usage",
-	"Usage2",
-	"Usage3",
-	"Links",
-	"LinksMove"
+	"Count",
+	"Time",
+	"Paths",
+	"Direction"
 };
 
 enum class DrawPosition

BioImageOperation/FrameSource.cpp

@@ -54,3 +54,7 @@ void FrameSource::calcFrameParams(string start, string length, double fps, int i
 		this->interval = 1;
 	}
 }
+
+int FrameSource::getInterval() {
+	return this->interval;
+}