[Hugin-cvs] SF.net SVN: hugin: [2773] hugin/trunk/platforms/windows/droplets

[<eri...@us...>]

Revision: 2773
          http://hugin.svn.sourceforge.net/hugin/?rev=2773&view=rev
Author:   erik_krause
Date:     2008-02-02 13:58:38 -0800 (Sat, 02 Feb 2008)

Log Message:
-----------


Modified Paths:
--------------
    hugin/trunk/platforms/windows/droplets/collect_data_enblend.bat
    hugin/trunk/platforms/windows/droplets/collect_data_enfuse.bat
    hugin/trunk/platforms/windows/droplets/enfuse_align_droplet.bat
    hugin/trunk/platforms/windows/droplets/enfuse_droplet.bat
    hugin/trunk/platforms/windows/droplets/enfuse_droplet_360.bat
    hugin/trunk/platforms/windows/droplets/readme.txt

Modified: hugin/trunk/platforms/windows/droplets/collect_data_enblend.bat
===================================================================
--- hugin/trunk/platforms/windows/droplets/collect_data_enblend.bat	2008-02-02 21:07:53 UTC (rev 2772)
+++ hugin/trunk/platforms/windows/droplets/collect_data_enblend.bat	2008-02-02 21:58:38 UTC (rev 2773)
@@ -17,4 +17,4 @@
 if "%~1"=="" goto :ready
 goto next_one
 :ready
-echo created by enblend from images %exiftool_ImageNames% 
+echo enblended from %exiftool_ImageNames% 

Modified: hugin/trunk/platforms/windows/droplets/collect_data_enfuse.bat
===================================================================
--- hugin/trunk/platforms/windows/droplets/collect_data_enfuse.bat	2008-02-02 21:07:53 UTC (rev 2772)
+++ hugin/trunk/platforms/windows/droplets/collect_data_enfuse.bat	2008-02-02 21:58:38 UTC (rev 2773)
@@ -17,4 +17,4 @@
 if "%~1"=="" goto :ready
 goto next_one
 :ready
-echo created by enfuse from images %exiftool_ImageNames% with LV range %exiftool_LighValues%
+echo enfused from %exiftool_ImageNames% LV range %exiftool_LighValues%

Modified: hugin/trunk/platforms/windows/droplets/enfuse_align_droplet.bat
===================================================================
--- hugin/trunk/platforms/windows/droplets/enfuse_align_droplet.bat	2008-02-02 21:07:53 UTC (rev 2772)
+++ hugin/trunk/platforms/windows/droplets/enfuse_align_droplet.bat	2008-02-02 21:58:38 UTC (rev 2773)
@@ -23,7 +23,7 @@
         rem Set 1 in next line to 0 if you want result files overwritten if created new
 set use_unique_filename=1
 rem ************* User editable area end
-echo enfuse with align droplet batch file version 0.3.5
+echo enfuse with align droplet batch file version 0.3.6
 echo copyright (c) 2008 Erik Krause - http://www.erik-krause.de
 rem ************* Check working environment
         rem we need command extensions enabled
@@ -66,17 +66,21 @@
 if "%Images_Temp_Dir%"=="" set Images_Temp_Dir=%~dp1
         rem delete temp files
 del "%Images_Temp_Dir%$$$_aligned_$$$????.tif"
-echo align images:
+echo align images...
 align_image_stack.exe %align_additional_parameters% -a "%Images_Temp_Dir%$$$_aligned_$$$" %*
 if errorlevel 1 call :program_failed align_image_stack
         rem fuse the aligned result
-enfuse.exe %enfuse_additional_parameters% -o "%~dpn1_enfused.tif" "%Images_Temp_Dir%$$$_aligned_$$$????.tif"
+set enfuse_result_filename=%~dpn1_enfused.tif
+if "%use_unique_filename%"=="1" (
+  for /F "usebackq delims=" %%i IN (`unique_filename.bat "%enfuse_result_filename%"`) DO set enfuse_result_filename=%%i
+)
+enfuse.exe %enfuse_additional_parameters% -o "%enfuse_result_filename%" "%Images_Temp_Dir%$$$_aligned_$$$????.tif"
 if errorlevel 1 call :program_failed enfuse
         rem inform user
 if "%use_exiftool%"=="1" echo EXIFTool collecting data from %*
         rem call helper batch to collect file names and light values - have them passed to exiftool
 if "%use_exiftool%"=="1" for /F "usebackq delims=" %%i IN (`collect_data_enfuse.bat %*`) DO (
-  exiftool.exe -TagsFromFile "%~1" -@ exiftool_enfuse_args.txt -ImageDescription="%%i" "%~dpn1_enfused.tif" 
+  exiftool.exe -TagsFromFile "%~1" -@ exiftool_enfuse_args.txt -ImageDescription="%%i" "%enfuse_result_filename%" 
 if errorlevel 1 call :program_failed exiftool
 )  
         rem that's all
@@ -106,7 +110,7 @@
 echo @echo off > $$$_enfuse_temp_$$$.bat
 echo REM automatically created batch file for enfuse folder processing>> $$$_enfuse_temp_$$$.bat 
 rem ************* Loop through files
-for /F "usebackq delims=" %%I in (`DIR /B /O:N "%~1\*.jpg"`) do (
+for /F "usebackq delims=" %%I in (`DIR /B /O:%folder_sort_order% "%~1\*.jpg"`) do (
   echo skip %%I | findstr _enfused 
   if errorlevel 1 call :loop "%~1\%%I"
 )  
@@ -118,7 +122,7 @@
         rem init temporary batch file. 
         rem we need this in order to avoid that the created files are included as well
 echo @echo off > $$$_enfuse_temp_$$$.bat
-for /F "usebackq delims=" %%I in (`DIR /B /O:N "%~1\*.tif"`) do (
+for /F "usebackq delims=" %%I in (`DIR /B /O:%folder_sort_order% "%~1\*.tif"`) do (
   echo skip %%I | findstr _enfused 
   if errorlevel 1 call :loop "%~1\%%I"
 )  

Modified: hugin/trunk/platforms/windows/droplets/enfuse_droplet.bat
===================================================================
--- hugin/trunk/platforms/windows/droplets/enfuse_droplet.bat	2008-02-02 21:07:53 UTC (rev 2772)
+++ hugin/trunk/platforms/windows/droplets/enfuse_droplet.bat	2008-02-02 21:58:38 UTC (rev 2773)
@@ -14,7 +14,7 @@
         rem Set 1 in next line to 0 if you want result files overwritten if created new
 set use_unique_filename=1
 rem ************* User editable area end
-echo enfuse with exif droplet batch file version 0.3.5
+echo enfuse with exif droplet batch file version 0.3.6
 echo copyright (c) 2008 Erik Krause - http://www.erik-krause.de
 rem ************* Check working environment
         rem we need command extensions enabled
@@ -53,13 +53,17 @@
 popd
 if not errorlevel 1 goto :IsDir
 rem ************* Enfuse a bunch of files.
-enfuse.exe %enfuse_additional_parameters% -o "%~dpn1_enfused.tif" %*
+set enfuse_result_filename=%~dpn1_enfused.tif
+if "%use_unique_filename%"=="1" (
+  for /F "usebackq delims=" %%i IN (`unique_filename.bat "%enfuse_result_filename%"`) DO set enfuse_result_filename=%%i
+)
+enfuse.exe %enfuse_additional_parameters% -o "%enfuse_result_filename%" %*
 if errorlevel 1 call :program_failed enfuse
         rem inform user
 if "%use_exiftool%"=="1" echo EXIFTool collecting data from %*
         rem call helper batch to collect file names and light values - have them passed to exiftool
 if "%use_exiftool%"=="1" for /F "usebackq delims=" %%i IN (`collect_data_enfuse.bat %*`) DO (
-  exiftool.exe -TagsFromFile "%~1" -@ exiftool_enfuse_args.txt -ImageDescription="%%i" "%~dpn1_enfused.tif" 
+  exiftool.exe -TagsFromFile "%~1" -@ exiftool_enfuse_args.txt -ImageDescription="%%i" "%enfuse_result_filename%" 
 if errorlevel 1 call :program_failed exiftool
 )  
         rem that's all
@@ -88,7 +92,7 @@
 echo REM automatically created batch file for enfuse folder processing>> $$$_enfuse_temp_$$$.bat 
         rem loop over all jpg and tif files in the respective folder 
 rem ************* Loop through files
-for /F "usebackq delims=" %%I in (`DIR /B /O:N "%~1\*.jpg"`) do (
+for /F "usebackq delims=" %%I in (`DIR /B /O:%folder_sort_order% "%~1\*.jpg"`) do (
   echo skip %%I | findstr _enfused 
   if errorlevel 1 call :loop "%~1\%%I"
 )  
@@ -99,7 +103,7 @@
         rem init temporary batch file. 
         rem we need this in order to avoid that the created files are included as well
 echo @echo off > $$$_enfuse_temp_$$$.bat
-for /F "usebackq delims=" %%I in (`DIR /B /O:N "%~1\*.tif"`) do (
+for /F "usebackq delims=" %%I in (`DIR /B /O:%folder_sort_order% "%~1\*.tif"`) do (
   echo skip %%I | findstr _enfused 
   if errorlevel 1 call :loop "%~1\%%I"
 )  

Modified: hugin/trunk/platforms/windows/droplets/enfuse_droplet_360.bat
===================================================================
--- hugin/trunk/platforms/windows/droplets/enfuse_droplet_360.bat	2008-02-02 21:07:53 UTC (rev 2772)
+++ hugin/trunk/platforms/windows/droplets/enfuse_droplet_360.bat	2008-02-02 21:58:38 UTC (rev 2773)
@@ -2,7 +2,7 @@
 rem ************* User editable area start
         rem Specify additional parameters you want to pass to enfuse in the next line 
         rem (must be one line)
-set enfuse_additional_parameters= --wExposure=1 --wSaturation=1 --wContrast=1 -w 
+set enfuse_additional_parameters= --wExposure=1 --wSaturation=1 --wContrast=1 -w
         rem sort order: possible values: 
         rem N  alphabetical by Name, 
         rem S  by size (smallest first)
@@ -14,7 +14,7 @@
         rem Set 1 in next line to 0 if you want result files overwritten if created new
 set use_unique_filename=1
 rem ************* User editable area end
-echo enfuse with exif droplet batch file version 0.3.5
+echo enfuse with exif droplet batch file version 0.3.6
 echo copyright (c) 2008 Erik Krause - http://www.erik-krause.de
 rem ************* Check working environment
         rem we need command extensions enabled
@@ -53,13 +53,17 @@
 popd
 if not errorlevel 1 goto :IsDir
 rem ************* Enfuse a bunch of files.
-enfuse.exe %enfuse_additional_parameters% -o "%~dpn1_enfused.tif" %*
+set enfuse_result_filename=%~dpn1_enfused.tif
+if "%use_unique_filename%"=="1" (
+  for /F "usebackq delims=" %%i IN (`unique_filename.bat "%enfuse_result_filename%"`) DO set enfuse_result_filename=%%i
+)
+enfuse.exe %enfuse_additional_parameters% -o "%enfuse_result_filename%" %*
 if errorlevel 1 call :program_failed enfuse
         rem inform user
 if "%use_exiftool%"=="1" echo EXIFTool collecting data from %*
         rem call helper batch to collect file names and light values - have them passed to exiftool
 if "%use_exiftool%"=="1" for /F "usebackq delims=" %%i IN (`collect_data_enfuse.bat %*`) DO (
-  exiftool.exe -TagsFromFile "%~1" -@ exiftool_enfuse_args.txt -ImageDescription="%%i" "%~dpn1_enfused.tif" 
+  exiftool.exe -TagsFromFile "%~1" -@ exiftool_enfuse_args.txt -ImageDescription="%%i" "%enfuse_result_filename%" 
 if errorlevel 1 call :program_failed exiftool
 )  
         rem that's all
@@ -88,7 +92,7 @@
 echo REM automatically created batch file for enfuse folder processing>> $$$_enfuse_temp_$$$.bat 
         rem loop over all jpg and tif files in the respective folder 
 rem ************* Loop through files
-for /F "usebackq delims=" %%I in (`DIR /B /O:N "%~1\*.jpg"`) do (
+for /F "usebackq delims=" %%I in (`DIR /B /O:%folder_sort_order% "%~1\*.jpg"`) do (
   echo skip %%I | findstr _enfused 
   if errorlevel 1 call :loop "%~1\%%I"
 )  
@@ -99,7 +103,7 @@
         rem init temporary batch file. 
         rem we need this in order to avoid that the created files are included as well
 echo @echo off > $$$_enfuse_temp_$$$.bat
-for /F "usebackq delims=" %%I in (`DIR /B /O:N "%~1\*.tif"`) do (
+for /F "usebackq delims=" %%I in (`DIR /B /O:%folder_sort_order% "%~1\*.tif"`) do (
   echo skip %%I | findstr _enfused 
   if errorlevel 1 call :loop "%~1\%%I"
 )  

Modified: hugin/trunk/platforms/windows/droplets/readme.txt
===================================================================
--- hugin/trunk/platforms/windows/droplets/readme.txt	2008-02-02 21:07:53 UTC (rev 2772)
+++ hugin/trunk/platforms/windows/droplets/readme.txt	2008-02-02 21:58:38 UTC (rev 2773)
@@ -116,7 +116,8 @@
 v 0.3.5 - 27. Jan 2008, omit own result images, don't overwrite result
                         images (count up), process .tif and .jpg
                         separately (folders processing only)
-
+v 0.3.6 - 2. Feb 2008,  don't overwrite result images (count up) in
+                        drop images mode.
 best regards
 Erik Krause
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.