Make camera plugins use the shared log4net.

Trawacho · Jul 27, 2024 · 3102138 · 3102138
1 parent dce2f94
commit 3102138
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 3 deletions.
diff --git a/Kinovea.Camera.Basler/Kinovea.Camera.Basler.csproj b/Kinovea.Camera.Basler/Kinovea.Camera.Basler.csproj
@@ -109,6 +109,7 @@
   <ItemGroup>
     <Reference Include="log4net">
       <HintPath>..\packages\log4net.2.0.14\lib\net45\log4net.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="PylonC.NET, Version=4.2.0.0, Culture=neutral, PublicKeyToken=a77e8471c5919d5a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

diff --git a/Kinovea.Camera.Baumer/Kinovea.Camera.Baumer.csproj b/Kinovea.Camera.Baumer/Kinovea.Camera.Baumer.csproj
@@ -64,6 +64,7 @@
     </Reference>
     <Reference Include="log4net">
       <HintPath>..\packages\log4net.2.0.14\lib\net45\log4net.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/Kinovea.Camera.Daheng/Kinovea.Camera.Daheng.csproj b/Kinovea.Camera.Daheng/Kinovea.Camera.Daheng.csproj
@@ -81,6 +81,7 @@
     </Reference>
     <Reference Include="log4net">
       <HintPath>..\packages\log4net.2.0.14\lib\net45\log4net.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/Kinovea.Camera.DirectShow/Kinovea.Camera.DirectShow.csproj b/Kinovea.Camera.DirectShow/Kinovea.Camera.DirectShow.csproj
@@ -122,6 +122,7 @@
     </Reference>
     <Reference Include="log4net">
       <HintPath>..\packages\log4net.2.0.14\lib\net45\log4net.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />

diff --git a/Kinovea.Camera.FrameGenerator/Kinovea.Camera.FrameGenerator.csproj b/Kinovea.Camera.FrameGenerator/Kinovea.Camera.FrameGenerator.csproj
@@ -88,6 +88,7 @@
     <Reference Include="log4net, Version=2.0.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\log4net.2.0.14\lib\net45\log4net.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Drawing" />

diff --git a/Kinovea.Camera.GenICam/Configuration/CameraPropertyManager.cs b/Kinovea.Camera.GenICam/Configuration/CameraPropertyManager.cs
@@ -379,8 +379,8 @@ private static CameraProperty ReadIntegerProperty(Device device, string symbol,
             p.Maximum = max.ToString(CultureInfo.InvariantCulture);
             p.Step = step.ToString(CultureInfo.InvariantCulture);
             p.CurrentValue = currentValue.ToString(CultureInfo.InvariantCulture);
-
-            log.DebugFormat("Read GenICam property {0}", p);
+            
+            log.DebugFormat("Read GenICam property: \"{0}\"", symbol);
 
             return p;
         }
@@ -425,7 +425,7 @@ private static CameraProperty ReadFloatProperty(Device device, string symbol)
             p.Representation = ConvertRepresentation(repr);
             p.CurrentValue = currentValue.ToString(CultureInfo.InvariantCulture);
 
-            log.DebugFormat("Read GenICam property {0}", p);
+            log.DebugFormat("Read GenICam property: \"{0}\"", symbol);
 
             return p;
         }
@@ -605,6 +605,7 @@ public static bool ExecuteCommand(Device device, string command)
             try
             {
                 node.Execute();
+                log.DebugFormat("Executed command: \"{0}\"", command);
                 result = true;
             }
             catch (BGAPI2.Exceptions.ErrorException e)

diff --git a/Kinovea.Camera.GenICam/Kinovea.Camera.GenICam.csproj b/Kinovea.Camera.GenICam/Kinovea.Camera.GenICam.csproj
@@ -40,6 +40,7 @@
     <Reference Include="log4net, Version=2.0.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\log4net.2.0.14\lib\net45\log4net.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/Kinovea.Camera.HTTP/Kinovea.Camera.HTTP.csproj b/Kinovea.Camera.HTTP/Kinovea.Camera.HTTP.csproj
@@ -102,6 +102,7 @@
     </Reference>
     <Reference Include="log4net">
       <HintPath>..\packages\log4net.2.0.14\lib\net45\log4net.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Drawing" />

diff --git a/Kinovea.Camera.IDS/Kinovea.Camera.IDS.csproj b/Kinovea.Camera.IDS/Kinovea.Camera.IDS.csproj
@@ -94,6 +94,7 @@
   <ItemGroup>
     <Reference Include="log4net">
       <HintPath>..\packages\log4net.2.0.14\lib\net45\log4net.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Drawing" />