Hugin

Update of /cvsroot/hugin/hugin/src/hugin
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv23581/src/hugin

Modified Files:
	PanoPanel.cpp 
Log Message:
check if output file already exists.


Index: PanoPanel.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/PanoPanel.cpp,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- PanoPanel.cpp	21 Dec 2006 08:31:20 -0000	1.105
+++ PanoPanel.cpp	22 Dec 2006 13:50:02 -0000	1.106
@@ -641,15 +641,28 @@
     // create filename
     wxString filename =  getDefaultProjectName(pano) + wxT(".") + ext;
     wxString wildcard = wxT("*.") + ext;
+    wildcard = wildcard + wxT("|") + wildcard;
 
     wxFileDialog dlg(this,_("Create panorama image"),
                      wxConfigBase::Get()->Read(wxT("actualPath"),wxT("")),
-                     filename, ext,
+                     filename, wildcard,
                      wxSAVE, wxDefaultPosition);
     if (dlg.ShowModal() == wxID_OK) {
         // print as optimizer script..
         wxConfig::Get()->Write(wxT("actualPath"), dlg.GetDirectory());  // remember for later
         opt.outfile = dlg.GetPath().mb_str();
+        std::string outfile = stripExtension(opt.outfile) + std::string(".") + opt.getOutputExtension();
+        wxString wxfn(outfile.c_str(), *wxConvCurrent);
+        if (wxFile::Exists(wxfn)) {
+            int answer = wxMessageBox(wxString::Format(_("File %s already exists\n\nOverwrite?"), wxfn.c_str() ),
+                                      _("Overwrite file?"),
+                                      (wxYES_NO | wxICON_EXCLAMATION),
+                                      this);
+            if (answer != wxYES) {
+                return;
+            }
+        }
+
         m_Stitcher->Stitch(pano, opt);
     }
     // TODO: show image after it has been created

Update of /cvsroot/hugin/hugin/src/hugin
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv14039/src/hugin

Modified Files:
	OptimizePanel.cpp 
Log Message:
disable edit script for incremental optimization


Index: OptimizePanel.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/OptimizePanel.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- OptimizePanel.cpp	17 Dec 2006 10:49:50 -0000	1.40
+++ OptimizePanel.cpp	22 Dec 2006 13:24:59 -0000	1.41
@@ -606,6 +606,7 @@
           SetCheckMark(m_c_list,false);
           SetCheckMark(m_d_list,false);
           SetCheckMark(m_e_list,false);
+          break;
         case OPT_YRP:
           // simple position
           SetCheckMark(m_yaw_list,true);
@@ -708,6 +709,8 @@
 			break;
         }
 
+        m_edit_cb->Enable(mode != OPT_PAIRWISE);
+
 	    // disable all manual settings
 	    m_yaw_list->Disable();
 	    m_pitch_list->Disable();

Update of /cvsroot/hugin/hugin/src/hugin
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv7166/src/hugin

Modified Files:
	LensPanel.cpp MainFrame.cpp PreviewFrame.cpp 
Log Message:
more cleanup + updated strings


Index: LensPanel.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/LensPanel.cpp,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -d -r1.101 -r1.102
--- LensPanel.cpp	22 Dec 2006 12:31:37 -0000	1.101
+++ LensPanel.cpp	22 Dec 2006 13:09:05 -0000	1.102
@@ -91,7 +91,6 @@
     EVT_TEXT_ENTER ( XRCID("lens_val_K2a"), LensPanel::OnVarChanged )
     EVT_TEXT_ENTER ( XRCID("lens_val_K2b"), LensPanel::OnVarChanged )
 //    EVT_BUTTON ( XRCID("lens_button_center"), LensPanel::SetCenter )
-    EVT_BUTTON     ( XRCID("lens_button_crop"),  LensPanel::OnCrop)
     EVT_BUTTON ( XRCID("lens_button_vig"), LensPanel::EditVigCorr )
     EVT_BUTTON ( XRCID("lens_button_loadEXIF"), LensPanel::OnReadExif )
     EVT_BUTTON ( XRCID("lens_button_save"), LensPanel::OnSaveLensParameters )
@@ -605,7 +604,6 @@
         XRCCTRL(*this, "lens_button_newlens", wxButton)->Disable();
         XRCCTRL(*this, "lens_button_changelens", wxButton)->Disable();
         XRCCTRL(*this, "lens_button_vig", wxButton)->Disable();
-        XRCCTRL(*this, "lens_button_crop", wxButton)->Disable();  
     } else {
 //        m_editImageNr = *sel.begin();
 
@@ -642,7 +640,6 @@
             XRCCTRL(*this, "lens_button_loadEXIF", wxButton)->Enable();
             XRCCTRL(*this, "lens_button_newlens", wxButton)->Enable();
             XRCCTRL(*this, "lens_button_changelens", wxButton)->Enable();
-            XRCCTRL(*this, "lens_button_crop", wxButton)->Enable();  
         }
 
         if (m_selectedImages.size() == 1) {
@@ -923,77 +920,6 @@
     }
 }
 
-void LensPanel::OnCrop ( wxCommandEvent & e )
-{
-#if 0
-//    wxLogError(_("temporarily disabled"));
-    const UIntSet & selectedImages = images_list->GetSelected();
-    if (images_list->GetSelected().size() > 0) {
-        ImgCenter dlg(this);
-        int imgNr = *(selectedImages.begin());
-        const PanoImage & img = pano.getImage(imgNr);
-        // show an image preview
-        wxImage * wximg = ImageCache::getInstance().getImage(
-                img.getFilename())->image;
-        bool circular_crop = pano.getLens(img.getLensNr()).getProjection() == PT::Lens::CIRCULAR_FISHEYE;
-
-        ImageOptions opts = img.getOptions();
-        dlg.SetImage(*wximg);
-        VariableMap vars = pano.getImageVariables(imgNr);
-        int dx = roundi(map_get(vars,"d").getValue());
-        int dy = roundi(map_get(vars,"e").getValue());
-        vigra::Point2D center(wximg->GetWidth()/2 + dx, wximg->GetHeight()/2 + dy);
-
-        dlg.SetParameters(opts.cropRect, circular_crop, center, opts.autoCenterCrop);
-//        dlg.CentreOnParent ();
-//        dlg->Refresh();
-        if ( dlg.ShowModal() == wxID_OK ) {
-            // get crop parameters
-            opts.cropRect = dlg.getCrop();
-            if (! opts.cropRect.isEmpty()) {
-                opts.docrop = true;
-            } else {
-                opts.docrop = false;
-            }
-            if (dlg.getCenterOnDE()) {
-                opts.autoCenterCrop = true;
-            } else {
-                opts.autoCenterCrop = false;
-            }
-
-            // set image options.
-            GlobalCmdHist::getInstance().addCommand(
-                    new PT::SetImageOptionsCmd(pano, opts, selectedImages)
-                                                   );
-
-            // allow setting of the d,e if automatic centering on d and e is switched off.
-            if (wxConfigBase::Get()->Read(wxT("LensPanel/CropSetsCenter"), HUGIN_CROP_SETS_CENTER ) && ! opts.autoCenterCrop)
-//            if (opts.autoCenterCrop)
-            {
-                double centerx = opts.cropRect.left() + opts.cropRect.width() / 2.0;
-                double centery = opts.cropRect.top() + opts.cropRect.height() / 2.0;
-                if (centerx != 0.0 && centery != 0.0) {
-                    VariableMapVector vars(selectedImages.size());
-                    UIntSet::const_iterator iNrIt = selectedImages.begin();
-                    for (VariableMapVector::iterator it = vars.begin(); it != vars.end(); ++it)
-                    {
-                        const PanoImage & pimg = pano.getImage(*iNrIt);
-                        (*it).insert(make_pair(std::string("d"), Variable("d", centerx - pimg.getWidth()/2.0 )));
-                        (*it).insert(make_pair(std::string("e"), Variable("e", centery - pimg.getHeight()/2.0 )));
-                        iNrIt++;
-                    }
-                    GlobalCmdHist::getInstance().addCommand(
-                            new PT::UpdateImagesVariablesCmd(pano, selectedImages, vars)
-                                                       );
-                }
-            }
-        }
-    }
-    DEBUG_TRACE ("")
-#endif
-}
-
-
 
 bool initLensFromFile(const std::string & filename, double &cropFactor, Lens & l,
                       VariableMap & vars, ImageOptions & imgopts, bool sameSettings)

Index: MainFrame.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/MainFrame.cpp,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -d -r1.186 -r1.187
--- MainFrame.cpp	22 Dec 2006 12:31:37 -0000	1.186
+++ MainFrame.cpp	22 Dec 2006 13:09:05 -0000	1.187
@@ -592,8 +592,12 @@
         SetStatusText( _("Error opening project:   ") + filename);
         DEBUG_ERROR("Could not open file " << filename);
     }
-
     pano.clearDirty();
+    // force update of preview window
+    if ( !(preview_frame->IsIconized() ||(! preview_frame->IsShown()) ) ) {
+        wxCommandEvent dummy;
+        preview_frame->OnUpdate(dummy);
+    }
 }
 
 #ifdef __WXMAC__
@@ -644,6 +648,8 @@
     ImageCache::getInstance().flush();
     this->SetTitle(wxT("hugin"));
     pano.clearDirty();
+    wxCommandEvent dummy;
+    preview_frame->OnUpdate(dummy);
 }
 
 void MainFrame::OnAddImages( wxCommandEvent& event )

Index: PreviewFrame.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/PreviewFrame.cpp,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- PreviewFrame.cpp	20 Dec 2006 19:39:08 -0000	1.67
+++ PreviewFrame.cpp	22 Dec 2006 13:09:05 -0000	1.68
@@ -325,7 +325,7 @@
     m_VFOVSlider->Enable( opts.fovCalcSupported(opts.getProjection()) );
 
     SetStatusText(_("Center panorama with left mouse button, set horizon with right button"),0);
-    SetStatusText(wxString::Format(_("%.1f x %.1f"), opts.getHFOV(), opts.getVFOV()),2);
+    SetStatusText(wxString::Format(wxT("%.1f x %.1f"), opts.getHFOV(), opts.getVFOV()),2);
     m_HFOVSlider->SetValue(roundi(opts.getHFOV()));
     m_VFOVSlider->SetValue(roundi(opts.getVFOV()));
 }

Update of /cvsroot/hugin/hugin/src/hugin/po
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv7166/src/hugin/po

Modified Files:
	POTFILES.in ca_ES.po cs_CZ.po de.po fr.po hu.po hugin.pot 
	it.po ja.po nl.po pl.po pt_BR.po ru.po sk.po sv.po uk.po 
	zh_CN.po 
Log Message:
more cleanup + updated strings


Index: sv.po
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/po/sv.po,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- sv.po	20 Dec 2006 22:01:00 -0000	1.8
+++ sv.po	22 Dec 2006 13:09:09 -0000	1.9
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: se\n"
 "Report-Msgid-Bugs-To: pablo.dangelo@..."
-"POT-Creation-Date: 2006-12-20 22:45+0100\n"
+"POT-Creation-Date: 2006-12-22 14:06+0100\n"
 "PO-Revision-Date: 2006-08-18 19:09+0100\n"
 "Last-Translator: Ulf Wilhelmson <ulf.wilhelmson@..."
 "Language-Team: Svenska <se@..."
@@ -18,26 +18,26 @@
 "X-Poedit-Country: SWEDEN\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
[...1011 lines suppressed...]
+#~ msgstr "exponering"
+
+#~ msgid "brightness"
+#~ msgstr "ljusstyrka"
+
+#~ msgid "inherit"
+#~ msgstr "ärv"
+
+#~ msgid "red (K0)"
+#~ msgstr "röd (K0)"
+
+#~ msgid "green (K1)"
+#~ msgstr "grön (K1)"
+
+#~ msgid "blue (K2)"
+#~ msgstr "blå (K2)"
+
 #~ msgid "Could not load dll"
 #~ msgstr "Kunde inte ladda dll"
 

Index: sk.po
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/po/sk.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- sk.po	20 Dec 2006 22:01:00 -0000	1.5
+++ sk.po	22 Dec 2006 13:09:09 -0000	1.6
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: sk\n"
 "Report-Msgid-Bugs-To: pablo.dangelo@..."
-"POT-Creation-Date: 2006-12-20 22:45+0100\n"
+"POT-Creation-Date: 2006-12-22 14:06+0100\n"
 "PO-Revision-Date: 2006-09-11 20:36+0200\n"
 "Last-Translator: Jozef Riha <jose1711@..."
 "Language-Team: Slovak <sk@..."
@@ -19,26 +19,26 @@
 "X-Poedit-Language: Slovak\n"
 "X-Poedit-Country: SLOVAKIA\n"
[...1011 lines suppressed...]
+#~ msgstr "expozícia"
+
+#~ msgid "brightness"
+#~ msgstr "jas"
+
+#~ msgid "inherit"
+#~ msgstr "zdediť"
+
+#~ msgid "red (K0)"
+#~ msgstr "červená (K0)"
+
+#~ msgid "green (K1)"
+#~ msgstr "zelená (K1)"
+
+#~ msgid "blue (K2)"
+#~ msgstr "modrá (K2)"
+
 #~ msgid "Could not load dll"
 #~ msgstr "Nie je možné nahrať dll"
 

Index: fr.po
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/po/fr.po,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- fr.po	20 Dec 2006 22:00:59 -0000	1.80
+++ fr.po	22 Dec 2006 13:09:06 -0000	1.81
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Hugin 0.6.1\n"
 "Report-Msgid-Bugs-To: pablo.dangelo@..."
-"POT-Creation-Date: 2006-12-20 22:45+0100\n"
+"POT-Creation-Date: 2006-12-22 14:06+0100\n"
 "PO-Revision-Date: 2006-12-17 13:49+0100\n"
 "Last-Translator: Jean-Luc Coulon (f5ibh) <jean-luc.coulon@..."
 "Language-Team: Translation Project French Team <traduc@..."
@@ -17,27 +17,27 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
[...1025 lines suppressed...]
+#~ msgstr "exposition"
+
+#~ msgid "brightness"
+#~ msgstr "luminosité"
+
+#~ msgid "inherit"
+#~ msgstr "hérité"
+
+#~ msgid "red (K0)"
+#~ msgstr "rouge (K0)"
+
+#~ msgid "green (K1)"
+#~ msgstr "vert (K1)"
+
+#~ msgid "blue (K2)"
+#~ msgstr "bleu (K2)"
+
 #~ msgid "%d control points.\n"
 #~ msgstr "%d points de contrôle.\n"
 

Index: ru.po
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/po/ru.po,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- ru.po	20 Dec 2006 22:01:00 -0000	1.30
+++ ru.po	22 Dec 2006 13:09:09 -0000	1.31
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: pablo.dangelo@..."
-"POT-Creation-Date: 2006-12-20 22:45+0100\n"
+"POT-Creation-Date: 2006-12-22 14:06+0100\n"
 "PO-Revision-Date: 2006-08-18 03:22+0400\n"
 "Last-Translator: Alexandre Prokoudine <alexandre.prokoudine@..."
 "Language-Team: Russian <ru@..."
@@ -18,26 +18,26 @@
 "Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
[...1017 lines suppressed...]
+#~ msgstr "экспозиция"
+
+#~ msgid "brightness"
+#~ msgstr "яркость"
+
+#~ msgid "inherit"
+#~ msgstr "заимствовать"
+
+#~ msgid "red (K0)"
+#~ msgstr "красный (K0)"
+
+#~ msgid "green (K1)"
+#~ msgstr "зелёный (K1)"
+
+#~ msgid "blue (K2)"
+#~ msgstr "синий (K2)"
+
 #~ msgid "Could not load dll"
 #~ msgstr "Не удалось загрузить dll"
 

Index: nl.po
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/po/nl.po,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- nl.po	20 Dec 2006 22:00:59 -0000	1.25
+++ nl.po	22 Dec 2006 13:09:09 -0000	1.26
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: nl\n"
 "Report-Msgid-Bugs-To: pablo.dangelo@..."
-"POT-Creation-Date: 2006-12-20 22:45+0100\n"
+"POT-Creation-Date: 2006-12-22 14:06+0100\n"
 "PO-Revision-Date: 2006-08-19 14:36+0100\n"
 "Last-Translator: Harry van der Wolf <harryvanderwolf@..."
 "Language-Team: Dutch <LL@..."
@@ -16,26 +16,26 @@
 "X-Poedit-Language: Dutch\n"
 "X-Poedit-Country: NETHERLANDS\n"
[...1014 lines suppressed...]
+#~ msgstr "belichting"
+
+#~ msgid "brightness"
+#~ msgstr "Helderheid"
+
+#~ msgid "inherit"
+#~ msgstr "Overerf"
+
+#~ msgid "red (K0)"
+#~ msgstr "rood (K0)"
+
+#~ msgid "green (K1)"
+#~ msgstr "groen (K1)"
+
+#~ msgid "blue (K2)"
+#~ msgstr "Blauw (K2)"
+
 #~ msgid "Could not load dll"
 #~ msgstr "Kan dll niet laden"
 

Index: it.po
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/po/it.po,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- it.po	20 Dec 2006 22:00:59 -0000	1.60
+++ it.po	22 Dec 2006 13:09:08 -0000	1.61
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: hugin 0.4\n"
 "Report-Msgid-Bugs-To: pablo.dangelo@..."
-"POT-Creation-Date: 2006-12-20 22:45+0100\n"
+"POT-Creation-Date: 2006-12-22 14:06+0100\n"
 "PO-Revision-Date: 2005-08-05 21:43+0100\n"
 "Last-Translator: Pablo d'Angelo <pablo.dangelo@..."
 "Language-Team: Italian <tp@..."
@@ -16,75 +16,75 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
[...1016 lines suppressed...]
+
+#, fuzzy
+#~ msgid "Channel:"
+#~ msgstr "Cancella"
+
+#, fuzzy
+#~ msgid "exposure"
+#~ msgstr "riferimento esposizione:"
+
+#, fuzzy
+#~ msgid "brightness"
+#~ msgstr "Luminosità (b)"
+
+#, fuzzy
+#~ msgid "inherit"
+#~ msgstr "Eredita"
+
 #~ msgid "Could not load dll"
 #~ msgstr "Caricamento dll fallito"
 

Index: pt_BR.po
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/po/pt_BR.po,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- pt_BR.po	20 Dec 2006 22:01:00 -0000	1.25
+++ pt_BR.po	22 Dec 2006 13:09:09 -0000	1.26
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: pablo.dangelo@..."
-"POT-Creation-Date: 2006-12-20 22:45+0100\n"
+"POT-Creation-Date: 2006-12-22 14:06+0100\n"
 "PO-Revision-Date: 2006-08-14 13:52-0400\n"
 "Last-Translator: Ademar de Souza Reis <ademar@..."
 "Language-Team: Português Brasileiro <pt_BR@..."
@@ -19,26 +19,26 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
[...1011 lines suppressed...]
+#~ msgstr "exposição"
+
+#~ msgid "brightness"
+#~ msgstr "brilho"
+
+#~ msgid "inherit"
+#~ msgstr "herdar"
+
+#~ msgid "red (K0)"
+#~ msgstr "vermelho (K0)"
+
+#~ msgid "green (K1)"
+#~ msgstr "verde (K1)"
+
+#~ msgid "blue (K2)"
+#~ msgstr "azul (K2)"
+
 #~ msgid "Could not load dll"
 #~ msgstr "Não foi possível carregar dll"
 

Index: ca_ES.po
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/po/ca_ES.po,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- ca_ES.po	20 Dec 2006 22:00:58 -0000	1.19
+++ ca_ES.po	22 Dec 2006 13:09:06 -0000	1.20
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Hugin 0.5\n"
 "Report-Msgid-Bugs-To: pablo.dangelo@..."
-"POT-Creation-Date: 2006-12-20 22:45+0100\n"
+"POT-Creation-Date: 2006-12-22 14:06+0100\n"
 "PO-Revision-Date: 2005-11-10 18:48+0100\n"
 "Last-Translator: Albert Capellades Badia <albertcba@..."
 "Language-Team: Translation Project Catalan Team <albertcba@..."
@@ -19,26 +19,26 @@
 "X-Poedit-Language: Catalan\n"
 "X-Poedit-Country: SPAIN\n"
[...1021 lines suppressed...]
+
+#, fuzzy
+#~ msgid "Channel:"
+#~ msgstr "Cancel·lar"
+
+#, fuzzy
+#~ msgid "exposure"
+#~ msgstr "àncora per la exposició :"
+
+#, fuzzy
+#~ msgid "brightness"
+#~ msgstr "Lluminositat (b)"
+
+#, fuzzy
+#~ msgid "inherit"
+#~ msgstr "Inherent"
+
 #~ msgid "Could not load dll"
 #~ msgstr "Impossible d'obrir la dll"
 

Index: hu.po
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/po/hu.po,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- hu.po	20 Dec 2006 22:00:59 -0000	1.19
+++ hu.po	22 Dec 2006 13:09:08 -0000	1.20
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: Hugin 0.5\n"
 "Report-Msgid-Bugs-To: pablo.dangelo@..."
-"POT-Creation-Date: 2006-12-20 22:45+0100\n"
+"POT-Creation-Date: 2006-12-22 14:06+0100\n"
 "PO-Revision-Date: 2005-11-06 04:34+0100\n"
 "Last-Translator: Balló György <ballogy@..."
 "Language-Team: Balló György <ballogy@..."
@@ -12,75 +12,75 @@
 "X-Poedit-Language: Hungarian\n"
 "X-Poedit-Country: HUNGARY\n"
[...1006 lines suppressed...]
+
+#, fuzzy
+#~ msgid "Channel:"
+#~ msgstr "Mégse"
+
+#, fuzzy
+#~ msgid "exposure"
+#~ msgstr "expozíciós horgony:"
+
+#, fuzzy
+#~ msgid "brightness"
+#~ msgstr "Fényesség (b)"
+
+#, fuzzy
+#~ msgid "inherit"
+#~ msgstr "Örököl"
+
 #~ msgid "Could not load dll"
 #~ msgstr "A dll nem tölthető be"
 

Index: hugin.pot
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/po/hugin.pot,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- hugin.pot	20 Dec 2006 22:00:59 -0000	1.64
+++ hugin.pot	22 Dec 2006 13:09:08 -0000	1.65
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: pablo.dangelo@..."
-"POT-Creation-Date: 2006-12-20 22:45+0100\n"
+"POT-Creation-Date: 2006-12-22 14:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@..."
 "Language-Team: LANGUAGE <LL@..."
@@ -16,75 +16,75 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/hugin/AssistantPanel.cpp:235
+#: src/hugin/AssistantPanel.cpp:227
 msgid "Please load images by pressing on the Load images button."
 msgstr ""
 
-#: src/hugin/AssistantPanel.cpp:265
+#: src/hugin/AssistantPanel.cpp:257
 #, c-format
 msgid "%d images loaded."
 msgstr ""
 
-#: src/hugin/AssistantPanel.cpp:299
+#: src/hugin/AssistantPanel.cpp:291
 #, c-format
 msgid "Images are connected by %d control points.\n"
 msgstr ""
 
-#: src/hugin/AssistantPanel.cpp:308
+#: src/hugin/AssistantPanel.cpp:300
 #, c-format
 msgid "%d unconnected image groups found: "
 msgstr ""
 
-#: src/hugin/AssistantPanel.cpp:309
+#: src/hugin/AssistantPanel.cpp:301
 msgid ""
 "Please use the Control Points tab to connect all images with control "
 "points.\n"
 msgstr ""
 
-#: src/hugin/AssistantPanel.cpp:312
+#: src/hugin/AssistantPanel.cpp:304
 msgid "Images or control points have changed, new alignment is needed."
 msgstr ""
 
-#: src/hugin/AssistantPanel.cpp:323
+#: src/hugin/AssistantPanel.cpp:315
 msgid "Very good fit."
 msgstr ""
 
-#: src/hugin/AssistantPanel.cpp:325
+#: src/hugin/AssistantPanel.cpp:317
 msgid "Good fit."
 msgstr ""
 
-#: src/hugin/AssistantPanel.cpp:327
+#: src/hugin/AssistantPanel.cpp:319
 msgid ""
 "Bad fit, some control points might be bad, or there are parallax and "
 "movement errors"
 msgstr ""
 
-#: src/hugin/AssistantPanel.cpp:329
+#: src/hugin/AssistantPanel.cpp:321
 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 ""
 
-#: src/hugin/AssistantPanel.cpp:331
+#: src/hugin/AssistantPanel.cpp:323
 #, c-format
 msgid "Mean error after optimization: %.1f pixel\n"
 msgstr ""
 
-#: src/hugin/AssistantPanel.cpp:355
+#: src/hugin/AssistantPanel.cpp:360
 msgid "At least two images are required."
 msgstr ""
 
-#: src/hugin/AssistantPanel.cpp:355
+#: src/hugin/AssistantPanel.cpp:360
 msgid "Error"
 msgstr ""
 
-#: src/hugin/AssistantPanel.cpp:399
+#: src/hugin/AssistantPanel.cpp:404
 #, c-format
 msgid "Warning %d unconnected image groups found:"
 msgstr ""
 
-#: src/hugin/AssistantPanel.cpp:400
+#: src/hugin/AssistantPanel.cpp:405
 msgid ""
 "Please create control points between unconnected images using the Control "
 "Points tab.\n"
@@ -92,7 +92,7 @@
 "After adding the points, press the \"Align\" button again"
 msgstr ""
 
-#: src/hugin/AssistantPanel.cpp:569 src/hugin/LensPanel.cpp:724
+#: src/hugin/AssistantPanel.cpp:574 src/hugin/LensPanel.cpp:719
 msgid "Not a jpeg file:"
 msgstr ""
 
@@ -294,35 +294,35 @@
 msgid "No corresponding point found"
 msgstr ""
 
-#: src/hugin/CPEditorPanel.cpp:633
+#: src/hugin/CPEditorPanel.cpp:644
 msgid "new control point added"
 msgstr ""
 
-#: src/hugin/CPEditorPanel.cpp:733 src/hugin/CPEditorPanel.cpp:957
+#: src/hugin/CPEditorPanel.cpp:744 src/hugin/CPEditorPanel.cpp:968
 msgid "searching similar point..."
 msgstr ""
 
-#: src/hugin/CPEditorPanel.cpp:752 src/hugin/CPEditorPanel.cpp:875
+#: src/hugin/CPEditorPanel.cpp:763 src/hugin/CPEditorPanel.cpp:886
 msgid "Error during Fine-tune"
 msgstr ""
 
-#: src/hugin/CPEditorPanel.cpp:766 src/hugin/CPEditorPanel.cpp:895
-#: src/hugin/CPEditorPanel.cpp:1010
+#: src/hugin/CPEditorPanel.cpp:777 src/hugin/CPEditorPanel.cpp:906
+#: src/hugin/CPEditorPanel.cpp:1021
 #, c-format
 msgid ""
 "Point finetuned, angle: %.0f deg, correlation coefficient: %0.3f, curvature: "
 "%0.3f %0.3f "
 msgstr ""
 
-#: src/hugin/CPEditorPanel.cpp:769 src/hugin/CPEditorPanel.cpp:898
+#: src/hugin/CPEditorPanel.cpp:780 src/hugin/CPEditorPanel.cpp:909
 msgid "change points, or press right mouse button to add the pair"
 msgstr ""
 
-#: src/hugin/CPEditorPanel.cpp:789
+#: src/hugin/CPEditorPanel.cpp:800
 msgid "Estimated point outside image"
 msgstr ""
 
-#: src/hugin/CPEditorPanel.cpp:1016
+#: src/hugin/CPEditorPanel.cpp:1027
 #, c-format
 msgid ""
 "No similar point found.\n"
@@ -330,56 +330,57 @@
 "peak curvature: (%.3f, %.3f) ( should be > %.3f)"
 msgstr ""
 
-#: src/hugin/CPEditorPanel.cpp:1018
+#: src/hugin/CPEditorPanel.cpp:1029
 msgid "No similar point found"
 msgstr ""
 
-#: src/hugin/CPEditorPanel.cpp:1420 src/hugin/CPListFrame.cpp:397
+#: src/hugin/CPEditorPanel.cpp:1431 src/hugin/CPListFrame.cpp:397
 #: src/hugin/PreviewFrame.cpp:213 src/hugin/xrc/cp_editor_panel.xrs:8
 #: src/hugin/xrc/cp_editor_panel-2.5.xrs:8
 msgid "normal"
 msgstr ""
 
-#: src/hugin/CPEditorPanel.cpp:1423 src/hugin/CPListFrame.cpp:400
+#: src/hugin/CPEditorPanel.cpp:1434 src/hugin/CPListFrame.cpp:400
 msgid "vert. Line"
 msgstr ""
 
-#: src/hugin/CPEditorPanel.cpp:1426 src/hugin/CPListFrame.cpp:403
+#: src/hugin/CPEditorPanel.cpp:1437 src/hugin/CPListFrame.cpp:403
 msgid "horiz. Line"
 msgstr ""
 
-#: src/hugin/CPEditorPanel.cpp:1716
+#: src/hugin/CPEditorPanel.cpp:1727
 msgid "Cannot estimate image position without control points"
 msgstr ""
 
-#: src/hugin/CPEditorPanel.cpp:1737
+#: src/hugin/CPEditorPanel.cpp:1748
 msgid ""
 "Create control points.\n"
 "To create less points,\n"
 "enter a higher number."
 msgstr ""
 
-#: src/hugin/CPEditorPanel.cpp:1737
+#: src/hugin/CPEditorPanel.cpp:1748
 msgid "Corner Detection threshold"
 msgstr ""
 
-#: src/hugin/CPEditorPanel.cpp:1737 src/hugin/CPEditorPanel.cpp:1741
+#: src/hugin/CPEditorPanel.cpp:1748 src/hugin/CPEditorPanel.cpp:1752
+#: src/hugin/xrc/images_panel-2.5.xrs:23
 msgid "Create control points"
 msgstr ""
 
-#: src/hugin/CPEditorPanel.cpp:1741
+#: src/hugin/CPEditorPanel.cpp:1752
 msgid "Corner Detection scale"
 msgstr ""
 
-#: src/hugin/CPEditorPanel.cpp:1753
+#: src/hugin/CPEditorPanel.cpp:1764
 msgid "Error during control point creation:\n"
 msgstr ""
 
-#: src/hugin/CPEditorPanel.cpp:1884
+#: src/hugin/CPEditorPanel.cpp:1895
 msgid "Select Point in right image"
 msgstr ""
 
-#: src/hugin/CPEditorPanel.cpp:1896
+#: src/hugin/CPEditorPanel.cpp:1907
 msgid "Select Point in left image"
 msgstr ""
 
@@ -426,8 +427,8 @@
 msgid "Could not read number"
 msgstr ""
 
-#: src/hugin/huginApp.cpp:49 src/hugin/ImagesPanel.cpp:313
-#: src/hugin/ImagesPanel.cpp:334 src/hugin/ImagesPanel.cpp:354
+#: src/hugin/huginApp.cpp:50 src/hugin/ImagesPanel.cpp:315
+#: src/hugin/ImagesPanel.cpp:336 src/hugin/ImagesPanel.cpp:356
 #: src/hugin/PanoPanel.cpp:295 src/hugin/PanoPanel.cpp:326
 msgid "Value must be numeric."
 msgstr ""
@@ -461,45 +462,6 @@
 msgid "Creating pyramid image for %s, level %d"
 msgstr ""
 
-#: src/hugin/ImageCenter.cpp:62
-msgid "Crop Image"
-msgstr ""
-
-#: src/hugin/ImageCenter.cpp:81
-msgid "Left:"
-msgstr ""
-
-#: src/hugin/ImageCenter.cpp:86
-msgid "Top:"
-msgstr ""
-
-#: src/hugin/ImageCenter.cpp:91
-msgid "Right:"
-msgstr ""
-
-#: src/hugin/ImageCenter.cpp:96
-msgid "Bottom:"
-msgstr ""
-
-#: src/hugin/ImageCenter.cpp:101 src/hugin/xrc/images_panel.xrs:33
-#: src/hugin/xrc/images_panel-2.5.xrs:18
-msgid "Reset"
-msgstr ""
-
-#: src/hugin/ImageCenter.cpp:103
-msgid "Always center Crop on d,e"
-msgstr ""
-
-#: src/hugin/ImageCenter.cpp:219 src/hugin/ImageCenter.cpp:234
-#: src/hugin/ImageCenter.cpp:249 src/hugin/ImageCenter.cpp:264
-msgid "Please enter a valid number"
-msgstr ""
-
-#: src/hugin/ImageOrientationPanel.cpp:132
-#, c-format
-msgid "Yaw: %.1f Pitch:%.1f Roll:%.1f"
-msgstr ""
-
 #: src/hugin/ImagesList.cpp:306 src/hugin/ImagesList.cpp:365
 msgid "Filename"
 msgstr ""
@@ -572,97 +534,96 @@
 msgid "t"
 msgstr ""
 
-#: src/hugin/ImagesList.cpp:376 src/hugin/xrc/images_panel.xrs:10
-#: src/hugin/xrc/images_panel-2.5.xrs:31 src/hugin/xrc/lens_panel.xrs:34
-#: src/hugin/xrc/lens_panel-2.5.xrs:25
+#: src/hugin/ImagesList.cpp:376 src/hugin/ImagesList.cpp:428
+#: src/hugin/xrc/images_panel.xrs:10 src/hugin/xrc/images_panel-2.5.xrs:31
+#: src/hugin/xrc/lens_panel.xrs:34
 msgid "Crop"
 msgstr ""
 
 #: src/hugin/ImagesList.cpp:399 src/hugin/xrc/assistant_panel.xrs:6
 #: src/hugin/xrc/assistant_panel.xrs:25 src/hugin/xrc/lens_panel.xrs:2
-#: src/hugin/xrc/lens_panel-2.5.xrs:13 src/hugin/xrc/lens_panel-2.5.xrs:55
+#: src/hugin/xrc/lens_panel-2.5.xrs:13
 msgid "Normal (rectilinear)"
 msgstr ""
 
 #: src/hugin/ImagesList.cpp:400 src/hugin/xrc/assistant_panel.xrs:7
 #: src/hugin/xrc/assistant_panel.xrs:26 src/hugin/xrc/lens_panel.xrs:3
-#: src/hugin/xrc/lens_panel-2.5.xrs:14 src/hugin/xrc/lens_panel-2.5.xrs:56
+#: src/hugin/xrc/lens_panel-2.5.xrs:14
 msgid "Panoramic (cylindrical)"
 msgstr ""
 
 #: src/hugin/ImagesList.cpp:401 src/hugin/xrc/assistant_panel.xrs:8
 #: src/hugin/xrc/assistant_panel.xrs:27 src/hugin/xrc/lens_panel.xrs:4
-#: src/hugin/xrc/lens_panel-2.5.xrs:15 src/hugin/xrc/lens_panel-2.5.xrs:57
+#: src/hugin/xrc/lens_panel-2.5.xrs:15
 msgid "Circular fisheye"
 msgstr ""
 
 #: src/hugin/ImagesList.cpp:402 src/hugin/xrc/assistant_panel.xrs:9
 #: src/hugin/xrc/assistant_panel.xrs:28 src/hugin/xrc/lens_panel.xrs:5
-#: src/hugin/xrc/lens_panel-2.5.xrs:16 src/hugin/xrc/lens_panel-2.5.xrs:58
-#: src/hugin/xrc/pano_panel.xrs:6
+#: src/hugin/xrc/lens_panel-2.5.xrs:16 src/hugin/xrc/pano_panel.xrs:6
 msgid "Full frame fisheye"
 msgstr ""
 
 #: src/hugin/ImagesList.cpp:403 src/hugin/PreviewFrame.cpp:439
 #: src/hugin/xrc/assistant_panel.xrs:10 src/hugin/xrc/assistant_panel.xrs:29
 #: src/hugin/xrc/lens_panel.xrs:6 src/hugin/xrc/lens_panel-2.5.xrs:17
-#: src/hugin/xrc/lens_panel-2.5.xrs:59 src/hugin/xrc/pano_panel.xrs:5
+#: src/hugin/xrc/pano_panel.xrs:5
 msgid "Equirectangular"
 msgstr ""
 
-#: src/hugin/ImagesPanel.cpp:292
+#: src/hugin/ImagesPanel.cpp:294
 #, c-format
 msgid "Added %d control points"
 msgstr ""
 
-#: src/hugin/ImagesPanel.cpp:292
+#: src/hugin/ImagesPanel.cpp:294
 msgid "Autopano result"
 msgstr ""
 
-#: src/hugin/ImagesPanel.cpp:695
+#: src/hugin/ImagesPanel.cpp:687
 #, c-format
 msgid "Really Delete %d control points?"
 msgstr ""
 
-#: src/hugin/ImagesPanel.cpp:697
+#: src/hugin/ImagesPanel.cpp:689
 msgid "Delete Control Points"
 msgstr ""
 
-#: src/hugin/LensPanel.cpp:729 src/hugin/LensPanel.cpp:789
-#: src/hugin/LensPanel.cpp:822 src/hugin/LensPanel.cpp:906
-#: src/hugin/LensPanel.cpp:924
+#: src/hugin/LensPanel.cpp:724 src/hugin/LensPanel.cpp:784
+#: src/hugin/LensPanel.cpp:817 src/hugin/LensPanel.cpp:901
+#: src/hugin/LensPanel.cpp:919
 msgid "Please select an image and try again"
 msgstr ""
 
-#: src/hugin/LensPanel.cpp:747
+#: src/hugin/LensPanel.cpp:742
 msgid "Save lens parameters file"
 msgstr ""
 
-#: src/hugin/LensPanel.cpp:749
+#: src/hugin/LensPanel.cpp:744
 msgid "Lens Project Files (*.ini)|*.ini|All files (*)|*"
 msgstr ""
 
-#: src/hugin/LensPanel.cpp:831
+#: src/hugin/LensPanel.cpp:826
 msgid "Load lens parameters"
 msgstr ""
 
-#: src/hugin/LensPanel.cpp:833
+#: src/hugin/LensPanel.cpp:828
 msgid "Lens Project Files (*.ini)|*.ini|All files (*.*)|*.*"
 msgstr ""
 
-#: src/hugin/LensPanel.cpp:914
+#: src/hugin/LensPanel.cpp:909
 msgid "Enter new lens number"
 msgstr ""
 
-#: src/hugin/LensPanel.cpp:914
+#: src/hugin/LensPanel.cpp:909
 msgid "Lens number"
 msgstr ""
 
-#: src/hugin/LensPanel.cpp:915
+#: src/hugin/LensPanel.cpp:910
 msgid "Change lens number"
 msgstr ""
 
-#: src/hugin/LensPanel.cpp:1009
+#: src/hugin/LensPanel.cpp:935
 msgid ""
 "Enter Crop Factor for image\n"
 "\n"
@@ -672,96 +633,96 @@
 "where diagnal is the diagonal (in mm) of the film or imaging chip."
 msgstr ""
 
-#: src/hugin/LensPanel.cpp:1010
+#: src/hugin/LensPanel.cpp:936
 msgid "Adding Image"
 msgstr ""
 
-#: src/hugin/LensPanel.cpp:1034
+#: src/hugin/LensPanel.cpp:960
 msgid "The crop factor must be numeric."
 msgstr ""
 
-#: src/hugin/LensPanel.cpp:1043
+#: src/hugin/LensPanel.cpp:969
 msgid "The focal length value must be numeric."
 msgstr ""
 
-#: src/hugin/MainFrame.cpp:182
+#: src/hugin/MainFrame.cpp:183
 msgid ""
 "Fatal installation error\n"
 "The xrc directory was not found.\n"
 "Please ensure it is placed in the same directory as hugin.exe"
 msgstr ""
 
-#: src/hugin/MainFrame.cpp:202 src/hugin/xrc/main_menubar.xrs:4
+#: src/hugin/MainFrame.cpp:203 src/hugin/xrc/main_menubar.xrs:4
 #: src/hugin/xrc/main_menu.xrs:31 src/hugin/xrc/main_menu.xrs:34
 msgid "&Help"
 msgstr ""
 
-#: src/hugin/MainFrame.cpp:293
+#: src/hugin/MainFrame.cpp:299
 msgid "Started"
 msgstr ""
 
-#: src/hugin/MainFrame.cpp:419
+#: src/hugin/MainFrame.cpp:425
 msgid ""
 "The panorama has been changed\n"
 "Save changes?"
 msgstr ""
 
-#: src/hugin/MainFrame.cpp:419
+#: src/hugin/MainFrame.cpp:425
 msgid "Save Panorama?"
 msgstr ""
 
-#: src/hugin/MainFrame.cpp:452
+#: src/hugin/MainFrame.cpp:458
 msgid "forced close"
 msgstr ""
 
-#: src/hugin/MainFrame.cpp:499
+#: src/hugin/MainFrame.cpp:505
 #, c-format
 msgid "saved project %s"
 msgstr ""
 
-#: src/hugin/MainFrame.cpp:508
+#: src/hugin/MainFrame.cpp:518
 msgid "Save project file"
 msgstr ""
 
-#: src/hugin/MainFrame.cpp:510
+#: src/hugin/MainFrame.cpp:520
 msgid "Project files (*.pto)|*.pto|All files (*)|*"
 msgstr ""
 
-#: src/hugin/MainFrame.cpp:526
+#: src/hugin/MainFrame.cpp:540
 msgid "Save PTStitcher script file"
 msgstr ""
 
-#: src/hugin/MainFrame.cpp:528
+#: src/hugin/MainFrame.cpp:542
 msgid "PTStitcher files (*.txt)|*.txt"
 msgstr ""
 
-#: src/hugin/MainFrame.cpp:556
+#: src/hugin/MainFrame.cpp:570
 msgid "Open project:   "
 msgstr ""
 
-#: src/hugin/MainFrame.cpp:568
+#: src/hugin/MainFrame.cpp:582
 msgid "Project opened"
 msgstr ""
 
-#: src/hugin/MainFrame.cpp:578
+#: src/hugin/MainFrame.cpp:592
 msgid "Error opening project:   "
 msgstr ""
 
-#: src/hugin/MainFrame.cpp:605
+#: src/hugin/MainFrame.cpp:623
 msgid "Open project file"
 msgstr ""
 
-#: src/hugin/MainFrame.cpp:607
+#: src/hugin/MainFrame.cpp:625
 msgid ""
 "Project files (*.pto,*.ptp,*.pts,*.oto)|*.pto;*.ptp;*.pts;*.oto;|All files "
 "(*)|*"
 msgstr ""
 
-#: src/hugin/MainFrame.cpp:620
+#: src/hugin/MainFrame.cpp:638
 msgid "Open project: cancel"
 msgstr ""
 
-#: src/hugin/MainFrame.cpp:644 src/hugin/VigCorrDialog.cpp:169
+#: src/hugin/MainFrame.cpp:664 src/hugin/VigCorrDialog.cpp:169
 #: src/include/hugin/wxPanoCommand.h:194
 msgid ""
 "All Image files|*.jpg;*.JPG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*.PNG;*.bmp;*."
@@ -769,23 +730,23 @@
 "JPG|All files (*)|*"
 msgstr ""
 
-#: src/hugin/MainFrame.cpp:645 src/include/hugin/wxPanoCommand.h:195
+#: src/hugin/MainFrame.cpp:665 src/include/hugin/wxPanoCommand.h:195
 msgid "Add images"
 msgstr ""
 
-#: src/hugin/MainFrame.cpp:697
+#: src/hugin/MainFrame.cpp:717
 msgid "Add Image: cancel"
 msgstr ""
 
-#: src/hugin/MainFrame.cpp:1074
+#: src/hugin/MainFrame.cpp:1093
 msgid "Fine-tuning all points"
 msgstr ""
 
-#: src/hugin/MainFrame.cpp:1076
+#: src/hugin/MainFrame.cpp:1095
 msgid "Finetuning"
 msgstr ""
 
-#: src/hugin/MainFrame.cpp:1167
+#: src/hugin/MainFrame.cpp:1186
 #, c-format
 msgid ""
 "%d points fine-tuned, %d points not updated due to low correlation\n"
@@ -801,7 +762,7 @@
 "Use the Control Point list (F3) to see all point of the current project\n"
 msgstr ""
 
-#: src/hugin/MainFrame.cpp:1169
+#: src/hugin/MainFrame.cpp:1188
 msgid "Fine-tune result"
 msgstr ""
 
@@ -1101,7 +1062,7 @@
 msgid "height needs to be an integer bigger than 0"
 msgstr ""
 
-#: src/hugin/PanoPanel.cpp:641
+#: src/hugin/PanoPanel.cpp:645
 msgid "Create panorama image"
 msgstr ""
 
@@ -1252,11 +1213,6 @@
 msgid "Center panorama with left mouse button, set horizon with right button"
 msgstr ""
 
-#: src/hugin/PreviewFrame.cpp:328
-#, c-format
-msgid "%.1f x %.1f"
-msgstr ""
-
 #: src/hugin/PreviewFrame.cpp:437 src/hugin/xrc/pano_panel.xrs:3
 msgid "Rectilinear"
 msgstr ""
@@ -1536,7 +1492,6 @@
 
 #: src/hugin/xrc/assistant_panel.xrs:5 src/hugin/xrc/assistant_panel.xrs:24
 #: src/hugin/xrc/lens_panel.xrs:1 src/hugin/xrc/lens_panel-2.5.xrs:12
-#: src/hugin/xrc/lens_panel-2.5.xrs:54
 msgid "Lens type:"
 msgstr ""
 
@@ -1754,6 +1709,36 @@
 msgid "Select by Distance"
 msgstr ""
 
+#: src/hugin/xrc/crop_panel.xrs:1
+msgid "Left:"
+msgstr ""
+
+#: src/hugin/xrc/crop_panel.xrs:2
+msgid "Top:"
+msgstr ""
+
+#: src/hugin/xrc/crop_panel.xrs:3
+msgid "Right:"
+msgstr ""
+
+#: src/hugin/xrc/crop_panel.xrs:4
+msgid "Bottom:"
+msgstr ""
+
+#: src/hugin/xrc/crop_panel.xrs:5
+msgid "Always center Crop on d,e"
+msgstr ""
+
+#: src/hugin/xrc/crop_panel.xrs:6 src/hugin/xrc/images_panel.xrs:33
+#: src/hugin/xrc/images_panel-2.5.xrs:18
+msgid "Reset"
+msgstr ""
+
+#: src/hugin/xrc/crop_panel.xrs:7 src/hugin/xrc/lens_panel.xrs:38
+#: src/hugin/xrc/lens_panel-2.5.xrs:2
+msgid "Load lens parameters from a file"
+msgstr ""
+
 #: src/hugin/xrc/edit_script_dialog.xrs:1
 msgid "Edit Panorama Tools Script"
 msgstr ""
@@ -1789,24 +1774,10 @@
 msgid "Hugin Reference"
 msgstr ""
 
-#: src/hugin/xrc/help.xrs:2 src/hugin/xrc/image_center.xrs:3
-#: src/hugin/xrc/keyboard_help.xrs:2
+#: src/hugin/xrc/help.xrs:2 src/hugin/xrc/keyboard_help.xrs:2
 msgid "Close"
 msgstr ""
 
-#: src/hugin/xrc/image_center.xrs:1 src/hugin/xrc/pref_dialog.xrs:83
-#: src/hugin/xrc/run_optimizer_frame.xrs:2
-msgid "Apply"
-msgstr ""
-
-#: src/hugin/xrc/image_center.xrs:2
-msgid "apply changed values to actual selected images from panorama"
-msgstr ""
-
-#: src/hugin/xrc/image_center.xrs:4
-msgid "close window"
-msgstr ""
-
 #: src/hugin/xrc/images_panel.xrs:1
 msgid "Image Collection"
 msgstr ""
@@ -1889,7 +1860,7 @@
 msgid "number of points created at each overlap"
 msgstr ""
 
-#: src/hugin/xrc/images_panel.xrs:22 src/hugin/xrc/images_panel-2.5.xrs:23
+#: src/hugin/xrc/images_panel.xrs:22
 msgid "Create Ctrl Points"
 msgstr ""
 
@@ -1897,7 +1868,7 @@
 msgid "Run external autopano program on the selected images"
 msgstr ""
 
-#: src/hugin/xrc/images_panel.xrs:24 src/hugin/xrc/images_panel-2.5.xrs:9
+#: src/hugin/xrc/images_panel.xrs:24
 msgid "Remove Points"
 msgstr ""
 
@@ -1942,6 +1913,10 @@
 msgid "This Image"
 msgstr ""
 
+#: src/hugin/xrc/images_panel-2.5.xrs:9
+msgid "Remove points"
+msgstr ""
+
 #: src/hugin/xrc/images_panel-2.5.xrs:32
 msgid "Crop..."
 msgstr ""
@@ -1951,17 +1926,14 @@
 msgstr ""
 
 #: src/hugin/xrc/lens_panel.xrs:7 src/hugin/xrc/lens_panel-2.5.xrs:11
-#: src/hugin/xrc/lens_panel-2.5.xrs:60
 msgid "Design Parameters"
 msgstr ""
 
 #: src/hugin/xrc/lens_panel.xrs:8 src/hugin/xrc/lens_panel-2.5.xrs:18
-#: src/hugin/xrc/lens_panel-2.5.xrs:61
 msgid "degrees of view (v):"
 msgstr ""
 
 #: src/hugin/xrc/lens_panel.xrs:9 src/hugin/xrc/lens_panel-2.5.xrs:19
-#: src/hugin/xrc/lens_panel-2.5.xrs:62
 msgid "Horizontal Field of View"
 msgstr ""
 
@@ -1969,36 +1941,28 @@
 #: src/hugin/xrc/lens_panel.xrs:19 src/hugin/xrc/lens_panel.xrs:21
 #: src/hugin/xrc/lens_panel.xrs:24 src/hugin/xrc/lens_panel.xrs:26
 #: src/hugin/xrc/lens_panel.xrs:29 src/hugin/xrc/lens_panel.xrs:31
-#: src/hugin/xrc/lens_panel-2.5.xrs:20 src/hugin/xrc/lens_panel-2.5.xrs:30
-#: src/hugin/xrc/lens_panel-2.5.xrs:32 src/hugin/xrc/lens_panel-2.5.xrs:34
-#: src/hugin/xrc/lens_panel-2.5.xrs:37 src/hugin/xrc/lens_panel-2.5.xrs:39
-#: src/hugin/xrc/lens_panel-2.5.xrs:42 src/hugin/xrc/lens_panel-2.5.xrs:44
-#: src/hugin/xrc/lens_panel-2.5.xrs:49 src/hugin/xrc/lens_panel-2.5.xrs:51
-#: src/hugin/xrc/lens_panel-2.5.xrs:53 src/hugin/xrc/lens_panel-2.5.xrs:63
-#: src/hugin/xrc/lens_panel-2.5.xrs:72 src/hugin/xrc/lens_panel-2.5.xrs:74
-#: src/hugin/xrc/lens_panel-2.5.xrs:76 src/hugin/xrc/lens_panel-2.5.xrs:79
-#: src/hugin/xrc/lens_panel-2.5.xrs:81 src/hugin/xrc/lens_panel-2.5.xrs:84
-#: src/hugin/xrc/lens_panel-2.5.xrs:86
+#: src/hugin/xrc/lens_panel-2.5.xrs:20 src/hugin/xrc/lens_panel-2.5.xrs:29
+#: src/hugin/xrc/lens_panel-2.5.xrs:31 src/hugin/xrc/lens_panel-2.5.xrs:33
+#: src/hugin/xrc/lens_panel-2.5.xrs:36 src/hugin/xrc/lens_panel-2.5.xrs:38
+#: src/hugin/xrc/lens_panel-2.5.xrs:41 src/hugin/xrc/lens_panel-2.5.xrs:43
+#: src/hugin/xrc/lens_panel-2.5.xrs:48 src/hugin/xrc/lens_panel-2.5.xrs:50
+#: src/hugin/xrc/lens_panel-2.5.xrs:52
 msgid "Inherit"
 msgstr ""
 
 #: src/hugin/xrc/lens_panel.xrs:11 src/hugin/xrc/lens_panel-2.5.xrs:21
-#: src/hugin/xrc/lens_panel-2.5.xrs:64
 msgid "focal length:"
 msgstr ""
 
 #: src/hugin/xrc/lens_panel.xrs:12 src/hugin/xrc/lens_panel-2.5.xrs:22
-#: src/hugin/xrc/lens_panel-2.5.xrs:65
 msgid "true focal length in mm"
 msgstr ""
 
 #: src/hugin/xrc/lens_panel.xrs:13 src/hugin/xrc/lens_panel-2.5.xrs:23
-#: src/hugin/xrc/lens_panel-2.5.xrs:66
 msgid "crop factor:"
 msgstr ""
 
 #: src/hugin/xrc/lens_panel.xrs:14 src/hugin/xrc/lens_panel-2.5.xrs:24
-#: src/hugin/xrc/lens_panel-2.5.xrs:67
 msgid "35mm film diameter / ccd diameter"
 msgstr ""
 
@@ -2006,53 +1970,46 @@
 msgid "Lens Correction Parameters"
 msgstr ""
 
-#: src/hugin/xrc/lens_panel.xrs:16 src/hugin/xrc/lens_panel-2.5.xrs:29
-#: src/hugin/xrc/lens_panel-2.5.xrs:71 src/hugin/xrc/optimize_panel.xrs:25
+#: src/hugin/xrc/lens_panel.xrs:16 src/hugin/xrc/lens_panel-2.5.xrs:28
+#: src/hugin/xrc/optimize_panel.xrs:25
 msgid "distortion (a):"
 msgstr ""
 
-#: src/hugin/xrc/lens_panel.xrs:18 src/hugin/xrc/lens_panel-2.5.xrs:31
-#: src/hugin/xrc/lens_panel-2.5.xrs:73 src/hugin/xrc/optimize_panel.xrs:26
+#: src/hugin/xrc/lens_panel.xrs:18 src/hugin/xrc/lens_panel-2.5.xrs:30
+#: src/hugin/xrc/optimize_panel.xrs:26
 msgid "barrel (b):"
 msgstr ""
 
-#: src/hugin/xrc/lens_panel.xrs:20 src/hugin/xrc/lens_panel-2.5.xrs:33
-#: src/hugin/xrc/lens_panel-2.5.xrs:75 src/hugin/xrc/optimize_panel.xrs:27
+#: src/hugin/xrc/lens_panel.xrs:20 src/hugin/xrc/lens_panel-2.5.xrs:32
+#: src/hugin/xrc/optimize_panel.xrs:27
 msgid "distortion (c):"
 msgstr ""
 
-#: src/hugin/xrc/lens_panel.xrs:22 src/hugin/xrc/lens_panel-2.5.xrs:35
-#: src/hugin/xrc/lens_panel-2.5.xrs:77
+#: src/hugin/xrc/lens_panel.xrs:22 src/hugin/xrc/lens_panel-2.5.xrs:34
 msgid "Image Center Shift"
 msgstr ""
 
-#: src/hugin/xrc/lens_panel.xrs:23 src/hugin/xrc/lens_panel-2.5.xrs:36
-#: src/hugin/xrc/lens_panel-2.5.xrs:78
+#: src/hugin/xrc/lens_panel.xrs:23 src/hugin/xrc/lens_panel-2.5.xrs:35
 msgid "horizontal (d):"
 msgstr ""
 
-#: src/hugin/xrc/lens_panel.xrs:25 src/hugin/xrc/lens_panel-2.5.xrs:38
-#: src/hugin/xrc/lens_panel-2.5.xrs:80
+#: src/hugin/xrc/lens_panel.xrs:25 src/hugin/xrc/lens_panel-2.5.xrs:37
 msgid "vertical (e):"
 msgstr ""
 
-#: src/hugin/xrc/lens_panel.xrs:27 src/hugin/xrc/lens_panel-2.5.xrs:40
-#: src/hugin/xrc/lens_panel-2.5.xrs:82
+#: src/hugin/xrc/lens_panel.xrs:27 src/hugin/xrc/lens_panel-2.5.xrs:39
 msgid "Image Shearing"
 msgstr ""
 
-#: src/hugin/xrc/lens_panel.xrs:28 src/hugin/xrc/lens_panel-2.5.xrs:41
-#: src/hugin/xrc/lens_panel-2.5.xrs:83
+#: src/hugin/xrc/lens_panel.xrs:28 src/hugin/xrc/lens_panel-2.5.xrs:40
 msgid "horizontal (g):"
 msgstr ""
 
-#: src/hugin/xrc/lens_panel.xrs:30 src/hugin/xrc/lens_panel-2.5.xrs:43
-#: src/hugin/xrc/lens_panel-2.5.xrs:85
+#: src/hugin/xrc/lens_panel.xrs:30 src/hugin/xrc/lens_panel-2.5.xrs:42
 msgid "vertical (t):"
 msgstr ""
 
-#: src/hugin/xrc/lens_panel.xrs:32 src/hugin/xrc/lens_panel-2.5.xrs:26
-#: src/hugin/xrc/lens_panel-2.5.xrs:88
+#: src/hugin/xrc/lens_panel.xrs:32 src/hugin/xrc/lens_panel-2.5.xrs:25
 msgid "Vignetting"
 msgstr ""
 
@@ -2060,55 +2017,43 @@
 msgid "Set crop and image center"
 msgstr ""
 
-#: src/hugin/xrc/lens_panel.xrs:36 src/hugin/xrc/lens_panel-2.5.xrs:98
+#: src/hugin/xrc/lens_panel.xrs:36
 msgid "Lens management"
 msgstr ""
 
-#: src/hugin/xrc/lens_panel.xrs:37 src/hugin/xrc/lens_panel-2.5.xrs:99
+#: src/hugin/xrc/lens_panel.xrs:37
 msgid "Load"
 msgstr ""
 
-#: src/hugin/xrc/lens_panel.xrs:38 src/hugin/xrc/lens_panel-2.5.xrs:2
-#: src/hugin/xrc/lens_panel-2.5.xrs:100
-msgid "Load lens parameters from a file"
-msgstr ""
-
-#: src/hugin/xrc/lens_panel.xrs:39 src/hugin/xrc/lens_panel-2.5.xrs:101
-#: src/hugin/xrc/main_tool.xrs:8
+#: src/hugin/xrc/lens_panel.xrs:39 src/hugin/xrc/main_tool.xrs:8
 msgid "Save"
 msgstr ""
 
 #: src/hugin/xrc/lens_panel.xrs:40 src/hugin/xrc/lens_panel-2.5.xrs:4
-#: src/hugin/xrc/lens_panel-2.5.xrs:102
 msgid "Save lens parameters to an file"
 msgstr ""
 
 #: src/hugin/xrc/lens_panel.xrs:41 src/hugin/xrc/lens_panel-2.5.xrs:5
-#: src/hugin/xrc/lens_panel-2.5.xrs:103
 msgid "Load EXIF"
 msgstr ""
 
 #: src/hugin/xrc/lens_panel.xrs:42 src/hugin/xrc/lens_panel-2.5.xrs:6
-#: src/hugin/xrc/lens_panel-2.5.xrs:104
 msgid "Try to read HFOV from the EXIF data"
 msgstr ""
 
 #: src/hugin/xrc/lens_panel.xrs:43 src/hugin/xrc/lens_panel-2.5.xrs:7
-#: src/hugin/xrc/lens_panel-2.5.xrs:105
 msgid "New Lens"
 msgstr ""
 
 #: src/hugin/xrc/lens_panel.xrs:44 src/hugin/xrc/lens_panel-2.5.xrs:8
-#: src/hugin/xrc/lens_panel-2.5.xrs:106
 msgid "Create a new lens and assign it to selected images"
 msgstr ""
 
-#: src/hugin/xrc/lens_panel.xrs:45 src/hugin/xrc/lens_panel-2.5.xrs:107
+#: src/hugin/xrc/lens_panel.xrs:45
 msgid "Change lens"
 msgstr ""
 
 #: src/hugin/xrc/lens_panel.xrs:46 src/hugin/xrc/lens_panel-2.5.xrs:10
-#: src/hugin/xrc/lens_panel-2.5.xrs:108
 msgid "change lens of selected images"
 msgstr ""
 
@@ -2120,82 +2065,38 @@
 msgid "Change lens..."
 msgstr ""
 
-#: src/hugin/xrc/lens_panel-2.5.xrs:27
+#: src/hugin/xrc/lens_panel-2.5.xrs:26
 msgid "Edit Parameters..."
 msgstr ""
 
-#: src/hugin/xrc/lens_panel-2.5.xrs:28 src/hugin/xrc/lens_panel-2.5.xrs:70
+#: src/hugin/xrc/lens_panel-2.5.xrs:27
 msgid "Radial Distortion"
 msgstr ""
 
-#: src/hugin/xrc/lens_panel-2.5.xrs:45 src/hugin/xrc/lens_panel-2.5.xrs:90
+#: src/hugin/xrc/lens_panel-2.5.xrs:44
 msgid "Exposure and Color"
 msgstr ""
 
-#: src/hugin/xrc/lens_panel-2.5.xrs:46
+#: src/hugin/xrc/lens_panel-2.5.xrs:45
 msgid "gain"
 msgstr ""
 
-#: src/hugin/xrc/lens_panel-2.5.xrs:47
+#: src/hugin/xrc/lens_panel-2.5.xrs:46
 msgid "offset"
 msgstr ""
 
-#: src/hugin/xrc/lens_panel-2.5.xrs:48
+#: src/hugin/xrc/lens_panel-2.5.xrs:47
 msgid "red (K0):"
 msgstr ""
 
-#: src/hugin/xrc/lens_panel-2.5.xrs:50
+#: src/hugin/xrc/lens_panel-2.5.xrs:49
 msgid "green (K1):"
 msgstr ""
 
-#: src/hugin/xrc/lens_panel-2.5.xrs:52
+#: src/hugin/xrc/lens_panel-2.5.xrs:51
 msgid "blue (K2):"
 msgstr ""
 
-#: src/hugin/xrc/lens_panel-2.5.xrs:68 src/hugin/xrc/vig_corr_dlg.xrs:2
-msgid "Correction"
-msgstr ""
-
-#: src/hugin/xrc/lens_panel-2.5.xrs:69
-msgid "Geometric"
-msgstr ""
-
-#: src/hugin/xrc/lens_panel-2.5.xrs:87
-msgid "Photometric"
-msgstr ""
-
-#: src/hugin/xrc/lens_panel-2.5.xrs:89
-msgid "Edit Parameters"
-msgstr ""
-
-#: src/hugin/xrc/lens_panel-2.5.xrs:91
-msgid "Channel:"
-msgstr ""
-
-#: src/hugin/xrc/lens_panel-2.5.xrs:92
-msgid "exposure"
-msgstr ""
-
-#: src/hugin/xrc/lens_panel-2.5.xrs:93
-msgid "brightness"
-msgstr ""
-
-#: src/hugin/xrc/lens_panel-2.5.xrs:94
-msgid "inherit"
-msgstr ""
-
-#: src/hugin/xrc/lens_panel-2.5.xrs:95
-msgid "red (K0)"
-msgstr ""
-
-#: src/hugin/xrc/lens_panel-2.5.xrs:96
-msgid "green (K1)"
-msgstr ""
-
-#: src/hugin/xrc/lens_panel-2.5.xrs:97
-msgid "blue (K2)"
-msgstr ""
-
 #: src/hugin/xrc/main_frame.xrs:1
 msgid "Hugin - Panorama Tools Frontend"
 msgstr ""
@@ -3069,6 +2970,10 @@
 msgid "Save cropped images, requires less disk space and memory."
 msgstr ""
 
+#: src/hugin/xrc/pref_dialog.xrs:83 src/hugin/xrc/run_optimizer_frame.xrs:2
+msgid "Apply"
+msgstr ""
+
 #: src/hugin/xrc/preview_frame.xrs:2 src/hugin/xrc/preview_frame.xrs:9
 msgid "Center"
 msgstr ""
@@ -3275,6 +3180,10 @@
 msgid "Vignetting correction"
 msgstr ""
 
+#: src/hugin/xrc/vig_corr_dlg.xrs:2
+msgid "Correction"
+msgstr ""
+
 #: src/hugin/xrc/vig_corr_dlg.xrs:3
 msgid "Flatfield"
 msgstr ""

Index: pl.po
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/po/pl.po,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- pl.po	20 Dec 2006 22:00:59 -0000	1.79
+++ pl.po	22 Dec 2006 13:09:09 -0000	1.80
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: hugin 0.6.1-CVS\n"
 "Report-Msgid-Bugs-To: pablo.dangelo@..."
-"POT-Creation-Date: 2006-12-20 22:45+0100\n"
+"POT-Creation-Date: 2006-12-22 14:06+0100\n"
 "PO-Revision-Date: 2006-08-17 18:50+0200\n"
 "Last-Translator: Jakub Bogusz <qboosh@..."
 "Language-Team: Polish <translation-team-pl@..."
@@ -17,26 +17,26 @@
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
[...1011 lines suppressed...]
+#~ msgstr "ekspozycja"
+
+#~ msgid "brightness"
+#~ msgstr "jasność"
+
+#~ msgid "inherit"
+#~ msgstr "odziedzicz"
+
+#~ msgid "red (K0)"
+#~ msgstr "czerwień (K0)"
+
+#~ msgid "green (K1)"
+#~ msgstr "zieleń (K1)"
+
+#~ msgid "blue (K2)"
+#~ msgstr "błękit (K2)"
+
 #~ msgid "Could not load dll"
 #~ msgstr "Nie można załadować biblioteki dll"
 

Index: ja.po
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/po/ja.po,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- ja.po	20 Dec 2006 22:00:59 -0000	1.31
+++ ja.po	22 Dec 2006 13:09:08 -0000	1.32
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Hugin 0.6\n"
 "Report-Msgid-Bugs-To: pablo.dangelo@..."
-"POT-Creation-Date: 2006-12-20 22:45+0100\n"
+"POT-Creation-Date: 2006-12-22 14:06+0100\n"
 "PO-Revision-Date: 2006-08-18 07:43+0100\n"
 "Last-Translator: Ippei UKAI <ippei_ukai@..."
 "Language-Team: N/A\n"
@@ -15,26 +15,26 @@
 "X-Poedit-Language: Japanese\n"
 "X-Poedit-Basepath: ../../../\n"
[...1011 lines suppressed...]
+#~ msgstr "露出"
+
+#~ msgid "brightness"
+#~ msgstr "明るさ"
+
+#~ msgid "inherit"
+#~ msgstr "受け継ぐ"
+
+#~ msgid "red (K0)"
+#~ msgstr "赤 (K0)"
+
+#~ msgid "green (K1)"
+#~ msgstr "緑 (K1)"
+
+#~ msgid "blue (K2)"
+#~ msgstr "青 (K2)"
+
 #~ msgid "Could not load dll"
 #~ msgstr "dllファイルを読み込めません"
 

Index: POTFILES.in
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/po/POTFILES.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- POTFILES.in	22 Dec 2006 12:31:37 -0000	1.16
+++ POTFILES.in	22 Dec 2006 13:09:06 -0000	1.17
@@ -9,7 +9,6 @@
 src/hugin/CPListFrame.cpp
 src/hugin/huginApp.cpp
 src/hugin/ImageCache.cpp
-src/hugin/ImageCenter.cpp
 src/hugin/ImagesList.cpp
 src/hugin/ImagesPanel.cpp
 src/hugin/LensPanel.cpp
@@ -39,7 +38,7 @@
 src/hugin/xrc/cp_editor_panel.xrs
 src/hugin/xrc/cp_editor_panel-2.5.xrs
 src/hugin/xrc/cp_list_frame.xrs
-src/hugin/xrc/crop_frame.xrs
+src/hugin/xrc/crop_panel.xrs
 src/hugin/xrc/edit_script_dialog.xrs
 src/hugin/xrc/edit_text.xrs
 src/hugin/xrc/help.xrs

Index: cs_CZ.po
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/po/cs_CZ.po,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- cs_CZ.po	20 Dec 2006 22:00:59 -0000	1.15
+++ cs_CZ.po	22 Dec 2006 13:09:06 -0000	1.16
@@ -26,7 +26,7 @@
 msgstr ""
 "Project-Id-Version: 0.1\n"
 "Report-Msgid-Bugs-To: pablo.dangelo@..."
-"POT-Creation-Date: 2006-12-20 22:45+0100\n"
+"POT-Creation-Date: 2006-12-22 14:06+0100\n"
 "PO-Revision-Date: 2006-02-10 12:53+0100\n"
 "Last-Translator: Jiří Slabý <jirislaby@..."
 "Language-Team: Jiří Slabý <jirislaby@..."
@@ -37,26 +37,26 @@
 "X-Poedit-Country: CZECH REPUBLIC\n"
 "X-Poedit-Bookmarks: -1,-1,-1,-1,-1,-1,-1,429,-1,-1\n"
[...1016 lines suppressed...]
+#~ msgstr "expozice"
+
+#~ msgid "brightness"
+#~ msgstr "jas"
+
+#~ msgid "inherit"
+#~ msgstr "zdědit"
+
+#~ msgid "red (K0)"
+#~ msgstr "červená (K0)"
+
+#~ msgid "green (K1)"
+#~ msgstr "zelená (K1)"
+
+#~ msgid "blue (K2)"
+#~ msgstr "modrá (K2)"
+
 #~ msgid "Could not load dll"
 #~ msgstr "Nelze nahrát dll"
 

Index: uk.po
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/po/uk.po,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- uk.po	20 Dec 2006 22:01:00 -0000	1.12
+++ uk.po	22 Dec 2006 13:09:09 -0000	1.13
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: Hugin 0.5\n"
 "Report-Msgid-Bugs-To: pablo.dangelo@..."
-"POT-Creation-Date: 2006-12-20 22:45+0100\n"
+"POT-Creation-Date: 2006-12-22 14:06+0100\n"
 "PO-Revision-Date: 2006-08-20 21:38+0200\n"
 "Last-Translator: Serhij Dubyk <dubyk@..."
 "Language-Team: \n"
@@ -20,26 +20,26 @@
 "X-Poedit-Country: UKRAINE\n"
 "X-Poedit-SourceCharset: utf-8\n"
[...1012 lines suppressed...]
+#~ msgstr "експозиція"
+
+#~ msgid "brightness"
+#~ msgstr "яскравість"
+
+#~ msgid "inherit"
+#~ msgstr "запозичувати"
+
+#~ msgid "red (K0)"
+#~ msgstr "червоний (K0)"
+
+#~ msgid "green (K1)"
+#~ msgstr "зелений (K1)"
+
+#~ msgid "blue (K2)"
+#~ msgstr "синій (K2)"
+
 #~ msgid "Could not load dll"
 #~ msgstr "Не вдалося завантажити dll"
 

Index: de.po
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/po/de.po,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -d -r1.107 -r1.108
--- de.po	20 Dec 2006 22:00:59 -0000	1.107
+++ de.po	22 Dec 2006 13:09:06 -0000	1.108
@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: pablo.dangelo@..."
-"POT-Creation-Date: 2006-12-20 22:45+0100\n"
-"PO-Revision-Date: 2006-12-20 22:58+0100\n"
+"POT-Creation-Date: 2006-12-22 14:06+0100\n"
+"PO-Revision-Date: 2006-12-22 14:05+0100\n"
 "Last-Translator: Pablo d'Angelo <pablo.dangelo@..."
 "Language-Team: deutsch <de@..."
 "MIME-Version: 1.0\n"
@@ -22,79 +22,95 @@
[...3136 lines suppressed...]
 #~ msgid "Ok"
 #~ msgstr "Ok"
+
 #~ msgid "hugin - FAQ"
 #~ msgstr "hugin - FAQ"
+
 #~ msgid "Set Crop"
 #~ msgstr "Zuschneiden"
+
 #~ msgid "Memory usage"
 #~ msgstr "Speicherverbrauch"
+
 #~ msgid "Approximation (f):"
 #~ msgstr "Approximation (f):"
 
@@ -3941,4 +3900,3 @@
 #~ msgstr ""
 #~ "Neustart von hugin\n"
 #~ "erforderlich"
-

Index: zh_CN.po
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/po/zh_CN.po,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- zh_CN.po	20 Dec 2006 22:01:00 -0000	1.22
+++ zh_CN.po	22 Dec 2006 13:09:09 -0000	1.23
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: Hugin v0.6.1\n"
 "Report-Msgid-Bugs-To: pablo.dangelo@..."
-"POT-Creation-Date: 2006-12-20 22:45+0100\n"
+"POT-Creation-Date: 2006-12-22 14:06+0100\n"
 "PO-Revision-Date: 2006-11-13 18:37+0800\n"
 "Last-Translator: Chinese Simplified <N/A>\n"
 "Language-Team: Chinese Simplified <N/A>\n"
@@ -11,76 +11,76 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Country: CHINA\n"
[...1008 lines suppressed...]
+#~ msgstr "曝光"
+
+#~ msgid "brightness"
+#~ msgstr "亮度"
+
+#~ msgid "inherit"
+#~ msgstr "继承"
+
+#~ msgid "red (K0)"
+#~ msgstr "红 (K0)"
+
+#~ msgid "green (K1)"
+#~ msgstr "绿 (K1)"
+
+#~ msgid "blue (K2)"
+#~ msgstr "蓝 (K2)"
+
 #~ msgid "Could not load dll"
 #~ msgstr "不能载入 dll"

Update of /cvsroot/hugin/hugin/src/include/hugin
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv7166/src/include/hugin

Modified Files:
	LensPanel.h 
Log Message:
more cleanup + updated strings


Index: LensPanel.h
===================================================================
RCS file: /cvsroot/hugin/hugin/src/include/hugin/LensPanel.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- LensPanel.h	17 Dec 2006 21:11:57 -0000	1.41
+++ LensPanel.h	22 Dec 2006 13:09:10 -0000	1.42
@@ -112,8 +112,6 @@
      */
     void OnNewLens(wxCommandEvent & e);
 
-    void OnCrop ( wxCommandEvent & e );
-
     /** catches changes to the list selection */
     void ListSelectionChanged(wxListEvent& e);

Update of /cvsroot/hugin/hugin/src/hugin/xrc
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv7166/src/hugin/xrc

Modified Files:
	Makefile.am 
Log Message:
more cleanup + updated strings


Index: Makefile.am
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/xrc/Makefile.am,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- Makefile.am	22 Dec 2006 12:31:37 -0000	1.17
+++ Makefile.am	22 Dec 2006 13:09:10 -0000	1.18
@@ -17,7 +17,7 @@
             optimize_panel.xrc pano_panel.xrc pref_dialog.xrc preview_frame.xrc ptstitcher_panel.xrc run_optimizer_frame.xrc run_stitcher_frame.xrc \
             cp_editor_panel-2.5.xrc images_panel-2.5.xrc lens_panel-2.5.xrc main_frame-2.5.xrc optimize_panel-2.5.xrc pano_panel-2.5.xrc vig_corr_dlg.xrc assistant_panel.xrc
 
-XRS_FILES = about.xrs anchor_orientation.xrs cp_editor_panel.xrs cp_list_frame.xrs crop_panel.xrc \
+XRS_FILES = about.xrs anchor_orientation.xrs cp_editor_panel.xrs cp_list_frame.xrs crop_panel.xrs \
             edit_script_dialog.xrs edit_text.xrs help.xrs \
             images_panel.xrs keyboard_help.xrs lens_panel.xrs main_frame.xrs main_menubar.xrs main_menu.xrs main_tool.xrs nona_panel.xrs \
             optimize_panel.xrs pano_panel.xrs pref_dialog.xrs preview_frame.xrs ptstitcher_panel.xrs run_optimizer_frame.xrs run_stitcher_frame.xrs \

Update of /cvsroot/hugin/hugin/src/hugin
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv29134/src/hugin

Modified Files:
	ImagesPanel.cpp 
Removed Files:
	ImageOrientationFrame.cpp ImageOrientationPanel.cpp 
Log Message:
removed buggy image anchor dialog, since the preview windows has improved a lot


--- ImageOrientationFrame.cpp DELETED ---

Index: ImagesPanel.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/ImagesPanel.cpp,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -d -r1.100 -r1.101
--- ImagesPanel.cpp	21 Dec 2006 22:50:58 -0000	1.100
+++ ImagesPanel.cpp	22 Dec 2006 12:42:36 -0000	1.101
@@ -42,9 +42,7 @@
 #include "hugin/ImagesList.h"
 #include "hugin/MainFrame.h"
 #include "hugin/huginApp.h"
-#include "hugin/ImageOrientationFrame.h"
 #include "hugin/AutoCtrlPointCreator.h"
-#include "hugin/ImageCenter.h"
 #include "hugin/config_defaults.h"
 
 using namespace PT;
@@ -376,16 +374,6 @@
     }
 }
 
-void ImagesPanel::OnSelectAnchorPosition(wxCommandEvent & e)
-{
-    // first, change anchor
-    OnOptAnchorChanged(e);
-
-    // open a frame to show the image
-    ImageOrientationFrame * t = new ImageOrientationFrame(this, pano);
-    t->Show();
-}
-
 void ImagesPanel::OnColorAnchorChanged(wxCommandEvent &e )
 {
     const UIntSet & sel = images_list->GetSelected();

--- ImageOrientationPanel.cpp DELETED ---

Update of /cvsroot/hugin/hugin/src/include/hugin
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv29134/src/include/hugin

Modified Files:
	ImagesPanel.h 
Removed Files:
	ImageOrientationFrame.h ImageOrientationPanel.h 
Log Message:
removed buggy image anchor dialog, since the preview windows has improved a lot


--- ImageOrientationPanel.h DELETED ---

--- ImageOrientationFrame.h DELETED ---

Index: ImagesPanel.h
===================================================================
RCS file: /cvsroot/hugin/hugin/src/include/hugin/ImagesPanel.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- ImagesPanel.h	20 Dec 2006 19:41:30 -0000	1.40
+++ ImagesPanel.h	22 Dec 2006 12:42:36 -0000	1.41
@@ -96,7 +96,6 @@
 
     void OnOptAnchorChanged(wxCommandEvent & e);
     void OnColorAnchorChanged(wxCommandEvent &e );
-    void OnSelectAnchorPosition(wxCommandEvent & e);
 
     void OnRemoveCtrlPoints(wxCommandEvent & e);
     void OnResetImagePositions(wxCommandEvent & e);

Update of /cvsroot/hugin/hugin/src/hugin/po
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv24749/src/hugin/po

Modified Files:
	POTFILES.in 
Log Message:
created crop panel, removed some obselete stuff


Index: POTFILES.in
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/po/POTFILES.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- POTFILES.in	17 Dec 2006 21:11:55 -0000	1.15
+++ POTFILES.in	22 Dec 2006 12:31:37 -0000	1.16
@@ -10,8 +10,6 @@
 src/hugin/huginApp.cpp
 src/hugin/ImageCache.cpp
 src/hugin/ImageCenter.cpp
-src/hugin/ImageOrientationPanel.cpp
-src/hugin/ImageOrientationFrame.cpp
 src/hugin/ImagesList.cpp
 src/hugin/ImagesPanel.cpp
 src/hugin/LensPanel.cpp
@@ -41,10 +39,10 @@
 src/hugin/xrc/cp_editor_panel.xrs
 src/hugin/xrc/cp_editor_panel-2.5.xrs
 src/hugin/xrc/cp_list_frame.xrs
+src/hugin/xrc/crop_frame.xrs
 src/hugin/xrc/edit_script_dialog.xrs
 src/hugin/xrc/edit_text.xrs
 src/hugin/xrc/help.xrs
-src/hugin/xrc/image_center.xrs
 src/hugin/xrc/images_panel.xrs
 src/hugin/xrc/images_panel-2.5.xrs
 src/hugin/xrc/keyboard_help.xrs

Update of /cvsroot/hugin/hugin/src/include/PT
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv24749/src/include/PT

Modified Files:
	PanoCommand.h 
Log Message:
created crop panel, removed some obselete stuff


Index: PanoCommand.h
===================================================================
RCS file: /cvsroot/hugin/hugin/src/include/PT/PanoCommand.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- PanoCommand.h	20 Dec 2006 00:42:16 -0000	1.32
+++ PanoCommand.h	22 Dec 2006 12:31:38 -0000	1.33
@@ -875,6 +875,43 @@
         UIntSet imgNrs;
     };
 
+
+    //=========================================================================
+    //=========================================================================
+
+    /** set image options for a set of images.
+     *  just sets the @p options given for all images in @p imgs
+     */
+    class UpdateImageOptionsCmd : public PanoCommand
+    {
+        public:
+            UpdateImageOptionsCmd(Panorama & p, std::vector<ImageOptions> opts, UIntSet imgs)
+            : PanoCommand(p), options(opts), imgNrs(imgs)
+            {
+                assert(opts.size() == imgs.size());
+            };
+
+            virtual void execute()
+            {
+                PanoCommand::execute();
+                int i=0;
+                for (UIntSet::iterator it = imgNrs.begin();
+                     it != imgNrs.end(); ++it)
+                {
+                    pano.setImageOptions(*it, options[i]);
+                    i++;
+                }
+                pano.changeFinished();
+            }
+            virtual std::string getName() const
+            {
+                return "set image options";
+            }
+        private:
+            std::vector<ImageOptions> options;
+            UIntSet imgNrs;
+    };
+
     //=========================================================================
     //=========================================================================

Update of /cvsroot/hugin/hugin/src/hugin
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv24749/src/hugin

Modified Files:
	AssistantPanel.cpp ImagesList.cpp LensPanel.cpp MainFrame.cpp 
	Makefile.am huginApp.cpp 
Removed Files:
	ImageCenter.cpp 
Log Message:
created crop panel, removed some obselete stuff


--- ImageCenter.cpp DELETED ---

Index: AssistantPanel.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/AssistantPanel.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- AssistantPanel.cpp	21 Dec 2006 08:31:19 -0000	1.7
+++ AssistantPanel.cpp	22 Dec 2006 12:31:37 -0000	1.8
@@ -197,18 +197,9 @@
 
 void AssistantPanel::OnSize( wxSizeEvent & e )
 {
-#ifdef USE_WX253
-    int winWidth, winHeight;
-    GetClientSize(&winWidth, &winHeight);
-    XRCCTRL(*this, "assistant_panel", wxPanel)->SetSize (winWidth, winHeight);
-    DEBUG_INFO( "assistant panel: " << winWidth <<"x"<< winHeight );
-    DEBUG_INFO( "assistant controls: " << winWidth <<"x"<< winHeight );
-    m_panel->SetSize(winWidth, winHeight);
-#else
     wxSize new_size = GetSize();
     XRCCTRL(*this, "assistant_panel", wxPanel)->SetSize ( new_size );
     DEBUG_INFO( "assistant panel: " << new_size.GetWidth() <<"x"<< new_size.GetHeight()  );
-#endif
 
     if (m_restoreLayoutOnResize) {
         m_restoreLayoutOnResize = false;

Index: huginApp.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/huginApp.cpp,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -d -r1.100 -r1.101
--- huginApp.cpp	21 Dec 2006 08:31:20 -0000	1.100
+++ huginApp.cpp	22 Dec 2006 12:31:37 -0000	1.101
@@ -280,7 +280,7 @@
         return false;
     }
 
-    wxXmlResource::Get()->Load(m_xrcPrefix + wxT("image_center.xrc"));
+    wxXmlResource::Get()->Load(m_xrcPrefix + wxT("crop_panel.xrc"));
     wxXmlResource::Get()->Load(m_xrcPrefix + wxT("nona_panel.xrc"));
     wxXmlResource::Get()->Load(m_xrcPrefix + wxT("ptstitcher_panel.xrc"));
     wxXmlResource::Get()->Load(m_xrcPrefix + wxT("cp_list_frame.xrc"));

Index: Makefile.am
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/Makefile.am,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- Makefile.am	17 Dec 2006 21:51:08 -0000	1.28
+++ Makefile.am	22 Dec 2006 12:31:37 -0000	1.29
@@ -14,8 +14,8 @@
 
 STD_SRC     = huginApp.cpp ImagesList.cpp AutoCtrlPointCreator.cpp MainFrame.cpp CPImageCtrl.cpp CPEditorPanel.cpp LensPanel.cpp \
 	      ImagesPanel.cpp CommandHistory.cpp PanoPanel.cpp NonaStitcherPanel.cpp PTStitcherPanel.cpp PreviewFrame.cpp \
-	      PreviewPanel.cpp ImageCenter.cpp OptimizePanel.cpp RunStitcherFrame.cpp CPListFrame.cpp \
-	      TextKillFocusHandler.cpp ImageOrientationPanel.cpp ImageOrientationFrame.cpp PanoDruid.cpp \
+	      PreviewPanel.cpp CropPanel.cpp OptimizePanel.cpp RunStitcherFrame.cpp CPListFrame.cpp \
+	      TextKillFocusHandler.cpp PanoDruid.cpp \
 	      CPZoomDisplayPanel.cpp CPFineTuneFrame.cpp \
 	      PreferencesDialog.cpp LocalizedFileTipProvider.cpp VigCorrDialog.cpp \
 	      wxPanoCommand.cpp MyExternalCmdExecDialog.cpp UniversalCursor.cpp \

Index: MainFrame.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/MainFrame.cpp,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -d -r1.185 -r1.186
--- MainFrame.cpp	21 Dec 2006 08:31:19 -0000	1.185
+++ MainFrame.cpp	22 Dec 2006 12:31:37 -0000	1.186
@@ -42,6 +42,7 @@
 #include "hugin/AssistantPanel.h"
 #include "hugin/ImagesPanel.h"
 #include "hugin/LensPanel.h"
+#include "hugin/CropPanel.h"
 #include "hugin/OptimizePanel.h"
 #include "hugin/PreviewFrame.h"
 #include "hugin/huginApp.h"
@@ -245,6 +246,11 @@
                lens_panel );
 
 
+    // the crop panel
+    crop_panel = new CropPanel( this, &pano);
+    // show the crop_panel
+    wxXmlResource::Get()->AttachUnknownControl (wxT("crop_panel_unknown"), crop_panel );
+
     // the pano_panel
     // The xrc resources are loaded by the class itself.
     DEBUG_TRACE("");
@@ -504,7 +510,7 @@
 void MainFrame::OnSaveProjectAs(wxCommandEvent & e)
 {
     DEBUG_TRACE("");
-    wxString scriptName = m_filename;
+    wxString scriptName;
     if (m_filename == wxT("")) {
         scriptName = getDefaultProjectName(pano) + wxT(".pto");
     }
@@ -1196,7 +1202,7 @@
 void MainFrame::ShowCtrlPoint(unsigned int cpNr)
 {
     DEBUG_DEBUG("Showing control point " << cpNr);
-    m_notebook->SetSelection(3);
+    m_notebook->SetSelection(4);
     cpe->ShowControlPoint(cpNr);
 }
 
@@ -1294,6 +1300,7 @@
     m_doRestoreLayout = true;
     cpe->RestoreLayoutOnNextResize();
     lens_panel->RestoreLayoutOnNextResize();
+    //crop_panel->RestoreLayoutOnNextResize();
     images_panel->RestoreLayoutOnNextResize();
 }
 

Index: LensPanel.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/LensPanel.cpp,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -d -r1.100 -r1.101
--- LensPanel.cpp	17 Dec 2006 21:11:55 -0000	1.100
+++ LensPanel.cpp	22 Dec 2006 12:31:37 -0000	1.101
@@ -42,7 +42,7 @@
 #include "hugin/ImageCache.h"
 #include "hugin/CPEditorPanel.h"
 #include "hugin/ImagesList.h"
-#include "hugin/ImageCenter.h"
+//#include "hugin/ImageCenter.h"
 #include "hugin/ImagesPanel.h"
 #include "hugin/MainFrame.h"
 #include "hugin/huginApp.h"
@@ -325,8 +325,6 @@
         }
     }
     // we need to do something if the image we are editing has changed.
-// DGSW FIXME - Unreferenced
-//	bool update=false;
     UIntSet intersection;
 
     std::set_intersection(m_selectedLenses.begin(), m_selectedLenses.end(),
@@ -927,6 +925,7 @@
 
 void LensPanel::OnCrop ( wxCommandEvent & e )
 {
+#if 0
 //    wxLogError(_("temporarily disabled"));
     const UIntSet & selectedImages = images_list->GetSelected();
     if (images_list->GetSelected().size() > 0) {
@@ -991,6 +990,7 @@
         }
     }
     DEBUG_TRACE ("")
+#endif
 }
 
 

Index: ImagesList.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/ImagesList.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- ImagesList.cpp	14 Dec 2006 07:45:15 -0000	1.38
+++ ImagesList.cpp	22 Dec 2006 12:31:37 -0000	1.39
@@ -419,3 +419,33 @@
     }
     SetItem(imgNr, 12, cropstr);
 }
+
+ImagesListCrop::ImagesListCrop(wxWindow * parent, Panorama * pano)
+    : ImagesList(parent, pano)
+{
+    m_configClassName = wxT("/ImagesListCrop");
+
+    InsertColumn(1, _("Crop"), wxLIST_FORMAT_RIGHT,100);
+
+    //get saved width
+    for ( int j=0; j < GetColumnCount() ; j++ )
+    {
+        // -1 is auto
+        int width = wxConfigBase::Get()->Read(wxString::Format(m_configClassName+wxT("/ColumnWidth%d"), j ), -1);
+        if(width != -1)
+            SetColumnWidth(j, width);
+    }
+}
+
+void ImagesListCrop::UpdateItem(unsigned int imgNr)
+{
+    const PanoImage & img = pano.getImage(imgNr);
+    wxFileName fn(wxString (img.getFilename().c_str(), *wxConvCurrent));
+
+    wxString cropstr(wxT("-"));
+    if ( img.getOptions().docrop ) {
+        vigra::Rect2D c = img.getOptions().cropRect;
+        cropstr.Printf(wxT("%d,%d,%d,%d"), c.left(), c.right(), c.top(), c.bottom());
+    }
+    SetItem(imgNr, 1, cropstr);
+}

Update of /cvsroot/hugin/hugin/src/hugin/xrc
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv24749/src/hugin/xrc

Modified Files:
	Makefile.am lens_panel-2.5.xrc main_frame-2.5.xrc 
Added Files:
	crop_panel.xrc 
Removed Files:
	image_center.xrc 
Log Message:
created crop panel, removed some obselete stuff


--- NEW FILE: crop_panel.xrc ---
<?xml version="1.0" encoding="ISO-8859-1"?>
<resource>
  <object class="wxPanel" name="crop_panel">
    <style>wxTAB_TRAVERSAL</style>
    <object class="wxBoxSizer">
      <orient>wxVERTICAL</orient>
      <object class="sizeritem">
        <object class="wxBoxSizer">
          <orient>wxHORIZONTAL</orient>
          <object class="sizeritem">
            <object class="wxBoxSizer">
              <orient>wxVERTICAL</orient>
              <object class="spacer">
                    
                    
                    
                    
                
                
                <size>0,12</size>
                  </object>
              <object class="sizeritem">
                <object class="wxFlexGridSizer">
                  <cols>2</cols>
                  <rows>2</rows>
                  <object class="sizeritem">
                    <object class="wxStaticText">
                      
                      <label>Left:</label>
                    </object>
                  
                    <flag>wxALIGN_RIGHT</flag>
                  </object>
                  <object class="sizeritem">
                    <object class="wxTextCtrl" name="crop_left_text">
                      
                      <size>50,-1</size>
                      
                      <style>wxTE_PROCESS_ENTER</style>
                    </object>
                  </object>
                  <object class="sizeritem">
                    <object class="wxStaticText" name="">
                      
                      <label>Top:</label>
                    </object>
                  
                    <flag>wxALIGN_RIGHT</flag>
                  </object>
                  <object class="sizeritem">
                    <object class="wxTextCtrl" name="crop_top_text">
                      
                      <size>50,-1</size>
                      
                      <style>wxTE_PROCESS_ENTER</style>
                    </object>
                  </object>
                  <object class="sizeritem">
                    <object class="wxStaticText">
                      
                      <label>Right:</label>
                    </object>
                  
                    <flag>wxALIGN_RIGHT</flag>
                  </object>
                  <object class="sizeritem">
                    <object class="wxTextCtrl" name="crop_right_text">
                      
                      <size>50,-1</size>
                      
                      <style>wxTE_PROCESS_ENTER</style>
                    </object>
                  </object>
                  <object class="sizeritem">
                    <object class="wxStaticText">
                      
                      <label>Bottom:</label>
                    </object>
                  
                    <flag>wxALIGN_RIGHT</flag>
                  </object>
                  <vgap>3</vgap>
                  <hgap>6</hgap>
                  <object class="sizeritem">
                    <object class="wxTextCtrl" name="crop_bottom_text">
                      
                      <size>50,-1</size>
                      
                      <style>wxTE_PROCESS_ENTER</style>
                    </object>
                  </object>
                </object>
                
                <flag>wxEXPAND</flag>
              </object>
              <object class="spacer">
                    
                    
                    
                    
                
                
                <size>0,12</size>
                  </object>
              <object class="sizeritem">
                <object class="wxCheckBox" name="crop_autocenter_cb">
                  
                  <label>Always center Crop on d,e</label>
                </object>
              </object>
              <object class="sizeritem">
                <object class="wxButton" name="crop_reset_button">
                      
                      
                      
                      
                  
                  
                  <label>Reset</label>
                      
                      
                      
                      
                  
                  
                  <tooltip>Load lens parameters from a file</tooltip>
                    </object>
                    
                    
                    
                    
                
                
                <flag>wxTOP</flag>
                    
                    
                    
                    
                
                
                <border>5</border>
                  </object>
              <object class="spacer">
                    
                    
                    
                    
                
                
                <size>0,12</size>
                  </object>
              <object class="sizeritem">
                <object class="unknown" name="crop_list_unknown"/>
                
                <option>1</option>
                
                <flag>wxEXPAND</flag>
              </object>
            </object>
                
                
                
                
            
            
            <flag>wxALL|wxEXPAND</flag>
                
                
                
                
            
            
            <border>6</border>
              </object>
          <object class="sizeritem">
            <object class="unknown" name="crop_edit_unknown"/>
                
                
                
                
            
            
            <option>1</option>
                
                
                
                
            
            
            <flag>wxTOP|wxBOTTOM|wxRIGHT|wxEXPAND</flag>
              
            
            <border>6</border>
          </object>
        </object>
        
        
        <option>1</option>
        
        
        <flag>wxEXPAND</flag>
      </object>
    </object>
  </object>
</resource>
Index: Makefile.am
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/xrc/Makefile.am,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Makefile.am	17 Dec 2006 10:49:50 -0000	1.16
+++ Makefile.am	22 Dec 2006 12:31:37 -0000	1.17
@@ -11,12 +11,14 @@
 xrcdir = $(datadir)/hugin/xrc
 endif
 
-XRC_FILES = about.xrc anchor_orientation.xrc cp_editor_panel.xrc cp_list_frame.xrc edit_script_dialog.xrc edit_text.xrc help.xrc image_center.xrc \
+XRC_FILES = about.xrc anchor_orientation.xrc cp_editor_panel.xrc cp_list_frame.xrc crop_panel.xrc \
+            edit_script_dialog.xrc edit_text.xrc help.xrc \
             images_panel.xrc keyboard_help.xrc lens_panel.xrc main_frame.xrc main_menubar.xrc main_menu.xrc main_tool.xrc nona_panel.xrc \
             optimize_panel.xrc pano_panel.xrc pref_dialog.xrc preview_frame.xrc ptstitcher_panel.xrc run_optimizer_frame.xrc run_stitcher_frame.xrc \
             cp_editor_panel-2.5.xrc images_panel-2.5.xrc lens_panel-2.5.xrc main_frame-2.5.xrc optimize_panel-2.5.xrc pano_panel-2.5.xrc vig_corr_dlg.xrc assistant_panel.xrc
 
-XRS_FILES = about.xrs anchor_orientation.xrs cp_editor_panel.xrs cp_list_frame.xrs edit_script_dialog.xrs edit_text.xrs help.xrs image_center.xrs \
+XRS_FILES = about.xrs anchor_orientation.xrs cp_editor_panel.xrs cp_list_frame.xrs crop_panel.xrc \
+            edit_script_dialog.xrs edit_text.xrs help.xrs \
             images_panel.xrs keyboard_help.xrs lens_panel.xrs main_frame.xrs main_menubar.xrs main_menu.xrs main_tool.xrs nona_panel.xrs \
             optimize_panel.xrs pano_panel.xrs pref_dialog.xrs preview_frame.xrs ptstitcher_panel.xrs run_optimizer_frame.xrs run_stitcher_frame.xrs \
             cp_editor_panel-2.5.xrs images_panel-2.5.xrs lens_panel-2.5.xrs main_frame-2.5.xrs optimize_panel-2.5.xrs pano_panel-2.5.xrs vig_corr_dlg.xrs assistant_panel.xrs

Index: lens_panel-2.5.xrc
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/xrc/lens_panel-2.5.xrc,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- lens_panel-2.5.xrc	6 Aug 2006 14:51:25 -0000	1.21
+++ lens_panel-2.5.xrc	22 Dec 2006 12:31:37 -0000	1.22
@@ -16,10 +16,12 @@
                 
                 
                 
+                
                 <option>1</option>
                 
                 
                 
+                
                 <flag>wxEXPAND</flag>
               </object>
[...2811 lines suppressed...]
-            
-            <flag>wxLEFT|wxRIGHT</flag>
-            
-            
-            
-            <border>12</border>
           </object>
         </object>
         
         
         
-        <flag>wxALL</flag>
-        
-        
         
-        <border>6</border>
+        <flag>wxEXPAND</flag>
       </object>
     </object>
   </object>

--- image_center.xrc DELETED ---

Index: main_frame-2.5.xrc
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/xrc/main_frame-2.5.xrc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- main_frame-2.5.xrc	17 Dec 2006 10:49:50 -0000	1.3
+++ main_frame-2.5.xrc	22 Dec 2006 12:31:38 -0000	1.4
@@ -30,6 +30,10 @@
             <object class="unknown" name="lens_panel_unknown"/>
           </object>
           <object class="notebookpage">
+            <label>Crop</label>
+            <object class="unknown" name="crop_panel_unknown"/>
+          </object>
+          <object class="notebookpage">
             <label>Control Points</label>
             <object class="unknown" name="cp_editor_panel_unknown"/>
           </object>

Update of /cvsroot/hugin/hugin/src/include/hugin
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv24749/src/include/hugin

Modified Files:
	ImagesList.h MainFrame.h 
Removed Files:
	ImageCenter.h 
Log Message:
created crop panel, removed some obselete stuff


Index: MainFrame.h
===================================================================
RCS file: /cvsroot/hugin/hugin/src/include/hugin/MainFrame.h,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- MainFrame.h	21 Dec 2006 08:31:20 -0000	1.53
+++ MainFrame.h	22 Dec 2006 12:31:38 -0000	1.54
@@ -42,6 +42,7 @@
 class LensPanel;
 class ImgPreview;
 class ImagesPanel;
+class CropPanel;
 class PanoPanel;
 class PreviewFrame;
 class CPListFrame;
@@ -181,6 +182,7 @@
     AssistantPanel* assistant_panel;
     ImagesPanel* images_panel;
     LensPanel* lens_panel;
+    CropPanel* crop_panel;
     CPEditorPanel * cpe;
     OptimizePanel * opt_panel;
     PanoPanel * pano_panel;

Index: ImagesList.h
===================================================================
RCS file: /cvsroot/hugin/hugin/src/include/hugin/ImagesList.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ImagesList.h	10 Jun 2005 23:12:21 -0000	1.8
+++ ImagesList.h	22 Dec 2006 12:31:38 -0000	1.9
@@ -154,6 +154,19 @@
 
 };
 
+/** specialized to display the crop aspect of images
+ */
+class ImagesListCrop : public ImagesList
+{
+public:
+    ImagesListCrop(wxWindow * parent, Panorama * pano);
+
+    /** update the information in an already existing list item
+     */
+    virtual void UpdateItem(unsigned int imgNr);
+
+
+};
 
 
 #endif // _LIST_H

--- ImageCenter.h DELETED ---

Update of /cvsroot/hugin/hugin/src/Panorama
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv24749/src/Panorama

Modified Files:
	PanoImage.cpp 
Log Message:
created crop panel, removed some obselete stuff


Index: PanoImage.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/Panorama/PanoImage.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- PanoImage.cpp	10 Aug 2006 15:00:55 -0000	1.18
+++ PanoImage.cpp	22 Dec 2006 12:31:36 -0000	1.19
@@ -129,6 +129,7 @@
         m_shear == other.m_shear  &&
 
         m_crop == other.m_crop  &&
+        m_cropRect == other.m_cropRect &&
 
         m_vigCorrMode == other.m_vigCorrMode  &&
         m_radialVigCorrCoeff == other.m_radialVigCorrCoeff &&

Update of /cvsroot/hugin/hugin/src/hugin
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv22806/hugin

Added Files:
	CropPanel.cpp 
Log Message:
moved crop to crop panel, fixed strange behaviour of previous crop dialog


--- NEW FILE: CropPanel.cpp ---
// -*- c-basic-offset: 4 -*-

/** @file ImagesPanel.cpp
 *
 *  @brief implementation of ImagesCenter Class
 *
 *  @author Pablo d'Angelo <pablo.dangelo@...>
 *
 *  $Id: CropPanel.cpp,v 1.1 2006/12/22 12:26:29 dangelo Exp $
 *
 *  This program 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
 *  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
 *
 */

#include <config.h>
#include "panoinc_WX.h"

#include "panoinc.h"

#include "hugin/huginApp.h"
#include "hugin/CommandHistory.h"
#include "hugin/ImageCache.h"
#include "hugin/CropPanel.h"
#include "hugin/ImagesList.h"
#include "hugin/TextKillFocusHandler.h"

using namespace PT;
using namespace utils;
using namespace std;
using namespace vigra;

/*
#define ID_EDIT_LEFT    (wxID_HIGHEST + 1)
#define ID_EDIT_RIGHT   (wxID_HIGHEST + 2)
#define ID_EDIT_TOP     (wxID_HIGHEST + 3)
#define ID_EDIT_BOTTOM  (wxID_HIGHEST + 4)
#define ID_BUT_RESET    (wxID_HIGHEST + 5)
#define ID_CB_AUTOCENTER (wxID_HIGHEST + 6)
*/

BEGIN_EVENT_TABLE(CropPanel, wxPanel)
    EVT_SIZE   ( CropPanel::OnSize )
    EVT_LIST_ITEM_SELECTED( XRCID("crop_list_unknown"), CropPanel::ListSelectionChanged )
    EVT_LIST_ITEM_DESELECTED( XRCID("crop_list_unknown"), CropPanel::ListSelectionChanged )
    EVT_TEXT_ENTER (XRCID("crop_left_text") ,CropPanel::OnSetLeft )
    EVT_TEXT_ENTER (XRCID("crop_right_text") ,CropPanel::OnSetRight )
    EVT_TEXT_ENTER (XRCID("crop_top_text") ,CropPanel::OnSetTop )
    EVT_TEXT_ENTER (XRCID("crop_bottom_text") ,CropPanel::OnSetBottom )
    EVT_BUTTON ( XRCID("crop_reset_button") , CropPanel::OnResetButton )
    EVT_CHECKBOX( XRCID("crop_autocenter_cb") , CropPanel::OnAutoCenter)
END_EVENT_TABLE()

// Define a constructor for my canvas
CropPanel::CropPanel(wxWindow *parent, Panorama * pano)
  : wxPanel (parent, -1, wxDefaultPosition, wxDefaultSize, wxEXPAND|wxGROW),
    m_pano(*pano), m_circular(false)
{
    DEBUG_TRACE("");

    DEBUG_TRACE("ctor");
    m_pano.addObserver(this);

    wxXmlResource::Get()->LoadPanel (this, wxT("crop_panel"));

    m_imagesList = new ImagesListCrop (parent, pano);
    wxXmlResource::Get()->AttachUnknownControl (
            wxT("crop_list_unknown"),
            m_imagesList );


    m_Canvas = new CenterCanvas (this,this);
    wxXmlResource::Get()->AttachUnknownControl (
            wxT("crop_edit_unknown"),
            m_Canvas);

    // get all other widgets

    m_left_textctrl = XRCCTRL(*this,"crop_left_text", wxTextCtrl);
    DEBUG_ASSERT(m_left_textctrl);
    m_left_textctrl->PushEventHandler(new TextKillFocusHandler(this));

    m_top_textctrl = XRCCTRL(*this,"crop_top_text", wxTextCtrl);
    DEBUG_ASSERT(m_top_textctrl);
    m_top_textctrl->PushEventHandler(new TextKillFocusHandler(this));

    m_right_textctrl = XRCCTRL(*this,"crop_right_text", wxTextCtrl);
    DEBUG_ASSERT(m_right_textctrl);
    m_right_textctrl->PushEventHandler(new TextKillFocusHandler(this));

    m_bottom_textctrl = XRCCTRL(*this,"crop_bottom_text", wxTextCtrl);
    DEBUG_ASSERT(m_bottom_textctrl);
    m_bottom_textctrl->PushEventHandler(new TextKillFocusHandler(this));

    m_autocenter_cb = XRCCTRL(*this,"crop_autocenter_cb", wxCheckBox);
    DEBUG_ASSERT(m_autocenter_cb);

    m_Canvas->Show();
    DEBUG_TRACE("");
}

CropPanel::~CropPanel(void)
{
    DEBUG_TRACE("");
    m_left_textctrl->PopEventHandler(true);
    m_right_textctrl->PopEventHandler(true);
    m_top_textctrl->PopEventHandler(true);
    m_bottom_textctrl->PopEventHandler(true);
}

// We need to override the default handling of size events because the
// sizers set the virtual size but not the actual size. We reverse
// the standard handling and fit the child to the parent rather than
// fitting the parent around the child

void CropPanel::OnSize( wxSizeEvent & e )
{
    wxSize new_size = GetSize();
    XRCCTRL(*this, "crop_panel", wxPanel)->SetSize ( new_size );
    DEBUG_INFO( "" << new_size.GetWidth() <<"x"<< new_size.GetHeight()  );
    /*
    if (m_restoreLayoutOnResize) {
        m_restoreLayoutOnResize = false;
        RestoreLayout();
    }
    */
}


void CropPanel::ListSelectionChanged(wxListEvent& e)
{
    DEBUG_TRACE(e.GetIndex());
    m_selectedImages = m_imagesList->GetSelected();
    DEBUG_DEBUG("selected Images: " << m_selectedImages.size());
    bool hasImage = (m_selectedImages.size() > 0);
    m_left_textctrl->Enable(hasImage);
    m_top_textctrl->Enable(hasImage);
    m_bottom_textctrl->Enable(hasImage);
    m_right_textctrl->Enable(hasImage);
    if (hasImage) {
        // show first image.
        int imgNr = *(m_selectedImages.begin());
        Pano2Display(imgNr);
    } else {
        // TODO: set an empty display
    }
    // else do some stuff...
}

void CropPanel::panoramaImagesChanged (PT::Panorama &pano, const PT::UIntSet & imgNrs)
{
    if (m_selectedImages.size() > 0) {
        int imgNr = *(m_selectedImages.begin());
        if (set_contains(imgNrs, imgNr )) {
            Pano2Display(imgNr);
        }
    }
}

// transfer panorama state to our state
void CropPanel::Pano2Display(int imgNr)
{
    const PanoImage & img = m_pano.getImage(imgNr);

    std::string newImgFile = img.getFilename();
    // check if we need to display a new image
    if (m_currentImageFile != newImgFile) {
        wxImage * wximg = ImageCache::getInstance().getImage(newImgFile)->image;
        m_Canvas->SetImage(*wximg);
        m_currentImageFile == newImgFile;
    }
    m_imgOpts = img.getOptions();

    VariableMap vars = m_pano.getImageVariables(imgNr);
    int dx = roundi(map_get(vars,"d").getValue());
    int dy = roundi(map_get(vars,"e").getValue());
    m_center = vigra::Point2D(img.getWidth()/2 + dx, img.getHeight()/2 + dy);
    m_circular= m_pano.getLens(img.getLensNr()).getProjection() == PT::Lens::CIRCULAR_FISHEYE;

    UpdateDisplay();
}

// transfer our state to panorama
void CropPanel::Display2Pano()
{
    // set crop image options.
    vector<ImageOptions> opts;
    for (UIntSet::iterator it = m_selectedImages.begin();
         it != m_selectedImages.end(); ++it)
    {
        const PanoImage & img = m_pano.getImage(*it);
        ImageOptions opt = img.getOptions();
        opt.cropRect = m_imgOpts.cropRect;
        opt.autoCenterCrop = m_imgOpts.autoCenterCrop;
        opt.docrop = ! (opt.cropRect.left() == 0 && opt.cropRect.top() == 0 
                && opt.cropRect.right() == img.getWidth() && opt.cropRect.bottom() == img.getHeight());
        opts.push_back(opt);
    }

    GlobalCmdHist::getInstance().addCommand(
            new PT::UpdateImageOptionsCmd(m_pano, opts, m_selectedImages)
                                           );
}

// redraw display with new information
void CropPanel::UpdateDisplay()
{
    DEBUG_TRACE("")
    m_autocenter_cb->SetValue(m_imgOpts.autoCenterCrop);
    m_left_textctrl->SetValue(wxString::Format(wxT("%d"),m_imgOpts.cropRect.left()));
    m_right_textctrl->SetValue(wxString::Format(wxT("%d"),m_imgOpts.cropRect.right()));
    m_top_textctrl->SetValue(wxString::Format(wxT("%d"),m_imgOpts.cropRect.top()));
    m_bottom_textctrl->SetValue(wxString::Format(wxT("%d"),m_imgOpts.cropRect.bottom()));

    m_Canvas->UpdateDisplay(m_imgOpts.cropRect, m_circular, m_center, m_imgOpts.autoCenterCrop);
}


void CropPanel::OnSetTop(wxCommandEvent & e)
{
    long val;
    if (m_top_textctrl->GetValue().ToLong(&val)) {
        DEBUG_DEBUG(val);
        m_imgOpts.cropRect.setUpperLeft(Point2D(m_imgOpts.cropRect.left(), val));
        if (m_imgOpts.autoCenterCrop) {
            CenterCrop();
            UpdateDisplay();
        }
        Display2Pano();
    } else {
        wxLogError(_("Please enter a valid number"));
    }
}

void CropPanel::OnSetBottom(wxCommandEvent & e)
{
    long val;
    if (m_bottom_textctrl->GetValue().ToLong(&val)) {
        DEBUG_DEBUG(val);
        m_imgOpts.cropRect.setLowerRight(Point2D(m_imgOpts.cropRect.right(), val));
        if (m_imgOpts.autoCenterCrop) {
            CenterCrop();
            UpdateDisplay();
        }
        Display2Pano();
    } else {
        wxLogError(_("Please enter a valid number"));
    }
}

void CropPanel::OnSetLeft(wxCommandEvent & e)
{
    long val = 0;
    if (m_left_textctrl->GetValue().ToLong(&val)) {
        DEBUG_DEBUG(val);
        m_imgOpts.cropRect.setUpperLeft(Point2D(val, m_imgOpts.cropRect.top()));
        if (m_imgOpts.autoCenterCrop) {
            CenterCrop();
            UpdateDisplay();
        }
        Display2Pano();
    } else {
        wxLogError(_("Please enter a valid number"));
    }
}

void CropPanel::OnSetRight(wxCommandEvent & e)
{
    long val = 0;
    if (m_right_textctrl->GetValue().ToLong(&val)) {
        DEBUG_DEBUG(val);
        m_imgOpts.cropRect.setLowerRight(Point2D(val, m_imgOpts.cropRect.bottom()));
        if (m_imgOpts.autoCenterCrop) {
            CenterCrop();
            UpdateDisplay();
        }
        Display2Pano();
    } else {
        wxLogError(_("Please enter a valid number"));
    }
}

void CropPanel::OnResetButton(wxCommandEvent & e)
{
    // suitable defaults.
    m_imgOpts.cropRect.setUpperLeft(Point2D(0,0));
    m_imgOpts.cropRect.setLowerRight(Point2D(0,0));
    m_imgOpts.autoCenterCrop = false;
    UpdateDisplay();
    Display2Pano();
}

void CropPanel::OnAutoCenter(wxCommandEvent & e)
{
    m_imgOpts.autoCenterCrop = e.IsChecked();
    if (m_imgOpts.autoCenterCrop) {
        CenterCrop();
        UpdateDisplay();
    }
    Display2Pano();
}

// event handlers for CenterCanvas
void CropPanel::CropChanged(vigra::Rect2D & crop, bool dragging)
{
    m_imgOpts.cropRect = crop;
    if (dragging) {
        m_left_textctrl->SetValue(wxString::Format(wxT("%d"),m_imgOpts.cropRect.left()));
        m_right_textctrl->SetValue(wxString::Format(wxT("%d"),m_imgOpts.cropRect.right()));
        m_top_textctrl->SetValue(wxString::Format(wxT("%d"),m_imgOpts.cropRect.top()));
        m_bottom_textctrl->SetValue(wxString::Format(wxT("%d"),m_imgOpts.cropRect.bottom()));
    } else {
        if (m_imgOpts.autoCenterCrop) {
            CenterCrop();
        }
        UpdateDisplay();
        Display2Pano();
    }
}


void CropPanel::CenterCrop()
{
    Diff2D d(m_imgOpts.cropRect.width()/2, m_imgOpts.cropRect.height() / 2);
    m_imgOpts.cropRect.setUpperLeft( m_center - d);
    m_imgOpts.cropRect.setLowerRight( m_center + d);
}

//------------------------------------------------------------------------------

BEGIN_EVENT_TABLE(CenterCanvas, wxPanel)
    EVT_SIZE   ( CenterCanvas::Resize )
    EVT_MOUSE_EVENTS ( CenterCanvas::OnMouse )
    EVT_PAINT ( CenterCanvas::OnPaint )
END_EVENT_TABLE()

// Define a constructor for my canvas
CenterCanvas::CenterCanvas(wxWindow *parent, CropPanel * listener,const wxSize & sz)
    : wxPanel(parent, -1, wxDefaultPosition, sz),
    m_listener(listener)
{
    DEBUG_TRACE("");
    m_state = NO_SEL;

    m_cursor_no_sel = new wxCursor(wxCURSOR_CROSS);
    m_cursor_circ_drag = new wxCursor(wxCURSOR_SIZING);
    m_cursor_move_crop = new wxCursor(wxCURSOR_HAND);
    m_cursor_drag_vert = new wxCursor(wxCURSOR_SIZENS);
    m_cursor_drag_horiz = new wxCursor(wxCURSOR_SIZEWE);
    SetCursor(*m_cursor_no_sel);
}

CenterCanvas::~CenterCanvas(void)
{
    DEBUG_TRACE("");
    delete m_cursor_no_sel;
    delete m_cursor_circ_drag;
    delete m_cursor_move_crop;
    delete m_cursor_drag_vert;
    delete m_cursor_drag_horiz;
}

void CenterCanvas::DrawView()
{
      // now show the position of current PT shift (d,e)
      wxMemoryDC memDC;
      m_display_img.Create(m_scaled_img.GetWidth(), m_scaled_img.GetHeight());
      memDC.SelectObject (m_display_img);
      memDC.BeginDrawing ();
      // copy resized image into buffer
      memDC.DrawBitmap(m_scaled_img,0,0,false);

      // draw all areas without fillings
      wxBrush brush = memDC.GetBrush();
      brush.SetStyle (wxTRANSPARENT);
      memDC.SetBrush (brush);
      memDC.SetLogicalFunction (wxINVERT);
      // draw text without background
      memDC.SetBackgroundMode (wxTRANSPARENT);
      // draw circle, if needed.
      if (!m_roi.isEmpty()) {
          // draw region of interest
          int mid_x = roundi(m_scale * (m_roi.left() + m_roi.width()/2.0));
          int mid_y = roundi(m_scale * (m_roi.top() + m_roi.height()/2.0));

          int c = 8; // size of midpoint cross
          memDC.DrawLine( mid_x + c, mid_y + c,
                          mid_x - c, mid_y - c);
          memDC.DrawLine( mid_x - c, mid_y + c,
                          mid_x + c, mid_y - c);
          // draw circle
          // draw rectangle
          memDC.DrawRectangle(roundi(m_scale*m_roi.left()),
                              roundi(m_scale*m_roi.top()),
                              roundi(m_scale*m_roi.width()),
                              roundi(m_scale*m_roi.height()));

          // draw crop circle as well, if requested.
          if (m_circle) {
              int radius = roundi(m_scale * std::min(m_roi.width(), m_roi.height())/2);
              memDC.DrawCircle ( mid_x, mid_y, radius );
          }
          // draw helping lines while dragging
          if (m_state == CIRC_DRAGGING) {
              memDC.SetBrush(wxBrush(wxT("RED"),wxTRANSPARENT));
              memDC.SetPen(wxPen(wxT("RED"), 1, wxSOLID));
              memDC.SetLogicalFunction (wxXOR);
              memDC.DrawLine(roundi(m_scale * m_circ_first_point.x),
                             roundi(m_scale * m_circ_first_point.y),
                             roundi(m_scale * m_circ_second_point.x),
                             roundi(m_scale * m_circ_second_point.y) );

              memDC.DrawCircle(roundi(m_scale * m_circ_first_point.x),
                               roundi(m_scale * m_circ_first_point.y), 7);

              memDC.DrawCircle(roundi(m_scale * m_circ_second_point.x),
                               roundi(m_scale * m_circ_second_point.y), 7);
          }
      }
//      memDC.SelectObject(wxNullBitmap);
      memDC.EndDrawing ();

}

void CenterCanvas::ChangeMode(PointState m)
{
    switch (m) {
    case NO_SEL:
        SetCursor(*m_cursor_no_sel);
        break;

    case RECT_DRAGGING:
    case CIRC_DRAGGING:
        SetCursor(*m_cursor_circ_drag);
        break;

    case CROP_SELECTED:
    case CROP_MOVE:
        SetCursor(*m_cursor_move_crop);
        break;

    case RECT_LEFT_DRAG:
    case RECT_RIGHT_DRAG:
        SetCursor(*m_cursor_drag_horiz);
        break;

    case RECT_TOP_DRAG:
    case RECT_BOTTOM_DRAG:
        SetCursor(*m_cursor_drag_vert);
        break;

    }
    m_state = m;
}


void CenterCanvas::Resize( wxSizeEvent & e )
{
    if ( img.Ok() )
    {
      int x = GetSize().x;
      int y = GetSize().y;
      DEBUG_INFO( "x "<< x <<" y "<< y );

      // scale to fit the window
      {
          int new_width;
          int new_height;

          float r_img = (float)img.GetWidth() / (float)img.GetHeight();
          float r_window = (float)x/(float)y;
          if ( r_img > r_window ) {
            m_scale = (float)x / img.GetWidth();
            new_width =  x;
            new_height = roundi(m_scale * img.GetHeight());
          } else {
            m_scale = (float)y / img.GetHeight();
            new_height = y;
            new_width = roundi(m_scale * img.GetWidth());
          }
          m_scaled_img = wxBitmap(img.Scale (new_width, new_height));
      }

      // draw new view into offscreen buffer
      DrawView();
      // eventually update the view
      Refresh(false);
    }
    DEBUG_TRACE ("end")
}

void CenterCanvas::UpdateCropCircle()
{
    if (m_listener) {
        m_listener->CropChanged(m_roi, m_state != CROP_SELECTED);
    }
    DrawView();
    Refresh(false);
}


// Define the repainting behaviour
void CenterCanvas::OnPaint(wxPaintEvent & dc)
{
    wxPaintDC paintDC( this );
    if ( m_display_img.Ok() )
    {
        paintDC.DrawBitmap(m_display_img, 0,0, FALSE);
    }
}

void CenterCanvas::SetImage(wxImage & s_img)
{
    img = s_img;

    wxSizeEvent e;
    Resize (e);
    // draw new view into offscreen buffer
    DrawView();
    // eventually update the view
    Refresh(false);
}

void CenterCanvas::UpdateDisplay(const vigra::Rect2D & crop, bool circle,
                                 const vigra::Point2D & center, bool useCenter)
{
    DEBUG_TRACE("");

    m_roi = crop;
    m_circle = circle;
    m_center = center;
    m_centered = useCenter;
    if (crop.isEmpty()) {
        ChangeMode(NO_SEL);
    } else {
        ChangeMode(CROP_SELECTED);
    }

    // draw new view into offscreen buffer
    DrawView();
    // eventually update the view
    Refresh(false);

    DEBUG_TRACE("");
}


//#define MAX(a,b) ( ( a > b ) ? a : b)
//#define MIN(a,b) ( ( a < b ) ? a : b)

void CenterCanvas::OnMouse ( wxMouseEvent & e )
{
    if (!img.Ok()) {
        // nothing to do if we don't have an image
        return;
    }

    double xpos = e.m_x / m_scale;
    int xpos_i = roundi(xpos);
    double ypos = e.m_y / m_scale;
    int ypos_i = roundi(ypos);
    vigra::Point2D mpos(xpos_i, ypos_i);

    switch (m_state) {
        case NO_SEL:
            if (e.LeftDown()) {
                if (m_circle) {
                    // set starting point
                    m_circ_first_point.x = xpos_i;
                    m_circ_first_point.y = ypos_i;
                    ChangeMode(CIRC_DRAGGING);
                } else {
                    // set starting point
                    vigra::Point2D p(xpos_i, ypos_i);
                    m_circ_first_point = p;
                    m_roi.setUpperLeft(p);
                    m_roi.setLowerRight(p);
                    ChangeMode(RECT_DRAGGING);
                }
            }
            break;
        case RECT_DRAGGING:
            {
                vigra::Point2D fp(xpos_i, ypos_i);
                if (m_centered) {
                    // special case for centered crops
                    vigra::Diff2D d = fp - m_center;
                    vigra::Point2D sp(m_center - d);
                    m_roi.setUpperLeft(sp);
                    m_roi.setLowerRight(fp);
                } else {
                    // check on which side we are.
                    int left,right,top,bottom;
                    if ( m_circ_first_point.x < fp.x) {
                        right = fp.x;
                        left = m_circ_first_point.x;
                    } else {
                        left = fp.x;
                        right = m_circ_first_point.x;
                    }
                    if ( m_circ_first_point.y < fp.y) {
                        bottom = fp.y;
                        top = m_circ_first_point.y;
                    } else {
                        top = fp.y;
                        bottom = m_circ_first_point.y;
                    }
                    m_roi.setLowerRight(Point2D(right, bottom));
                    m_roi.setUpperLeft(Point2D(left, top));
                    DEBUG_DEBUG("RECT_DRAGGING: ul:" << left << " " << top << " lr:" << right << " " << bottom);
                    //m_roi.setLowerRight(fp);
                }
                UpdateCropCircle();
                if (e.LeftUp()) {
                    // stop dragging
                    ChangeMode(CROP_SELECTED);
                }
            }
            break;
        case CIRC_DRAGGING:
            m_circ_second_point.x = xpos_i;
            m_circ_second_point.y = ypos_i;
            if (m_centered) {
                double dx = xpos - m_center.x;
                double dy = ypos - m_center.y;
                double r = sqrt(dx*dx+dy*dy);
                Diff2D d(roundi(r), roundi(r));
                m_roi.setUpperLeft(m_center - d);
                m_roi.setLowerRight(m_center + d);
            } else {
                // calculate circle from two points
                m_roi = calcCircleROIFromPoints(m_circ_first_point, m_circ_second_point);
            }
            UpdateCropCircle();

            if (e.LeftUp()) {
                // stop dragging
                ChangeMode(CROP_SELECTED);
                UpdateCropCircle();
            }
            break;
        case CROP_SELECTED:
            if (m_circle) {
                vigra::Point2D mid (m_roi.left() + m_roi.width() / 2, m_roi.top() + m_roi.height() / 2);
                vigra::Diff2D mouse_d = mpos - mid;
                double r_mouse =  sqrt((double)mouse_d.x*mouse_d.x + mouse_d.y*mouse_d.y);
                double r_circ = std::min(m_roi.width(), m_roi.height())/2.0;
                if (abs(r_mouse - r_circ) < 2 / m_scale) {
                    // we are close to a point on the circle
                    SetCursor(*m_cursor_circ_drag);
                    if (e.LeftDown()) {
                        // ok, determine first point, on the other side of the currently selected point.
                        // angle
                        double angle = atan2((double)mouse_d.y, (double)mouse_d.x);
                        double opp_angle = angle + M_PI;
                        // calculate point there.
                        double nx = cos(opp_angle) * r_circ;
                        double ny = sin(opp_angle) * r_circ;
                        m_circ_first_point.x = roundi(mid.x + nx);
                        m_circ_first_point.y = roundi(mid.y + ny);
                        ChangeMode(CIRC_DRAGGING);
                    }
                } else {
                    if (&GetCursor() != m_cursor_move_crop) {
                        SetCursor(*m_cursor_move_crop);
                    }
                }
            } else {
                if (&GetCursor() != m_cursor_move_crop) {
                    SetCursor(*m_cursor_move_crop);
                }
                // no treatment for rectangular crop area yet.
                // check if mouse is on a rectangular crop border
            }
            if (abs(xpos_i - m_roi.left()) < 2 / m_scale && ypos_i > m_roi.top() && ypos_i < m_roi.bottom()) {
                SetCursor(*m_cursor_drag_horiz);
                if (e.LeftDown()) {
                    m_moveAnchor = e.GetPosition();
                    ChangeMode(RECT_LEFT_DRAG);
                }
            }

            if (abs(xpos_i - m_roi.right()) < 2 / m_scale && ypos_i > m_roi.top() && ypos_i < m_roi.bottom()) {
                SetCursor(*m_cursor_drag_horiz);
                if (e.LeftDown()) {
                    m_moveAnchor = e.GetPosition();
                    ChangeMode(RECT_RIGHT_DRAG);
                }
            }
            if (abs(ypos_i - m_roi.top()) < 2 / m_scale && xpos_i > m_roi.left() && xpos_i < m_roi.right()) {
                SetCursor(*m_cursor_drag_vert);
                if (e.LeftDown()) {
                    m_moveAnchor = e.GetPosition();
                    ChangeMode(RECT_TOP_DRAG);
                }
            }

            if (abs(ypos_i - m_roi.bottom()) < 2 / m_scale && xpos_i > m_roi.left() && xpos_i < m_roi.right()) {
                SetCursor(*m_cursor_drag_vert);
                if (e.LeftDown()) {
                    m_moveAnchor = e.GetPosition();
                    ChangeMode(RECT_BOTTOM_DRAG);
                }
            }

            // check for moving of roi if nothing else was done, and it is allowed
            if (m_state == CROP_SELECTED && ! m_centered) {
                if ( e.LeftDown() ) {
                    m_moveAnchor = e.GetPosition();
                    ChangeMode(CROP_MOVE);
                }
            }
            break;
        case CROP_MOVE:
            {
            if (e.LeftUp()) {
                ChangeMode(CROP_SELECTED);
            }
            int dx = e.m_x - m_moveAnchor.x;
            int dy = e.m_y - m_moveAnchor.y;
            m_moveAnchor = e.GetPosition();
            m_roi.moveBy(roundi(dx/m_scale), roundi(dy/m_scale));
            UpdateCropCircle();
            break;
            }
        case RECT_LEFT_DRAG:
            {
            if (e.LeftUp()) {
                ChangeMode(CROP_SELECTED);
            }
            if (m_centered) {
                int dx = abs(xpos_i - m_center.x);
                m_roi.setUpperLeft(Point2D(roundi(m_center.x - dx), m_roi.top()));
                m_roi.setLowerRight(Point2D(roundi(m_center.x + dx), m_roi.bottom()));
            } else {
                int dx = e.m_x - m_moveAnchor.x;
                m_moveAnchor = e.GetPosition();
                m_roi.setUpperLeft(Point2D(roundi(m_roi.left() + dx/m_scale), m_roi.top()));
            }
            UpdateCropCircle();
            }
            break;

        case RECT_RIGHT_DRAG:
            {
            if (e.LeftUp()) {
                ChangeMode(CROP_SELECTED);
            }
            if (m_centered) {
                int dx = abs(xpos_i - m_center.x);
                m_roi.setUpperLeft(Point2D(roundi(m_center.x - dx), m_roi.top()));
                m_roi.setLowerRight(Point2D(roundi(m_center.x + dx), m_roi.bottom()));
            } else {
                int dx = e.m_x - m_moveAnchor.x;
                m_moveAnchor = e.GetPosition();
                m_roi.setLowerRight(Point2D(roundi(m_roi.right() + dx/m_scale), m_roi.bottom()));
            }
            UpdateCropCircle();
            }
            break;

        case RECT_TOP_DRAG:
            {
            if (e.LeftUp()) {
                ChangeMode(CROP_SELECTED);
            }
            if (m_centered) {
                int dy = abs(ypos_i - m_center.y);
                m_roi.setUpperLeft(Point2D(m_roi.left(), roundi(m_center.y - dy)));
                m_roi.setLowerRight(Point2D(m_roi.right(), roundi(m_center.y + dy)));
            } else {
                int dy = e.m_y - m_moveAnchor.y;
                m_moveAnchor = e.GetPosition();
                m_roi.setUpperLeft(Point2D(m_roi.left(), roundi(m_roi.top() + dy/m_scale)));
            }
            UpdateCropCircle();
            }
            break;

        case RECT_BOTTOM_DRAG:
            {
            if (e.LeftUp()) {
                ChangeMode(CROP_SELECTED);
            }
            if (m_centered) {
                int dy = abs(ypos_i - m_center.y);
                m_roi.setUpperLeft(Point2D(m_roi.left(), roundi(m_center.y - dy)));
                m_roi.setLowerRight(Point2D(m_roi.right(), roundi(m_center.y + dy)));
            } else {
                int dy = e.m_y - m_moveAnchor.y;
                m_moveAnchor = e.GetPosition();
                m_roi.setLowerRight(Point2D(m_roi.right(), roundi(m_roi.bottom() + dy/m_scale)));
            }
            UpdateCropCircle();
            }
            break;

    }
}

Update of /cvsroot/hugin/hugin/src/include/hugin
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv22806/include/hugin

Added Files:
	CropPanel.h 
Log Message:
moved crop to crop panel, fixed strange behaviour of previous crop dialog


--- NEW FILE: CropPanel.h ---
// -*- c-basic-offset: 4 -*-
/** @file CropPanel.h
 *
 *  @author Pablo d'Angelo <pablo.dangelo@...
 *
 *  $Id: CropPanel.h,v 1.1 2006/12/22 12:26:29 dangelo Exp $
 *
 *  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 _CROP_PANEL_H
#define _CROP_PANEL_H


#ifdef __WXMAC__
// use wxChoice
#define HUGIN_CP_IMG_CHOICE
#else
// use wxNotebook tab
#define HUGIN_CP_IMG_TAB
#endif

class CenterCanvas;
class ImagesListCrop;
/** adjustment dialog
 *
 */
class CropPanel: public wxPanel, public PT::PanoramaObserver
{
public:
    CropPanel(wxWindow *parent, Panorama * pano );
    virtual ~CropPanel(void);
#if 0
    /** restore layout after hugin start */
    void RestoreLayout();
    /// hack to restore the layout on next resize
    void RestoreLayoutOnNextResize()
    {
        m_restoreLayoutOnResize = true;
    }
#endif

    void panoramaImagesChanged(PT::Panorama &pano, const PT::UIntSet & imgNr);

    void CropChanged(vigra::Rect2D & crop, bool dragging);


protected:
    // a window event
    void OnSize(wxSizeEvent & e);

    void Pano2Display(int imgNr);
    void Display2Pano();

    /** update GUI display */
    void UpdateDisplay();

    /** catches changes to the list selection */
    void ListSelectionChanged(wxListEvent& e);

    // reset crop area. 
    void OnResetButton(wxCommandEvent & e);
    void OnSetLeft(wxCommandEvent & e);
    void OnSetRight(wxCommandEvent & e);
    void OnSetTop(wxCommandEvent & e);
    void OnSetBottom(wxCommandEvent & e);
    void OnAutoCenter(wxCommandEvent & e);

    // ensure that the crop roi is centered
    void CenterCrop();

    wxTextCtrl * m_left_textctrl;
    wxTextCtrl * m_right_textctrl;
    wxTextCtrl * m_top_textctrl;
    wxTextCtrl * m_bottom_textctrl;
    wxCheckBox * m_autocenter_cb;

private:

    Panorama       & m_pano;

    CenterCanvas   * m_Canvas;
    ImagesListCrop * m_imagesList;

    UIntSet m_selectedImages;
    std::string m_currentImageFile;

    ImageOptions   m_imgOpts;
    vigra::Point2D m_center;
    bool           m_circular;

    DECLARE_EVENT_TABLE()
};

/** adjustment image view
 *
 *  Define a new canvas which can receive some events.
 */
class CenterCanvas: public wxPanel
{
public:
    CenterCanvas(wxWindow *parent, CropPanel * listener, const wxSize & sz=wxDefaultSize);
    virtual ~CenterCanvas(void) ;

    /** set image and crop parameters */
    void SetImage(wxImage & img);
    void UpdateDisplay(const vigra::Rect2D & crop, bool circle,
                       const vigra::Point2D & center, bool useCenter);

protected:
    /** draw the view into the offscreen buffer */
    void DrawView();
    void UpdateCropCircle();


    wxCursor * m_cursor_no_sel;
    wxCursor * m_cursor_circ_drag;
    wxCursor * m_cursor_move_crop;
    wxCursor * m_cursor_drag_vert;
    wxCursor * m_cursor_drag_horiz;

private:
    void Resize ( wxSizeEvent & e );
    void OnPaint(wxPaintEvent & dc);
    void OnMouse ( wxMouseEvent & event );

    // the image to adjust ( full scale )
    wxImage img;
    // the scaled image (clear/dirty)
    wxBitmap m_scaled_img;
    // image with center cross and circle
    wxBitmap m_display_img;

    CropPanel * m_listener;

    enum PointState { NO_SEL, RECT_DRAGGING, CIRC_DRAGGING, CROP_SELECTED, CROP_MOVE,
                      RECT_LEFT_DRAG, RECT_RIGHT_DRAG, RECT_TOP_DRAG, RECT_BOTTOM_DRAG};

    void ChangeMode(PointState m);

    wxPoint m_moveAnchor;

    PointState m_state;

    // the selected rectangle
    vigra::Rect2D m_roi;

    // circular crop
    bool m_circle;
    vigra::Point2D m_circ_first_point;
    vigra::Point2D m_circ_second_point;

    // center
    vigra::Point2D m_center;
    bool m_centered;

    // scale factor
    float m_scale;

    DECLARE_EVENT_TABLE()
};



#endif // _IMAGECENTER_H

Update of /cvsroot/hugin/hugin/src/Panorama
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv25000

Modified Files:
	PanoramaMemento.cpp 
Log Message:
fixed problems with setting invalid HFOV when changing projections


Index: PanoramaMemento.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/Panorama/PanoramaMemento.cpp,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- PanoramaMemento.cpp	21 Dec 2006 08:31:19 -0000	1.76
+++ PanoramaMemento.cpp	21 Dec 2006 23:05:26 -0000	1.77
@@ -525,6 +525,8 @@
         setVFOV(vfov);
     } else {
         m_projectionFormat = f;
+        double hfov = std::min(getHFOV(), getMaxHFOV());
+        setHFOV(hfov, false);
     }
 }

Update of /cvsroot/hugin/hugin/src/hugin
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv19996

Modified Files:
	ImagesPanel.cpp 
Log Message:
enable Create control points button as soon as two images are loaded.


Index: ImagesPanel.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/ImagesPanel.cpp,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- ImagesPanel.cpp	20 Dec 2006 19:41:29 -0000	1.99
+++ ImagesPanel.cpp	21 Dec 2006 22:50:58 -0000	1.100
@@ -240,7 +240,11 @@
 	if (pano.getNrOfImages() == 0)
 	{
 	  DisableImageCtrls();
-	}
+    };
+    if (pano.getNrOfImages() > 1) {
+        m_matchingButton->Enable();
+    }
+
     if (selected.size() == 1 &&
         *(selected.begin()) < pano.getNrOfImages() &&
         set_contains(_imgNr, *(selected.begin())))
@@ -465,7 +469,7 @@
     if (XRCCTRL(*this, "images_text_yaw", wxTextCtrl)->Enable()) {
         XRCCTRL(*this, "images_text_roll", wxTextCtrl) ->Enable();
         XRCCTRL(*this, "images_text_pitch", wxTextCtrl) ->Enable();
-        m_matchingButton->Enable();
+        // m_matchingButton->Enable();
         m_removeCPButton->Enable();
         m_moveDownButton->Enable();
         m_moveUpButton->Enable();

Update of /cvsroot/hugin/hugin/src/hugin
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv14444

Modified Files:
	CPEditorPanel.cpp 
Log Message:
fixed automatic choosing of horizontal/vertical control points for
rotated images.


Index: CPEditorPanel.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/CPEditorPanel.cpp,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -d -r1.126 -r1.127
--- CPEditorPanel.cpp	7 Dec 2006 20:33:34 -0000	1.126
+++ CPEditorPanel.cpp	21 Dec 2006 22:37:02 -0000	1.127
@@ -609,10 +609,21 @@
     point.x2 = p2.x;
     point.y2 = p2.y;
     if (point.image1Nr == point.image2Nr) {
-        if ( abs(p1.x - p2.x) > abs(p1.y - p2.y)) {
-            point.mode = PT::ControlPoint::Y;
-        } else {
-            point.mode = PT::ControlPoint::X;
+        bool hor = abs(p1.x - p2.x) > abs(p1.y - p2.y);
+        switch (m_leftRot) {
+            case CPImageCtrl::ROT0:
+            case CPImageCtrl::ROT180:
+                if (hor)
+                    point.mode = PT::ControlPoint::Y;
+                else
+                    point.mode = PT::ControlPoint::X;
+                break;
+            default:
+                if (hor)
+                    point.mode = PT::ControlPoint::X;
+                else
+                    point.mode = PT::ControlPoint::Y;
+                break;
         }
     } else {
         point.mode = PT::ControlPoint::X_Y;

Update of /cvsroot/hugin/hugin/src/hugin/xrc
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv5094

Modified Files:
	images_panel-2.5.xrc 
Log Message:
small layout changes


Index: images_panel-2.5.xrc
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/xrc/images_panel-2.5.xrc,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- images_panel-2.5.xrc	20 Dec 2006 19:41:29 -0000	1.20
+++ images_panel-2.5.xrc	21 Dec 2006 22:13:50 -0000	1.21
@@ -14,8 +14,10 @@
               <object class="sizeritem">
                 <object class="unknown" name="images_list_unknown"/>
                 
+                
                 <option>1</option>
                 
+                
                 <flag>wxEXPAND</flag>
               </object>
               <object class="sizeritem">
@@ -23,6 +25,7 @@
                   <orient>wxVERTICAL</orient>
                   <object class="spacer">
                     
+                    
                     <size>0,12</size>
                   </object>
                   <object class="sizeritem">
@@ -32,29 +35,37 @@
                       <object class="sizeritem">
                         <object class="wxButton" name="action_add_images">
                           
+                          
                           <label>Add individual images...</label>
                           
+                          
                           <tooltip>load one or more photos for this project</tooltip>
                         </object>
                         
+                        
                         <flag>wxEXPAND</flag>
                       </object>
                       <object class="sizeritem">
                         <object class="wxButton" name="action_add_time_images">
                           
+                          
                           <label>Add time-series of images...</label>
                           
+                          
                           <tooltip>load a set of photos taken at the same time</tooltip>
                         </object>
                         
+                        
                         <flag>wxEXPAND</flag>
                       </object>
                       <object class="sizeritem">
                         <object class="wxStaticLine">
                           
+                          
                           <style></style>
                         </object>
                         
+                        
                         <flag>wxTOP|wxBOTTOM|wxEXPAND</flag>
                       </object>
                       <object class="sizeritem">
@@ -63,68 +74,87 @@
                           <object class="sizeritem">
                             <object class="wxButton" name="images_move_image_up">
                               
+                              
                               <label>Move up</label>
                             </object>
                             
+                            
                             <option>1</option>
                             
+                            
                             <flag>wxEXPAND</flag>
                           </object>
                           <object class="sizeritem">
                             <object class="wxButton" name="images_move_image_down">
                               
+                              
                               <label>Move down</label>
                             </object>
                             
+                            
                             <option>1</option>
                             
+                            
                             <flag>wxEXPAND</flag>
                           </object>
                           <hgap>6</hgap>
                         </object>
                         
+                        
                         <flag>wxEXPAND</flag>
                       </object>
                       <object class="sizeritem">
                         <object class="wxButton" name="action_remove_images">
                           
+                          
                           <label>Remove this image</label>
                           
+                          
                           <tooltip>dismiss the current photo from this project</tooltip>
                         </object>
                         
+                        
                         <flag>wxEXPAND</flag>
                       </object>
                       <object class="sizeritem">
                         <object class="wxStaticLine">
                           
+                          
                           <style></style>
                         </object>
                         
+                        
                         <flag>wxTOP|wxBOTTOM|wxEXPAND</flag>
                       </object>
                       <object class="sizeritem">
                         <object class="wxButton" name="images_remove_cp">
                           
-                          <label>Remove Points</label>
+                          
+                          <label>Remove points</label>
+                          
                           
                           <tooltip>Remove control points connecting the selected images</tooltip>
                         </object>
                         
+                        
                         <flag>wxEXPAND</flag>
                       </object>
                     </object>
                     
+                    
                     <flag>wxEXPAND</flag>
                   </object>
                   <object class="spacer">
                     
+                    
                     <size>0,10</size>
                   </object>
                 </object>
                 
+                
                 <flag>wxALL|wxEXPAND</flag>
                 
+                
                 <border>6</border>
               </object>
             </object>
@@ -141,22 +171,30 @@
                       <object class="sizeritem">
                         <object class="wxStaticText">
                           
+                          
                           <label>Image Orientation</label>
                           
+                          
                           <font>
                             
+                            
                             <style platform="mac">normal</style>
                             
+                            
                             <family platform="mac">swiss</family>
                             
+                            
                             <weight>bold</weight>
                             
+                            
                             <size platform="mac">12</size>
                           </font>
                         </object>
                         
+                        
                         <flag>wxBOTTOM</flag>
                         
+                        
                         <border>6</border>
                       </object>
                       <object class="sizeritem">
@@ -167,61 +205,79 @@
                               <object class="sizeritem">
                                 <object class="wxStaticText">
                                   
+                                  
                                   <label>yaw:</label>
                                 </object>
                                 
+                                
                                 <flag>wxALIGN_CENTRE_VERTICAL</flag>
                               </object>
                               <object class="sizeritem">
                                 <object class="wxTextCtrl" name="images_text_yaw">
                                   
+                                  
                                   <size>50,-1</size>
                                   
+                                  
                                   <style>wxTE_PROCESS_ENTER</style>
                                   
+                                  
                                   <tooltip>set yaw for selected image(s)</tooltip>
                                 </object>
                                 
+                                
                                 <flag>wxALIGN_CENTRE_VERTICAL</flag>
                               </object>
                               <object class="sizeritem">
                                 <object class="wxStaticText" name="">
                                   
+                                  
                                   <label>pitch:</label>
                                 </object>
                                 
+                                
                                 <flag>wxALIGN_CENTRE_VERTICAL</flag>
                               </object>
                               <object class="sizeritem">
                                 <object class="wxTextCtrl" name="images_text_pitch">
                                   
+                                  
                                   <size>50,-1</size>
                                   
+                                  
                                   <style>wxTE_PROCESS_ENTER</style>
                                   
+                                  
                                   <tooltip>set pitch for selected image(s)</tooltip>
                                 </object>
                                 
+                                
                                 <flag>wxALIGN_CENTRE_VERTICAL</flag>
                               </object>
                               <object class="sizeritem">
                                 <object class="wxStaticText" name="">
                                   
+                                  
                                   <label>roll:</label>
                                 </object>
                                 
+                                
                                 <flag>wxALIGN_CENTRE_VERTICAL</flag>
                               </object>
                               <object class="sizeritem">
                                 <object class="wxTextCtrl" name="images_text_roll">
                                   
+                                  
                                   <size>50,-1</size>
                                   
+                                  
                                   <style>wxTE_PROCESS_ENTER</style>
                                   
+                                  
                                   <tooltip>set roll for selected image(s)</tooltip>
                                 </object>
                                 
+                                
                                 <flag>wxALIGN_CENTRE_VERTICAL</flag>
                               </object>
                               <cols>6</cols>
@@ -231,28 +287,36 @@
                           </object>
                           <object class="spacer">
                             
+                            
                             <size>12,6</size>
                           </object>
                           <object class="sizeritem">
                             <object class="wxButton" name="images_reset_pos">
                               
+                              
                               <label>Reset</label>
                               
+                              
                               <style></style>
                               
+                              
                               <tooltip>Reset position of selected image(s)</tooltip>
                             </object>
                             
+                            
                             <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
                           </object>
                         </object>
                         
+                        
                         <flag>wxLEFT</flag>
                         
+                        
                         <border>12</border>
                       </object>
                     </object>
                     
+                    
                     <flag>wxEXPAND</flag>
                   </object>
                   <object class="sizeritem">
@@ -260,26 +324,35 @@
                       <orient>wxVERTICAL</orient>
                       <object class="spacer">
                         
+                        
                         <size>0,20</size>
                       </object>
                       <object class="sizeritem">
                         <object class="wxStaticText">
                           
+                          
                           <label>Feature Matching (Autopano)</label>
                           
+                          
                           <font>
                             
+                            
                             <style platform="mac">normal</style>
                             
+                            
                             <family platform="mac">swiss</family>
                             
+                            
                             <weight>bold</weight>
                             
+                            
                             <size platform="mac">12</size>
                           </font>
                         </object>
                         
-                        <flag>wxBOTTOM</flag>
+                        
+                        <flag>wxBOTTOM|wxEXPAND</flag>
+                        
                         
                         <border>6</border>
                       </object>
@@ -292,47 +365,61 @@
                               <object class="sizeritem">
                                 <object class="wxStaticText">
                                   
+                                  
                                   <label>Points per Overlap:</label>
                                 </object>
                                 
+                                
                                 <flag>wxALIGN_CENTRE_VERTICAL</flag>
                               </object>
                               <object class="sizeritem">
                                 <object class="wxSpinCtrl" name="images_points_per_overlap">
                                   
+                                  
                                   <value>10</value>
                                   
+                                  
                                   <size>60,-1</size>
                                   
+                                  
                                   <tooltip>number of points created at each overlap</tooltip>
                                 </object>
                                 
+                                
                                 <flag>wxLEFT|wxALIGN_CENTRE_VERTICAL</flag>
                                 
+                                
                                 <border>6</border>
                               </object>
                               <object class="spacer">
                             
+                                
                                 <size>12,6</size>
                           </object>
                               <object class="sizeritem">
                                 <object class="wxButton" name="images_feature_matching">
                               
-                                  <label>Create Ctrl Points</label>
+                                  
+                                  <label>Create control points</label>
                               
+                                  
                                   <tooltip>Run external autopano program on the selected images</tooltip>
                             </object>
                             
+                                
                                 <flag>wxTOP|wxALIGN_RIGHT</flag>
                             
+                                
                                 <border>3</border>
                           </object>
                             </object>
                           </object>
                         </object>
                         
+                        
                         <flag>wxLEFT|wxALIGN_LEFT</flag>
                         
+                        
                         <border>12</border>
                       </object>
                     </object>
@@ -342,27 +429,36 @@
                       <orient>wxVERTICAL</orient>
                       <object class="spacer">
                         
+                        
                         <size>0,20</size>
                       </object>
                       <object class="sizeritem">
                         <object class="wxStaticText">
                           
+                          
                           <label>Reference Image</label>
                           
+                          
                           <font>
                             
+                            
                             <style platform="mac">normal</style>
                             
+                            
                             <family platform="mac">swiss</family>
                             
+                            
                             <weight>bold</weight>
                             
+                            
                             <size platform="mac">12</size>
                           </font>
                         </object>
                         
+                        
                         <flag>wxBOTTOM</flag>
                         
+                        
                         <border>6</border>
                       </object>
                       <object class="sizeritem">
@@ -370,25 +466,33 @@
                           <object class="sizeritem">
                             <object class="wxButton" name="images_opt_anchor_button">
                               
+                              
                               <label>Anchor this image for position</label>
                               
+                              
                               <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>
                           </object>
                           <object class="sizeritem">
                             <object class="wxButton" name="images_color_anchor_button">
                               
+                              
                               <label>Anchor this image for exposure</label>
                               
+                              
                               <enabled>0</enabled>
                               
+                              
                               <tooltip>use the currently selected images as color correction anchor image</tooltip>
                             </object>
                             
+                            
                             <flag>wxEXPAND</flag>
                           </object>
                           <cols>1</cols>
@@ -396,28 +500,36 @@
                           <hgap>6</hgap>
                         </object>
                         
+                        
                         <flag>wxLEFT|wxEXPAND</flag>
                         
+                        
                         <border>12</border>
                       </object>
                     </object>
                     
+                    
                     <flag>wxEXPAND</flag>
                   </object>
                 </object>
                 
+                
                 <flag>wxALL</flag>
                 
+                
                 <border>6</border>
               </object>
               <object class="sizeritem">
                 <object class="wxStaticLine">
                   
+                  
                   <style>wxLI_VERTICAL</style>
                 </object>
                 
+                
                 <flag>wxALL|wxEXPAND</flag>
                 
+                
                 <border>10</border>
               </object>
               <object class="sizeritem">
@@ -426,50 +538,66 @@
                   <object class="sizeritem">
                     <object class="wxStaticText">
                       
+                      
                       <label>This Image</label>
                       
+                      
                       <font>
                         
+                        
                         <style platform="mac">normal</style>
                         
+                        
                         <family platform="mac">swiss</family>
                         
+                        
                         <weight>bold</weight>
                         
+                        
                         <size platform="mac">12</size>
                       </font>
                     </object>
                     
+                    
                     <flag>wxBOTTOM</flag>
                     
+                    
                     <border>6</border>
                   </object>
                   <object class="sizeritem">
                     <object class="wxStaticBitmap" name="images_selected_image">
                       
+                      
                       <bitmap>data/druid.images.128.png</bitmap>
                     </object>
                     
+                    
                     <flag>wxLEFT</flag>
                     
+                    
                     <border>12</border>
                   </object>
                 </object>
                 
+                
                 <option>1</option>
                 
+                
                 <flag>wxALL|wxEXPAND</flag>
                 
+                
                 <border>6</border>
               </object>
               <object class="spacer">
                 
+                
                 <size>10,0</size>
               </object>
             </object>
           </object>
         </object>
         
+        
         <flag>wxEXPAND</flag>
       </object>
     </object>
@@ -479,27 +607,36 @@
       <orient>wxVERTICAL</orient>
       <object class="spacer">
                         
+        
         <size>0,20</size>
                       </object>
       <object class="sizeritem">
         <object class="wxStaticText">
                           
+          
           <label>Crop</label>
                           
+          
           <font>
                             
+            
             <style platform="mac">normal</style>
                             
+            
             <family platform="mac">swiss</family>
                             
+            
             <weight>bold</weight>
                             
+            
             <size platform="mac">12</size>
                           </font>
                         </object>
                         
+        
         <flag>wxBOTTOM</flag>
                         
+        
         <border>6</border>
                       </object>
       <object class="sizeritem">
@@ -508,21 +645,27 @@
           <object class="sizeritem">
             <object class="wxButton" name="images_button_crop">
                               
+              
               <label>Crop...</label>
                               
+              
               <tooltip>Open a dialog to select the image area to be used while stitching</tooltip>
                             </object>
                             
+            
             <flag>wxTOP</flag>
                             
+            
             <border>6</border>
                           </object>
         </object>
                         
+        
         <flag>wxLEFT</flag>
                         
+        
         <border>12</border>
                       </object>
     </object>
   </object>
-</resource>
+</resource>
\ No newline at end of file

Update of /cvsroot/hugin/hugin/src/hugin
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv27927/src/hugin

Modified Files:
	AssistantPanel.cpp MainFrame.cpp PanoPanel.cpp huginApp.cpp 
Log Message:
suggest output and project names based on input images
run align automatically after "load images" button on Assistant tab


Index: AssistantPanel.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/AssistantPanel.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- AssistantPanel.cpp	20 Dec 2006 22:03:48 -0000	1.6
+++ AssistantPanel.cpp	21 Dec 2006 08:31:19 -0000	1.7
@@ -96,6 +96,7 @@
     EVT_CHOICE     ( XRCID("ass_lens_proj_choice"), AssistantPanel::OnLensTypeChanged)
     EVT_TEXT_ENTER ( XRCID("ass_focallength_text"), AssistantPanel::OnFocalLengthChanged)
     EVT_TEXT_ENTER ( XRCID("ass_cropfactor_text"),  AssistantPanel::OnCropFactorChanged)
+    EVT_BUTTON     ( XRCID("ass_load_images_button"), AssistantPanel::OnLoadImages)
     EVT_BUTTON     ( XRCID("ass_load_lens_button"), AssistantPanel::OnLoadLens)
     EVT_BUTTON     ( XRCID("ass_align_button"),     AssistantPanel::OnAlign)
     EVT_BUTTON     ( XRCID("ass_create_button"),    AssistantPanel::OnCreate)
@@ -345,7 +346,20 @@
 
 // #####  Here start the eventhandlers  #####
 
-// Yaw by text -> double
+void AssistantPanel::OnLoadImages( wxCommandEvent & e )
+{
+    // load the images.
+    wxCommandEvent dummy;
+    MainFrame::Get()->OnAddImages(dummy);
+
+    long autoAlign = wxConfigBase::Get()->Read(wxT("/Assistant/autoAlign"), HUGIN_ASS_AUTO_ALIGN); 
+
+    if (autoAlign) {
+        OnAlign(dummy);
+    }
+
+}
+
 void AssistantPanel::OnAlign( wxCommandEvent & e )
 {
     // create control points
@@ -505,7 +519,7 @@
             new PT::SetPanoOptionsCmd(m_pano, opts)
             );
     }
-    
+
     wxCommandEvent dummy;
     MainFrame::Get()->OnDoStitch(dummy);
 }

Index: huginApp.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/huginApp.cpp,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- huginApp.cpp	17 Dec 2006 10:49:50 -0000	1.99
+++ huginApp.cpp	21 Dec 2006 08:31:20 -0000	1.100
@@ -41,6 +41,7 @@
 
 #include <tiffio.h>
 
+using namespace utils;
 
 // utility functions
 bool str2double(wxString s, double & d)
@@ -52,6 +53,18 @@
     return true;
 }
 
+wxString getDefaultProjectName(const Panorama & pano)
+{
+    if (pano.getNrOfImages() > 0) {
+        
+        wxString first_img(stripExtension(stripPath(pano.getImage(0).getFilename())).c_str(), *wxConvCurrent);
+        wxString last_img(stripExtension(stripPath(pano.getImage(pano.getNrOfImages()-1).getFilename())).c_str(), *wxConvCurrent);
+        return first_img + wxT("-") + last_img;
+    } else {
+        return wxString(wxT("pano"));
+    }
+}
+
 #ifdef __WXMAC__
 wxString MacGetPathTOBundledResourceFile(CFStringRef filename)
 {

Index: MainFrame.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/MainFrame.cpp,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -d -r1.184 -r1.185
--- MainFrame.cpp	17 Dec 2006 21:11:55 -0000	1.184
+++ MainFrame.cpp	21 Dec 2006 08:31:19 -0000	1.185
@@ -504,9 +504,13 @@
 void MainFrame::OnSaveProjectAs(wxCommandEvent & e)
 {
     DEBUG_TRACE("");
+    wxString scriptName = m_filename;
+    if (m_filename == wxT("")) {
+        scriptName = getDefaultProjectName(pano) + wxT(".pto");
+    }
     wxFileDialog dlg(this,
                      _("Save project file"),
-                     wxConfigBase::Get()->Read(wxT("actualPath"),wxT("")), wxT(""),
+                     wxConfigBase::Get()->Read(wxT("actualPath"),wxT("")), scriptName,
                      _("Project files (*.pto)|*.pto|All files (*)|*"),
                      wxSAVE, wxDefaultPosition);
     if (dlg.ShowModal() == wxID_OK) {
@@ -522,9 +526,13 @@
 void MainFrame::OnSavePTStitcherAs(wxCommandEvent & e)
 {
     DEBUG_TRACE("");
+    wxString scriptName = m_filename;
+    if (m_filename == wxT("")) {
+        scriptName = getDefaultProjectName(pano) + wxT(".pto");
+    }
     wxFileDialog dlg(this,
                      _("Save PTStitcher script file"),
-                     wxConfigBase::Get()->Read(wxT("actualPath"),wxT("")), wxT(""),
+                     wxConfigBase::Get()->Read(wxT("actualPath"),wxT("")), scriptName,
                      _("PTStitcher files (*.txt)|*.txt"),
                      wxSAVE, wxDefaultPosition);
     if (dlg.ShowModal() == wxID_OK) {
@@ -1032,8 +1040,7 @@
 void MainFrame::OnDoStitch(wxCommandEvent & e)
 {
     DEBUG_TRACE("");
-    wxCommandEvent dummy;
-    pano_panel->DoStitch(dummy);
+    pano_panel->DoStitch();
 }
 
 

Index: PanoPanel.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/PanoPanel.cpp,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- PanoPanel.cpp	20 Dec 2006 19:41:29 -0000	1.104
+++ PanoPanel.cpp	21 Dec 2006 08:31:20 -0000	1.105
@@ -73,7 +73,7 @@
     EVT_TEXT_ENTER ( XRCID("pano_val_width"),PanoPanel::WidthChanged )
     EVT_TEXT_ENTER ( XRCID("pano_val_height"),PanoPanel::HeightChanged )
     EVT_BUTTON ( XRCID("pano_button_opt_width"), PanoPanel::DoCalcOptimalWidth)
-    EVT_BUTTON ( XRCID("pano_button_stitch"),PanoPanel::DoStitch )
+    EVT_BUTTON ( XRCID("pano_button_stitch"),PanoPanel::OnDoStitch )
     EVT_CHOICE ( XRCID("pano_choice_stitcher"),PanoPanel::StitcherChanged )
 END_EVENT_TABLE()
 
@@ -628,19 +628,23 @@
     DEBUG_INFO ( "new optimal width: " << opt.getWidth() );
 }
 
-void PanoPanel::DoStitch ( wxCommandEvent & e )
+void PanoPanel::DoStitch()
 {
-    int preset = m_QuickChoice->GetSelection();
-    // apply preset mode. (recalculates width etc)
-    ApplyQuickMode(preset);
-
+    if (pano.getNrOfImages() == 0) {
+        return;
+    }
     PanoramaOptions opt = pano.getOptions();
     // select output file
     // FIXME put in right output extension for selected
     // file format
+    wxString ext(opt.getOutputExtension().c_str(), *wxConvCurrent);
+    // create filename
+    wxString filename =  getDefaultProjectName(pano) + wxT(".") + ext;
+    wxString wildcard = wxT("*.") + ext;
+
     wxFileDialog dlg(this,_("Create panorama image"),
                      wxConfigBase::Get()->Read(wxT("actualPath"),wxT("")),
-                     wxT(""), wxT(""),
+                     filename, ext,
                      wxSAVE, wxDefaultPosition);
     if (dlg.ShowModal() == wxID_OK) {
         // print as optimizer script..
@@ -648,6 +652,15 @@
         opt.outfile = dlg.GetPath().mb_str();
         m_Stitcher->Stitch(pano, opt);
     }
+    // TODO: show image after it has been created
+}
+
+void PanoPanel::OnDoStitch ( wxCommandEvent & e )
+{
+    int preset = m_QuickChoice->GetSelection();
+    // apply preset mode. (recalculates width etc)
+    ApplyQuickMode(preset);
+    DoStitch();
 }
 
 // We need to override the default handling of size events because the

Update of /cvsroot/hugin/hugin/src/hugin/xrc
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv27927/src/hugin/xrc

Modified Files:
	assistant_panel.xrc 
Log Message:
suggest output and project names based on input images
run align automatically after "load images" button on Assistant tab


Index: assistant_panel.xrc
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/xrc/assistant_panel.xrc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- assistant_panel.xrc	17 Dec 2006 21:11:56 -0000	1.2
+++ assistant_panel.xrc	21 Dec 2006 08:31:20 -0000	1.3
@@ -16,12 +16,13 @@
               
               
               
+              
               <size>0,12</size>
                   </object>
             <object class="sizeritem">
               <object class="wxBoxSizer">
                 <object class="sizeritem">
-                  <object class="wxButton" name="action_add_images">
+                  <object class="wxButton" name="ass_load_images_button">
                           
                           
                     
@@ -29,6 +30,7 @@
                     
                     
                     
+                    
                     <label>1. Load images...</label>
                           
                           
@@ -37,6 +39,7 @@
                     
                     
                     
+                    
                     <tooltip>load a series of photos</tooltip>
                         </object>
                         
@@ -46,11 +49,13 @@
                   
                   
                   
+                  
                   <flag>wxBOTTOM</flag>
                   
                   
                   
                   
+                  
                   <border>12</border>
                 </object>
                 <object class="sizeritem">
@@ -63,6 +68,7 @@
                         
                         
                         
+                        
                         <label>no images loaded</label>
                   </object>
                   
@@ -72,11 +78,13 @@
                       
                       
                       
+                      
                       <flag>wxBOTTOM|wxEXPAND|wxADJUST_MINSIZE</flag>
                       
                       
                       
                       
+                      
                       <border>6</border>
                     </object>
                   </object>
@@ -84,11 +92,13 @@
                   
                   
                   
+                  
                   <flag>wxLEFT|wxEXPAND</flag>
                   
                   
                   
                   
+                  
                   <border>15</border>
                 </object>
                 <object class="sizeritem">
@@ -101,16 +111,19 @@
                         
                         
                         
+                        
                         <label>Automatic (use EXIF data)</label>
                           </object>
                         
                       
                       
                       
+                      
                       <flag>wxTOP|wxBOTTOM</flag>
                       
                       
                       
+                      
                       <border>6</border>
                     </object>
                     <object class="sizeritem">
@@ -124,15 +137,18 @@
                                   
                                   
                                   
+                                  
                                   <label>Lens type:</label>
                                   
                                   
                                   
+                                  
                                   <style>wxALIGN_RIGHT</style>
                                 </object>
                                 
                                 
                                 
+                                
                                 <flag>wxALIGN_CENTRE_VERTICAL</flag>
                               </object>
                               <object class="sizeritem">
@@ -140,6 +156,7 @@
                                   
                                   
                                   
+                                  
                                   <content>
                                     <item>Normal (rectilinear)</item>
                                     <item>Panoramic (cylindrical)</item>
@@ -155,16 +172,19 @@
                             
                             
                             
+                            
                             <flag>wxLEFT|wxEXPAND</flag>
                             
                             
                             
+                            
                             <border>12</border>
                           </object>
                           <object class="spacer">
                             
                             
                             
+                            
                             <size>0,6</size>
                           </object>
                           <object class="sizeritem">
@@ -174,15 +194,18 @@
                                   
                                   
                                   
+                                  
                                   <label>Focal length:</label>
                                   
                                   
                                   
+                                  
                                   <style>wxALIGN_RIGHT</style>
                                 </object>
                                 
                                 
                                 
+                                
                                 <flag>wxALIGN_CENTRE_VERTICAL</flag>
                               </object>
                               <object class="sizeritem">
@@ -195,11 +218,13 @@
                                   
                                   
                                   
+                                  
                                   <label>mm</label>
                                 </object>
                                 
                                 
                                 
+                                
                                 <flag>wxALIGN_CENTRE_VERTICAL</flag>
                               </object>
                               <object class="sizeritem">
@@ -207,15 +232,18 @@
                                   
                                   
                                   
+                                  
                                   <label>Focal length multiplier:</label>
                                 </object>
                                 
                                 
                                 
+                                
                                 <flag>wxLEFT|wxALIGN_CENTRE_VERTICAL</flag>
                                 
                                 
                                 
+                                
                                 <border>20</border>
                               </object>
                               <object class="sizeritem">
@@ -226,27 +254,32 @@
                                   
                                   
                                   
+                                  
                                   <label>x</label>
                                 </object>
                                 
                                 
                                 
+                                
                                 <flag>wxRIGHT|wxALIGN_CENTRE_VERTICAL</flag>
                               </object>
                             </object>
                             
                             
                             
+                            
                             <flag>wxLEFT|wxEXPAND</flag>
                             
                             
                             
+                            
                             <border>12</border>
                           </object>
                           <object class="spacer">
                             
                             
                             
+                            
                             <size>0,6</size>
                           </object>
                           <object class="sizeritem">
@@ -256,6 +289,7 @@
                               
                               
                               
+                              
                               <label>Load lens...</label>
                         
                             
@@ -264,10 +298,12 @@
                             
                             
                             
+                            
                             <flag>wxLEFT</flag>
                             
                             
                             
+                            
                             <border>12</border>
                           </object>
                         </object>
@@ -275,6 +311,7 @@
                       
                       
                       
+                      
                       <flag>wxEXPAND</flag>
                     </object>
                     <label>Camera and Lens</label>
@@ -286,6 +323,7 @@
                   
                   
                   
+                  
                   <size>0,20</size>
                 </object>
                 <object class="sizeritem">
@@ -297,6 +335,7 @@
                     
                     
                     
+                    
                     <label>2. Align...</label>
                           
                           
@@ -305,6 +344,7 @@
                     
                     
                     
+                    
                     <tooltip>Align all images. Creates control points and optimizes the image positions</tooltip>
                         </object>
                         
@@ -314,11 +354,13 @@
                   
                   
                   
+                  
                   <flag>wxBOTTOM</flag>
                   
                   
                   
                   
+                  
                   <border>12</border>
                 </object>
                 <object class="sizeritem">
@@ -328,11 +370,13 @@
                     
                     
                     
+                    
                     <label>\n\n\n\n</label>
                   
                     
                     
                     
+                    
                     <style></style>
                   </object>
                   
@@ -340,12 +384,14 @@
                   
                   
                   
+                  
                   <flag>wxLEFT|wxEXPAND|wxADJUST_MINSIZE</flag>
                   
                   
                   
                   
                   
+                  
                   <border>15</border>
                 </object>
                 <object class="spacer">
@@ -354,6 +400,7 @@
                   
                   
                   
+                  
                   <size>0,20</size>
                 </object>
                 <object class="sizeritem">
@@ -365,6 +412,7 @@
                     
                     
                     
+                    
                     <label>3. Create panorama...</label>
                           
                           
@@ -373,6 +421,7 @@
                     
                     
                     
+                    
                     <tooltip>Create a high resolution panorama.</tooltip>
                         </object>
                         
@@ -387,12 +436,14 @@
               
               
               
+              
               <option>1</option>
               
               
               
               
               
+              
               <flag>wxEXPAND</flag>
                   </object>
             <object class="spacer">
@@ -403,17 +454,21 @@
               
               
               
+              
               <size>0,12</size>
                   </object>
             <object class="sizeritem">
               <object class="unknown" name="ass_druid">
+                
                 <hidden>1</hidden>
               </object>
               
               
+              
               <flag>wxRIGHT</flag>
               
               
+              
               <border>10</border>
             </object>
           </object>
@@ -423,18 +478,21 @@
         
         
         
+        
         <option>1</option>
         
         
         
         
         
+        
         <flag>wxLEFT|wxEXPAND</flag>
         
         
         
         
         
+        
         <border>10</border>
       </object>
     </object>
@@ -449,6 +507,7 @@
           <object class="sizeritem">
             <object class="wxStaticText">
               
+              
               <label>No information about focal length and field of view were
 found in the images. Please enter the data of your camera
 and lens below.</label>
@@ -456,6 +515,7 @@
           </object>
           <object class="spacer">
             
+            
             <size>0,10</size>
           </object>
           <object class="sizeritem">
@@ -465,15 +525,18 @@
                   
                   
                   
+                  
                   <label>Lens type:</label>
                   
                   
                   
+                  
                   <style>wxALIGN_RIGHT</style>
                 </object>
                 
                 
                 
+                
                 <flag>wxALIGN_CENTRE_VERTICAL</flag>
               </object>
               <object class="sizeritem">
@@ -481,6 +544,7 @@
                   
                   
                   
+                  
                   <content>
                     <item>Normal (rectilinear)</item>
                     <item>Panoramic (cylindrical)</item>
@@ -490,6 +554,7 @@
                   </content>
                 
                   
+                  
                   <selection>0</selection>
                 </object>
               </object>
@@ -499,16 +564,19 @@
             
             
             
+            
             <flag>wxLEFT|wxEXPAND</flag>
             
             
             
+            
             <border>12</border>
           </object>
           <object class="spacer">
             
             
             
+            
             <size>0,10</size>
           </object>
           <object class="sizeritem">
@@ -518,20 +586,24 @@
                   
                   
                   
+                  
                   <label>Focal length:</label>
                   
                   
                   
+                  
                   <style>wxALIGN_RIGHT</style>
                 </object>
                 
                 
                 
+                
                 <flag>wxALIGN_CENTRE_VERTICAL</flag>
               </object>
               <object class="sizeritem">
                 <object class="wxTextCtrl" name="lensdlg_focallength_text">
                   
+                  
                   <value>35</value>
                 </object>
               </object>
@@ -542,11 +614,13 @@
                   
                   
                   
+                  
                   <label>mm</label>
                 </object>
                 
                 
                 
+                
                 <flag>wxRIGHT|wxALIGN_CENTRE_VERTICAL</flag>
               </object>
               <object class="sizeritem">
@@ -554,20 +628,24 @@
                   
                   
                   
+                  
                   <label>Focal length multiplier:</label>
                 </object>
                 
                 
                 
+                
                 <flag>wxLEFT|wxALIGN_CENTRE_VERTICAL</flag>
                 
                 
                 
+                
                 <border>20</border>
               </object>
               <object class="sizeritem">
                 <object class="wxTextCtrl" name="lensdlg_crop_factor_text">
                   
+                  
                   <value>1</value>
                 </object>
               </object>
@@ -576,27 +654,32 @@
                   
                   
                   
+                  
                   <label>x</label>
                 </object>
                 
                 
                 
+                
                 <flag>wxRIGHT|wxALIGN_CENTRE_VERTICAL</flag>
               </object>
             </object>
             
             
             
+            
             <flag>wxLEFT|wxEXPAND</flag>
             
             
             
+            
             <border>12</border>
           </object>
           <object class="spacer">
             
             
             
+            
             <size>0,6</size>
           </object>
           <object class="sizeritem">
@@ -606,6 +689,7 @@
               
               
               
+              
               <label>Load lens data...</label>
                         
                             
@@ -613,28 +697,34 @@
               
                       
               
+              
               <style></style>
               
+              
               <enabled>0</enabled>
             </object>
                     
             
             
             
+            
             <flag>wxLEFT|wxALIGN_RIGHT</flag>
             
             
             
+            
             <border>12</border>
           </object>
         </object>
         
         
         
+        
         <flag>wxALL</flag>
         
         
         
+        
         <border>10</border>
       </object>
       <object class="sizeritem">
@@ -644,10 +734,12 @@
             
             
             
+            
             <size>0,0</size>
             
             
             
+            
             <option>1</option>
           </object>
           <object class="sizeritem">
@@ -655,25 +747,30 @@
               
               
               
+              
               <label></label>
             </object>
             
             
             
+            
             <flag>wxRIGHT</flag>
             
             
             
+            
             <border>8</border>
           </object>
         </object>
         
         
         
+        
         <flag>wxALL|wxEXPAND</flag>
         
         
         
+        
         <border>5</border>
       </object>
     </object>

Update of /cvsroot/hugin/hugin/src/include/PT
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv27927/src/include/PT

Modified Files:
	PanoramaMemento.h 
Log Message:
suggest output and project names based on input images
run align automatically after "load images" button on Assistant tab


Index: PanoramaMemento.h
===================================================================
RCS file: /cvsroot/hugin/hugin/src/include/PT/PanoramaMemento.h,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- PanoramaMemento.h	18 Dec 2006 23:15:30 -0000	1.60
+++ PanoramaMemento.h	21 Dec 2006 08:31:20 -0000	1.61
@@ -474,6 +474,8 @@
 
     DestPanoImage getDestImage() const;
 
+    const std::string & PanoramaOptions::getOutputExtension();
+
     // they are public, because they need to be set through
     // get/setOptions in Panorama.
 
@@ -505,6 +507,7 @@
 
 private:
     static const std::string fileformatNames[];
+    static const std::string fileformatExt[];
     double m_hfov;
 //    unsigned int m_width;
 //    unsigned int m_height;

Update of /cvsroot/hugin/hugin/src/include/hugin
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv27927/src/include/hugin

Modified Files:
	AssistantPanel.h MainFrame.h PanoPanel.h config_defaults.h 
	huginApp.h 
Log Message:
suggest output and project names based on input images
run align automatically after "load images" button on Assistant tab


Index: config_defaults.h
===================================================================
RCS file: /cvsroot/hugin/hugin/src/include/hugin/config_defaults.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- config_defaults.h	20 Dec 2006 19:31:28 -0000	1.32
+++ config_defaults.h	21 Dec 2006 08:31:20 -0000	1.33
@@ -30,6 +30,7 @@
 #define HUGIN_ASS_NCONTROLPOINTS             20l
 #define HUGIN_ASS_MAX_NORMAL_FOV            100.0
 #define HUGIN_ASS_PANO_DOWNSIZE_FACTOR        0.7
+#define HUGIN_ASS_AUTO_ALIGN                  1l
 
 // template matching
 #define HUGIN_FT_TEMPLATE_SIZE                21l

Index: MainFrame.h
===================================================================
RCS file: /cvsroot/hugin/hugin/src/include/hugin/MainFrame.h,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- MainFrame.h	17 Dec 2006 21:11:57 -0000	1.52
+++ MainFrame.h	21 Dec 2006 08:31:20 -0000	1.53
@@ -135,6 +135,7 @@
     void OnOptimize(wxCommandEvent & e);
     void OnDoStitch(wxCommandEvent & e);
     void OnTogglePreviewFrame(wxCommandEvent & e);
+    void OnAddImages(wxCommandEvent & e);
 
     void ShowCtrlPointEditor(unsigned int img1, unsigned int img2);
 
@@ -164,7 +165,6 @@
     void OnSavePTStitcherAs(wxCommandEvent & e);
     void OnLoadProject(wxCommandEvent & e);
     void OnNewProject(wxCommandEvent & e);
-    void OnAddImages(wxCommandEvent & e);
     void OnAddTimeImages(wxCommandEvent & e);
     void OnTextEdit(wxCommandEvent & e);
     void OnFineTuneAll(wxCommandEvent & e);

Index: AssistantPanel.h
===================================================================
RCS file: /cvsroot/hugin/hugin/src/include/hugin/AssistantPanel.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- AssistantPanel.h	17 Dec 2006 21:11:57 -0000	1.2
+++ AssistantPanel.h	21 Dec 2006 08:31:20 -0000	1.3
@@ -74,6 +74,7 @@
     Panorama &m_pano;
 
     // event handlers
+    void OnLoadImages( wxCommandEvent & e );
     void OnAlign( wxCommandEvent & e );
     void OnCreate( wxCommandEvent & e );
     void OnExifToggle( wxCommandEvent & e);

Index: PanoPanel.h
===================================================================
RCS file: /cvsroot/hugin/hugin/src/include/hugin/PanoPanel.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- PanoPanel.h	17 Dec 2006 10:49:51 -0000	1.45
+++ PanoPanel.h	21 Dec 2006 08:31:20 -0000	1.46
@@ -71,7 +71,8 @@
 
 
     // actions
-    void DoStitch(wxCommandEvent & e);
+    void DoStitch();
+
 
  private:
 
@@ -106,6 +107,8 @@
 // TODO remove
 //    void DoPreview(wxCommandEvent & e);
     void DoCalcFOV(wxCommandEvent & e);
+    void OnDoStitch(wxCommandEvent & e);
+
 
     /** set the highest sensible width
      */

Index: huginApp.h
===================================================================
RCS file: /cvsroot/hugin/hugin/src/include/hugin/huginApp.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- huginApp.h	23 Jul 2006 09:50:10 -0000	1.20
+++ huginApp.h	21 Dec 2006 08:31:20 -0000	1.21
@@ -45,6 +45,8 @@
 /// Restore window size and position from configfile/registry
 void RestoreFramePosition(wxTopLevelWindow * frame, const wxString & basename);
 
+///
+wxString getDefaultProjectName(const Panorama & pano);
 
 /** Resources Definition
  *

Update of /cvsroot/hugin/hugin/src/Panorama
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv27927/src/Panorama

Modified Files:
	PanoramaMemento.cpp 
Log Message:
suggest output and project names based on input images
run align automatically after "load images" button on Assistant tab


Index: PanoramaMemento.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/Panorama/PanoramaMemento.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- PanoramaMemento.cpp	20 Dec 2006 18:05:58 -0000	1.75
+++ PanoramaMemento.cpp	21 Dec 2006 08:31:19 -0000	1.76
@@ -418,13 +418,19 @@
 
 const std::string & PanoramaOptions::getFormatName(FileFormat f)
 {
-    assert((int)f <= (int)QTVR);
+    assert((int)f <= (int)HDR_m);
     return fileformatNames[(int) f];
 }
 
+const std::string & PanoramaOptions::getOutputExtension()
+{
+    assert((int)outputFormat <= (int)HDR_m);
+    return fileformatExt[(int) outputFormat];
+}
+
 PanoramaOptions::FileFormat PanoramaOptions::getFormatFromName(const std::string & name)
 {
-    int max = (int) QTVR;
+    int max = (int) HDR_m;
     int i;
     for (i=0; i<max; i++) {
         if (name == fileformatNames[i]) {
@@ -739,6 +745,28 @@
 };
 
 
+const string PanoramaOptions::fileformatExt[] =
+{
+    "jpg",
+    "png",
+    "tif",
+    "tif",
+    "tif",
+    "tif",
+    "tif",
+    "pict",
+    "psd",
+    "psd",
+    "psd",
+    "pan",
+    "ivr",
+    "IVR_java",
+    "wrl",
+    "mov",
+    "hdr",
+    "hdr"
+};
+
 struct ImgInfo
 {
 public: