Menu
▾
▴
hugin-cvs
|
From: <bru...@us...> - 2009-02-11 20:55:39
|
Revision: 3641
http://hugin.svn.sourceforge.net/hugin/?rev=3641&view=rev
Author: brunopostle
Date: 2009-02-11 20:55:34 +0000 (Wed, 11 Feb 2009)
Log Message:
-----------
Define some variables in the .pto.mk file to give plugin Makefiles hints about
what kind of panorama it is: HUGIN_PROJECTION HUGIN_HFOV HUGIN_WIDTH
HUGIN_HEIGHT DO_LDR_BLENDED DO_LDR_STACKED_BLENDED DO_HDR_BLENDED. Use them in
the example plugin Makefile.
Modified Paths:
--------------
hugin/trunk/src/hugin1/hugin/Makefile.equirect.mk
hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp
Modified: hugin/trunk/src/hugin1/hugin/Makefile.equirect.mk
===================================================================
--- hugin/trunk/src/hugin1/hugin/Makefile.equirect.mk 2009-02-11 12:45:16 UTC (rev 3640)
+++ hugin/trunk/src/hugin1/hugin/Makefile.equirect.mk 2009-02-11 20:55:34 UTC (rev 3641)
@@ -11,14 +11,19 @@
# hugin (nona)
# Image::ExifTool (exiftool)
+include $(PTO).mk
+
JPEG_QUALITY = 70
-GEOMETRY = 1280x1280
+GEOMETRY = $(HUGIN_WIDTH)x$(HUGIN_WIDTH)
+
+ifdef DO_LDR_BLENDED
+FUSED_SUFFIX =
+else
FUSED_SUFFIX = _fused
+endif
equirect_all : qtvr sky planet mercator
-include $(PTO).mk
-
.PHONY: equirect_all layered psd qtvr preview panosalado vrml x3d spiv sky planet mercator equirect_clean faces_clean sky_clean planet_clean mercator_clean
.SECONDARY: $(LDR_EXPOSURE_LAYERS_REMAPPED) $(LDR_STACKS) $(LDR_LAYERS)
@@ -277,8 +282,8 @@
$(EXIFTOOL) -overwrite_original_in_place -TagsFromFile $(INPUT_IMAGE_1_SHELL) \
$(EXIFTOOL_COPY_ARGS) $(JPEG_MERCATOR_SHELL)
-# some PHONY targets
-
+# This Makefile is only useful for equirectangular
+ifeq ($(HUGIN_PROJECTION),2)
faces : $(JPEG_FACES)
qtvr : $(MOV)
spiv : $(SPIV_CUBE)
@@ -289,6 +294,9 @@
sky : $(JPEG_SKY)
planet : $(JPEG_PLANET)
mercator : $(JPEG_MERCATOR)
+else
+equirect_all faces qtvr spiv panosalado vrml x3d preview sky planet mercator :
+endif
# cleanup
Modified: hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp
===================================================================
--- hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp 2009-02-11 12:45:16 UTC (rev 3640)
+++ hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp 2009-02-11 20:55:34 UTC (rev 3641)
@@ -217,6 +217,13 @@
// << "endif" << endl
// << endl
+ << "# Project parameters" << endl
+ << "HUGIN_PROJECTION=" << opts.getProjection() << endl
+ << "HUGIN_HFOV=" << opts.getHFOV() << endl
+ << "HUGIN_WIDTH=" << opts.getWidth() << endl
+ << "HUGIN_HEIGHT=" << opts.getHeight() << endl
+ << endl
+
<< "# options for the programs" << endl << endl;
o << "NONA_LDR_REMAPPED_COMP=";
@@ -599,6 +606,7 @@
if (opts.outputLDRBlended) {
targets += "$(LDR_BLENDED) ";
outputFiles.push_back(sLDR_BLENDED);
+ o << "DO_LDR_BLENDED = 1" << endl;
// depends on remapped ldr images and stacked ldr images
if (! opts.outputLDRLayers) {
outputFiles.insert(outputFiles.end(), remappedImages.begin(), remappedImages.end());
@@ -628,6 +636,7 @@
if (opts.outputLDRExposureBlended) {
targets += " $(LDR_STACKED_BLENDED) ";
outputFiles.push_back(sLDR_STACKED_BLENDED);
+ o << "DO_LDR_STACKED_BLENDED = 1" << endl;
outputFiles.insert(outputFiles.end(),ldrStackedImages.begin(), ldrStackedImages.end());
// always clean temp files used by exposure stacks
cleanTargets += "$(LDR_STACKS_SHELL) ";
@@ -656,6 +665,7 @@
if (opts.outputHDRBlended) {
targets += "$(HDR_BLENDED) ";
outputFiles.push_back(sHDR_BLENDED);
+ o << "DO_HDR_BLENDED = 1" << endl;
if (!opts.outputHDRStacks) {
outputFiles.insert(outputFiles.end(),stackedImages.begin(), stackedImages.end());
cleanTargets += "$(HDR_STACKS_SHELL) ";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st...@us...> - 2009-02-13 15:51:01
|
Revision: 3645
http://hugin.svn.sourceforge.net/hugin/?rev=3645&view=rev
Author: stativ
Date: 2009-02-13 15:50:55 +0000 (Fri, 13 Feb 2009)
Log Message:
-----------
Use home directory for storing PTBatcher batch queue instead of temp dir which caused quite serious security problems.
Modified Paths:
--------------
hugin/trunk/src/PTBatcher/Batch.cpp
hugin/trunk/src/PTBatcherGUI/BatchFrame.cpp
hugin/trunk/src/hugin1/hugin/PanoPanel.cpp
Modified: hugin/trunk/src/PTBatcher/Batch.cpp
===================================================================
--- hugin/trunk/src/PTBatcher/Batch.cpp 2009-02-12 16:35:15 UTC (rev 3644)
+++ hugin/trunk/src/PTBatcher/Batch.cpp 2009-02-13 15:50:55 UTC (rev 3645)
@@ -24,7 +24,8 @@
*
*/
-#include "Batch.h"
+#include "Batch.h"
+#include <wx/stdpaths.h>
BEGIN_EVENT_TABLE(Batch, wxFrame)
EVT_END_PROCESS(-1, Batch::OnProcessTerminate)
@@ -398,9 +399,9 @@
int Batch::LoadTemp()
{
- wxDir* workingDir = new wxDir(wxFileName::GetTempDir());
+ wxDir* workingDir = new wxDir(wxStandardPaths::Get().GetUserConfigDir());
wxString pending;
- wxString fileTemp = _T("~ptbt*");
+ wxString fileTemp = _T(".ptbt*");
wxString temp = _T("");
//we check for existing temporary files
if(workingDir->GetFirst(&temp,fileTemp,wxDIR_FILES))
@@ -879,8 +880,8 @@
void Batch::SaveTemp()
{
//wxMessageBox( _T("saving temp file"),_T(""),wxOK | wxICON_INFORMATION );
- wxDir* workingDir = new wxDir(wxFileName::GetTempDir());
- wxString fileTemp = _T("~ptbt*");
+ wxDir* workingDir = new wxDir(wxStandardPaths::Get().GetUserConfigDir());
+ wxString fileTemp = _T(".ptbt*");
//we get the old temp file
fileTemp = workingDir->FindFirst(workingDir->GetName(),fileTemp,wxDIR_FILES);
wxFileName oldFile(fileTemp);
@@ -890,7 +891,7 @@
suffix = _T("1");
else
suffix = _T("0");
- SaveBatchFile(wxFileName::GetTempDir()+wxFileName::GetPathSeparator()+_T("~ptbt")+suffix);
+ SaveBatchFile(wxStandardPaths::Get().GetUserConfigDir()+wxFileName::GetPathSeparator()+_T(".ptbt")+suffix);
if(verbose && !gui)
cout << "Saved temp file." << endl;
//we remove the previous temp file
Modified: hugin/trunk/src/PTBatcherGUI/BatchFrame.cpp
===================================================================
--- hugin/trunk/src/PTBatcherGUI/BatchFrame.cpp 2009-02-12 16:35:15 UTC (rev 3644)
+++ hugin/trunk/src/PTBatcherGUI/BatchFrame.cpp 2009-02-13 15:50:55 UTC (rev 3645)
@@ -25,6 +25,7 @@
*/
#include "BatchFrame.h"
+#include <wx/stdpaths.h>
//#include "PTBatcherGUI.h"
BEGIN_EVENT_TABLE(BatchFrame, wxFrame)
@@ -247,10 +248,10 @@
//we define the working dir to search in and the file name syntax of the spool files
//wxMessageBox( _T("new file received1"),_T("new file received1"),wxOK | wxICON_INFORMATION );
- wxDir* workingDir = new wxDir(wxFileName::GetTempDir());
- wxString fileSent = _T("~ptbs*");
+ wxDir* workingDir = new wxDir(wxStandardPaths::Get().GetUserConfigDir());
+ wxString fileSent = _T(".ptbs*");
wxString pending;
- /*wxString fileTemp = _T("~ptbt*");
+ /*wxString fileTemp = _T(".ptbt*");
wxString temp = _T("");
//we check for existing temporary files
if(workingDir->GetFirst(&temp,fileTemp,wxDIR_FILES))
Modified: hugin/trunk/src/hugin1/hugin/PanoPanel.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/PanoPanel.cpp 2009-02-12 16:35:15 UTC (rev 3644)
+++ hugin/trunk/src/hugin1/hugin/PanoPanel.cpp 2009-02-13 15:50:55 UTC (rev 3645)
@@ -26,6 +26,7 @@
*/
#include <config.h>
+#include <wx/stdpaths.h>
#include "panoinc_WX.h"
#include "panoinc.h"
@@ -1032,12 +1033,12 @@
if(wxFileName::FileExists(projectFile))
{
int i=0;
- wxString batchFileName = wxFileName::GetTempDir()+wxFileName::GetPathSeparator();
- batchFileName = batchFileName.Append(_T("~ptbs")) << i;
+ wxString batchFileName = wxStandardPaths::Get().GetUserConfigDir()+wxFileName::GetPathSeparator();
+ batchFileName = batchFileName.Append(_T(".ptbs")) << i;
while(wxFileName::FileExists(batchFileName)){
i++;
- batchFileName = wxFileName::GetTempDir()+wxFileName::GetPathSeparator();
- batchFileName = batchFileName.Append(_T("~ptbs")) << i;
+ batchFileName = wxStandardPaths::Get().GetUserConfigDir()+wxFileName::GetPathSeparator();
+ batchFileName = batchFileName.Append(_T(".ptbs")) << i;
}
wxFile batchFile;
batchFile.Create(batchFileName);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st...@us...> - 2009-03-01 09:28:58
|
Revision: 3693
http://hugin.svn.sourceforge.net/hugin/?rev=3693&view=rev
Author: stativ
Date: 2009-03-01 09:28:57 +0000 (Sun, 01 Mar 2009)
Log Message:
-----------
Changed wxConvUTF8 in PTBatcher to wxConvLocal. It should fix problems with non ASCII characters under Windows.
Modified Paths:
--------------
hugin/trunk/src/PTBatcher/PTBatcher.cpp
hugin/trunk/src/hugin1/hugin/PanoPanel.cpp
Modified: hugin/trunk/src/PTBatcher/PTBatcher.cpp
===================================================================
--- hugin/trunk/src/PTBatcher/PTBatcher.cpp 2009-03-01 08:05:46 UTC (rev 3692)
+++ hugin/trunk/src/PTBatcher/PTBatcher.cpp 2009-03-01 09:28:57 UTC (rev 3693)
@@ -173,7 +173,7 @@
return 1;
}
batch->LoadTemp();
- batch->AddProjectToBatch(wxString(input.c_str(), wxConvUTF8),wxString(output.c_str(), wxConvUTF8));
+ batch->AddProjectToBatch(wxString(input.c_str(), wxConvLocal),wxString(output.c_str(), wxConvLocal));
if(output == "")
cout << "Added project " << input << " with output " << output << endl;
else
Modified: hugin/trunk/src/hugin1/hugin/PanoPanel.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/PanoPanel.cpp 2009-03-01 08:05:46 UTC (rev 3692)
+++ hugin/trunk/src/hugin1/hugin/PanoPanel.cpp 2009-03-01 09:28:57 UTC (rev 3693)
@@ -1043,7 +1043,7 @@
}
wxFile batchFile;
batchFile.Create(batchFileName);
- batchFile.Write(projectFile,wxConvUTF8);
+ batchFile.Write(projectFile,wxConvLocal);
batchFile.Close();
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bru...@us...> - 2009-03-01 22:47:23
|
Revision: 3694
http://hugin.svn.sourceforge.net/hugin/?rev=3694&view=rev
Author: brunopostle
Date: 2009-03-01 22:47:11 +0000 (Sun, 01 Mar 2009)
Log Message:
-----------
Add 'Reset...' button to Camera and Lens tab + 8 new translation strings (Thomas Modes)
Modified Paths:
--------------
hugin/trunk/src/hugin1/hugin/CMakeLists.txt
hugin/trunk/src/hugin1/hugin/LensPanel.cpp
hugin/trunk/src/hugin1/hugin/LensPanel.h
hugin/trunk/src/hugin1/hugin/huginApp.cpp
hugin/trunk/src/hugin1/hugin/xrc/CMakeLists.txt
hugin/trunk/src/hugin1/hugin/xrc/lens_panel.xrc
hugin/trunk/src/hugin_base/panodata/SrcPanoImage.cpp
hugin/trunk/src/hugin_base/panodata/SrcPanoImage.h
hugin/trunk/src/translations/bg.po
hugin/trunk/src/translations/ca_ES.po
hugin/trunk/src/translations/cs_CZ.po
hugin/trunk/src/translations/de.po
hugin/trunk/src/translations/en_GB.po
hugin/trunk/src/translations/es.po
hugin/trunk/src/translations/fr.po
hugin/trunk/src/translations/hu.po
hugin/trunk/src/translations/hugin.pot
hugin/trunk/src/translations/it.po
hugin/trunk/src/translations/ja.po
hugin/trunk/src/translations/ko.po
hugin/trunk/src/translations/nl.po
hugin/trunk/src/translations/pl.po
hugin/trunk/src/translations/pt_BR.po
hugin/trunk/src/translations/ru.po
hugin/trunk/src/translations/sk.po
hugin/trunk/src/translations/sv.po
hugin/trunk/src/translations/uk.po
hugin/trunk/src/translations/zh_CN.po
Added Paths:
-----------
hugin/trunk/src/hugin1/hugin/ResetDialog.cpp
hugin/trunk/src/hugin1/hugin/ResetDialog.h
hugin/trunk/src/hugin1/hugin/xrc/reset_dialog.xrc
Modified: hugin/trunk/src/hugin1/hugin/CMakeLists.txt
===================================================================
--- hugin/trunk/src/hugin1/hugin/CMakeLists.txt 2009-03-01 09:28:57 UTC (rev 3693)
+++ hugin/trunk/src/hugin1/hugin/CMakeLists.txt 2009-03-01 22:47:11 UTC (rev 3694)
@@ -27,7 +27,7 @@
ImagesPanel.cpp CommandHistory.cpp PanoPanel.cpp NonaOptionsDialog.cpp
PreviewFrame.cpp PreviewPanel.cpp GLPreviewFrame.cpp GLViewer.cpp GLRenderer.cpp
CropPanel.cpp OptimizePhotometricPanel.cpp OptimizePanel.cpp CPListFrame.cpp
-TextKillFocusHandler.cpp PanoDruid.cpp PreferencesDialog.cpp
+TextKillFocusHandler.cpp PanoDruid.cpp PreferencesDialog.cpp ResetDialog.cpp
LocalizedFileTipProvider.cpp wxPanoCommand.cpp AssistantPanel.cpp
HFOVDialog.cpp TextureManager.cpp MeshRemapper.cpp VertexCoordRemapper.cpp
TexCoordRemapper.cpp ChoosyRemapper.cpp MeshManager.cpp ViewState.cpp
Modified: hugin/trunk/src/hugin1/hugin/LensPanel.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/LensPanel.cpp 2009-03-01 09:28:57 UTC (rev 3693)
+++ hugin/trunk/src/hugin1/hugin/LensPanel.cpp 2009-03-01 22:47:11 UTC (rev 3694)
@@ -49,6 +49,7 @@
#include "hugin/TextKillFocusHandler.h"
#include "hugin/wxPanoCommand.h"
//#include "hugin/VigCorrDialog.h"
+#include "hugin/ResetDialog.h"
using namespace PT;
@@ -104,6 +105,7 @@
EVT_BUTTON ( XRCID("lens_button_load"), LensPanel::OnLoadLensParameters )
EVT_BUTTON ( XRCID("lens_button_newlens"), LensPanel::OnNewLens )
EVT_BUTTON ( XRCID("lens_button_changelens"), LensPanel::OnChangeLens )
+ EVT_BUTTON ( XRCID("lens_button_reset"), LensPanel::OnReset )
EVT_CHECKBOX ( XRCID("lens_inherit_v"), LensPanel::OnVarInheritChanged )
EVT_CHECKBOX ( XRCID("lens_inherit_a"), LensPanel::OnVarInheritChanged )
EVT_CHECKBOX ( XRCID("lens_inherit_b"), LensPanel::OnVarInheritChanged )
@@ -353,6 +355,10 @@
} else if (m_selectedImages.size() == 0) {
UpdateLensDisplay();
}
+ if(pano.getNrOfImages()>0)
+ XRCCTRL(*this, "lens_button_reset", wxButton)->Enable();
+ else
+ XRCCTRL(*this, "lens_button_reset", wxButton)->Disable();
}
@@ -1112,6 +1118,103 @@
}
}
+void LensPanel::OnReset(wxCommandEvent & e)
+{
+ ResetDialog reset_dlg(this);
+ if(reset_dlg.ShowModal()==wxID_OK)
+ {
+ //reset
+ UIntSet selImg = images_list->GetSelected();
+ if ( selImg.size() < 1) {
+ // add all images.
+ selImg.clear();
+ unsigned int nImg = pano->getNrOfImages();
+ for (unsigned int i=0; i < nImg; i++) {
+ selImg.insert(i);
+ }
+ }
+
+ if (selImg.size() == 0) {
+ return;
+ }
+ VariableMapVector vars;
+ for(UIntSet::const_iterator it = selImg.begin(); it != selImg.end(); it++)
+ {
+ unsigned int imgNr = *it;
+ VariableMap ImgVars=pano->getImageVariables(imgNr);
+ if(reset_dlg.GetResetPos())
+ {
+ map_get(ImgVars,"y").setValue(0);
+ map_get(ImgVars,"p").setValue(0);
+ map_get(ImgVars,"r").setValue(0);
+ };
+ double cropFactor = 0;
+ double focalLength = 0;
+ double eV = 0;
+ SrcPanoImage srcImg = pano->getSrcImage(imgNr);
+ if(reset_dlg.GetResetFOV() || reset_dlg.GetResetExposure())
+ srcImg.readEXIF(focalLength,cropFactor,eV,false);
+ if(reset_dlg.GetResetFOV())
+ {
+ if(focalLength!=0&&cropFactor!=0)
+ {
+ double newHFOV=calcHFOV(srcImg.getProjection(),focalLength,cropFactor,srcImg.getSize());
+ if(newHFOV!=0)
+ map_get(ImgVars,"v").setValue(newHFOV);
+ };
+ };
+ if(reset_dlg.GetResetLens())
+ {
+ map_get(ImgVars,"a").setValue(0);
+ map_get(ImgVars,"b").setValue(0);
+ map_get(ImgVars,"c").setValue(0);
+ map_get(ImgVars,"d").setValue(0);
+ map_get(ImgVars,"e").setValue(0);
+ map_get(ImgVars,"g").setValue(0);
+ map_get(ImgVars,"t").setValue(0);
+ };
+ if(reset_dlg.GetResetExposure())
+ {
+ if(reset_dlg.GetResetExposureToExif())
+ {
+ //reset to exif value
+ if(eV!=0)
+ map_get(ImgVars,"Eev").setValue(eV);
+ }
+ else
+ {
+ //reset to zero
+ map_get(ImgVars,"Eev").setValue(0);
+ };
+ };
+ if(reset_dlg.GetResetColor())
+ {
+ map_get(ImgVars,"Er").setValue(1);
+ map_get(ImgVars,"Eb").setValue(1);
+ };
+ if(reset_dlg.GetResetVignetting())
+ {
+ map_get(ImgVars,"Vb").setValue(0);
+ map_get(ImgVars,"Vc").setValue(0);
+ map_get(ImgVars,"Vd").setValue(0);
+ map_get(ImgVars,"Vx").setValue(0);
+ map_get(ImgVars,"Vy").setValue(0);
+
+ };
+ if(reset_dlg.GetResetResponse())
+ {
+ map_get(ImgVars,"Ra").setValue(0);
+ map_get(ImgVars,"Rb").setValue(0);
+ map_get(ImgVars,"Rc").setValue(0);
+ map_get(ImgVars,"Rd").setValue(0);
+ map_get(ImgVars,"Re").setValue(0);
+ };
+ vars.push_back(ImgVars);
+ };
+ GlobalCmdHist::getInstance().addCommand(new PT::UpdateImagesVariablesCmd(*pano, selImg,vars));
+ }
+};
+
const char *LensPanel::m_varNames[] = { "v", "a", "b", "c", "d", "e", "g", "t",
"Eev", "Er", "Eb",
"Vb", "Vc", "Vd", "Vx", "Vy",
Modified: hugin/trunk/src/hugin1/hugin/LensPanel.h
===================================================================
--- hugin/trunk/src/hugin1/hugin/LensPanel.h 2009-03-01 09:28:57 UTC (rev 3693)
+++ hugin/trunk/src/hugin1/hugin/LensPanel.h 2009-03-01 22:47:11 UTC (rev 3694)
@@ -115,6 +115,10 @@
*/
void OnNewLens(wxCommandEvent & e);
+ /** reset lens parameters
+ */
+ void OnReset(wxCommandEvent & e);
+
/** catches changes to the list selection */
void ListSelectionChanged(wxListEvent& e);
Added: hugin/trunk/src/hugin1/hugin/ResetDialog.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/ResetDialog.cpp (rev 0)
+++ hugin/trunk/src/hugin1/hugin/ResetDialog.cpp 2009-03-01 22:47:11 UTC (rev 3694)
@@ -0,0 +1,124 @@
+#include "hugin/ResetDialog.h"
+#include "common/wxPlatform.h"
+
+#include "hugin/huginApp.h"
+
+BEGIN_EVENT_TABLE(ResetDialog,wxDialog)
+ EVT_BUTTON(wxID_OK, ResetDialog::OnOk)
+ EVT_CHECKBOX(XRCID("reset_exposure"), ResetDialog::OnSelectExposure)
+END_EVENT_TABLE()
+
+ResetDialog::ResetDialog(wxWindow *parent)
+{
+ // load our children. some children might need special
+ // initialization. this will be done later.
+ wxXmlResource::Get()->LoadDialog(this, parent, wxT("reset_dialog"));
+
+#ifdef __WXMSW__
+ wxIcon myIcon(MainFrame::Get()->GetXRCPath() + wxT("data/icon.ico"),wxBITMAP_TYPE_ICO);
+#else
+ wxIcon myIcon(MainFrame::Get()->GetXRCPath() + wxT("data/icon.png"),wxBITMAP_TYPE_PNG);
+#endif
+ SetIcon(myIcon);
+ //set parameters
+ wxConfigBase * cfg = wxConfigBase::Get();
+ bool check;
+ cfg->Read(wxT("/ResetDialog/ResetPosition"),&check,true);
+ XRCCTRL(*this,"reset_pos",wxCheckBox)->SetValue(check);
+ cfg->Read(wxT("/ResetDialog/ResetFOV"),&check,true);
+ XRCCTRL(*this,"reset_fov",wxCheckBox)->SetValue(check);
+ cfg->Read(wxT("/ResetDialog/ResetLens"),&check,true);
+ XRCCTRL(*this,"reset_lens",wxCheckBox)->SetValue(check);
+ cfg->Read(wxT("/ResetDialog/ResetExposure"),&check,true);
+ XRCCTRL(*this,"reset_exposure",wxCheckBox)->SetValue(check);
+ int exp_param;
+ cfg->Read(wxT("/ResetDialog/ResetExposureParam"),&exp_param,0);
+ XRCCTRL(*this,"combo_exposure",wxComboBox)->Select(exp_param);
+ cfg->Read(wxT("/ResetDialog/ResetColor"),&check,true);
+ XRCCTRL(*this,"reset_color",wxCheckBox)->SetValue(check);
+ cfg->Read(wxT("/ResetDialog/ResetVignetting"),&check,true);
+ XRCCTRL(*this,"reset_vignetting",wxCheckBox)->SetValue(check);
+ cfg->Read(wxT("/ResetDialog/ResetResponse"),&check,true);
+ XRCCTRL(*this,"reset_response",wxCheckBox)->SetValue(check);
+ //position
+ int x = cfg->Read(wxT("/ResetDialog/positionX"),-1l);
+ int y = cfg->Read(wxT("/ResetDialog/positionY"),-1l);
+ if ( y >= 0 && x >= 0)
+ {
+ this->Move(x, y);
+ }
+ else
+ {
+ this->Move(0, 44);
+ };
+};
+
+void ResetDialog::OnOk(wxCommandEvent & e)
+{
+ wxConfigBase * cfg = wxConfigBase::Get();
+ wxPoint ps = this->GetPosition();
+ cfg->Write(wxT("/ResetDialog/positionX"), ps.x);
+ cfg->Write(wxT("/ResetDialog/positionY"), ps.y);
+ cfg->Write(wxT("/ResetDialog/ResetPosition"),GetResetPos());
+ cfg->Write(wxT("/ResetDialog/ResetFOV"),GetResetFOV());
+ cfg->Write(wxT("/ResetDialog/ResetLens"),GetResetLens());
+ cfg->Write(wxT("/ResetDialog/ResetExposure"),GetResetExposure());
+ int exp_param;
+ exp_param=XRCCTRL(*this,"combo_exposure",wxComboBox)->GetSelection();
+ cfg->Write(wxT("/ResetDialog/ResetExposureParam"),exp_param);
+ cfg->Write(wxT("/ResetDialog/ResetColor"),GetResetColor());
+ cfg->Write(wxT("/ResetDialog/ResetVignetting"),GetResetVignetting());
+ cfg->Write(wxT("/ResetDialog/ResetResponse"),GetResetResponse());
+ cfg->Flush();
+ e.Skip();
+};
+
+void ResetDialog::OnSelectExposure(wxCommandEvent & e)
+{
+ if(XRCCTRL(*this, "reset_exposure", wxCheckBox)->GetValue())
+ XRCCTRL(*this,"combo_exposure",wxComboBox)->Enable();
+ else
+ XRCCTRL(*this,"combo_exposure",wxComboBox)->Disable();
+};
+
+bool ResetDialog::GetResetPos()
+{
+ return XRCCTRL(*this, "reset_pos", wxCheckBox)->GetValue();
+};
+
+bool ResetDialog::GetResetFOV()
+{
+ return XRCCTRL(*this, "reset_fov", wxCheckBox)->GetValue();
+};
+
+bool ResetDialog::GetResetLens()
+{
+ return XRCCTRL(*this, "reset_lens", wxCheckBox)->GetValue();
+};
+
+bool ResetDialog::GetResetExposure()
+{
+ return XRCCTRL(*this, "reset_exposure", wxCheckBox)->GetValue();
+};
+
+bool ResetDialog::GetResetExposureToExif()
+{
+ if(!GetResetExposure())
+ return false;
+ return XRCCTRL(*this, "combo_exposure", wxComboBox)->GetSelection()==0;
+};
+
+bool ResetDialog::GetResetColor()
+{
+ return XRCCTRL(*this, "reset_color", wxCheckBox)->GetValue();
+};
+
+bool ResetDialog::GetResetVignetting()
+{
+ return XRCCTRL(*this, "reset_vignetting", wxCheckBox)->GetValue();
+};
+
+bool ResetDialog::GetResetResponse()
+{
+ return XRCCTRL(*this, "reset_response", wxCheckBox)->GetValue();
+};
Added: hugin/trunk/src/hugin1/hugin/ResetDialog.h
===================================================================
--- hugin/trunk/src/hugin1/hugin/ResetDialog.h (rev 0)
+++ hugin/trunk/src/hugin1/hugin/ResetDialog.h 2009-03-01 22:47:11 UTC (rev 3694)
@@ -0,0 +1,48 @@
+// -*- c-basic-offset: 4 -*-
+/** @file ResetDialog.h
+ *
+ *
+ * This is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this software; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#ifndef _RESETDIALOG_H
+#define _RESETDIALOG_H
+
+#include "panoinc_WX.h"
+
+class ResetDialog : public wxDialog
+{
+public:
+ // ctor.
+ ResetDialog(wxWindow *parent);
+ bool GetResetPos();
+ bool GetResetFOV();
+ bool GetResetLens();
+ bool GetResetExposure();
+ bool GetResetExposureToExif();
+ bool GetResetColor();
+ bool GetResetVignetting();
+ bool GetResetResponse();
+
+protected:
+ void OnSelectExposure(wxCommandEvent & e);
+ void OnOk(wxCommandEvent & e);
+
+private:
+ DECLARE_EVENT_TABLE()
+};
+
+#endif //_RESETDIALOG_H
Modified: hugin/trunk/src/hugin1/hugin/huginApp.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/huginApp.cpp 2009-03-01 09:28:57 UTC (rev 3693)
+++ hugin/trunk/src/hugin1/hugin/huginApp.cpp 2009-03-01 22:47:11 UTC (rev 3694)
@@ -236,6 +236,7 @@
wxXmlResource::Get()->Load(m_xrcPrefix + wxT("help.xrc"));
wxXmlResource::Get()->Load(m_xrcPrefix + wxT("keyboard_help.xrc"));
wxXmlResource::Get()->Load(m_xrcPrefix + wxT("pref_dialog.xrc"));
+ wxXmlResource::Get()->Load(m_xrcPrefix + wxT("reset_dialog.xrc"));
wxXmlResource::Get()->Load(m_xrcPrefix + wxT("vig_corr_dlg.xrc"));
wxXmlResource::Get()->Load(m_xrcPrefix + wxT("optimize_photo_panel.xrc"));
wxXmlResource::Get()->Load(m_xrcPrefix + wxT("cp_editor_panel.xrc"));
Modified: hugin/trunk/src/hugin1/hugin/xrc/CMakeLists.txt
===================================================================
--- hugin/trunk/src/hugin1/hugin/xrc/CMakeLists.txt 2009-03-01 09:28:57 UTC (rev 3693)
+++ hugin/trunk/src/hugin1/hugin/xrc/CMakeLists.txt 2009-03-01 22:47:11 UTC (rev 3694)
@@ -13,6 +13,7 @@
help.xrc
keyboard_help.xrc
pref_dialog.xrc
+ reset_dialog.xrc
vig_corr_dlg.xrc
optimize_photo_panel.xrc
cp_editor_panel.xrc
Modified: hugin/trunk/src/hugin1/hugin/xrc/lens_panel.xrc
===================================================================
--- hugin/trunk/src/hugin1/hugin/xrc/lens_panel.xrc 2009-03-01 09:28:57 UTC (rev 3693)
+++ hugin/trunk/src/hugin1/hugin/xrc/lens_panel.xrc 2009-03-01 22:47:11 UTC (rev 3694)
@@ -69,9 +69,21 @@
<label>Change lens...</label>
<tooltip>change lens of selected images</tooltip>
</object>
- <flag>wxEXPAND|wxTOP</flag>
+ <flag>wxTOP|wxBOTTOM|wxEXPAND</flag>
<border>5</border>
</object>
+ <object class="sizeritem">
+ <object class="wxStaticLine"/>
+ <flag>wxTOP|wxBOTTOM|wxEXPAND</flag>
+ <border>3</border>
+ </object>
+ <object class="sizeritem">
+ <object class="wxButton" name="lens_button_reset">
+ <label>Reset...</label>
+ </object>
+ <flag>wxTOP|wxEXPAND</flag>
+ <border>5</border>
+ </object>
</object>
<flag>wxALL</flag>
<border>6</border>
Added: hugin/trunk/src/hugin1/hugin/xrc/reset_dialog.xrc
===================================================================
--- hugin/trunk/src/hugin1/hugin/xrc/reset_dialog.xrc (rev 0)
+++ hugin/trunk/src/hugin1/hugin/xrc/reset_dialog.xrc 2009-03-01 22:47:11 UTC (rev 3694)
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="cp1252"?>
+<resource>
+ <object class="wxDialog" name="reset_dialog">
+ <title>Reset values</title>
+ <style>wxDEFAULT_DIALOG_STYLE|wxCAPTION|wxTAB_TRAVERSAL</style>
+ <object class="wxBoxSizer">
+ <orient>wxVERTICAL</orient>
+ <object class="sizeritem">
+ <object class="wxStaticBoxSizer">
+ <label>Reset</label>
+ <orient>wxVERTICAL</orient>
+ <object class="sizeritem">
+ <object class="wxCheckBox" name="reset_pos">
+ <label>Image Orientation</label>
+ <checked>1</checked>
+ </object>
+ <flag>wxALL|wxEXPAND</flag>
+ <border>5</border>
+ </object>
+ <object class="sizeritem">
+ <object class="wxCheckBox" name="reset_fov">
+ <label>Field of View</label>
+ </object>
+ <flag>wxALL|wxEXPAND</flag>
+ <border>5</border>
+ </object>
+ <object class="sizeritem">
+ <object class="wxCheckBox" name="reset_lens">
+ <label>Lens parameters</label>
+ <checked>1</checked>
+ </object>
+ <flag>wxALL|wxEXPAND</flag>
+ <border>5</border>
+ </object>
+ <object class="sizeritem">
+ <object class="wxBoxSizer">
+ <orient>wxHORIZONTAL</orient>
+ <object class="sizeritem">
+ <object class="wxCheckBox" name="reset_exposure">
+ <label>Exposure</label>
+ <checked>1</checked>
+ </object>
+ <flag>wxALL|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+ <border>0</border>
+ </object>
+ <object class="spacer">
+ <size>10</size>
+ <flag>wxEXPAND</flag>
+ </object>
+ <object class="sizeritem">
+ <object class="wxComboBox" name="combo_exposure">
+ <content>
+ <item>to EXIF values</item>
+ <item>to zero (no exposure correction)</item>
+ </content>
+ <selection>0</selection>
+ <style>wxCB_READONLY</style>
+ </object>
+ <flag>wxALL|wxEXPAND|wxALIGN_CENTRE_HORIZONTAL</flag>
+ <border>0</border>
+ </object>
+ </object>
+ <flag>wxALL|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+ <border>5</border>
+ </object>
+ <object class="sizeritem">
+ <object class="wxCheckBox" name="reset_color">
+ <label>Color</label>
+ <checked>1</checked>
+ </object>
+ <flag>wxALL|wxEXPAND</flag>
+ <border>5</border>
+ </object>
+ <object class="sizeritem">
+ <object class="wxCheckBox" name="reset_vignetting">
+ <label>Vignetting</label>
+ <checked>1</checked>
+ </object>
+ <flag>wxALL|wxEXPAND</flag>
+ <border>5</border>
+ </object>
+ <object class="sizeritem">
+ <object class="wxCheckBox" name="reset_response">
+ <label>Camera Response</label>
+ <checked>1</checked>
+ </object>
+ <flag>wxALL|wxEXPAND</flag>
+ <border>5</border>
+ </object>
+ </object>
+ <flag>wxALL|wxEXPAND</flag>
+ <border>5</border>
+ </object>
+ <object class="sizeritem">
+ <object class="wxBoxSizer">
+ <orient>wxHORIZONTAL</orient>
+ <object class="sizeritem">
+ <object class="wxButton" name="wxID_OK">
+ <label>OK</label>
+ <default>1</default>
+ </object>
+ <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+ <border>5</border>
+ </object>
+ <object class="sizeritem">
+ <object class="wxButton" name="wxID_CANCEL">
+ <label>Cancel</label>
+ </object>
+ <flag>wxALL|wxEXPAND|wxALIGN_CENTRE|wxALIGN_CENTRE_VERTICAL</flag>
+ <border>5</border>
+ </object>
+ </object>
+ <flag>wxALIGN_CENTRE_HORIZONTAL</flag>
+ </object>
+ </object>
+ </object>
+</resource>
\ No newline at end of file
Modified: hugin/trunk/src/hugin_base/panodata/SrcPanoImage.cpp
===================================================================
--- hugin/trunk/src/hugin_base/panodata/SrcPanoImage.cpp 2009-03-01 09:28:57 UTC (rev 3693)
+++ hugin/trunk/src/hugin_base/panodata/SrcPanoImage.cpp 2009-03-01 22:47:11 UTC (rev 3694)
@@ -333,12 +333,18 @@
bool SrcPanoImage::readEXIF(double & focalLength, double & cropFactor, bool applyEXIFValues)
{
+ double eV=0;
+ return readEXIF(focalLength,cropFactor,eV,applyEXIFValues);
+};
+
+bool SrcPanoImage::readEXIF(double & focalLength, double & cropFactor, double & eV, bool applyEXIFValues)
+{
std::string filename = getFilename();
std::string ext = hugin_utils::getExtension(filename);
std::transform(ext.begin(), ext.end(), ext.begin(), (int(*)(int)) toupper);
double roll = 0;
- double eV = 0;
+ //double eV = 0;
float isoSpeed = 0;
float photoFNumber = 0;
float exposureTime = 0;
Modified: hugin/trunk/src/hugin_base/panodata/SrcPanoImage.h
===================================================================
--- hugin/trunk/src/hugin_base/panodata/SrcPanoImage.h 2009-03-01 09:28:57 UTC (rev 3693)
+++ hugin/trunk/src/hugin_base/panodata/SrcPanoImage.h 2009-03-01 22:47:11 UTC (rev 3694)
@@ -369,6 +369,7 @@
* settings where provided, they will be used for computation of the HFOV.
*/
bool readEXIF(double & focalLength, double & cropFactor, bool applyEXIF=false);
+ bool readEXIF(double & focalLength, double & cropFactor, double & eV, bool applyEXIF=false);
/** calculate hfov of an image given focal length, image size and crop factor */
static double calcHFOV(SrcPanoImage::Projection proj, double fl, double crop, vigra::Size2D imageSize);
Modified: hugin/trunk/src/translations/bg.po
===================================================================
--- hugin/trunk/src/translations/bg.po 2009-03-01 09:28:57 UTC (rev 3693)
+++ hugin/trunk/src/translations/bg.po 2009-03-01 22:47:11 UTC (rev 3694)
@@ -1,14 +1,14 @@
# This file is distributed under the same license as the PACKAGE package.
# Copyright (C) YEAR Pablo dAngelo.
#
-#: hugin1/hugin/AssistantPanel.cpp:528 hugin1/hugin/CPEditorPanel.cpp:2224
-#: hugin1/hugin/ImagesPanel.cpp:860 PTBatcher/Batch.cpp:148
+#: hugin1/hugin/AssistantPanel.cpp:528 hugin1/hugin/CPEditorPanel.cpp:2240
+#: hugin1/hugin/ImagesPanel.cpp:860 PTBatcher/Batch.cpp:127
msgid ""
msgstr ""
"Project-Id-Version: bg\n"
"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?"
"group_id=77506&atid=550441\n"
-"POT-Creation-Date: 2009-02-17 22:41+0000\n"
+"POT-Creation-Date: 2009-03-01 22:38+0000\n"
"PO-Revision-Date: 2008-07-10 10:12+0200\n"
"Last-Translator: Svetoslav Stefanov <lfu...@gm...>\n"
"Language-Team: Bulgarian <bg...@li...>\n"
@@ -34,7 +34,7 @@
#: hugin1/base_wx/huginConfig.cpp:69 hugin1/base_wx/huginConfig.cpp:82
#: hugin1/base_wx/RunStitchPanel.cpp:246 hugin1/hugin/AssistantPanel.cpp:377
#: hugin1/hugin/AssistantPanel.cpp:552 hugin1/hugin/AssistantPanel.cpp:684
-#: hugin1/hugin/CPEditorPanel.cpp:2122
+#: hugin1/hugin/CPEditorPanel.cpp:2138
#: hugin1/hugin/OptimizePhotometricPanel.cpp:487
#: hugin1/hugin/OptimizePhotometricPanel.cpp:507
#: PTBatcherGUI/ProjectListBox.cpp:168
@@ -111,7 +111,8 @@
#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:593
#: hugin1/stitch_project/hugin_stitch_project.cpp:123
#: PTBatcher/RunStitchFrame.cpp:43 translations/xrc.cpp:87
-#: translations/xrc.cpp:538 xrc.cpp:87 xrc.cpp:538
+#: translations/xrc.cpp:539 translations/xrc.cpp:611 xrc.cpp:87 xrc.cpp:539
+#: xrc.cpp:611
msgid "Cancel"
msgstr "Отказ"
@@ -141,7 +142,7 @@
"jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|Всички файлове (*)|*"
#: hugin1/base_wx/PTWXDlg.cpp:65 hugin1/base_wx/PTWXDlg.cpp:83
-#: hugin1/base_wx/PTWXDlg.cpp:135 translations/xrc.cpp:540 xrc.cpp:540
+#: hugin1/base_wx/PTWXDlg.cpp:135 translations/xrc.cpp:541 xrc.cpp:541
msgid "Panorama Tools"
msgstr "Panorama Tools"
@@ -200,7 +201,7 @@
msgstr "Грешка при синтактическия разбор на скрипта panotools: %s"
#: hugin1/base_wx/RunStitchPanel.cpp:177 hugin1/base_wx/RunStitchPanel.cpp:194
-#: hugin1/hugin/PanoPanel.cpp:911
+#: hugin1/hugin/PanoPanel.cpp:912
msgid "Could not create temporary file"
msgstr "Не може да бъде създаден временен файл"
@@ -322,20 +323,20 @@
msgstr "Намиране на съответстващите точки"
#: hugin1/hugin/AssistantPanel.cpp:412 hugin1/hugin/AssistantPanel.cpp:441
-#: hugin1/hugin/CPEditorPanel.cpp:2126 hugin1/hugin/CPEditorPanel.cpp:2188
-#: hugin1/hugin/CPEditorPanel.cpp:2198 hugin1/hugin/CPEditorPanel.cpp:2217
+#: hugin1/hugin/CPEditorPanel.cpp:2142 hugin1/hugin/CPEditorPanel.cpp:2204
+#: hugin1/hugin/CPEditorPanel.cpp:2214 hugin1/hugin/CPEditorPanel.cpp:2233
#: hugin1/hugin/ImagesPanel.cpp:739 hugin1/hugin/ImagesPanel.cpp:770
#, fuzzy
msgid "Running Celeste"
msgstr "Выполняется %s"
-#: hugin1/hugin/AssistantPanel.cpp:496 hugin1/hugin/CPEditorPanel.cpp:2132
+#: hugin1/hugin/AssistantPanel.cpp:496 hugin1/hugin/CPEditorPanel.cpp:2148
#: hugin1/hugin/ImagesPanel.cpp:829
#, fuzzy
msgid "searching for cloud-like control points..."
msgstr "Търсене на подобни точки..."
-#: hugin1/hugin/AssistantPanel.cpp:525 hugin1/hugin/CPEditorPanel.cpp:2179
+#: hugin1/hugin/AssistantPanel.cpp:525 hugin1/hugin/CPEditorPanel.cpp:2195
#: hugin1/hugin/ImagesPanel.cpp:764
#, fuzzy
msgid "Celeste model file not found, Hugin needs to be properly installed."
@@ -343,11 +344,11 @@
"Папката xrc не е намерена, hugin трябва да се инсталира правилно.\n"
"Търсенето се извърши в:"
-#: hugin1/hugin/AssistantPanel.cpp:525 hugin1/hugin/CPEditorPanel.cpp:2179
+#: hugin1/hugin/AssistantPanel.cpp:525 hugin1/hugin/CPEditorPanel.cpp:2195
#: hugin1/hugin/huginApp.cpp:143 hugin1/hugin/huginApp.cpp:154
#: hugin1/hugin/huginApp.cpp:166 hugin1/hugin/ImagesPanel.cpp:764
#: hugin1/stitch_project/hugin_stitch_project.cpp:272
-#: PTBatcherGUI/PTBatcherGUI.cpp:67 PTBatcherGUI/PTBatcherGUI.cpp:79
+#: PTBatcherGUI/PTBatcherGUI.cpp:66 PTBatcherGUI/PTBatcherGUI.cpp:72
msgid "Fatal Error"
msgstr "Фатална грешка"
@@ -415,8 +416,8 @@
msgid "Would you like to use Autopano-Sift instead?"
msgstr "Искате ли вместо нея да използвате Autopano-Sift?"
-#: hugin1/hugin/AutoCtrlPointCreator.cpp:279 translations/xrc.cpp:499
-#: translations/xrc.cpp:508 xrc.cpp:499 xrc.cpp:508
+#: hugin1/hugin/AutoCtrlPointCreator.cpp:279 translations/xrc.cpp:500
+#: translations/xrc.cpp:509 xrc.cpp:500 xrc.cpp:509
msgid "Autopano"
msgstr "Autopano"
@@ -463,7 +464,7 @@
#: hugin1/hugin/AutoCtrlPointCreator.cpp:434
#: hugin1/hugin/AutoCtrlPointCreator.cpp:539
#: hugin1/hugin/AutoCtrlPointCreator.cpp:548
-#: hugin1/hugin/NonaStitcherPanel.cpp:427 hugin1/hugin/PanoPanel.cpp:1007
+#: hugin1/hugin/NonaStitcherPanel.cpp:427 hugin1/hugin/PanoPanel.cpp:1008
msgid "Could not execute command: "
msgstr "Не може да се изпълни команда: "
@@ -576,24 +577,24 @@
msgid "Distance"
msgstr "Разстояние"
-#: hugin1/hugin/CPEditorPanel.cpp:540
+#: hugin1/hugin/CPEditorPanel.cpp:544
msgid "No corresponding point found"
msgstr "Не е намерена съответстваща точка"
-#: hugin1/hugin/CPEditorPanel.cpp:630
+#: hugin1/hugin/CPEditorPanel.cpp:634
msgid "new control point added"
msgstr "Добавена е нова контролна точка"
-#: hugin1/hugin/CPEditorPanel.cpp:751 hugin1/hugin/CPEditorPanel.cpp:976
+#: hugin1/hugin/CPEditorPanel.cpp:759 hugin1/hugin/CPEditorPanel.cpp:984
msgid "searching similar points..."
msgstr "Търсене на подобни точки..."
-#: hugin1/hugin/CPEditorPanel.cpp:770 hugin1/hugin/CPEditorPanel.cpp:894
+#: hugin1/hugin/CPEditorPanel.cpp:778 hugin1/hugin/CPEditorPanel.cpp:902
msgid "Error during Fine-tune"
msgstr "Грешка по време на фината настройка"
-#: hugin1/hugin/CPEditorPanel.cpp:784 hugin1/hugin/CPEditorPanel.cpp:914
-#: hugin1/hugin/CPEditorPanel.cpp:1050
+#: hugin1/hugin/CPEditorPanel.cpp:792 hugin1/hugin/CPEditorPanel.cpp:922
+#: hugin1/hugin/CPEditorPanel.cpp:1058
#, c-format
msgid ""
"Point finetuned, angle: %.0f deg, correlation coefficient: %0.3f, curvature: "
@@ -602,17 +603,17 @@
"Точката е настроена, ъгъл: %.0f градуса, коефициент на корелация: %0.3f, "
"кривина: %0.3f %0.3f "
-#: hugin1/hugin/CPEditorPanel.cpp:787 hugin1/hugin/CPEditorPanel.cpp:917
+#: hugin1/hugin/CPEditorPanel.cpp:795 hugin1/hugin/CPEditorPanel.cpp:925
msgid "change points, or press right mouse button to add the pair"
msgstr ""
"Променете точките или натиснете десен бутон на мишката за да добавите "
"двойката"
-#: hugin1/hugin/CPEditorPanel.cpp:807
+#: hugin1/hugin/CPEditorPanel.cpp:815
msgid "Estimated point outside image"
msgstr "Определената точка е извън изображението"
-#: hugin1/hugin/CPEditorPanel.cpp:1056
+#: hugin1/hugin/CPEditorPanel.cpp:1064
#, c-format
msgid ""
"No similar point found. Check the similarity visually.\n"
@@ -622,40 +623,40 @@
"Не са открити сходни точки. Проверете сходството на око.\n"
"Коефициентът на корелация (%.3f) е по-нисък от зададения в настройките"
-#: hugin1/hugin/CPEditorPanel.cpp:1058
+#: hugin1/hugin/CPEditorPanel.cpp:1066
msgid "No similar point found"
msgstr "Не е открита сходна точка"
-#: hugin1/hugin/CPEditorPanel.cpp:1220 hugin1/hugin/CPEditorPanel.cpp:1231
+#: hugin1/hugin/CPEditorPanel.cpp:1228 hugin1/hugin/CPEditorPanel.cpp:1239
msgid "Add new Line"
msgstr "Добавяне на нова линия"
-#: hugin1/hugin/CPEditorPanel.cpp:1226 hugin1/hugin/CPEditorPanel.cpp:1229
-#: hugin1/hugin/CPEditorPanel.cpp:1563 hugin1/hugin/CPListFrame.cpp:417
+#: hugin1/hugin/CPEditorPanel.cpp:1234 hugin1/hugin/CPEditorPanel.cpp:1237
+#: hugin1/hugin/CPEditorPanel.cpp:1575 hugin1/hugin/CPListFrame.cpp:417
#, c-format
msgid "Line %d"
msgstr "Линия %d"
-#: hugin1/hugin/CPEditorPanel.cpp:1554 hugin1/hugin/CPListFrame.cpp:408
+#: hugin1/hugin/CPEditorPanel.cpp:1566 hugin1/hugin/CPListFrame.cpp:408
#: hugin1/hugin/GLPreviewFrame.cpp:266 hugin1/hugin/PreviewFrame.cpp:246
#: translations/xrc.cpp:49 xrc.cpp:49
msgid "normal"
msgstr "Нормален"
-#: hugin1/hugin/CPEditorPanel.cpp:1557 hugin1/hugin/CPListFrame.cpp:411
+#: hugin1/hugin/CPEditorPanel.cpp:1569 hugin1/hugin/CPListFrame.cpp:411
msgid "vert. Line"
msgstr "верт. линия"
-#: hugin1/hugin/CPEditorPanel.cpp:1560 hugin1/hugin/CPListFrame.cpp:414
+#: hugin1/hugin/CPEditorPanel.cpp:1572 hugin1/hugin/CPListFrame.cpp:414
msgid "horiz. Line"
msgstr "хориз. линия"
-#: hugin1/hugin/CPEditorPanel.cpp:1862
+#: hugin1/hugin/CPEditorPanel.cpp:1874
msgid "Cannot estimate image position without control points"
msgstr ""
"Невъзможно е да се определи положението на изображението без контролни точки."
-#: hugin1/hugin/CPEditorPanel.cpp:1883
+#: hugin1/hugin/CPEditorPanel.cpp:1895
msgid ""
"Create control points.\n"
"To create less points,\n"
@@ -665,47 +666,47 @@
"За да създадете по-малко точки\n"
"въведете по-голямо число."
-#: hugin1/hugin/CPEditorPanel.cpp:1883
+#: hugin1/hugin/CPEditorPanel.cpp:1895
msgid "Corner Detection threshold"
msgstr "Праг за определяне на ъгъла"
-#: hugin1/hugin/CPEditorPanel.cpp:1883 hugin1/hugin/CPEditorPanel.cpp:1887
+#: hugin1/hugin/CPEditorPanel.cpp:1895 hugin1/hugin/CPEditorPanel.cpp:1899
#: translations/xrc.cpp:114 xrc.cpp:114
msgid "Create control points"
msgstr "Създаване на контролни точки"
-#: hugin1/hugin/CPEditorPanel.cpp:1887
+#: hugin1/hugin/CPEditorPanel.cpp:1899
msgid "Corner Detection scale"
msgstr "Мащаб за определяне на ъгъла"
-#: hugin1/hugin/CPEditorPanel.cpp:1899
+#: hugin1/hugin/CPEditorPanel.cpp:1911
msgid "Error during control point creation:\n"
msgstr "Грешка при създаване на контролна точка:\n"
-#: hugin1/hugin/CPEditorPanel.cpp:2030
+#: hugin1/hugin/CPEditorPanel.cpp:2046
msgid "Select Point in right image"
msgstr "Изберете точка в дясното изображение"
-#: hugin1/hugin/CPEditorPanel.cpp:2042
+#: hugin1/hugin/CPEditorPanel.cpp:2058
msgid "Select Point in left image"
msgstr "Изберете точка в дясното изображение"
-#: hugin1/hugin/CPEditorPanel.cpp:2122
+#: hugin1/hugin/CPEditorPanel.cpp:2138
#, fuzzy
msgid ""
"Cannot run celeste without at least one control point connecting the two "
"images"
msgstr "Премахване на контролните точки, съединяващи избраните изображения"
-#: hugin1/hugin/CPEditorPanel.cpp:2219
+#: hugin1/hugin/CPEditorPanel.cpp:2235
#, c-format
msgid ""
"Finished running Celeste.\n"
"%d cloud-like control points removed."
msgstr ""
-#: hugin1/hugin/CPEditorPanel.cpp:2220 translations/xrc.cpp:62
-#: translations/xrc.cpp:526 xrc.cpp:62 xrc.cpp:526
+#: hugin1/hugin/CPEditorPanel.cpp:2236 translations/xrc.cpp:62
+#: translations/xrc.cpp:527 xrc.cpp:62 xrc.cpp:527
#, fuzzy
msgid "Celeste"
msgstr "Изтриване"
@@ -794,7 +795,7 @@
msgstr "Настройки на Предварителния преглед"
#: hugin1/hugin/GLPreviewFrame.cpp:218 hugin1/hugin/PreviewFrame.cpp:198
-#: translations/xrc.cpp:362 xrc.cpp:362
+#: translations/xrc.cpp:363 xrc.cpp:363
msgid "projection (f):"
msgstr "Проекция (f):"
@@ -833,8 +834,8 @@
#: hugin1/hugin/GLPreviewFrame.cpp:631 hugin1/hugin/ImagesList.cpp:492
#: hugin1/hugin/PreviewFrame.cpp:625 translations/xrc.cpp:15
-#: translations/xrc.cpp:33 translations/xrc.cpp:141 xrc.cpp:15 xrc.cpp:33
-#: xrc.cpp:141
+#: translations/xrc.cpp:33 translations/xrc.cpp:142 xrc.cpp:15 xrc.cpp:33
+#: xrc.cpp:142
msgid "Equirectangular"
msgstr "Географска проекция"
@@ -853,7 +854,7 @@
#: hugin1/hugin/GLPreviewFrame.cpp:760 hugin1/hugin/GLPreviewFrame.cpp:776
#: hugin1/hugin/huginApp.cpp:66 hugin1/hugin/ImagesPanel.cpp:299
#: hugin1/hugin/ImagesPanel.cpp:320 hugin1/hugin/ImagesPanel.cpp:340
-#: hugin1/hugin/PanoPanel.cpp:587 hugin1/hugin/PanoPanel.cpp:618
+#: hugin1/hugin/PanoPanel.cpp:588 hugin1/hugin/PanoPanel.cpp:619
#: hugin1/hugin/PreviewFrame.cpp:772 hugin1/hugin/PreviewFrame.cpp:788
msgid "Value must be numeric."
msgstr "Стойността трябва да е число"
@@ -885,13 +886,13 @@
msgid "The crop factor must be positive."
msgstr "Коефициентът на отрязване трябва да е положително число."
-#: hugin1/hugin/huginApp.cpp:143 PTBatcherGUI/PTBatcherGUI.cpp:67
+#: hugin1/hugin/huginApp.cpp:143 PTBatcherGUI/PTBatcherGUI.cpp:66
msgid "xrc directory not found in bundle"
msgstr "Папката xrc не е намерена"
#: hugin1/hugin/huginApp.cpp:154
#: hugin1/stitch_project/hugin_stitch_project.cpp:272
-#: PTBatcherGUI/PTBatcherGUI.cpp:79
+#: PTBatcherGUI/PTBatcherGUI.cpp:72
msgid "Translations not found in bundle"
msgstr "Не са намерени файлове с локализация"
@@ -980,32 +981,32 @@
msgstr "t"
#: hugin1/hugin/ImagesList.cpp:488 translations/xrc.cpp:11
-#: translations/xrc.cpp:29 translations/xrc.cpp:137 xrc.cpp:11 xrc.cpp:29
-#: xrc.cpp:137
+#: translations/xrc.cpp:29 translations/xrc.cpp:138 xrc.cpp:11 xrc.cpp:29
+#: xrc.cpp:138
msgid "Normal (rectilinear)"
msgstr "Нормален (праволинеен)"
#: hugin1/hugin/ImagesList.cpp:489 translations/xrc.cpp:12
-#: translations/xrc.cpp:30 translations/xrc.cpp:138 xrc.cpp:12 xrc.cpp:30
-#: xrc.cpp:138
+#: translations/xrc.cpp:30 translations/xrc.cpp:139 xrc.cpp:12 xrc.cpp:30
+#: xrc.cpp:139
msgid "Panoramic (cylindrical)"
msgstr "Панорамен (цилинричен)"
#: hugin1/hugin/ImagesList.cpp:490 translations/xrc.cpp:13
-#: translations/xrc.cpp:31 translations/xrc.cpp:139 xrc.cpp:13 xrc.cpp:31
-#: xrc.cpp:139
+#: translations/xrc.cpp:31 translations/xrc.cpp:140 xrc.cpp:13 xrc.cpp:31
+#: xrc.cpp:140
msgid "Circular fisheye"
msgstr "Тип «рибешко око»"
#: hugin1/hugin/ImagesList.cpp:491 translations/xrc.cpp:14
-#: translations/xrc.cpp:32 translations/xrc.cpp:140 xrc.cpp:14 xrc.cpp:32
-#: xrc.cpp:140
+#: translations/xrc.cpp:32 translations/xrc.cpp:141 xrc.cpp:14 xrc.cpp:32
+#: xrc.cpp:141
msgid "Full frame fisheye"
msgstr "«рибешко око» на цял кадър"
-#: hugin1/hugin/ImagesList.cpp:561 translations/xrc.cpp:193
-#: translations/xrc.cpp:372 translations/xrc.cpp:591 xrc.cpp:193 xrc.cpp:372
-#: xrc.cpp:591
+#: hugin1/hugin/ImagesList.cpp:561 translations/xrc.cpp:194
+#: translations/xrc.cpp:373 translations/xrc.cpp:592 xrc.cpp:194 xrc.cpp:373
+#: xrc.cpp:592
msgid "Crop"
msgstr "Отрязване"
@@ -1042,33 +1043,33 @@
msgid "Celeste result"
msgstr "Резултат от фината настройка"
-#: hugin1/hugin/LensPanel.cpp:826
+#: hugin1/hugin/LensPanel.cpp:832
msgid "Not a jpeg file:"
msgstr "Не е JPEG файл:"
-#: hugin1/hugin/LensPanel.cpp:831 hugin1/hugin/LensPanel.cpp:940
-#: hugin1/hugin/LensPanel.cpp:973 hugin1/hugin/LensPanel.cpp:1093
-#: hugin1/hugin/LensPanel.cpp:1111
+#: hugin1/hugin/LensPanel.cpp:837 hugin1/hugin/LensPanel.cpp:946
+#: hugin1/hugin/LensPanel.cpp:979 hugin1/hugin/LensPanel.cpp:1099
+#: hugin1/hugin/LensPanel.cpp:1117
msgid "Please select an image and try again"
msgstr "Изберете изображение и опитайте отново"
-#: hugin1/hugin/LensPanel.cpp:849
+#: hugin1/hugin/LensPanel.cpp:855
msgid "Save lens parameters file"
msgstr "Запазване на файл с параметрите на обектива"
-#: hugin1/hugin/LensPanel.cpp:851
+#: hugin1/hugin/LensPanel.cpp:857
msgid "Lens Project Files (*.ini)|*.ini|All files (*)|*"
msgstr "Файлове с данни за обектив (*.ini)|*.ini|Всички файлове (*)|*"
-#: hugin1/hugin/LensPanel.cpp:982
+#: hugin1/hugin/LensPanel.cpp:988
msgid "Load lens parameters"
msgstr "Зареждане на параметри на обектива"
-#: hugin1/hugin/LensPanel.cpp:984
+#: hugin1/hugin/LensPanel.cpp:990
msgid "Lens Project Files (*.ini)|*.ini|All files (*.*)|*.*"
msgstr "Файлове с данни за обектив (*.ini)|*.ini|Всички файлове (*.*)|*.*"
-#: hugin1/hugin/LensPanel.cpp:1003
+#: hugin1/hugin/LensPanel.cpp:1009
msgid ""
"Incompatible lens parameter file, image sizes do not match\n"
"Apply settings anyway?"
@@ -1077,19 +1078,19 @@
"размерът на изображенията не съвпада\n"
"Да се приложат ли настройките въпреки това?"
-#: hugin1/hugin/LensPanel.cpp:1003
+#: hugin1/hugin/LensPanel.cpp:1009
msgid "Error loading lens parameters"
msgstr "Грешка при зареждане параметрите на обектива"
-#: hugin1/hugin/LensPanel.cpp:1101
+#: hugin1/hugin/LensPanel.cpp:1107
msgid "Enter new lens number"
msgstr "Въведете номер на новия обектив"
-#: hugin1/hugin/LensPanel.cpp:1101
+#: hugin1/hugin/LensPanel.cpp:1107
msgid "Lens number"
msgstr "Номер на обектива"
-#: hugin1/hugin/LensPanel.cpp:1102
+#: hugin1/hugin/LensPanel.cpp:1108
msgid "Change lens number"
msgstr "Промяна на номера на обектив"
@@ -1115,9 +1116,9 @@
"Фатална грешка при инсталиране\n"
"Файлът data/splash.png не намерен в:"
-#: hugin1/hugin/MainFrame.cpp:256 translations/xrc.cpp:201
-#: translations/xrc.cpp:242 translations/xrc.cpp:243 xrc.cpp:201 xrc.cpp:242
-#: xrc.cpp:243
+#: hugin1/hugin/MainFrame.cpp:256 translations/xrc.cpp:202
+#: translations/xrc.cpp:243 translations/xrc.cpp:244 xrc.cpp:202 xrc.cpp:243
+#: xrc.cpp:244
msgid "&Help"
msgstr "&Помощ"
@@ -1159,7 +1160,7 @@
msgid "File %s exists. Overwrite?"
msgstr "Файлът %s вече съществува. Да се презапише ли?"
-#: hugin1/hugin/MainFrame.cpp:594 translations/xrc.cpp:261 xrc.cpp:261
+#: hugin1/hugin/MainFrame.cpp:594 translations/xrc.cpp:262 xrc.cpp:262
msgid "Save project"
msgstr "Запазване на проект"
@@ -1188,8 +1189,8 @@
msgstr "Отваряне на проектен файл"
#: hugin1/hugin/MainFrame.cpp:714 hugin1/hugin/MainFrame.cpp:1204
-#: hugin1/stitch_project/hugin_stitch_project.cpp:338 PTBatcher/Batch.cpp:593
-#: PTBatcherGUI/BatchFrame.cpp:431
+#: hugin1/stitch_project/hugin_stitch_project.cpp:338 PTBatcher/Batch.cpp:572
+#: PTBatcherGUI/BatchFrame.cpp:435
msgid ""
"Project files (*.pto,*.ptp,*.pts,*.oto)|*.pto;*.ptp;*.pts;*.oto;|All files "
"(*)|*"
@@ -1645,124 +1646,124 @@
"размер на крайното изображение (в пиксели), чрез натискане на бутон \n"
"«Изчисли оптимален размер размер» в подпрозореца «Събиране»."
-#: hugin1/hugin/PanoPanel.cpp:149
+#: hugin1/hugin/PanoPanel.cpp:150
msgid "Fisheye"
msgstr ""
-#: hugin1/hugin/PanoPanel.cpp:150
+#: hugin1/hugin/PanoPanel.cpp:151
msgid "Stereographic"
msgstr "Стереографическая"
-#: hugin1/hugin/PanoPanel.cpp:151
+#: hugin1/hugin/PanoPanel.cpp:152
msgid "Mercator"
msgstr "Меркатора"
-#: hugin1/hugin/PanoPanel.cpp:152
+#: hugin1/hugin/PanoPanel.cpp:153
#, fuzzy
msgid "Trans Mercator"
msgstr "Поперечная Меркатора"
-#: hugin1/hugin/PanoPanel.cpp:153
+#: hugin1/hugin/PanoPanel.cpp:154
#, fuzzy
msgid "Sinusoidal"
msgstr "Синусоидная"
-#: hugin1/hugin/PanoPanel.cpp:154
+#: hugin1/hugin/PanoPanel.cpp:155
msgid "Lambert Cylindrical Equal Area"
msgstr ""
-#: hugin1/hugin/PanoPanel.cpp:155
+#: hugin1/hugin/PanoPanel.cpp:156
msgid "Lambert Equal Area Azimuthal"
msgstr ""
-#: hugin1/hugin/PanoPanel.cpp:156
+#: hugin1/hugin/PanoPanel.cpp:157
msgid "Albers Equal Area Conic"
msgstr ""
-#: hugin1/hugin/PanoPanel.cpp:157
+#: hugin1/hugin/PanoPanel.cpp:158
#, fuzzy
msgid "Miller Cylindrical"
msgstr "Цилиндрична"
-#: hugin1/hugin/PanoPanel.cpp:158
+#: hugin1/hugin/PanoPanel.cpp:159
#, fuzzy
msgid "Panini"
msgstr "Предупреждение"
-#: hugin1/hugin/PanoPanel.cpp:159
+#: hugin1/hugin/PanoPanel.cpp:160
msgid "Architectural"
msgstr ""
-#: hugin1/hugin/PanoPanel.cpp:160
+#: hugin1/hugin/PanoPanel.cpp:161
#, fuzzy
msgid "Orthographic"
msgstr "Стереографическая"
-#: hugin1/hugin/PanoPanel.cpp:161
+#: hugin1/hugin/PanoPanel.cpp:162
msgid "Equisolid"
msgstr ""
-#: hugin1/hugin/PanoPanel.cpp:162
+#: hugin1/hugin/PanoPanel.cpp:163
#, fuzzy
msgid "Equirectangular Panini"
msgstr "Географска проекция"
-#: hugin1/hugin/PanoPanel.cpp:163
+#: hugin1/hugin/PanoPanel.cpp:164
#, fuzzy
msgid "Biplane"
msgstr "Билинеен"
-#: hugin1/hugin/PanoPanel.cpp:164
+#: hugin1/hugin/PanoPanel.cpp:165
msgid "Triplane"
msgstr ""
-#: hugin1/hugin/PanoPanel.cpp:593
+#: hugin1/hugin/PanoPanel.cpp:594
#, c-format
msgid "Invalid HFOV value. Maximum HFOV for this projection is %lf."
msgstr "Неправилен HFOV. Максимално възможното за тази проекция е %lf."
-#: hugin1/hugin/PanoPanel.cpp:624
+#: hugin1/hugin/PanoPanel.cpp:625
#, c-format
msgid "Invalid VFOV value. Maximum VFOV for this projection is %lf."
msgstr "Неправилен VFOV. Максимално възможното за тази проекция е %lf."
-#: hugin1/hugin/PanoPanel.cpp:670
+#: hugin1/hugin/PanoPanel.cpp:671
msgid "width needs to be an integer bigger than 0"
msgstr "ширината трябва да е цяло число > 0"
-#: hugin1/hugin/PanoPanel.cpp:687
+#: hugin1/hugin/PanoPanel.cpp:688
msgid "height needs to be an integer bigger than 0"
msgstr "височината трябва да е цяло число > 0"
-#: hugin1/hugin/PanoPanel.cpp:697
+#: hugin1/hugin/PanoPanel.cpp:698
msgid "Top needs to be an integer bigger than 0"
msgstr "горната страна трябва да е цяло число > 0"
-#: hugin1/hugin/PanoPanel.cpp:701
+#: hugin1/hugin/PanoPanel.cpp:702
msgid "left needs to be an integer bigger than 0"
msgstr "лявата страна трябва да е цяло число > 0"
-#: hugin1/hugin/PanoPanel.cpp:705
+#: hugin1/hugin/PanoPanel.cpp:706
msgid "right needs to be an integer bigger than 0"
msgstr "дясната страна трябва да е цяло число > 0"
-#: hugin1/hugin/PanoPanel.cpp:709
+#: hugin1/hugin/PanoPanel.cpp:710
msgid "bottom needs to be an integer bigger than 0"
msgstr "долната страна трябва да е цяло число > 0"
-#: hugin1/hugin/PanoPanel.cpp:770
+#: hugin1/hugin/PanoPanel.cpp:771
msgid " PTmender options not yet implemented"
msgstr "Все още няма поддръжка на настройките на PTmender"
-#: hugin1/hugin/PanoPanel.cpp:820
+#: hugin1/hugin/PanoPanel.cpp:821
msgid " PTblender options not yet implemented"
msgstr "Все още няма поддръжка на настройките на PTblender"
-#: hugin1/hugin/PanoPanel.cpp:858
+#: hugin1/hugin/PanoPanel.cpp:859
msgid "Not yet implemented"
msgstr "Все още няма поддръжка"
-#: hugin1/hugin/PanoPanel.cpp:1007
+#: hugin1/hugin/PanoPanel.cpp:1008
msgid "ShellExecuteEx failed"
msgstr "ShellExecuteEx се провали"
@@ -1862,7 +1863,7 @@
msgid "Select Enfuse"
msgstr "Изберете Enfuse"
-#: hugin1/hugin/PreferencesDialog.cpp:343 translations/xrc.cpp:500 xrc.cpp:500
+#: hugin1/hugin/PreferencesDialog.cpp:343 translations/xrc.cpp:501 xrc.cpp:501
msgid "Select Autopano"
msgstr "Изберете Autopano"
@@ -1882,7 +1883,7 @@
msgid "Really reset displayed preferences to default values?"
msgstr "Наистина ли да се върнат началните стойност на показните настройки?"
-#: hugin1/hugin/PreferencesDialog.cpp:820 translations/xrc.cpp:536 xrc.cpp:536
+#: hugin1/hugin/PreferencesDialog.cpp:820 translations/xrc.cpp:537 xrc.cpp:537
msgid "Load Defaults"
msgstr "&Начални Настройки"
@@ -1966,23 +1967,23 @@
msgid "Bicubic"
msgstr "Бикубичен"
-#: hugin1/hugin/PTStitcherPanel.cpp:280 translations/xrc.cpp:346 xrc.cpp:346
+#: hugin1/hugin/PTStitcherPanel.cpp:280 translations/xrc.cpp:347 xrc.cpp:347
msgid "Spline 16"
msgstr "Сплайн 16"
-#: hugin1/hugin/PTStitcherPanel.cpp:281 translations/xrc.cpp:347 xrc.cpp:347
+#: hugin1/hugin/PTStitcherPanel.cpp:281 translations/xrc.cpp:348 xrc.cpp:348
msgid "Spline 36"
msgstr "Сплайн 36"
-#: hugin1/hugin/PTStitcherPanel.cpp:282 translations/xrc.cpp:348 xrc.cpp:348
+#: hugin1/hugin/PTStitcherPanel.cpp:282 translations/xrc.cpp:349 xrc.cpp:349
msgid "Sinc 256"
msgstr "Sinc 256"
-#: hugin1/hugin/PTStitcherPanel.cpp:283 translations/xrc.cpp:349 xrc.cpp:349
+#: hugin1/hugin/PTStitcherPanel.cpp:283 translations/xrc.cpp:350 xrc.cpp:350
msgid "Spline 64"
msgstr "Сплайн 64"
-#: hugin1/hugin/PTStitcherPanel.cpp:284 translations/xrc.cpp:350 xrc.cpp:350
+#: hugin1/hugin/PTStitcherPanel.cpp:284 translations/xrc.cpp:351 xrc.cpp:351
msgid "Bilinear"
msgstr "Билинеен"
@@ -1990,7 +1991,7 @@
msgid "Nearest neighbour"
msgstr "Съседен"
-#: hugin1/hugin/PTStitcherPanel.cpp:286 translations/xrc.cpp:352 xrc.cpp:352
+#: hugin1/hugin/PTStitcherPanel.cpp:286 translations/xrc.cpp:353 xrc.cpp:353
msgid "Sinc 1024"
msgstr ""
@@ -2125,12 +2126,12 @@
#: hugin1/nona_gui/nona_gui.cpp:154
#: hugin1/stitch_project/hugin_stitch_project.cpp:307
-#: PTBatcherGUI/PTBatcherGUI.cpp:121
+#: PTBatcherGUI/PTBatcherGUI.cpp:114
msgid "Syntax error in parameters detected, aborting."
msgstr "Засечена е синтактична грешка в параметрите, прекъсване."
#: hugin1/nona_gui/nona_gui.cpp:169
-#: hugin1/stitch_project/hugin_stitch_project.cpp:336 PTBatcher/Batch.cpp:591
+#: hugin1/stitch_project/hugin_stitch_project.cpp:336 PTBatcher/Batch.cpp:570
msgid "Specify project source project file"
msgstr "Посочете изходен файл на проекта"
@@ -2142,7 +2143,7 @@
msgid "Specify output image filename"
msgstr "Задайте име на изходния файл"
-#: hugin1/nona_gui/nona_gui.cpp:210 PTBatcher/Batch.cpp:616
+#: hugin1/nona_gui/nona_gui.cpp:210 PTBatcher/Batch.cpp:595
msgid "No project files specified"
msgstr "Не е указан проект"
@@ -2174,116 +2175,111 @@
"Моля изпратете пълния текст на съобщенията в тракера за грешки на адрес "
"http://sf.net/projects/hugin."
-#: hugin1/stitch_project/hugin_stitch_project.cpp:366 PTBatcher/Batch.cpp:601
+#: hugin1/stitch_project/hugin_stitch_project.cpp:366 PTBatcher/Batch.cpp:580
msgid "Specify output prefix"
msgstr "Задайте представка на изходящия файл"
-#: hugin1/stitch_project/hugin_stitch_project.cpp:398 PTBatcher/Batch.cpp:646
+#: hugin1/stitch_project/hugin_stitch_project.cpp:398 PTBatcher/Batch.cpp:625
#, c-format
msgid "%s - Stitching"
msgstr "%s — Събиране"
-#: PTBatcher/Batch.cpp:34
-#, fuzzy
-msgid "Batch"
-msgstr "Холандски"
-
-#: PTBatcher/Batch.cpp:246
+#: PTBatcher/Batch.cpp:225
msgid ""
"Cannot clear batch in progress.\n"
"Do you want to cancel it?"
msgstr ""
-#: PTBatcher/Batch.cpp:246 PTBatcherGUI/BatchFrame.cpp:658
-#: PTBatcherGUI/BatchFrame.cpp:685 PTBatcherGUI/BatchFrame.cpp:705
+#: PTBatcher/Batch.cpp:225 PTBatcherGUI/BatchFrame.cpp:662
+#: PTBatcherGUI/BatchFrame.cpp:689 PTBatcherGUI/BatchFrame.cpp:709
#: PTBatcher/ProjectArray.cpp:66
msgid "In progress"
msgstr ""
-#: PTBatcher/Batch.cpp:256 PTBatcher/Batch.cpp:277
+#: PTBatcher/Batch.cpp:235 PTBatcher/Batch.cpp:256
msgid "Cleared batch."
msgstr ""
-#: PTBatcher/Batch.cpp:351
+#: PTBatcher/Batch.cpp:330
msgid "Error: Could not get status, project with index "
msgstr ""
-#: PTBatcher/Batch.cpp:351 PTBatcher/Batch.cpp:908
+#: PTBatcher/Batch.cpp:330 PTBatcher/Batch.cpp:887
#: PTBatcherGUI/ProjectListBox.cpp:145
#, fuzzy, c-format
msgid "%d"
msgstr "d"
-#: PTBatcher/Batch.cpp:351 PTBatcher/Batch.cpp:703 PTBatcher/Batch.cpp:908
+#: PTBatcher/Batch.cpp:330 PTBatcher/Batch.cpp:682 PTBatcher/Batch.cpp:887
msgid " is not in list."
msgstr ""
-#: PTBatcher/Batch.cpp:351 PTBatcher/Batch.cpp:703 PTBatcher/Batch.cpp:720
-#: PTBatcher/Batch.cpp:908 PTBatcherGUI/BatchFrame.cpp:310
+#: PTBatcher/Batch.cpp:330 PTBatcher/Batch.cpp:682 PTBatcher/Batch.cpp:699
+#: PTBatcher/Batch.cpp:887 PTBatcherGUI/BatchFrame.cpp:314
#, fuzzy
msgid "Error!"
msgstr "Грешка"
-#: PTBatcher/Batch.cpp:393
+#: PTBatcher/Batch.cpp:372
#, fuzzy
msgid "Error: Could not load batch file."
msgstr "Грешка: Не могат да се заредят всички изображения"
-#: PTBatcher/Batch.cpp:490
+#: PTBatcher/Batch.cpp:469
msgid "Batch successfully completed."
msgstr ""
-#: PTBatcher/Batch.cpp:499
+#: PTBatcher/Batch.cpp:478
msgid "Batch completed with errors."
msgstr ""
-#: PTBatcher/Batch.cpp:508
+#: PTBatcher/Batch.cpp:487
msgid "Initializing shutdown..."
msgstr ""
-#: PTBatcher/Batch.cpp:508 PTBatcher/Batch.cpp:513
+#: PTBatcher/Batch.cpp:487 PTBatcher/Batch.cpp:492
msgid "Shutting down..."
msgstr ""
-#: PTBatcher/Batch.cpp:537
+#: PTBatcher/Batch.cpp:516
#, fuzzy
msgid "Error shutting down."
msgstr "Грешка при изпълнението на %s"
-#: PTBatcher/Batch.cpp:539
+#: PTBatcher/Batch.cpp:518
msgid "Error shutting down. Do you have root privileges?"
msgstr ""
-#: PTBatcher/Batch.cpp:610
+#: PTBatcher/Batch.cpp:589
#, fuzzy
msgid "No output prefix specified"
msgstr "Не е указан проект"
-#: PTBatcher/Batch.cpp:703
+#: PTBatcher/Batch.cpp:682
#, fuzzy
msgid "Error removing, project with id "
msgstr "Грешка при отваряне на проекта: "
-#: PTBatcher/Batch.cpp:720
+#: PTBatcher/Batch.cpp:699
#, fuzzy
msgid "Error: Could not delete project file "
msgstr "Проектният файл не може да бъде отворен:"
-#: PTBatcher/Batch.cpp:738
+#: PTBatcher/Batch.cpp:717
#, fuzzy
msgid "Running batch..."
msgstr "Запускается autopano"
-#: PTBatcher/Batch.cpp:771
+#: PTBatcher/Batch.cpp:750
msgid "Batch already in progress."
msgstr ""
-#: PTBatcher/Batch.cpp:788
+#: PTBatcher/Batch.cpp:767
#, fuzzy
msgid "Running command \""
msgstr "Запускается autopano"
-#: PTBatcher/Batch.cpp:908
+#: PTBatcher/Batch.cpp:887
msgid "Error: Could not set status, project with index "
msgstr ""
@@ -2310,339 +2306,339 @@
msgid "File"
msgstr "Файл"
-#: PTBatcherGUI/BatchFrame.cpp:99
+#: PTBatcherGUI/BatchFrame.cpp:100
#, fuzzy
msgid "Help"
msgstr "&Помощ"
-#: PTBatcherGUI/BatchFrame.cpp:103
+#: PTBatcherGUI/BatchFrame.cpp:107
msgid "Not doing much..."
msgstr ""
-#: PTBatcherGUI/BatchFrame.cpp:137 translations/xrc.cpp:308
-#: translations/xrc.cpp:311 translations/xrc.cpp:314 xrc.cpp:308 xrc.cpp:311
-#: xrc.cpp:314
+#: PTBatcherGUI/BatchFrame.cpp:141 translations/xrc.cpp:309
+#: translations/xrc.cpp:312 translations/xrc.cpp:315 xrc.cpp:309 xrc.cpp:312
+#: xrc.cpp:315
msgid "clear"
msgstr "изчистване"
-#: PTBatcherGUI/BatchFrame.cpp:137
+#: PTBatcherGUI/BatchFrame.cpp:141
msgid "Clear batch"
msgstr ""
-#: PTBatcherGUI/BatchFrame.cpp:137
+#: PTBatcherGUI/BatchFrame.cpp:141
msgid "Clears the batch list"
msgstr ""
-#: PTBatcherGUI/BatchFrame.cpp:138
+#: PTBatcherGUI/BatchFrame.cpp:142
#, fuzzy
msgid "open"
msgstr "Отваряне"
-#: PTBatcherGUI/BatchFrame.cpp:138
+#: PTBatcherGUI/BatchFrame.cpp:142
msgid "Open batch"
msgstr ""
-#: PTBatcherGUI/BatchFrame.cpp:138
+#: PTBatcherGUI/BatchFrame.cpp:142
msgid "Opens a batch file with a list of projects"
msgstr ""
-#: PTBatcherGUI/BatchFrame.cpp:139
+#: PTBatcherGUI/BatchFrame.cpp:143
#, fuzzy
msgid "save"
msgstr "Запазване"
-#: PTBatcherGUI/BatchFrame.cpp:139
+#: PTBatcherGUI/BatchFrame.cpp:143
#, fuzzy
msgid "Save batch"
msgstr "Запазване като"
-#: PTBatcherGUI/BatchFrame.cpp:139
+#: PTBatcherGUI/BatchFrame.cpp:143
msgid "Saves a batch file with a list of projects"
msgstr ""
-#: PTBatcherGUI/BatchFrame.cpp:142
+#: PTBatcherGUI/BatchFrame.cpp:146
#, fuzzy
msgid "start"
msgstr "В готовност"
-#: PTBatcherGUI/BatchFrame.cpp:142
+#: PTBatcherGUI/BatchFrame.cpp:146
#, fuzzy
msgid "Start batch"
msgstr "Начален ъгъл:"
-#: PTBatcherGUI/BatchFrame.cpp:142
+#: PTBatcherGUI/BatchFrame.cpp:146
msgid "Starts batch execution"
msgstr ""
-#: PTBatcherGUI/BatchFrame.cpp:143
+#: PTBatcherGUI/BatchFrame.cpp:147
msgid "skip"
msgstr ""
-#: PTBatcherGUI/BatchFrame.cpp:143
+#: PTBatcherGUI/BatchFrame.cpp:147
#, fuzzy
msgid "Skip project(s)"
msgstr "Запазване на проекта като"
-#: PTBatcherGUI/BatchFrame.cpp:143
+#: PTBatcherGUI/BatchFrame.cpp:147
msgid "Skips execution of currently running project(s)"
msgstr ""
-#: PTBatcherGUI/BatchFrame.cpp:144
+#: PTBatcherGUI/BatchFrame.cpp:148
#, fuzzy
msgid "pause"
msgstr "Японски"
-#: PTBatcherGUI/BatchFrame.cpp:144
+#: PTBatcherGUI/BatchFrame.cpp:148
msgid "Pause batch"
msgstr ""
-#: PTBatcherGUI/BatchFrame.cpp:144
+#: PTBatcherGUI/BatchFrame.cpp:148
msgid "Pauses batch execution"
msgstr ""
-#: PTBatcherGUI/BatchFrame.cpp:145 translations/xrc.cpp:600 xrc.cpp:600
+#: PTBatcherGUI/BatchFrame.cpp:149 translations/xrc.cpp:614 xrc.cpp:614
msgid "cancel"
msgstr "отказ"
-#: PTBatcherGUI/BatchFrame.cpp:145
+#: PTBatcherGUI/BatchFrame.cpp:149
#, fuzzy
msgid "Cancel batch"
msgstr "Отказ"
-#: PTBatcherGUI/BatchFrame.cpp:145
+#: PTBatcherGUI/BatchFrame.cpp:149
msgid "Cancels batch execution"
msgstr ""
-#: PTBatcherGUI/BatchFrame.cpp:148
+#: PTBatcherGUI/BatchFrame.cpp:152
#, fuzzy
msgid "add"
msgstr "Добавяне"
-#: PTBatcherGUI/BatchFrame.cpp:148
+#: PTBatcherGUI/BatchFrame.cpp:152
#, fuzzy
msgid "Add project(s)"
msgstr "запазен проект %s"
-#: PTBatcherGUI/BatchFrame.cpp:148
+#: PTBatcherGUI/BatchFrame.cpp:152
msgid "Appends project file(s) to the batch list"
msgstr ""
-#: PTBatcherGUI/BatchFrame.cpp:150
+#: PTBatcherGUI/BatchFrame.cpp:154
#, fuzzy
msgid "remove"
msgstr "Предварителен преглед"
-#: PTBatcherGUI/BatchFrame.cpp:150
+#: PTBatcherGUI/BatchFrame.cpp:154
#, fuzzy
msgid "Remove project"
msgstr "Запазване на проект"
-#: PTBatcherGUI/BatchFrame.cpp:150
+#: PTBatcherGUI/BatchFrame.cpp:154
#, fuzzy
msgid "Removes selected project from the batch list"
msgstr "Премахване на избраните изображения от този проект"
-#: PTBatcherGUI/BatchFrame.cpp:151
+#: PTBatcherGUI/BatchFrame.cpp:155
msgid "adddir"
msgstr ""
-#: PTBatcherGUI/BatchFrame.cpp:151
+#: PTBatcherGUI/BatchFrame.cpp:155
#, fuzzy
msgid "Search directory"
msgstr ""
"\n"
" текуща папка:"
-#: PTBatcherGUI/BatchFrame.cpp:151
+#: PTBatcherGUI/BatchFrame.cpp:155
msgid "Appends all project files from a directory and subdirectories"
msgstr ""
-#: PTBatcherGUI/BatchFrame.cpp:187
+#: PTBatcherGUI/BatchFrame.cpp:191
#, fuzzy
msgid "Add application"
msgstr "Изход от приложението"
-#: PTBatcherGUI/BatchFrame.cpp:192
+#: PTBatcherGUI/BatchFrame.cpp:196
#, fuzzy
msgid "Remove complete"
msgstr "Премахване на точки"
-#: PTBatcherGUI/BatchFrame.cpp:197
+#: PTBatcherGUI/BatchFrame.cpp:201
#, fuzzy
msgid "Change prefix"
msgstr "Сменить объектив"
-#: PTBatcherGUI/BatchFrame.cpp:201
+#: PTBatcherGUI/BatchFrame.cpp:205
#, fuzzy
msgid "Reset project"
msgstr "Нов проект"
-#: PTBatcherGUI/BatchFrame.cpp:203
+#: PTBatcherGUI/BatchFrame.cpp:207
#, fuzzy
msgid "Reset all"
msgstr "Възстановяване"
-#: PTBatcherGUI/BatchFrame.cpp:205
+#: PTBatcherGUI/BatchFrame.cpp:209
msgid "Edit with Hugin"
msgstr ""
-#: PTBatcherGUI/BatchFrame.cpp:207
+#: PTBatcherGUI/BatchFrame.cpp:211
#, fuzzy
msgid "Move project up"
msgstr "Запазване на проект"
-#: PTBatcherGUI/BatchFrame.cpp:209
+#: PTBatcherGUI/BatchFrame.cpp:213
#, fuzzy
msgid "Move project down"
msgstr "Преместване надолу"
-#: PTBatcherGUI/BatchFrame.cpp:212
+#: PTBatcherGUI/BatchFrame.cpp:216
msgid "Parallel execution"
msgstr ""
-#: PTBatcherGUI/BatchFrame.cpp:214
+#: PTBatcherGUI/BatchFrame.cpp:218
#, fuzzy
msgid "Delete *.pto files"
msgstr "Удалить переразложенные файлы TIFF"
-#: PTBatcherGUI/BatchFrame.cpp:216
+#: PTBatcherGUI/BatchFrame.cpp:220
msgid "Overwrite always"
msgstr ""
-#: PTBatcherGUI/BatchFrame.cpp:218
+#: PTBatcherGUI/BatchFrame.cpp:222
msgid "Shutdown when done"
msgstr ""
-#: PTBatcherGUI/BatchFrame.cpp:220
+#: PTBatcherGUI/BatchFrame.cpp:224
msgid "Verbose output"
msgstr ""
-#: PTBatcherGUI/BatchFrame.cpp:310
+#: PTBatcherGUI/BatchFrame.cpp:314
#, fuzzy
msgid "Error: Could not remove temporary file"
msgstr "Не може да бъде създаден временен файл"
-#: PTBatcherGUI/BatchFrame.cpp:386
+#: PTBatcherGUI/BatchFrame.cpp:390
msgid "Please enter the command-line application to execute:"
msgstr ""
-#: PTBatcherGUI/BatchFrame.cpp:386
+#: PTBatcherGUI/BatchFrame.cpp:390
#, fuzzy
msgid "Enter application"
msgstr "Изход от приложението"
-#: PTBatcherGUI/BatchFrame.cpp:406
+#: PTBatcherGUI/BatchFrame.cpp:410
#, fuzzy
msgid "Specify a directory to search for projects in"
msgstr "Посочете изходен файл на проекта"
-#: PTBatcherGUI/BatchFrame.cpp:419
+#: PTBatcherGUI/BatchFrame.cpp:423
#, fuzzy
msgid "Added projects from dir "
msgstr "Отваряне на проект: "
-#: PTBatcherGUI/BatchFrame.cpp:429
+#: PTBatcherGUI/BatchFrame.cpp:433
#, fuzzy
msgid "Specify project source file(s)"
msgstr "Посочете изходен файл на проекта"
-#: PTBatcherGUI/BatchFrame.cpp:445 PTBatcherGUI/PTBatcherGUI.cpp:159
-#: PTBatcherGUI/PTBatcherGUI.cpp:216
+#: PTBatcherGUI/BatchFrame.cpp:449 PTBatcherGUI/PTBatcherGUI.cpp:154
+#: PTBatcherGUI/PTBatcherGUI.cpp:211
#, fuzzy
msgid "Added project "
msgstr "запазен проект %s"
-#: PTBatcherGUI/BatchFrame.cpp:465
+#: PTBatcherGUI/BatchFrame.cpp:469
#, fuzzy
msgid "Specify output prefix for project "
msgstr "Задайте представка на изходящия файл"
-#: PTBatcherGUI/BatchFrame.cpp:480
+#: PTBatcherGUI/BatchFrame.cpp:484
#, fuzzy
msgid "Please select a project"
msgstr "Изберете изображение и опитайте отново"
-#: PTBatcherGUI/BatchFrame.cpp:535
+#: PTBatcherGUI/BatchFrame.cpp:539
#, fuzzy
msgid "help file: "
msgstr "Изображение:"
-#: PTBatcherGUI/BatchFrame.cpp:556
+#: PTBatcherGUI/BatchFrame.cpp:560
msgid "Specify batch file to open"
msgstr ""
-#: PTBatcherGUI/BatchFrame.cpp:558
+#: PTBatcherGUI/BatchFrame.cpp:562
#, fuzzy
msgid "Batch files (*.ptb)|*.ptb;|All files (*)|*"
msgstr "Проектни файлове (*.pto)|*.pto|Всички файлове (*)|*"
-#: PTBatcherGUI/BatchFrame.cpp:584
+#: PTBatcherGUI/BatchFrame.cpp:588
msgid "Cannot open app in Hugin."
msgstr ""
-#: PTBatcherGUI/BatchFrame.cpp:588
+#: PTBatcherGUI/BatchFrame.cpp:592
msgid "No project selected. Open Hugin without project?"
msgstr ""
-#: PTBatcherGUI/BatchFrame.cpp:588 PTBatcherGUI/BatchFrame.cpp:631
+#: PTBatcherGUI/BatchFrame.cpp:592 PTBatcherGUI/BatchFrame.cpp:635
msgid "Question"
msgstr ""
-#: PTBatcherGUI/BatchFrame.cpp:606
+#: PTBatcherGUI/BatchFrame.cpp:610
msgid "Batch paused"
msgstr ""
-#: PTBatcherGUI/BatchFrame.cpp:616
+#: PTBatcherGUI/BatchFrame.cpp:620
msgid "Continuing ...
[truncated message content] |
|
From: <st...@us...> - 2009-03-06 13:41:57
|
Revision: 3708
http://hugin.svn.sourceforge.net/hugin/?rev=3708&view=rev
Author: stativ
Date: 2009-03-06 13:41:42 +0000 (Fri, 06 Mar 2009)
Log Message:
-----------
Added test target to panorama makefile
Modified Paths:
--------------
hugin/trunk/src/hugin1/base_wx/RunStitchPanel.cpp
hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp
Modified: hugin/trunk/src/hugin1/base_wx/RunStitchPanel.cpp
===================================================================
--- hugin/trunk/src/hugin1/base_wx/RunStitchPanel.cpp 2009-03-06 00:17:57 UTC (rev 3707)
+++ hugin/trunk/src/hugin1/base_wx/RunStitchPanel.cpp 2009-03-06 13:41:42 UTC (rev 3708)
@@ -234,7 +234,7 @@
DEBUG_DEBUG("Overwrite existing images!");
}
- wxString args = wxT("-f ") + wxQuoteString(m_currentMakefn) + wxT(" all clean");
+ wxString args = wxT("-f ") + wxQuoteString(m_currentMakefn) + wxT(" test all clean");
wxString caption = wxString::Format(_("Stitching %s"), scriptFile.c_str());
Modified: hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp
===================================================================
--- hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp 2009-03-06 00:17:57 UTC (rev 3707)
+++ hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp 2009-03-06 13:41:42 UTC (rev 3708)
@@ -156,6 +156,12 @@
setlocale(LC_NUMERIC,"C");
#endif
+#ifdef __unix__
+ std::string NULL_DEVICE("/dev/null");
+#else // WINDOWS
+ std::string NULL_DEVICE("NUL");
+#endif
+
// output only images in current ROI
UIntSet images = getImagesinROI(pano,rimages);
@@ -258,7 +264,7 @@
o << "--compression " << opts.quality;
}
o << endl;
-
+
o << "ENBLEND_HDR_COMP=";
if (opts.outputImageType == "tif" && opts.outputImageTypeHDRCompression.size() != 0) {
o << "--compression " << opts.outputImageTypeHDRCompression;
@@ -720,6 +726,46 @@
<< "\t-$(RM) $(TEMP_FILES_SHELL)" << endl
<< endl;
+ // test rule
+ o << "test: " << endl;
+ // test remapper
+ switch(opts.remapper) {
+ case PanoramaOptions::NONA:
+ o << "\t@echo -n 'Checking nona...'" << endl
+ << "\t@$(NONA) --help > " << NULL_DEVICE << " 2>&1 && echo '[OK]'" << endl;
+ break;
+ case PanoramaOptions::PTMENDER:
+ break;
+ }
+ // test blender
+ switch(opts.blendMode) {
+ case PanoramaOptions::ENBLEND_BLEND:
+ o << "\t@echo -n 'Checking enblend...'" << endl
+ << "\t@$(ENBLEND) -h > " << NULL_DEVICE << " 2>&1 && echo '[OK]'" << endl;
+ break;
+ case PanoramaOptions::PTBLENDER_BLEND:
+ o << "\t@echo -n 'Checking PTblender...'" << endl
+ << "\t@$(PTBLENDER) -h > " << NULL_DEVICE << " 2>&1 && echo '[OK]'" << endl;
+ break;
+ case PanoramaOptions::SMARTBLEND_BLEND:
+ o << "\t@echo -n 'Checking smartblend...'" << endl
+ << "\t@$(SMARTBLEND) > " << NULL_DEVICE << " 2>&1 && echo '[OK]'" << endl;
+ break;
+ }
+ // test enfuse
+ o << "\t@echo -n 'Checking enfuse...'" << endl
+ << "\t@$(ENFUSE) -h > " << NULL_DEVICE << " 2>&1 && echo '[OK]'" << endl;
+ // test hugin_hdrmerge
+ o << "\t@echo -n 'Checking hugin_hdrmerge...'" << endl
+ << "\t@$(HDRMERGE) -h > " << NULL_DEVICE << " 2>&1 && echo '[OK]'" << endl;
+ // test exiftool
+ o << "\t@echo -n 'Checking exiftool...'" << endl
+ << "\t@-$(EXIFTOOL) -ver > " << NULL_DEVICE << " 2>&1 && echo '[OK]' || echo '[FAIL]'" << endl;
+ // test rm
+ o << "\t@echo -n 'Checking rm...'" << endl
+ << "\t@-$(RM) --version > " << NULL_DEVICE << " 2>&1 && echo '[OK]' || echo '[FAIL]'" << endl;
+ o << endl;
+
// ==============================
// output rules for all targets.
// remapped LDR images for exposure stacks.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tm...@us...> - 2009-03-11 06:34:25
|
Revision: 3718
http://hugin.svn.sourceforge.net/hugin/?rev=3718&view=rev
Author: tmodes
Date: 2009-03-11 06:34:20 +0000 (Wed, 11 Mar 2009)
Log Message:
-----------
Modified PTBatcherGUI to use xrc resource files
Modified Paths:
--------------
hugin/trunk/src/PTBatcherGUI/BatchFrame.cpp
hugin/trunk/src/PTBatcherGUI/BatchFrame.h
hugin/trunk/src/PTBatcherGUI/PTBatcherGUI.cpp
hugin/trunk/src/PTBatcherGUI/ProjectListBox.cpp
hugin/trunk/src/PTBatcherGUI/ProjectListBox.h
hugin/trunk/src/hugin1/hugin/xrc/CMakeLists.txt
Added Paths:
-----------
hugin/trunk/src/hugin1/hugin/xrc/batch_frame.xrc
hugin/trunk/src/hugin1/hugin/xrc/batch_menu.xrc
hugin/trunk/src/hugin1/hugin/xrc/batch_toolbar.xrc
Modified: hugin/trunk/src/PTBatcherGUI/BatchFrame.cpp
===================================================================
--- hugin/trunk/src/PTBatcherGUI/BatchFrame.cpp 2009-03-11 00:16:38 UTC (rev 3717)
+++ hugin/trunk/src/PTBatcherGUI/BatchFrame.cpp 2009-03-11 06:34:20 UTC (rev 3718)
@@ -29,213 +29,77 @@
//#include "PTBatcherGUI.h"
BEGIN_EVENT_TABLE(BatchFrame, wxFrame)
- EVT_TOOL(TOOLRUN,BatchFrame::OnButtonRunBatch)
- EVT_TOOL(TOOLPAUSE,BatchFrame::OnButtonPause)
- EVT_TOOL(TOOLSKIP,BatchFrame::OnButtonSkip)
- EVT_TOOL(TOOLCANCEL,BatchFrame::OnButtonCancel)
- EVT_TOOL(TOOLADD,BatchFrame::OnButtonAddToList)
- EVT_TOOL(TOOLREMOVE,BatchFrame::OnButtonRemoveFromList)
- EVT_TOOL(TOOLOPEN,BatchFrame::OnButtonOpenBatch)
- EVT_TOOL(TOOLSAVE,BatchFrame::OnButtonSaveBatch)
- EVT_TOOL(TOOLCLEAR,BatchFrame::OnButtonClear)
- EVT_TOOL(TOOLADDDIR,BatchFrame::OnButtonAddDir)
- EVT_BUTTON(BUTTONADD, BatchFrame::OnButtonAddToList)
- EVT_BUTTON(BUTTONCOMMAND, BatchFrame::OnButtonAddCommand)
- EVT_BUTTON(BUTTONREMOVE, BatchFrame::OnButtonRemoveFromList)
- EVT_BUTTON(BUTTONCOMPLETE, BatchFrame::OnButtonRemoveComplete)
- EVT_BUTTON(BUTTONCLEAR, BatchFrame::OnButtonClear)
- EVT_BUTTON(BUTTONPREFIX, BatchFrame::OnButtonChangePrefix)
- EVT_BUTTON(BUTTONRUN, BatchFrame::OnButtonRunBatch)
- EVT_BUTTON(BUTTONRESET, BatchFrame::OnButtonReset)
- EVT_BUTTON(BUTTONRESETALL, BatchFrame::OnButtonResetAll)
- EVT_BUTTON(BUTTONHUGIN, BatchFrame::OnButtonOpenWithHugin)
- EVT_BUTTON(BUTTONUP, BatchFrame::OnButtonMoveUp)
- EVT_BUTTON(BUTTONDOWN, BatchFrame::OnButtonMoveDown)
- EVT_MENU(MENUADD, BatchFrame::OnButtonAddToList)
- EVT_MENU(MENUHELP, BatchFrame::OnButtonHelp)
- EVT_CHECKBOX(CHECKPARALLEL, BatchFrame::OnCheckParallel)
- EVT_CHECKBOX(CHECKDELETE, BatchFrame::OnCheckDelete)
- EVT_CHECKBOX(CHECKSHUTDOWN, BatchFrame::OnCheckShutdown)
- EVT_CHECKBOX(CHECKOVERWRITE, BatchFrame::OnCheckOverwrite)
- EVT_CHECKBOX(CHECKVERBOSE, BatchFrame::OnCheckVerbose)
- EVT_SIZE(BatchFrame::OnSizeChange)
- EVT_END_PROCESS(-1, BatchFrame::OnProcessTerminate)
- EVT_CLOSE(BatchFrame::OnClose)
+ EVT_TOOL(XRCID("tool_clear"),BatchFrame::OnButtonClear)
+ EVT_TOOL(XRCID("tool_open"),BatchFrame::OnButtonOpenBatch)
+ EVT_TOOL(XRCID("tool_save"),BatchFrame::OnButtonSaveBatch)
+ EVT_TOOL(XRCID("tool_start"),BatchFrame::OnButtonRunBatch)
+ EVT_TOOL(XRCID("tool_skip"),BatchFrame::OnButtonSkip)
+ EVT_TOOL(XRCID("tool_pause"),BatchFrame::OnButtonPause)
+ EVT_TOOL(XRCID("tool_cancel"),BatchFrame::OnButtonCancel)
+ EVT_TOOL(XRCID("tool_add"),BatchFrame::OnButtonAddToList)
+ EVT_TOOL(XRCID("tool_remove"),BatchFrame::OnButtonRemoveFromList)
+ EVT_TOOL(XRCID("tool_adddir"),BatchFrame::OnButtonAddDir)
+ EVT_MENU(XRCID("menu_add"),BatchFrame::OnButtonAddToList)
+ EVT_MENU(XRCID("menu_remove"),BatchFrame::OnButtonRemoveFromList)
+ EVT_MENU(XRCID("menu_adddir"),BatchFrame::OnButtonAddDir)
+ EVT_MENU(XRCID("menu_open"),BatchFrame::OnButtonOpenBatch)
+ EVT_MENU(XRCID("menu_save"),BatchFrame::OnButtonSaveBatch)
+ EVT_MENU(XRCID("menu_clear"),BatchFrame::OnButtonClear)
+ EVT_MENU(XRCID("menu_exit"),BatchFrame::OnUserExit)
+ EVT_MENU(XRCID("menu_help"),BatchFrame::OnButtonHelp)
+ EVT_BUTTON(XRCID("button_addcommand"),BatchFrame::OnButtonAddCommand)
+ EVT_BUTTON(XRCID("button_remove"),BatchFrame::OnButtonRemoveComplete)
+ EVT_BUTTON(XRCID("button_prefix"),BatchFrame::OnButtonChangePrefix)
+ EVT_BUTTON(XRCID("button_reset"),BatchFrame::OnButtonReset)
+ EVT_BUTTON(XRCID("button_resetall"),BatchFrame::OnButtonResetAll)
+ EVT_BUTTON(XRCID("button_edit"),BatchFrame::OnButtonOpenWithHugin)
+ EVT_BUTTON(XRCID("button_move_up"),BatchFrame::OnButtonMoveUp)
+ EVT_BUTTON(XRCID("button_move_down"),BatchFrame::OnButtonMoveDown)
+ EVT_CHECKBOX(XRCID("cb_parallel"), BatchFrame::OnCheckParallel)
+ EVT_CHECKBOX(XRCID("cb_delete"), BatchFrame::OnCheckDelete)
+ EVT_CHECKBOX(XRCID("cb_overwrite"), BatchFrame::OnCheckOverwrite)
+ EVT_CHECKBOX(XRCID("cb_shutdown"), BatchFrame::OnCheckShutdown)
+ EVT_CHECKBOX(XRCID("cb_verbose"), BatchFrame::OnCheckVerbose)
+ EVT_END_PROCESS(-1, BatchFrame::OnProcessTerminate)
+ EVT_CLOSE(BatchFrame::OnClose)
END_EVENT_TABLE()
-BatchFrame::BatchFrame(const wxString &title, wxLocale* locale, wxString xrc) : wxFrame(NULL, wxID_ANY, title)
+BatchFrame::BatchFrame(wxLocale* locale, wxString xrc)
{
this->SetLocaleAndXRC(locale,xrc);
m_cancelled = false;
m_closeThread = false;
//m_paused = false;
- m_batch = new Batch(this,wxTheApp->argv[0],true);
- m_batch->gui = true;
- m_batch->LoadTemp();
m_help=0;
- //get saved size
- int width = wxConfigBase::Get()->Read(wxT("/BatchFrame/Width"), -1);
- int height = wxConfigBase::Get()->Read(wxT("/BatchFrame/Height"), -1);
- int max = wxConfigBase::Get()->Read(wxT("/BatchFrame/Max"), -1);;
- if((width != -1) && (height != -1))
- this->SetSize(width,height);
- else
- this->SetSize(600,400);
+ //load xrc resources
+ wxXmlResource::Get()->LoadFrame(this, (wxWindow* )NULL, wxT("batch_frame"));
+ // load our menu bar
+#ifdef __WXMAC__
+ wxApp::s_macExitMenuItemId = XRCID("menu_exit");
+ wxApp::s_macHelpMenuTitleName = _("&Help");
+#endif
+ SetMenuBar(wxXmlResource::Get()->LoadMenuBar(this, wxT("batch_menu")));
- if(max)
- this->Maximize();
- //this->GetSizer()->RecalcSizes();
-// this->GetSizer()->SetItemMinSize(this,500,200);
+ // create tool bar
+ SetToolBar(wxXmlResource::Get()->LoadToolBar(this, wxT("batch_toolbar")));
- wxMenu *fileMenu = new wxMenu();
- fileMenu->Append(MENUADD,_("Add project..."),
- _("Adds a project to the batch list."));
- wxMenu *fileMenu1 = new wxMenu();
- fileMenu1->Append(MENUHELP,_("Batch Stitcher help"),
- _("Open Batch Stitcher help."));
- wxMenuBar *menuBar = new wxMenuBar();
- menuBar->Append(fileMenu,_("File"));
-#if !defined __WXMAC__
- menuBar->Append(fileMenu1,_("Help"));
+ CreateStatusBar(1);
+ SetStatusText(_("Not doing much..."));
+
+ // set the minimize icon
+#ifdef __WXMSW__
+ wxIcon myIcon(m_xrcPrefix + wxT("data/icon.ico"),wxBITMAP_TYPE_ICO);
#else
- menuBar->Append(fileMenu1,wxApp::s_macHelpMenuTitleName);
+ wxIcon myIcon(m_xrcPrefix + wxT("data/icon.png"),wxBITMAP_TYPE_PNG);
#endif
- SetMenuBar(menuBar);
+ SetIcon(myIcon);
- CreateStatusBar(1,0,STATUSBAR);
- SetStatusText(_("Not doing much..."));
- /*wxImage image(_T("filenew.bmp"),wxBITMAP_TYPE_ANY);
- wxBitmap icon(image);
- wxToolBar *toolbar = new wxToolBar(this, -1);
- toolbar->AddTool(wxID_ANY, _T("some label"), icon, icon);*/
-
- //create resizable control window
- wxFlexGridSizer* topSizer = new wxFlexGridSizer(2,1,0,0);
- wxToolBar *toolbar = new wxToolBar(this, TOOLBAR,wxDefaultPosition,wxDefaultSize,wxBORDER_RAISED|wxTB_HORIZONTAL);
- toolbar->SetToolBitmapSize(wxSize(32,32));
-
- //wxImage::InitStandardHandlers();
- //wxImage image(_T("filenew.bmp"),wxBITMAP_TYPE_ANY);
- //InitAllImageHandlers();
- wxImage::AddHandler(new wxPNGHandler());
- //we get the directory of the program, so we can access icon files by absolute path
- //wxFileName dir(wxPathOnly(wxString::Format(_T("%s"),wxTheApp->argv[0])));
- //wxMessageBox(dir.GetPath());
- wxBitmap icon1(this->m_xrcPrefix+_T("data/media-playback-start.png"),wxBITMAP_TYPE_PNG);
- wxBitmap icon2(this->m_xrcPrefix+_T("data/media-playback-pause.png"),wxBITMAP_TYPE_PNG);
- //wxBitmap icon3(_T("../share/hugin/xrc/data/media-playback-stop.png"),wxBITMAP_TYPE_PNG);
- wxBitmap icon3(this->m_xrcPrefix+_T("data/media-skip-forward.png"),wxBITMAP_TYPE_PNG);
- //wxBitmap icon8(_T("E:/svn/huginbase/hugin-build/INSTALL/FILES/bin/emblem-symbolic-link.png"),wxBITMAP_TYPE_PNG);
- //wxBitmap icon9(_T("E:/svn/huginbase/hugin-build/INSTALL/FILES/bin/emblem-unreadable.png"),wxBITMAP_TYPE_PNG);
- wxBitmap icon7(this->m_xrcPrefix+_T("data/process-stop22.png"),wxBITMAP_TYPE_PNG);
- //wxBitmap icon4(_T("E:/svn/huginbase/hugin-build/INSTALL/FILES/bin/image-missing.png"),wxBITMAP_TYPE_PNG);
- //wxBitmap icon5(_T("E:/svn/huginbase/hugin-build/INSTALL/FILES/bin/go-jump.png"),wxBITMAP_TYPE_PNG);
- //wxBitmap icon6(_T("E:/svn/huginbase/hugin-build/INSTALL/FILES/bin/process-stop.png"),wxBITMAP_TYPE_PNG);
- wxBitmap icon10(this->m_xrcPrefix+_T("data/list-add.png"),wxBITMAP_TYPE_PNG);
- wxBitmap icon11(this->m_xrcPrefix+_T("data/list-remove.png"),wxBITMAP_TYPE_PNG);
- wxBitmap icon12(this->m_xrcPrefix+_T("data/document-new.png"),wxBITMAP_TYPE_PNG);
- wxBitmap icon13(this->m_xrcPrefix+_T("data/document-open.png"),wxBITMAP_TYPE_PNG);
- wxBitmap icon14(this->m_xrcPrefix+_T("data/media-floppy.png"),wxBITMAP_TYPE_PNG);
- wxBitmap icon15(this->m_xrcPrefix+_T("data/folder-saved-search.png"),wxBITMAP_TYPE_PNG);
- toolbar->AddTool(TOOLCLEAR, _("clear"), icon12, wxNullBitmap, wxITEM_NORMAL, _("Clear batch"), _("Clears the batch list"));
- toolbar->AddTool(TOOLOPEN, _("open"), icon13, wxNullBitmap, wxITEM_NORMAL, _("Open batch"), _("Opens a batch file with a list of projects"));
- toolbar->AddTool(TOOLSAVE, _("save"), icon14, wxNullBitmap, wxITEM_NORMAL, _("Save batch"), _("Saves a batch file with a list of projects"));
- toolbar->AddSeparator();
- toolbar->AddSeparator();
- toolbar->AddTool(TOOLRUN, _("start"), icon1, wxNullBitmap, wxITEM_NORMAL, _("Start batch"), _("Starts batch execution"));
- toolbar->AddTool(TOOLSKIP, _("skip"), icon3, wxNullBitmap, wxITEM_NORMAL, _("Skip project(s)"), _("Skips execution of currently running project(s)"));
- toolbar->AddTool(TOOLPAUSE, _("pause"), icon2, wxNullBitmap, wxITEM_CHECK, _("Pause batch"), _("Pauses batch execution"));
- toolbar->AddTool(TOOLCANCEL, _("cancel"), icon7, wxNullBitmap, wxITEM_NORMAL, _("Cancel batch"), _("Cancels batch execution"));
- toolbar->AddSeparator();
- toolbar->AddSeparator();
- toolbar->AddTool(TOOLADD, _("add"), icon10, wxNullBitmap, wxITEM_NORMAL, _("Add project(s)"), _("Appends project file(s) to the batch list"));
- //toolbar->AddSeparator();
- toolbar->AddTool(TOOLREMOVE, _("remove"), icon11, wxNullBitmap, wxITEM_NORMAL, _("Remove project"), _("Removes selected project from the batch list"));
- toolbar->AddTool(TOOLADDDIR, _("adddir"), icon15, wxNullBitmap, wxITEM_NORMAL, _("Search directory"), _("Appends all project files from a directory and subdirectories"));
+ m_batch = new Batch(this,wxTheApp->argv[0],true);
+ m_batch->gui = true;
+ m_batch->LoadTemp();
+ projListBox = XRCCTRL(*this,"project_listbox",ProjectListBox);
-
- /*toolbar->AddTool(wxID_ANY, _T("cancel"), icon4, wxNullBitmap, wxITEM_NORMAL, _T("Cancel batch"), _T("Cancels batch execution"));
- toolbar->AddTool(wxID_ANY, _T("cancel"), icon5, wxNullBitmap, wxITEM_NORMAL, _T("Cancel batch"), _T("Cancels batch execution"));
- toolbar->AddTool(wxID_ANY, _T("cancel"), icon6, wxNullBitmap, wxITEM_NORMAL, _T("Cancel batch"), _T("Cancels batch execution"));*/
- toolbar->Realize();
- //topSizer->AddGrowableRow(0,0);
-
- wxFlexGridSizer* firstSizer = new wxFlexGridSizer(1,2,0,0);
- firstSizer->AddGrowableRow(0,1);
- firstSizer->AddGrowableCol(0,1);
-
- topSizer->Add(toolbar,0,wxEXPAND);
- topSizer->Add(firstSizer,1,wxEXPAND);
- topSizer->AddGrowableRow(1,1);
- topSizer->AddGrowableCol(0,1);
- //wxBoxSizer *secondSizer = new wxBoxSizer(wxVERTICAL);
-
- projListBox = new ProjectListBox(this,PROJLISTBOX,wxPoint(0,0),wxSize(100,100),wxLC_REPORT | wxLC_SINGLE_SEL);
-
- firstSizer->Add(projListBox,1,wxEXPAND);
- wxPanel* panel = new wxPanel(this,wxID_ANY,wxPoint(width-140,0),wxSize(140,height));
- firstSizer->Add(panel,0,wxEXPAND);//,wxEXPAND | wxALL);
- //panel->SetMaxSize(wxSize(120,100));
-
- //we put all controls on the panel
-
- wxFlexGridSizer* panelSizer = new wxFlexGridSizer(13,1,0,0);
- /*for(int i=0; i<13; i++)
- panelSizer->AddGrowableRow(i,0);*/
- panelSizer->AddGrowableCol(0,0);
-
- /*removed because we have an icon
- wxButton* button = new wxButton(panel,BUTTONADD,_T("Add project(s)"),wxDefaultPosition,wxDefaultSize);
- panelSizer->Add(button,0,wxEXPAND);*/
- wxButton* button = new wxButton(panel,BUTTONCOMMAND,_("Add application"),wxDefaultPosition,wxDefaultSize);
- panelSizer->Add(button,0,wxEXPAND);
- /*removed because we have an icon
- button = new wxButton(panel,BUTTONREMOVE,_T("Remove project"),wxDefaultPosition,wxDefaultSize);
- panelSizer->Add(button,0,wxEXPAND);*/
- button = new wxButton(panel,BUTTONCOMPLETE,_("Remove complete"),wxDefaultPosition,wxDefaultSize);
- panelSizer->Add(button,0,wxEXPAND);
- /*removed because we have an icon
- button = new wxButton(panel,BUTTONCLEAR,_T("Clear Batch"),wxDefaultPosition,wxDefaultSize);
- panelSizer->Add(button,0,wxEXPAND);*/
- button = new wxButton(panel,BUTTONPREFIX,_("Change prefix"),wxDefaultPosition,wxDefaultSize);
- panelSizer->Add(button,0,wxEXPAND);
- /*button = new wxButton(panel,BUTTONRUN,_T("Run batch"),wxDefaultPosition,wxDefaultSize);
- panelSizer->Add(button,0,wxEXPAND);*/
- button = new wxButton(panel,BUTTONRESET,_("Reset project"),wxDefaultPosition,wxDefaultSize);
- panelSizer->Add(button,0,wxEXPAND);
- button = new wxButton(panel,BUTTONRESETALL,_("Reset all"),wxDefaultPosition,wxDefaultSize);
- panelSizer->Add(button,0,wxEXPAND);
- button = new wxButton(panel,BUTTONHUGIN,_("Edit with Hugin"),wxDefaultPosition,wxDefaultSize);
- panelSizer->Add(button,0,wxEXPAND);
- button = new wxButton(panel,BUTTONUP,_("Move project up"),wxDefaultPosition,wxDefaultSize);
- panelSizer->Add(button,0,wxEXPAND);
- button = new wxButton(panel,BUTTONDOWN,_("Move project down"),wxDefaultPosition,wxDefaultSize);
- panelSizer->Add(button,0,wxEXPAND);
- panelSizer->AddSpacer(10);
- wxCheckBox* check = new wxCheckBox(panel,CHECKPARALLEL,_("Parallel execution"),wxDefaultPosition,wxDefaultSize);
- panelSizer->Add(check,0,wxEXPAND);
- check = new wxCheckBox(panel,CHECKDELETE,_("Delete *.pto files"),wxDefaultPosition,wxDefaultSize);
- panelSizer->Add(check,0,wxEXPAND);
- check = new wxCheckBox(panel,CHECKOVERWRITE,_("Overwrite always"),wxDefaultPosition,wxDefaultSize);
- panelSizer->Add(check,0,wxEXPAND);
- check = new wxCheckBox(panel,CHECKSHUTDOWN,_("Shutdown when done"),wxDefaultPosition,wxDefaultSize);
- panelSizer->Add(check,0,wxEXPAND);
- check = new wxCheckBox(panel,CHECKVERBOSE,_("Verbose output"),wxDefaultPosition,wxDefaultSize);
- panelSizer->Add(check,0,wxEXPAND);
-
- panel->SetSizer(panelSizer);
-
- /*wxPanel* panel2 = new wxPanel(this,wxID_ANY,wxDefaultPosition,wxSize(120,100));
- button = new wxButton(panel2,wxID_ANY,_T("Run batch"),wxPoint(0,60),wxSize(120,20));
- secondSizer->Add(panel,0,wxEXPAND | wxALL);
- secondSizer->Add(panel2,1,wxEXPAND);
- firstSizer->Add(secondSizer,1);*/
- SetSizer(topSizer);
- //firstSizer->SetSizeHints( this );
- //firstSizer->Fit(this);
- Layout();
-
//projListMutex = new wxMutex();
this->wxThreadHelper::Create();
//wxMessageBox( _T("B"),_T("B"),wxOK | wxICON_INFORMATION );
@@ -385,6 +249,11 @@
return 0;
}
+void BatchFrame::OnUserExit(wxCommandEvent &event)
+{
+ Close(true);
+};
+
void BatchFrame::OnButtonAddCommand(wxCommandEvent &event)
{
wxTextEntryDialog dlg(this,_("Please enter the command-line application to execute:"),_("Enter application"));
@@ -419,7 +288,10 @@
dir.Traverse(traverser);
wxArrayString projects = traverser.GetProjectFiles();
for(unsigned int i=0; i<projects.GetCount(); i++)
+ {
m_batch->AddProjectToBatch(projects.Item(i));
+ projListBox->AppendProject(m_batch->GetProject(m_batch->GetProjectCount()-1));
+ };
SetStatusText(_("Added projects from dir ")+dlg.GetPath());
}
else { // bail
@@ -457,7 +329,7 @@
void BatchFrame::OnButtonCancel(wxCommandEvent &event)
{
- ((wxToolBar*)FindWindow(TOOLBAR))->ToggleTool(TOOLPAUSE,false);
+ GetToolBar()->ToggleTool(XRCID("tool_pause"),false);
m_cancelled = true;
m_batch->CancelBatch();
}
@@ -494,9 +366,9 @@
{
m_cancelled = true;
projListBox->DeleteAllItems();
- if(((wxToolBar*)FindWindow(TOOLBAR))->GetToolState(TOOLPAUSE))
+ if(GetToolBar()->GetToolState(XRCID("tool_pause")))
{
- ((wxToolBar*)FindWindow(TOOLBAR))->ToggleTool(TOOLPAUSE,false);
+ GetToolBar()->ToggleTool(XRCID("tool_pause"),false);
}
}
}
@@ -610,7 +482,7 @@
if(!m_batch->IsPaused())
{
m_batch->PauseBatch();
- ((wxToolBar*)FindWindow(TOOLBAR))->ToggleTool(TOOLPAUSE,true);
+ GetToolBar()->ToggleTool(XRCID("tool_pause"),true);
SetStatusText(_("Batch paused"));
}
//m_paused=true;
@@ -620,7 +492,7 @@
else//if(m_batch->paused)
{
m_batch->PauseBatch();
- ((wxToolBar*)FindWindow(TOOLBAR))->ToggleTool(TOOLPAUSE,false);
+ GetToolBar()->ToggleTool(XRCID("tool_pause"),false);
SetStatusText(_("Continuing batch..."));
}
//m_paused=false;
@@ -628,7 +500,7 @@
}
else //if no projects are running, we deactivate the button
{
- ((wxToolBar*)FindWindow(TOOLBAR))->ToggleTool(TOOLPAUSE,false);
+ GetToolBar()->ToggleTool(XRCID("tool_pause"),false);
}
}
void BatchFrame::OnButtonRemoveComplete(wxCommandEvent &event)
@@ -757,7 +629,7 @@
if(m_batch->GetStatus(selIndex)==Project::PAUSED)
{
if(m_batch->GetRunningCount()==1)
- ((wxToolBar*)FindWindow(TOOLBAR))->ToggleTool(TOOLPAUSE,false);
+ GetToolBar()->ToggleTool(XRCID("tool_pause"),false);
for(int i=0; i<m_batch->GetRunningCount(); i++)
{
if(m_batch->GetStatus(selIndex)==Project::PAUSED
@@ -808,7 +680,7 @@
void BatchFrame::OnCheckDelete(wxCommandEvent &event)
{
- if(((wxCheckBox*)FindWindow(CHECKDELETE))->GetValue())
+ if(event.IsChecked())
{
m_batch->deleteFiles = true;
wxConfigBase::Get()->Write(wxT("/BatchFrame/DeleteCheck"), 1);
@@ -823,7 +695,7 @@
void BatchFrame::OnCheckOverwrite(wxCommandEvent &event)
{
- if(((wxCheckBox*)FindWindow(CHECKOVERWRITE))->GetValue())
+ if(event.IsChecked())
{
m_batch->overwrite = true;
wxConfigBase::Get()->Write(wxT("/BatchFrame/OverwriteCheck"), 1);
@@ -836,7 +708,7 @@
}
void BatchFrame::OnCheckParallel(wxCommandEvent &event)
{
- if(((wxCheckBox*)FindWindow(CHECKPARALLEL))->GetValue())
+ if(event.IsChecked())
{
m_batch->parallel = true;
wxConfigBase::Get()->Write(wxT("/BatchFrame/ParallelCheck"), 1);
@@ -850,7 +722,7 @@
void BatchFrame::OnCheckShutdown(wxCommandEvent &event)
{
- if(((wxCheckBox*)FindWindow(CHECKSHUTDOWN))->GetValue())
+ if(event.IsChecked())
{
m_batch->shutdown = true;
wxConfigBase::Get()->Write(wxT("/BatchFrame/ShutdownCheck"), 1);
@@ -864,7 +736,7 @@
void BatchFrame::OnCheckVerbose(wxCommandEvent &event)
{
- if(((wxCheckBox*)FindWindow(CHECKVERBOSE))->GetValue())
+ if(event.IsChecked())
{
m_batch->verbose = true;
wxConfigBase::Get()->Write(wxT("/BatchFrame/VerboseCheck"), 1);
@@ -876,39 +748,44 @@
}
}
-
-
-
-
-
-
void BatchFrame::OnClose(wxCloseEvent &event)
{
//wxMessageBox(_T("Closing..."));
+ //save windows position
+ if(this->IsMaximized())
+ wxConfigBase::Get()->Write(wxT("/BatchFrame/Max"), 1);
+ else
+ {
+ wxConfigBase::Get()->Write(wxT("/BatchFrame/Max"), 0);
+ wxConfigBase::Get()->Write(wxT("/BatchFrame/Width"), this->GetSize().GetWidth());
+ wxConfigBase::Get()->Write(wxT("/BatchFrame/Height"), this->GetSize().GetHeight());
+ }
m_closeThread = true;
this->GetThread()->Wait();
//wxMessageBox(_T("Closing frame..."));
- event.Skip();
+ delete m_help;
+ this->Destroy();
}
+
void BatchFrame::PropagateDefaults()
{
- if(((wxCheckBox*)FindWindow(CHECKPARALLEL))->GetValue())
+ if(XRCCTRL(*this,"cb_parallel",wxCheckBox)->IsChecked())
m_batch->parallel = true;
else
m_batch->parallel = false;
- if(((wxCheckBox*)FindWindow(CHECKDELETE))->GetValue())
+ if(XRCCTRL(*this,"cb_delete",wxCheckBox)->IsChecked())
m_batch->deleteFiles = true;
else
m_batch->deleteFiles = false;
- if(((wxCheckBox*)FindWindow(CHECKSHUTDOWN))->GetValue())
+ if(XRCCTRL(*this,"cb_shutdown",wxCheckBox)->IsChecked())
m_batch->shutdown = true;
else
m_batch->shutdown = false;
- if(((wxCheckBox*)FindWindow(CHECKOVERWRITE))->GetValue())
+ if(XRCCTRL(*this,"cb_overwrite",wxCheckBox)->IsChecked())
m_batch->overwrite = true;
else
m_batch->overwrite = false;
- if(((wxCheckBox*)FindWindow(CHECKVERBOSE))->GetValue())
+ if(XRCCTRL(*this,"cb_verbose",wxCheckBox)->IsChecked())
m_batch->verbose = true;
else
m_batch->verbose = false;
@@ -951,7 +828,7 @@
delete framePtr;*/
//wxGetApp().stitchFrames.RemoveAt(i);
if(m_batch->GetRunningCount()==1)
- ((wxToolBar*)FindWindow(TOOLBAR))->ToggleTool(TOOLPAUSE,false);
+ GetToolBar()->ToggleTool(XRCID("tool_pause"),false);
event.Skip();
/*i = wxGetApp().GetIndex(event.GetId());
if (event.GetExitCode() != 0)
@@ -1016,19 +893,17 @@
}*/
}
-void BatchFrame::OnSizeChange(wxSizeEvent &event)
+void BatchFrame::RestoreSize()
{
- if(this->IsMaximized())
- wxConfigBase::Get()->Write(wxT("/BatchFrame/Max"), 1);
+ //get saved size
+ int width = wxConfigBase::Get()->Read(wxT("/BatchFrame/Width"), -1);
+ int height = wxConfigBase::Get()->Read(wxT("/BatchFrame/Height"), -1);
+ int max = wxConfigBase::Get()->Read(wxT("/BatchFrame/Max"), -1);;
+ if((width != -1) && (height != -1))
+ this->SetSize(width,height);
else
- {
- wxConfigBase::Get()->Write(wxT("/BatchFrame/Max"), 0);
- wxConfigBase::Get()->Write(wxT("/BatchFrame/Width"), event.GetSize().GetWidth());
- wxConfigBase::Get()->Write(wxT("/BatchFrame/Height"), event.GetSize().GetHeight());
- }
-
- if(this->GetSizer()!=NULL)
- {
- this->Layout();
- }
+ this->SetSize(600,400);
+
+ if(max)
+ this->Maximize();
}
Modified: hugin/trunk/src/PTBatcherGUI/BatchFrame.h
===================================================================
--- hugin/trunk/src/PTBatcherGUI/BatchFrame.h 2009-03-11 00:16:38 UTC (rev 3717)
+++ hugin/trunk/src/PTBatcherGUI/BatchFrame.h 2009-03-11 06:34:20 UTC (rev 3718)
@@ -37,10 +37,11 @@
{
public:
//Main constructor
- BatchFrame(const wxString& title, wxLocale* locale, wxString xrc);
+ BatchFrame(wxLocale* locale, wxString xrc);
//Main thread for all file polling - checking for new projects and updating modified ones.
void *Entry();
+ void OnUserExit(wxCommandEvent &event);
void OnButtonAddCommand(wxCommandEvent &event);
void OnButtonAddDir(wxCommandEvent &event);
void OnButtonAddToList(wxCommandEvent &event);
@@ -78,7 +79,7 @@
//Swaps the project entry at index in the list with the next (at index+1).
void SwapProject(int index);
//PanoramaOptions readOptions(wxString projectFile);
-
+ void RestoreSize();
//wxMutex* projListMutex;
ProjectListBox *projListBox;
@@ -94,7 +95,6 @@
wxHtmlHelpController * m_help;
void OnProcessTerminate(wxProcessEvent & event);
- void OnSizeChange(wxSizeEvent &event);
DECLARE_EVENT_TABLE()
//PTPrograms progs;
@@ -102,38 +102,4 @@
//DECLARE_APP(PTBatcherGUI)
-//component IDs
-const int BUTTONADD = 1;
-const int BUTTONREMOVE = 2;
-const int BUTTONRUN = 3;
-const int PROJLISTBOX = 4;
-const int MENUADD = 5;
-const int STATUSBAR = 6;
-const int CHECKPARALLEL = 7;
-const int CHECKDELETE = 8;
-const int BUTTONHUGIN = 9;
-const int BUTTONUP = 10;
-const int BUTTONDOWN = 11;
-const int BUTTONCOMMAND = 12;
-const int BUTTONPREFIX = 13;
-const int BUTTONCOMPLETE = 14;
-const int TOOLRUN = 15;
-const int TOOLPAUSE = 16;
-const int TOOLSKIP = 17;
-const int TOOLCANCEL = 18;
-const int TOOLBAR = 19;
-const int TOOLADD = 20;
-const int TOOLREMOVE = 21;
-const int BUTTONRESET = 22;
-const int BUTTONRESETALL = 23;
-const int BUTTONCLEAR = 24;
-const int CHECKSHUTDOWN = 25;
-const int CHECKOVERWRITE = 26;
-const int TOOLOPEN = 27;
-const int TOOLSAVE = 28;
-const int TOOLCLEAR = 29;
-const int TOOLADDDIR = 30;
-const int MENUHELP = 31;
-const int CHECKVERBOSE = 32;
-
#endif //BATCHFRAME_H
Modified: hugin/trunk/src/PTBatcherGUI/PTBatcherGUI.cpp
===================================================================
--- hugin/trunk/src/PTBatcherGUI/PTBatcherGUI.cpp 2009-03-11 00:16:38 UTC (rev 3717)
+++ hugin/trunk/src/PTBatcherGUI/PTBatcherGUI.cpp 2009-03-11 06:34:20 UTC (rev 3718)
@@ -30,7 +30,7 @@
IMPLEMENT_APP(PTBatcherGUI)
BEGIN_EVENT_TABLE(PTBatcherGUI, wxApp)
- EVT_LIST_ITEM_ACTIVATED(PROJLISTBOX,PTBatcherGUI::OnItemActivated)
+ EVT_LIST_ITEM_ACTIVATED(XRCID("project_listbox"),PTBatcherGUI::OnItemActivated)
EVT_KEY_DOWN(PTBatcherGUI::OnKeyDown)
END_EVENT_TABLE()
@@ -79,13 +79,29 @@
m_locale.AddCatalogLookupPathPrefix(wxT(INSTALL_LOCALE_DIR));
PTPrograms progs = getPTProgramsConfig(wxT(""), wxConfigBase::Get());
#endif
+
// update incompatible configuration entries.
updateHuginConfig(wxConfigBase::Get());
// set the name of locale recource to look for
m_locale.AddCatalog(wxT("hugin"));
- // parse arguments
+ if ( ! wxFile::Exists(m_xrcPrefix + wxT("/batch_frame.xrc")) ) {
+ wxMessageBox(_("xrc directory not found, hugin needs to be properly installed\nTried Path:" + m_xrcPrefix ), _("Fatal Error"));
+ return false;
+ }
+ // initialize image handlers
+ wxInitAllImageHandlers();
+
+ // Initialize all the XRC handlers.
+ wxXmlResource::Get()->InitAllHandlers();
+ wxXmlResource::Get()->AddHandler(new ProjectListBoxXmlHandler());
+ // load XRC files
+ wxXmlResource::Get()->Load(m_xrcPrefix + wxT("batch_frame.xrc"));
+ wxXmlResource::Get()->Load(m_xrcPrefix + wxT("batch_toolbar.xrc"));
+ wxXmlResource::Get()->Load(m_xrcPrefix + wxT("batch_menu.xrc"));
+
+ // parse arguments
static const wxCmdLineEntryDesc cmdLineDesc[] =
{
{ wxCMD_LINE_SWITCH, wxT("h"), wxT("help"), wxT("show this help message"),
@@ -135,7 +151,9 @@
} */
#endif
- m_frame = new BatchFrame(_("Batch Processor"),&m_locale,m_xrcPrefix);
+ m_frame = new BatchFrame(&m_locale,m_xrcPrefix);
+ m_frame->RestoreSize();
+ SetTopWindow(m_frame);
m_frame->Show(true);
//m_frame->SetLocaleAndXRC(&m_locale,m_xrcPrefix);
//projectsRunning=0;
@@ -217,59 +235,59 @@
}
if (parser.Found(wxT("d")) ) {
- ((wxCheckBox*)m_frame->FindWindow(CHECKDELETE))->SetValue(true);
+ XRCCTRL(*m_frame,"cb_delete",wxCheckBox)->SetValue(true);
wxConfigBase::Get()->Write(wxT("/BatchFrame/DeleteCheck"), 1);
}
else{
int del = wxConfigBase::Get()->Read(wxT("/BatchFrame/DeleteCheck"), (long)0);
if(del==0)
- ((wxCheckBox*)m_frame->FindWindow(CHECKDELETE))->SetValue(false);
+ XRCCTRL(*m_frame,"cb_delete",wxCheckBox)->SetValue(false);
else
- ((wxCheckBox*)m_frame->FindWindow(CHECKDELETE))->SetValue(true);
+ XRCCTRL(*m_frame,"cb_delete",wxCheckBox)->SetValue(true);
}
if (parser.Found(wxT("p")) ) {
- ((wxCheckBox*)m_frame->FindWindow(CHECKPARALLEL))->SetValue(true);
+ XRCCTRL(*m_frame,"cb_parallel",wxCheckBox)->SetValue(true);
wxConfigBase::Get()->Write(wxT("/BatchFrame/ParallelCheck"), 1);
}
else{
int par = wxConfigBase::Get()->Read(wxT("/BatchFrame/ParallelCheck"), (long)0);
if(par==0)
- ((wxCheckBox*)m_frame->FindWindow(CHECKPARALLEL))->SetValue(false);
+ XRCCTRL(*m_frame,"cb_parallel",wxCheckBox)->SetValue(false);
else
- ((wxCheckBox*)m_frame->FindWindow(CHECKPARALLEL))->SetValue(true);
+ XRCCTRL(*m_frame,"cb_parallel",wxCheckBox)->SetValue(true);
}
if (parser.Found(wxT("s")) ) {
- ((wxCheckBox*)m_frame->FindWindow(CHECKSHUTDOWN))->SetValue(true);
+ XRCCTRL(*m_frame,"cb_shutdown",wxCheckBox)->SetValue(true);
wxConfigBase::Get()->Write(wxT("/BatchFrame/ShutdownCheck"), 1);
}
else{
int shtdwn = wxConfigBase::Get()->Read(wxT("/BatchFrame/ShutdownCheck"), (long)0);
if(shtdwn==0)
- ((wxCheckBox*)m_frame->FindWindow(CHECKSHUTDOWN))->SetValue(false);
+ XRCCTRL(*m_frame,"cb_shutdown",wxCheckBox)->SetValue(false);
else
- ((wxCheckBox*)m_frame->FindWindow(CHECKSHUTDOWN))->SetValue(true);
+ XRCCTRL(*m_frame,"cb_shutdown",wxCheckBox)->SetValue(true);
}
if (parser.Found(wxT("o")) ) {
- ((wxCheckBox*)m_frame->FindWindow(CHECKOVERWRITE))->SetValue(true);
+ XRCCTRL(*m_frame,"cb_overwrite",wxCheckBox)->SetValue(true);
wxConfigBase::Get()->Write(wxT("/BatchFrame/OverwriteCheck"), 1);
}
else{
int overwrite = wxConfigBase::Get()->Read(wxT("/BatchFrame/OverwriteCheck"), (long)0);
if(overwrite==0)
- ((wxCheckBox*)m_frame->FindWindow(CHECKOVERWRITE))->SetValue(false);
+ XRCCTRL(*m_frame,"cb_overwrite",wxCheckBox)->SetValue(false);
else
- ((wxCheckBox*)m_frame->FindWindow(CHECKOVERWRITE))->SetValue(true);
+ XRCCTRL(*m_frame,"cb_overwrite",wxCheckBox)->SetValue(true);
}
if (parser.Found(wxT("v")) ) {
- ((wxCheckBox*)m_frame->FindWindow(CHECKVERBOSE))->SetValue(true);
+ XRCCTRL(*m_frame,"cb_verbose",wxCheckBox)->SetValue(true);
wxConfigBase::Get()->Write(wxT("/BatchFrame/VerboseCheck"), 1);
}
else{
int overwrite = wxConfigBase::Get()->Read(wxT("/BatchFrame/VerboseCheck"), (long)0);
if(overwrite==0)
- ((wxCheckBox*)m_frame->FindWindow(CHECKVERBOSE))->SetValue(false);
+ XRCCTRL(*m_frame,"cb_verbose",wxCheckBox)->SetValue(false);
else
- ((wxCheckBox*)m_frame->FindWindow(CHECKVERBOSE))->SetValue(true);
+ XRCCTRL(*m_frame,"cb_verbose",wxCheckBox)->SetValue(true);
}
m_frame->PropagateDefaults();
if (parser.Found(wxT("b")) ) {
Modified: hugin/trunk/src/PTBatcherGUI/ProjectListBox.cpp
===================================================================
--- hugin/trunk/src/PTBatcherGUI/ProjectListBox.cpp 2009-03-11 00:16:38 UTC (rev 3717)
+++ hugin/trunk/src/PTBatcherGUI/ProjectListBox.cpp 2009-03-11 06:34:20 UTC (rev 3718)
@@ -32,8 +32,11 @@
EVT_LIST_COL_END_DRAG(wxID_ANY, ProjectListBox::OnColumnWidthChange)
END_EVENT_TABLE()
-ProjectListBox::ProjectListBox(wxWindow* parent, wxWindowID id, wxPoint point, wxSize size, long style) : wxListCtrl(parent, id, point, size, style)
+bool ProjectListBox::Create(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name)
{
+ if (! wxListCtrl::Create(parent, id, pos, size, wxLC_REPORT | style) ) {
+ return false;
+ };
columns.Add(ID),
columns.Add(PROJECT);
columns.Add(PREFIX);
@@ -60,6 +63,7 @@
if(width != -1)
SetColumnWidth(i, width);
}
+ return true;
}
//public methods:
@@ -370,3 +374,34 @@
_T("BRIGHTNESS"),
_T("COLOR")
};
+
+IMPLEMENT_DYNAMIC_CLASS(ProjectListBox, wxListCtrl)
+
+ProjectListBoxXmlHandler::ProjectListBoxXmlHandler()
+ : wxListCtrlXmlHandler()
+{
+ AddWindowStyles();
+}
+
+wxObject *ProjectListBoxXmlHandler::DoCreateResource()
+{
+ XRC_MAKE_INSTANCE(cp, ProjectListBox)
+
+ cp->Create(m_parentAsWindow,
+ GetID(),
+ GetPosition(), GetSize(),
+ GetStyle(wxT("style")),
+ GetName());
+
+ SetupWindow( cp);
+
+ return cp;
+}
+
+bool ProjectListBoxXmlHandler::CanHandle(wxXmlNode *node)
+{
+ return IsOfClass(node, wxT("ProjectListBox"));
+}
+
+IMPLEMENT_DYNAMIC_CLASS(ProjectListBoxXmlHandler, wxListCtrlXmlHandler)
+
Modified: hugin/trunk/src/PTBatcherGUI/ProjectListBox.h
===================================================================
--- hugin/trunk/src/PTBatcherGUI/ProjectListBox.h 2009-03-11 00:16:38 UTC (rev 3717)
+++ hugin/trunk/src/PTBatcherGUI/ProjectListBox.h 2009-03-11 06:34:20 UTC (rev 3718)
@@ -25,6 +25,7 @@
*/
#include <wx/listctrl.h>
+#include <wx/xrc/xh_listc.h>
#include "../PTBatcher/ProjectArray.h"
#include "../PTBatcher/Batch.h"
@@ -32,7 +33,7 @@
{
public:
//Constructor
- ProjectListBox(wxWindow* parent, wxWindowID id, wxPoint point, wxSize size, long style);
+ bool Create(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxTAB_TRAVERSAL, const wxString& name = wxT("panel"));
//Appends project to list
void AppendProject(Project* project);
@@ -81,4 +82,16 @@
static const wxString colorCorrection[];
DECLARE_EVENT_TABLE()
+ DECLARE_DYNAMIC_CLASS(ProjectListBox)
};
+
+/** xrc handler */
+class ProjectListBoxXmlHandler : public wxListCtrlXmlHandler
+{
+ DECLARE_DYNAMIC_CLASS(ProjectListBoxXmlHandler)
+
+ public:
+ ProjectListBoxXmlHandler();
+ virtual wxObject *DoCreateResource();
+ virtual bool CanHandle(wxXmlNode *node);
+};
Modified: hugin/trunk/src/hugin1/hugin/xrc/CMakeLists.txt
===================================================================
--- hugin/trunk/src/hugin1/hugin/xrc/CMakeLists.txt 2009-03-11 00:16:38 UTC (rev 3717)
+++ hugin/trunk/src/hugin1/hugin/xrc/CMakeLists.txt 2009-03-11 06:34:20 UTC (rev 3718)
@@ -22,7 +22,10 @@
assistant_panel.xrc
main_frame.xrc
optimize_panel.xrc
- pano_panel.xrc)
+ pano_panel.xrc
+ batch_frame.xrc
+ batch_menu.xrc
+ batch_toolbar.xrc)
INSTALL(FILES ${XRCFILES} DESTINATION ${HUGINDATADIR}/xrc)
Added: hugin/trunk/src/hugin1/hugin/xrc/batch_frame.xrc
===================================================================
--- hugin/trunk/src/hugin1/hugin/xrc/batch_frame.xrc (rev 0)
+++ hugin/trunk/src/hugin1/hugin/xrc/batch_frame.xrc 2009-03-11 06:34:20 UTC (rev 3718)
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<resource>
+ <object class="wxFrame" name="batch_frame">
+ <title>Batch Processor</title>
+ <centered>1</centered>
+ <style>wxDEFAULT_FRAME_STYLE|wxCAPTION|wxSYSTEM_MENU|wxRESIZE_BORDER|wxMINIMIZE_BOX|wxMAXIMIZE_BOX|wxFULL_REPAINT_ON_RESIZE</style>
+ <object class="wxBoxSizer">
+ <object class="sizeritem">
+ <object class="wxPanel" name="panel_main">
+ <style>wxTAB_TRAVERSAL</style>
+ <object class="wxBoxSizer">
+ <orient>wxHORIZONTAL</orient>
+ <object class="sizeritem">
+ <object class="ProjectListBox" name="project_listbox">
+ <style>wxLC_REPORT|wxLC_SINGLE_SEL</style>
+ </object>
+ <option>1</option>
+ <flag>wxEXPAND</flag>
+ </object>
+ <object class="sizeritem">
+ <object class="wxBoxSizer">
+ <orient>wxVERTICAL</orient>
+ <object class="sizeritem">
+ <object class="wxButton" name="button_addcommand">
+ <label>Add application</label>
+ </object>
+ <flag>wxEXPAND</flag>
+ </object>
+ <object class="sizeritem">
+ <object class="wxButton" name="button_remove">
+ <label>Remove complete</label>
+ </object>
+ <flag>wxEXPAND</flag>
+ </object>
+ <object class="sizeritem">
+ <object class="wxButton" name="button_prefix">
+ <label>Change prefix</label>
+ </object>
+ <flag>wxEXPAND</flag>
+ </object>
+ <object class="sizeritem">
+ <object class="wxButton" name="button_reset">
+ <label>Reset project</label>
+ </object>
+ <flag>wxEXPAND</flag>
+ </object>
+ <object class="sizeritem">
+ <object class="wxButton" name="button_resetall">
+ <label>Reset all</label>
+ </object>
+ <flag>wxEXPAND</flag>
+ </object>
+ <object class="sizeritem">
+ <object class="wxButton" name="button_edit">
+ <label>Edit with Hugin</label>
+ </object>
+ <flag>wxEXPAND</flag>
+ </object>
+ <object class="sizeritem">
+ <object class="wxButton" name="button_move_up">
+ <label>Move project up</label>
+ </object>
+ <flag>wxEXPAND</flag>
+ </object>
+ <object class="sizeritem">
+ <object class="wxButton" name="button_move_down">
+ <label>Move project down</label>
+ </object>
+ <flag>wxEXPAND</flag>
+ </object>
+ <object class="spacer">
+ <size>0,12</size>
+ </object>
+ <object class="sizeritem">
+ <object class="wxCheckBox" name="cb_parallel">
+ <label>Parallel execution</label>
+ </object>
+ <flag>wxEXPAND</flag>
+ </object>
+ <object class="sizeritem">
+ <object class="wxCheckBox" name="cb_delete">
+ <label>Delete *.pto files</label>
+ </object>
+ <flag>wxEXPAND</flag>
+ </object>
+ <object class="sizeritem">
+ <object class="wxCheckBox" name="cb_overwrite">
+ <label>Overwrite always</label>
+ </object>
+ <flag>wxEXPAND</flag>
+ </object>
+ <object class="sizeritem">
+ <object class="wxCheckBox" name="cb_shutdown">
+ <label>Shutdown when done</label>
+ </object>
+ <flag>wxEXPAND</flag>
+ </object>
+ <object class="sizeritem">
+ <object class="wxCheckBox" name="cb_verbose">
+ <label>Verbose output</label>
+ </object>
+ <flag>wxEXPAND</flag>
+ </object>
+ </object>
+ <flag>wxALL|wxEXPAND</flag>
+ <border>5</border>
+ </object>
+ </object>
+ </object>
+ <option>1</option>
+ <flag>wxEXPAND</flag>
+ </object>
+ <orient>wxHORIZONTAL</orient>
+ </object>
+ </object>
+</resource>
Added: hugin/trunk/src/hugin1/hugin/xrc/batch_menu.xrc
===================================================================
--- hugin/trunk/src/hugin1/hugin/xrc/batch_menu.xrc (rev 0)
+++ hugin/trunk/src/hugin1/hugin/xrc/batch_menu.xrc 2009-03-11 06:34:20 UTC (rev 3718)
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<resource>
+ <object class="wxMenuBar" name="batch_menu">
+ <object class="wxMenu" name="file_menu">
+ <label>&File</label>
+ <object class="wxMenuItem" name="menu_add">
+ <label>Add project...</label>
+ <help>Adds a project to the batch list.</help>
+ </object>
+ <object class="wxMenuItem" name="menu_remove">
+ <label>Remove project</label>
+ <help>Removes selected project from the batch list</help>
+ </object>
+ <object class="wxMenuItem" name="menu_adddir">
+ <label>Search directory</label>
+ <help>Appends all project files from a directory and subdirectories</help>
+ </object>
+ <object class="separator"/>
+ <object class="wxMenuItem" name="menu_open">
+ <label>Open batch</label>
+ <help>Opens a batch file with a list of projects</help>
+ </object>
+ <object class="wxMenuItem" name="menu_save">
+ <label>Save batch</label>
+ <help>Saves a batch file with a list of projects</help>
+ </object>
+ <object class="wxMenuItem" name="menu_clear">
+ <label>Clear batch</label>
+ <help>Clears the batch list</help>
+ </object>
+ <object class="separator"/>
+ <object class="wxMenuItem" name="menu_exit">
+ <label>&Quit</label>
+ <help>Exit program</help>
+ </object>
+ </object>
+ <object class="wxMenu" name="help_menu">
+ <label>&Help</label>
+ <object class="wxMenuItem" name="menu_help">
+ <label>Batch Stitcher help</label>
+ <help>Open Batch Stitcher help.</help>
+ </object>
+ </object>
+ </object>
+</resource>
Added: hugin/trunk/src/hugin1/hugin/xrc/batch_toolbar.xrc
===================================================================
--- hugin/trunk/src/hugin1/hugin/xrc/batch_toolbar.xrc (rev 0)
+++ hugin/trunk/src/hugin1/hugin/xrc/batch_toolbar.xrc 2009-03-11 06:34:20 UTC (rev 3718)
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<resource>
+ <object class="wxToolBar" name="batch_toolbar">
+ <bitmapsize>32,32</bitmapsize>
+ <margins>2,2</margins>
+ <style>wxTB_FLAT|wxTB_DOCKABLE</style>
+ <object class="tool" name="tool_clear">
+ <bitmap>data/document-new.png</bitmap>
+ <tooltip>Clear batch</tooltip>
+ <longhelp>Clears the batch list</longhelp>
+ <label>clear</label>
+ </object>
+ <object class="tool" name="tool_open">
+ <bitmap>data/document-open.png</bitmap>
+ <tooltip>Open batch</tooltip>
+ <longhelp>Opens a batch file with a list of projects</longhelp>
+ <label>open</label>
+ </object>
+ <object class="tool" name="tool_save">
+ <bitmap>data/media-floppy.png</bitmap>
+ <tooltip>Save batch</tooltip>
+ <longhelp>Saves a batch file with a list of projects</longhelp>
+ <label>save</label>
+ </object>
+ <object class="separator"/>
+ <object class="tool" name="tool_start">
+ <bitmap>data/media-playback-start.png</bitmap>
+ <tooltip>Start batch</tooltip>
+ <longhelp>Starts batch execution</longhelp>
+ <label>start</label>
+ </object>
+ <object class="tool" name="tool_skip">
+ <bitmap>data/media-skip-forward.png</bitmap>
+ <tooltip>Skip project(s)</tooltip>
+ <longhelp>Skips execution of currently running project(s)</longhelp>
+ <label>skip</label>
+ </object>
+ <object class="tool" name="tool_pause">
+ <bitmap>data/media-playback-pause.png</bitmap>
+ <tooltip>Pause batch</tooltip>
+ <longhelp>Pauses batch execution</longhelp>
+ <label>pause</label>
+ </object>
+ <object class="tool" name="tool_cancel">
+ <bitmap>data/process-stop22.png</bitmap>
+ <tooltip>Cancel batch</tooltip>
+ <longhelp>Cancels batch execution</longhelp>
+ <label>cancel</label>
+ </object>
+ <object class="separator"/>
+ <object class="tool" name="tool_add">
+ <bitmap>data/list-add.png</bitmap>
+ <tooltip>Add project(s)</tooltip>
+ <longhelp>Appends project file(s) to the batch list</longhelp>
+ <label>add</label>
+ </object>
+ <object class="tool" name="tool_remove">
+ <bitmap>data/list-remove.png</bitmap>
+ <tooltip>Remove project</tooltip>
+ <longhelp>Removes selected project from the batch list</longhelp>
+ <label>remove</label>
+ </object>
+ <object class="tool" name="tool_adddir">
+ <bitmap>data/folder-saved-search.png</bitmap>
+ <tooltip>Search directory</tooltip>
+ <longhelp>Appends all project files from a directory and subdirectories</longhelp>
+ <label>adddir</label>
+ </object>
+ </object>
+</resource>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gko...@us...> - 2009-03-11 21:48:37
|
Revision: 3721
http://hugin.svn.sourceforge.net/hugin/?rev=3721&view=rev
Author: gkohlmeyer
Date: 2009-03-11 21:48:19 +0000 (Wed, 11 Mar 2009)
Log Message:
-----------
Code cosmetics to get rid of MSVC compiler warnings C4244, C4305 and C4800
Modified Paths:
--------------
hugin/trunk/src/celeste/CelesteGlobals.cpp
hugin/trunk/src/celeste/ContrastFilter.cpp
hugin/trunk/src/celeste/GaborFilter.cpp
hugin/trunk/src/celeste/GaborJet.cpp
hugin/trunk/src/celeste/LogPolar.cpp
hugin/trunk/src/celeste/Utilities.cpp
hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp
hugin/trunk/src/hugin1/hugin/ImagesPanel.cpp
hugin/trunk/src/hugin1/hugin/OptimizePanel.cpp
hugin/trunk/src/hugin1/hugin/OptimizePhotometricPanel.cpp
hugin/trunk/src/hugin1/hugin/VertexCoordRemapper.cpp
Modified: hugin/trunk/src/celeste/CelesteGlobals.cpp
===================================================================
--- hugin/trunk/src/celeste/CelesteGlobals.cpp 2009-03-11 20:50:15 UTC (rev 3720)
+++ hugin/trunk/src/celeste/CelesteGlobals.cpp 2009-03-11 21:48:19 UTC (rev 3721)
@@ -21,10 +21,10 @@
int gF = 6;
// -l : Lower bound of frequency
-float gL = 0.1;
+float gL = 0.1f;
// -u : Upper bound of frequency
-float gU = 1.8;
+float gU = 1.8f;
// Number of fiducials
int gNumLocs = 0;
Modified: hugin/trunk/src/celeste/ContrastFilter.cpp
===================================================================
--- hugin/trunk/src/celeste/ContrastFilter.cpp 2009-03-11 20:50:15 UTC (rev 3720)
+++ hugin/trunk/src/celeste/ContrastFilter.cpp 2009-03-11 21:48:19 UTC (rev 3721)
@@ -8,111 +8,111 @@
float CONTRAST[9][9] = {
{
- -0.00601522,
- -0.00815698,
- -0.00576532,
- -0.000761649,
- 0.00105624,
- -0.000761649,
- -0.00576532,
- -0.00815698,
- -0.00601522
+ -0.00601522f,
+ -0.00815698f,
+ -0.00576532f,
+ -0.000761649f,
+ 0.00105624f,
+ -0.000761649f,
+ -0.00576532f,
+ -0.00815698f,
+ -0.00601522f
},
{
- -0.00815698,
- -0.00235211,
- 0.00300229,
- -0.0157626,
- -0.0304662,
- -0.0157626,
- 0.00300229,
- -0.00235211,
- -0.00815698
+ -0.00815698f,
+ -0.00235211f,
+ 0.00300229f,
+ -0.0157626f,
+ -0.0304662f,
+ -0.0157626f,
+ 0.00300229f,
+ -0.00235211f,
+ -0.00815698f
},
{
- -0.00576532,
- 0.00300229,
- -0.0505102,
- -0.115416,
- -0.115769,
- -0.115416,
- -0.0505102,
- 0.00300229,
- -0.00576532
+ -0.00576532f,
+ 0.00300229f,
+ -0.0505102f,
+ -0.115416f,
+ -0.115769f,
+ -0.115416f,
+ -0.0505102f,
+ 0.00300229f,
+ -0.00576532f
},
{
- -0.000761649,
- -0.0157626,
- -0.115416,
- 0.0361012,
- 0.273771,
- 0.0361012,
- -0.115416,
- -0.0157626,
- -0.000761649
+ -0.000761649f,
+ -0.0157626f,
+ -0.115416f,
+ 0.0361012f,
+ 0.273771f,
+ 0.0361012f,
+ -0.115416f,
+ -0.0157626f,
+ -0.000761649f
},
{
- 0.00105624,
- -0.0304662,
- -0.115769,
- 0.273771,
- 0.719623,
- 0.273771,
- -0.115769,
- -0.0304662,
- 0.00105624
+ 0.00105624f,
+ -0.0304662f,
+ -0.115769f,
+ 0.273771f,
+ 0.719623f,
+ 0.273771f,
+ -0.115769f,
+ -0.0304662f,
+ 0.00105624f
},
{
- -0.000761649,
- -0.0157626,
- -0.115416,
- 0.0361012,
- 0.273771,
- 0.0361012,
- -0.115416,
- -0.0157626,
- -0.000761649
+ -0.000761649f,
+ -0.0157626f,
+ -0.115416f,
+ 0.0361012f,
+ 0.273771f,
+ 0.0361012f,
+ -0.115416f,
+ -0.0157626f,
+ -0.000761649f
},
{
- -0.00576532,
- 0.00300229,
- -0.0505102,
- -0.115416,
- -0.115769,
- -0.115416,
- -0.0505102,
- 0.00300229,
- -0.00576532
+ -0.00576532f,
+ 0.00300229f,
+ -0.0505102f,
+ -0.115416f,
+ -0.115769f,
+ -0.115416f,
+ -0.0505102f,
+ 0.00300229f,
+ -0.00576532f
},
{
- -0.00815698,
- -0.00235211,
- 0.00300229,
- -0.0157626,
- -0.0304662,
- -0.0157626,
- 0.00300229,
- -0.00235211,
- -0.00815698
+ -0.00815698f,
+ -0.00235211f,
+ 0.00300229f,
+ -0.0157626f,
+ -0.0304662f,
+ -0.0157626f,
+ 0.00300229f,
+ -0.00235211f,
+ -0.00815698f
},
{
- -0.00601522,
- -0.00815698,
- -0.00576532,
- -0.000761649,
- 0.00105624,
- -0.000761649,
- -0.00576532,
- -0.00815698,
- -0.00601522
+ -0.00601522f,
+ -0.00815698f,
+ -0.00576532f,
+ -0.000761649f,
+ 0.00105624f,
+ -0.000761649f,
+ -0.00576532f,
+ -0.00815698f,
+ -0.00601522f
}};
// construct class and apply filter
Modified: hugin/trunk/src/celeste/GaborFilter.cpp
===================================================================
--- hugin/trunk/src/celeste/GaborFilter.cpp 2009-03-11 20:50:15 UTC (rev 3720)
+++ hugin/trunk/src/celeste/GaborFilter.cpp 2009-03-11 21:48:19 UTC (rev 3721)
@@ -17,7 +17,7 @@
GaborFilter::GaborFilter()
{
mRadius = 16;
- mSigma = M_PI;
+ mSigma = (float)(M_PI);
mAngle = 0;
mPhase = 0;
mFrequency = 1.0;
@@ -54,7 +54,7 @@
mSigma = s;
mAngle = a;
mPhase = p;
- mFrequency = f * M_PI / 2.0;
+ mFrequency = (float)(f * M_PI / 2.0);
// allocate memory for this filter
mReal = new float*[mRadius]; // real part of filter
@@ -78,7 +78,7 @@
// calculate sin-cos sum
sincos = mFrequency * ( y * cos( mAngle ) - x * sin( mAngle ) );
mReal[i][j] = exponential * sin( sincos );
- mImaginary[i][j] = exponential * ( cos( sincos ) - exp((-1.0*M_PI*M_PI)/2.0) );
+ mImaginary[i][j] = exponential * ( cos( sincos ) - exp( (float)((-1.0*M_PI*M_PI)/2.0f) ) );
}
}
}
Modified: hugin/trunk/src/celeste/GaborJet.cpp
===================================================================
--- hugin/trunk/src/celeste/GaborJet.cpp 2009-03-11 20:50:15 UTC (rev 3720)
+++ hugin/trunk/src/celeste/GaborJet.cpp 2009-03-11 21:48:19 UTC (rev 3721)
@@ -48,7 +48,7 @@
mWidth = x;
mX = x0;
mY = y0;
- mSigma = s * M_PI * M_PI;
+ mSigma = (float)(s * M_PI * M_PI);
mAngles = a;
mFreqs = f;
mRadius = r;
@@ -62,7 +62,7 @@
for ( i = 0; i < mAngles; i++ )
{
// calculate angle
- angle = (float)i * M_PI / (float)mAngles;
+ angle = (float)((float)i * M_PI / (float)mAngles);
// allocate filters for this angle
mFilters[i] = new GaborFilter[mFreqs];
Modified: hugin/trunk/src/celeste/LogPolar.cpp
===================================================================
--- hugin/trunk/src/celeste/LogPolar.cpp 2009-03-11 20:50:15 UTC (rev 3720)
+++ hugin/trunk/src/celeste/LogPolar.cpp 2009-03-11 21:48:19 UTC (rev 3721)
@@ -66,11 +66,11 @@
for( k = 0; k < mHeight; k++ )
{
- theta = 2.0 * M_PI * (float)k / (float)mHeight;
+ theta = (float)(2.0 * M_PI * (float)k / (float)mHeight);
for( l = 0; l < mWidth; l++ )
{
- rho = exp( log( (float)mMinHW / 2.0 ) * (float)l / (float)mWidth );
+ rho = exp( log( (float)((float)mMinHW / 2.0) ) * (float)l / (float)mWidth );
x = rho * cos( theta );
y = rho * sin( theta );
@@ -88,8 +88,8 @@
for( j = g-1; j <= g+1; j++ )
sum += img[i][j];
- mPolarized[k][l] = sum / 9.0;
- mCoords[f][g] = 255.0;
+ mPolarized[k][l] = sum / 9.0f;
+ mCoords[f][g] = 255.0f;
}
}
}
Modified: hugin/trunk/src/celeste/Utilities.cpp
===================================================================
--- hugin/trunk/src/celeste/Utilities.cpp 2009-03-11 20:50:15 UTC (rev 3720)
+++ hugin/trunk/src/celeste/Utilities.cpp 2009-03-11 21:48:19 UTC (rev 3721)
@@ -55,13 +55,13 @@
float Heavyside( float a )
{
// if a is larger than 0.5, return 1.0, else return 0.0
- return( ( a > 0.5 ) ? 1.0 : 0.0 );
+ return (float)( ( a > 0.5 ) ? 1.0 : 0.0 );
}
float Sigmoid( float act )
{
- return ( 1.0 / ( 1.0 + exp( -1.0 * act ) ) );
+ return (float)( 1.0 / ( 1.0 + exp( -1.0 * act ) ) );
}
@@ -69,12 +69,12 @@
// untested
float Sigmoid( float beta, float a_pot )
{
- return ( 1.0 / ( 1.0 + exp( beta * a_pot ) ) );
+ return (float)( 1.0 / ( 1.0 + exp( beta * a_pot ) ) );
}
float Sigmoid( float beta, float a_pot, float thresh )
{
- return ( 1.0 / ( 1.0 + exp( beta * a_pot + thresh ) ) );
+ return (float)( 1.0 / ( 1.0 + exp( beta * a_pot + thresh ) ) );
}
// Create a matrix and fill it with constant given in parameter
@@ -233,7 +233,7 @@
{
float diff = val1 - val2;
- if ( diff < 0.0 ) return ( 0.0 - diff );
+ if ( diff < 0.0 ) return (float)( 0.0 - diff );
else return diff;
}
@@ -253,7 +253,7 @@
float SafeAbs( float val )
{
- if ( val < 0.0 ) return ( 0.0 - val );
+ if ( val < 0.0 ) return (float)( 0.0 - val );
else return val;
}
Modified: hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp 2009-03-11 20:50:15 UTC (rev 3720)
+++ hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp 2009-03-11 21:48:19 UTC (rev 3721)
@@ -405,7 +405,7 @@
}
// Run Celeste
- bool t = wxConfigBase::Get()->Read(wxT("/Celeste/Auto"), HUGIN_CELESTE_AUTO);
+ bool t = (wxConfigBase::Get()->Read(wxT("/Celeste/Auto"), HUGIN_CELESTE_AUTO) != 0);
if (t && m_pano->getNrOfCtrlPoints())
{
@@ -473,7 +473,7 @@
wxConfigBase::Get()->Read(wxT("/Celeste/Threshold"), &threshold, HUGIN_CELESTE_THRESHOLD);
// Mask resolution - 1 sets it to fine
- bool t = wxConfigBase::Get()->Read(wxT("/Celeste/Filter"), HUGIN_CELESTE_FILTER);
+ bool t = (wxConfigBase::Get()->Read(wxT("/Celeste/Filter"), HUGIN_CELESTE_FILTER) != 0);
if (t){
//cerr <<"---Celeste--- Using small filter" << endl;
gRadius = 10;
Modified: hugin/trunk/src/hugin1/hugin/ImagesPanel.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/ImagesPanel.cpp 2009-03-11 20:50:15 UTC (rev 3720)
+++ hugin/trunk/src/hugin1/hugin/ImagesPanel.cpp 2009-03-11 21:48:19 UTC (rev 3721)
@@ -807,7 +807,7 @@
wxConfigBase::Get()->Read(wxT("/Celeste/Threshold"), &threshold, HUGIN_CELESTE_THRESHOLD);
// Mask resolution - 1 sets it to fine
- bool t = wxConfigBase::Get()->Read(wxT("/Celeste/Filter"), HUGIN_CELESTE_FILTER);
+ bool t = (wxConfigBase::Get()->Read(wxT("/Celeste/Filter"), HUGIN_CELESTE_FILTER) != 0);
if (t){
//cerr <<"---Celeste--- Using small filter" << endl;
gRadius = 10;
Modified: hugin/trunk/src/hugin1/hugin/OptimizePanel.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/OptimizePanel.cpp 2009-03-11 20:50:15 UTC (rev 3720)
+++ hugin/trunk/src/hugin1/hugin/OptimizePanel.cpp 2009-03-11 21:48:19 UTC (rev 3721)
@@ -100,7 +100,7 @@
m_only_active_images_cb = XRCCTRL(*this, "optimizer_only_active_images", wxCheckBox);
DEBUG_ASSERT(m_only_active_images_cb);
- m_only_active_images_cb->SetValue(wxConfigBase::Get()->Read(wxT("/OptimizePanel/OnlyActiveImages"),1l));
+ m_only_active_images_cb->SetValue(wxConfigBase::Get()->Read(wxT("/OptimizePanel/OnlyActiveImages"),1l) != 0);
m_yaw_list = XRCCTRL(*this, "optimizer_yaw_list", wxCheckListBox);
Modified: hugin/trunk/src/hugin1/hugin/OptimizePhotometricPanel.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/OptimizePhotometricPanel.cpp 2009-03-11 20:50:15 UTC (rev 3720)
+++ hugin/trunk/src/hugin1/hugin/OptimizePhotometricPanel.cpp 2009-03-11 21:48:19 UTC (rev 3721)
@@ -90,7 +90,7 @@
m_only_active_images_cb = XRCCTRL(*this, "optimize_photo_only_active_images", wxCheckBox);
DEBUG_ASSERT(m_only_active_images_cb);
- m_only_active_images_cb->SetValue(wxConfigBase::Get()->Read(wxT("/OptimizeOptimizePhotometricPanelPanel/OnlyActiveImages"),1l));
+ m_only_active_images_cb->SetValue(wxConfigBase::Get()->Read(wxT("/OptimizeOptimizePhotometricPanelPanel/OnlyActiveImages"),1l) != 0);
m_vig_list = XRCCTRL(*this, "optimize_photo_vig_list", wxCheckListBox);
DEBUG_ASSERT(m_vig_list);
Modified: hugin/trunk/src/hugin1/hugin/VertexCoordRemapper.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/VertexCoordRemapper.cpp 2009-03-11 20:50:15 UTC (rev 3720)
+++ hugin/trunk/src/hugin1/hugin/VertexCoordRemapper.cpp 2009-03-11 21:48:19 UTC (rev 3721)
@@ -931,8 +931,8 @@
return 0; // no more faces
}
// where does this split?
- bool sx = nodes[cur_tree_node].flags & split_flag_x,
- sy = nodes[cur_tree_node].flags & split_flag_y;
+ bool sx = ((nodes[cur_tree_node].flags & split_flag_x) != 0);
+ bool sy = ((nodes[cur_tree_node].flags & split_flag_y) != 0);
// have we used all the split options?
if (!(((sx && xd) || !sx) && ((sy && yd) || !sy)))
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tm...@us...> - 2009-03-14 07:11:20
|
Revision: 3729
http://hugin.svn.sourceforge.net/hugin/?rev=3729&view=rev
Author: tmodes
Date: 2009-03-14 07:11:10 +0000 (Sat, 14 Mar 2009)
Log Message:
-----------
Fix for Hugin starts only once from PTBatcherGUI [2194458]
Modified Paths:
--------------
hugin/trunk/src/PTBatcherGUI/BatchFrame.cpp
hugin/trunk/src/hugin1/hugin/MainFrame.cpp
hugin/trunk/src/hugin1/hugin/huginApp.cpp
Modified: hugin/trunk/src/PTBatcherGUI/BatchFrame.cpp
===================================================================
--- hugin/trunk/src/PTBatcherGUI/BatchFrame.cpp 2009-03-14 07:04:20 UTC (rev 3728)
+++ hugin/trunk/src/PTBatcherGUI/BatchFrame.cpp 2009-03-14 07:11:10 UTC (rev 3729)
@@ -26,7 +26,7 @@
#include "BatchFrame.h"
#include <wx/stdpaths.h>
-//#include "PTBatcherGUI.h"
+#include "PTBatcherGUI.h"
BEGIN_EVENT_TABLE(BatchFrame, wxFrame)
EVT_TOOL(XRCID("tool_clear"),BatchFrame::OnButtonClear)
@@ -449,7 +449,7 @@
void BatchFrame::OnButtonOpenWithHugin(wxCommandEvent &event)
{
#ifdef __WINDOWS__
- wxString huginPath = wxConfigBase::Get()->Read(wxT("/startDir"), wxGetCwd())+wxFileName::GetPathSeparator();
+ wxString huginPath = getExePath(wxGetApp().argv[0])+wxFileName::GetPathSeparator();
#else
wxString huginPath = _T(""); //we call hugin directly without path on linux
#endif
Modified: hugin/trunk/src/hugin1/hugin/MainFrame.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/MainFrame.cpp 2009-03-14 07:04:20 UTC (rev 3728)
+++ hugin/trunk/src/hugin1/hugin/MainFrame.cpp 2009-03-14 07:11:10 UTC (rev 3729)
@@ -1225,7 +1225,7 @@
void MainFrame::OnOpenPTBatcher(wxCommandEvent & e)
{
#ifdef __WINDOWS__
- wxString huginPath = wxConfigBase::Get()->Read(wxT("/startDir"), wxGetCwd())+wxFileName::GetPathSeparator();
+ wxString huginPath = getExePath(wxGetApp().argv[0])+wxFileName::GetPathSeparator();
#else
wxString huginPath = _T(""); //we call the batch processor directly without path on linux
#endif
Modified: hugin/trunk/src/hugin1/hugin/huginApp.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/huginApp.cpp 2009-03-14 07:04:20 UTC (rev 3728)
+++ hugin/trunk/src/hugin1/hugin/huginApp.cpp 2009-03-14 07:11:10 UTC (rev 3729)
@@ -268,7 +268,6 @@
frame->Show(TRUE);
wxString cwd = wxFileName::GetCwd();
- config->Write( wxT("startDir"), cwd );
m_workDir = config->Read(wxT("tempDir"),wxT(""));
// FIXME, make secure against some symlink attacks
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bru...@us...> - 2009-04-16 21:05:52
|
Revision: 3790
http://hugin.svn.sourceforge.net/hugin/?rev=3790&view=rev
Author: brunopostle
Date: 2009-04-16 21:05:41 +0000 (Thu, 16 Apr 2009)
Log Message:
-----------
more doxygen tweaks
Modified Paths:
--------------
hugin/trunk/src/Doxyfile
Added Paths:
-----------
hugin/trunk/src/dox/footerFile
hugin/trunk/src/dox/headerFile
Modified: hugin/trunk/src/Doxyfile
===================================================================
--- hugin/trunk/src/Doxyfile 2009-04-16 19:57:33 UTC (rev 3789)
+++ hugin/trunk/src/Doxyfile 2009-04-16 21:05:41 UTC (rev 3790)
@@ -80,9 +80,13 @@
#---------------------------------------------------------------------------
INPUT = ./
FILE_PATTERNS = *.h \
+ *.c \
+ *.cpp \
+ *.hxx \
+ *.cxx \
*.dox
RECURSIVE = YES
-EXCLUDE =
+EXCLUDE = foreign/
EXCLUDE_SYMLINKS = YES
EXCLUDE_PATTERNS =
EXAMPLE_PATH =
@@ -112,9 +116,9 @@
#---------------------------------------------------------------------------
GENERATE_HTML = YES
HTML_OUTPUT = html
-HTML_FILE_EXTENSION = .html
-HTML_HEADER =
-HTML_FOOTER =
+HTML_FILE_EXTENSION = .shtml
+HTML_HEADER = dox/headerFile
+HTML_FOOTER = dox/footerFile
HTML_STYLESHEET =
HTML_ALIGN_MEMBERS = YES
GENERATE_HTMLHELP = NO
Added: hugin/trunk/src/dox/footerFile
===================================================================
--- hugin/trunk/src/dox/footerFile (rev 0)
+++ hugin/trunk/src/dox/footerFile 2009-04-16 21:05:41 UTC (rev 3790)
@@ -0,0 +1,5 @@
+</div>
+<hr size="1"><address style="align: right;"><small>
+Generated on $datetime for $projectname by <a href="http://www.doxygen.org/index.html"><img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> $doxygenversion</small></address>
+</body>
+</html>
Added: hugin/trunk/src/dox/headerFile
===================================================================
--- hugin/trunk/src/dox/headerFile (rev 0)
+++ hugin/trunk/src/dox/headerFile 2009-04-16 21:05:41 UTC (rev 3790)
@@ -0,0 +1,12 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<title>$title</title>
+<style media="screen" type="text/css" title="Screen style sheet">
+@import url(/css/normal.css);
+</style>
+<link rel="icon" href="/css/icon.png" type="image/png" />
+<link href="$relpath$doxygen.css" rel="stylesheet" type="text/css">
+</head><body>
+<!--#include virtual="/ssi/menu.html"-->
+<div class="content">
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bru...@us...> - 2009-04-21 21:58:20
|
Revision: 3796
http://hugin.svn.sourceforge.net/hugin/?rev=3796&view=rev
Author: brunopostle
Date: 2009-04-21 21:58:14 +0000 (Tue, 21 Apr 2009)
Log Message:
-----------
Fix for svn 3783
Modified Paths:
--------------
hugin/trunk/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Control_Points_table.html
hugin/trunk/src/translations/bg.po
hugin/trunk/src/translations/ca_ES.po
hugin/trunk/src/translations/cs_CZ.po
hugin/trunk/src/translations/de.po
hugin/trunk/src/translations/en_GB.po
hugin/trunk/src/translations/es.po
hugin/trunk/src/translations/fr.po
hugin/trunk/src/translations/hu.po
hugin/trunk/src/translations/hugin.pot
hugin/trunk/src/translations/it.po
hugin/trunk/src/translations/ja.po
hugin/trunk/src/translations/ko.po
hugin/trunk/src/translations/nl.po
hugin/trunk/src/translations/pl.po
hugin/trunk/src/translations/pt_BR.po
hugin/trunk/src/translations/ru.po
hugin/trunk/src/translations/sk.po
hugin/trunk/src/translations/sl.po
hugin/trunk/src/translations/sv.po
hugin/trunk/src/translations/uk.po
hugin/trunk/src/translations/zh_CN.po
Modified: hugin/trunk/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Control_Points_table.html
===================================================================
--- hugin/trunk/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Control_Points_table.html 2009-04-21 20:39:25 UTC (rev 3795)
+++ hugin/trunk/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Control_Points_table.html 2009-04-21 21:58:14 UTC (rev 3796)
@@ -48,8 +48,8 @@
</p><p>The list of points can be sorted by clicking on one of the column titles, clicking twice will reverse the sort:
</p>
<ul><li> <b>G CP#</b>, the global (project-wide) index number of the control point pair, deleting points will renumber the list.
-</li><li> <b>left Img.</b>, the index number of the first image in the pair (<i>left/right</i> has no significance except that this is the order they are shown in the <a href="Hugin_Control_Points_tab.html" title="Hugin Control Points tab">hugin Control Points tab</a>).
-</li><li> <b>right Img.</b>, the index number of the second image in the pair.
+</li><li> <b>Left Img.</b>, the index number of the first image in the pair (<i>left/right</i> has no significance except that this is the order they are shown in the <a href="Hugin_Control_Points_tab.html" title="Hugin Control Points tab">hugin Control Points tab</a>).
+</li><li> <b>Right Img.</b>, the index number of the second image in the pair.
</li><li> <b>P CP#</b>, the local index number (of two images shown in the <a href="Hugin_Control_Points_tab.html" title="Hugin Control Points tab">Hugin Control Points tab</a>) of the control point pair, deleting points will renumber the list.
</li><li> <b>Alignment</b>, the type of control point, these can be normal control points, <a href="Horizontal_control_points.html" title="Horizontal control points">horizontal control points</a>, <a href="Vertical_control_points.html" title="Vertical control points">vertical control points</a> or <a href="Straight_line_control_points.html" title="Straight line control points">straight line control points</a>.
</li><li> <b>Distance</b>, the distance in pixels between a perfect alignment and the actual alignment achieved by the optimiser. Otherwise, after selecting <b>Fine-tune all Points</b> from the <b>Edit</b> menu, this column shows the correlation between the points (0.0 indicates no correlation and 1.00 indicates 100% correlation) - Typically values over 0.8 show that the image areas around each point of the pair are very similar (an 80% correlation).
Modified: hugin/trunk/src/translations/bg.po
===================================================================
--- hugin/trunk/src/translations/bg.po 2009-04-21 20:39:25 UTC (rev 3795)
+++ hugin/trunk/src/translations/bg.po 2009-04-21 21:58:14 UTC (rev 3796)
@@ -724,7 +724,7 @@
msgstr "Събитието не можа да се обработи!"
#: hugin1/hugin/CPListFrame.cpp:284 hugin1/hugin/CPListFrame.cpp:294
-msgid "left Img."
+msgid "Left Img."
msgstr "Ляво изображение"
#: hugin1/hugin/CPListFrame.cpp:285 hugin1/hugin/CPListFrame.cpp:288
@@ -737,7 +737,7 @@
msgstr "y"
#: hugin1/hugin/CPListFrame.cpp:287 hugin1/hugin/CPListFrame.cpp:295
-msgid "right Img."
+msgid "Right Img."
msgstr "Дясно изображение"
#: hugin1/hugin/CPListFrame.cpp:293
Modified: hugin/trunk/src/translations/ca_ES.po
===================================================================
--- hugin/trunk/src/translations/ca_ES.po 2009-04-21 20:39:25 UTC (rev 3795)
+++ hugin/trunk/src/translations/ca_ES.po 2009-04-21 21:58:14 UTC (rev 3796)
@@ -695,7 +695,7 @@
msgstr "No es pot processar l'esdeveniment !"
#: hugin1/hugin/CPListFrame.cpp:284 hugin1/hugin/CPListFrame.cpp:294
-msgid "left Img."
+msgid "Left Img."
msgstr "imatge de la dreta"
#: hugin1/hugin/CPListFrame.cpp:285 hugin1/hugin/CPListFrame.cpp:288
@@ -708,7 +708,7 @@
msgstr "y"
#: hugin1/hugin/CPListFrame.cpp:287 hugin1/hugin/CPListFrame.cpp:295
-msgid "right Img."
+msgid "Right Img."
msgstr "imatge de la dreta"
#: hugin1/hugin/CPListFrame.cpp:293
Modified: hugin/trunk/src/translations/cs_CZ.po
===================================================================
--- hugin/trunk/src/translations/cs_CZ.po 2009-04-21 20:39:25 UTC (rev 3795)
+++ hugin/trunk/src/translations/cs_CZ.po 2009-04-21 21:58:14 UTC (rev 3796)
@@ -727,7 +727,7 @@
msgstr "Nelze provést událost!"
#: hugin1/hugin/CPListFrame.cpp:284 hugin1/hugin/CPListFrame.cpp:294
-msgid "left Img."
+msgid "Left Img."
msgstr "levý obr."
#: hugin1/hugin/CPListFrame.cpp:285 hugin1/hugin/CPListFrame.cpp:288
@@ -740,7 +740,7 @@
msgstr "y"
#: hugin1/hugin/CPListFrame.cpp:287 hugin1/hugin/CPListFrame.cpp:295
-msgid "right Img."
+msgid "Right Img."
msgstr "pravý obr."
#: hugin1/hugin/CPListFrame.cpp:293
Modified: hugin/trunk/src/translations/de.po
===================================================================
--- hugin/trunk/src/translations/de.po 2009-04-21 20:39:25 UTC (rev 3795)
+++ hugin/trunk/src/translations/de.po 2009-04-21 21:58:14 UTC (rev 3796)
@@ -719,7 +719,7 @@
msgstr "Interner Fehler: Konnte Ereignis nicht verarbeiten"
#: hugin1/hugin/CPListFrame.cpp:284 hugin1/hugin/CPListFrame.cpp:294
-msgid "left Img."
+msgid "Left Img."
msgstr "linkes Bild"
#: hugin1/hugin/CPListFrame.cpp:285 hugin1/hugin/CPListFrame.cpp:288
@@ -732,7 +732,7 @@
msgstr "y"
#: hugin1/hugin/CPListFrame.cpp:287 hugin1/hugin/CPListFrame.cpp:295
-msgid "right Img."
+msgid "Right Img."
msgstr "rechtes Bild"
#: hugin1/hugin/CPListFrame.cpp:293
Modified: hugin/trunk/src/translations/en_GB.po
===================================================================
--- hugin/trunk/src/translations/en_GB.po 2009-04-21 20:39:25 UTC (rev 3795)
+++ hugin/trunk/src/translations/en_GB.po 2009-04-21 21:58:14 UTC (rev 3796)
@@ -644,7 +644,7 @@
msgstr ""
#: hugin1/hugin/CPListFrame.cpp:284 hugin1/hugin/CPListFrame.cpp:294
-msgid "left Img."
+msgid "Left Img."
msgstr ""
#: hugin1/hugin/CPListFrame.cpp:285 hugin1/hugin/CPListFrame.cpp:288
@@ -657,7 +657,7 @@
msgstr ""
#: hugin1/hugin/CPListFrame.cpp:287 hugin1/hugin/CPListFrame.cpp:295
-msgid "right Img."
+msgid "Right Img."
msgstr ""
#: hugin1/hugin/CPListFrame.cpp:293
Modified: hugin/trunk/src/translations/es.po
===================================================================
--- hugin/trunk/src/translations/es.po 2009-04-21 20:39:25 UTC (rev 3795)
+++ hugin/trunk/src/translations/es.po 2009-04-21 21:58:14 UTC (rev 3796)
@@ -721,7 +721,7 @@
#: hugin1/hugin/CPListFrame.cpp:284 hugin1/hugin/CPListFrame.cpp:294
#, fuzzy
-msgid "left Img."
+msgid "Left Img."
msgstr "Img. izq."
#: hugin1/hugin/CPListFrame.cpp:285 hugin1/hugin/CPListFrame.cpp:288
@@ -735,7 +735,7 @@
#: hugin1/hugin/CPListFrame.cpp:287 hugin1/hugin/CPListFrame.cpp:295
#, fuzzy
-msgid "right Img."
+msgid "Right Img."
msgstr "Img. dcha."
#: hugin1/hugin/CPListFrame.cpp:293
Modified: hugin/trunk/src/translations/fr.po
===================================================================
--- hugin/trunk/src/translations/fr.po 2009-04-21 20:39:25 UTC (rev 3795)
+++ hugin/trunk/src/translations/fr.po 2009-04-21 21:58:14 UTC (rev 3796)
@@ -724,7 +724,7 @@
msgstr "Impossible de traiter l'événement !"
#: hugin1/hugin/CPListFrame.cpp:284 hugin1/hugin/CPListFrame.cpp:294
-msgid "left Img."
+msgid "Left Img."
msgstr "image de gauche"
#: hugin1/hugin/CPListFrame.cpp:285 hugin1/hugin/CPListFrame.cpp:288
@@ -737,7 +737,7 @@
msgstr "y"
#: hugin1/hugin/CPListFrame.cpp:287 hugin1/hugin/CPListFrame.cpp:295
-msgid "right Img."
+msgid "Right Img."
msgstr "image de droite"
#: hugin1/hugin/CPListFrame.cpp:293
Modified: hugin/trunk/src/translations/hu.po
===================================================================
--- hugin/trunk/src/translations/hu.po 2009-04-21 20:39:25 UTC (rev 3795)
+++ hugin/trunk/src/translations/hu.po 2009-04-21 21:58:14 UTC (rev 3796)
@@ -704,7 +704,7 @@
msgstr "Nem feldolgozható eset!"
#: hugin1/hugin/CPListFrame.cpp:284 hugin1/hugin/CPListFrame.cpp:294
-msgid "left Img."
+msgid "Left Img."
msgstr "bal kép"
#: hugin1/hugin/CPListFrame.cpp:285 hugin1/hugin/CPListFrame.cpp:288
@@ -717,7 +717,7 @@
msgstr "y"
#: hugin1/hugin/CPListFrame.cpp:287 hugin1/hugin/CPListFrame.cpp:295
-msgid "right Img."
+msgid "Right Img."
msgstr "jobb kép"
#: hugin1/hugin/CPListFrame.cpp:293
Modified: hugin/trunk/src/translations/hugin.pot
===================================================================
--- hugin/trunk/src/translations/hugin.pot 2009-04-21 20:39:25 UTC (rev 3795)
+++ hugin/trunk/src/translations/hugin.pot 2009-04-21 21:58:14 UTC (rev 3796)
@@ -641,7 +641,7 @@
msgstr ""
#: hugin1/hugin/CPListFrame.cpp:284 hugin1/hugin/CPListFrame.cpp:294
-msgid "left Img."
+msgid "Left Img."
msgstr ""
#: hugin1/hugin/CPListFrame.cpp:285 hugin1/hugin/CPListFrame.cpp:288
@@ -654,7 +654,7 @@
msgstr ""
#: hugin1/hugin/CPListFrame.cpp:287 hugin1/hugin/CPListFrame.cpp:295
-msgid "right Img."
+msgid "Right Img."
msgstr ""
#: hugin1/hugin/CPListFrame.cpp:293
Modified: hugin/trunk/src/translations/it.po
===================================================================
--- hugin/trunk/src/translations/it.po 2009-04-21 20:39:25 UTC (rev 3795)
+++ hugin/trunk/src/translations/it.po 2009-04-21 21:58:14 UTC (rev 3796)
@@ -741,7 +741,7 @@
msgstr "Impossibile controllare l'evento."
#: hugin1/hugin/CPListFrame.cpp:284 hugin1/hugin/CPListFrame.cpp:294
-msgid "left Img."
+msgid "Left Img."
msgstr "Imm. sinistra"
#: hugin1/hugin/CPListFrame.cpp:285 hugin1/hugin/CPListFrame.cpp:288
@@ -754,7 +754,7 @@
msgstr "y"
#: hugin1/hugin/CPListFrame.cpp:287 hugin1/hugin/CPListFrame.cpp:295
-msgid "right Img."
+msgid "Right Img."
msgstr "Imm. destra"
#: hugin1/hugin/CPListFrame.cpp:293
Modified: hugin/trunk/src/translations/ja.po
===================================================================
--- hugin/trunk/src/translations/ja.po 2009-04-21 20:39:25 UTC (rev 3795)
+++ hugin/trunk/src/translations/ja.po 2009-04-21 21:58:14 UTC (rev 3796)
@@ -720,7 +720,7 @@
#: hugin1/hugin/CPListFrame.cpp:284
#: hugin1/hugin/CPListFrame.cpp:294
-msgid "left Img."
+msgid "Left Img."
msgstr "画像左"
#: hugin1/hugin/CPListFrame.cpp:285
@@ -739,7 +739,7 @@
#: hugin1/hugin/CPListFrame.cpp:287
#: hugin1/hugin/CPListFrame.cpp:295
-msgid "right Img."
+msgid "Right Img."
msgstr "画像右"
#: hugin1/hugin/CPListFrame.cpp:293
Modified: hugin/trunk/src/translations/ko.po
===================================================================
--- hugin/trunk/src/translations/ko.po 2009-04-21 20:39:25 UTC (rev 3795)
+++ hugin/trunk/src/translations/ko.po 2009-04-21 21:58:14 UTC (rev 3796)
@@ -710,7 +710,7 @@
msgstr "이벤트를 처리할 수 없습니다"
#: hugin1/hugin/CPListFrame.cpp:284 hugin1/hugin/CPListFrame.cpp:294
-msgid "left Img."
+msgid "Left Img."
msgstr "왼쪽 이미지"
#: hugin1/hugin/CPListFrame.cpp:285 hugin1/hugin/CPListFrame.cpp:288
@@ -723,7 +723,7 @@
msgstr "y"
#: hugin1/hugin/CPListFrame.cpp:287 hugin1/hugin/CPListFrame.cpp:295
-msgid "right Img."
+msgid "Right Img."
msgstr "오른쪽 이미지"
#: hugin1/hugin/CPListFrame.cpp:293
Modified: hugin/trunk/src/translations/nl.po
===================================================================
--- hugin/trunk/src/translations/nl.po 2009-04-21 20:39:25 UTC (rev 3795)
+++ hugin/trunk/src/translations/nl.po 2009-04-21 21:58:14 UTC (rev 3796)
@@ -725,7 +725,7 @@
#: hugin1/hugin/CPListFrame.cpp:284
#: hugin1/hugin/CPListFrame.cpp:294
-msgid "left Img."
+msgid "Left Img."
msgstr "linker Afb."
#: hugin1/hugin/CPListFrame.cpp:285
@@ -744,7 +744,7 @@
#: hugin1/hugin/CPListFrame.cpp:287
#: hugin1/hugin/CPListFrame.cpp:295
-msgid "right Img."
+msgid "Right Img."
msgstr "rechter Afb."
#: hugin1/hugin/CPListFrame.cpp:293
Modified: hugin/trunk/src/translations/pl.po
===================================================================
--- hugin/trunk/src/translations/pl.po 2009-04-21 20:39:25 UTC (rev 3795)
+++ hugin/trunk/src/translations/pl.po 2009-04-21 21:58:14 UTC (rev 3796)
@@ -723,7 +723,7 @@
msgstr "Nie można obsłużyć wydarzenia!"
#: hugin1/hugin/CPListFrame.cpp:284 hugin1/hugin/CPListFrame.cpp:294
-msgid "left Img."
+msgid "Left Img."
msgstr "lewe zdjęcie"
#: hugin1/hugin/CPListFrame.cpp:285 hugin1/hugin/CPListFrame.cpp:288
@@ -736,7 +736,7 @@
msgstr "y"
#: hugin1/hugin/CPListFrame.cpp:287 hugin1/hugin/CPListFrame.cpp:295
-msgid "right Img."
+msgid "Right Img."
msgstr "prawe zdjęcie"
#: hugin1/hugin/CPListFrame.cpp:293
Modified: hugin/trunk/src/translations/pt_BR.po
===================================================================
--- hugin/trunk/src/translations/pt_BR.po 2009-04-21 20:39:25 UTC (rev 3795)
+++ hugin/trunk/src/translations/pt_BR.po 2009-04-21 21:58:14 UTC (rev 3796)
@@ -705,7 +705,7 @@
msgstr "Não foi possível processar o evento!"
#: hugin1/hugin/CPListFrame.cpp:284 hugin1/hugin/CPListFrame.cpp:294
-msgid "left Img."
+msgid "Left Img."
msgstr "Img. esquerda"
#: hugin1/hugin/CPListFrame.cpp:285 hugin1/hugin/CPListFrame.cpp:288
@@ -718,7 +718,7 @@
msgstr "y"
#: hugin1/hugin/CPListFrame.cpp:287 hugin1/hugin/CPListFrame.cpp:295
-msgid "right Img."
+msgid "Right Img."
msgstr "Img. direita"
#: hugin1/hugin/CPListFrame.cpp:293
Modified: hugin/trunk/src/translations/ru.po
===================================================================
--- hugin/trunk/src/translations/ru.po 2009-04-21 20:39:25 UTC (rev 3795)
+++ hugin/trunk/src/translations/ru.po 2009-04-21 21:58:14 UTC (rev 3796)
@@ -725,7 +725,7 @@
#: hugin1/hugin/CPListFrame.cpp:284
#: hugin1/hugin/CPListFrame.cpp:294
-msgid "left Img."
+msgid "Left Img."
msgstr "Снимок слева"
#: hugin1/hugin/CPListFrame.cpp:285
@@ -744,7 +744,7 @@
#: hugin1/hugin/CPListFrame.cpp:287
#: hugin1/hugin/CPListFrame.cpp:295
-msgid "right Img."
+msgid "Right Img."
msgstr "Снимок справа"
#: hugin1/hugin/CPListFrame.cpp:293
Modified: hugin/trunk/src/translations/sk.po
===================================================================
--- hugin/trunk/src/translations/sk.po 2009-04-21 20:39:25 UTC (rev 3795)
+++ hugin/trunk/src/translations/sk.po 2009-04-21 21:58:14 UTC (rev 3796)
@@ -713,7 +713,7 @@
msgstr "Nie je možné spracovať udalosť!"
#: hugin1/hugin/CPListFrame.cpp:284 hugin1/hugin/CPListFrame.cpp:294
-msgid "left Img."
+msgid "Left Img."
msgstr "ľavý obr."
#: hugin1/hugin/CPListFrame.cpp:285 hugin1/hugin/CPListFrame.cpp:288
@@ -726,7 +726,7 @@
msgstr "y"
#: hugin1/hugin/CPListFrame.cpp:287 hugin1/hugin/CPListFrame.cpp:295
-msgid "right Img."
+msgid "Right Img."
msgstr "pravý obr."
#: hugin1/hugin/CPListFrame.cpp:293
Modified: hugin/trunk/src/translations/sl.po
===================================================================
--- hugin/trunk/src/translations/sl.po 2009-04-21 20:39:25 UTC (rev 3795)
+++ hugin/trunk/src/translations/sl.po 2009-04-21 21:58:14 UTC (rev 3796)
@@ -647,7 +647,7 @@
#: hugin1/hugin/CPListFrame.cpp:284
#: hugin1/hugin/CPListFrame.cpp:294
-msgid "left Img."
+msgid "Left Img."
msgstr "leva slika"
#: hugin1/hugin/CPListFrame.cpp:285
@@ -666,7 +666,7 @@
#: hugin1/hugin/CPListFrame.cpp:287
#: hugin1/hugin/CPListFrame.cpp:295
-msgid "right Img."
+msgid "Right Img."
msgstr "desna slika"
#: hugin1/hugin/CPListFrame.cpp:293
Modified: hugin/trunk/src/translations/sv.po
===================================================================
--- hugin/trunk/src/translations/sv.po 2009-04-21 20:39:25 UTC (rev 3795)
+++ hugin/trunk/src/translations/sv.po 2009-04-21 21:58:14 UTC (rev 3796)
@@ -712,7 +712,7 @@
msgstr "Kunde inte processa event"
#: hugin1/hugin/CPListFrame.cpp:284 hugin1/hugin/CPListFrame.cpp:294
-msgid "left Img."
+msgid "Left Img."
msgstr "vänster bild"
#: hugin1/hugin/CPListFrame.cpp:285 hugin1/hugin/CPListFrame.cpp:288
@@ -725,7 +725,7 @@
msgstr "y"
#: hugin1/hugin/CPListFrame.cpp:287 hugin1/hugin/CPListFrame.cpp:295
-msgid "right Img."
+msgid "Right Img."
msgstr "höger bild"
#: hugin1/hugin/CPListFrame.cpp:293
Modified: hugin/trunk/src/translations/uk.po
===================================================================
--- hugin/trunk/src/translations/uk.po 2009-04-21 20:39:25 UTC (rev 3795)
+++ hugin/trunk/src/translations/uk.po 2009-04-21 21:58:14 UTC (rev 3796)
@@ -708,7 +708,7 @@
msgstr "Не вдалося обробити подію!"
#: hugin1/hugin/CPListFrame.cpp:284 hugin1/hugin/CPListFrame.cpp:294
-msgid "left Img."
+msgid "Left Img."
msgstr "Зобр. зліва."
#: hugin1/hugin/CPListFrame.cpp:285 hugin1/hugin/CPListFrame.cpp:288
@@ -721,7 +721,7 @@
msgstr "y"
#: hugin1/hugin/CPListFrame.cpp:287 hugin1/hugin/CPListFrame.cpp:295
-msgid "right Img."
+msgid "Right Img."
msgstr "Зобр. справа."
#: hugin1/hugin/CPListFrame.cpp:293
Modified: hugin/trunk/src/translations/zh_CN.po
===================================================================
--- hugin/trunk/src/translations/zh_CN.po 2009-04-21 20:39:25 UTC (rev 3795)
+++ hugin/trunk/src/translations/zh_CN.po 2009-04-21 21:58:14 UTC (rev 3796)
@@ -691,7 +691,7 @@
msgstr "不能处理事件!"
#: hugin1/hugin/CPListFrame.cpp:284 hugin1/hugin/CPListFrame.cpp:294
-msgid "left Img."
+msgid "Left Img."
msgstr "左边图像"
#: hugin1/hugin/CPListFrame.cpp:285 hugin1/hugin/CPListFrame.cpp:288
@@ -704,7 +704,7 @@
msgstr "y"
#: hugin1/hugin/CPListFrame.cpp:287 hugin1/hugin/CPListFrame.cpp:295
-msgid "right Img."
+msgid "Right Img."
msgstr "右边图像"
#: hugin1/hugin/CPListFrame.cpp:293
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gpa...@us...> - 2009-04-26 20:12:11
|
Revision: 3803
http://hugin.svn.sourceforge.net/hugin/?rev=3803&view=rev
Author: gpatters1
Date: 2009-04-26 20:12:07 +0000 (Sun, 26 Apr 2009)
Log Message:
-----------
Compute errors for control points after loading an existing project
Modified Paths:
--------------
hugin/trunk/src/hugin1/hugin/wxPanoCommand.cpp
hugin/trunk/src/hugin1/hugin/wxPanoCommand.h
hugin/trunk/src/hugin_base/CMakeLists.txt
hugin/trunk/src/hugin_base/panotools/PanoToolsOptimizerWrapper.cpp
Modified: hugin/trunk/src/hugin1/hugin/wxPanoCommand.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/wxPanoCommand.cpp 2009-04-26 09:40:36 UTC (rev 3802)
+++ hugin/trunk/src/hugin1/hugin/wxPanoCommand.cpp 2009-04-26 20:12:07 UTC (rev 3803)
@@ -409,6 +409,8 @@
DEBUG_ERROR("could not load panotools script");
}
in.close();
+ // Update control point error values
+ HuginBase::PTools::calcCtrlPointErrors(pano);
pano.changeFinished();
}
Modified: hugin/trunk/src/hugin1/hugin/wxPanoCommand.h
===================================================================
--- hugin/trunk/src/hugin1/hugin/wxPanoCommand.h 2009-04-26 09:40:36 UTC (rev 3802)
+++ hugin/trunk/src/hugin1/hugin/wxPanoCommand.h 2009-04-26 20:12:07 UTC (rev 3803)
@@ -26,6 +26,7 @@
#ifndef _WXPANOCOMMAND__H
#define _WXPANOCOMMAND__H
+#include "PT/PanoToolsUtils.h"
#include "PT/PanoCommand.h"
#include "common/stl_utils.h"
#include "vigra/impex.hxx"
Modified: hugin/trunk/src/hugin_base/CMakeLists.txt
===================================================================
--- hugin/trunk/src/hugin_base/CMakeLists.txt 2009-04-26 09:40:36 UTC (rev 3802)
+++ hugin/trunk/src/hugin_base/CMakeLists.txt 2009-04-26 20:12:07 UTC (rev 3803)
@@ -51,6 +51,7 @@
panodata/SrcPanoImage.cpp
panotools/PanoToolsInterface.cpp
panotools/PanoToolsOptimizerWrapper.cpp
+panotools/PanoToolsUtils.cpp
vigra_ext/emor.cpp
vigra_ext/MultiThreadOperations.cpp
)
Modified: hugin/trunk/src/hugin_base/panotools/PanoToolsOptimizerWrapper.cpp
===================================================================
--- hugin/trunk/src/hugin_base/panotools/PanoToolsOptimizerWrapper.cpp 2009-04-26 09:40:36 UTC (rev 3802)
+++ hugin/trunk/src/hugin_base/panotools/PanoToolsOptimizerWrapper.cpp 2009-04-26 20:12:07 UTC (rev 3803)
@@ -233,5 +233,4 @@
}
#endif
-
}} //namespace
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gpa...@us...> - 2009-05-15 15:39:23
|
Revision: 3855
http://hugin.svn.sourceforge.net/hugin/?rev=3855&view=rev
Author: gpatters1
Date: 2009-05-15 15:39:14 +0000 (Fri, 15 May 2009)
Log Message:
-----------
Removed jhead from build environment entirely.
Modified Paths:
--------------
hugin/trunk/src/CMakeLists.txt
hugin/trunk/src/foreign/CMakeLists.txt
Removed Paths:
-------------
hugin/trunk/src/foreign/jhead/
Modified: hugin/trunk/src/CMakeLists.txt
===================================================================
--- hugin/trunk/src/CMakeLists.txt 2009-05-15 15:13:43 UTC (rev 3854)
+++ hugin/trunk/src/CMakeLists.txt 2009-05-15 15:39:14 UTC (rev 3855)
@@ -3,12 +3,12 @@
IF (MSVC)
# boost_thread is linked automatically
# additionally link to our getopt
- set(common_libs huginbase huginjhead hugingetopt
+ set(common_libs huginbase hugingetopt
${PANO_LIBRARIES} huginlevmar)
include_directories( ${CMAKE_SOURCE_DIR}/src/foreign/getopt/include )
ELSE (MSVC)
# need to specify boost thread library
- set(common_libs huginbase huginjhead
+ set(common_libs huginbase
${Boost_thread_LIBRARIES} ${PANO_LIBRARIES} huginlevmar)
ENDIF (MSVC)
Modified: hugin/trunk/src/foreign/CMakeLists.txt
===================================================================
--- hugin/trunk/src/foreign/CMakeLists.txt 2009-05-15 15:13:43 UTC (rev 3854)
+++ hugin/trunk/src/foreign/CMakeLists.txt 2009-05-15 15:39:14 UTC (rev 3855)
@@ -2,7 +2,6 @@
add_subdirectory(ANN)
add_subdirectory(vigra)
add_subdirectory(levmar)
-add_subdirectory(jhead)
add_subdirectory(lensdb)
IF (WIN32 AND NOT MINGW)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tm...@us...> - 2009-05-29 05:23:49
|
Revision: 3891
http://hugin.svn.sourceforge.net/hugin/?rev=3891&view=rev
Author: tmodes
Date: 2009-05-29 05:23:39 +0000 (Fri, 29 May 2009)
Log Message:
-----------
Image cache use memory setting from preferences dialog
Modified Paths:
--------------
hugin/trunk/src/hugin1/hugin/MainFrame.cpp
hugin/trunk/src/hugin_base/huginapp/ImageCache.cpp
hugin/trunk/src/hugin_base/huginapp/ImageCache.h
Modified: hugin/trunk/src/hugin1/hugin/MainFrame.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/MainFrame.cpp 2009-05-28 16:37:18 UTC (rev 3890)
+++ hugin/trunk/src/hugin1/hugin/MainFrame.cpp 2009-05-29 05:23:39 UTC (rev 3891)
@@ -379,6 +379,7 @@
// set progress display for image cache.
ImageCache::getInstance().setProgressDisplay(this);
+ ImageCache::getInstance().SetUpperLimit(wxConfigBase::Get()->Read(wxT("/ImageCache/UpperBound"), HUGIN_IMGCACHE_UPPERBOUND));
if(splash) {
splash->Close();
@@ -1156,6 +1157,8 @@
// wxDialog dlg(this, -1, _("Preferences"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxDIALOG_MODAL);
PreferencesDialog * pref_dlg = new PreferencesDialog(this);
pref_dlg->ShowModal();
+ //update image cache size
+ ImageCache::getInstance().SetUpperLimit(wxConfigBase::Get()->Read(wxT("/ImageCache/UpperBound"), HUGIN_IMGCACHE_UPPERBOUND));
}
Modified: hugin/trunk/src/hugin_base/huginapp/ImageCache.cpp
===================================================================
--- hugin/trunk/src/hugin_base/huginapp/ImageCache.cpp 2009-05-28 16:37:18 UTC (rev 3890)
+++ hugin/trunk/src/hugin_base/huginapp/ImageCache.cpp 2009-05-29 05:23:39 UTC (rev 3891)
@@ -169,7 +169,8 @@
void ImageCache::softFlush()
{
- long upperBound = 100 * 1024 * 1024l;
+ if(upperBound==0l)
+ upperBound = 100 * 1024 * 1024l;
long purgeToSize = long(0.75 * upperBound);
// calculate used memory
Modified: hugin/trunk/src/hugin_base/huginapp/ImageCache.h
===================================================================
--- hugin/trunk/src/hugin_base/huginapp/ImageCache.h 2009-05-28 16:37:18 UTC (rev 3890)
+++ hugin/trunk/src/hugin_base/huginapp/ImageCache.h 2009-05-29 05:23:39 UTC (rev 3891)
@@ -105,7 +105,7 @@
private:
// ctor. private, nobody execpt us can create an instance.
ImageCache()
- : m_progress(NULL), m_accessCounter(0)
+ : m_progress(NULL), m_accessCounter(0), upperBound(100*1024*1024l)
{};
public:
@@ -158,9 +158,13 @@
* Releases some images if they go over a certain threshold
*/
void softFlush();
+ /** sets the upper limit, which is used by softFlush()
+ */
+ void SetUpperLimit(long newUpperLimit) { upperBound=newUpperLimit; };
private:
-
+ long upperBound;
+
template <class SrcPixelType,
class DestIterator, class DestAccessor>
void importAndConvertImage(const vigra::ImageImportInfo& info,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tm...@us...> - 2009-06-05 05:17:57
|
Revision: 3916
http://hugin.svn.sourceforge.net/hugin/?rev=3916&view=rev
Author: tmodes
Date: 2009-06-05 05:17:52 +0000 (Fri, 05 Jun 2009)
Log Message:
-----------
Updated german translation
Modified Paths:
--------------
hugin/trunk/src/hugin1/hugin/hugin.desktop
hugin/trunk/src/hugin1/ptbatcher/PTBatcherGUI.desktop
hugin/trunk/src/translations/de.po
Modified: hugin/trunk/src/hugin1/hugin/hugin.desktop
===================================================================
--- hugin/trunk/src/hugin1/hugin/hugin.desktop 2009-06-04 23:26:36 UTC (rev 3915)
+++ hugin/trunk/src/hugin1/hugin/hugin.desktop 2009-06-05 05:17:52 UTC (rev 3916)
@@ -1,7 +1,7 @@
[Desktop Entry]
Name=Hugin panorama creator
Name[cs]=Hugin pro skládání panoramat
-Name[de]=Hugin panorama creator
+Name[de]=Hugin - Panorama-Editor
Name[fr]=Hugin - Créateur de panoramas
Name[ru]=Сшиватель панорам Hugin
Comment=Stitch photographs together
Modified: hugin/trunk/src/hugin1/ptbatcher/PTBatcherGUI.desktop
===================================================================
--- hugin/trunk/src/hugin1/ptbatcher/PTBatcherGUI.desktop 2009-06-04 23:26:36 UTC (rev 3915)
+++ hugin/trunk/src/hugin1/ptbatcher/PTBatcherGUI.desktop 2009-06-05 05:17:52 UTC (rev 3916)
@@ -2,11 +2,14 @@
Name=Hugin Batch Processor
Name[ru]=Графический интерфейс к PTBatcher
Name[fr]=Hugin - Interface grahique pour le traitement par lots PTBatcher
+Name[de]=Hugin - Stapelverarbeitung
Comment=Hugin project stitching queue manager
Comment[fr]=Gérer la file d'attente des projets Hugin d'assemblage
+Comment[de]=Stapelverarbeitung für die Panoramaerstellung
GenericName=Panorama batch processor GUI
GenericName[ru]=Пакетная сборка панорам
GenericName[fr]=Interface graphique pour le traitement par lots de panoramas
+GenericName[de]=Panorama Stapelverarbeitung
Categories=Graphics;
Exec=PTBatcherGUI %F
Icon=hugin
Modified: hugin/trunk/src/translations/de.po
===================================================================
--- hugin/trunk/src/translations/de.po 2009-06-04 23:26:36 UTC (rev 3915)
+++ hugin/trunk/src/translations/de.po 2009-06-05 05:17:52 UTC (rev 3916)
@@ -5,16 +5,13 @@
# Pablo dAngelo <pab...@we...>, 2004.
# Lorenz Trischberger <tri...@il...>, 2004.
#
-#: hugin1/hugin/AssistantPanel.cpp:528 hugin1/hugin/CPEditorPanel.cpp:2240
-#: hugin1/hugin/ImagesPanel.cpp:860 PTBatcher/Batch.cpp:127
msgid ""
msgstr ""
"Project-Id-Version: de\n"
-"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?"
-"group_id=77506&atid=550441\n"
+"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=77506&atid=550441\n"
"POT-Creation-Date: 2009-03-01 22:38+0000\n"
-"PO-Revision-Date: 2009-05-01 13:21+0100\n"
-"Last-Translator: J. Schneider <j-s...@gm...>\n"
+"PO-Revision-Date: 2009-06-04 17:44+0100\n"
+"Last-Translator: T. Modes\n"
"Language-Team: deutsch <de...@li...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -25,19 +22,20 @@
"X-Poedit-Language: German\n"
"X-Poedit-Country: GERMANY\n"
-#: hugin1/base_wx/huginConfig.cpp:47 hugin1/base_wx/huginConfig.cpp:82
+#: hugin1/base_wx/huginConfig.cpp:47
+#: hugin1/base_wx/huginConfig.cpp:82
#, c-format
-msgid ""
-"External program %s not found as specified in preferences, reverting to "
-"bundled version"
-msgstr ""
-"Externe Anwendung %s wurde nicht gefunden wie in den Voreinstellungen "
-"angegeben. Die Version aus dem Paket wird benutzt."
+msgid "External program %s not found as specified in preferences, reverting to bundled version"
+msgstr "Externe Anwendung %s wurde nicht gefunden wie in den Voreinstellungen angegeben. Die Version aus dem Paket wird benutzt."
-#: hugin1/base_wx/huginConfig.cpp:47 hugin1/base_wx/huginConfig.cpp:57
-#: hugin1/base_wx/huginConfig.cpp:69 hugin1/base_wx/huginConfig.cpp:82
-#: hugin1/base_wx/RunStitchPanel.cpp:246 hugin1/hugin/AssistantPanel.cpp:377
-#: hugin1/hugin/AssistantPanel.cpp:552 hugin1/hugin/AssistantPanel.cpp:684
+#: hugin1/base_wx/huginConfig.cpp:47
+#: hugin1/base_wx/huginConfig.cpp:57
+#: hugin1/base_wx/huginConfig.cpp:69
+#: hugin1/base_wx/huginConfig.cpp:82
+#: hugin1/base_wx/RunStitchPanel.cpp:246
+#: hugin1/hugin/AssistantPanel.cpp:377
+#: hugin1/hugin/AssistantPanel.cpp:552
+#: hugin1/hugin/AssistantPanel.cpp:684
#: hugin1/hugin/CPEditorPanel.cpp:2138
#: hugin1/hugin/OptimizePhotometricPanel.cpp:487
#: hugin1/hugin/OptimizePhotometricPanel.cpp:507
@@ -45,27 +43,33 @@
msgid "Error"
msgstr "Fehler"
-#: hugin1/base_wx/huginConfig.cpp:57 hugin1/base_wx/huginConfig.cpp:69
+#: hugin1/base_wx/huginConfig.cpp:57
+#: hugin1/base_wx/huginConfig.cpp:69
#: hugin1/base_wx/RunStitchPanel.cpp:246
#, c-format
msgid "External program %s not found in the bundle, reverting to system path"
-msgstr ""
-"Externe Anwendung %s wurde nicht im Paket gefunden. Verwende Systempfad."
+msgstr "Externe Anwendung %s wurde nicht im Paket gefunden. Verwende Systempfad."
-#: hugin1/base_wx/huginConfig.cpp:95 hugin1/base_wx/huginConfig.cpp:109
+#: hugin1/base_wx/huginConfig.cpp:95
+#: hugin1/base_wx/huginConfig.cpp:109
#, c-format
msgid "Program %s not found in preferences, reverting to default value"
-msgstr ""
-"Externe Anwendung %s wurde in den Voreinstellungen nicht gefunden. Der "
-"Standardwert wird benutzt."
+msgstr "Externe Anwendung %s wurde in den Voreinstellungen nicht gefunden. Der Standardwert wird benutzt."
-#: hugin1/base_wx/huginConfig.cpp:129 hugin1/base_wx/huginConfig.cpp:134
-#: hugin1/base_wx/huginConfig.cpp:140 hugin1/base_wx/huginConfig.cpp:145
-#: hugin1/base_wx/huginConfig.cpp:150 hugin1/base_wx/huginConfig.cpp:155
-#: hugin1/base_wx/huginConfig.cpp:161 hugin1/base_wx/huginConfig.cpp:166
-#: hugin1/base_wx/huginConfig.cpp:171 hugin1/base_wx/huginConfig.cpp:176
-#: hugin1/base_wx/huginConfig.cpp:182 hugin1/base_wx/huginConfig.cpp:187
-#: hugin1/base_wx/huginConfig.cpp:194 hugin1/base_wx/huginConfig.cpp:199
+#: hugin1/base_wx/huginConfig.cpp:129
+#: hugin1/base_wx/huginConfig.cpp:134
+#: hugin1/base_wx/huginConfig.cpp:140
+#: hugin1/base_wx/huginConfig.cpp:145
+#: hugin1/base_wx/huginConfig.cpp:150
+#: hugin1/base_wx/huginConfig.cpp:155
+#: hugin1/base_wx/huginConfig.cpp:161
+#: hugin1/base_wx/huginConfig.cpp:166
+#: hugin1/base_wx/huginConfig.cpp:171
+#: hugin1/base_wx/huginConfig.cpp:176
+#: hugin1/base_wx/huginConfig.cpp:182
+#: hugin1/base_wx/huginConfig.cpp:187
+#: hugin1/base_wx/huginConfig.cpp:194
+#: hugin1/base_wx/huginConfig.cpp:199
msgid "Warning"
msgstr "Warnung"
@@ -79,7 +83,8 @@
msgid "Error reading image: %s"
msgstr "Fehler beim Laden des Bildes %s"
-#: hugin1/base_wx/ImageCache.cpp:691 hugin_base/huginapp/ImageCache.cpp:660
+#: hugin1/base_wx/ImageCache.cpp:691
+#: hugin_base/huginapp/ImageCache.cpp:660
msgid "Cannot load image: "
msgstr "Konnte Bild nicht laden:"
@@ -115,8 +120,12 @@
#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:593
#: hugin1/stitch_project/hugin_stitch_project.cpp:123
-#: PTBatcher/RunStitchFrame.cpp:43 translations/xrc.cpp:87
-#: translations/xrc.cpp:539 translations/xrc.cpp:611 xrc.cpp:87 xrc.cpp:539
+#: PTBatcher/RunStitchFrame.cpp:43
+#: translations/xrc.cpp:87
+#: translations/xrc.cpp:539
+#: translations/xrc.cpp:611
+#: xrc.cpp:87
+#: xrc.cpp:539
#: xrc.cpp:611
msgid "Cancel"
msgstr "Abbrechen"
@@ -134,21 +143,14 @@
msgstr "Optimiere Panorama"
#: hugin1/base_wx/platform.h:39
-msgid ""
-"All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*."
-"PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|"
-"JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif,*."
-"tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files (*."
-"hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*"
-msgstr ""
-"Alle Bilddateien|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*."
-"PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|"
-"JPEG-Dateien (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF-Dateien (*.tif,*."
-"tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG-Dateien (*.png)|*.png;*.PNG|HDR-Dateien "
-"(*.hdr)|*.hdr;*.HDR|EXR-Dateien (*.exr)|*.exr;*.EXR|Alle Dateien (*)|*"
+msgid "All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*.PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif,*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files (*.hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*"
+msgstr "Alle Bilddateien|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*.PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|JPEG-Dateien (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF-Dateien (*.tif,*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG-Dateien (*.png)|*.png;*.PNG|HDR-Dateien (*.hdr)|*.hdr;*.HDR|EXR-Dateien (*.exr)|*.exr;*.EXR|Alle Dateien (*)|*"
-#: hugin1/base_wx/PTWXDlg.cpp:65 hugin1/base_wx/PTWXDlg.cpp:83
-#: hugin1/base_wx/PTWXDlg.cpp:135 translations/xrc.cpp:541 xrc.cpp:541
+#: hugin1/base_wx/PTWXDlg.cpp:65
+#: hugin1/base_wx/PTWXDlg.cpp:83
+#: hugin1/base_wx/PTWXDlg.cpp:135
+#: translations/xrc.cpp:541
+#: xrc.cpp:541
msgid "Panorama Tools"
msgstr "Panorama Tools"
@@ -190,19 +192,22 @@
msgid "Could not open project file:"
msgstr "Konnte Projektdatei nicht öffnen:"
-#: hugin1/base_wx/RunStitchPanel.cpp:118 hugin1/nona_gui/nona_gui.cpp:232
+#: hugin1/base_wx/RunStitchPanel.cpp:118
+#: hugin1/nona_gui/nona_gui.cpp:232
#: PTBatcher/ProjectArray.cpp:84
#, c-format
msgid "could not open script : %s"
msgstr "Konnte Skriptdatei %s nicht öffnen."
-#: hugin1/base_wx/RunStitchPanel.cpp:138 hugin1/nona_gui/nona_gui.cpp:239
+#: hugin1/base_wx/RunStitchPanel.cpp:138
+#: hugin1/nona_gui/nona_gui.cpp:239
#: PTBatcher/ProjectArray.cpp:107
#, c-format
msgid "error while parsing panotools script: %s"
msgstr "Fehler beim Einlesen des Skriptes %s"
-#: hugin1/base_wx/RunStitchPanel.cpp:177 hugin1/base_wx/RunStitchPanel.cpp:194
+#: hugin1/base_wx/RunStitchPanel.cpp:177
+#: hugin1/base_wx/RunStitchPanel.cpp:194
#: hugin1/hugin/PanoPanel.cpp:912
msgid "Could not create temporary file"
msgstr "Konnte temporäre Datei nicht erzeugen."
@@ -233,7 +238,8 @@
"Fehler beim Zusammenfügen von Projekt\n"
"%s"
-#: hugin1/base_wx/RunStitchPanel.cpp:255 hugin1/base_wx/RunStitchPanel.cpp:261
+#: hugin1/base_wx/RunStitchPanel.cpp:255
+#: hugin1/base_wx/RunStitchPanel.cpp:261
#: hugin1/hugin/NonaStitcherPanel.cpp:326
#: hugin1/hugin/NonaStitcherPanel.cpp:331
#: hugin1/stitch_project/hugin_stitch_project.cpp:172
@@ -261,17 +267,12 @@
msgstr "%d unverbundene Bildgruppen gefunden:"
#: hugin1/hugin/AssistantPanel.cpp:316
-msgid ""
-"Please use the Control Points tab to connect all images with control "
-"points.\n"
-msgstr ""
-"Benutzen Sie den Kontrollpunkte-Reiter, um alle Bilder mit Kontrollpunkten "
-"zu verbinden.\n"
+msgid "Please use the Control Points tab to connect all images with control points.\n"
+msgstr "Benutzen Sie den Kontrollpunkte-Reiter, um alle Bilder mit Kontrollpunkten zu verbinden.\n"
#: hugin1/hugin/AssistantPanel.cpp:319
msgid "Images or control points have changed, new alignment is needed."
-msgstr ""
-"Bilder oder Kontrollpunkte haben sich geändert, Neuausrichtung erforderlich."
+msgstr "Bilder oder Kontrollpunkte haben sich geändert, Neuausrichtung erforderlich."
#: hugin1/hugin/AssistantPanel.cpp:330
msgid "Very good fit."
@@ -282,22 +283,12 @@
msgstr "Die Bilder passen gut."
#: hugin1/hugin/AssistantPanel.cpp:334
-msgid ""
-"Bad fit, some control points might be bad, or there are parallax and "
-"movement errors"
-msgstr ""
-"Die Bilder passen schlecht. Einige Kontrollpunkte könnten falsch sein oder "
-"es liegen Fehler durch Parallaxe oder Kamarabewegung vor."
+msgid "Bad fit, some control points might be bad, or there are parallax and movement errors"
+msgstr "Die Bilder passen schlecht. Einige Kontrollpunkte könnten falsch sein oder es liegen Fehler durch Parallaxe oder Kamarabewegung vor."
#: hugin1/hugin/AssistantPanel.cpp:336
-msgid ""
-"Very bad fit. Check for bad control points, lens parameters, or images with "
-"parallax or movement. The optimizer might have failed. Manual intervention "
-"required."
-msgstr ""
-"Die Bilder passen sehr schlecht. Überprüfen Sie Kontrollpunkte, "
-"Objektivparameter oder Bilder mit Parallaxenfehler oder Bewegung. Der "
-"Optmierer könnte versagt haben. Ein manueller Eingriff ist erforderlich."
+msgid "Very bad fit. Check for bad control points, lens parameters, or images with parallax or movement. The optimizer might have failed. Manual intervention required."
+msgstr "Die Bilder passen sehr schlecht. Überprüfen Sie Kontrollpunkte, Objektivparameter oder Bilder mit Parallaxenfehler oder Bewegung. Der Optmierer könnte versagt haben. Ein manueller Eingriff ist erforderlich."
#: hugin1/hugin/AssistantPanel.cpp:338
#, c-format
@@ -320,30 +311,38 @@
msgid "Finding corresponding points"
msgstr "Suche übereinstimmende Punkte"
-#: hugin1/hugin/AssistantPanel.cpp:412 hugin1/hugin/AssistantPanel.cpp:441
-#: hugin1/hugin/CPEditorPanel.cpp:2142 hugin1/hugin/CPEditorPanel.cpp:2204
-#: hugin1/hugin/CPEditorPanel.cpp:2214 hugin1/hugin/CPEditorPanel.cpp:2233
-#: hugin1/hugin/ImagesPanel.cpp:739 hugin1/hugin/ImagesPanel.cpp:770
+#: hugin1/hugin/AssistantPanel.cpp:412
+#: hugin1/hugin/AssistantPanel.cpp:441
+#: hugin1/hugin/CPEditorPanel.cpp:2142
+#: hugin1/hugin/CPEditorPanel.cpp:2204
+#: hugin1/hugin/CPEditorPanel.cpp:2214
+#: hugin1/hugin/CPEditorPanel.cpp:2233
+#: hugin1/hugin/ImagesPanel.cpp:739
+#: hugin1/hugin/ImagesPanel.cpp:770
msgid "Running Celeste"
msgstr "Starte Celeste"
-#: hugin1/hugin/AssistantPanel.cpp:496 hugin1/hugin/CPEditorPanel.cpp:2148
+#: hugin1/hugin/AssistantPanel.cpp:496
+#: hugin1/hugin/CPEditorPanel.cpp:2148
#: hugin1/hugin/ImagesPanel.cpp:829
msgid "searching for cloud-like control points..."
msgstr "Suche wolkenähnliche Kontrollpunkte ..."
-#: hugin1/hugin/AssistantPanel.cpp:525 hugin1/hugin/CPEditorPanel.cpp:2195
+#: hugin1/hugin/AssistantPanel.cpp:525
+#: hugin1/hugin/CPEditorPanel.cpp:2195
#: hugin1/hugin/ImagesPanel.cpp:764
msgid "Celeste model file not found, Hugin needs to be properly installed."
-msgstr ""
-"Celeste Modell-Datei nicht gefunden, Hugin muss ordentlich installiert "
-"werden."
+msgstr "Celeste Modell-Datei nicht gefunden, Hugin muss ordentlich installiert werden."
-#: hugin1/hugin/AssistantPanel.cpp:525 hugin1/hugin/CPEditorPanel.cpp:2195
-#: hugin1/hugin/huginApp.cpp:143 hugin1/hugin/huginApp.cpp:154
-#: hugin1/hugin/huginApp.cpp:166 hugin1/hugin/ImagesPanel.cpp:764
+#: hugin1/hugin/AssistantPanel.cpp:525
+#: hugin1/hugin/CPEditorPanel.cpp:2195
+#: hugin1/hugin/huginApp.cpp:143
+#: hugin1/hugin/huginApp.cpp:154
+#: hugin1/hugin/huginApp.cpp:166
+#: hugin1/hugin/ImagesPanel.cpp:764
#: hugin1/stitch_project/hugin_stitch_project.cpp:272
-#: PTBatcherGUI/PTBatcherGUI.cpp:66 PTBatcherGUI/PTBatcherGUI.cpp:72
+#: PTBatcherGUI/PTBatcherGUI.cpp:66
+#: PTBatcherGUI/PTBatcherGUI.cpp:72
msgid "Fatal Error"
msgstr "Nicht behebbarer Fehler"
@@ -358,13 +357,11 @@
#: hugin1/hugin/AssistantPanel.cpp:552
msgid ""
-"Please create control points between unconnected images using the Control "
-"Points tab.\n"
+"Please create control points between unconnected images using the Control Points tab.\n"
"\n"
"After adding the points, press the \"Align\" button again"
msgstr ""
-"Bitte fügen Sie Kontrollpunkte zwischen unverbundenen Bildern mit Hilfe des "
-"Kontrollpunkte-Reiters hinzu.\n"
+"Bitte fügen Sie Kontrollpunkte zwischen unverbundenen Bildern mit Hilfe des Kontrollpunkte-Reiters hinzu.\n"
"\n"
"Drücken Sie danach noch einmal die Ausrichten-Schaltfläche."
@@ -411,8 +408,11 @@
msgid "Would you like to use Autopano-Sift instead?"
msgstr "Möchten Sie stattdessen Autopano-SIFT verwenden?"
-#: hugin1/hugin/AutoCtrlPointCreator.cpp:279 translations/xrc.cpp:500
-#: translations/xrc.cpp:509 xrc.cpp:500 xrc.cpp:509
+#: hugin1/hugin/AutoCtrlPointCreator.cpp:279
+#: translations/xrc.cpp:500
+#: translations/xrc.cpp:509
+#: xrc.cpp:500
+#: xrc.cpp:509
msgid "Autopano"
msgstr "Autopano"
@@ -420,17 +420,12 @@
#: hugin1/hugin/AutoCtrlPointCreator.cpp:300
#: hugin1/hugin/AutoCtrlPointCreator.cpp:311
msgid "Autopano-SIFT not found. Please specify a valid path in the preferences"
-msgstr ""
-"Autopano-SIFT nicht gefunden. Bitte gültigen Pfad in den Einstellungen "
-"angeben."
+msgstr "Autopano-SIFT nicht gefunden. Bitte gültigen Pfad in den Einstellungen angeben."
#: hugin1/hugin/AutoCtrlPointCreator.cpp:362
#, c-format
-msgid ""
-"Please use %namefile, %i or %s to specify the input files for autopano-sift"
-msgstr ""
-"Bitte benutzen Sie %namefile, %i oder %s für die Eingabedateien von Autopano-"
-"SIFT"
+msgid "Please use %namefile, %i or %s to specify the input files for autopano-sift"
+msgstr "Bitte benutzen Sie %namefile, %i oder %s für die Eingabedateien von Autopano-SIFT"
#: hugin1/hugin/AutoCtrlPointCreator.cpp:363
msgid "Error in Autopano command"
@@ -459,7 +454,8 @@
#: hugin1/hugin/AutoCtrlPointCreator.cpp:434
#: hugin1/hugin/AutoCtrlPointCreator.cpp:539
#: hugin1/hugin/AutoCtrlPointCreator.cpp:548
-#: hugin1/hugin/NonaStitcherPanel.cpp:427 hugin1/hugin/PanoPanel.cpp:1008
+#: hugin1/hugin/NonaStitcherPanel.cpp:427
+#: hugin1/hugin/PanoPanel.cpp:1008
msgid "Could not execute command: "
msgstr "Konnte den Befehl nicht ausführen:"
@@ -521,9 +517,7 @@
#: hugin1/hugin/AutoCtrlPointCreator.cpp:481
msgid "autopano.exe not found. Please specify a valid path in the preferences"
-msgstr ""
-"Autopano.exe nicht gefunden. Bitte gültigen Pfad in den Einstellungen "
-"angeben."
+msgstr "Autopano.exe nicht gefunden. Bitte gültigen Pfad in den Einstellungen angeben."
#: hugin1/hugin/AutoCtrlPointCreator.cpp:563
msgid ""
@@ -541,7 +535,8 @@
msgid "no command in redo history"
msgstr "Kein Kommando im Wiederholenprotokoll"
-#: hugin1/hugin/CPEditorPanel.cpp:219 hugin1/hugin/CPListFrame.cpp:283
+#: hugin1/hugin/CPEditorPanel.cpp:219
+#: hugin1/hugin/CPListFrame.cpp:283
#: hugin1/hugin/ImagesList.cpp:71
msgid "#"
msgstr "Nr."
@@ -562,12 +557,14 @@
msgid "right y"
msgstr "y rechts"
-#: hugin1/hugin/CPEditorPanel.cpp:224 hugin1/hugin/CPListFrame.cpp:290
+#: hugin1/hugin/CPEditorPanel.cpp:224
+#: hugin1/hugin/CPListFrame.cpp:290
#: hugin1/hugin/CPListFrame.cpp:297
msgid "Alignment"
msgstr "Ausrichtung"
-#: hugin1/hugin/CPEditorPanel.cpp:225 hugin1/hugin/CPListFrame.cpp:291
+#: hugin1/hugin/CPEditorPanel.cpp:225
+#: hugin1/hugin/CPListFrame.cpp:291
#: hugin1/hugin/CPListFrame.cpp:298
msgid "Distance"
msgstr "Abstand"
@@ -580,25 +577,25 @@
msgid "new control point added"
msgstr "Neuer Kontrollpunkt hinzugefügt"
-#: hugin1/hugin/CPEditorPanel.cpp:759 hugin1/hugin/CPEditorPanel.cpp:984
+#: hugin1/hugin/CPEditorPanel.cpp:759
+#: hugin1/hugin/CPEditorPanel.cpp:984
msgid "searching similar points..."
msgstr "Suche ähnliche Punkte ..."
-#: hugin1/hugin/CPEditorPanel.cpp:778 hugin1/hugin/CPEditorPanel.cpp:902
+#: hugin1/hugin/CPEditorPanel.cpp:778
+#: hugin1/hugin/CPEditorPanel.cpp:902
msgid "Error during Fine-tune"
msgstr "Fehler bei der Feinjustierung"
-#: hugin1/hugin/CPEditorPanel.cpp:792 hugin1/hugin/CPEditorPanel.cpp:922
+#: hugin1/hugin/CPEditorPanel.cpp:792
+#: hugin1/hugin/CPEditorPanel.cpp:922
#: hugin1/hugin/CPEditorPanel.cpp:1058
#, c-format
-msgid ""
-"Point finetuned, angle: %.0f deg, correlation coefficient: %0.3f, curvature: "
-"%0.3f %0.3f "
-msgstr ""
-"Punkt justiert, Winkel: %.0f °, Korrelationskoeffizient: %0.3f, Krümmung: %"
-"0.3f %0.3f"
+msgid "Point finetuned, angle: %.0f deg, correlation coefficient: %0.3f, curvature: %0.3f %0.3f "
+msgstr "Punkt justiert, Winkel: %.0f °, Korrelationskoeffizient: %0.3f, Krümmung: %0.3f %0.3f"
-#: hugin1/hugin/CPEditorPanel.cpp:795 hugin1/hugin/CPEditorPanel.cpp:925
+#: hugin1/hugin/CPEditorPanel.cpp:795
+#: hugin1/hugin/CPEditorPanel.cpp:925
msgid "change points, or press right mouse button to add the pair"
msgstr "Punkte ändern oder mit der rechten Maustaste das Paar hinzufügen"
@@ -610,38 +607,44 @@
#, c-format
msgid ""
"No similar point found. Check the similarity visually.\n"
-"Correlation coefficient (%.3f) is lower than the threshold set in the "
-"preferences."
+"Correlation coefficient (%.3f) is lower than the threshold set in the preferences."
msgstr ""
"Keinen ähnlichen Punkt gefunden. Bitte prüfen Sie die Position.\n"
-"Der Korrelationskoeffizient ist %.3f und damit kleiner als der eingestellte "
-"Schwellwert."
+"Der Korrelationskoeffizient ist %.3f und damit kleiner als der eingestellte Schwellwert."
#: hugin1/hugin/CPEditorPanel.cpp:1066
msgid "No similar point found"
msgstr "Keinen ähnlichen Punkt gefunden"
-#: hugin1/hugin/CPEditorPanel.cpp:1228 hugin1/hugin/CPEditorPanel.cpp:1239
+#: hugin1/hugin/CPEditorPanel.cpp:1228
+#: hugin1/hugin/CPEditorPanel.cpp:1239
msgid "Add new Line"
msgstr "Neue Linie hinzufügen"
-#: hugin1/hugin/CPEditorPanel.cpp:1234 hugin1/hugin/CPEditorPanel.cpp:1237
-#: hugin1/hugin/CPEditorPanel.cpp:1575 hugin1/hugin/CPListFrame.cpp:417
+#: hugin1/hugin/CPEditorPanel.cpp:1234
+#: hugin1/hugin/CPEditorPanel.cpp:1237
+#: hugin1/hugin/CPEditorPanel.cpp:1575
+#: hugin1/hugin/CPListFrame.cpp:417
#, c-format
msgid "Line %d"
msgstr "Gerade %d"
-#: hugin1/hugin/CPEditorPanel.cpp:1566 hugin1/hugin/CPListFrame.cpp:408
-#: hugin1/hugin/GLPreviewFrame.cpp:266 hugin1/hugin/PreviewFrame.cpp:246
-#: translations/xrc.cpp:49 xrc.cpp:49
+#: hugin1/hugin/CPEditorPanel.cpp:1566
+#: hugin1/hugin/CPListFrame.cpp:408
+#: hugin1/hugin/GLPreviewFrame.cpp:266
+#: hugin1/hugin/PreviewFrame.cpp:246
+#: translations/xrc.cpp:49
+#: xrc.cpp:49
msgid "normal"
msgstr "Normal"
-#: hugin1/hugin/CPEditorPanel.cpp:1569 hugin1/hugin/CPListFrame.cpp:411
+#: hugin1/hugin/CPEditorPanel.cpp:1569
+#: hugin1/hugin/CPListFrame.cpp:411
msgid "vert. Line"
msgstr "Vert. Linie"
-#: hugin1/hugin/CPEditorPanel.cpp:1572 hugin1/hugin/CPListFrame.cpp:414
+#: hugin1/hugin/CPEditorPanel.cpp:1572
+#: hugin1/hugin/CPListFrame.cpp:414
msgid "horiz. Line"
msgstr "Horiz. Linie"
@@ -663,8 +666,10 @@
msgid "Corner Detection threshold"
msgstr "Schwellwert für Eckendetektion"
-#: hugin1/hugin/CPEditorPanel.cpp:1895 hugin1/hugin/CPEditorPanel.cpp:1899
-#: translations/xrc.cpp:114 xrc.cpp:114
+#: hugin1/hugin/CPEditorPanel.cpp:1895
+#: hugin1/hugin/CPEditorPanel.cpp:1899
+#: translations/xrc.cpp:114
+#: xrc.cpp:114
msgid "Create control points"
msgstr "Kontrollpunkte erstellen"
@@ -686,23 +691,21 @@
msgstr "Punkt im linken Bild wählen"
#: hugin1/hugin/CPEditorPanel.cpp:2138
-msgid ""
-"Cannot run celeste without at least one control point connecting the two "
-"images"
-msgstr ""
-"Kann Celeste nicht starten, ohne dass mindestens ein Kontrollpunkt die zwei "
-"Bilder verbindet."
+msgid "Cannot run celeste without at least one control point connecting the two images"
+msgstr "Kann Celeste nicht starten, ohne dass mindestens ein Kontrollpunkt die zwei Bilder verbindet."
#: hugin1/hugin/CPEditorPanel.cpp:2235
#, c-format
msgid ""
"Finished running Celeste.\n"
"%d cloud-like control points removed."
-msgstr ""
-"Durchgang von Celeste beendet. %d wolkenartige Kontrollpunkte entfernt."
+msgstr "Durchgang von Celeste beendet. %d wolkenartige Kontrollpunkte entfernt."
-#: hugin1/hugin/CPEditorPanel.cpp:2236 translations/xrc.cpp:62
-#: translations/xrc.cpp:527 xrc.cpp:62 xrc.cpp:527
+#: hugin1/hugin/CPEditorPanel.cpp:2236
+#: translations/xrc.cpp:62
+#: translations/xrc.cpp:527
+#: xrc.cpp:62
+#: xrc.cpp:527
msgid "Celeste"
msgstr "Celeste"
@@ -718,20 +721,27 @@
msgid "Could not process event!"
msgstr "Interner Fehler: Konnte Ereignis nicht verarbeiten"
-#: hugin1/hugin/CPListFrame.cpp:284 hugin1/hugin/CPListFrame.cpp:294
+#: hugin1/hugin/CPListFrame.cpp:284
+#: hugin1/hugin/CPListFrame.cpp:294
msgid "Left Img."
msgstr "linkes Bild"
-#: hugin1/hugin/CPListFrame.cpp:285 hugin1/hugin/CPListFrame.cpp:288
-#: translations/xrc.cpp:19 translations/xrc.cpp:41 xrc.cpp:19 xrc.cpp:41
+#: hugin1/hugin/CPListFrame.cpp:285
+#: hugin1/hugin/CPListFrame.cpp:288
+#: translations/xrc.cpp:19
+#: translations/xrc.cpp:41
+#: xrc.cpp:19
+#: xrc.cpp:41
msgid "x"
msgstr "x"
-#: hugin1/hugin/CPListFrame.cpp:286 hugin1/hugin/CPListFrame.cpp:289
+#: hugin1/hugin/CPListFrame.cpp:286
+#: hugin1/hugin/CPListFrame.cpp:289
msgid "y"
msgstr "y"
-#: hugin1/hugin/CPListFrame.cpp:287 hugin1/hugin/CPListFrame.cpp:295
+#: hugin1/hugin/CPListFrame.cpp:287
+#: hugin1/hugin/CPListFrame.cpp:295
msgid "Right Img."
msgstr "rechtes Bild"
@@ -755,8 +765,10 @@
msgid "Select Control Points"
msgstr "Kontrollpunkte auswählen"
-#: hugin1/hugin/CropPanel.cpp:250 hugin1/hugin/CropPanel.cpp:266
-#: hugin1/hugin/CropPanel.cpp:282 hugin1/hugin/CropPanel.cpp:298
+#: hugin1/hugin/CropPanel.cpp:250
+#: hugin1/hugin/CropPanel.cpp:266
+#: hugin1/hugin/CropPanel.cpp:282
+#: hugin1/hugin/CropPanel.cpp:298
msgid "Please enter a valid number"
msgstr "Bitte eine gültige Zahl eingeben"
@@ -764,92 +776,122 @@
msgid "Fast Panorama preview"
msgstr "Schnelle Panoramavorschau"
-#: hugin1/hugin/GLPreviewFrame.cpp:150 hugin1/hugin/PreviewFrame.cpp:129
+#: hugin1/hugin/GLPreviewFrame.cpp:150
+#: hugin1/hugin/PreviewFrame.cpp:129
msgid "displayed images"
msgstr "Dargestellte Bilder"
-#: hugin1/hugin/GLPreviewFrame.cpp:186 hugin1/hugin/PreviewFrame.cpp:166
+#: hugin1/hugin/GLPreviewFrame.cpp:186
+#: hugin1/hugin/PreviewFrame.cpp:166
msgid "VFOV"
msgstr "VFOV"
-#: hugin1/hugin/GLPreviewFrame.cpp:190 hugin1/hugin/PreviewFrame.cpp:170
+#: hugin1/hugin/GLPreviewFrame.cpp:190
+#: hugin1/hugin/PreviewFrame.cpp:170
msgid "drag to change the vertical field of view"
msgstr "Ziehen um den vertikalen Bildwinkel festzulegen"
-#: hugin1/hugin/GLPreviewFrame.cpp:199 hugin1/hugin/PreviewFrame.cpp:179
+#: hugin1/hugin/GLPreviewFrame.cpp:199
+#: hugin1/hugin/PreviewFrame.cpp:179
msgid "HFOV"
msgstr "HFOV"
-#: hugin1/hugin/GLPreviewFrame.cpp:204 hugin1/hugin/PreviewFrame.cpp:184
+#: hugin1/hugin/GLPreviewFrame.cpp:204
+#: hugin1/hugin/PreviewFrame.cpp:184
msgid "drag to change the horizontal field of view"
msgstr "Ziehen um den horizontalen Bildwinkel festzulegen"
-#: hugin1/hugin/GLPreviewFrame.cpp:215 hugin1/hugin/PreviewFrame.cpp:195
+#: hugin1/hugin/GLPreviewFrame.cpp:215
+#: hugin1/hugin/PreviewFrame.cpp:195
msgid "Preview Options"
msgstr "Vorschauoptionen"
-#: hugin1/hugin/GLPreviewFrame.cpp:218 hugin1/hugin/PreviewFrame.cpp:198
-#: translations/xrc.cpp:363 xrc.cpp:363
+#: hugin1/hugin/GLPreviewFrame.cpp:218
+#: hugin1/hugin/PreviewFrame.cpp:198
+#: translations/xrc.cpp:363
+#: xrc.cpp:363
msgid "projection (f):"
msgstr "Projektion:"
-#: hugin1/hugin/GLPreviewFrame.cpp:261 hugin1/hugin/PreviewFrame.cpp:241
+#: hugin1/hugin/GLPreviewFrame.cpp:261
+#: hugin1/hugin/PreviewFrame.cpp:241
msgid "Blend mode:"
msgstr "Überblendmodus:"
-#: hugin1/hugin/GLPreviewFrame.cpp:267 hugin1/hugin/PreviewFrame.cpp:247
+#: hugin1/hugin/GLPreviewFrame.cpp:267
+#: hugin1/hugin/PreviewFrame.cpp:247
msgid "difference"
msgstr "Unterschiede"
-#: hugin1/hugin/GLPreviewFrame.cpp:306 hugin1/hugin/PreviewFrame.cpp:281
+#: hugin1/hugin/GLPreviewFrame.cpp:306
+#: hugin1/hugin/PreviewFrame.cpp:281
msgid "EV:"
msgstr "EV:"
-#: hugin1/hugin/GLPreviewFrame.cpp:319 hugin1/hugin/GLPreviewFrame.cpp:353
-#: hugin1/hugin/PreviewFrame.cpp:294 hugin1/hugin/PreviewFrame.cpp:328
+#: hugin1/hugin/GLPreviewFrame.cpp:319
+#: hugin1/hugin/GLPreviewFrame.cpp:353
+#: hugin1/hugin/PreviewFrame.cpp:294
+#: hugin1/hugin/PreviewFrame.cpp:328
msgid "0"
msgstr "0"
-#: hugin1/hugin/GLPreviewFrame.cpp:339 hugin1/hugin/PreviewFrame.cpp:314
+#: hugin1/hugin/GLPreviewFrame.cpp:339
+#: hugin1/hugin/PreviewFrame.cpp:314
msgid "Projection Parameters"
msgstr "Projektionsparameter"
-#: hugin1/hugin/GLPreviewFrame.cpp:348 hugin1/hugin/PreviewFrame.cpp:323
+#: hugin1/hugin/GLPreviewFrame.cpp:348
+#: hugin1/hugin/PreviewFrame.cpp:323
msgid "param:"
msgstr "Param:"
-#: hugin1/hugin/GLPreviewFrame.cpp:629 hugin1/hugin/PreviewFrame.cpp:623
+#: hugin1/hugin/GLPreviewFrame.cpp:629
+#: hugin1/hugin/PreviewFrame.cpp:623
msgid "Rectilinear"
msgstr "Gradlinig (Rectilinear)"
-#: hugin1/hugin/GLPreviewFrame.cpp:630 hugin1/hugin/PreviewFrame.cpp:624
+#: hugin1/hugin/GLPreviewFrame.cpp:630
+#: hugin1/hugin/PreviewFrame.cpp:624
msgid "Cylindrical"
msgstr "Zylindrisch"
-#: hugin1/hugin/GLPreviewFrame.cpp:631 hugin1/hugin/ImagesList.cpp:492
-#: hugin1/hugin/PreviewFrame.cpp:625 translations/xrc.cpp:15
-#: translations/xrc.cpp:33 translations/xrc.cpp:142 xrc.cpp:15 xrc.cpp:33
+#: hugin1/hugin/GLPreviewFrame.cpp:631
+#: hugin1/hugin/ImagesList.cpp:492
+#: hugin1/hugin/PreviewFrame.cpp:625
+#: translations/xrc.cpp:15
+#: translations/xrc.cpp:33
+#: translations/xrc.cpp:142
+#: xrc.cpp:15
+#: xrc.cpp:33
#: xrc.cpp:142
msgid "Equirectangular"
msgstr "Sphärisch (Equirectangular)"
-#: hugin1/hugin/GLPreviewFrame.cpp:727 hugin1/hugin/PreviewFrame.cpp:737
+#: hugin1/hugin/GLPreviewFrame.cpp:727
+#: hugin1/hugin/PreviewFrame.cpp:737
msgid "Yaw value must be numeric."
msgstr "Gierwinkel (Yaw) muss numerisch sein"
-#: hugin1/hugin/GLPreviewFrame.cpp:733 hugin1/hugin/PreviewFrame.cpp:743
+#: hugin1/hugin/GLPreviewFrame.cpp:733
+#: hugin1/hugin/PreviewFrame.cpp:743
msgid "Pitch value must be numeric."
msgstr "Nickwinkel (Pitsch) muss numerisch sein"
-#: hugin1/hugin/GLPreviewFrame.cpp:739 hugin1/hugin/PreviewFrame.cpp:749
+#: hugin1/hugin/GLPreviewFrame.cpp:739
+#: hugin1/hugin/PreviewFrame.cpp:749
msgid "Roll value must be numeric."
msgstr "Rollwinkel (Roll) muss numerisch sein"
-#: hugin1/hugin/GLPreviewFrame.cpp:760 hugin1/hugin/GLPreviewFrame.cpp:776
-#: hugin1/hugin/huginApp.cpp:66 hugin1/hugin/ImagesPanel.cpp:299
-#: hugin1/hugin/ImagesPanel.cpp:320 hugin1/hugin/ImagesPanel.cpp:340
-#: hugin1/hugin/PanoPanel.cpp:588 hugin1/hugin/PanoPanel.cpp:619
-#: hugin1/hugin/PreviewFrame.cpp:772 hugin1/hugin/PreviewFrame.cpp:788
+#: hugin1/hugin/GLPreviewFrame.cpp:760
+#: hugin1/hugin/GLPreviewFrame.cpp:776
+#: hugin1/hugin/huginApp.cpp:66
+#: hugin1/hugin/ImagesPanel.cpp:299
+#: hugin1/hugin/ImagesPanel.cpp:320
+#: hugin1/hugin/ImagesPanel.cpp:340
+#: hugin1/hugin/PanoPanel.cpp:588
+#: hugin1/hugin/PanoPanel.cpp:619
+#: hugin1/hugin/PreviewFrame.cpp:772
+#: hugin1/hugin/PreviewFrame.cpp:788
msgid "Value must be numeric."
msgstr "Wert muss numerisch sein."
@@ -859,14 +901,12 @@
"No or only partial information about field of view was found in image file\n"
"%s\n"
"\n"
-"Please enter the horizontal field of view (HFOV) or the focal length and "
-"crop factor."
+"Please enter the horizontal field of view (HFOV) or the focal length and crop factor."
msgstr ""
"In der Bilddatei \n"
"%s\n"
"wurden keine oder nur unvollständige Daten über den Bildwinkel gefunden.\n"
-"Bitte geben Sie den horizontalen Bildwinkel (HFOV) oder die Brennweite und "
-"den Formatfaktor ein."
+"Bitte geben Sie den horizontalen Bildwinkel (HFOV) oder die Brennweite und den Formatfaktor ein."
#: hugin1/hugin/HFOVDialog.cpp:157
msgid "The horizontal field of view must be positive."
@@ -880,7 +920,8 @@
msgid "The crop factor must be positive."
msgstr "Der Formatfaktor muss größer Null sein."
-#: hugin1/hugin/huginApp.cpp:143 PTBatcherGUI/PTBatcherGUI.cpp:66
+#: hugin1/hugin/huginApp.cpp:143
+#: PTBatcherGUI/PTBatcherGUI.cpp:66
msgid "xrc directory not found in bundle"
msgstr "xrc-Verzeichnis nicht im Paket gefunden"
@@ -898,7 +939,8 @@
"xrc-Verzeichnis nicht gefunden, Hugin muss ordentlich installiert werden.\n"
"Folgenden Pfad versucht:"
-#: hugin1/hugin/ImagesList.cpp:332 hugin1/hugin/ImagesList.cpp:448
+#: hugin1/hugin/ImagesList.cpp:332
+#: hugin1/hugin/ImagesList.cpp:448
msgid "Filename"
msgstr "Dateiname"
@@ -974,32 +1016,52 @@
msgid "t"
msgstr "t"
-#: hugin1/hugin/ImagesList.cpp:488 translations/xrc.cpp:11
-#: translations/xrc.cpp:29 translations/xrc.cpp:138 xrc.cpp:11 xrc.cpp:29
+#: hugin1/hugin/ImagesList.cpp:488
+#: translations/xrc.cpp:11
+#: translations/xrc.cpp:29
+#: translations/xrc.cpp:138
+#: xrc.cpp:11
+#: xrc.cpp:29
#: xrc.cpp:138
msgid "Normal (rectilinear)"
msgstr "Gradlinig (Rectilinear)"
-#: hugin1/hugin/ImagesList.cpp:489 translations/xrc.cpp:12
-#: translations/xrc.cpp:30 translations/xrc.cpp:139 xrc.cpp:12 xrc.cpp:30
+#: hugin1/hugin/ImagesList.cpp:489
+#: translations/xrc.cpp:12
+#: translations/xrc.cpp:30
+#: translations/xrc.cpp:139
+#: xrc.cpp:12
+#: xrc.cpp:30
#: xrc.cpp:139
msgid "Panoramic (cylindrical)"
msgstr "Zylindrisch"
-#: hugin1/hugin/ImagesList.cpp:490 translations/xrc.cpp:13
-#: translations/xrc.cpp:31 translations/xrc.cpp:140 xrc.cpp:13 xrc.cpp:31
+#: hugin1/hugin/ImagesList.cpp:490
+#: translations/xrc.cpp:13
+#: translations/xrc.cpp:31
+#: translations/xrc.cpp:140
+#: xrc.cpp:13
+#: xrc.cpp:31
#: xrc.cpp:140
msgid "Circular fisheye"
msgstr "Fischauge kreisförmig"
-#: hugin1/hugin/ImagesList.cpp:491 translations/xrc.cpp:14
-#: translations/xrc.cpp:32 translations/xrc.cpp:141 xrc.cpp:14 xrc.cpp:32
+#: hugin1/hugin/ImagesList.cpp:491
+#: translations/xrc.cpp:14
+#: translations/xrc.cpp:32
+#: translations/xrc.cpp:141
+#: xrc.cpp:14
+#: xrc.cpp:32
#: xrc.cpp:141
msgid "Full frame fisheye"
msgstr "Fischauge Vollbild"
-#: hugin1/hugin/ImagesList.cpp:561 translations/xrc.cpp:194
-#: translations/xrc.cpp:373 translations/xrc.cpp:592 xrc.cpp:194 xrc.cpp:373
+#: hugin1/hugin/ImagesList.cpp:561
+#: translations/xrc.cpp:194
+#: translations/xrc.cpp:373
+#: translations/xrc.cpp:592
+#: xrc.cpp:194
+#: xrc.cpp:373
#: xrc.cpp:592
msgid "Crop"
msgstr "Beschnitt"
@@ -1039,8 +1101,10 @@
msgid "Not a jpeg file:"
msgstr "Kein JPEG-Bild:"
-#: hugin1/hugin/LensPanel.cpp:837 hugin1/hugin/LensPanel.cpp:946
-#: hugin1/hugin/LensPanel.cpp:979 hugin1/hugin/LensPanel.cpp:1099
+#: hugin1/hugin/LensPanel.cpp:837
+#: hugin1/hugin/LensPanel.cpp:946
+#: hugin1/hugin/LensPanel.cpp:979
+#: hugin1/hugin/LensPanel.cpp:1099
#: hugin1/hugin/LensPanel.cpp:1117
msgid "Please select an image and try again"
msgstr "Bitte ein Bild auswählen und erneut versuchen"
@@ -1108,8 +1172,12 @@
"Schwerwiegender Installationsfehler.\n"
"Die Datei data/splash.png wurde nicht gefunden in:"
-#: hugin1/hugin/MainFrame.cpp:256 translations/xrc.cpp:202
-#: translations/xrc.cpp:243 translations/xrc.cpp:244 xrc.cpp:202 xrc.cpp:243
+#: hugin1/hugin/MainFrame.cpp:256
+#: translations/xrc.cpp:202
+#: translations/xrc.cpp:243
+#: translations/xrc.cpp:244
+#: xrc.cpp:202
+#: xrc.cpp:243
#: xrc.cpp:244
msgid "&Help"
msgstr "&Hilfe"
@@ -1153,7 +1221,9 @@
msgid "File %s exists. Overwrite?"
msgstr "Datei %s ist bereits vorhanden. Überschreiben?"
-#: hugin1/hugin/MainFrame.cpp:594 translations/xrc.cpp:262 xrc.cpp:262
+#: hugin1/hugin/MainFrame.cpp:594
+#: translations/xrc.cpp:262
+#: xrc.cpp:262
msgid "Save project"
msgstr "Projekt speichern"
@@ -1181,21 +1251,20 @@
msgid "Open project file"
msgstr "Projekt laden"
-#: hugin1/hugin/MainFrame.cpp:714 hugin1/hugin/MainFrame.cpp:1204
-#: hugin1/stitch_project/hugin_stitch_project.cpp:338 PTBatcher/Batch.cpp:572
+#: hugin1/hugin/MainFrame.cpp:714
+#: hugin1/hugin/MainFrame.cpp:1204
+#: hugin1/stitch_project/hugin_stitch_project.cpp:338
+#: PTBatcher/Batch.cpp:572
#: PTBatcherGUI/BatchFrame.cpp:435
-msgid ""
-"Project files (*.pto,*.ptp,*.pts,*.oto)|*.pto;*.ptp;*.pts;*.oto;|All files "
-"(*)|*"
-msgstr ""
-"Projekt-Dateien (*.pto,*.ptp,*.pts,*.oto)|*.pto;*.ptp;*.pts;*.oto;|Alle "
-"Dateien (*)|*"
+msgid "Project files (*.pto,*.ptp,*.pts,*.oto)|*.pto;*.ptp;*.pts;*.oto;|All files (*)|*"
+msgstr "Projekt-Dateien (*.pto,*.ptp,*.pts,*.oto)|*.pto;*.ptp;*.pts;*.oto;|Alle Dateien (*)|*"
#: hugin1/hugin/MainFrame.cpp:728
msgid "Open project: cancel"
msgstr "Projekt laden abgebrochen"
-#: hugin1/hugin/MainFrame.cpp:763 hugin1/hugin/wxPanoCommand.cpp:359
+#: hugin1/hugin/MainFrame.cpp:763
+#: hugin1/hugin/wxPanoCommand.cpp:359
#: hugin1/hugin/wxPanoCommand.cpp:434
msgid "Add images"
msgstr "Bilder hinzufügen"
@@ -1221,30 +1290,23 @@
msgid ""
"%d points fine-tuned, %d points not updated due to low correlation\n"
"\n"
-"Hint: The errors of the fine-tuned points have been set to the correlation "
-"coefficient\n"
+"Hint: The errors of the fine-tuned points have been set to the correlation coefficient\n"
"Problematic points can be spotted (just after fine-tune, before optimizing)\n"
"by an error <= %.3f.\n"
-"The error of points without a well defined peak (typically in regions with "
-"uniform color)\n"
+"The error of points without a well defined peak (typically in regions with uniform color)\n"
"will be set to 0\n"
"\n"
"Use the Control Point list (F3) to see all points of the current project\n"
msgstr ""
-"%d Punkte justiert. %d Punkte wurden aufgrund geringer Übereinstimmung nicht "
-"aktualisiert.\n"
+"%d Punkte justiert. %d Punkte wurden aufgrund geringer Übereinstimmung nicht aktualisiert.\n"
"\n"
-"Hinweis: Der Fehlerwert der feinabgestimmten Punkte wurde auf den "
-"Korrelationskoeffizienten gesetzt.\n"
-"Problematische Punkte können nach der Feinjustierung, aber vor der "
-"Optimierung\n"
+"Hinweis: Der Fehlerwert der feinabgestimmten Punkte wurde auf den Korrelationskoeffizienten gesetzt.\n"
+"Problematische Punkte können nach der Feinjustierung, aber vor der Optimierung\n"
"durch einen Fehlerwert <= %.3f ermittelt werden.\n"
-"Der Fehlerwert von Punkten ohne ausreichende Ähnlichkeit (typischerweise in "
-"Regionen mit einheitlicher Farbe)\n"
+"Der Fehlerwert von Punkten ohne ausreichende Ähnlichkeit (typischerweise in Regionen mit einheitlicher Farbe)\n"
"wird auf 0 gesetzt.\n"
"\n"
-"Benutzen Sie die Kontrollpunktliste (F3) um alle Punkte des aktuellen "
-"Projekts zu sehen.\n"
+"Benutzen Sie die Kontrollpunktliste (F3) um alle Punkte des aktuellen Projekts zu sehen.\n"
#: hugin1/hugin/MainFrame.cpp:1365
msgid "Fine-tune result"
@@ -1254,7 +1316,8 @@
msgid "Nona options"
msgstr "Optionen für Nona"
-#: hugin1/hugin/NonaStitcherPanel.cpp:288 hugin1/nona_gui/nona_gui.cpp:226
+#: hugin1/hugin/NonaStitcherPanel.cpp:288
+#: hugin1/nona_gui/nona_gui.cpp:226
msgid "Stitching Panorama"
msgstr "Panorama zusammenfügen"
@@ -1302,7 +1365,8 @@
msgstr "Enblend-Fehler"
# Log-Meldung übersetzen
-#: hugin1/hugin/NonaStitcherPanel.cpp:506 hugin1/hugin/PTStitcherPanel.cpp:310
+#: hugin1/hugin/NonaStitcherPanel.cpp:506
+#: hugin1/hugin/PTStitcherPanel.cpp:310
msgid "gamma must be a number"
msgstr "Gammawert muss eine Zahl sein"
@@ -1313,8 +1377,7 @@
"\n"
"The results are probably invalid.\n"
"\n"
-"Optimization of the Field of View (v) of partial panoramas can lead to bad "
-"results.\n"
+"Optimization of the Field of View (v) of partial panoramas can lead to bad results.\n"
"Try adding more images and control points.\n"
"\n"
"Apply the changes anyway?"
@@ -1323,8 +1386,7 @@
"\n"
"WARNUNG: Ein sehr kleiner Bildwinkel wurde ermittelt.\n"
"Der Ergebnis ist wahrscheinlich nicht richtig.\n"
-"Bei Teilpanoramen kann die Optimierung des Bildwinkels zu schlechten "
-"Ergebnissen führen.\n"
+"Bei Teilpanoramen kann die Optimierung des Bildwinkels zu schlechten Ergebnissen führen.\n"
"Versuchen Sie, mehr Bilder und mehr Kontrollpunkte hinzuzufügen.\n"
"\n"
"Änderungen trotzdem übernehmen?"
@@ -1340,8 +1402,7 @@
"\n"
"*WARNING*: very high distortion coefficients (a,b,c) have been estimated.\n"
"The results are probably invalid.\n"
-"Only optimize all distortion parameters when many, well spread control "
-"points are used.\n"
+"Only optimize all distortion parameters when many, well spread control points are used.\n"
"Please reset the a,b and c parameters to zero and add more control points\n"
"\n"
"Apply the changes anyway?"
@@ -1354,10 +1415,8 @@
"\n"
"WARNUNG: Es wurden sehr große Verzeichungsparameter (a, b, c) berechnet.\n"
"Die Ergebnisse sind wahrscheinlich ungültig.\n"
-"Die Optimierung der Parameter gelingt nur bei vielen, gut verteilten "
-"Kontrollpunkten.\n"
-"Bitte setzen Sie die Parameter zurück auf 0 und fügen Sie mehr "
-"Kontrollpunkte hinzu.\n"
+"Die Optimierung der Parameter gelingt nur bei vielen, gut verteilten Kontrollpunkten.\n"
+"Bitte setzen Sie die Parameter zurück auf 0 und fügen Sie mehr Kontrollpunkte hinzu.\n"
"\n"
"Änderungen trotzdem übernehmen?"
@@ -1402,14 +1461,11 @@
#: hugin1/hugin/OptimizePhotometricPanel.cpp:467
msgid ""
-"The vignetting and exposure correction is determined by analysing color "
-"values in the overlapping areas.\n"
+"The vignetting and exposure correction is determined by analysing color values in the overlapping areas.\n"
"To speed up the computation, only a random subset of points is used."
msgstr ""
-"Die Vignettierungs- und Belichtungskorrektur wird aus überlappenden "
-"Bildbereichen ermittelt.\n"
-"Um die Geschwindigkeit zu erhöhen, werden nur einige zufällige Punkte im "
-"Überlappungsbereich benutzt."
+"Die Vignettierungs- und Belichtungskorrektur wird aus überlappenden Bildbereichen ermittelt.\n"
+"Um die Geschwindigkeit zu erhöhen, werden nur einige zufällige Punkte im Überlappungsbereich benutzt."
#: hugin1/hugin/OptimizePhotometricPanel.cpp:468
msgid "Number of points per image"
@@ -1428,9 +1484,7 @@
# and photo... instead of Photo...?
#: hugin1/hugin/OptimizePhotometricPanel.cpp:507
msgid "Error: no overlapping points found, Photometric optimization aborted"
-msgstr ""
-"Fehler: Keine überlappenden Punkte gefunden, photometrische Optimierung "
-"abgebrochen."
+msgstr "Fehler: Keine überlappenden Punkte gefunden, photometrische Optimierung abgebrochen."
#: hugin1/hugin/OptimizePhotometricPanel.cpp:540
msgid "Internal error during photometric optimization:\n"
@@ -1444,8 +1498,7 @@
#, c-format
msgid ""
"Photometric optimization results:\n"
-"Average difference (RMSE) between overlapping pixels: %.2f gray values "
-"(0..255)\n"
+"Average difference (RMSE) between overlapping pixels: %.2f gray values (0..255)\n"
"\n"
"Apply results?"
msgstr ""
@@ -1463,25 +1516,28 @@
msgstr "Der Assistent hat keinen Ratschlag"
# Shouldn't it be "... doesn't find any problem ..."?
-#: hugin1/hugin/PanoDruid.cpp:53 hugin1/hugin/PanoDruid.cpp:423
+#: hugin1/hugin/PanoDruid.cpp:53
+#: hugin1/hugin/PanoDruid.cpp:423
msgid "The druid finds no problems with your panorama."
msgstr "Der Assistent findet keine Probleme in Ihrem Panorama"
-#: hugin1/hugin/PanoDruid.cpp:54 hugin1/hugin/PanoDruid.cpp:424
+#: hugin1/hugin/PanoDruid.cpp:54
+#: hugin1/hugin/PanoDruid.cpp:424
msgid ""
"Stitch your final image now, and then use an image editor\n"
"such as the GNU Image Manipulation Program (the GIMP)\n"
"to add any finishing touches."
msgstr ""
"Fügen Sie jetzt Ihr endgültiges Panorama zusammen und benutzt dann ein\n"
-"Bildverarbeitungsprogramm (z.B. GIMP), um dem Panorama den letzten Schliff "
-"zu geben."
+"Bildverarbeitungsprogramm (z.B. GIMP), um dem Panorama den letzten Schliff zu geben."
-#: hugin1/hugin/PanoDruid.cpp:63 hugin1/hugin/PanoDruid.cpp:443
+#: hugin1/hugin/PanoDruid.cpp:63
+#: hugin1/hugin/PanoDruid.cpp:443
msgid "Warning: you haven't saved the current project."
msgstr "Warnung: Sie haben das aktuelle Projekt nicht gespeichert."
-#: hugin1/hugin/PanoDruid.cpp:64 hugin1/hugin/PanoDruid.cpp:444
+#: hugin1/hugin/PanoDruid.cpp:64
+#: hugin1/hugin/PanoDruid.cpp:444
msgid ""
"While everything else seems to be ready to stitch,\n"
"don't forget to save your project file so you can\n"
@@ -1492,7 +1548,8 @@
"denn dann können Sie noch weiter experimentieren\n"
"oder die Einstellungen später verändern."
-#: hugin1/hugin/PanoDruid.cpp:73 hugin1/hugin/PanoDruid.cpp:439
+#: hugin1/hugin/PanoDruid.cpp:73
+#: hugin1/hugin/PanoDruid.cpp:439
msgid "Warning: current stitch has huge dimensions."
msgstr "Warnung: Derzeitiges Panorama ist sehr groß."
@@ -1507,15 +1564,16 @@
msgstr ""
"Zurzeit ist eine sehr große Bildgröße eingestellt.\n"
"Manche Rechner brauchen für die Erstellung solcher Bilder sehr lange.\n"
-"Für eine optimale Größe benutzen Sie bitte die Schaltfläche \"Optimale Größe "
-"berechnen\"\n"
+"Für eine optimale Größe benutzen Sie bitte die Schaltfläche \"Optimale Größe berechnen\"\n"
"auf dem Zusammenfügen-Reiter."
-#: hugin1/hugin/PanoDruid.cpp:104 hugin1/hugin/PanoDruid.cpp:435
+#: hugin1/hugin/PanoDruid.cpp:104
+#: hugin1/hugin/PanoDruid.cpp:435
msgid "The Horizontal Field of View (HFOV) may be too low."
msgstr "Der horizontale Bildwinkel (HFOV) könnte zu klein sein."
-#: hugin1/hugin/PanoDruid.cpp:105 hugin1/hugin/PanoDruid.cpp:436
+#: hugin1/hugin/PanoDruid.cpp:105
+#: hugin1/hugin/PanoDruid.cpp:436
msgid ""
"Check that the focal lengths and/or hfov figures\n"
"for each image are correct for the camera settings.\n"
@@ -1610,21 +1668,24 @@
"Kontrollpunkte für identische optische Merkmale\n"
"eines Paares überlappender Bildern hinzu."
-#: hugin1/hugin/PanoDruid.cpp:213 hugin1/hugin/PanoDruid.cpp:431
+#: hugin1/hugin/PanoDruid.cpp:213
+#: hugin1/hugin/PanoDruid.cpp:431
msgid "Add at least one more image."
msgstr "Noch mindestens ein weiteres Bild hinzufügen."
# This ignores the fact that panotools may be used to correct (e.g. shift) the perspective of single images!
-#: hugin1/hugin/PanoDruid.cpp:214 hugin1/hugin/PanoDruid.cpp:432
+#: hugin1/hugin/PanoDruid.cpp:214
+#: hugin1/hugin/PanoDruid.cpp:432
msgid "You should have at least two files listed in the Images tab."
-msgstr ""
-"Die Dateiliste im Bilder-Reiter sollte mindestens zwei Bilder enthalten."
+msgstr "Die Dateiliste im Bilder-Reiter sollte mindestens zwei Bilder enthalten."
-#: hugin1/hugin/PanoDruid.cpp:228 hugin1/hugin/PanoDruid.cpp:427
+#: hugin1/hugin/PanoDruid.cpp:228
+#: hugin1/hugin/PanoDruid.cpp:427
msgid "To get started, add some image files."
msgstr "Zu Beginn, fügen Sie Biilder hinzu."
-#: hugin1/hugin/PanoDruid.cpp:229 hugin1/hugin/PanoDruid.cpp:428
+#: hugin1/hugin/PanoDruid.cpp:229
+#: hugin1/hugin/PanoDruid.cpp:428
msgid "You can add any number of images using the Images tab."
msgstr "Im Bilder-Reiter können Sie beliebig viele Bilder hinzufügen."
@@ -1647,8 +1708,7 @@
msgstr ""
"Zurzeit ist eine sehr große Bildgröße eingestellt.\n"
"Manche Rechner brauchen für die Erstellung solcher Bilder sehr lange.\n"
-"Für eine optimale Größe benutzen Sie bitte die Schaltfläche \"Optimale Größe "
-"berechnen\"\n"
+"Für eine optimale Größe benutzen Sie bitte die Schaltfläche \"Optimale Größe berechnen\"\n"
"auf dem Zusammenfügen-Reiter."
#: hugin1/hugin/PanoPanel.cpp:150
@@ -1679,8 +1739,7 @@
#: hugin1/hugin/PanoPanel.cpp:156
#, fuzzy
msgid "Lambert Equal Area Azimuthal"
-msgstr ""
-"Lambert flächengleiche Azimutalprojektion (Lambert Equal Area Azimuthal)"
+msgstr "Lambert flächengleiche Azimutalprojektion (Lambert Equal Area Azimuthal)"
#: hugin1/hugin/PanoPanel.cpp:157
#, fuzzy
@@ -1724,16 +1783,12 @@
#: hugin1/hugin/PanoPanel.cpp:594
#, c-format
msgid "Invalid HFOV value. Maximum HFOV for this projection is %lf."
-msgstr ""
-"Ungültiger horizontaler Bildwinkel (HFOV). Der maximale Winkel dieser "
-"Projektion beträgt: %lf"
+msgstr "Ungültiger horizontaler Bildwinkel (HFOV). Der maximale Winkel dieser Projektion beträgt: %lf"
#: hugin1/hugin/PanoPanel.cpp:625
#, c-format
msgid "Invalid VFOV value. Maximum VFOV for this projection is %lf."
-msgstr ""
-"Ungültiger vertikaler Bildwinkel (VFOV). Der maximale Winkel dieser "
-"Projektion beträgt: %lf"
+msgstr "Ungültiger vertikaler Bildwinkel (VFOV). Der maximale Winkel dieser Projektion beträgt: %lf"
#: hugin1/hugin/PanoPanel.cpp:671
msgid "width needs to be an integer bigger than 0"
@@ -1855,7 +1910,8 @@
#: hugin1/hugin/PreferencesDialog.cpp:296
#: hugin1/hugin/PreferencesDialog.cpp:313
#: hugin1/hugin/PreferencesDialog.cpp:329
-#: hugin1/hugin/PreferencesDialog.cpp:346 hugin1/hugin/PTStitcherPanel.cpp:483
+#: hugin1/hugin/PreferencesDialog.cpp:346
+#: hugin1/hugin/PTStitcherPanel.cpp:483
msgid "Executables (*.exe)|*.exe"
msgstr "Anwendungen (*.exe)|*.exe"
@@ -1871,7 +1927,9 @@
msgid "Select Enfuse"
msgstr "Enfuse auswählen"
-#: hugin1/hugin/PreferencesDialog.cpp:343 translations/xrc.cpp:501 xrc.cpp:501
+#: hugin1/hugin/PreferencesDialog.cpp:343
+#: translations/xrc.cpp:501
+#: xrc.cpp:501
msgid "Select Autopano"
msgstr "Autopano auswählen"
@@ -1893,7 +1951,9 @@
"Möchten Sie die angezeigten Einstellungen wirklich\n"
"auf die Voreinstellungen zurücksetzen?"
-#: hugin1/hugin/PreferencesDialog.cpp:820 translations/xrc.cpp:537 xrc.cpp:537
+#: hugin1/hugin/PreferencesDialog.cpp:820
+#: translations/xrc.cpp:537
+#: xrc.cpp:537
msgid "Load Defaults"
msgstr "Voreinstellungen laden"
@@ -1901,42 +1961,26 @@
msgid "Drag the inside of the cropping rectangle to adjust the crop."
msgstr "Innerhalb des Beschnitt-Rechtecks ziehen um den Beschnitt anzupassen."
-#: hugin1/hugin/PreviewDragTool.cpp:53 hugin1/hugin/PreviewDragTool.cpp:258
-msgid ""
-"Drag to move images (optionally use shift to constrain), or roll with right-"
-"drag or ctrl-drag."
-msgstr ""
-"Ziehen um Bilder zu bewegen (Hochstelltaste zur Richtungseinschränkung "
-"verwenden), oder rollen mit rechts-ziehen oder Ctrl-ziehen."
+#: hugin1/hugin/PreviewDragTool.cpp:53
+#: hugin1/hugin/PreviewDragTool.cpp:258
+msgid "Drag to move images (optionally use shift to constrain), or roll with right-drag or ctrl-drag."
+msgstr "Ziehen um Bilder zu bewegen (Hochstelltaste zur Richtungseinschränkung verwenden), oder rollen mit rechts-ziehen oder Ctrl-ziehen."
#: hugin1/hugin/PreviewDragTool.cpp:76
-msgid ""
-"Currently constrained to moving only pitch. Make a larger movement in the "
-"opposite direction to constrain to yaw."
-msgstr ""
-"Momentan beschränkt auf Änderung der Nickwinkel (pitch). Machen Sie eine "
-"größere Bewegung in die entgegengesetzte Richtung, um auf den Gierwinkel "
-"(yaw) zu beschränken."
+msgid "Currently constrained to moving only pitch. Make a larger movement in the opposite direction to constrain to yaw."
+msgstr "Momentan beschränkt auf Änderung der Nickwinkel (pitch). Machen Sie eine größere Bewegung in die entgegengesetzte Richtung, um auf den Gierwinkel (yaw) zu beschränken."
#: hugin1/hugin/PreviewDragTool.cpp:80
-msgid ""
-"Currently constrained to moving only yaw. Make a larger movement in the "
-"opposite direction to constrain to pitch."
-msgstr ""
-"Momentan beschränkt auf Änderung des Gierwinkels (yaw). Machen Sie eine "
-"größere Bewegung in die entgegengesetzte Richtung, um auf den Nickwinkel "
-"(pitch) zu beschränken."
+msgid "Currently constrained to moving only yaw. Make a larger movement in the opposite direction to constrain to pitch."
+msgstr "Momentan beschränkt auf Änderung des Gierwinkels (yaw). Machen Sie eine größere Bewegung in die entgegengesetzte Richtung, um auf den Nickwinkel (pitch) zu beschränken."
#: hugin1/hugin/PreviewDragTool.cpp:149
msgid "Rotate around the centre to roll."
msgstr "Zum Rollen um den Mittelpunkt drehen."
#: hugin1/hugin/PreviewDragTool.cpp:170
-msgid ""
-"Constrained drag: make a movement and it will be snapped to the yaw or pitch."
-msgstr ""
-"Eingeschänktes Ziehen: Machen Sie eine Bewegung und sie wird sich auf "
-"Gierwinkel (yaw) oder Neigung (pitch) beschränken."
+msgid "Constrained drag: make a movement and it will be snapped to the yaw or pitch."
+msgstr "Eingeschänktes Ziehen: Machen Sie eine Bewegung und sie wird sich auf Gierwinkel (yaw) oder Neigung (pitch) beschränken."
#: hugin1/hugin/PreviewDragTool.cpp:172
msgid "Drag to move."
@@ -1958,18 +2002,17 @@
msgid "HDR"
msgstr "HDR"
-#: hugin1/hugin/PreviewFrame.cpp:355 hugin1/hugin/PreviewPanel.cpp:768
-msgid ""
-"Left click to define new center point, right click to move point to horizon."
-msgstr ""
-"Linke Maustaste: Mittelpunkt wählen; rechter Maustaste: Punkt auf den "
-"Horizont bewegen."
+#: hugin1/hugin/PreviewFrame.cpp:355
+#: hugin1/hugin/PreviewPanel.cpp:768
+msgid "Left click to define new center point, right click to move point to horizon."
+msgstr "Linke Maustaste: Mittelpunkt wählen; rechter Maustaste: Punkt auf den Horizont bewegen."
# Alte Übersetzung
# "Drehung (yaw) und Neigung (pitch) mit der linken Maustaste setzen.\n
# Benutzen Sie die rechte Maustaste um den Rollwinkel zu setzten."
# ... war auch gut. Der englische Text müsste dann angepasst werden.
-#: hugin1/hugin/PreviewFrame.cpp:390 hugin1/hugin/PreviewFrame.cpp:512
+#: hugin1/hugin/PreviewFrame.cpp:390
+#: hugin1/hugin/PreviewFrame.cpp:512
msgid "Center panorama with left mouse button, set horizon with right button"
msgstr ""
"Panorama zentrieren mit der linken Maustaste,\n"
@@ -1992,23 +2035,33 @@
msgid "Bicubic"
msgstr "Bikubisch"
-#: hugin1/hugin/PTStitcherPanel.cpp:280 translations/xrc.cpp:347 xrc.cpp:347
+#: hugin1/hugin/PTStitcherPanel.cpp:280
+#: translations/xrc.cpp:347
+#: xrc.cpp:347
msgid "Spline 16"
msgstr "Spline 16"
-#: hugin1/hugin/PTStitcherPanel.cpp:281 translations/xrc.cpp:348 xrc.cpp:348
+#: hugin1/hugin/PTStitcherPanel.cpp:281
+#: translations/xrc.cpp:348
+#: xrc.cpp:348
msgid "Spline 36"
msgstr "Spline 36"
-#: hugin1/hugin/PTStitcherPanel.cpp:282 translations/xrc.cpp:349 xrc.cpp:349
+#: hugin1/hugin/PTStitcherPanel.cpp:282
+#: translations/xrc.cpp:349
+#: xrc.cpp:349
msgid "Sinc 256"
msgstr "Sinc 256"
-#: hugin1/hugin/PTStitcherPanel.cpp:283 translations/xrc.cpp:350 xrc.cpp:350
+#: hugin1/hugin/PTStitcherPanel.cpp:283
+#: translations/xrc.cpp:350
+#: xrc.cpp:350
msgid "Spline 64"
msgstr "Spline 64"
-#: hugin1/hugin/PTStitcherPanel.cpp:284 translations/xrc.cpp:351 xrc.cpp:351
+#: hugin1/hugin/PTStitcherPanel.cpp:284
+#: translations/xrc.cpp:351
+#: xrc.cpp:351
msgid "Bilinear"
msgstr "Bilinear"
@@ -2016,22 +2069,21 @@
msgid "Nearest neighbour"
msgstr "Pixelwiederholung"
-#: hugin1/hugin/PTStitcherPanel.cpp:286 translations/xrc.cpp:353 xrc.cpp:353
+#: hugin1/hugin/PTStitcherPanel.cpp:286
+#: translations/xrc.cpp:353
+#: xrc.cpp:353
msgid "Sinc 1024"
msgstr "Sinc 1024"
#: hugin1/hugin/PTStitcherPanel.cpp:450
msgid ""
-"PTStitcher does not support output filenames that include a dot character "
-"(.).\n"
+"PTStitcher does not support output filenames that include a dot character (.).\n"
"Please save your projects in a directory without dot in the pathname.\n"
"\n"
"Do you want to continue anyway?"
msgstr ""
-"PTStitcher unterstützt keine Datei- und Pfadnamen die einen Punkt (\".\") "
-"enthalten.\n"
-"Bitte speichern Sie ein Projekt in einem Verzeichnis, dessen Pfad keinen "
-"Punkt enthält.\n"
+"PTStitcher unterstützt keine Datei- und Pfadnamen die einen Punkt (\".\") enthalten.\n"
+"Bitte speichern Sie ein Projekt in einem Verzeichnis, dessen Pfad keinen Punkt enthält.\n"
"\n"
"Möchten Sie trotzdem fortfahren?"
@@ -2065,17 +2117,13 @@
#: hugin1/hugin/PTStitcherPanel.cpp:518
msgid ""
-"Warning: PTmender (from panotools 2.9 or later) only supports TIFF_m "
-"output.\n"
-"For color and brightness correction, the resulting tiff files must be "
-"processed with PTblender.\n"
+"Warning: PTmender (from panotools 2.9 or later) only supports TIFF_m output.\n"
+"For color and brightness correction, the resulting tiff files must be processed with PTblender.\n"
"\n"
"Continue anyway?"
msgstr ""
-"WARNUNG: PTmender (aus PanoTools 2.9 oder neuer) unterstützt nur TIFF_m-"
-"Ausgabe.\n"
-"Für die Farb- und Helligkeitskorrektur müssen die Ergebnisse mit PTblender "
-"verarbeitet werden.\n"
+"WARNUNG: PTmender (aus PanoTools 2.9 oder neuer) unterstützt nur TIFF_m-Ausgabe.\n"
+"Für die Farb- und Helligkeitskorrektur müssen die Ergebnisse mit PTblender verarbeitet werden.\n"
"\n"
"Trotzdem fortfahren?"
@@ -2143,7 +2191,8 @@
"Fehler, die Vorlage erwartet %d Bilder,\n"
"das Projekt enthält %d Bilder.\n"
-#: hugin1/hugin/wxPanoCommand.cpp:506 hugin1/hugin/wxPanoCommand.cpp:532
+#: hugin1/hugin/wxPanoCommand.cpp:506
+#: hugin1/hugin/wxPanoCommand.cpp:532
msgid "Could not apply template"
msgstr "Konnte die Vorlage nicht anwenden"
@@ -2158,7 +2207,8 @@
msgstr "Fehler in der Komandozeile."
#: hugin1/nona_gui/nona_gui.cpp:169
-#: hugin1/stitch_project/hugin_stitch_project.cpp:336 PTBatcher/Batch.cpp:570
+#: hugin1/stitch_project/hugin_stitch_project.cpp:336
+#: PTBatcher/Batch.cpp:570
msgid "Specify project source project file"
msgstr "Projektdatei auswählen"
@@ -2170,7 +2220,8 @@
msgid "Specify output image filename"
msgstr "Name des Panoramabildes angeben"
-#: hugin1/nona_gui/nona_gui.cpp:210 PTBatcher/Batch.cpp:595
+#: hugin1/nona_gui/nona_gui.cpp:210
+#: PTBatcher/Batch.cpp:595
msgid "No project files specified"
msgstr "Keine Projektdatei angegeben"
@@ -2195,18 +2246,18 @@
#: PTBatcher/RunStitchFrame.cpp:119
msgid ""
"Error during stitching\n"
-"Please report the complete text to the bug tracker on http://sf.net/projects/"
-"hugin."
+"Please report the complete text to the bug tracker on http://sf.net/projects/hugin."
msgstr ""
"Fehler während der Ausführung.\n"
-"Bitte senden Sie den gesamten Text an den Bug-Tracker auf http://sf.net/"
-"projects/hugin."
+"Bitte senden Sie den gesamten Text an den Bug-Tracker auf http://sf.net/projects/hugin."
-#: hugin1/stitch_project/hugin_stitch_project.cpp:366 PTBatcher/Batch.cpp:580
+#: hugin1/stitch_project/hugin_stitch_project.cpp:366
+#: PTBatcher/Batch.cpp:580
msgid "Specify output prefix"
msgstr "Bitte Namensanfang eingeben: "
-#: hugin1/stitch_project/hugin_stitch_project.cpp:398 PTBatcher/Batch.cpp:625
+#: hugin1/stitch_project/hugin_stitch_project.cpp:398
+#: PTBatcher/Batch.cpp:625
#, c-format
msgid "%s - Stitching"
msgstr "%s - Zusammenfügen"
@@ -2219,13 +2270,16 @@
"Die laufende Stapelverarbeitung kann nicht gelöscht werden.\n"
"Wollen Sie sie abbrechen?"
-#: PTBatcher/Batch.cpp:225 PTBatcherGUI/BatchFrame.cpp:662
-#: PTBatcherGUI/BatchFrame.cpp:689 PTBatcherGUI/BatchFrame.cpp:709
+#: PTBatcher/Batch.cpp:225
+#: PTBatcherGUI/BatchFrame.cpp:662
+#: PTBatcherGUI/BatchFrame.cpp:689
+#: PTBatcherGUI/BatchFrame.cpp:709
#: PTBatcher/ProjectArray.cpp:66
msgid "In progress"
msgstr "In Bearbeitung"
-#: PTBatcher/Batch.cpp:235 PTBatcher/Batch.cpp:256
+#: PTBatcher/Batch.cpp:235
+#: PTBatcher/Batch.cpp:256
msgid "Cleared batch."
msgstr "Stapelverarbeitung gelöscht."
@@ -2233,18 +2287,24 @@
msgid "Error: Could not get status, project with index "
msgstr "Fehler: Konnte Status nicht ermitteln, Projekt mit Index "
-#: PTBatcher/Batch.cpp:330 PTBatcher/Batch.cpp:887
+#: PTBatcher/Batch.cpp:330
+#: PTBatcher/Batch.cpp:887
#: PTBatcherGUI/ProjectListBox.cpp:145
#, c-format
msgid "%d"
msgstr "%d"
-#: PTBatcher/Batch.cpp:330 PTBatcher/Batch.cpp:682 PTBatcher/Batch.cpp:887
+#: PTBatcher/Batch.cpp:330
+#: PTBatcher/Batch.cpp:682
+#: PTBatcher/Batch.cpp:887
msgid " is not in list."
msgstr " ist nicht in der Liste."
-#: PTBatcher/Batch.cpp:330 PTBatcher/Batch.cpp:682 PTBatcher/Batch.cpp:699
-#: PTBatcher/Batch.cpp:887 PTBatcherGUI/BatchFrame.cpp:314
+#: PTBatcher/Batch.cpp:330
+#: PTBatcher/Batch.cpp:682
+#: PTBatcher/Batch.cpp:699
+#: PTBatcher/Batch.cpp:887
+#: PTBatcherGUI/BatchFrame.cpp:314
msgid "Error!"
msgstr "Fehler!"
@@ -2264,7 +2324,8 @@
msgid "Initializing shutdown..."
msgstr "Leite das Herunterfahren ein ..."
-#: PTBatcher/Batch.cpp:487 PTBatcher/Batch.cpp:492
+#: PTBatcher/Batch.cpp:487
+#: PTBatcher/Batch.cpp:492
msgid "Shutting down..."
msgstr "Fahre herunter ..."
@@ -2332,8 +2393,12 @@
msgid "Not doing much..."
msgstr "Tue nicht viel ..."
-#: PTBatcherGUI/BatchFrame.cpp:141 translations/xrc.cpp:309
-#: translations/xrc.cpp:312 translations/xrc.cpp:315 xrc.cpp:309 xrc.cpp:312
+#: PTBatcherGUI/BatchFrame.cpp:141
+#: translations/xrc.cpp:309
+#: translations/xrc.cpp:312
+#: translations/xrc.cpp:315
+#: xrc.cpp:309
+#: xrc.cpp:312
#: xrc.cpp:315
msgid "clear"
msgstr "Auswahl aufheben"
@@ -2392,8 +2457,7 @@
#: PTBatcherGUI/BatchFrame.cpp:147
msgid "Skips execution of currently running project(s)"
-msgstr ""
-"Überspringt die Ausführung des/der momentan laufenden Projekts/Projekte"
+msgstr "Überspringt die Ausführung des/der momentan laufenden Projekts/Projekte"
#: PTBatcherGUI/BatchFrame.cpp:148
msgid "pause"
@@ -2407,7 +2471,9 @@
msgid "Pauses batch execution"
msgstr "Pausiert die Stapelverarbeitung"
-#: PTBatcherGUI/BatchFrame.cpp:149 translations/xrc.cpp:614 xrc.cpp:614
+#: PTBatcherGUI/BatchFrame.cpp:149
+#: translations/xrc.cpp:614
+#: xrc.cpp:614
msgid "cancel"
msgstr "Abbrechen"
...
[truncated message content] |
|
From: <gpa...@us...> - 2009-06-13 15:13:18
|
Revision: 3941
http://hugin.svn.sourceforge.net/hugin/?rev=3941&view=rev
Author: gpatters1
Date: 2009-06-13 15:13:07 +0000 (Sat, 13 Jun 2009)
Log Message:
-----------
[2805120] Fix autoopmitizer from updating the Ev values of images when recomputing the HFOV.
Modified Paths:
--------------
hugin/trunk/src/hugin_base/panodata/SrcPanoImage.cpp
hugin/trunk/src/tools/autooptimiser.cpp
Modified: hugin/trunk/src/hugin_base/panodata/SrcPanoImage.cpp
===================================================================
--- hugin/trunk/src/hugin_base/panodata/SrcPanoImage.cpp 2009-06-12 05:14:25 UTC (rev 3940)
+++ hugin/trunk/src/hugin_base/panodata/SrcPanoImage.cpp 2009-06-13 15:13:07 UTC (rev 3941)
@@ -367,18 +367,18 @@
try {
image = Exiv2::ImageFactory::open(filename.c_str());
}catch(...) {
- std::cout << __FILE__ << " " << __LINE__ << " Error opening file" << std::endl;
+ std::cerr << __FILE__ << " " << __LINE__ << " Error opening file" << std::endl;
return false;
}
if (image.get() == 0) {
- std::cout << "Unable to open file to read EXIF data: " << filename << std::endl;
+ std::cerr << "Unable to open file to read EXIF data: " << filename << std::endl;
return false;
}
image->readMetadata();
Exiv2::ExifData &exifData = image->exifData();
if (exifData.empty()) {
- std::cout << "Unable to read EXIF data from opened file:" << filename << std::endl;
+ std::cerr << "Unable to read EXIF data from opened file:" << filename << std::endl;
return false;
}
Modified: hugin/trunk/src/tools/autooptimiser.cpp
===================================================================
--- hugin/trunk/src/tools/autooptimiser.cpp 2009-06-12 05:14:25 UTC (rev 3940)
+++ hugin/trunk/src/tools/autooptimiser.cpp 2009-06-13 15:13:07 UTC (rev 3941)
@@ -176,6 +176,8 @@
double focalLength = 0;
double cropFactor = 0;
cerr << "HFOV of image " << img.getFilename() << " invalid, trying to read EXIF tags" << endl;
+ // Remember original exposure value as we don't want to reset it when reloading EXIF tags
+ double Ev = img.getExposure();
bool ok = img.readEXIF(focalLength, cropFactor, true);
if (! ok) {
if (hfov) {
@@ -185,6 +187,8 @@
return 1;
}
}
+ //Restore saved exposure value
+ img.setExposure(Ev);
pano.setSrcImage(i, img);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tm...@us...> - 2009-06-17 05:34:38
|
Revision: 3944
http://hugin.svn.sourceforge.net/hugin/?rev=3944&view=rev
Author: tmodes
Date: 2009-06-17 05:34:34 +0000 (Wed, 17 Jun 2009)
Log Message:
-----------
More fixes for reading eV value [2805120]
Modified Paths:
--------------
hugin/trunk/src/hugin1/PT/PanoImage.h
hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp
hugin/trunk/src/hugin1/hugin/LensPanel.cpp
hugin/trunk/src/hugin1/hugin/wxPanoCommand.cpp
hugin/trunk/src/hugin_base/algorithms/basic/StraightenPanorama.cpp
hugin/trunk/src/hugin_base/panodata/SrcPanoImage.cpp
hugin/trunk/src/hugin_base/panodata/SrcPanoImage.h
hugin/trunk/src/tools/align_image_stack.cpp
hugin/trunk/src/tools/autooptimiser.cpp
Modified: hugin/trunk/src/hugin1/PT/PanoImage.h
===================================================================
--- hugin/trunk/src/hugin1/PT/PanoImage.h 2009-06-14 11:53:40 UTC (rev 3943)
+++ hugin/trunk/src/hugin1/PT/PanoImage.h 2009-06-17 05:34:34 UTC (rev 3944)
@@ -38,9 +38,9 @@
using HuginBase::SrcPanoImage;
using HuginBase::DestPanoImage;
- inline bool initImageFromFile(SrcPanoImage & img, double & focalLength, double & cropFactor)
+ inline bool initImageFromFile(SrcPanoImage & img, double & focalLength, double & cropFactor, bool applyExposureValue)
{
- return img.readEXIF(focalLength, cropFactor, true);
+ return img.readEXIF(focalLength, cropFactor, true, applyExposureValue);
}
inline double calcHFOV(SrcPanoImage::Projection proj, double fl, double crop, vigra::Size2D imageSize)
Modified: hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp 2009-06-14 11:53:40 UTC (rev 3943)
+++ hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp 2009-06-17 05:34:34 UTC (rev 3944)
@@ -789,7 +789,7 @@
double cropFactor = 0;
double focalLength = 0;
SrcPanoImage srcImg = m_pano->getSrcImage(imgNr);
- bool ok = initImageFromFile(srcImg, focalLength, cropFactor);
+ bool ok = initImageFromFile(srcImg, focalLength, cropFactor, true);
if (! ok) {
if (!getLensDataFromUser(this, srcImg, focalLength, cropFactor)) {
// hmm, we don't know anything, assume a standart lens.
Modified: hugin/trunk/src/hugin1/hugin/LensPanel.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/LensPanel.cpp 2009-06-14 11:53:40 UTC (rev 3943)
+++ hugin/trunk/src/hugin1/hugin/LensPanel.cpp 2009-06-17 05:34:34 UTC (rev 3944)
@@ -810,7 +810,7 @@
double cropFactor = 0;
double focalLength = 0;
SrcPanoImage srcImg = pano->getSrcImage(imgNr);
- bool ok = initImageFromFile(srcImg, focalLength, cropFactor);
+ bool ok = initImageFromFile(srcImg, focalLength, cropFactor, true);
if (! ok) {
if ( ! getLensDataFromUser(this, srcImg, focalLength, cropFactor)) {
srcImg.setHFOV(50);
@@ -893,7 +893,7 @@
// to be loaded now to save into the lens file
double focalLength = 0;
double cropFactor = 0;
- if (image.readEXIF(focalLength, cropFactor, false)) {
+ if (image.readEXIF(focalLength, cropFactor, false, false)) {
// write exif data to ini file
cfg.Write(wxT("EXIF/CameraMake"), wxString(image.getExifMake().c_str(), wxConvLocal));
@@ -1121,7 +1121,7 @@
double eV = 0;
SrcPanoImage srcImg = pano->getSrcImage(imgNr);
if(reset_dlg.GetResetFOV() || reset_dlg.GetResetExposure())
- srcImg.readEXIF(focalLength,cropFactor,eV,false);
+ srcImg.readEXIF(focalLength,cropFactor,eV,false,false);
if(reset_dlg.GetResetFOV())
{
if(focalLength!=0&&cropFactor!=0)
Modified: hugin/trunk/src/hugin1/hugin/wxPanoCommand.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/wxPanoCommand.cpp 2009-06-14 11:53:40 UTC (rev 3943)
+++ hugin/trunk/src/hugin1/hugin/wxPanoCommand.cpp 2009-06-17 05:34:34 UTC (rev 3944)
@@ -186,7 +186,7 @@
// try to read settings automatically.
srcImg.setFilename(filename);
- bool ok = srcImg.readEXIF(focalLength, cropFactor, true);
+ bool ok = srcImg.readEXIF(focalLength, cropFactor, true, true);
if (srcImg.getSize().x == 0 || srcImg.getSize().y == 0) {
wxMessageBox(wxString::Format(_("Could not decode image:\n%s\nAbort"), fname.c_str()), _("Unsupported image file format"));
return;
@@ -199,7 +199,7 @@
SrcPanoImage other = pano.getSrcImage(i);
double dummyfl=0;
double dummycrop = 0;
- other.readEXIF(dummyfl, dummycrop, false);
+ other.readEXIF(dummyfl, dummycrop, false, false);
if ( other.getSize() == srcImg.getSize()
&&
other.getExifModel() == srcImg.getExifModel() &&
@@ -247,7 +247,7 @@
SrcPanoImage other = pano.getSrcImage(i);
// force reading of exif data, as it is currently not stored in the
// Panorama data class
- if (other.readEXIF(focalLength, cropFactor, false)) {
+ if (other.readEXIF(focalLength, cropFactor, false, false)) {
if (other.getSize() == srcImg.getSize()
&& other.getExifModel() == srcImg.getExifModel()
&& other.getExifMake() == srcImg.getExifMake()
@@ -391,7 +391,7 @@
{
autopanoSiftFile = true;
// something is wrong here, try to read from exif data (all images)
- bool ok = initImageFromFile(srcImg, focalLength, cropFactor);
+ bool ok = initImageFromFile(srcImg, focalLength, cropFactor, false);
if (! ok) {
getLensDataFromUser(MainFrame::Get(), srcImg, focalLength, cropFactor);
}
@@ -401,7 +401,7 @@
srcImg.setHFOV(autopanoSiftRefImg.getHFOV());
} else {
// load exif data, but do not apply it
- srcImg.readEXIF(focalLength, cropFactor);
+ srcImg.readEXIF(focalLength, cropFactor, false, false);
}
pano.setSrcImage(i, srcImg);
}
Modified: hugin/trunk/src/hugin_base/algorithms/basic/StraightenPanorama.cpp
===================================================================
--- hugin/trunk/src/hugin_base/algorithms/basic/StraightenPanorama.cpp 2009-06-14 11:53:40 UTC (rev 3943)
+++ hugin/trunk/src/hugin_base/algorithms/basic/StraightenPanorama.cpp 2009-06-17 05:34:34 UTC (rev 3944)
@@ -44,7 +44,7 @@
// stored in Panorama data model
double fl=0;
double crop=0;
- img.readEXIF(fl, crop, false);
+ img.readEXIF(fl, crop, false, false);
double roll = img.getExifOrientation();
if (roll == 90 || roll == 270 ) {
coord_idx.push_back(2);
Modified: hugin/trunk/src/hugin_base/panodata/SrcPanoImage.cpp
===================================================================
--- hugin/trunk/src/hugin_base/panodata/SrcPanoImage.cpp 2009-06-14 11:53:40 UTC (rev 3943)
+++ hugin/trunk/src/hugin_base/panodata/SrcPanoImage.cpp 2009-06-17 05:34:34 UTC (rev 3944)
@@ -327,13 +327,13 @@
}
-bool SrcPanoImage::readEXIF(double & focalLength, double & cropFactor, bool applyEXIFValues)
+bool SrcPanoImage::readEXIF(double & focalLength, double & cropFactor, bool applyEXIFValues, bool applyExposureValue)
{
double eV=0;
- return readEXIF(focalLength,cropFactor,eV,applyEXIFValues);
+ return readEXIF(focalLength,cropFactor,eV,applyEXIFValues, applyExposureValue);
};
-bool SrcPanoImage::readEXIF(double & focalLength, double & cropFactor, double & eV, bool applyEXIFValues)
+bool SrcPanoImage::readEXIF(double & focalLength, double & cropFactor, double & eV, bool applyEXIFValues, bool applyExposureValue)
{
std::string filename = getFilename();
std::string ext = hugin_utils::getExtension(filename);
@@ -617,7 +617,8 @@
// Update image with computed values from EXIF
if (applyEXIFValues) {
setRoll(roll);
- setExposureValue(eV);
+ if (applyExposureValue)
+ setExposureValue(eV);
if (focalLength > 0 && cropFactor > 0) {
setHFOV(calcHFOV(getProjection(), focalLength, cropFactor, getSize()));
DEBUG_DEBUG("HFOV: " << getHFOV());
Modified: hugin/trunk/src/hugin_base/panodata/SrcPanoImage.h
===================================================================
--- hugin/trunk/src/hugin_base/panodata/SrcPanoImage.h 2009-06-14 11:53:40 UTC (rev 3943)
+++ hugin/trunk/src/hugin_base/panodata/SrcPanoImage.h 2009-06-17 05:34:34 UTC (rev 3944)
@@ -108,7 +108,7 @@
m_filename = filename;
double crop = 0;
double fl = 0;
- readEXIF(fl, crop, true);
+ readEXIF(fl, crop, true, true);
};
///
@@ -368,8 +368,8 @@
* If no or not enought exif data was found and valid given focalLength and cropFactor
* settings where provided, they will be used for computation of the HFOV.
*/
- bool readEXIF(double & focalLength, double & cropFactor, bool applyEXIF=false);
- bool readEXIF(double & focalLength, double & cropFactor, double & eV, bool applyEXIF=false);
+ bool readEXIF(double & focalLength, double & cropFactor, bool applyEXIF, bool applyExposureValue);
+ bool readEXIF(double & focalLength, double & cropFactor, double & eV, bool applyEXIF, bool applyExposureValue);
/** calculate hfov of an image given focal length, image size and crop factor */
static double calcHFOV(SrcPanoImage::Projection proj, double fl, double crop, vigra::Size2D imageSize);
Modified: hugin/trunk/src/tools/align_image_stack.cpp
===================================================================
--- hugin/trunk/src/tools/align_image_stack.cpp 2009-06-14 11:53:40 UTC (rev 3943)
+++ hugin/trunk/src/tools/align_image_stack.cpp 2009-06-17 05:34:34 UTC (rev 3944)
@@ -284,7 +284,7 @@
if (param.fisheye) {
srcImg.setProjection(SrcPanoImage::FULL_FRAME_FISHEYE);
}
- srcImg.readEXIF(focalLength, cropFactor, true);
+ srcImg.readEXIF(focalLength, cropFactor, true, true);
// disable autorotate
srcImg.setRoll(0);
if (srcImg.getSize().x == 0 || srcImg.getSize().y == 0) {
@@ -354,7 +354,7 @@
}
// add next image.
srcImg.setFilename(files[i]);
- srcImg.readEXIF(focalLength, cropFactor, true);
+ srcImg.readEXIF(focalLength, cropFactor, true, true);
if (srcImg.getSize().x == 0 || srcImg.getSize().y == 0) {
cerr << "Could not decode image: " << files[i] << "Unsupported image file format";
return 1;
Modified: hugin/trunk/src/tools/autooptimiser.cpp
===================================================================
--- hugin/trunk/src/tools/autooptimiser.cpp 2009-06-14 11:53:40 UTC (rev 3943)
+++ hugin/trunk/src/tools/autooptimiser.cpp 2009-06-17 05:34:34 UTC (rev 3944)
@@ -176,9 +176,7 @@
double focalLength = 0;
double cropFactor = 0;
cerr << "HFOV of image " << img.getFilename() << " invalid, trying to read EXIF tags" << endl;
- // Remember original exposure value as we don't want to reset it when reloading EXIF tags
- double Ev = img.getExposure();
- bool ok = img.readEXIF(focalLength, cropFactor, true);
+ bool ok = img.readEXIF(focalLength, cropFactor, true, false);
if (! ok) {
if (hfov) {
img.setHFOV(hfov);
@@ -187,8 +185,6 @@
return 1;
}
}
- //Restore saved exposure value
- img.setExposure(Ev);
pano.setSrcImage(i, img);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gpa...@us...> - 2009-07-19 21:48:30
|
Revision: 4065
http://hugin.svn.sourceforge.net/hugin/?rev=4065&view=rev
Author: gpatters1
Date: 2009-07-19 21:48:28 +0000 (Sun, 19 Jul 2009)
Log Message:
-----------
Display EXIF info of image in images tab.
Modified Paths:
--------------
hugin/trunk/src/hugin1/hugin/ImagesPanel.cpp
hugin/trunk/src/hugin1/hugin/ImagesPanel.h
hugin/trunk/src/hugin1/hugin/xrc/images_panel.xrc
hugin/trunk/src/hugin_base/panodata/SrcPanoImage.cpp
hugin/trunk/src/hugin_base/panodata/SrcPanoImage.h
Modified: hugin/trunk/src/hugin1/hugin/ImagesPanel.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/ImagesPanel.cpp 2009-07-19 20:59:08 UTC (rev 4064)
+++ hugin/trunk/src/hugin1/hugin/ImagesPanel.cpp 2009-07-19 21:48:28 UTC (rev 4065)
@@ -463,9 +463,50 @@
XRCCTRL(*this, "images_text_roll", wxTextCtrl) ->SetValue(wxString(val.c_str(), wxConvLocal));
ShowImage(imgNr);
+ ShowExifInfo(imgNr);
}
+void ImagesPanel::ShowExifInfo(unsigned int imgNr)
+{
+ SrcPanoImage img = pano->getSrcImage(imgNr);
+
+ double focalLength = 0;
+ double cropFactor = 0;
+ const bool applyExposureValue = FALSE;
+ initImageFromFile(img,focalLength,cropFactor,applyExposureValue);
+
+ std::string val;
+ val = img.getFilename();
+ XRCCTRL(*this, "images_filename",wxStaticText) ->
+ SetLabel(wxFileName(wxString(val.c_str(),HUGIN_CONV_FILENAME)).GetFullName());
+
+ val = img.getExifMake();
+ XRCCTRL(*this, "images_camera_make",wxStaticText) ->
+ SetLabel(wxString(val.c_str(),wxConvLocal));
+
+ val = img.getExifModel();
+ XRCCTRL(*this, "images_camera_model",wxStaticText) ->
+ SetLabel(wxString(val.c_str(),wxConvLocal));
+
+ val = img.getExifDate();
+ XRCCTRL(*this, "images_capture_date",wxStaticText) ->
+ SetLabel(wxString(val.c_str(),wxConvLocal));
+
+ val = doubleToString(img.getExifFocalLength(),1);
+ XRCCTRL(*this, "images_focal_length",wxStaticText) ->
+ SetLabel(wxString(val.c_str(),wxConvLocal));
+
+ val = doubleToString(img.getExifAperture(),1);
+ XRCCTRL(*this, "images_aperture",wxStaticText) ->
+ SetLabel(wxString(val.c_str(),wxConvLocal));
+
+ val = doubleToString(img.getExifExposureTime(),5);
+ XRCCTRL(*this, "images_shutter_speed",wxStaticText) ->
+ SetLabel(wxString(val.c_str(),wxConvLocal));
+}
+
+
void ImagesPanel::ClearImgParameters()
{
XRCCTRL(*this, "images_text_yaw", wxTextCtrl) ->Clear();
@@ -474,9 +515,22 @@
XRCCTRL(*this, "images_selected_image", wxStaticBitmap)->
SetBitmap(m_empty);
+
+ ClearImgExifInfo();
}
+void ImagesPanel::ClearImgExifInfo()
+{
+ XRCCTRL(*this, "images_filename", wxStaticText) ->SetLabel(wxT(""));
+ XRCCTRL(*this, "images_camera_make", wxStaticText) ->SetLabel(wxT(""));
+ XRCCTRL(*this, "images_camera_model", wxStaticText) ->SetLabel(wxT(""));
+ XRCCTRL(*this, "images_capture_date", wxStaticText) ->SetLabel(wxT(""));
+ XRCCTRL(*this, "images_focal_length", wxStaticText) ->SetLabel(wxT(""));
+ XRCCTRL(*this, "images_aperture", wxStaticText) ->SetLabel(wxT(""));
+ XRCCTRL(*this, "images_shutter_speed", wxStaticText) ->SetLabel(wxT(""));
+}
+
void ImagesPanel::ShowImage(unsigned int imgNr)
{
m_showImgNr = imgNr;
Modified: hugin/trunk/src/hugin1/hugin/ImagesPanel.h
===================================================================
--- hugin/trunk/src/hugin1/hugin/ImagesPanel.h 2009-07-19 20:59:08 UTC (rev 4064)
+++ hugin/trunk/src/hugin1/hugin/ImagesPanel.h 2009-07-19 21:48:28 UTC (rev 4065)
@@ -141,6 +141,8 @@
/** show a bigger thumbnail */
void ShowImage(unsigned int imgNr);
+ void ShowExifInfo(unsigned int imgNr);
+ void ClearImgExifInfo();
void UpdatePreviewImage();
/** bitmap with default image */
Modified: hugin/trunk/src/hugin1/hugin/xrc/images_panel.xrc
===================================================================
--- hugin/trunk/src/hugin1/hugin/xrc/images_panel.xrc 2009-07-19 20:59:08 UTC (rev 4064)
+++ hugin/trunk/src/hugin1/hugin/xrc/images_panel.xrc 2009-07-19 21:48:28 UTC (rev 4065)
@@ -42,7 +42,7 @@
</object>
<object class="sizeritem">
<object class="wxStaticLine">
- <style></style>
+ <style/>
</object>
<flag>wxTOP|wxBOTTOM|wxEXPAND</flag>
</object>
@@ -76,7 +76,7 @@
</object>
<object class="sizeritem">
<object class="wxStaticLine">
- <style></style>
+ <style/>
</object>
<flag>wxTOP|wxBOTTOM|wxEXPAND</flag>
</object>
@@ -89,21 +89,21 @@
</object>
</object>
<flag>wxEXPAND</flag>
- </object>
- <object class="sizeritem">
- <object class="wxStaticLine">
- <style></style>
- </object>
- <flag>wxTOP|wxBOTTOM|wxEXPAND</flag>
- <border>6</border>
- </object>
- <object class="sizeritem">
- <object class="wxButton" name="images_celeste_button">
- <label>Run Celeste</label>
- <tooltip>Tries to remove control points from clouds</tooltip>
- </object>
- <flag>wxEXPAND</flag>
- </object>
+ </object>
+ <object class="sizeritem">
+ <object class="wxStaticLine">
+ <style/>
+ </object>
+ <flag>wxTOP|wxBOTTOM|wxEXPAND</flag>
+ <border>6</border>
+ </object>
+ <object class="sizeritem">
+ <object class="wxButton" name="images_celeste_button">
+ <label>Run Celeste</label>
+ <tooltip>Tries to remove control points from clouds</tooltip>
+ </object>
+ <flag>wxEXPAND</flag>
+ </object>
<object class="spacer">
<size>0,10</size>
</object>
@@ -128,10 +128,10 @@
<object class="wxStaticText">
<label>Image Orientation</label>
<font>
- <style platform="mac">normal</style>
- <family platform="mac">swiss</family>
+ <size>12</size>
+ <style>normal</style>
<weight>bold</weight>
- <size platform="mac">12</size>
+ <family>swiss</family>
</font>
</object>
<flag>wxBOTTOM</flag>
@@ -195,7 +195,7 @@
<object class="sizeritem">
<object class="wxButton" name="images_reset_pos">
<label>Reset</label>
- <style></style>
+ <style/>
<tooltip>Reset position of selected image(s)</tooltip>
</object>
<flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
@@ -217,10 +217,10 @@
<object class="wxStaticText">
<label>Feature Matching (Autopano)</label>
<font>
- <style platform="mac">normal</style>
- <family platform="mac">swiss</family>
+ <size>12</size>
+ <style>normal</style>
<weight>bold</weight>
- <size platform="mac">12</size>
+ <family>swiss</family>
</font>
</object>
<flag>wxBOTTOM|wxEXPAND</flag>
@@ -276,10 +276,10 @@
<object class="wxStaticText">
<label>Reference Image</label>
<font>
- <style platform="mac">normal</style>
- <family platform="mac">swiss</family>
+ <size>12</size>
+ <style>normal</style>
<weight>bold</weight>
- <size platform="mac">12</size>
+ <family>swiss</family>
</font>
</object>
<flag>wxBOTTOM</flag>
@@ -290,7 +290,7 @@
<object class="sizeritem">
<object class="wxButton" name="images_opt_anchor_button">
<label>Anchor this image for position</label>
- <style></style>
+ <style/>
<tooltip>use currently selected image as anchor image. That is, do not optimize the (complete) position of this image.</tooltip>
</object>
<flag>wxEXPAND</flag>
@@ -326,15 +326,14 @@
</object>
<object class="sizeritem">
<object class="wxBoxSizer">
- <orient>wxVERTICAL</orient>
<object class="sizeritem">
<object class="wxStaticText">
<label>Selected Image</label>
<font>
- <style platform="mac">normal</style>
- <family platform="mac">swiss</family>
+ <size>12</size>
+ <style>normal</style>
<weight>bold</weight>
- <size platform="mac">12</size>
+ <family>swiss</family>
</font>
</object>
<flag>wxBOTTOM</flag>
@@ -355,7 +354,98 @@
<flag>wxLEFT|wxEXPAND</flag>
<border>12</border>
</object>
+ <orient>wxVERTICAL</orient>
</object>
+ <flag>wxALL|wxEXPAND</flag>
+ <border>6</border>
+ </object>
+ <object class="sizeritem">
+ <object class="wxBoxSizer">
+ <object class="sizeritem">
+ <object class="wxStaticText">
+ <label>EXIF Info</label>
+ <font>
+ <size>12</size>
+ <style>normal</style>
+ <weight>bold</weight>
+ <underlined>0</underlined>
+ <family>swiss</family>
+ <face>Sans</face>
+ <encoding>UTF-8</encoding>
+ </font>
+ </object>
+ <flag>wxBOTTOM</flag>
+ <border>6</border>
+ </object>
+ <object class="sizeritem">
+ <object class="wxFlexGridSizer">
+ <object class="sizeritem">
+ <object class="wxStaticText">
+ <label>Filename:</label>
+ </object>
+ <flag>wxALIGN_CENTRE_VERTICAL</flag>
+ </object>
+ <object class="sizeritem">
+ <object class="wxStaticText" name="images_filename"/>
+ </object>
+ <object class="sizeritem">
+ <object class="wxStaticText">
+ <label>Make:</label>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <object class="wxStaticText" name="images_camera_make"/>
+ </object>
+ <object class="sizeritem">
+ <object class="wxStaticText">
+ <label>Model:</label>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <object class="wxStaticText" name="images_camera_model"/>
+ </object>
+ <object class="sizeritem">
+ <object class="wxStaticText">
+ <label>Capture Date:</label>
+ </object>
+ <flag>wxALIGN_CENTRE_VERTICAL</flag>
+ </object>
+ <object class="sizeritem">
+ <object class="wxStaticText" name="images_capture_date"/>
+ </object>
+ <object class="sizeritem">
+ <object class="wxStaticText">
+ <label>Focal Length:</label>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <object class="wxStaticText" name="images_focal_length"/>
+ </object>
+ <object class="sizeritem">
+ <object class="wxStaticText">
+ <label>Aperture:</label>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <object class="wxStaticText" name="images_aperture"/>
+ </object>
+ <cols>2</cols>
+ <object class="sizeritem">
+ <object class="wxStaticText">
+ <label>Shutter Speed:</label>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <object class="wxStaticText" name="images_shutter_speed"/>
+ </object>
+ <vgap>6</vgap>
+ <hgap>6</hgap>
+ </object>
+ <flag>wxLEFT|wxEXPAND</flag>
+ <border>12</border>
+ </object>
+ <orient>wxVERTICAL</orient>
+ </object>
<option>1</option>
<flag>wxALL|wxEXPAND</flag>
<border>6</border>
@@ -374,4 +464,4 @@
</object>
</object>
</object>
-</resource>
+</resource>
\ No newline at end of file
Modified: hugin/trunk/src/hugin_base/panodata/SrcPanoImage.cpp
===================================================================
--- hugin/trunk/src/hugin_base/panodata/SrcPanoImage.cpp 2009-07-19 20:59:08 UTC (rev 4064)
+++ hugin/trunk/src/hugin_base/panodata/SrcPanoImage.cpp 2009-07-19 21:48:28 UTC (rev 4065)
@@ -601,6 +601,10 @@
}
getExiv2Value(exifData,"Exif.Photo.SubjectDistance", subjectDistance);
+ std::string captureDate;
+ getExiv2Value(exifData,"Exif.Image.DateTime",captureDate);
+
+
// store some important EXIF tags for later usage.
setExifFocalLength(focalLength);
setExifCropFactor(cropFactor);
@@ -608,6 +612,8 @@
setExifAperture(photoFNumber);
setExifISO(isoSpeed);
setExifDistance(subjectDistance);
+ setExifDate(captureDate);
+ setExifExposureTime(exposureTime);
DEBUG_DEBUG("Results for:" << filename);
DEBUG_DEBUG("Focal Length: " << getExifFocalLength());
@@ -755,5 +761,19 @@
return false;
}
}
+
+
+bool SrcPanoImage::getExiv2Value(Exiv2::ExifData& exifData, std::string keyName, std::string & value)
+{
+ Exiv2::ExifKey key(keyName);
+ Exiv2::ExifData::iterator itr = exifData.findKey(key);
+ if (itr != exifData.end()) {
+ value = itr->toString();
+ DEBUG_DEBUG("" << keyName << ": " << value);
+ return true;
+ } else {
+ return false;
+ }
+}
} // namespace
Modified: hugin/trunk/src/hugin_base/panodata/SrcPanoImage.h
===================================================================
--- hugin/trunk/src/hugin_base/panodata/SrcPanoImage.h 2009-07-19 20:59:08 UTC (rev 4064)
+++ hugin/trunk/src/hugin_base/panodata/SrcPanoImage.h 2009-07-19 21:48:28 UTC (rev 4065)
@@ -345,6 +345,12 @@
void setExifDistance(const double & val)
{ m_exifDistance = val; }
+ const std::string & getExifDate() const
+ {return m_exifDate; }
+
+ void setExifDate(const std::string & val)
+ { m_exifDate = val;}
+
const double & getExifISO() const
{ return m_exifISO; }
@@ -356,7 +362,13 @@
void setExifAperture(const double & val)
{ m_exifAperture = val; }
+
+ const double & getExifExposureTime() const
+ { return m_exifExposureTime; }
+ void setExifExposureTime(const double & val)
+ { m_exifExposureTime = val; }
+
double getVar(const std::string & name) const;
void setVar(const std::string & name, double val);
@@ -428,12 +440,15 @@
// store camera information from exif tags...
std::string m_exifModel;
std::string m_exifMake;
+ std::string m_exifDate;
+
double m_exifCropFactor;
double m_exifFocalLength;
double m_exifOrientation;
double m_exifAperture;
double m_exifISO;
double m_exifDistance;
+ double m_exifExposureTime;
unsigned m_lensNr;
//
@@ -447,6 +462,7 @@
/** convenience functions to work with Exiv2 */
bool getExiv2Value(Exiv2::ExifData& exifData, std::string keyName, long & value);
bool getExiv2Value(Exiv2::ExifData& exifData, std::string keyName, float & value);
+ bool getExiv2Value(Exiv2::ExifData& exifData, std::string keyName, std::string & value);
};
} // namespace
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bru...@us...> - 2009-07-22 08:50:31
|
Revision: 4083
http://hugin.svn.sourceforge.net/hugin/?rev=4083&view=rev
Author: brunopostle
Date: 2009-07-22 08:50:22 +0000 (Wed, 22 Jul 2009)
Log Message:
-----------
make hugin build with LDFLAGS="-Wl,--as-needed" (Tiziano M?\195?\188ller)
Modified Paths:
--------------
hugin/trunk/src/foreign/levmar/CMakeLists.txt
hugin/trunk/src/foreign/vigra/vigra_impex/CMakeLists.txt
hugin/trunk/src/hugin_base/CMakeLists.txt
Modified: hugin/trunk/src/foreign/levmar/CMakeLists.txt
===================================================================
--- hugin/trunk/src/foreign/levmar/CMakeLists.txt 2009-07-22 03:35:07 UTC (rev 4082)
+++ hugin/trunk/src/foreign/levmar/CMakeLists.txt 2009-07-22 08:50:22 UTC (rev 4083)
@@ -6,3 +6,5 @@
IF(LAPACK_FOUND)
ADD_DEFINITIONS(-DHAVE_LAPACK)
ENDIF(LAPACK_FOUND)
+
+SET_TARGET_PROPERTIES(huginlevmar PROPERTIES COMPILE_FLAGS -fPIC)
Modified: hugin/trunk/src/foreign/vigra/vigra_impex/CMakeLists.txt
===================================================================
--- hugin/trunk/src/foreign/vigra/vigra_impex/CMakeLists.txt 2009-07-22 03:35:07 UTC (rev 4082)
+++ hugin/trunk/src/foreign/vigra/vigra_impex/CMakeLists.txt 2009-07-22 08:50:22 UTC (rev 4083)
@@ -9,3 +9,5 @@
ELSE (${HUGIN_SHARED_LIBS})
add_library(huginvigraimpex STATIC ${VIGRA_IMPEX_SRC})
ENDIF (${HUGIN_SHARED_LIBS})
+
+TARGET_LINK_LIBRARIES(huginvigraimpex ${JPEG_LIBRARIES} ${OPENEXR_LIBRARIES} ${PNG_LIBRARIES} ${TIFF_LIBRARIES})
Modified: hugin/trunk/src/hugin_base/CMakeLists.txt
===================================================================
--- hugin/trunk/src/hugin_base/CMakeLists.txt 2009-07-22 03:35:07 UTC (rev 4082)
+++ hugin/trunk/src/hugin_base/CMakeLists.txt 2009-07-22 08:50:22 UTC (rev 4083)
@@ -65,3 +65,5 @@
ENDIF (${HUGIN_SHARED_LIBS})
add_subdirectory(test)
+
+TARGET_LINK_LIBRARIES(huginbase huginlevmar huginvigraimpex ${Boost_thread_LIBRARIES} ${EXIV2_LIBRARIES} ${PANO_LIBRARIES} ${TIFF_LIBRARIES} ${LAPACK_LIBRARIES})
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tm...@us...> - 2009-07-27 05:30:27
|
Revision: 4113
http://hugin.svn.sourceforge.net/hugin/?rev=4113&view=rev
Author: tmodes
Date: 2009-07-27 05:30:19 +0000 (Mon, 27 Jul 2009)
Log Message:
-----------
Some formatting of EXIF information
Modified Paths:
--------------
hugin/trunk/src/hugin1/hugin/ImagesPanel.cpp
hugin/trunk/src/hugin1/hugin/xrc/images_panel.xrc
hugin/trunk/src/hugin_base/panodata/SrcPanoImage.cpp
hugin/trunk/src/hugin_base/panodata/SrcPanoImage.h
Modified: hugin/trunk/src/hugin1/hugin/ImagesPanel.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/ImagesPanel.cpp 2009-07-27 05:25:59 UTC (rev 4112)
+++ hugin/trunk/src/hugin1/hugin/ImagesPanel.cpp 2009-07-27 05:30:19 UTC (rev 4113)
@@ -28,6 +28,7 @@
#include <config.h>
#include "panoinc_WX.h"
#include "panoinc.h"
+#include <time.h>
#include "base_wx/platform.h"
#include <vector>
@@ -401,6 +402,7 @@
if (sel.size() == 0) {
// nothing to edit
DisableImageCtrls();
+ ClearImgExifInfo();
} else {
// enable edit
EnableImageCtrls();
@@ -417,6 +419,7 @@
// multiselection, clear all values
// we don't know which images parameters to show.
ClearImgParameters();
+ ClearImgExifInfo();
m_optAnchorButton->Disable();
m_colorAnchorButton->Disable();
m_moveDownButton->Disable();
@@ -473,8 +476,8 @@
val = doubleToString(const_map_get(vars,"r").getValue(),m_degDigits);
XRCCTRL(*this, "images_text_roll", wxTextCtrl) ->SetValue(wxString(val.c_str(), wxConvLocal));
+ ShowExifInfo(imgNr);
ShowImage(imgNr);
- ShowExifInfo(imgNr);
}
@@ -488,6 +491,7 @@
initImageFromFile(img,focalLength,cropFactor,applyExposureValue);
std::string val;
+ wxString s;
val = img.getFilename();
XRCCTRL(*this, "images_filename",wxStaticText) ->
SetLabel(wxFileName(wxString(val.c_str(),HUGIN_CONV_FILENAME)).GetFullName());
@@ -500,21 +504,45 @@
XRCCTRL(*this, "images_camera_model",wxStaticText) ->
SetLabel(wxString(val.c_str(),wxConvLocal));
- val = img.getExifDate();
- XRCCTRL(*this, "images_capture_date",wxStaticText) ->
- SetLabel(wxString(val.c_str(),wxConvLocal));
+ struct tm exifdatetime;
+ if(img.getExifDateTime(&exifdatetime)==0)
+ {
+ wxDateTime s_datetime=wxDateTime(exifdatetime);
+ s=s_datetime.Format();
+ }
+ else
+ s = wxString(img.getExifDate().c_str(),wxConvLocal);
+ XRCCTRL(*this, "images_capture_date",wxStaticText)->SetLabel(s);
- val = doubleToString(img.getExifFocalLength(),1);
- XRCCTRL(*this, "images_focal_length",wxStaticText) ->
- SetLabel(wxString(val.c_str(),wxConvLocal));
+ if(img.getExifFocalLength()>0.0)
+ if(img.getExifFocalLength35()>0.0)
+ s = wxString::Format(wxT("%0.1f mm (%0.0f mm)"),img.getExifFocalLength(),img.getExifFocalLength35());
+ else
+ s = wxString::Format(wxT("%0.1f mm"),img.getExifFocalLength());
+ else
+ s = wxEmptyString;
+ XRCCTRL(*this, "images_focal_length",wxStaticText)->SetLabel(s);
- val = doubleToString(img.getExifAperture(),1);
- XRCCTRL(*this, "images_aperture",wxStaticText) ->
- SetLabel(wxString(val.c_str(),wxConvLocal));
+ if(img.getExifAperture()>0)
+ s=wxString::Format(wxT("F%.1f"),img.getExifAperture());
+ else
+ s=wxEmptyString;
+ XRCCTRL(*this, "images_aperture",wxStaticText)->SetLabel(s);
- val = doubleToString(img.getExifExposureTime(),5);
- XRCCTRL(*this, "images_shutter_speed",wxStaticText) ->
- SetLabel(wxString(val.c_str(),wxConvLocal));
+ if(img.getExifExposureTime()>0.5)
+ if(img.getExifExposureTime()>=1.0)
+ if(img.getExifExposureTime()>=10.0)
+ s=wxString::Format(wxT("%3.0f s"),img.getExifExposureTime());
+ else
+ s=wxString::Format(wxT("%1.1f s"),img.getExifExposureTime());
+ else
+ s=wxString::Format(wxT("%1.2f s"),img.getExifExposureTime());
+ else
+ s=wxString::Format(wxT("1/%2.0f s"),1.0/img.getExifExposureTime());
+ XRCCTRL(*this, "images_shutter_speed",wxStaticText)->SetLabel(s);
+
+ XRCCTRL(*this, "images_shutter_speed",wxStaticText)->GetParent()->Layout();
+ Refresh();
}
Modified: hugin/trunk/src/hugin1/hugin/xrc/images_panel.xrc
===================================================================
--- hugin/trunk/src/hugin1/hugin/xrc/images_panel.xrc 2009-07-27 05:25:59 UTC (rev 4112)
+++ hugin/trunk/src/hugin1/hugin/xrc/images_panel.xrc 2009-07-27 05:30:19 UTC (rev 4113)
@@ -42,7 +42,7 @@
</object>
<object class="sizeritem">
<object class="wxStaticLine">
- <style/>
+ <style></style>
</object>
<flag>wxTOP|wxBOTTOM|wxEXPAND</flag>
</object>
@@ -76,7 +76,7 @@
</object>
<object class="sizeritem">
<object class="wxStaticLine">
- <style/>
+ <style></style>
</object>
<flag>wxTOP|wxBOTTOM|wxEXPAND</flag>
</object>
@@ -92,7 +92,7 @@
</object>
<object class="sizeritem">
<object class="wxStaticLine">
- <style/>
+ <style></style>
</object>
<flag>wxTOP|wxBOTTOM|wxEXPAND</flag>
<border>6</border>
@@ -128,10 +128,10 @@
<object class="wxStaticText">
<label>Image Orientation</label>
<font>
- <size>12</size>
- <style>normal</style>
+ <style platform="mac">normal</style>
+ <family platform="mac">swiss</family>
<weight>bold</weight>
- <family>swiss</family>
+ <size platform="mac">12</size>
</font>
</object>
<flag>wxBOTTOM</flag>
@@ -195,7 +195,7 @@
<object class="sizeritem">
<object class="wxButton" name="images_reset_pos">
<label>Reset</label>
- <style/>
+ <style></style>
<tooltip>Reset position of selected image(s)</tooltip>
</object>
<flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
@@ -217,10 +217,10 @@
<object class="wxStaticText">
<label>Feature Matching (Autopano)</label>
<font>
- <size>12</size>
- <style>normal</style>
+ <style platform="mac">normal</style>
+ <family platform="mac">swiss</family>
<weight>bold</weight>
- <family>swiss</family>
+ <size platform="mac">12</size>
</font>
</object>
<flag>wxBOTTOM|wxEXPAND</flag>
@@ -297,10 +297,10 @@
<object class="wxStaticText">
<label>Reference Image</label>
<font>
- <size>12</size>
- <style>normal</style>
+ <style platform="mac">normal</style>
+ <family platform="mac">swiss</family>
<weight>bold</weight>
- <family>swiss</family>
+ <size platform="mac">12</size>
</font>
</object>
<flag>wxBOTTOM</flag>
@@ -311,7 +311,7 @@
<object class="sizeritem">
<object class="wxButton" name="images_opt_anchor_button">
<label>Anchor this image for position</label>
- <style/>
+ <style></style>
<tooltip>use currently selected image as anchor image. That is, do not optimize the (complete) position of this image.</tooltip>
</object>
<flag>wxEXPAND</flag>
@@ -347,14 +347,15 @@
</object>
<object class="sizeritem">
<object class="wxBoxSizer">
+ <orient>wxVERTICAL</orient>
<object class="sizeritem">
<object class="wxStaticText">
<label>Selected Image</label>
<font>
- <size>12</size>
- <style>normal</style>
+ <style platform="mac">normal</style>
+ <family platform="mac">swiss</family>
<weight>bold</weight>
- <family>swiss</family>
+ <size platform="mac">12</size>
</font>
</object>
<flag>wxBOTTOM</flag>
@@ -362,114 +363,105 @@
</object>
<object class="sizeritem">
<object class="wxBoxSizer">
- <orient>wxVERTICAL</orient>
+ <orient>wxHORIZONTAL</orient>
<object class="sizeritem">
+ <object class="wxFlexGridSizer">
+ <object class="sizeritem">
+ <object class="wxStaticText">
+ <label>Filename:</label>
+ </object>
+ <flag>wxALIGN_CENTRE_VERTICAL</flag>
+ </object>
+ <object class="sizeritem">
+ <object class="wxStaticText" name="images_filename">
+ <label></label>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <object class="wxStaticText">
+ <label>Make:</label>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <object class="wxStaticText" name="images_camera_make">
+ <label></label>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <object class="wxStaticText">
+ <label>Model:</label>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <object class="wxStaticText" name="images_camera_model">
+ <label></label>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <object class="wxStaticText">
+ <label>Capture Date:</label>
+ </object>
+ <flag>wxALIGN_CENTRE_VERTICAL</flag>
+ </object>
+ <object class="sizeritem">
+ <object class="wxStaticText" name="images_capture_date">
+ <label></label>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <object class="wxStaticText">
+ <label>Focal Length:</label>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <object class="wxStaticText" name="images_focal_length">
+ <label></label>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <object class="wxStaticText">
+ <label>Aperture:</label>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <object class="wxStaticText" name="images_aperture">
+ <label></label>
+ </object>
+ </object>
+ <cols>2</cols>
+ <object class="sizeritem">
+ <object class="wxStaticText">
+ <label>Shutter Speed:</label>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <object class="wxStaticText" name="images_shutter_speed">
+ <label></label>
+ </object>
+ </object>
+ <vgap>6</vgap>
+ <hgap>6</hgap>
+ </object>
+ <flag>wxALL|wxEXPAND</flag>
+ <border>5</border>
+ </object>
+ <object class="sizeritem">
<object class="wxStaticBitmap" name="images_selected_image">
<bitmap>data/druid.images.128.png</bitmap>
</object>
<option>1</option>
- <flag>wxEXPAND</flag>
+ <flag>wxALL|wxEXPAND</flag>
+ <border>5</border>
</object>
</object>
<option>1</option>
- <flag>wxLEFT|wxEXPAND</flag>
- <border>12</border>
+ <flag>wxALL|wxEXPAND</flag>
</object>
<orient>wxVERTICAL</orient>
</object>
<flag>wxALL|wxEXPAND</flag>
<border>6</border>
</object>
- <object class="sizeritem">
- <object class="wxBoxSizer">
- <object class="sizeritem">
- <object class="wxStaticText">
- <label>EXIF Info</label>
- <font>
- <size>12</size>
- <style>normal</style>
- <weight>bold</weight>
- <underlined>0</underlined>
- <family>swiss</family>
- <face>Sans</face>
- </font>
- </object>
- <flag>wxBOTTOM</flag>
- <border>6</border>
- </object>
- <object class="sizeritem">
- <object class="wxFlexGridSizer">
- <object class="sizeritem">
- <object class="wxStaticText">
- <label>Filename:</label>
- </object>
- <flag>wxALIGN_CENTRE_VERTICAL</flag>
- </object>
- <object class="sizeritem">
- <object class="wxStaticText" name="images_filename"/>
- </object>
- <object class="sizeritem">
- <object class="wxStaticText">
- <label>Make:</label>
- </object>
- </object>
- <object class="sizeritem">
- <object class="wxStaticText" name="images_camera_make"/>
- </object>
- <object class="sizeritem">
- <object class="wxStaticText">
- <label>Model:</label>
- </object>
- </object>
- <object class="sizeritem">
- <object class="wxStaticText" name="images_camera_model"/>
- </object>
- <object class="sizeritem">
- <object class="wxStaticText">
- <label>Capture Date:</label>
- </object>
- <flag>wxALIGN_CENTRE_VERTICAL</flag>
- </object>
- <object class="sizeritem">
- <object class="wxStaticText" name="images_capture_date"/>
- </object>
- <object class="sizeritem">
- <object class="wxStaticText">
- <label>Focal Length:</label>
- </object>
- </object>
- <object class="sizeritem">
- <object class="wxStaticText" name="images_focal_length"/>
- </object>
- <object class="sizeritem">
- <object class="wxStaticText">
- <label>Aperture:</label>
- </object>
- </object>
- <object class="sizeritem">
- <object class="wxStaticText" name="images_aperture"/>
- </object>
- <cols>2</cols>
- <object class="sizeritem">
- <object class="wxStaticText">
- <label>Shutter Speed:</label>
- </object>
- </object>
- <object class="sizeritem">
- <object class="wxStaticText" name="images_shutter_speed"/>
- </object>
- <vgap>6</vgap>
- <hgap>6</hgap>
- </object>
- <flag>wxLEFT|wxEXPAND</flag>
- <border>12</border>
- </object>
- <orient>wxVERTICAL</orient>
- </object>
- <option>1</option>
- <flag>wxALL|wxEXPAND</flag>
- <border>6</border>
- </object>
<object class="spacer">
<size>10,0</size>
</object>
Modified: hugin/trunk/src/hugin_base/panodata/SrcPanoImage.cpp
===================================================================
--- hugin/trunk/src/hugin_base/panodata/SrcPanoImage.cpp 2009-07-27 05:25:59 UTC (rev 4112)
+++ hugin/trunk/src/hugin_base/panodata/SrcPanoImage.cpp 2009-07-27 05:30:19 UTC (rev 4113)
@@ -142,6 +142,7 @@
m_exifCropFactor = 0;
m_exifFocalLength = 0;
+ m_exifFocalLength35 = 0;
m_exifOrientation = 0;
m_exifAperture = 0;
m_exifDistance = 0;
@@ -246,6 +247,7 @@
m_exifMake == other.m_exifMake &&
m_exifCropFactor == other.m_exifCropFactor &&
m_exifFocalLength == other.m_exifFocalLength &&
+ m_exifFocalLength35 == other.m_exifFocalLength35 &&
m_exifOrientation == other.m_exifOrientation &&
m_exifAperture == other.m_exifAperture &&
m_exifISO == other.m_exifISO &&
@@ -607,6 +609,7 @@
// store some important EXIF tags for later usage.
setExifFocalLength(focalLength);
+ setExifFocalLength35(eFocalLength35);
setExifCropFactor(cropFactor);
setExifOrientation(roll);
setExifAperture(photoFNumber);
Modified: hugin/trunk/src/hugin_base/panodata/SrcPanoImage.h
===================================================================
--- hugin/trunk/src/hugin_base/panodata/SrcPanoImage.h 2009-07-27 05:25:59 UTC (rev 4112)
+++ hugin/trunk/src/hugin_base/panodata/SrcPanoImage.h 2009-07-27 05:30:19 UTC (rev 4113)
@@ -333,6 +333,12 @@
void setExifFocalLength(const double & val)
{ m_exifFocalLength = val; }
+ const double & getExifFocalLength35() const
+ { return m_exifFocalLength35; }
+
+ void setExifFocalLength35(const double & val)
+ { m_exifFocalLength35 = val; }
+
const double & getExifOrientation() const
{ return m_exifOrientation; }
@@ -345,9 +351,16 @@
void setExifDistance(const double & val)
{ m_exifDistance = val; }
+ /** returns EXIF date and time as string */
const std::string & getExifDate() const
{return m_exifDate; }
+ /** try to convert Exif date time string to struct tm
+ * @return 0, if conversion was sucessfull */
+ const int getExifDateTime(struct tm* datetime) const
+ { return Exiv2::exifTime(m_exifDate.c_str(),datetime); }
+
+
void setExifDate(const std::string & val)
{ m_exifDate = val;}
@@ -444,6 +457,7 @@
double m_exifCropFactor;
double m_exifFocalLength;
+ double m_exifFocalLength35;
double m_exifOrientation;
double m_exifAperture;
double m_exifISO;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tm...@us...> - 2009-07-30 05:45:31
|
Revision: 4127
http://hugin.svn.sourceforge.net/hugin/?rev=4127&view=rev
Author: tmodes
Date: 2009-07-30 05:45:22 +0000 (Thu, 30 Jul 2009)
Log Message:
-----------
Some fixes for restoring old locale [2826516]
Modified Paths:
--------------
hugin/trunk/src/celeste/svm.cpp
hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp
hugin/trunk/src/hugin1/hugin/CPEditorPanel.cpp
hugin/trunk/src/hugin1/hugin/ImagesPanel.cpp
hugin/trunk/src/hugin1/hugin/LensPanel.cpp
hugin/trunk/src/hugin_base/panodata/Panorama.cpp
Modified: hugin/trunk/src/celeste/svm.cpp
===================================================================
--- hugin/trunk/src/celeste/svm.cpp 2009-07-29 23:05:12 UTC (rev 4126)
+++ hugin/trunk/src/celeste/svm.cpp 2009-07-30 05:45:22 UTC (rev 4127)
@@ -40,6 +40,7 @@
#include <float.h>
#include <string.h>
#include <stdarg.h>
+#include <locale.h>
#include "svm.h"
typedef float Qfloat;
@@ -2741,10 +2742,15 @@
svm_model *svm_load_model(const char *model_file_name)
{
FILE *fp = fopen(model_file_name,"r");
+ char *p,*old_locale;
if(fp==NULL) return NULL;
+ // set numeric locale to C, for correct number output
+ p = setlocale(LC_NUMERIC,NULL);
+ old_locale = strdup(p);
+ setlocale(LC_NUMERIC,"C");
+
// read parameters
-
svm_model *model = Malloc(svm_model,1);
svm_parameter& param = model->param;
model->rho = NULL;
@@ -2869,6 +2875,8 @@
free(model->label);
free(model->nSV);
free(model);
+ setlocale(LC_NUMERIC,old_locale);
+ free(old_locale);
return NULL;
}
}
@@ -2930,6 +2938,8 @@
if (ferror(fp) != 0 || fclose(fp) != 0) return NULL;
model->free_sv = 1; // XXX
+ setlocale(LC_NUMERIC,old_locale);
+ free(old_locale);
return model;
}
Modified: hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp 2009-07-29 23:05:12 UTC (rev 4126)
+++ hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp 2009-07-30 05:45:22 UTC (rev 4127)
@@ -412,10 +412,6 @@
DEBUG_TRACE("Running Celeste");
progress.increaseProgress(1, std::wstring(wxString(_("Running Celeste")).wc_str(wxConvLocal)));
- // set numeric locale to C, for correct number output
- char * old_locale = setlocale(LC_NUMERIC,NULL);
- setlocale(LC_NUMERIC,"C");
-
// determine file name of SVM model file
// get XRC path from application
wxString wxstrModelFileName = huginApp::Get()->GetXRCPath() + wxT("data/") + wxT(HUGIN_CELESTE_MODEL);
@@ -517,10 +513,6 @@
}
MainFrame::Get()->SetStatusText(_(""),0);
-
- // reset locale
- setlocale(LC_NUMERIC,old_locale);
-
}
DEBUG_TRACE("Finished running Celeste");
Modified: hugin/trunk/src/hugin1/hugin/CPEditorPanel.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/CPEditorPanel.cpp 2009-07-29 23:05:12 UTC (rev 4126)
+++ hugin/trunk/src/hugin1/hugin/CPEditorPanel.cpp 2009-07-30 05:45:22 UTC (rev 4127)
@@ -2141,10 +2141,6 @@
ProgressReporterDialog progress(3, _("Running Celeste"), _("Running Celeste"),this);
- // set numeric locale to C, for correct number output
- char * old_locale = setlocale(LC_NUMERIC,NULL);
- setlocale(LC_NUMERIC,"C");
-
MainFrame::Get()->SetStatusText(_("searching for cloud-like control points..."),0);
// Create the storage matrix
@@ -2231,9 +2227,6 @@
DEBUG_TRACE("Finished running Celeste");
MainFrame::Get()->SetStatusText(_(""),0);
-
- // reset locale
- setlocale(LC_NUMERIC,old_locale);
}
}
Modified: hugin/trunk/src/hugin1/hugin/ImagesPanel.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/ImagesPanel.cpp 2009-07-29 23:05:12 UTC (rev 4126)
+++ hugin/trunk/src/hugin1/hugin/ImagesPanel.cpp 2009-07-30 05:45:22 UTC (rev 4127)
@@ -843,9 +843,6 @@
ProgressReporterDialog progress(selImg.size()+1, _("Running Celeste"), _("Running Celeste"),this);
DEBUG_TRACE("Running Celeste");
- // set numeric locale to C, for correct number output
- char * old_locale = setlocale(LC_NUMERIC,NULL);
- setlocale(LC_NUMERIC,"C");
// determine file name of SVM model file
// get XRC path from application
@@ -955,8 +952,6 @@
}
MainFrame::Get()->SetStatusText(_(""),0);
- // reset locale
- setlocale(LC_NUMERIC,old_locale);
}
wxMessageBox(wxString::Format(_("Removed %d control points"), total_removed), _("Celeste result"),wxOK|wxICON_INFORMATION,this);
Modified: hugin/trunk/src/hugin1/hugin/LensPanel.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/LensPanel.cpp 2009-07-29 23:05:12 UTC (rev 4126)
+++ hugin/trunk/src/hugin1/hugin/LensPanel.cpp 2009-07-30 05:45:22 UTC (rev 4127)
@@ -850,7 +850,8 @@
}
wxConfig::Get()->Write(wxT("/lensPath"), dlg.GetDirectory()); // remember for later
// set numeric locale to C, for correct number output
- char * old_locale = setlocale(LC_NUMERIC,NULL);
+ char * p = setlocale(LC_NUMERIC,NULL);
+ char * old_locale = strdup(p);
setlocale(LC_NUMERIC,"C");
{
wxFileConfig cfg(wxT("hugin lens file"),wxT(""),fname);
@@ -909,6 +910,7 @@
}
// reset locale
setlocale(LC_NUMERIC,old_locale);
+ free(old_locale);
}
} else {
wxLogError(_("Please select an image and try again"));
@@ -962,7 +964,8 @@
fname = dlg.GetPath();
wxConfig::Get()->Write(wxT("/lensPath"), dlg.GetDirectory()); // remember for later
// read with with standart C numeric format
- char * old_locale = setlocale(LC_NUMERIC,NULL);
+ char * p = setlocale(LC_NUMERIC,NULL);
+ char * old_locale = strdup(p);
setlocale(LC_NUMERIC,"C");
{
wxFileConfig cfg(wxT("hugin lens file"),wxT(""),fname);
@@ -977,6 +980,7 @@
int ret = wxMessageBox(_("Incompatible lens parameter file, image sizes do not match\nApply settings anyway?"), _("Error loading lens parameters"), wxICON_QUESTION |wxYES_NO);
if (ret == wxNO) {
setlocale(LC_NUMERIC,old_locale);
+ free(old_locale);
return false;
}
}
@@ -1047,6 +1051,7 @@
}
// reset locale
setlocale(LC_NUMERIC,old_locale);
+ free(old_locale);
return true;
} else {
return false;
Modified: hugin/trunk/src/hugin_base/panodata/Panorama.cpp
===================================================================
--- hugin/trunk/src/hugin_base/panodata/Panorama.cpp 2009-07-29 23:05:12 UTC (rev 4126)
+++ hugin/trunk/src/hugin_base/panodata/Panorama.cpp 2009-07-30 05:45:22 UTC (rev 4127)
@@ -1665,7 +1665,8 @@
DEBUG_TRACE("");
#ifdef __unix__
// set numeric locale to C, for correct number output
- char * old_locale = setlocale(LC_NUMERIC,NULL);
+ char * p = setlocale(LC_NUMERIC,NULL);
+ char * old_locale = strdup(p);
setlocale(LC_NUMERIC,"C");
#endif
PTParseState state;
@@ -2320,6 +2321,7 @@
#ifdef __unix__
// reset locale
setlocale(LC_NUMERIC,old_locale);
+ free(old_locale);
#endif
return false;
} else {
@@ -2356,6 +2358,7 @@
#ifdef __unix__
// reset locale
setlocale(LC_NUMERIC,old_locale);
+ free(old_locale);
#endif
return false;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tm...@us...> - 2009-08-01 15:22:33
|
Revision: 4138
http://hugin.svn.sourceforge.net/hugin/?rev=4138&view=rev
Author: tmodes
Date: 2009-08-01 15:22:24 +0000 (Sat, 01 Aug 2009)
Log Message:
-----------
Some more fixes for changed locale [2826516]
Modified Paths:
--------------
hugin/trunk/src/hugin1/hugin/OptimizePanel.cpp
hugin/trunk/src/hugin_base/panotools/PanoToolsUtils.cpp
Modified: hugin/trunk/src/hugin1/hugin/OptimizePanel.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/OptimizePanel.cpp 2009-08-01 08:36:31 UTC (rev 4137)
+++ hugin/trunk/src/hugin1/hugin/OptimizePanel.cpp 2009-08-01 15:22:24 UTC (rev 4138)
@@ -528,6 +528,11 @@
}
UIntSet allImg;
fill_set(allImg,0, imgs.size()-1);
+
+ char *p = setlocale(LC_ALL,NULL);
+ char *oldlocale = strdup(p);
+ setlocale(LC_ALL,"C");
+
if (mode == OPT_PAIRWISE) {
std::set<std::string> optvars2;
@@ -597,6 +602,8 @@
#endif
}
+ setlocale(LC_ALL,oldlocale);
+ free(oldlocale);
// calculate control point errors and display text.
if (AskApplyResult(optPano)) {
GlobalCmdHist::getInstance().addCommand(
Modified: hugin/trunk/src/hugin_base/panotools/PanoToolsUtils.cpp
===================================================================
--- hugin/trunk/src/hugin_base/panotools/PanoToolsUtils.cpp 2009-08-01 08:36:31 UTC (rev 4137)
+++ hugin/trunk/src/hugin_base/panotools/PanoToolsUtils.cpp 2009-08-01 15:22:24 UTC (rev 4138)
@@ -61,6 +61,9 @@
{
if(pano.getNrOfImages()>0)
{
+ char * p=setlocale(LC_ALL,NULL);
+ char * oldlocale=strdup(p);
+ setlocale(LC_ALL,"C");
UIntSet allImg;
std::ostringstream scriptbuf;
fill_set(allImg,0, unsigned(pano.getNrOfImages()-1));
@@ -79,6 +82,8 @@
pano.updateCtrlPointErrors( GetAlignInfoCtrlPoints(ainf) );
}
}
+ setlocale(LC_ALL,oldlocale);
+ free(oldlocale);
};
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bru...@us...> - 2009-08-02 16:48:25
|
Revision: 4147
http://hugin.svn.sourceforge.net/hugin/?rev=4147&view=rev
Author: brunopostle
Date: 2009-08-02 16:48:17 +0000 (Sun, 02 Aug 2009)
Log Message:
-----------
Fix for older versions of system findBoost module.
Modified Paths:
--------------
hugin/trunk/src/celeste/CMakeLists.txt
hugin/trunk/src/hugin_base/CMakeLists.txt
Modified: hugin/trunk/src/celeste/CMakeLists.txt
===================================================================
--- hugin/trunk/src/celeste/CMakeLists.txt 2009-08-02 01:44:57 UTC (rev 4146)
+++ hugin/trunk/src/celeste/CMakeLists.txt 2009-08-02 16:48:17 UTC (rev 4147)
@@ -87,7 +87,7 @@
# standalone
ADD_EXECUTABLE(celeste_standalone ../hugin_config.h Main.cpp )
-target_link_libraries( celeste_standalone celeste ${image_libs} )
+target_link_libraries( celeste_standalone celeste ${image_libs} boost_thread)
SET (CELESTE_MODEL
data/celeste.model
Modified: hugin/trunk/src/hugin_base/CMakeLists.txt
===================================================================
--- hugin/trunk/src/hugin_base/CMakeLists.txt 2009-08-02 01:44:57 UTC (rev 4146)
+++ hugin/trunk/src/hugin_base/CMakeLists.txt 2009-08-02 16:48:17 UTC (rev 4147)
@@ -69,4 +69,4 @@
add_subdirectory(test)
-TARGET_LINK_LIBRARIES(huginbase huginlevmar huginvigraimpex ${Boost_thread_LIBRARIES} ${EXIV2_LIBRARIES} ${PANO_LIBRARIES} ${TIFF_LIBRARIES} ${LAPACK_LIBRARIES})
+TARGET_LINK_LIBRARIES(huginbase huginlevmar huginvigraimpex boost_thread ${Boost_LIBRARIES} ${EXIV2_LIBRARIES} ${PANO_LIBRARIES} ${TIFF_LIBRARIES} ${LAPACK_LIBRARIES})
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bru...@us...> - 2009-08-02 21:57:33
|
Revision: 4148
http://hugin.svn.sourceforge.net/hugin/?rev=4148&view=rev
Author: brunopostle
Date: 2009-08-02 21:57:26 +0000 (Sun, 02 Aug 2009)
Log Message:
-----------
revert wrong svn4147, build is broken again with cmake-2.4
Modified Paths:
--------------
hugin/trunk/src/celeste/CMakeLists.txt
hugin/trunk/src/hugin_base/CMakeLists.txt
Modified: hugin/trunk/src/celeste/CMakeLists.txt
===================================================================
--- hugin/trunk/src/celeste/CMakeLists.txt 2009-08-02 16:48:17 UTC (rev 4147)
+++ hugin/trunk/src/celeste/CMakeLists.txt 2009-08-02 21:57:26 UTC (rev 4148)
@@ -87,7 +87,7 @@
# standalone
ADD_EXECUTABLE(celeste_standalone ../hugin_config.h Main.cpp )
-target_link_libraries( celeste_standalone celeste ${image_libs} boost_thread)
+target_link_libraries( celeste_standalone celeste ${image_libs} ${Boost_LIBRARIES})
SET (CELESTE_MODEL
data/celeste.model
Modified: hugin/trunk/src/hugin_base/CMakeLists.txt
===================================================================
--- hugin/trunk/src/hugin_base/CMakeLists.txt 2009-08-02 16:48:17 UTC (rev 4147)
+++ hugin/trunk/src/hugin_base/CMakeLists.txt 2009-08-02 21:57:26 UTC (rev 4148)
@@ -69,4 +69,4 @@
add_subdirectory(test)
-TARGET_LINK_LIBRARIES(huginbase huginlevmar huginvigraimpex boost_thread ${Boost_LIBRARIES} ${EXIV2_LIBRARIES} ${PANO_LIBRARIES} ${TIFF_LIBRARIES} ${LAPACK_LIBRARIES})
+TARGET_LINK_LIBRARIES(huginbase huginlevmar huginvigraimpex ${Boost_LIBRARIES} ${EXIV2_LIBRARIES} ${PANO_LIBRARIES} ${TIFF_LIBRARIES} ${LAPACK_LIBRARIES})
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tm...@us...> - 2009-08-03 16:38:30
|
Revision: 4157
http://hugin.svn.sourceforge.net/hugin/?rev=4157&view=rev
Author: tmodes
Date: 2009-08-03 16:38:18 +0000 (Mon, 03 Aug 2009)
Log Message:
-----------
Fixes for compiling nona-gpu on windows
Modified Paths:
--------------
hugin/trunk/src/hugin1/hugin/CMakeLists.txt
hugin/trunk/src/hugin1/nona_gui/CMakeLists.txt
hugin/trunk/src/hugin_base/panotools/PanoToolsTransformGPU.cpp
hugin/trunk/src/hugin_base/vigra_ext/ImageTransformsGPU.cpp
hugin/trunk/src/hugin_base/vigra_ext/ImageTransformsGPU.h
hugin/trunk/src/hugin_base/vigra_ext/Interpolators.h
hugin/trunk/src/tools/CMakeLists.txt
Property Changed:
----------------
hugin/trunk/src/hugin_base/panotools/PanoToolsTransformGPU.cpp
hugin/trunk/src/hugin_base/vigra_ext/ImageTransformsGPU.cpp
hugin/trunk/src/hugin_base/vigra_ext/ImageTransformsGPU.h
Modified: hugin/trunk/src/hugin1/hugin/CMakeLists.txt
===================================================================
--- hugin/trunk/src/hugin1/hugin/CMakeLists.txt 2009-08-03 16:01:29 UTC (rev 4156)
+++ hugin/trunk/src/hugin1/hugin/CMakeLists.txt 2009-08-03 16:38:18 UTC (rev 4157)
@@ -101,7 +101,7 @@
ADD_EXECUTABLE( ${PROGNAME} ${hugin_SOURCES} )
ENDIF(APPLE)
-target_link_libraries( ${PROGNAME} ${common_libs} ${image_libs} huginbasewx celeste ${wxWidgets_LIBRARIES} ${OPENGL_LIBRARIES} ${GLEW_LIBRARIES})
+target_link_libraries( ${PROGNAME} ${common_libs} ${image_libs} huginbasewx celeste ${wxWidgets_LIBRARIES} ${OPENGL_LIBRARIES} ${GLEW_LIBRARIES} ${GLUT_LIBRARIES})
IF (APPLE)
IF (NOT MAC_SELF_CONTAINED_BUNDLE)
Modified: hugin/trunk/src/hugin1/nona_gui/CMakeLists.txt
===================================================================
--- hugin/trunk/src/hugin1/nona_gui/CMakeLists.txt 2009-08-03 16:01:29 UTC (rev 4156)
+++ hugin/trunk/src/hugin1/nona_gui/CMakeLists.txt 2009-08-03 16:38:18 UTC (rev 4157)
@@ -6,7 +6,7 @@
ENDIF (WIN32)
-target_link_libraries(nona_gui ${common_libs} ${image_libs} huginbasewx ${wxWidgets_LIBRARIES})
+target_link_libraries(nona_gui ${common_libs} ${image_libs} huginbasewx ${wxWidgets_LIBRARIES} ${GLEW_LIBRARIES} ${GLUT_LIBRARIES})
install(TARGETS nona_gui DESTINATION ${BINDIR})
Modified: hugin/trunk/src/hugin_base/panotools/PanoToolsTransformGPU.cpp
===================================================================
--- hugin/trunk/src/hugin_base/panotools/PanoToolsTransformGPU.cpp 2009-08-03 16:01:29 UTC (rev 4156)
+++ hugin/trunk/src/hugin_base/panotools/PanoToolsTransformGPU.cpp 2009-08-03 16:38:18 UTC (rev 4157)
@@ -6,7 +6,7 @@
*
* @author Andrew Mihal
*
- * $Id: $
+ * $Id$
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public
Property changes on: hugin/trunk/src/hugin_base/panotools/PanoToolsTransformGPU.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: hugin/trunk/src/hugin_base/vigra_ext/ImageTransformsGPU.cpp
===================================================================
--- hugin/trunk/src/hugin_base/vigra_ext/ImageTransformsGPU.cpp 2009-08-03 16:01:29 UTC (rev 4156)
+++ hugin/trunk/src/hugin_base/vigra_ext/ImageTransformsGPU.cpp 2009-08-03 16:38:18 UTC (rev 4157)
@@ -5,7 +5,7 @@
*
* @author Andrew Mihal
*
- * $Id:$
+ * $Id$
*
* This is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public
@@ -31,13 +31,28 @@
#include <GL/glut.h>
#include <string.h>
-#include <sys/time.h>
-#include <time.h>
#include <vigra/diff2d.hxx>
#include <vigra/utilities.hxx>
#include <vigra/error.hxx>
+#ifdef _WIN32
+#include <windows.h>
+long getms()
+{
+ return GetTickCount();
+};
+#else
+#include <sys/time.h>
+long getms()
+{
+ struct timeval tv;
+ gettimeofday(&tv,NULL);
+ return (long)(tv.tv_sec*1000+(tv.tv_usec/1000));
+};
+#endif
+#include <time.h>
+
#include <vector>
using std::cout;
@@ -225,9 +240,9 @@
}
for (int yChunk = 0, y = 0; yChunk < numYChunks; yChunk++) {
- int yEnd = std::min(height, static_cast<int>(ceil(static_cast<double>(height) / numYChunks)) + y);
+ int yEnd = std::min<int>(height, static_cast<int>(ceil(static_cast<double>(height) / numYChunks)) + y);
for (int xChunk = 0, x = 0; xChunk < numXChunks; xChunk++) {
- int xEnd = std::min(width, static_cast<int>(ceil(static_cast<double>(width) / numXChunks)) + x);
+ int xEnd = std::min<int>(width, static_cast<int>(ceil(static_cast<double>(width) / numXChunks)) + x);
result.push_back(Rect2D(x, y, xEnd, yEnd));
x = xEnd;
}
@@ -258,8 +273,8 @@
const int destAlphaGLType,
const bool warparound)
{
- timeval t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17, t18, t19, t20, t21;
- gettimeofday(&t1, NULL);
+ long t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17, t18, t19, t20, t21;
+ t1=getms();
const int xstart = destUL.x;
const int xend = destUL.x + destSize.x;
@@ -637,8 +652,8 @@
}
glFinish();
- gettimeofday(&t21, NULL);
- cout << "gpu shader program compile time = " << (t21.tv_sec - t1.tv_sec + 1e-6*(t21.tv_usec - t1.tv_usec)) << endl;
+ t21=getms();
+ cout << "gpu shader program compile time = " << ((t21 - t1)/1000.0) << endl;
// General GL setup
glPixelStorei(GL_PACK_ALIGNMENT, 8);
@@ -656,8 +671,8 @@
GLuint destFB = framebuffers[3];
GLuint destAlphaFB = framebuffers[4];
- const int viewportWidth = std::max(destChunks[0].width(), sourceChunks[0].width());
- const int viewportHeight = std::max(destChunks[0].height(), sourceChunks[0].height());
+ const int viewportWidth = std::max<int>(destChunks[0].width(), sourceChunks[0].width());
+ const int viewportHeight = std::max<int>(destChunks[0].height(), sourceChunks[0].height());
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
gluOrtho2D(0.0, viewportWidth, 0.0, viewportHeight);
@@ -804,15 +819,15 @@
glFinish();
- gettimeofday(&t2, NULL);
- cout << "gpu shader texture/framebuffer setup time = " << (t2.tv_sec - t21.tv_sec + 1e-6*(t2.tv_usec - t21.tv_usec)) << endl;
+ t2=getms();
+ cout << "gpu shader texture/framebuffer setup time = " << ((t2-t21)/1000.0) << endl;
// Render each dest chunk
int destChunkNumber = 0;
for (vector<Rect2D>::iterator dI = destChunks.begin(); dI != destChunks.end(); ++dI, ++destChunkNumber) {
glFinish();
- gettimeofday(&t3, NULL);
+ t3=getms();
// Render coord image
glUseProgramObjectARB(coordXformProgramObject);
@@ -829,8 +844,8 @@
CHECK_GL();
glFinish();
- gettimeofday(&t4, NULL);
- cout << "gpu dest chunk=" << *dI << " coord image render time = " << (t4.tv_sec - t3.tv_sec + 1e-6*(t4.tv_usec - t3.tv_usec)) << endl;
+ t4=getms();
+ cout << "gpu dest chunk=" << *dI << " coord image render time = " << ((t4-t3)/1000.0) << endl;
// Multipass rendering of dest image
int pass = 0;
@@ -838,7 +853,7 @@
if (destChunkNumber == 0 || sourceChunks.size() > 1) {
glFinish();
- gettimeofday(&t5, NULL);
+ t5=getms();
glPixelStorei(GL_UNPACK_ROW_LENGTH, srcSize.x);
glPixelStorei(GL_UNPACK_SKIP_PIXELS, sI->left());
@@ -857,8 +872,8 @@
CHECK_GL();
glFinish();
- gettimeofday(&t6, NULL);
- cout << "gpu dest chunk=" << *dI << " source chunk=" << *sI << " src upload = " << (t6.tv_sec - t5.tv_sec + 1e-6*(t6.tv_usec - t5.tv_usec)) << endl;
+ t6=getms();
+ cout << "gpu dest chunk=" << *dI << " source chunk=" << *sI << " src upload = " << ((t6-t5)/1000.0) << endl;
if (srcAlphaBuffer != NULL) {
// Upload to srcAlphaTexture and composite to srcTexture.
@@ -872,8 +887,8 @@
CHECK_GL();
glFinish();
- gettimeofday(&t7, NULL);
- cout << "gpu dest chunk=" << *dI << " source chunk=" << *sI << " src alpha upload = " << (t7.tv_sec - t6.tv_sec + 1e-6*(t7.tv_usec - t6.tv_usec)) << endl;
+ t7=getms();
+ cout << "gpu dest chunk=" << *dI << " source chunk=" << *sI << " src alpha upload = " << ((t7-t6)/1000.0) << endl;
glPolygonMode(GL_FRONT, GL_FILL);
glBegin(GL_QUADS);
@@ -885,8 +900,8 @@
CHECK_GL();
glFinish();
- gettimeofday(&t8, NULL);
- cout << "gpu dest chunk=" << *dI << " source chunk=" << *sI << " src+alpha render = " << (t8.tv_sec - t7.tv_sec + 1e-6*(t8.tv_usec - t7.tv_usec)) << endl;
+ t8=getms();
+ cout << "gpu dest chunk=" << *dI << " source chunk=" << *sI << " src+alpha render = " << ((t8-t7)/1000.0) << endl;
}
}
else {
@@ -902,8 +917,8 @@
CHECK_GL();
glFinish();
- gettimeofday(&t6, NULL);
- cout << "gpu dest chunk=" << *dI << " source chunk=" << *sI << " src upload = " << (t6.tv_sec - t5.tv_sec + 1e-6*(t6.tv_usec - t5.tv_usec)) << endl;
+ t6=getms();
+ cout << "gpu dest chunk=" << *dI << " source chunk=" << *sI << " src upload = " << ((t6-t5)/1000.0) << endl;
if (srcAlphaBuffer != NULL) {
// Upload to srcAlphaTexture
@@ -915,8 +930,8 @@
CHECK_GL();
glFinish();
- gettimeofday(&t7, NULL);
- cout << "gpu dest chunk=" << *dI << " source chunk=" << *sI << " src alpha upload = " << (t7.tv_sec - t6.tv_sec + 1e-6*(t7.tv_usec - t6.tv_usec)) << endl;
+ t7=getms();
+ cout << "gpu dest chunk=" << *dI << " source chunk=" << *sI << " src alpha upload = " << ((t7- t6)/1000.0) << endl;
glPolygonMode(GL_FRONT, GL_FILL);
glBegin(GL_QUADS);
@@ -934,8 +949,8 @@
CHECK_GL();
glFinish();
- gettimeofday(&t8, NULL);
- cout << "gpu dest chunk=" << *dI << " source chunk=" << *sI << " src+alpha render = " << (t8.tv_sec - t7.tv_sec + 1e-6*(t8.tv_usec - t7.tv_usec)) << endl;
+ t8=getms();
+ cout << "gpu dest chunk=" << *dI << " source chunk=" << *sI << " src+alpha render = " << ((t8-t7)/1000.0) << endl;
}
else {
glPolygonMode(GL_FRONT, GL_FILL);
@@ -956,14 +971,14 @@
CHECK_GL();
glFinish();
- gettimeofday(&t7, NULL);
- cout << "gpu dest chunk=" << *dI << " source chunk=" << *sI << " src render = " << (t7.tv_sec - t6.tv_sec + 1e-6*(t7.tv_usec - t6.tv_usec)) << endl;
+ t7=getms();
+ cout << "gpu dest chunk=" << *dI << " source chunk=" << *sI << " src render = " << ((t7-t6)/1000.0) << endl;
}
}
}
glFinish();
- gettimeofday(&t9, NULL);
+ t9=getms();
// Render dest image
glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, accumFB);
@@ -1010,8 +1025,8 @@
glDrawBuffer((pass & 1) ? GL_COLOR_ATTACHMENT1_EXT : GL_COLOR_ATTACHMENT0_EXT);
glFinish();
- gettimeofday(&t10, NULL);
- cout << "gpu dest chunk=" << *dI << " source chunk=" << *sI << " interpolation chunk=" << *iI << " setup = " << (t10.tv_sec - t9.tv_sec + 1e-6*(t10.tv_usec - t9.tv_usec)) << endl;
+ t10=getms();
+ cout << "gpu dest chunk=" << *dI << " source chunk=" << *sI << " interpolation chunk=" << *iI << " setup = " << ((t10-t9)/1000.0) << endl;
glPolygonMode(GL_FRONT, GL_FILL);
glBegin(GL_QUADS);
@@ -1023,9 +1038,9 @@
CHECK_GL();
glFinish();
- gettimeofday(&t11, NULL);
- gettimeofday(&t9, NULL);
- cout << "gpu dest chunk=" << *dI << " source chunk=" << *sI << " interpolation chunk=" << *iI << " render = " << (t11.tv_sec - t10.tv_sec + 1e-6*(t11.tv_usec - t10.tv_usec)) << endl;
+ t11=getms();
+ t9=getms();
+ cout << "gpu dest chunk=" << *dI << " source chunk=" << *sI << " interpolation chunk=" << *iI << " render = " << ((t11-t10)/1000.0) << endl;
} // next interpolation chunk
@@ -1065,8 +1080,8 @@
glDrawBuffer((pass & 1) ? GL_COLOR_ATTACHMENT1_EXT : GL_COLOR_ATTACHMENT0_EXT);
glFinish();
- gettimeofday(&t12, NULL);
- cout << "gpu dest chunk=" << *dI << " normalization setup = " << (t12.tv_sec - t11.tv_sec + 1e-6*(t12.tv_usec - t11.tv_usec)) << endl;
+ t12=getms();
+ cout << "gpu dest chunk=" << *dI << " normalization setup = " << ((t12-t11)/1000.0) << endl;
glPolygonMode(GL_FRONT, GL_FILL);
glBegin(GL_QUADS);
@@ -1078,8 +1093,8 @@
CHECK_GL();
glFinish();
- gettimeofday(&t13, NULL);
- cout << "gpu dest chunk=" << *dI << " normalization render = " << (t13.tv_sec - t12.tv_sec + 1e-6*(t13.tv_usec - t12.tv_usec)) << endl;
+ t13=getms();
+ cout << "gpu dest chunk=" << *dI << " normalization render = " << ((t13-t12)/1000.0) << endl;
pass++;
@@ -1097,8 +1112,8 @@
CHECK_GL();
glFinish();
- gettimeofday(&t14, NULL);
- cout << "gpu dest chunk=" << *dI << " rgb readback = " << (t14.tv_sec - t13.tv_sec + 1e-6*(t14.tv_usec - t13.tv_usec)) << endl;
+ t14=getms();
+ cout << "gpu dest chunk=" << *dI << " rgb readback = " << ((t14-t13)/1000.0) << endl;
}
else {
// Move output accumTexture to dest texture then readback.
@@ -1112,8 +1127,8 @@
CHECK_GL();
glFinish();
- gettimeofday(&t14, NULL);
- cout << "gpu dest chunk=" << *dI << " dest rgb disassembly setup = " << (t14.tv_sec - t13.tv_sec + 1e-6*(t14.tv_usec - t13.tv_usec)) << endl;
+ t14=getms();
+ cout << "gpu dest chunk=" << *dI << " dest rgb disassembly setup = " << ((t14-t13)/1000.0) << endl;
glPolygonMode(GL_FRONT, GL_FILL);
glBegin(GL_QUADS);
@@ -1129,8 +1144,8 @@
CHECK_GL();
glFinish();
- gettimeofday(&t15, NULL);
- cout << "gpu dest chunk=" << *dI << " dest rgb disassembly render = " << (t15.tv_sec - t14.tv_sec + 1e-6*(t15.tv_usec - t14.tv_usec)) << endl;
+ t15=getms();
+ cout << "gpu dest chunk=" << *dI << " dest rgb disassembly render = " << ((t15-t14)/1000.0) << endl;
glReadBuffer(GL_COLOR_ATTACHMENT0_EXT);
CHECK_GL();
@@ -1139,8 +1154,8 @@
CHECK_GL();
glFinish();
- gettimeofday(&t16, NULL);
- cout << "gpu dest chunk=" << *dI << " rgb readback = " << (t16.tv_sec - t15.tv_sec + 1e-6*(t16.tv_usec - t15.tv_usec)) << endl;
+ t16=getms();
+ cout << "gpu dest chunk=" << *dI << " rgb readback = " << ((t16-t15)/1000.0) << endl;
}
if (destAlphaBuffer != NULL) {
@@ -1155,8 +1170,8 @@
CHECK_GL();
glFinish();
- gettimeofday(&t17, NULL);
- cout << "gpu dest chunk=" << *dI << " dest alpha disassembly setup = " << (t17.tv_sec - t16.tv_sec + 1e-6*(t17.tv_usec - t16.tv_usec)) << endl;
+ t17=getms();
+ cout << "gpu dest chunk=" << *dI << " dest alpha disassembly setup = " << ((t17-t16)/1000.0) << endl;
glPolygonMode(GL_FRONT, GL_FILL);
glBegin(GL_QUADS);
@@ -1172,8 +1187,8 @@
CHECK_GL();
glFinish();
- gettimeofday(&t18, NULL);
- cout << "gpu dest chunk=" << *dI << " dest alpha disassembly render = " << (t18.tv_sec - t17.tv_sec + 1e-6*(t18.tv_usec - t17.tv_usec)) << endl;
+ t18=getms();
+ cout << "gpu dest chunk=" << *dI << " dest alpha disassembly render = " << ((t18-t17)/1000.0) << endl;
// Readback dest alpha chunk
glReadBuffer(GL_COLOR_ATTACHMENT0_EXT);
@@ -1183,14 +1198,14 @@
CHECK_GL();
glFinish();
- gettimeofday(&t19, NULL);
- cout << "gpu dest chunk=" << *dI << " alpha readback = " << (t19.tv_sec - t18.tv_sec + 1e-6*(t19.tv_usec - t18.tv_usec)) << endl;
+ t19=getms();
+ cout << "gpu dest chunk=" << *dI << " alpha readback = " << ((t19-t18)/1000.0) << endl;
}
} // next dest chunk
glFinish();
- gettimeofday(&t19, NULL);
+ t19=getms();
glDeleteTextures(2, accumTextures);
glDeleteTextures(1, &coordTexture);
@@ -1221,9 +1236,9 @@
glDeleteObjectARB(normalizationPhotometricProgramObject);
glFinish();
- gettimeofday(&t20, NULL);
- cout << "gpu destruct time = " << (t20.tv_sec - t19.tv_sec + 1e-6*(t20.tv_usec - t19.tv_usec)) << endl;
- cout << "gpu total time = " << (t20.tv_sec - t1.tv_sec + 1e-6*(t20.tv_usec - t1.tv_usec)) << endl;
+ t20=getms();
+ cout << "gpu destruct time = " << ((t20-t19)/1000.0) << endl;
+ cout << "gpu total time = " << ((t20-t1)/1000.0) << endl;
return true;
}
Property changes on: hugin/trunk/src/hugin_base/vigra_ext/ImageTransformsGPU.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: hugin/trunk/src/hugin_base/vigra_ext/ImageTransformsGPU.h
===================================================================
--- hugin/trunk/src/hugin_base/vigra_ext/ImageTransformsGPU.h 2009-08-03 16:01:29 UTC (rev 4156)
+++ hugin/trunk/src/hugin_base/vigra_ext/ImageTransformsGPU.h 2009-08-03 16:38:18 UTC (rev 4157)
@@ -6,7 +6,7 @@
*
* @author Andrew Mihal
*
- * $Id:$
+ * $Id$
*
* This is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public
Property changes on: hugin/trunk/src/hugin_base/vigra_ext/ImageTransformsGPU.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: hugin/trunk/src/hugin_base/vigra_ext/Interpolators.h
===================================================================
--- hugin/trunk/src/hugin_base/vigra_ext/Interpolators.h 2009-08-03 16:01:29 UTC (rev 4156)
+++ hugin/trunk/src/hugin_base/vigra_ext/Interpolators.h 2009-08-03 16:38:18 UTC (rev 4157)
@@ -456,7 +456,7 @@
return true;
}
- bool emitGLSL(std::ostringstream& oss) const {
+ void emitGLSL(std::ostringstream& oss) const {
m_inter.emitGLSL(oss);
}
Modified: hugin/trunk/src/tools/CMakeLists.txt
===================================================================
--- hugin/trunk/src/tools/CMakeLists.txt 2009-08-03 16:01:29 UTC (rev 4156)
+++ hugin/trunk/src/tools/CMakeLists.txt 2009-08-03 16:38:18 UTC (rev 4157)
@@ -15,7 +15,7 @@
target_link_libraries(vig_optimize ${common_libs} ${image_libs})
add_executable(align_image_stack align_image_stack.cpp)
-target_link_libraries(align_image_stack ${common_libs} ${image_libs})
+target_link_libraries(align_image_stack ${common_libs} ${image_libs} ${GLEW_LIBRARIES} ${GLUT_LIBRARIES})
add_executable(tca_correct tca_correct.cpp)
target_link_libraries(tca_correct ${common_libs} ${image_libs})
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bru...@us...> - 2009-08-14 17:38:13
|
Revision: 4209
http://hugin.svn.sourceforge.net/hugin/?rev=4209&view=rev
Author: brunopostle
Date: 2009-08-14 17:38:06 +0000 (Fri, 14 Aug 2009)
Log Message:
-----------
Transfer multilayer TIFF and PSD rules from plugin to .pto.mk file.
Another much requested feature, requires tiffcp and PTtiff2psd.
No GUI, for now use one of these:
make -f project.pto.mk project_multilayer.tif
make -f project.pto.mk project_fused_multilayer.tif
make -f project.pto.mk project_multilayer.psd
make -f project.pto.mk project_fused_multilayer.psd
Modified Paths:
--------------
hugin/trunk/src/hugin1/hugin/Makefile.equirect.mk
hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp
Modified: hugin/trunk/src/hugin1/hugin/Makefile.equirect.mk
===================================================================
--- hugin/trunk/src/hugin1/hugin/Makefile.equirect.mk 2009-08-14 06:33:55 UTC (rev 4208)
+++ hugin/trunk/src/hugin1/hugin/Makefile.equirect.mk 2009-08-14 17:38:06 UTC (rev 4209)
@@ -32,28 +32,12 @@
# a multilayer TIFF
-layered : $(EQUIRECT_PREFIX)_layered.tif
+layered : $(EQUIRECT_PREFIX)_multilayer.tif
-$(LDR_REMAPPED_PREFIX)_layered.tif : $(LDR_BLENDED) $(LDR_LAYERS)
- tiffcp $(LDR_REMAPPED_PREFIX_SHELL).tif $(LDR_LAYERS_SHELL) \
- $(LDR_REMAPPED_PREFIX_SHELL)_layered.tif
-
-$(LDR_REMAPPED_PREFIX)_fused_layered.tif : $(LDR_STACKED_BLENDED) $(LDR_STACKS) $(LDR_EXPOSURE_LAYERS)
- tiffcp $(LDR_REMAPPED_PREFIX_SHELL)_fused.tif $(LDR_STACKS_SHELL) $(LDR_EXPOSURE_LAYERS_SHELL) \
- $(LDR_REMAPPED_PREFIX_SHELL)_fused_layered.tif
-
# a multilayer PSD
-psd : $(EQUIRECT_PREFIX)_layered.psd
+psd : $(EQUIRECT_PREFIX)_multilayer.psd
-$(LDR_REMAPPED_PREFIX)_layered.psd : $(LDR_LAYERS) $(LDR_BLENDED)
- PTtiff2psd -o $(LDR_REMAPPED_PREFIX_SHELL)_layered.psd \
- $(LDR_LAYERS_SHELL) $(LDR_BLENDED_SHELL)
-
-$(LDR_REMAPPED_PREFIX)_fused_layered.psd : $(LDR_STACKS) $(LDR_STACKED_BLENDED) $(LDR_EXPOSURE_LAYERS)
- PTtiff2psd -o $(LDR_REMAPPED_PREFIX_SHELL)_fused_layered.psd \
- $(LDR_STACKS_SHELL) $(LDR_STACKED_BLENDED_SHELL) $(LDR_EXPOSURE_LAYERS_SHELL)
-
# a set of cubefaces
CUBE_PREFIX = $(EQUIRECT_PREFIX)_cube
Modified: hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp
===================================================================
--- hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp 2009-08-14 06:33:55 UTC (rev 4208)
+++ hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp 2009-08-14 17:38:06 UTC (rev 4209)
@@ -886,6 +886,20 @@
o << "$(HDR_BLENDED) : $(HDR_STACKS)" << endl;
o << "\t$(ENBLEND) $(ENBLEND_HDR_COMP) $(ENBLEND_OPTS) -o $(HDR_BLENDED_SHELL) $(HDR_STACKS_SHELL) " << endl << endl;
+ // rules for multilayer output
+
+ o << "$(LDR_REMAPPED_PREFIX)_multilayer.tif : $(LDR_REMAPPED_PREFIX).tif $(LDR_LAYERS)" << endl;
+ o << "\ttiffcp $(LDR_REMAPPED_PREFIX_SHELL).tif $(LDR_LAYERS_SHELL) $(LDR_REMAPPED_PREFIX_SHELL)_multilayer.tif" << endl << endl;
+
+ o << "$(LDR_REMAPPED_PREFIX)_fused_multilayer.tif : $(LDR_REMAPPED_PREFIX)_fused.tif $(LDR_STACKS) $(LDR_EXPOSURE_LAYERS)" << endl;
+ o << "\ttiffcp $(LDR_REMAPPED_PREFIX_SHELL)_fused.tif $(LDR_STACKS_SHELL) $(LDR_EXPOSURE_LAYERS_SHELL) $(LDR_REMAPPED_PREFIX_SHELL)_fused_multilayer.tif" << endl << endl;
+
+ o << "$(LDR_REMAPPED_PREFIX)_multilayer.psd : $(LDR_REMAPPED_PREFIX).tif $(LDR_LAYERS)" << endl;
+ o << "\tPTtiff2psd -o $(LDR_REMAPPED_PREFIX_SHELL)_multilayer.psd $(LDR_REMAPPED_PREFIX_SHELL).tif $(LDR_LAYERS_SHELL)" << endl << endl;
+
+ o << "$(LDR_REMAPPED_PREFIX)_fused_multilayer.psd : $(LDR_REMAPPED_PREFIX)_fused.tif $(LDR_STACKS) $(LDR_EXPOSURE_LAYERS)" << endl;
+ o << "\tPTtiff2psd -o $(LDR_REMAPPED_PREFIX_SHELL)_fused_multilayer.psd $(LDR_REMAPPED_PREFIX_SHELL)_fused.tif $(LDR_STACKS_SHELL) $(LDR_EXPOSURE_LAYERS_SHELL)" << endl << endl;
+
break;
case PanoramaOptions::NO_BLEND:
o << "$(LDR_BLENDED) : $(LDR_LAYERS)" << endl
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X