Hugin

Revision: 4907
          http://hugin.svn.sourceforge.net/hugin/?rev=4907&view=rev
Author:   tmodes
Date:     2010-01-18 06:37:32 +0000 (Mon, 18 Jan 2010)

Log Message:
-----------
Extended cp detectors to allow also 2 step detectors (e.g. generatekeys + autopano)

Modified Paths:
--------------
    hugin/trunk/src/hugin1/hugin/AutoCtrlPointCreator.cpp
    hugin/trunk/src/hugin1/hugin/AutoCtrlPointCreator.h
    hugin/trunk/src/hugin1/hugin/CPDetectorConfig.cpp
    hugin/trunk/src/hugin1/hugin/CPDetectorConfig.h
    hugin/trunk/src/hugin1/hugin/CPDetectorConfig_default.h
    hugin/trunk/src/hugin1/hugin/xrc/cpdetector_dialog.xrc

Modified: hugin/trunk/src/hugin1/hugin/AutoCtrlPointCreator.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/AutoCtrlPointCreator.cpp	2010-01-17 22:23:48 UTC (rev 4906)
+++ hugin/trunk/src/hugin1/hugin/AutoCtrlPointCreator.cpp	2010-01-18 06:37:32 UTC (rev 4907)
@@ -122,6 +122,16 @@
 }
 #endif
 
+wxString GetProgPath(wxString progName)
+{
+#if defined MAC_SELF_CONTAINED_BUNDLE
+    wxString bundled=GetBundledProg(progName);
+    if(!bundled.IsEmpty())
+        return bundled;
+#endif
+    return progName;
+};
+
 bool CanStartProg(wxString progName,wxWindow* parent)
 {
 #if defined MAC_SELF_CONTAINED_BUNDLE
@@ -170,9 +180,12 @@
 {
     CPVector cps;
     CPDetectorType t = setting.GetType();
-    //check, if the cp generator exists
+    //check, if the cp generators exists
     if(!CanStartProg(setting.GetProg(),parent))
         return cps;
+    if(setting.IsTwoStepDetector())
+        if(!CanStartProg(setting.GetProgMatcher(),parent))
+            return cps;
     if(t==CPDetector_AutoPanoSiftStack || t==CPDetector_AutoPanoSiftMultiRowStack)
         if(!setting.GetProgStack().IsEmpty())
             if(!CanStartProg(setting.GetProgStack(),parent))
@@ -226,6 +239,23 @@
     return cps;
 }
 
+void RemoveKeyfiles(vector<wxString> &keyFiles)
+{
+    if(keyFiles.size()>0)
+    {
+        for(unsigned int i=0;i<keyFiles.size();i++)
+        {
+            if(wxFileExists(keyFiles[i]))
+            {
+                if(!wxRemoveFile(keyFiles[i]))
+                {
+                    DEBUG_DEBUG("could not remove temporary file: " << keyFiles[i].c_str());
+                };
+            };
+        };
+    };
+};
+        
 CPVector AutoPanoSift::automatch(CPDetectorSetting &setting, Panorama & pano, const UIntSet & imgs,
                                      int nFeatures, int & ret_value, wxWindow *parent)
 {
@@ -234,20 +264,21 @@
         return cps;
     }
     // create suitable command line..
-#if defined MAC_SELF_CONTAINED_BUNDLE
-    wxString autopanoExe = GetBundledProg(setting.GetProg());
-    if(autopanoExe.IsEmpty())
-        autopanoExe = setting.GetProg();
-#else
-    wxString autopanoExe = setting.GetProg();
-#endif
+    wxString autopanoExe = GetProgPath(setting.GetProg());
+    if(setting.IsTwoStepDetector())
+    {
+        std::vector<wxString> keyFiles(pano.getNrOfImages());
+        cps=automatch(setting, pano, imgs, nFeatures, keyFiles, ret_value, parent);
+        RemoveKeyfiles(keyFiles);
+        return cps;
+    };
     wxString autopanoArgs = setting.GetArgs();
     
 #ifdef __WXMSW__
     // remember cwd.
     wxString cwd = wxGetCwd();
     wxString apDir = wxPathOnly(autopanoExe);
-    if (apDir.Length() > 0) {
+    if (apDir.Len() > 0) {
         wxSetWorkingDirectory(apDir);
     }
 #endif
@@ -393,7 +424,186 @@
     return cps;
 }
 
+CPVector AutoPanoSift::automatch(CPDetectorSetting &setting, PT::Panorama & pano, const PT::UIntSet & imgs,
+                           int nFeatures, vector<wxString> &keyFiles, int & ret_value, wxWindow *parent)
+{
+    CPVector cps;
+    if (imgs.size() == 0) 
+    {
+        return cps;
+    }
+    DEBUG_ASSERT(keyFiles.size()==pano.getNrOfImages());
+    // create suitable command line..
+    wxString generateKeysExe=GetProgPath(setting.GetProg());
+    wxString matcherExe = GetProgPath(setting.GetProgMatcher());
+    wxString generateKeysArgs=setting.GetArgs();
+    wxString matcherArgs = setting.GetArgsMatcher();
+    
+#ifdef __WXMSW__
+    // remember cwd.
+    wxString cwd = wxGetCwd();
+    wxString apDir = wxPathOnly(generateKeysExe);
+    if (apDir.Len() > 0) 
+    {
+        wxSetWorkingDirectory(apDir);
+    }
+#endif
 
+    wxString tempDir= wxConfigBase::Get()->Read(wxT("tempDir"),wxT(""));
+    if(!tempDir.IsEmpty())
+        if(tempDir.Last()!=wxFileName::GetPathSeparator())
+            tempDir.Append(wxFileName::GetPathSeparator());
+    //check arguments
+    if(generateKeysArgs.Find(wxT("%i"))==wxNOT_FOUND || generateKeysArgs.Find(wxT("%k"))==wxNOT_FOUND)
+    {
+        wxMessageBox(_("Please use %i to specify the input files and %k to specify the keypoint file for generate keys step"),
+                     _("Error in control point detector command"), wxOK | wxICON_ERROR,parent);
+        return cps;
+    };
+    if(matcherArgs.Find(wxT("%k"))==wxNOT_FOUND || matcherArgs.Find(wxT("%o"))==wxNOT_FOUND)
+    {
+        wxMessageBox(_("Please use %k to specify the keypoint files and %o to specify the output project file for the matching step"),
+                     _("Error in control point detector command"), wxOK | wxICON_ERROR,parent);
+        return cps;
+    };
+
+    ret_value=0;
+    for(UIntSet::const_iterator img=imgs.begin();img!=imgs.end();img++)
+    {
+        if(keyFiles[*img].IsEmpty())
+        {
+            //no key files exists, so generate it
+            wxString keyfile=wxFileName::CreateTempFileName(tempDir+wxT("apk_"));
+            keyFiles[*img]=keyfile;
+            wxString cmd=generateKeysArgs;
+            wxString tmp;
+            tmp.Printf(wxT("%d"), nFeatures);
+            cmd.Replace(wxT("%p"), tmp);
+
+            SrcPanoImage srcImg = pano.getSrcImage(*img);
+            tmp.Printf(wxT("%f"), srcImg.getHFOV());
+            cmd.Replace(wxT("%v"), tmp);
+
+            tmp.Printf(wxT("%d"), (int) srcImg.getProjection());
+            cmd.Replace(wxT("%f"), tmp);
+            
+            cmd.Replace(wxT("%i"),wxQuoteFilename(wxString(srcImg.getFilename().c_str(), HUGIN_CONV_FILENAME)));
+            cmd.Replace(wxT("%k"),wxQuoteFilename(keyfile));
+            // use MyExternalCmdExecDialog
+            ret_value = MyExecuteCommandOnDialog(generateKeysExe, cmd, parent,  _("generating key file"));
+            cmd=generateKeysExe+wxT(" ")+cmd;
+            if (ret_value == HUGIN_EXIT_CODE_CANCELLED) 
+                return cps;
+            else
+                if (ret_value == -1) 
+                {
+                    wxMessageBox( wxString::Format(_("Could not execute command: %s"),cmd.c_str()), _("wxExecute Error"), 
+                        wxOK | wxICON_ERROR, parent);
+                    return cps;
+                } 
+                else
+                    if (ret_value > 0) 
+                    {
+                        wxMessageBox(wxString::Format(_("Command: %s\nfailed with error code: %d"),cmd.c_str(),ret_value),
+                            _("wxExecute Error"), wxOK | wxICON_ERROR, parent);
+                        return cps;
+                    };
+        };
+    };
+
+    // TODO: create a secure temporary filename here
+    wxString ptofile = wxFileName::CreateTempFileName(wxT("ap_res"));
+    matcherArgs.Replace(wxT("%o"), ptofile);
+    wxString tmp;
+    tmp.Printf(wxT("%d"), nFeatures);
+    matcherArgs.Replace(wxT("%p"), tmp);
+
+    SrcPanoImage firstImg = pano.getSrcImage(*imgs.begin());
+    tmp.Printf(wxT("%f"), firstImg.getHFOV());
+    matcherArgs.Replace(wxT("%v"), tmp);
+
+    tmp.Printf(wxT("%d"), (int) firstImg.getProjection());
+    matcherArgs.Replace(wxT("%f"), tmp);
+
+    // build a list of all image files, and a corrosponding connection map.
+    // local img nr -> global (panorama) img number
+    std::map<int,int> imgMapping;
+
+    wxString imgFiles;
+    int imgNr=0;
+    for(UIntSet::const_iterator it = imgs.begin(); it != imgs.end(); it++)
+    {
+        imgMapping[imgNr] = *it;
+        imgFiles.append(wxT(" ")).append(wxQuoteFilename(keyFiles[*it]));
+        imgNr++;
+     };
+     matcherArgs.Replace(wxT("%k"), wxString (imgFiles.c_str(), HUGIN_CONV_FILENAME));
+
+#ifdef __WXMSW__
+    if (matcherArgs.size() > 32000) {
+        wxMessageBox(_("Command line for control point detector too long.\nThis is a windows limitation\nPlease select less images, or place the images in a folder with\na shorter pathname"),
+                     _("Too many images selected"),
+                     wxCANCEL | wxICON_ERROR, parent );
+        return cps;
+    }
+    apDir = wxPathOnly(matcherExe);
+    if (apDir.Len() > 0) {
+        wxSetWorkingDirectory(apDir);
+    }
+#endif
+
+    wxString cmd = matcherExe + wxT(" ") + matcherArgs;
+    DEBUG_DEBUG("Executing: " << matcherExe.mb_str(wxConvLocal) << " " << matcherArgs.mb_str(wxConvLocal));
+
+    wxArrayString arguments = wxCmdLineParser::ConvertStringToArgs(matcherArgs);
+    if (arguments.GetCount() > 127) {
+        DEBUG_ERROR("Too many arguments for call to wxExecute()");
+        wxMessageBox(wxString::Format(_("Too many arguments (images). Try using a cp generator setting which supports the %%s parameter in preferences.\n\n Could not execute command: %s"), matcherExe.c_str()), _("wxExecute Error"), wxOK | wxICON_ERROR, parent);
+        return cps;
+    }
+
+    // use MyExternalCmdExecDialog
+    ret_value = MyExecuteCommandOnDialog(matcherExe, matcherArgs, parent,  _("finding control points"));
+
+    if (ret_value == HUGIN_EXIT_CODE_CANCELLED) 
+        return cps;
+    else 
+        if (ret_value == -1) 
+        {
+            wxMessageBox( wxString::Format(_("Could not execute command: %s"),cmd.c_str()), _("wxExecute Error"), 
+                wxOK | wxICON_ERROR, parent);
+            return cps;
+        } 
+        else
+            if (ret_value > 0) 
+            {
+                wxMessageBox(wxString::Format(_("Command: %s\nfailed with error code: %d"),cmd.c_str(),ret_value),
+                     _("wxExecute Error"), wxOK | wxICON_ERROR, parent);
+                return cps;
+            };
+
+    if (! wxFileExists(ptofile.c_str()))
+    {
+        wxMessageBox(wxString::Format(_("Could not open %s for reading\nThis is an indicator that the control point detector call failed,\nor wrong command line parameters have been used.\n\nExecuted command: %s"),ptofile.c_str(),cmd.c_str()),
+                     _("Control point detector failure"), wxOK | wxICON_ERROR, parent );
+        return cps;
+    }
+
+    // read and update control points
+    cps = readUpdatedControlPoints((const char *)ptofile.mb_str(HUGIN_CONV_FILENAME), pano);
+
+#ifdef __WXMSW__
+	// set old cwd.
+	wxSetWorkingDirectory(cwd);
+#endif
+
+    if (!wxRemoveFile(ptofile)) {
+        DEBUG_DEBUG("could not remove temporary file: " << ptofile.c_str());
+    }
+
+    return cps;
+};
+
 CPVector AutoPanoKolor::automatch(CPDetectorSetting &setting, Panorama & pano, const UIntSet & imgs,
                               int nFeatures, int & ret_value, wxWindow *parent)
 {
@@ -609,6 +819,7 @@
     {
         return cps;
     };
+    std::vector<wxString> keyFiles(pano.getNrOfImages());
     //generate cp for every consecutive image pair
     unsigned int counter=0;
     for(UIntSet::const_iterator it = imgs.begin(); it != imgs.end(); )
@@ -624,11 +835,17 @@
         AutoPanoSift matcher;
         CPVector new_cps;
         new_cps.clear();
-        new_cps=matcher.automatch(setting, pano, ImagePair, nFeatures, ret_value, parent);
+        if(setting.IsTwoStepDetector())
+            new_cps=matcher.automatch(setting, pano, ImagePair, nFeatures, keyFiles, ret_value, parent);
+        else
+            new_cps=matcher.automatch(setting, pano, ImagePair, nFeatures, ret_value, parent);
         if(new_cps.size()>0)
             AddControlPointsWithCheck(cps,new_cps);
         if(ret_value!=0)
+        {
+            RemoveKeyfiles(keyFiles);
             return cps;
+        };
     };
     // now connect all image groups
     // generate temporary panorama to add all found cps
@@ -653,11 +870,17 @@
         };
         AutoPanoSift matcher;
         CPVector new_cps;
-        new_cps=matcher.automatch(setting, optPano, ImagesGroups, nFeatures, ret_value, parent);
+        if(setting.IsTwoStepDetector())
+            new_cps=matcher.automatch(setting, optPano, ImagesGroups, nFeatures, keyFiles, ret_value, parent);
+        else
+            new_cps=matcher.automatch(setting, optPano, ImagesGroups, nFeatures, ret_value, parent);
         if(new_cps.size()>0)
             AddControlPointsWithCheck(cps,new_cps,&optPano);
         if(ret_value!=0)
+        {
+            RemoveKeyfiles(keyFiles);
             return cps;
+        };
         createCPGraph(optPano,graph);
         n=findCPComponents(graph, comps);
     };
@@ -708,12 +931,21 @@
         CPDetectorSetting newSetting;
         newSetting.SetProg(setting.GetProg());
         newSetting.SetArgs(setting.GetArgs());
+        if(setting.IsTwoStepDetector())
+        {
+            newSetting.SetProgMatcher(setting.GetProgMatcher());
+            newSetting.SetArgsMatcher(setting.GetArgsMatcher());
+        };
         newSetting.SetOption(true);
         CPVector new_cps;
-        new_cps=matcher.automatch(newSetting, optPano, imgs, nFeatures, ret_value, parent);
+        if(setting.IsTwoStepDetector())
+            new_cps=matcher.automatch(newSetting, optPano, imgs, nFeatures, keyFiles, ret_value, parent);
+        else
+            new_cps=matcher.automatch(newSetting, optPano, imgs, nFeatures, ret_value, parent);
         if(new_cps.size()>0)
             AddControlPointsWithCheck(cps,new_cps);
     };
+    RemoveKeyfiles(keyFiles);
     return cps;
 };
 
@@ -808,9 +1040,18 @@
 CPVector AutoPanoSiftPreAlign::automatch(CPDetectorSetting &setting, Panorama & pano, const UIntSet & imgs,
                                      int nFeatures, int & ret_value, wxWindow *parent)
 {
+    std::vector<wxString> keyFiles(pano.getNrOfImages());
+    return automatch(setting, pano, imgs, nFeatures, keyFiles, ret_value, parent);
+};
+
+CPVector AutoPanoSiftPreAlign::automatch(CPDetectorSetting &setting, Panorama & pano, const UIntSet & imgs,
+                                         int nFeatures, std::vector<wxString> &keyFiles, int & ret_value, wxWindow *parent)
+{
     CPVector cps;
     if (imgs.size()<2) 
         return cps;
+    DEBUG_ASSERT(keyFiles.size()==pano.getNrOfImages());
+
     vector<UIntSet> usedImages;
     usedImages.resize(pano.getNrOfImages());
     if(setting.GetOption())
@@ -857,11 +1098,19 @@
             for(UIntSet::const_iterator img_it2=images.begin();img_it2!=images.end();img_it2++)
                 usedImages[*img_it].insert(*img_it2);
         AutoPanoSift matcher;
-        CPVector new_cps=matcher.automatch(setting, pano, images, nFeatures, ret_value, parent);
+        CPVector new_cps;
+        if(setting.IsTwoStepDetector())
+            new_cps=matcher.automatch(setting, pano, images, nFeatures, keyFiles, ret_value, parent);
+        else
+            new_cps=matcher.automatch(setting, pano, images, nFeatures, ret_value, parent);
         if(new_cps.size()>0)
             AddControlPointsWithCheck(cps,new_cps);
         if(ret_value!=0)
+        {
+            RemoveKeyfiles(keyFiles);
             return cps;
+        };
     };
+    RemoveKeyfiles(keyFiles);
     return cps;
 };

Modified: hugin/trunk/src/hugin1/hugin/AutoCtrlPointCreator.h
===================================================================
--- hugin/trunk/src/hugin1/hugin/AutoCtrlPointCreator.h	2010-01-17 22:23:48 UTC (rev 4906)
+++ hugin/trunk/src/hugin1/hugin/AutoCtrlPointCreator.h	2010-01-18 06:37:32 UTC (rev 4907)
@@ -75,6 +75,8 @@
 
     virtual CPVector automatch(CPDetectorSetting &setting, PT::Panorama & pano, const PT::UIntSet & imgs,
                            int nFeatures, int & ret_value, wxWindow *parent=NULL);
+    virtual CPVector automatch(CPDetectorSetting &setting, PT::Panorama & pano, const PT::UIntSet & imgs,
+                           int nFeatures, std::vector<wxString> &keyFiles, int & ret_value, wxWindow *parent=NULL);
 
 private:
 
@@ -180,6 +182,8 @@
 
     virtual CPVector automatch(CPDetectorSetting &setting, PT::Panorama & pano, const PT::UIntSet & imgs,
                            int nFeatures, int & ret_value, wxWindow *parent=NULL);
+    virtual CPVector automatch(CPDetectorSetting &setting, PT::Panorama & pano, const PT::UIntSet & imgs,
+                           int nFeatures, std::vector<wxString> &keyFiles, int & ret_value, wxWindow *parent=NULL);
 
 private:
 

Modified: hugin/trunk/src/hugin1/hugin/CPDetectorConfig.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/CPDetectorConfig.cpp	2010-01-17 22:23:48 UTC (rev 4906)
+++ hugin/trunk/src/hugin1/hugin/CPDetectorConfig.cpp	2010-01-18 06:37:32 UTC (rev 4907)
@@ -144,6 +144,8 @@
             desc=default_cpdetectors[new_type].desc;
             prog=default_cpdetectors[new_type].prog;
             args=default_cpdetectors[new_type].args;
+            prog_matcher=default_cpdetectors[new_type].prog_matcher;
+            args_matcher=default_cpdetectors[new_type].args_matcher;
             if(type==CPDetector_AutoPanoSiftStack || type==CPDetector_AutoPanoSiftMultiRowStack)
             {
                 prog_stack=default_cpdetectors[new_type].prog_stack;
@@ -156,15 +158,42 @@
             };
             option=default_cpdetectors[new_type].option;
         };
+    }
+    else
+    {
+        type=CPDetector_AutoPanoSift;
+        desc=wxEmptyString;
+        prog=wxEmptyString;
+        args=wxEmptyString;
+        prog_matcher=wxEmptyString;
+        args_matcher=wxEmptyString;
+        prog_stack=wxEmptyString;
+        args_stack=wxEmptyString;
+        option=true;
     };
+    CheckValues();
 };
 
+void CPDetectorSetting::CheckValues()
+{
+    if(type==CPDetector_AutoPano)
+    {
+        if(!prog_matcher.IsEmpty())
+        {
+            prog_matcher=wxEmptyString;
+            args_matcher=wxEmptyString;
+        };
+    };
+};
+
 void CPDetectorSetting::Read(wxConfigBase *config, wxString path)
 {
     type=(CPDetectorType)config->Read(path+wxT("/Type"),default_cpdetectors[0].type);
     desc=config->Read(path+wxT("/Description"),default_cpdetectors[0].desc);
     prog=config->Read(path+wxT("/Program"),default_cpdetectors[0].prog);
     args=config->Read(path+wxT("/Arguments"),default_cpdetectors[0].args);
+    prog_matcher=config->Read(path+wxT("/ProgramMatcher"),default_cpdetectors[0].prog_matcher);
+    args_matcher=config->Read(path+wxT("/ArgumentsMatcher"),default_cpdetectors[0].args_matcher);
     if(type==CPDetector_AutoPanoSiftStack || type==CPDetector_AutoPanoSiftMultiRowStack)
     {
         prog_stack=config->Read(path+wxT("/ProgramStack"),default_cpdetectors[0].prog_stack);
@@ -176,6 +205,7 @@
         args_stack=wxEmptyString;
     };
     option=config->Read(path+wxT("/Option"),default_cpdetectors[0].option);
+    CheckValues();
 };
 
 void CPDetectorSetting::Write(wxConfigBase *config, wxString path)
@@ -184,6 +214,8 @@
     config->Write(path+wxT("/Description"),desc);
     config->Write(path+wxT("/Program"),prog);
     config->Write(path+wxT("/Arguments"),args);
+    config->Write(path+wxT("/ProgramMatcher"),prog_matcher);
+    config->Write(path+wxT("/ArgumentsMatcher"),args_matcher);
     if(type==CPDetector_AutoPanoSiftStack || type==CPDetector_AutoPanoSiftMultiRowStack)
     {
         config->Write(path+wxT("/ProgramStack"),prog_stack);
@@ -197,8 +229,11 @@
 BEGIN_EVENT_TABLE(CPDetectorDialog,wxDialog)
     EVT_BUTTON(wxID_OK, CPDetectorDialog::OnOk)
     EVT_BUTTON(XRCID("prefs_cpdetector_program_select"),CPDetectorDialog::OnSelectPath)
+    EVT_BUTTON(XRCID("prefs_cpdetector_program_descriptor_select"),CPDetectorDialog::OnSelectPathDescriptor)
+    EVT_BUTTON(XRCID("prefs_cpdetector_program_matcher_select"),CPDetectorDialog::OnSelectPathMatcher)
     EVT_BUTTON(XRCID("prefs_cpdetector_program_stack_select"),CPDetectorDialog::OnSelectPathStack)
     EVT_CHOICE(XRCID("prefs_cpdetector_type"),CPDetectorDialog::OnTypeChange)
+    EVT_CHOICEBOOK_PAGE_CHANGING(XRCID("choicebook_steps"),CPDetectorDialog::OnStepChanging)
 END_EVENT_TABLE()
 
 CPDetectorDialog::CPDetectorDialog(wxWindow* parent)
@@ -217,10 +252,15 @@
     m_edit_desc = XRCCTRL(*this, "prefs_cpdetector_desc", wxTextCtrl);
     m_edit_prog = XRCCTRL(*this, "prefs_cpdetector_program", wxTextCtrl);
     m_edit_args = XRCCTRL(*this, "prefs_cpdetector_args", wxTextCtrl);
+    m_edit_prog_descriptor = XRCCTRL(*this, "prefs_cpdetector_program_descriptor", wxTextCtrl);
+    m_edit_args_descriptor = XRCCTRL(*this, "prefs_cpdetector_args_descriptor", wxTextCtrl);
+    m_edit_prog_matcher = XRCCTRL(*this, "prefs_cpdetector_program_matcher", wxTextCtrl);
+    m_edit_args_matcher = XRCCTRL(*this, "prefs_cpdetector_args_matcher", wxTextCtrl);
     m_edit_prog_stack = XRCCTRL(*this, "prefs_cpdetector_program_stack", wxTextCtrl);
     m_edit_args_stack = XRCCTRL(*this, "prefs_cpdetector_args_stack", wxTextCtrl);
     m_check_option = XRCCTRL(*this, "prefs_cpdetector_option", wxCheckBox);
     m_cpdetector_type = XRCCTRL(*this, "prefs_cpdetector_type", wxChoice);
+    m_choice_step = XRCCTRL(*this, "choicebook_steps", wxChoicebook);
     m_cpdetector_type->SetSelection(1);
     ChangeType();
 };
@@ -242,8 +282,20 @@
 #endif
     bool valid=true;
     valid=valid && (m_edit_desc->GetValue().Trim().Len()>0);
-    valid=valid && (m_edit_prog->GetValue().Trim().Len()>0);
-    valid=valid && (m_edit_args->GetValue().Trim().Len()>0);
+    if(m_choice_step->GetSelection()==0)
+    {
+        //detector with one step
+        valid=valid && (m_edit_prog->GetValue().Trim().Len()>0);
+        valid=valid && (m_edit_args->GetValue().Trim().Len()>0);
+    }
+    else
+    {
+        //detector with two steps
+        valid=valid && (m_edit_prog_descriptor->GetValue().Trim().Len()>0);
+        valid=valid && (m_edit_prog_matcher->GetValue().Trim().Len()>0);
+        valid=valid && (m_edit_args_descriptor->GetValue().Trim().Len()>0);
+        valid=valid && (m_edit_args_matcher->GetValue().Trim().Len()>0);
+    };
     int type=m_cpdetector_type->GetSelection();
     if(type==CPDetector_AutoPanoSiftStack || type==CPDetector_AutoPanoSiftMultiRowStack)
         if(m_edit_prog_stack->GetValue().Trim().Len()>0)
@@ -258,8 +310,21 @@
 void CPDetectorDialog::UpdateFields(CPDetectorConfig* cpdet_config,int index)
 {
     m_edit_desc->SetValue(cpdet_config->settings[index].GetCPDetectorDesc());
-    m_edit_prog->SetValue(cpdet_config->settings[index].GetProg());
-    m_edit_args->SetValue(cpdet_config->settings[index].GetArgs());
+    //program names and arguments
+    if(cpdet_config->settings[index].IsTwoStepDetector())
+    {
+        m_choice_step->SetSelection(1);
+        m_edit_prog_descriptor->SetValue(cpdet_config->settings[index].GetProg());
+        m_edit_prog_matcher->SetValue(cpdet_config->settings[index].GetProgMatcher());
+        m_edit_args_descriptor->SetValue(cpdet_config->settings[index].GetArgs());
+        m_edit_args_matcher->SetValue(cpdet_config->settings[index].GetArgsMatcher());
+    }
+    else
+    {
+        m_choice_step->SetSelection(0);
+        m_edit_prog->SetValue(cpdet_config->settings[index].GetProg());
+        m_edit_args->SetValue(cpdet_config->settings[index].GetArgs());
+    };
     int type=cpdet_config->settings[index].GetType();
     if(type==CPDetector_AutoPanoSiftStack || type==CPDetector_AutoPanoSiftMultiRowStack)
     {
@@ -274,9 +339,19 @@
 void CPDetectorDialog::UpdateSettings(CPDetectorConfig* cpdet_config,int index)
 {
     cpdet_config->settings[index].SetCPDetectorDesc(m_edit_desc->GetValue().Trim());
-    cpdet_config->settings[index].SetProg(m_edit_prog->GetValue().Trim());
-    cpdet_config->settings[index].SetArgs(m_edit_args->GetValue().Trim());
     cpdet_config->settings[index].SetType((CPDetectorType)m_cpdetector_type->GetSelection());
+    if(m_choice_step->GetSelection()==0)
+    {
+        cpdet_config->settings[index].SetProg(m_edit_prog->GetValue().Trim());
+        cpdet_config->settings[index].SetArgs(m_edit_args->GetValue().Trim());
+    }
+    else
+    {
+        cpdet_config->settings[index].SetProg(m_edit_prog_descriptor->GetValue().Trim());
+        cpdet_config->settings[index].SetArgs(m_edit_args_descriptor->GetValue().Trim());
+        cpdet_config->settings[index].SetProgMatcher(m_edit_prog_matcher->GetValue().Trim());
+        cpdet_config->settings[index].SetArgsMatcher(m_edit_args_matcher->GetValue().Trim());
+    };
     CPDetectorType type=cpdet_config->settings[index].GetType();
     if(type==CPDetector_AutoPanoSiftStack || type==CPDetector_AutoPanoSiftMultiRowStack)
     {
@@ -294,70 +369,102 @@
 void CPDetectorDialog::ChangeType()
 {
     int type=m_cpdetector_type->GetSelection();
-    wxPanel* panel=XRCCTRL(*this,"panel_stack",wxPanel);
+    if(type==CPDetector_AutoPano)
+    {
+        m_choice_step->SetSelection(0);
+        twoStepAllowed=false;
+    }
+    else
+        twoStepAllowed=true;
     bool isActive=(type==CPDetector_AutoPanoSiftStack || type==CPDetector_AutoPanoSiftMultiRowStack);
-    panel->Show(isActive);
-    panel->Enable(isActive);
-    panel=XRCCTRL(*this,"panel_option",wxPanel);
-    isActive=(type==CPDetector_AutoPanoSiftMultiRow || type==CPDetector_AutoPanoSiftMultiRowStack
-        || type==CPDetector_AutoPanoSiftPreAlign);
-    panel->Show(isActive);
-    panel->Enable(isActive);
+    XRCCTRL(*this,"panel_stack",wxPanel)->Enable(isActive);
     switch(type)
     {
         case CPDetector_AutoPanoSiftMultiRow:
         case CPDetector_AutoPanoSiftMultiRowStack:
             m_check_option->SetLabel(_("Try to connect all overlapping images."));
+            m_check_option->Enable(true);
+            m_check_option->Show(true);
+            XRCCTRL(*this, "prefs_cpdetector_no_option",wxStaticText)->Show(false);
             break;
         case CPDetector_AutoPanoSiftPreAlign:
             m_check_option->SetLabel(_("Only work on image pairs without control points."));
+            m_check_option->Enable(true);
+            m_check_option->Show(true);
+            XRCCTRL(*this, "prefs_cpdetector_no_option",wxStaticText)->Show(false);
             break;
+        default:
+            XRCCTRL(*this, "prefs_cpdetector_no_option",wxStaticText)->Show(true);
+            m_check_option->Enable(false);
+            m_check_option->Show(false);
+            break;
     };
+    m_check_option->GetParent()->Layout();
     Layout();
 };
 
-void CPDetectorDialog::OnSelectPath(wxCommandEvent &e)
+
+bool CPDetectorDialog::ShowFileDialog(wxString & prog)
 {
-    wxFileName executable(m_edit_prog->GetValue());
+    wxFileName executable(prog);
 #ifdef MAC_SELF_CONTAINED_BUNDLE
-	wxString autopanoPath = MacGetPathToUserAppSupportAutoPanoFolder();
+    wxString autopanoPath = MacGetPathToUserAppSupportAutoPanoFolder();
 #endif
     wxFileDialog dlg(this,_("Select control point detector program"), 
 #ifdef MAC_SELF_CONTAINED_BUNDLE
-			autopanoPath,
-#else					 
-			executable.GetPath(),
+            autopanoPath,
+#else
+            executable.GetPath(),
 #endif
-			executable.GetFullName(),
+            executable.GetFullName(),
 #ifdef __WXMSW__
-             _("Executables (*.exe,*.vbs,*.cmd, *.bat)|*.exe;*.vbs;*.cmd;*.bat"),
+            _("Executables (*.exe,*.vbs,*.cmd, *.bat)|*.exe;*.vbs;*.cmd;*.bat"),
 #else
-             wxT(""),
+            wxT(""),
 #endif
-             wxOPEN, wxDefaultPosition);
+            wxOPEN, wxDefaultPosition);
     if (dlg.ShowModal() == wxID_OK)
-        m_edit_prog->SetValue(dlg.GetPath());
+    {
+        prog=dlg.GetPath();
+        return true;
+    }
+    else
+        return false;
 };
 
+void CPDetectorDialog::OnSelectPath(wxCommandEvent &e)
+{
+    wxString prog=m_edit_prog->GetValue();
+    if (ShowFileDialog(prog))
+        m_edit_prog->SetValue(prog);
+};
+
+void CPDetectorDialog::OnSelectPathDescriptor(wxCommandEvent &e)
+{
+    wxString prog=m_edit_prog_descriptor->GetValue();
+    if (ShowFileDialog(prog))
+        m_edit_prog_descriptor->SetValue(prog);
+};
+
+void CPDetectorDialog::OnSelectPathMatcher(wxCommandEvent &e)
+{
+    wxString prog=m_edit_prog_matcher->GetValue();
+    if (ShowFileDialog(prog))
+        m_edit_prog_matcher->SetValue(prog);
+};
+
 void CPDetectorDialog::OnSelectPathStack(wxCommandEvent &e)
 {
-    wxFileName executable(m_edit_prog_stack->GetValue());
-#ifdef MAC_SELF_CONTAINED_BUNDLE
-	wxString autopanoPath = MacGetPathToUserAppSupportAutoPanoFolder();
-#endif
-    wxFileDialog dlg(this,_("Select control point detector program"), 
-#ifdef MAC_SELF_CONTAINED_BUNDLE
-			autopanoPath,
-#else					 
-			executable.GetPath(),
-#endif
-			executable.GetFullName(),
-#ifdef __WXMSW__
-             _("Executables (*.exe,*.vbs,*.cmd, *.bat)|*.exe;*.vbs;*.cmd;*.bat"),
-#else
-             wxT(""),
-#endif
-             wxOPEN, wxDefaultPosition);
-    if (dlg.ShowModal() == wxID_OK)
-        m_edit_prog_stack->SetValue(dlg.GetPath());
+    wxString prog=m_edit_prog_stack->GetValue();
+    if (ShowFileDialog(prog))
+        m_edit_prog_stack->SetValue(prog);
 };
+
+void CPDetectorDialog::OnStepChanging(wxChoicebookEvent &e)
+{
+    if(!twoStepAllowed && e.GetOldSelection()==0)
+    {
+        wxBell();
+        e.Veto();
+    };
+};

Modified: hugin/trunk/src/hugin1/hugin/CPDetectorConfig.h
===================================================================
--- hugin/trunk/src/hugin1/hugin/CPDetectorConfig.h	2010-01-17 22:23:48 UTC (rev 4906)
+++ hugin/trunk/src/hugin1/hugin/CPDetectorConfig.h	2010-01-18 06:37:32 UTC (rev 4907)
@@ -33,6 +33,7 @@
 #include "panoinc_WX.h"
 
 #include <wx/dynarray.h>
+#include <wx/choicebk.h>
 
 enum CPDetectorType
 {
@@ -61,18 +62,26 @@
     const wxString GetCPDetectorDesc() {return desc; };
     /** sets description of this setting */
     void SetCPDetectorDesc(wxString new_desc) { desc=new_desc; };
-    /** return program of this setting (program name) */
+    /** return type of this setting */
+    const CPDetectorType GetType() {return type; };
+    /** sets type of this setting */
+    void SetType(CPDetectorType new_type) { type=new_type;};
+    /** return program for one step detector or feature descriptor */
     const wxString GetProg() {return prog; };
-    /** sets program of this setting */
+    /** sets program for one step detector or feature descriptor */
     void SetProg(wxString new_prog) { prog=new_prog; };
-    /** return arguments of this setting */
+    /** return arguments of one step detector or feature descriptor */
     const wxString GetArgs() {return args; };
-    /** sets arguments of this setting */
+    /** sets arguments of one step detector or feature descriptor */
     void SetArgs(wxString new_args) { args=new_args; };
-    /** return type of this setting */
-    const CPDetectorType GetType() {return type; };
-    /** sets type of this setting */
-    void SetType(CPDetectorType new_type) { type=new_type;};
+    /** return program for feature matcher */
+    const wxString GetProgMatcher() {return prog_matcher; };
+    /** sets program for feature matcher */
+    void SetProgMatcher(wxString new_prog) { prog_matcher=new_prog; };
+    /** return arguments for feature matcher */
+    const wxString GetArgsMatcher() {return args_matcher; };
+    /** sets arguments for feature matcher */
+    void SetArgsMatcher(wxString new_args) { args_matcher=new_args; };
     /** return program name, which works on stacks */
     const wxString GetProgStack() {return prog_stack; };
     /** sets program for detecting cp in stacks */
@@ -85,11 +94,16 @@
     const bool GetOption() { return option; }
     /** set options, used in multi-row cp and prealigned detectors */
     void SetOption(bool new_option) { option=new_option; };
+    /** returns true, if setting is suitable for two step detector otherwise false */
+    const bool IsTwoStepDetector() { return !prog_matcher.IsEmpty(); };
 private:
+    void CheckValues();
     CPDetectorType type;
     wxString desc;
     wxString prog;
     wxString args;
+    wxString prog_matcher;
+    wxString args_matcher;
     wxString prog_stack;
     wxString args_stack;
     bool option;
@@ -153,18 +167,32 @@
     void OnOk(wxCommandEvent & e);
     /** select program with file open dialog */
     void OnSelectPath(wxCommandEvent &e);
+    /** select program for feature descriptor with file open dialog */
+    void OnSelectPathDescriptor(wxCommandEvent &e);
+    /** select program for feature matcher with file open dialog */
+    void OnSelectPathMatcher(wxCommandEvent &e);
     /** select program for stack with file open dialog */
     void OnSelectPathStack(wxCommandEvent &e);
     /** update dialog, when other cp detector type is changed */
     void OnTypeChange(wxCommandEvent &e);
+    /** block selection of two step detector for autopano setting */
+    void OnStepChanging(wxChoicebookEvent &e);
+    /** shows file dialog */
+    bool ShowFileDialog(wxString & prog);
 private:
     wxTextCtrl *m_edit_desc;
     wxTextCtrl *m_edit_prog;
     wxTextCtrl *m_edit_args;
+    wxTextCtrl *m_edit_prog_descriptor;
+    wxTextCtrl *m_edit_args_descriptor;
+    wxTextCtrl *m_edit_prog_matcher;
+    wxTextCtrl *m_edit_args_matcher;
     wxTextCtrl *m_edit_prog_stack;
     wxTextCtrl *m_edit_args_stack;
     wxCheckBox *m_check_option;
     wxChoice *m_cpdetector_type;
+    wxChoicebook * m_choice_step;
+    bool twoStepAllowed;
 
     void ChangeType();
     DECLARE_EVENT_TABLE();

Modified: hugin/trunk/src/hugin1/hugin/CPDetectorConfig_default.h
===================================================================
--- hugin/trunk/src/hugin1/hugin/CPDetectorConfig_default.h	2010-01-17 22:23:48 UTC (rev 4906)
+++ hugin/trunk/src/hugin1/hugin/CPDetectorConfig_default.h	2010-01-18 06:37:32 UTC (rev 4907)
@@ -38,10 +38,14 @@
     CPDetectorType type;
     /** name, which is shown in GUI */
     wxString desc;
-    /** program name */
+    /** program name for detector or descriptor*/
     wxString prog;
-    /** arguments of the detector */
+    /** arguments of the detector or descriptor*/
     wxString args;
+    /** program name for matcher */
+    wxString prog_matcher;
+    /** arguments of matcher */
+    wxString args_matcher;
     /** program name of cp detector for stacks */
     wxString prog_stack;
     /** arguments of cp detector for stacks */
@@ -53,29 +57,30 @@
 /** this array saves all default settings */
 const struct cpdetector_default default_cpdetectors[]=
 {
-/* use following order: {type, description, program name, arguments, program name stack, arguments stack, option} 
+/* use following order: {type, description, program for detector or descriptor, arguments for detector or descriptor,
+   program for matcher, arguments for matcher, program name stack, arguments stack, option} 
    attention: this array have to contain at least one item */
 #if defined WIN32
     {CPDetector_AutoPanoSift, wxT("Autopano-SIFT-C"),
         wxT("autopano-sift-c.exe"),wxT("--maxmatches %p --projection %f,%v %o %i"),
-        wxT(""), wxT(""), true},
+        wxT(""), wxT(""), wxT(""), wxT(""), true},
     {CPDetector_AutoPano, wxT("Autopano"),
         wxT("autopano.exe"),wxT("/allinone /path:%d /keys:%p /project:oto /name:%o /size:1024 /f %i"),
-        wxT(""), wxT(""), true},
-    {CPDetector_AutoPanoSift, wxT("Panomatic"),wxT("panomatic.exe"),wxT("-o %o %i"),wxT(""), wxT(""), true},
-    {CPDetector_AutoPanoSift, wxT("Align image stack"),wxT("align_image_stack.exe"),wxT("-f %v -p %o %i"),wxT(""),wxT(""), true},
-    {CPDetector_AutoPanoSift, wxT("Match-n-shift"),wxT("match-n-shift.exe"),wxT("-b -a -f %f -v %v -c -p %p -o %o %i"),wxT(""),wxT(""), true}
+        wxT(""), wxT(""), wxT(""), wxT(""), true},
+    {CPDetector_AutoPanoSift, wxT("Panomatic"),wxT("panomatic.exe"),wxT("-o %o %i"),wxT(""), wxT(""), wxT(""), wxT(""), true},
+    {CPDetector_AutoPanoSift, wxT("Align image stack"),wxT("align_image_stack.exe"),wxT("-f %v -p %o %i"),wxT(""),wxT(""), wxT(""), wxT(""), true},
+    {CPDetector_AutoPanoSift, wxT("Match-n-shift"),wxT("match-n-shift.exe"),wxT("-b -a -f %f -v %v -c -p %p -o %o %i"),wxT(""),wxT(""), wxT(""), wxT(""), true}
 #else 
   #if !defined MAC_SELF_CONTAINED_BUNDLE
     // Since medio 2008 the MacOSX bundle is built without patent/license restricted CP detectors.
-    {CPDetector_AutoPanoSift,wxT("Autopano-SIFT-C"),wxT("autopano-noop.sh"),wxT("--maxmatches %p --projection %f,%v %o %i"),wxT(""),wxT(""), true},
-    {CPDetector_AutoPanoSift,wxT("Panomatic"),wxT("panomatic"),wxT("-o %o %i"),wxT(""),wxT(""), true},
-    {CPDetector_AutoPanoSift,wxT("Match-n-shift"),wxT("match-n-shift"),wxT("-b -a -f %f -v %v -c -p %p -o %o %i"),wxT(""),wxT(""),true},
-    {CPDetector_AutoPanoSift,wxT("Align image stack"),wxT("align_image_stack"),wxT("-f %v -p %o %i"),wxT(""),wxT(""), true},
-    {CPDetector_AutoPanoSift,wxT("Align_image_stack FullFrameFisheye"),wxT("align_image_stack"),wxT("-f %v -p -e %o %i"),wxT(""),wxT(""), true}
+    {CPDetector_AutoPanoSift,wxT("Autopano-SIFT-C"),wxT("autopano-noop.sh"),wxT("--maxmatches %p --projection %f,%v %o %i"),wxT(""),wxT(""), wxT(""), wxT(""), true},
+    {CPDetector_AutoPanoSift,wxT("Panomatic"),wxT("panomatic"),wxT("-o %o %i"),wxT(""),wxT(""), wxT(""), wxT(""), true},
+    {CPDetector_AutoPanoSift,wxT("Match-n-shift"),wxT("match-n-shift"),wxT("-b -a -f %f -v %v -c -p %p -o %o %i"),wxT(""),wxT(""),wxT(""), wxT(""), true},
+    {CPDetector_AutoPanoSift,wxT("Align image stack"),wxT("align_image_stack"),wxT("-f %v -p %o %i"),wxT(""),wxT(""), wxT(""), wxT(""), true},
+    {CPDetector_AutoPanoSift,wxT("Align_image_stack FullFrameFisheye"),wxT("align_image_stack"),wxT("-f %v -p -e %o %i"),wxT(""),wxT(""), wxT(""), wxT(""), true}
   #else
-    {CPDetector_AutoPanoSift,wxT("Align_image_stack linear"),wxT("align_image_stack"),wxT("-f %v -p %o %i"),wxT(""),wxT(""), true},
-    {CPDetector_AutoPanoSift,wxT("Align_image_stack FullFrameFisheye"),wxT("align_image_stack"),wxT("-f %v -p -e %o %i"),wxT(""),wxT(""), true}
+    {CPDetector_AutoPanoSift,wxT("Align_image_stack linear"),wxT("align_image_stack"),wxT("-f %v -p %o %i"),wxT(""),wxT(""), wxT(""), wxT(""), true},
+    {CPDetector_AutoPanoSift,wxT("Align_image_stack FullFrameFisheye"),wxT("align_image_stack"),wxT("-f %v -p -e %o %i"),wxT(""),wxT(""), wxT(""), wxT(""), true}
   #endif
 #endif
 };

Modified: hugin/trunk/src/hugin1/hugin/xrc/cpdetector_dialog.xrc
===================================================================
--- hugin/trunk/src/hugin1/hugin/xrc/cpdetector_dialog.xrc	2010-01-17 22:23:48 UTC (rev 4906)
+++ hugin/trunk/src/hugin1/hugin/xrc/cpdetector_dialog.xrc	2010-01-18 06:37:32 UTC (rev 4907)
@@ -4,183 +4,310 @@
     <object class="wxBoxSizer">
       <orient>wxVERTICAL</orient>
       <object class="sizeritem">
-        <object class="wxStaticBoxSizer">
+        <object class="wxBoxSizer">
           <orient>wxVERTICAL</orient>
           <object class="sizeritem">
-            <object class="wxFlexGridSizer">
-              <cols>2</cols>
+            <object class="wxBoxSizer">
+              <orient>wxVERTICAL</orient>
               <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>Description:</label>
-                </object>
-                <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxTextCtrl" name="prefs_cpdetector_desc"/>
-                <flag>wxALL|wxEXPAND</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>Type:</label>
-                </object>
-                <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxChoice" name="prefs_cpdetector_type">
-                  <content>
-                    <item>Autopano (by A. Jenny)</item>
-                    <item>All images at once</item>
-                    <item>Panorama with stacks</item>
-                    <item>Multi-row panorama</item>
-                    <item>Multi-row panorama with stacks</item>
-                    <item>Prealigned panorama</item>
-                  </content>
-                </object>
-                <flag>wxALL</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>Program:</label>
-                </object>
-                <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxBoxSizer">
-                  <orient>wxHORIZONTAL</orient>
+                <object class="wxFlexGridSizer">
+                  <cols>2</cols>
                   <object class="sizeritem">
-                    <object class="wxTextCtrl" name="prefs_cpdetector_program"/>
-                    <option>1</option>
-                    <flag>wxALL|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+                    <object class="wxStaticText">
+                      <label>Description:</label>
+                    </object>
+                    <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
                     <border>5</border>
                   </object>
                   <object class="sizeritem">
-                    <object class="wxButton" name="prefs_cpdetector_program_select">
-                      <label>Choose...</label>
+                    <object class="wxTextCtrl" name="prefs_cpdetector_desc"/>
+                    <flag>wxALL|wxEXPAND</flag>
+                    <border>5</border>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxStaticText">
+                      <label>Type:</label>
                     </object>
-                    <flag>wxRIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                    <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
                     <border>5</border>
                   </object>
+                  <object class="sizeritem">
+                    <object class="wxChoice" name="prefs_cpdetector_type">
+                      <content>
+                        <item>Autopano (by A. Jenny)</item>
+                        <item>All images at once</item>
+                        <item>Panorama with stacks</item>
+                        <item>Multi-row panorama</item>
+                        <item>Multi-row panorama with stacks</item>
+                        <item>Prealigned panorama</item>
+                      </content>
+                    </object>
+                    <flag>wxALL</flag>
+                    <border>5</border>
+                  </object>
+                  <growablecols>1</growablecols>
                 </object>
                 <flag>wxEXPAND</flag>
               </object>
               <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>Arguments:</label>
-                </object>
-                <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxTextCtrl" name="prefs_cpdetector_args"/>
-                <flag>wxALL|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
-                <border>5</border>
-              </object>
-              <growablecols>1</growablecols>
-            </object>
-            <flag>wxEXPAND</flag>
-          </object>
-          <object class="sizeritem">
-            <object class="wxPanel" name="panel_stack">
-              <object class="wxStaticBoxSizer">
-                <object class="sizeritem">
-                  <object class="wxStaticText">
-                    <label>Leave empty, when no control point detector should run on stacks.</label>
-                  </object>
-                  <flag>wxALL|wxEXPAND</flag>
-                  <border>5</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxFlexGridSizer">
-                    <object class="sizeritem">
-                      <object class="wxStaticText">
-                        <label>Program:</label>
+                <object class="wxNotebook" name="notebook_detector">
+                  <object class="notebookpage">
+                    <label>Detector</label>
+                    <object class="wxPanel" name="panel_detector">
+                      <object class="wxBoxSizer">
+                        <orient>wxVERTICAL</orient>
+                        <object class="sizeritem">
+                          <object class="wxChoicebook" name="choicebook_steps">
+                            <object class="choicebookpage">
+                              <label>One step detector</label>
+                              <object class="wxPanel">
+                                <object class="wxFlexGridSizer">
+                                  <cols>2</cols>
+                                  <object class="sizeritem">
+                                    <object class="wxStaticText">
+                                      <label>Program:</label>
+                                    </object>
+                                    <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                                    <border>5</border>
+                                  </object>
+                                  <object class="sizeritem">
+                                    <object class="wxBoxSizer">
+                                      <orient>wxHORIZONTAL</orient>
+                                      <object class="sizeritem">
+                                        <object class="wxTextCtrl" name="prefs_cpdetector_program"/>
+                                        <option>1</option>
+                                        <flag>wxALL|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+                                        <border>5</border>
+                                      </object>
+                                      <object class="sizeritem">
+                                        <object class="wxButton" name="prefs_cpdetector_program_select">
+                                          <label>Choose...</label>
+                                        </object>
+                                        <flag>wxRIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                                        <border>5</border>
+                                      </object>
+                                    </object>
+                                    <flag>wxEXPAND</flag>
+                                  </object>
+                                  <object class="sizeritem">
+                                    <object class="wxStaticText">
+                                      <label>Arguments:</label>
+                                    </object>
+                                    <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                                    <border>5</border>
+                                  </object>
+                                  <object class="sizeritem">
+                                    <object class="wxTextCtrl" name="prefs_cpdetector_args"/>
+                                    <flag>wxALL|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+                                    <border>5</border>
+                                  </object>
+                                  <growablecols>1</growablecols>
+                                </object>
+                              </object>
+                            </object>
+                            <object class="choicebookpage">
+                              <label>Two step detector</label>
+                              <object class="wxPanel">
+                                <object class="wxFlexGridSizer">
+                                  <cols>2</cols>
+                                  <object class="sizeritem">
+                                    <object class="wxStaticText">
+                                      <label>Feature descriptor:</label>
+                                    </object>
+                                    <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                                    <border>5</border>
+                                  </object>
+                                  <object class="sizeritem">
+                                    <object class="wxBoxSizer">
+                                      <orient>wxHORIZONTAL</orient>
+                                      <object class="sizeritem">
+                                        <object class="wxTextCtrl" name="prefs_cpdetector_program_descriptor"/>
+                                        <option>1</option>
+                                        <flag>wxALL|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+                                        <border>5</border>
+                                      </object>
+                                      <object class="sizeritem">
+                                        <object class="wxButton" name="prefs_cpdetector_program_descriptor_select">
+                                          <label>Choose...</label>
+                                        </object>
+                                        <flag>wxRIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                                        <border>5</border>
+                                      </object>
+                                    </object>
+                                    <flag>wxEXPAND</flag>
+                                  </object>
+                                  <object class="sizeritem">
+                                    <object class="wxStaticText">
+                                      <label>Arguments:</label>
+                                    </object>
+                                    <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                                    <border>5</border>
+                                  </object>
+                                  <object class="sizeritem">
+                                    <object class="wxTextCtrl" name="prefs_cpdetector_args_descriptor"/>
+                                    <flag>wxALL|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+                                    <border>5</border>
+                                  </object>
+                                  <growablecols>1</growablecols>
+                                  <object class="sizeritem">
+                                    <object class="wxStaticText">
+                                      <label>Feature matcher:</label>
+                                    </object>
+                                    <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                                    <border>5</border>
+                                  </object>
+                                  <object class="sizeritem">
+                                    <object class="wxBoxSizer">
+                                      <orient>wxHORIZONTAL</orient>
+                                      <object class="sizeritem">
+                                        <object class="wxTextCtrl" name="prefs_cpdetector_program_matcher"/>
+                                        <option>1</option>
+                                        <flag>wxALL|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+                                        <border>5</border>
+                                      </object>
+                                      <object class="sizeritem">
+                                        <object class="wxButton" name="prefs_cpdetector_program_matcher_select">
+                                          <label>Choose...</label>
+                                        </object>
+                                        <flag>wxRIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                                        <border>5</border>
+                                      </object>
+                                    </object>
+                                    <flag>wxEXPAND</flag>
+                                  </object>
+                                  <object class="sizeritem">
+                                    <object class="wxStaticText">
+                                      <label>Arguments:</label>
+                                    </object>
+                                    <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                                    <border>5</border>
+                                  </object>
+                                  <object class="sizeritem">
+                                    <object class="wxTextCtrl" name="prefs_cpdetector_args_matcher"/>
+                                    <flag>wxALL|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+                                    <border>5</border>
+                                  </object>
+                                </object>
+                              </object>
+                            </object>
+                          </object>
+                          <flag>wxALL|wxEXPAND</flag>
+                          <border>5</border>
+                        </object>
                       </object>
-                      <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-                      <border>5</border>
                     </object>
-                    <object class="sizeritem">
+                  </object>
+                  <object class="notebookpage">
+                    <label>Detector for stacks</label>
+                    <object class="wxPanel" name="panel_stack">
                       <object class="wxBoxSizer">
-                        <orient>wxHORIZONTAL</orient>
                         <object class="sizeritem">
-                          <object class="wxTextCtrl" name="prefs_cpdetector_program_stack"/>
-                          <option>1</option>
-                          <flag>wxALL|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+                          <object class="wxStaticText">
+                            <label>Leave empty, when no control point detector should run on stacks.</label>
+                          </object>
+                          <flag>wxALL|wxEXPAND</flag>
                           <border>5</border>
                         </object>
                         <object class="sizeritem">
-                          <object class="wxButton" name="prefs_cpdetector_program_stack_select">
-                            <label>Choose...</label>
+                          <object class="wxFlexGridSizer">
+                            <object class="sizeritem">
+                              <object class="wxStaticText">
+                                <label>Program:</label>
+                              </object>
+                              <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                              <border>5</border>
+                            </object>
+                            <object class="sizeritem">
+                              <object class="wxBoxSizer">
+                                <orient>wxHORIZONTAL</orient>
+                                <object class="sizeritem">
+                                  <object class="wxTextCtrl" name="prefs_cpdetector_program_stack"/>
+                                  <option>1</option>
+                                  <flag>wxALL|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+                                  <border>5</border>
+                                </object>
+                                <object class="sizeritem">
+                                  <object class="wxButton" name="prefs_cpdetector_program_stack_select">
+                                    <label>Choose...</label>
+                                  </object>
+                                  <flag>wxRIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                                  <border>5</border>
+                                </object>
+                              </object>
+                              <flag>wxEXPAND</flag>
+                            </object>
+                            <object class="sizeritem">
+                              <object class="wxStaticText">
+                                <label>Arguments:</label>
+                              </object>
+                              <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                              <border>5</border>
+                            </object>
+                            <object class="sizeritem">
+                              <object class="wxTextCtrl" name="prefs_cpdetector_args_stack"/>
+                              <flag>wxALL|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+                              <border>5</border>
+                            </object>
+                            <cols>2</cols>
+                            <growablecols>1</growablecols>
                           </object>
-                          <flag>wxRIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-                          <border>5</border>
+                          <flag>wxEXPAND</flag>
                         </object>
+                        <orient>wxVERTICAL</orient>
                       </object>
-                      <flag>wxEXPAND</flag>
                     </object>
-                    <object class="sizeritem">
-                      <object class="wxStaticText">
-                        <label>Arguments:</label>
+                  </object>
+                  <object class="notebookpage">
+                    <label>Advanced option</label>
+                    <object class="wxPanel" name="panel_option">
+                      <object class="wxBoxSizer">
+                        <orient>wxVERTICAL</orient>
+                        <object class="sizeritem">
+                          <object class="wxCheckBox" name="prefs_cpdetector_option">
+                            <label></label>
+                            <checked>1</checked>
+                          </object>
+                          <flag>wxALL|wxEXPAND</flag>
+                          <border>10</border>
+                        </object>
+                        <object class="sizeritem">
+                          <object class="wxStaticText" name="prefs_cpdetector_no_option">
+                            <label>This setting has no advanced options.</label>
+                          </object>
+                          <flag>wxALL|wxEXPAND</flag>
+                          <border>10</border>
+                        </object>
                       </object>
-                      <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-                      <border>5</border>
                     </object>
-                    <object class="sizeritem">
-                      <object class="wxTextCtrl" name="prefs_cpdetector_args_stack"/>
-                      <flag>wxALL|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
-                      <border>5</border>
-                    </object>
-                    <cols>2</cols>
-                    <growablecols>1</growablecols>
                   </object>
-                  <flag>wxEXPAND</flag>
+                  <style></style>
                 </object>
-                <label>Control Point Detector for stacks</label>
-                <orient>wxVERTICAL</orient>
+                <flag>wxALL|wxEXPAND</flag>
+                <border>5</border>
               </object>
-            </object>
-            <flag>wxEXPAND</flag>
-          </object>
-          <object class="sizeritem">
-            <object class="wxPanel" name="panel_option">
-              <object class="wxStaticBoxSizer">
-                <label>Advanced option</label>
-                <orient>wxVERTICAL</orient>
-                <object class="sizeritem">
-                  <object class="wxCheckBox" name="prefs_cpdetector_option">
-                    <label></label>
-                    <checked>1</checked>
-                  </object>
-                  <flag>wxALL|wxEXPAND</flag>
-                  <border>5</border>
-                </object>
-              </object>
-            </object>
-            <flag>wxEXPAND</flag>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>following patterns will be substituted before running:
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>following patterns will be substituted before running:
 %o  -- output project (0.oto will be appended when using Autopano)
 %p  -- number of control points between each pair
 %v  -- HFOV of first image
 %f  -- projection of first image (0-4, as in panotools)
 %i  -- image files
 %namefile -- file that contains image filenames
-%s -- input panotools script</label>
+%s -- input panotools script
+%k -- intermediate key file(s)</label>
+                </object>
+                <flag>wxALL|wxEXPAND|wxADJUST_MINSIZE</flag>
+                <border>5</border>
+              </object>
             </object>
-            <flag>wxALL|wxEXPAND|wxADJUST_MINSIZE</flag>
+            <option>1</option>
+            <flag>wxALL|wxEXPAND</flag>
             <border>5</border>
           </object>
-          <label>Detector</label>
         </object>
         <option>1</option>
-        <flag>wxALL|wxEXPAND</flag>
-        <border>5</border>
+        <flag>wxEXPAND</flag>
       </object>
       <object class="sizeritem">
         <object class="wxBoxSizer">
@@ -205,7 +332,8 @@
             <border>5</border>
           </object>
         </object>
-        <flag>wxTOP|wxALL|wxEXPAND</flag>
+        <option>0</option>
+        <flag>wxALL|wxEXPAND</flag>
         <border>5</border>
       </object>
     </object>


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

Revision: 4983
          http://hugin.svn.sourceforge.net/hugin/?rev=4983&view=rev
Author:   jlegg
Date:     2010-02-15 22:14:29 +0000 (Mon, 15 Feb 2010)

Log Message:
-----------
In the fast preview, separate drawing images over the top of the others and drawing overlays. This allows some constraint on blending order. Previously the blending order depended entierly on the order the tools were in memory. Fixes bug where sometimes the crop highlight was included in the difference mode. Fixes bug where sometimes the guides in drag mode inverted something that should have been masked out by difference mode.

Modified Paths:
--------------
    hugin/trunk/src/hugin1/hugin/PreviewCropTool.cpp
    hugin/trunk/src/hugin1/hugin/PreviewCropTool.h
    hugin/trunk/src/hugin1/hugin/PreviewDragTool.cpp
    hugin/trunk/src/hugin1/hugin/PreviewDragTool.h
    hugin/trunk/src/hugin1/hugin/PreviewPanoMaskTool.cpp
    hugin/trunk/src/hugin1/hugin/PreviewPanoMaskTool.h
    hugin/trunk/src/hugin1/hugin/PreviewTool.h
    hugin/trunk/src/hugin1/hugin/PreviewToolHelper.cpp
    hugin/trunk/src/hugin1/hugin/PreviewToolHelper.h

Modified: hugin/trunk/src/hugin1/hugin/PreviewCropTool.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/PreviewCropTool.cpp	2010-02-15 20:27:32 UTC (rev 4982)
+++ hugin/trunk/src/hugin1/hugin/PreviewCropTool.cpp	2010-02-15 22:14:29 UTC (rev 4983)
@@ -46,7 +46,7 @@
 {
     helper->NotifyMe(PreviewToolHelper::MOUSE_MOVE, this);
     helper->NotifyMe(PreviewToolHelper::MOUSE_PRESS, this);
-    helper->NotifyMe(PreviewToolHelper::DRAW_OVER_IMAGES, this);
+    helper->NotifyMe(PreviewToolHelper::REALLY_DRAW_OVER_IMAGES, this);
     mouse_down = false;
     moving_left = false;
     moving_right = false;
@@ -55,7 +55,7 @@
     helper->SetStatusMessage(_("Drag the inside of the cropping rectangle to adjust the crop."));
 }
 
-void PreviewCropTool::AfterDrawImagesEvent()
+void PreviewCropTool::ReallyAfterDrawImagesEvent()
 {
     // draw lines for the border to crop:
     // We use 1/4 of the smallest dimension as the size of an internal margin

Modified: hugin/trunk/src/hugin1/hugin/PreviewCropTool.h
===================================================================
--- hugin/trunk/src/hugin1/hugin/PreviewCropTool.h	2010-02-15 20:27:32 UTC (rev 4982)
+++ hugin/trunk/src/hugin1/hugin/PreviewCropTool.h	2010-02-15 22:14:29 UTC (rev 4983)
@@ -33,7 +33,7 @@
 public:
     PreviewCropTool(PreviewToolHelper *helper);
     void Activate();
-    void AfterDrawImagesEvent();
+    void ReallyAfterDrawImagesEvent();
     void MouseMoveEvent(double x, double y, wxMouseEvent & e);
     void MouseButtonEvent(wxMouseEvent &e);
 private:

Modified: hugin/trunk/src/hugin1/hugin/PreviewDragTool.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/PreviewDragTool.cpp	2010-02-15 20:27:32 UTC (rev 4982)
+++ hugin/trunk/src/hugin1/hugin/PreviewDragTool.cpp	2010-02-15 22:14:29 UTC (rev 4983)
@@ -48,7 +48,7 @@
     // register notifications
     helper->NotifyMe(PreviewToolHelper::MOUSE_MOVE, this);
     helper->NotifyMe(PreviewToolHelper::MOUSE_PRESS, this);
-    helper->NotifyMe(PreviewToolHelper::DRAW_OVER_IMAGES, this);
+    helper->NotifyMe(PreviewToolHelper::REALLY_DRAW_OVER_IMAGES, this);
     // a handy message for the user:
     helper->SetStatusMessage(_("Drag to move images (optionally use shift to constrain), or roll with right-drag or ctrl-drag."));
 }
@@ -261,7 +261,7 @@
     }
 }
 
-void PreviewDragTool::AfterDrawImagesEvent()
+void PreviewDragTool::ReallyAfterDrawImagesEvent()
 {
     // draw guide lines down the middle.
     HuginBase::PanoramaOptions *opts = helper->GetViewStatePtr()->GetOptions();

Modified: hugin/trunk/src/hugin1/hugin/PreviewDragTool.h
===================================================================
--- hugin/trunk/src/hugin1/hugin/PreviewDragTool.h	2010-02-15 20:27:32 UTC (rev 4982)
+++ hugin/trunk/src/hugin1/hugin/PreviewDragTool.h	2010-02-15 22:14:29 UTC (rev 4983)
@@ -53,7 +53,7 @@
     void Activate();
     void MouseMoveEvent(double x, double y, wxMouseEvent & e);
     void MouseButtonEvent(wxMouseEvent &e);
-    void AfterDrawImagesEvent();
+    void ReallyAfterDrawImagesEvent();
     class AngleStore
     {
     public:

Modified: hugin/trunk/src/hugin1/hugin/PreviewPanoMaskTool.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/PreviewPanoMaskTool.cpp	2010-02-15 20:27:32 UTC (rev 4982)
+++ hugin/trunk/src/hugin1/hugin/PreviewPanoMaskTool.cpp	2010-02-15 22:14:29 UTC (rev 4983)
@@ -37,14 +37,14 @@
     // we draw to the sentcil buffer the desired shape, and enable the stencil
     // test before the images are rendered. After they have all been drawn, we
     // turn off stenciling so the other tools can draw of the complete area.
-    helper->NotifyMe(PreviewToolHelper::DRAW_OVER_IMAGES, this);
+    helper->NotifyMe(PreviewToolHelper::REALLY_DRAW_OVER_IMAGES, this);
 }
 
 void PreviewPanoMaskTool::BeforeDrawImagesEvent()
 {
 }
 
-void PreviewPanoMaskTool::AfterDrawImagesEvent()
+void PreviewPanoMaskTool::ReallyAfterDrawImagesEvent()
 {
     switch (helper->GetViewStatePtr()->GetOptions()->getProjection())
     {

Modified: hugin/trunk/src/hugin1/hugin/PreviewPanoMaskTool.h
===================================================================
--- hugin/trunk/src/hugin1/hugin/PreviewPanoMaskTool.h	2010-02-15 20:27:32 UTC (rev 4982)
+++ hugin/trunk/src/hugin1/hugin/PreviewPanoMaskTool.h	2010-02-15 22:14:29 UTC (rev 4983)
@@ -34,7 +34,7 @@
     PreviewPanoMaskTool(PreviewToolHelper *helper);
     void Activate();
     void BeforeDrawImagesEvent();
-    void AfterDrawImagesEvent();
+    void ReallyAfterDrawImagesEvent();
 };
 
 #endif

Modified: hugin/trunk/src/hugin1/hugin/PreviewTool.h
===================================================================
--- hugin/trunk/src/hugin1/hugin/PreviewTool.h	2010-02-15 20:27:32 UTC (rev 4982)
+++ hugin/trunk/src/hugin1/hugin/PreviewTool.h	2010-02-15 22:14:29 UTC (rev 4983)
@@ -79,8 +79,10 @@
     virtual void KeypressEvent(int keycode, int modifiers, bool pressed) {}
     /// Draw using OpenGL anything the tool requires underneath the images.
     virtual void BeforeDrawImagesEvent() {}
-    /// Draw using OpenGL anything the tool requires over the images.
+    /// Draw (using OpenGL) images above the others.
     virtual void AfterDrawImagesEvent() {}
+    /// Draw (using OpenGL) the overlays, e.g. crop highlights, guides.
+    virtual void ReallyAfterDrawImagesEvent() {}
     /** Draw what the tool requires just before a given image is drawn.
      * This can be used to modify how the images are drawn, prevent drawing of
      * the image, or change the order of the image drawing (with another event

Modified: hugin/trunk/src/hugin1/hugin/PreviewToolHelper.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/PreviewToolHelper.cpp	2010-02-15 20:27:32 UTC (rev 4982)
+++ hugin/trunk/src/hugin1/hugin/PreviewToolHelper.cpp	2010-02-15 22:14:29 UTC (rev 4983)
@@ -61,6 +61,7 @@
     RemoveTool(tool, &image_draw_begin_tools);
     RemoveTool(tool, &image_draw_end_tools);
     RemoveTool(tool, &images_under_mouse_notified_tools);
+    RemoveTool(tool, &really_draw_over_notified_tools);
 }
 
 void PreviewToolHelper::MouseMoved(int x, int y, wxMouseEvent & e)
@@ -149,6 +150,12 @@
     {
         (*iterator)->AfterDrawImagesEvent();
     }
+    // The overlays are done separetly to avoid errors with blending order.
+    for (iterator = really_draw_over_notified_tools.begin();
+         iterator != really_draw_over_notified_tools.end(); iterator++)
+    {
+        (*iterator)->ReallyAfterDrawImagesEvent();
+    }
 }
 
 bool PreviewToolHelper::BeforeDrawImageNumber(unsigned int image)
@@ -241,6 +248,9 @@
         case IMAGES_UNDER_MOUSE_CHANGE:
             AddTool(tool, &images_under_mouse_notified_tools);
             break;
+        case REALLY_DRAW_OVER_IMAGES:
+            AddTool(tool, &really_draw_over_notified_tools);
+            break;
     }   
 }
 

Modified: hugin/trunk/src/hugin1/hugin/PreviewToolHelper.h
===================================================================
--- hugin/trunk/src/hugin1/hugin/PreviewToolHelper.h	2010-02-15 20:27:32 UTC (rev 4982)
+++ hugin/trunk/src/hugin1/hugin/PreviewToolHelper.h	2010-02-15 22:14:29 UTC (rev 4983)
@@ -70,7 +70,7 @@
     {
         MOUSE_MOVE, MOUSE_PRESS, KEY_PRESS,
         DRAW_UNDER_IMAGES, DRAW_OVER_IMAGES,
-        IMAGES_UNDER_MOUSE_CHANGE
+        IMAGES_UNDER_MOUSE_CHANGE, REALLY_DRAW_OVER_IMAGES
     };
     PreviewToolHelper(PT::Panorama *pano,
                       ViewState *view_state,
@@ -128,6 +128,7 @@
     PreviewTool * keypress_notified_tool;
     std::set<PreviewTool *> draw_under_notified_tools;
     std::set<PreviewTool *> draw_over_notified_tools;
+    std::set<PreviewTool *> really_draw_over_notified_tools;
     std::set<PreviewTool *> images_under_mouse_notified_tools;
     // these are vectors: the index is the image that a single tool uses.
     std::vector<PreviewTool *> image_draw_begin_tools;


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

Revision: 4990
          http://hugin.svn.sourceforge.net/hugin/?rev=4990&view=rev
Author:   tmodes
Date:     2010-02-18 06:20:31 +0000 (Thu, 18 Feb 2010)

Log Message:
-----------
Some small changes to lenspanel

Modified Paths:
--------------
    hugin/trunk/src/hugin1/hugin/LensPanel.cpp
    hugin/trunk/src/hugin1/hugin/xrc/lens_panel.xrc

Modified: hugin/trunk/src/hugin1/hugin/LensPanel.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/LensPanel.cpp	2010-02-18 06:19:36 UTC (rev 4989)
+++ hugin/trunk/src/hugin1/hugin/LensPanel.cpp	2010-02-18 06:20:31 UTC (rev 4990)
@@ -250,12 +250,8 @@
 void LensPanel::UpdateLensDisplay ()
 {
     DEBUG_TRACE("");
-    if (m_selectedLenses.size() == 0) {
-        // no lens selected
-        return;
-    }
 
-    if (m_selectedImages.size() == 0) {
+    if ((m_selectedImages.size() == 0) || (m_selectedLenses.size() == 0)){
         // no image selected
         wxListEvent ev;
         ListSelectionChanged(ev);
@@ -621,6 +617,7 @@
         DEBUG_DEBUG("no selection, disabling value display");
         // clear & disable display
         XRCCTRL(*this, "lens_val_projectionFormat", wxChoice)->Disable();
+        XRCCTRL(*this, "lens_val_responseType", wxChoice)->Disable();
         XRCCTRL(*this, "lens_val_v", wxTextCtrl)->Disable();
         XRCCTRL(*this, "lens_val_focalLength", wxTextCtrl)->Disable();
         XRCCTRL(*this, "lens_val_flFactor", wxTextCtrl)->Disable();
@@ -666,6 +663,7 @@
         // one or more images selected
         if (XRCCTRL(*this, "lens_val_projectionFormat", wxChoice)->Enable()) {
             // enable all other textboxes as well.
+            XRCCTRL(*this, "lens_val_responseType", wxChoice)->Enable();
             XRCCTRL(*this, "lens_val_v", wxTextCtrl)->Enable();
             XRCCTRL(*this, "lens_val_focalLength", wxTextCtrl)->Enable();
             XRCCTRL(*this, "lens_val_flFactor", wxTextCtrl)->Enable();

Modified: hugin/trunk/src/hugin1/hugin/xrc/lens_panel.xrc
===================================================================
--- hugin/trunk/src/hugin1/hugin/xrc/lens_panel.xrc	2010-02-18 06:19:36 UTC (rev 4989)
+++ hugin/trunk/src/hugin1/hugin/xrc/lens_panel.xrc	2010-02-18 06:20:31 UTC (rev 4990)
@@ -761,6 +761,22 @@
                                     </object>
                                     <flag>wxALIGN_CENTRE_VERTICAL</flag>
                                   </object>
+                                </object>
+                                <flag>wxLEFT|wxEXPAND</flag>
+                                <border>12</border>
+                              </object>
+                              <object class="spacer">
+                                <size>0,12</size>
+                              </object>
+                              <object class="sizeritem">
+                                <object class="wxBoxSizer">
+                                  <orient>wxHORIZONTAL</orient>
+                                  <object class="sizeritem">
+                                    <object class="wxStaticText">
+                                      <label>Parameters:</label>
+                                    </object>
+                                    <flag>wxALIGN_CENTRE_VERTICAL</flag>
+                                  </object>
                                   <object class="spacer">
                                     <size>6,0</size>
                                   </object>
@@ -778,16 +794,6 @@
                                 <size>0,6</size>
                               </object>
                               <object class="sizeritem">
-                                <object class="wxStaticText">
-                                  <label>Parameters:</label>
-                                </object>
-                                <flag>wxLEFT</flag>
-                                <border>12</border>
-                              </object>
-                              <object class="spacer">
-                                <size>0,12</size>
-                              </object>
-                              <object class="sizeritem">
                                 <object class="wxFlexGridSizer">
                                   <object class="sizeritem">
                                     <object class="wxTextCtrl" name="lens_val_Ra">


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

Revision: 4997
          http://hugin.svn.sourceforge.net/hugin/?rev=4997&view=rev
Author:   tmodes
Date:     2010-02-19 20:53:24 +0000 (Fri, 19 Feb 2010)

Log Message:
-----------
Changed text for mask type to exclude/include

Modified Paths:
--------------
    hugin/trunk/src/hugin1/hugin/MaskEditorPanel.cpp
    hugin/trunk/src/hugin1/hugin/xrc/mask_editor_panel.xrc

Modified: hugin/trunk/src/hugin1/hugin/MaskEditorPanel.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/MaskEditorPanel.cpp	2010-02-19 17:28:01 UTC (rev 4996)
+++ hugin/trunk/src/hugin1/hugin/MaskEditorPanel.cpp	2010-02-19 20:53:24 UTC (rev 4997)
@@ -395,10 +395,10 @@
                 switch(m_currentMasks[i].getMaskType())
                 {
                     case HuginBase::MaskPolygon::Mask_negative:
-                        m_maskList->SetItem(i,1,_("negative"));
+                        m_maskList->SetItem(i,1,_("exclude"));
                         break;
                     case HuginBase::MaskPolygon::Mask_positive:
-                        m_maskList->SetItem(i,1,_("positive"));
+                        m_maskList->SetItem(i,1,_("include"));
                         break;
                 };
                 if(!restoreSelection && i==oldSelection)

Modified: hugin/trunk/src/hugin1/hugin/xrc/mask_editor_panel.xrc
===================================================================
--- hugin/trunk/src/hugin1/hugin/xrc/mask_editor_panel.xrc	2010-02-19 17:28:01 UTC (rev 4996)
+++ hugin/trunk/src/hugin1/hugin/xrc/mask_editor_panel.xrc	2010-02-19 20:53:24 UTC (rev 4997)
@@ -52,8 +52,8 @@
               <object class="sizeritem">
                 <object class="wxChoice" name="mask_editor_choice_masktype">
                   <content>
-                    <item>negative</item>
-                    <item>positive</item>
+                    <item>exclude</item>
+                    <item>include</item>
                   </content>
                   <selection>0</selection>
                 </object>


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

Revision: 5000
          http://hugin.svn.sourceforge.net/hugin/?rev=5000&view=rev
Author:   jlegg
Date:     2010-02-19 23:39:28 +0000 (Fri, 19 Feb 2010)

Log Message:
-----------
Fix bug: mask textures were often shared between images with the same filename in the fast preview even if they had different masks. This fix compares the masks, if they are not the same a new texture and associated mask is used. It would have been possible to seperate masks and image textures, this would have provided better memory use (the image textrure doesn't need to be loaded multiple times when masked differently), but leaving masks and associated images tied as one unit is simpler.

Modified Paths:
--------------
    hugin/trunk/src/hugin1/hugin/TextureManager.cpp
    hugin/trunk/src/hugin1/hugin/TextureManager.h

Modified: hugin/trunk/src/hugin1/hugin/TextureManager.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/TextureManager.cpp	2010-02-19 20:55:44 UTC (rev 4999)
+++ hugin/trunk/src/hugin1/hugin/TextureManager.cpp	2010-02-19 23:39:28 UTC (rev 5000)
@@ -790,7 +790,7 @@
                 pix_start[1] = out_img[h][w].green();
                 pix_start[2] = out_img[h][w].blue();
                 pix_start[3] = (*out_alpha)[h][w];
-				pix_start += 4;
+                pix_start += 4;
             }
         }
         // We don't need to worry about levels with the ATI bug work around,
@@ -849,7 +849,7 @@
             {
                 pix_start[0] = 255;
                 pix_start[1] = mask[h][w];
-				pix_start += 2;
+                pix_start += 2;
             }
         }
         gluBuild2DMipmaps(GL_TEXTURE_2D, GL_LUMINANCE_ALPHA, maskSize, maskSize,
@@ -916,6 +916,9 @@
     // first try the filename.
     if (filename < comp.filename) return true;
     if (filename > comp.filename) return false;
+    // Are there different masks?
+    if (masks < comp.masks) return true;
+    if (masks > comp.masks) return false;
     // if we are not using photometric correction, the textures are equivalent.
     if (!(*photometric_correct)) return false;
     // now try the photometric properties
@@ -946,6 +949,12 @@
 void TextureManager::TextureKey::SetOptions(HuginBase::SrcPanoImage *source)
 {
     filename = source->getFilename();
+    // Record the masks. Images with different masks require different
+    // textures since the mask is stored with them.
+    std::stringstream mask_ss;
+    source->printMaskLines(mask_ss, 0);
+    masks = mask_ss.str();
+    
     exposure = source->getExposure();
     white_balance_red = source->getWhiteBalanceRed();
     white_balance_blue = source->getWhiteBalanceBlue();

Modified: hugin/trunk/src/hugin1/hugin/TextureManager.h
===================================================================
--- hugin/trunk/src/hugin1/hugin/TextureManager.h	2010-02-19 20:55:44 UTC (rev 4999)
+++ hugin/trunk/src/hugin1/hugin/TextureManager.h	2010-02-19 23:39:28 UTC (rev 5000)
@@ -139,6 +139,7 @@
         std::vector<double> radial_distortion_red;
         std::vector<double> radial_distortion_blue;
         double gamma;
+        std::string masks;
                 
         // when stored in the textures map, this should be set to something that
         // always indicates if photometric correction comparisons should be made


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

Revision: 5001
          http://hugin.svn.sourceforge.net/hugin/?rev=5001&view=rev
Author:   tmodes
Date:     2010-02-20 07:42:53 +0000 (Sat, 20 Feb 2010)

Log Message:
-----------
Some better labels, add hint for adding masks.

Modified Paths:
--------------
    hugin/trunk/src/hugin1/hugin/MaskEditorPanel.cpp
    hugin/trunk/src/hugin1/hugin/MaskImageCtrl.cpp
    hugin/trunk/src/hugin1/hugin/xrc/mask_editor_panel.xrc

Modified: hugin/trunk/src/hugin1/hugin/MaskEditorPanel.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/MaskEditorPanel.cpp	2010-02-19 23:39:28 UTC (rev 5000)
+++ hugin/trunk/src/hugin1/hugin/MaskEditorPanel.cpp	2010-02-20 07:42:53 UTC (rev 5001)
@@ -34,6 +34,7 @@
 #include "panoinc.h"
 
 // hugin's
+#include "hugin/MainFrame.h"
 #include "hugin/config_defaults.h"
 #include "hugin/CommandHistory.h"
 #include "hugin/MaskEditorPanel.h"
@@ -291,6 +292,7 @@
         if(m_MaskNr<UINT_MAX)
             m_maskList->SetItemState(m_MaskNr,0,wxLIST_STATE_SELECTED);
         setMask(UINT_MAX);
+        MainFrame::Get()->SetStatusText(_("Create a polygon mask by clicking with left mouse button on image, set last point with right mouse button."),0);
         m_editImg->startNewPolygon();
     };
 };
@@ -395,10 +397,10 @@
                 switch(m_currentMasks[i].getMaskType())
                 {
                     case HuginBase::MaskPolygon::Mask_negative:
-                        m_maskList->SetItem(i,1,_("exclude"));
+                        m_maskList->SetItem(i,1,_("Exclude region"));
                         break;
                     case HuginBase::MaskPolygon::Mask_positive:
-                        m_maskList->SetItem(i,1,_("include"));
+                        m_maskList->SetItem(i,1,_("Include region"));
                         break;
                 };
                 if(!restoreSelection && i==oldSelection)

Modified: hugin/trunk/src/hugin1/hugin/MaskImageCtrl.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/MaskImageCtrl.cpp	2010-02-19 23:39:28 UTC (rev 5000)
+++ hugin/trunk/src/hugin1/hugin/MaskImageCtrl.cpp	2010-02-20 07:42:53 UTC (rev 5001)
@@ -29,6 +29,7 @@
 #include "panoinc_WX.h"
 #include "panoinc.h"
 #include "base_wx/platform.h"
+#include "hugin/MainFrame.h"
 #include "hugin/config_defaults.h"
 #include "hugin/MaskImageCtrl.h"
 #include "hugin/MaskEditorPanel.h"
@@ -394,6 +395,7 @@
                 HuginBase::MaskPolygon mask;
                 m_editingMask=mask;
                 m_selectedPoints.clear();
+                MainFrame::Get()->SetStatusText(wxT(""),0);
                 break;
             };
         case NEW_POLYGON_CREATING:
@@ -416,6 +418,7 @@
                     m_selectedPoints.clear();
                     update();
                 };
+                MainFrame::Get()->SetStatusText(wxT(""),0);
                 break;
             };
     };
@@ -469,6 +472,7 @@
                 HuginBase::MaskPolygon mask;
                 m_editingMask=mask;
                 m_selectedPoints.clear();
+                MainFrame::Get()->SetStatusText(wxT(""),0);
                 break;
             };
         case NEW_POLYGON_CREATING:
@@ -489,6 +493,7 @@
                     m_selectedPoints.clear();
                     update();
                 };
+                MainFrame::Get()->SetStatusText(wxT(""),0);
                 break;
             };
         case POINTS_DELETING:

Modified: hugin/trunk/src/hugin1/hugin/xrc/mask_editor_panel.xrc
===================================================================
--- hugin/trunk/src/hugin1/hugin/xrc/mask_editor_panel.xrc	2010-02-19 23:39:28 UTC (rev 5000)
+++ hugin/trunk/src/hugin1/hugin/xrc/mask_editor_panel.xrc	2010-02-20 07:42:53 UTC (rev 5001)
@@ -52,8 +52,8 @@
               <object class="sizeritem">
                 <object class="wxChoice" name="mask_editor_choice_masktype">
                   <content>
-                    <item>exclude</item>
-                    <item>include</item>
+                    <item>Exclude region</item>
+                    <item>Include region</item>
                   </content>
                   <selection>0</selection>
                 </object>


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

Revision: 5004
          http://hugin.svn.sourceforge.net/hugin/?rev=5004&view=rev
Author:   tmodes
Date:     2010-02-20 10:06:19 +0000 (Sat, 20 Feb 2010)

Log Message:
-----------
Rotate image in mask editor depending on roll and pitch values

Modified Paths:
--------------
    hugin/trunk/src/hugin1/hugin/MaskEditorPanel.cpp
    hugin/trunk/src/hugin1/hugin/MaskEditorPanel.h
    hugin/trunk/src/hugin1/hugin/MaskImageCtrl.cpp
    hugin/trunk/src/hugin1/hugin/MaskImageCtrl.h

Modified: hugin/trunk/src/hugin1/hugin/MaskEditorPanel.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/MaskEditorPanel.cpp	2010-02-20 09:30:27 UTC (rev 5003)
+++ hugin/trunk/src/hugin1/hugin/MaskEditorPanel.cpp	2010-02-20 10:06:19 UTC (rev 5004)
@@ -170,11 +170,17 @@
         updateImage=(m_File!=m_pano->getImage(imgNr).getFilename());
         if(updateImage)
             m_File=m_pano->getImage(imgNr).getFilename();
+        else
+            if(GetRot(imgNr)!=m_editImg->getCurrentRotation())
+            {
+                updateImage=true;
+                m_File=m_pano->getImage(imgNr).getFilename();
+            };
         m_currentMasks=m_pano->getImage(imgNr).getMasks();
     };
     // update mask editor
     if(updateImage)
-        m_editImg->setImage(m_File,m_currentMasks);
+        m_editImg->setImage(m_File,m_currentMasks,GetRot(imgNr));
     else
         m_editImg->setNewMasks(m_currentMasks);
     if(m_currentMasks.size()==0)
@@ -432,6 +438,44 @@
     wxConfigBase::Get()->Write( wxString::Format(wxT("/MaskEditorPanel/ColumnWidth%d"),colNum), m_maskList->GetColumnWidth(colNum) );
 }
 
+MaskImageCtrl::ImageRotation MaskEditorPanel::GetRot(const unsigned int imgNr)
+{
+    if(imgNr==UINT_MAX)
+        return MaskImageCtrl::ROT0;
+
+    double pitch=m_pano->getImage(imgNr).getPitch();
+    double roll=m_pano->getImage(imgNr).getRoll();
+    
+    MaskImageCtrl::ImageRotation rot = MaskImageCtrl::ROT0;
+    // normalize roll angle
+    while (roll > 360) roll-= 360;
+    while (roll < 0) roll += 360;
+
+    while (pitch > 180) pitch -= 360;
+    while (pitch < -180) pitch += 360;
+    bool headOver = (pitch > 90 || pitch < -90);
+
+    if (roll >= 315 || roll < 45) 
+    {
+        rot = headOver ? MaskImageCtrl::ROT180 : MaskImageCtrl::ROT0;
+    } 
+    else 
+        if (roll >= 45 && roll < 135) 
+        {
+            rot = headOver ? MaskImageCtrl::ROT270 : MaskImageCtrl::ROT90;
+        }
+        else 
+            if (roll >= 135 && roll < 225) 
+            {
+                rot = headOver ? MaskImageCtrl::ROT0 : MaskImageCtrl::ROT180;
+            } 
+            else 
+            {
+                rot = headOver ? MaskImageCtrl::ROT90 : MaskImageCtrl::ROT270;
+            }
+    return rot;
+}
+
 IMPLEMENT_DYNAMIC_CLASS(MaskEditorPanel, wxPanel)
 
 MaskEditorPanelXmlHandler::MaskEditorPanelXmlHandler()

Modified: hugin/trunk/src/hugin1/hugin/MaskEditorPanel.h
===================================================================
--- hugin/trunk/src/hugin1/hugin/MaskEditorPanel.h	2010-02-20 09:30:27 UTC (rev 5003)
+++ hugin/trunk/src/hugin1/hugin/MaskEditorPanel.h	2010-02-20 10:06:19 UTC (rev 5004)
@@ -100,6 +100,8 @@
     unsigned int GetSelectedMask();
     /** called, when column with of mask list box was changed */
     void OnColumnWidthChange( wxListEvent & e );
+    /** determines, if the image should be rotated for display */
+    MaskImageCtrl::ImageRotation GetRot(const unsigned int imgNr);
 
     // GUI controls
     MaskImageCtrl *m_editImg;

Modified: hugin/trunk/src/hugin1/hugin/MaskImageCtrl.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/MaskImageCtrl.cpp	2010-02-20 09:30:27 UTC (rev 5003)
+++ hugin/trunk/src/hugin1/hugin/MaskImageCtrl.cpp	2010-02-20 10:06:19 UTC (rev 5004)
@@ -65,6 +65,7 @@
 {
     wxScrolledWindow::Create(parent, id, pos, size, style, name);
     maskEditState = NO_IMAGE;
+    m_imgRotation = ROT0;
     scaleFactor = 1;
     fitToWindow = false;
 
@@ -76,7 +77,7 @@
     m_editPanel = parent;
 }
 
-void MaskImageCtrl::setImage(const std::string & file, HuginBase::MaskPolygonVector newMask)
+void MaskImageCtrl::setImage(const std::string & file, HuginBase::MaskPolygonVector newMask, ImageRotation rot)
 {
     DEBUG_TRACE("setting Image " << file);
     imageFilename = file;
@@ -86,6 +87,7 @@
         m_img = ImageCache::getInstance().getImage(imageFilename);
         maskEditState = NO_MASK;
         m_imageMask=newMask;
+        m_imgRotation=rot;
         setActiveMask(UINT_MAX);
         rescaleImage();
     } 
@@ -98,6 +100,7 @@
         m_img = ImageCache::EntryPtr(new ImageCache::Entry);
         HuginBase::MaskPolygonVector mask;
         m_imageMask=mask;
+        m_imgRotation=ROT0;
         setActiveMask(UINT_MAX);
         Refresh(true);
     }
@@ -148,7 +151,7 @@
     wxPoint mpos;
     CalcUnscrolledPosition(mouse.GetPosition().x, mouse.GetPosition().y,
                            &mpos.x, & mpos.y);
-    FDiff2D currentPos=invtransform(mpos);
+    FDiff2D currentPos=applyRotInv(invtransform(mpos));
     bool doUpdate = false;
     switch(maskEditState)
     {
@@ -167,7 +170,7 @@
             doUpdate=true;
             m_editingMask=m_imageMask[m_activeMask];
             {
-                FDiff2D delta=currentPos-invtransform(m_dragStartPos);
+                FDiff2D delta=currentPos-applyRotInv(invtransform(m_dragStartPos));
                 for(HuginBase::UIntSet::const_iterator it=m_selectedPoints.begin();it!=m_selectedPoints.end();it++)
                     m_editingMask.movePointBy(*it,delta);
             };
@@ -187,7 +190,7 @@
     DEBUG_DEBUG("LEFT MOUSE DOWN");
     CalcUnscrolledPosition(mouse.GetPosition().x, mouse.GetPosition().y,
                            &m_dragStartPos.x, & m_dragStartPos.y);
-    FDiff2D currentPos=invtransform(m_dragStartPos);
+    FDiff2D currentPos=applyRotInv(invtransform(m_dragStartPos));
     m_currentPos=m_dragStartPos;
     if(!HasCapture())
         CaptureMouse();
@@ -282,7 +285,7 @@
     wxPoint mpos;
     CalcUnscrolledPosition(mouse.GetPosition().x, mouse.GetPosition().y,
                            &mpos.x, & mpos.y);
-    FDiff2D currentPos=invtransform(mpos);
+    FDiff2D currentPos=applyRotInv(invtransform(mpos));
     bool doUpdate=false;
     switch(maskEditState)
     {
@@ -302,7 +305,7 @@
             if(HasCapture())
                 ReleaseMouse();
             {
-                FDiff2D delta=currentPos-invtransform(m_dragStartPos);
+                FDiff2D delta=currentPos-applyRotInv(invtransform(m_dragStartPos));
                 if(sqr(delta.x)+sqr(delta.y)>sqr(maxSelectionDistance))
                 {
                     for(HuginBase::UIntSet::const_iterator it=m_selectedPoints.begin();it!=m_selectedPoints.end();it++)
@@ -328,6 +331,7 @@
                 hugin_utils::FDiff2D p;
                 p.x=invtransform(m_dragStartPos.x+(m_currentPos.x-m_dragStartPos.x)/2);
                 p.y=invtransform(m_dragStartPos.y+(m_currentPos.y-m_dragStartPos.y)/2);
+                p=applyRotInv(p);
                 FindPolygon(p);
             };
             break;
@@ -357,6 +361,7 @@
                         hugin_utils::FDiff2D p;
                         p.x=invtransform(m_dragStartPos.x+(m_currentPos.x-m_dragStartPos.x)/2);
                         p.y=invtransform(m_dragStartPos.y+(m_currentPos.y-m_dragStartPos.y)/2);
+                        p=applyRotInv(p);
                         FindPolygon(p);
                     };
                     maskEditState=NO_SELECTION;
@@ -386,7 +391,7 @@
     wxPoint mpos;
     CalcUnscrolledPosition(mouse.GetPosition().x, mouse.GetPosition().y,
                            &mpos.x, & mpos.y);
-    FDiff2D currentPos=invtransform(mpos);
+    FDiff2D currentPos=applyRotInv(invtransform(mpos));
     switch(maskEditState)
     {
         case NEW_POLYGON_STARTED:
@@ -429,7 +434,7 @@
     wxPoint mpos;
     CalcUnscrolledPosition(mouse.GetPosition().x, mouse.GetPosition().y,
                            &m_dragStartPos.x, & m_dragStartPos.y);
-    FDiff2D currentPos=invtransform(m_dragStartPos);
+    FDiff2D currentPos=applyRotInv(invtransform(m_dragStartPos));
     m_currentPos=m_dragStartPos;
     if(!HasCapture())
         CaptureMouse();
@@ -461,7 +466,7 @@
     wxPoint mpos;
     CalcUnscrolledPosition(mouse.GetPosition().x, mouse.GetPosition().y,
                            &mpos.x, & mpos.y);
-    FDiff2D currentPos=invtransform(mpos);
+    FDiff2D currentPos=applyRotInv(invtransform(mpos));
     if(HasCapture())
         ReleaseMouse();
     switch(maskEditState)
@@ -541,7 +546,7 @@
             };
         case POINTS_MOVING:
             {
-                FDiff2D delta=currentPos-invtransform(m_dragStartPos);
+                FDiff2D delta=currentPos-applyRotInv(invtransform(m_dragStartPos));
                 if(sqr(delta.x)+sqr(delta.y)>sqr(maxSelectionDistance))
                 {
                     for(HuginBase::UIntSet::const_iterator it=m_selectedPoints.begin();it!=m_selectedPoints.end();it++)
@@ -658,8 +663,7 @@
     wxPoint *polygonPoints=new wxPoint[nrOfPoints];
     for(unsigned int j=0;j<nrOfPoints;j++)
     {
-        polygonPoints[j].x=transform(poly.getMaskPolygon()[j].x);
-        polygonPoints[j].y=transform(poly.getMaskPolygon()[j].y);
+        polygonPoints[j]=transform(applyRot(poly.getMaskPolygon()[j]));
     };
     if(isSelected)
         dc.SetPen(wxPen(m_colour_point_unselected,1,wxSOLID));
@@ -774,8 +778,8 @@
         return;
     }
     imageSize = wxSize(img.GetWidth(), img.GetHeight());
+    m_realSize = imageSize;
     imageSize.IncBy(2*HuginBase::maskOffset);
-    m_realSize = imageSize;
     if (fitToWindow)
         scaleFactor = calcAutoScaleFactor(imageSize);
     //draw border around image to allow selection of position outside of image
@@ -793,11 +797,60 @@
         imageSize.SetWidth(scale(imageSize.GetWidth()));
         imageSize.SetHeight(scale(imageSize.GetHeight()));
         wxImage tmp=bitmap.ConvertToImage();
-        bitmap=wxBitmap(tmp.Scale(imageSize.GetWidth(), imageSize.GetHeight()));
+        tmp=tmp.Scale(imageSize.GetWidth(), imageSize.GetHeight());
+        switch(m_imgRotation) 
+        {
+            case ROT90:
+                tmp = tmp.Rotate90(true);
+                break;
+            case ROT180:
+                    // this is slower than it needs to be...
+                tmp = tmp.Rotate90(true);
+                tmp = tmp.Rotate90(true);
+                break;
+            case ROT270:
+                tmp = tmp.Rotate90(false);
+                break;
+            default:
+                break;
+        }
+        bitmap=wxBitmap(tmp);
         DEBUG_DEBUG("rescaling finished");
     }
+    else
+    {
+        // need to rotate full image. warning. this can be very memory intensive
+        if (m_imgRotation != ROT0) 
+        {
+            wxImage tmp=bitmap.ConvertToImage();
+            switch(m_imgRotation)
+            {
+                case ROT90:
+                    tmp = tmp.Rotate90(true);
+                    break;
+                case ROT180:
+                    // this is slower than it needs to be...
+                    tmp = tmp.Rotate90(true);
+                    tmp = tmp.Rotate90(true);
+                    break;
+                case ROT270:
+                    tmp = tmp.Rotate90(false);
+                    break;
+                default:
+                    break;
+            }
+            bitmap = wxBitmap(tmp);
+        };
+    };
 
-    SetVirtualSize(imageSize.GetWidth(), imageSize.GetHeight());
+    if (m_imgRotation == ROT90 || m_imgRotation == ROT270) 
+    {
+        SetVirtualSize(imageSize.GetHeight(), imageSize.GetWidth());
+    } 
+    else 
+    {
+        SetVirtualSize(imageSize.GetWidth(), imageSize.GetHeight());
+    };
     SetScrollRate(1,1);
     Refresh(true);
 };
@@ -830,10 +883,12 @@
 bool MaskImageCtrl::SelectPointsInsideMouseRect(HuginBase::UIntSet &points,const bool considerSelectedOnly)
 {
     bool founded=false;
-    double xmin=invtransform(std::min(m_dragStartPos.x,m_currentPos.x))-maxSelectionDistance;
-    double xmax=invtransform(std::max(m_dragStartPos.x,m_currentPos.x))+maxSelectionDistance;
-    double ymin=invtransform(std::min(m_dragStartPos.y,m_currentPos.y))-maxSelectionDistance;
-    double ymax=invtransform(std::max(m_dragStartPos.y,m_currentPos.y))+maxSelectionDistance;
+    hugin_utils::FDiff2D p1=applyRotInv(invtransform(m_dragStartPos));
+    hugin_utils::FDiff2D p2=applyRotInv(invtransform(m_currentPos));
+    double xmin=std::min(p1.x,p2.x)-maxSelectionDistance;
+    double xmax=std::max(p1.x,p2.x)+maxSelectionDistance;
+    double ymin=std::min(p1.y,p2.y)-maxSelectionDistance;
+    double ymax=std::max(p1.y,p2.y)+maxSelectionDistance;
     const HuginBase::VectorPolygon poly=m_editingMask.getMaskPolygon();
     for(unsigned int i=0;i<poly.size();i++)
     {
@@ -874,6 +929,12 @@
 {
     int w = size.GetWidth();
     int h = size.GetHeight();
+    if (m_imgRotation ==  ROT90 || m_imgRotation == ROT270)
+    {
+        int t = w;
+        w = h;
+        h = t;
+    }
 
     wxSize csize = GetSize();
     DEBUG_DEBUG("csize: " << csize.GetWidth() << "x" << csize.GetHeight() << "image: " << w << "x" << h);

Modified: hugin/trunk/src/hugin1/hugin/MaskImageCtrl.h
===================================================================
--- hugin/trunk/src/hugin1/hugin/MaskImageCtrl.h	2010-02-20 09:30:27 UTC (rev 5003)
+++ hugin/trunk/src/hugin1/hugin/MaskImageCtrl.h	2010-02-20 10:06:19 UTC (rev 5004)
@@ -47,8 +47,14 @@
 
     void Init(MaskEditorPanel * parent);
 
+    /** image rotation.
+     *  Useful to display images depending on their roll setting.
+     *  rotation is clockwise
+     */ 
+    enum ImageRotation { ROT0=0, ROT90, ROT180, ROT270 };
+
     /** set the current image and mask list, this loads also the image from cache */
-    void setImage (const std::string & filename, HuginBase::MaskPolygonVector newMask);
+    void setImage (const std::string & filename, HuginBase::MaskPolygonVector newMask, ImageRotation rot);
     /** updates masks for currently selected image */
     void setNewMasks(HuginBase::MaskPolygonVector newMasks);
     /** mark mask with image as beeing editing */
@@ -93,6 +99,9 @@
     double getScale()
         { return fitToWindow ? 0 : scaleFactor; }
 
+    /** returns the current rotation of displayed image */
+    ImageRotation getCurrentRotation() { return m_imgRotation; };
+    
     /** initiate redraw */
     void update();
 
@@ -121,6 +130,8 @@
     wxBitmap bitmap;
     //filename of current editing file
     std::string imageFilename;
+    // stores rotation of image
+    ImageRotation m_imgRotation;
     // size of displayed (probably scaled) image
     wxSize imageSize;
     // size of real image
@@ -140,6 +151,14 @@
     double transform(double x) const
         {  return (x+HuginBase::maskOffset) * getScaleFactor(); }
 
+    wxPoint transform(hugin_utils::FDiff2D p) const
+        {
+            wxPoint r;
+            r.x = transform(p.x);
+            r.y = transform(p.y);
+            return r;
+        };
+
     /** translate screen coordinates to image coordinates, considers additional added border */
     int invtransform(int x) const
         {  return (int) (x/getScaleFactor()-HuginBase::maskOffset + 0.5); };
@@ -155,6 +174,52 @@
             return r;
         };
     
+    // rotate coordinate to fit possibly rotated image display
+    // useful for drawing something on the rotated display
+    template <class T>
+    T applyRot(const T & p) const
+    {
+        switch (m_imgRotation) {
+            case ROT0:
+                return p;
+                break;
+            case ROT90:
+                return T(m_realSize.GetHeight()-1 - p.y, p.x);
+                break;
+            case ROT180:
+                return T(m_realSize.GetWidth()-1 - p.x, m_realSize.GetHeight()-1 - p.y);
+                break;
+            case ROT270:
+                return T(p.y, m_realSize.GetWidth()-1 - p.x);
+                break;
+            default:
+                return p;
+                break;
+        }
+    }
+
+    // rotate coordinate to fit possibly rotated image display
+    // useful for converting rotated display coordinates to image coordinates
+    template <class T>
+    T applyRotInv(const T & p) const
+    {
+        switch (m_imgRotation) {
+            case ROT90:
+                return T(p.y, m_realSize.GetHeight()-1 - p.x);
+                break;
+            case ROT180:
+                return T(m_realSize.GetWidth()-1 - p.x, m_realSize.GetHeight()-1 - p.y);
+                break;
+            case ROT270:
+                return T(m_realSize.GetWidth()-1 - p.y, p.x);
+                break;
+            case ROT0:
+            default:
+                return p;
+                break;
+        }
+    }
+
     //draw the given polygon
     void DrawPolygon(wxDC &dc, HuginBase::MaskPolygon poly, bool isSelected, bool drawMarker);
     //draw a selection rectange, when called the second time the rectangle is deleted


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

Revision: 5007
          http://hugin.svn.sourceforge.net/hugin/?rev=5007&view=rev
Author:   tmodes
Date:     2010-02-21 08:25:24 +0000 (Sun, 21 Feb 2010)

Log Message:
-----------
Prevent double drawing of image when selecting new image in mask editor

Modified Paths:
--------------
    hugin/trunk/src/hugin1/hugin/MaskImageCtrl.cpp
    hugin/trunk/src/hugin1/hugin/MaskImageCtrl.h

Modified: hugin/trunk/src/hugin1/hugin/MaskImageCtrl.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/MaskImageCtrl.cpp	2010-02-20 22:29:18 UTC (rev 5006)
+++ hugin/trunk/src/hugin1/hugin/MaskImageCtrl.cpp	2010-02-21 08:25:24 UTC (rev 5007)
@@ -88,7 +88,7 @@
         maskEditState = NO_MASK;
         m_imageMask=newMask;
         m_imgRotation=rot;
-        setActiveMask(UINT_MAX);
+        setActiveMask(UINT_MAX,false);
         rescaleImage();
     } 
     else 
@@ -114,7 +114,7 @@
     Refresh(false);
 };
 
-void MaskImageCtrl::setActiveMask(unsigned int newMask)
+void MaskImageCtrl::setActiveMask(unsigned int newMask, bool doUpdate)
 {
     if(m_activeMask!=newMask)
     {
@@ -136,7 +136,8 @@
         HuginBase::MaskPolygon mask;
         m_editingMask=mask;
     };
-    Refresh(true);
+    if(doUpdate)
+        Refresh(true);
 };
 
 void MaskImageCtrl::selectAllMarkers()

Modified: hugin/trunk/src/hugin1/hugin/MaskImageCtrl.h
===================================================================
--- hugin/trunk/src/hugin1/hugin/MaskImageCtrl.h	2010-02-20 22:29:18 UTC (rev 5006)
+++ hugin/trunk/src/hugin1/hugin/MaskImageCtrl.h	2010-02-21 08:25:24 UTC (rev 5007)
@@ -58,7 +58,7 @@
     /** updates masks for currently selected image */
     void setNewMasks(HuginBase::MaskPolygonVector newMasks);
     /** mark mask with image as beeing editing */
-    void setActiveMask(unsigned int newMask);
+    void setActiveMask(unsigned int newMask, bool doUpdate=true);
     /** returns the vector of all mask (including new created mask) */
     HuginBase::MaskPolygonVector getNewMask() const { return m_imageMask; };
     /** select all points of active mask */


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

Revision: 5008
          http://hugin.svn.sourceforge.net/hugin/?rev=5008&view=rev
Author:   tmodes
Date:     2010-02-21 09:46:05 +0000 (Sun, 21 Feb 2010)

Log Message:
-----------
Added function to remove cp in masks to edit menu

Modified Paths:
--------------
    hugin/trunk/src/hugin1/hugin/MainFrame.cpp
    hugin/trunk/src/hugin1/hugin/MainFrame.h
    hugin/trunk/src/hugin1/hugin/xrc/main_menu.xrc

Modified: hugin/trunk/src/hugin1/hugin/MainFrame.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/MainFrame.cpp	2010-02-21 08:25:24 UTC (rev 5007)
+++ hugin/trunk/src/hugin1/hugin/MainFrame.cpp	2010-02-21 09:46:05 UTC (rev 5008)
@@ -167,6 +167,7 @@
     EVT_BUTTON(XRCID("action_optimize"),  MainFrame::OnOptimize)
     EVT_MENU(XRCID("action_finetune_all_cp"), MainFrame::OnFineTuneAll)
 //    EVT_BUTTON(XRCID("action_finetune_all_cp"), MainFrame::OnFineTuneAll)
+    EVT_MENU(XRCID("action_remove_cp_in_masks"), MainFrame::OnRemoveCPinMasks)
 
     EVT_MENU(XRCID("ID_CP_TABLE"), MainFrame::OnShowCPFrame)
     EVT_BUTTON(XRCID("ID_CP_TABLE"),MainFrame::OnShowCPFrame)
@@ -1467,6 +1468,62 @@
         );
 }
 
+void MainFrame::OnRemoveCPinMasks(wxCommandEvent & e)
+{
+    HuginBase::UIntSet cps;
+    HuginBase::CPVector cpList=pano.getCtrlPoints();
+    if(cpList.size()>0)
+    {
+        for(unsigned int i=0;i<cpList.size();i++)
+        {
+            HuginBase::ControlPoint cp=cpList[i];
+            // ignore line control points
+            if(cp.mode!=HuginBase::ControlPoint::X_Y)
+                continue;
+            bool insideMask=false;
+            // check first image
+            // remark: we could also use pano.getImage(cp.image1Nr).isInside(vigra::Point2D(cp.x1,cp.y1))
+            //   this would also check the crop rectangles/circles
+            //   but it would require that the pano is correctly align, otherwise the positive masks
+            //   would not correctly checked
+            HuginBase::MaskPolygonVector masks=pano.getImage(cp.image1Nr).getMasks();
+            if(masks.size()>0)
+            {
+                unsigned int j=0;
+                while((!insideMask) && (j<masks.size()))
+                {
+                    insideMask=masks[j].isInside(hugin_utils::FDiff2D(cp.x1,cp.y1));
+                    j++;
+                };
+            };
+            // and now the second
+            if(!insideMask)
+            {
+                masks=pano.getImage(cp.image2Nr).getMasks();
+                if(masks.size()>0)
+                {
+                    unsigned int j=0;
+                    while((!insideMask) && (j<masks.size()))
+                    {
+                        insideMask=masks[j].isInside(hugin_utils::FDiff2D(cp.x2,cp.y2));
+                        j++;
+                    };
+                };
+            };
+            if(insideMask)
+                cps.insert(i);
+        };
+        if(cps.size()>0)
+        {
+            GlobalCmdHist::getInstance().addCommand(
+                        new PT::RemoveCtrlPointsCmd(pano,cps)
+                        );
+        };
+    };
+    wxMessageBox(wxString::Format(_("Removed %d control points"), cps.size()), 
+                 _("Removing control points in masks"),wxOK|wxICON_INFORMATION,this);
+}
+
 void MainFrame::OnUndo(wxCommandEvent & e)
 {
     DEBUG_TRACE("OnUndo");

Modified: hugin/trunk/src/hugin1/hugin/MainFrame.h
===================================================================
--- hugin/trunk/src/hugin1/hugin/MainFrame.h	2010-02-21 08:25:24 UTC (rev 5007)
+++ hugin/trunk/src/hugin1/hugin/MainFrame.h	2010-02-21 09:46:05 UTC (rev 5008)
@@ -184,6 +184,7 @@
     void OnNewProject(wxCommandEvent & e);
     void OnAddTimeImages(wxCommandEvent & e);
     void OnFineTuneAll(wxCommandEvent & e);
+    void OnRemoveCPinMasks(wxCommandEvent & e);
     void OnImportProject(wxCommandEvent & e);
     void OnApplyTemplate(wxCommandEvent & e);
 	void OnSendToBatch(wxCommandEvent & e);

Modified: hugin/trunk/src/hugin1/hugin/xrc/main_menu.xrc
===================================================================
--- hugin/trunk/src/hugin1/hugin/xrc/main_menu.xrc	2010-02-21 08:25:24 UTC (rev 5007)
+++ hugin/trunk/src/hugin1/hugin/xrc/main_menu.xrc	2010-02-21 09:46:05 UTC (rev 5008)
@@ -77,6 +77,10 @@
         <label>Fine-&amp;tune all Points</label>
         <help>Runs fine-tune on all control points. useful for projects created with other tools, like PTGui or PTAssembler</help>
       </object>
+      <object class="wxMenuItem" name="action_remove_cp_in_masks">
+        <label>Remove control points in masks</label>
+        <help>Removes all control points, which are in one mask</help>
+      </object>
       <object class="separator"/>
       <object class="wxMenuItem" name="action_optimize">
         <label>&amp;Optimize</label>
@@ -141,4 +145,4 @@
       </object>
     </object>
   </object>
-</resource>
+</resource>
\ No newline at end of file


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

Revision: 5010
          http://hugin.svn.sourceforge.net/hugin/?rev=5010&view=rev
Author:   tmodes
Date:     2010-02-22 06:35:11 +0000 (Mon, 22 Feb 2010)

Log Message:
-----------
Fixes small issue with numeric locale and cp detector

Modified Paths:
--------------
    hugin/trunk/src/hugin1/hugin/AutoCtrlPointCreator.cpp
    hugin/trunk/src/hugin1/hugin/CPDetectorConfig_default.h

Modified: hugin/trunk/src/hugin1/hugin/AutoCtrlPointCreator.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/AutoCtrlPointCreator.cpp	2010-02-21 10:28:18 UTC (rev 5009)
+++ hugin/trunk/src/hugin1/hugin/AutoCtrlPointCreator.cpp	2010-02-22 06:35:11 UTC (rev 5010)
@@ -190,6 +190,10 @@
         if(!setting.GetProgStack().IsEmpty())
             if(!CanStartProg(setting.GetProgStack(),parent))
                 return cps;
+    //change locale for correct numeric output
+    char * p = setlocale(LC_NUMERIC,NULL);
+    char * old_locale = strdup(p);
+    setlocale(LC_NUMERIC,"C");
     switch (t) {
     case CPDetector_AutoPano:
 	{
@@ -236,6 +240,8 @@
 	default:
 	    DEBUG_ERROR("Invalid autopano type");
     }
+    setlocale(LC_NUMERIC,old_locale);
+    free(old_locale);
     return cps;
 }
 

Modified: hugin/trunk/src/hugin1/hugin/CPDetectorConfig_default.h
===================================================================
--- hugin/trunk/src/hugin1/hugin/CPDetectorConfig_default.h	2010-02-21 10:28:18 UTC (rev 5009)
+++ hugin/trunk/src/hugin1/hugin/CPDetectorConfig_default.h	2010-02-22 06:35:11 UTC (rev 5010)
@@ -68,7 +68,10 @@
         wxT("autopano.exe"),wxT("/allinone /path:%d /keys:%p /project:oto /name:%o /size:1024 /f %i"),
         wxT(""), wxT(""), wxT(""), wxT(""), true},
     {CPDetector_AutoPanoSift, wxT("Panomatic"),wxT("panomatic.exe"),wxT("-o %o %i"),wxT(""), wxT(""), wxT(""), wxT(""), true},
-    {CPDetector_AutoPanoSift, wxT("Align image stack"),wxT("align_image_stack.exe"),wxT("-f %v -p %o %i"),wxT(""),wxT(""), wxT(""), wxT(""), true},
+    {CPDetector_AutoPanoSift, wxT("Align image stack"),wxT("align_image_stack.exe"),wxT("-f %v -v -p %o %i"),wxT(""),wxT(""), wxT(""), wxT(""), true},
+    {CPDetector_AutoPanoSiftMultiRowStack, wxT("Autopano-SIFT-C (multirow/stacked)"),
+        wxT("generatekeys.exe"),wxT("%i %k 800"), wxT("autopano.exe"),wxT("--maxmatches %p %o %k"),
+        wxT("align_image_stack.exe"),wxT("-f %v -v -p %o %i"), true},
     {CPDetector_AutoPanoSift, wxT("Match-n-shift"),wxT("match-n-shift.exe"),wxT("-b -a -f %f -v %v -c -p %p -o %o %i"),wxT(""),wxT(""), wxT(""), wxT(""), true}
 #else 
   #if !defined MAC_SELF_CONTAINED_BUNDLE
@@ -76,6 +79,9 @@
     {CPDetector_AutoPanoSift,wxT("Autopano-SIFT-C"),wxT("autopano-noop.sh"),wxT("--maxmatches %p --projection %f,%v %o %i"),wxT(""),wxT(""), wxT(""), wxT(""), true},
     {CPDetector_AutoPanoSift,wxT("Panomatic"),wxT("panomatic"),wxT("-o %o %i"),wxT(""),wxT(""), wxT(""), wxT(""), true},
     {CPDetector_AutoPanoSift,wxT("Match-n-shift"),wxT("match-n-shift"),wxT("-b -a -f %f -v %v -c -p %p -o %o %i"),wxT(""),wxT(""),wxT(""), wxT(""), true},
+    {CPDetector_AutoPanoSiftMultiRowStack, wxT("Autopano-SIFT-C (multirow/stacked)"),
+        wxT("generatekeys"),wxT("%i %k 800"), wxT("autopano"),wxT("--maxmatches %p %o %k"),
+        wxT("align_image_stack"),wxT("-f %v -p %o %i"), true},
     {CPDetector_AutoPanoSift,wxT("Align image stack"),wxT("align_image_stack"),wxT("-f %v -p %o %i"),wxT(""),wxT(""), wxT(""), wxT(""), true},
     {CPDetector_AutoPanoSift,wxT("Align_image_stack FullFrameFisheye"),wxT("align_image_stack"),wxT("-f %v -p -e %o %i"),wxT(""),wxT(""), wxT(""), wxT(""), true}
   #else


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

Revision: 5013
          http://hugin.svn.sourceforge.net/hugin/?rev=5013&view=rev
Author:   gpatters1
Date:     2010-02-23 03:18:06 +0000 (Tue, 23 Feb 2010)

Log Message:
-----------
Add Image mask save and restore buttons to mask image panel.

Modified Paths:
--------------
    hugin/trunk/src/hugin1/hugin/MaskEditorPanel.cpp
    hugin/trunk/src/hugin1/hugin/MaskEditorPanel.h
    hugin/trunk/src/hugin1/hugin/xrc/mask_editor_panel.xrc

Modified: hugin/trunk/src/hugin1/hugin/MaskEditorPanel.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/MaskEditorPanel.cpp	2010-02-22 23:09:12 UTC (rev 5012)
+++ hugin/trunk/src/hugin1/hugin/MaskEditorPanel.cpp	2010-02-23 03:18:06 UTC (rev 5013)
@@ -34,6 +34,7 @@
 #include "panoinc.h"
 
 // hugin's
+#include "base_wx/platform.h"
 #include "hugin/MainFrame.h"
 #include "hugin/config_defaults.h"
 #include "hugin/CommandHistory.h"
@@ -48,6 +49,8 @@
     EVT_COMBOBOX(XRCID("mask_editor_zoom_box"), MaskEditorPanel::OnZoom)
     EVT_CHOICE(XRCID("mask_editor_choice_masktype"), MaskEditorPanel::OnMaskTypeChange)
     EVT_BUTTON(XRCID("mask_editor_add"), MaskEditorPanel::OnMaskAdd)
+    EVT_BUTTON(XRCID("mask_editor_load"), MaskEditorPanel::OnMaskLoad)
+    EVT_BUTTON(XRCID("mask_editor_save"), MaskEditorPanel::OnMaskSave)
     EVT_BUTTON(XRCID("mask_editor_delete"), MaskEditorPanel::OnMaskDelete)
     EVT_COLOURPICKER_CHANGED(XRCID("mask_editor_colour_polygon_negative"),MaskEditorPanel::OnColourChanged)
     EVT_COLOURPICKER_CHANGED(XRCID("mask_editor_colour_polygon_positive"),MaskEditorPanel::OnColourChanged)
@@ -130,6 +133,8 @@
     m_maskType->Disable();
     XRCCTRL(*this, "mask_editor_zoom_box", wxComboBox)->Disable();
     XRCCTRL(*this, "mask_editor_add", wxButton)->Disable();
+    XRCCTRL(*this, "mask_editor_load", wxButton)->Disable();
+    XRCCTRL(*this, "mask_editor_save", wxButton)->Disable();
     XRCCTRL(*this, "mask_editor_delete", wxButton)->Disable();
 
     // apply zoom specified in xrc file
@@ -190,6 +195,8 @@
     XRCCTRL(*this, "mask_editor_zoom_box", wxComboBox)->Enable(enableCtrl);
     XRCCTRL(*this, "mask_editor_add", wxButton)->Enable(enableCtrl);
     XRCCTRL(*this, "mask_editor_delete", wxButton)->Enable(enableCtrl && m_MaskNr<UINT_MAX);
+    XRCCTRL(*this, "mask_editor_load", wxButton)->Enable(enableCtrl);
+    XRCCTRL(*this, "mask_editor_save", wxButton)->Enable(enableCtrl && m_MaskNr<UINT_MAX);
     UpdateMaskList(restoreMaskSelection);
     // FIXME: lets hope that nobody holds references to these images..
     ImageCache::getInstance().softFlush();
@@ -201,6 +208,7 @@
     m_maskType->Enable(m_MaskNr<UINT_MAX);
     m_editImg->setActiveMask(m_MaskNr);
     XRCCTRL(*this,"mask_editor_delete", wxButton)->Enable(m_MaskNr<UINT_MAX);
+    XRCCTRL(*this, "mask_editor_save", wxButton)->Enable(m_MaskNr<UINT_MAX);
     if(m_ImageNr<UINT_MAX && m_MaskNr<UINT_MAX)
         m_maskType->SetSelection(m_currentMasks[m_MaskNr].getMaskType());
     else
@@ -303,6 +311,114 @@
     };
 };
 
+void MaskEditorPanel::OnMaskSave(wxCommandEvent &e)
+{
+    if(m_ImageNr<UINT_MAX && m_MaskNr<UINT_MAX)
+    {
+        wxFileDialog dlg(this, _("Save mask"),
+                wxConfigBase::Get()->Read(wxT("/actualPath"), wxT("")),
+                wxT(""), _("Mask files (*.msk)|*.msk|All files (*)|*"), 
+                wxSAVE, wxDefaultPosition);
+        if (dlg.ShowModal() == wxID_OK) 
+        {
+            wxString fn = dlg.GetPath();
+            if (fn.Right(4) != wxT(".msk")) 
+            {
+                fn.Append(wxT(".msk"));
+            }
+            if (wxFile::Exists(fn)) 
+            {
+                int d = wxMessageBox(wxString::Format(_("File %s exists. Overwrite?"), 
+                        fn.c_str()),_("Save Mask"), 
+                        wxYES_NO | wxICON_QUESTION);
+                if (d != wxYES) {
+                    return;
+                }
+            }
+            wxFileName filename = fn;
+            std::ofstream maskFile(filename.GetFullPath().mb_str(HUGIN_CONV_FILENAME));
+            vigra::Size2D imageSize = m_pano->getImage(m_ImageNr).getSize();
+            maskFile << "# w" << imageSize.width() << " h" << imageSize.height() << std::endl;
+            HuginBase::MaskPolygon maskToWrite = m_currentMasks[m_MaskNr];
+            maskToWrite.printPolygonLine(maskFile,m_ImageNr);
+            maskFile.close();
+        };
+    }
+};
+
+void MaskEditorPanel::OnMaskLoad(wxCommandEvent &e)
+{
+    if (m_ImageNr<UINT_MAX) {
+        wxFileDialog dlg(this,_("Load mask"),
+                wxConfigBase::Get()->Read(wxT("/actualPath"),wxT("")),
+                wxT(""),_("Mask files (*.msk)|*.msk|All files (*)|*"),
+                wxOPEN, wxDefaultPosition);
+        if (dlg.ShowModal() != wxID_OK) {
+            MainFrame::Get()->SetStatusText(_("Load mask: cancel"));
+            return;
+        }
+        wxFileName filename(dlg.GetPath());
+        std::ifstream in(filename.GetFullPath().mb_str(HUGIN_CONV_FILENAME));
+        vigra::Size2D maskImageSize;
+        HuginBase::MaskPolygonVector imgMasks=m_currentMasks;
+        while (in.good()) 
+        {
+            std::string line;
+            std::getline(in,line);
+            switch (line[0]) 
+            {
+                case '#':
+                {
+                    unsigned int w;
+                    if (getIntParam(w, line, "w"))
+                        maskImageSize.setWidth(w);
+                    unsigned int h;
+                    if (getIntParam(h, line, "h"))
+                        maskImageSize.setHeight(h);
+                    break;
+                }
+                case 'k':
+                {
+                    HuginBase::MaskPolygon newPolygon;
+                    //Ignore image number set in mask
+                    newPolygon.setImgNr(m_ImageNr);
+                    unsigned int param;
+                    if (getIntParam(param,line,"t"))
+                    {
+                        newPolygon.setMaskType((HuginBase::MaskPolygon::MaskType)param);
+                    }
+                    std::string format;
+                    if (getPTParam(format,line,"p"))
+                    {
+                        if(newPolygon.parsePolygonString(format)) {
+                            imgMasks.push_back(newPolygon);
+                        } 
+                    }
+                    break;
+                }
+                default:
+                {
+                    break;
+                }
+            }
+        } 
+        in.close();
+        // compare image size from file with that of current image alert user
+        // if different.
+        if (maskImageSize != m_pano->getImage(m_ImageNr).getSize()) 
+        {
+            int cont = wxMessageBox(_("Mask size does not match image size.\n\nContinue?"),_("Warn"), wxYES_NO,this);
+            if (cont == wxNO)
+            {
+                // abort
+                return;
+            }
+        }
+        // Update the pano with the imported masks
+        GlobalCmdHist::getInstance().addCommand(new PT::UpdateMaskForImgCmd(*m_pano,m_ImageNr,imgMasks));
+    }
+}
+
 void MaskEditorPanel::OnMaskDelete(wxCommandEvent &e)
 {
     if(m_ImageNr<UINT_MAX && m_MaskNr<UINT_MAX)

Modified: hugin/trunk/src/hugin1/hugin/MaskEditorPanel.h
===================================================================
--- hugin/trunk/src/hugin1/hugin/MaskEditorPanel.h	2010-02-22 23:09:12 UTC (rev 5012)
+++ hugin/trunk/src/hugin1/hugin/MaskEditorPanel.h	2010-02-23 03:18:06 UTC (rev 5013)
@@ -83,6 +83,10 @@
     void OnMaskTypeChange(wxCommandEvent &e);
     /** called when user wants to create new polygon */
     void OnMaskAdd(wxCommandEvent &e);
+    /** called when user wants to save active mask */
+    void OnMaskSave(wxCommandEvent &e);
+    /** called when user wants to load a mask into the selected image */
+    void OnMaskLoad(wxCommandEvent &e);
     /** called when user wants to delete active mask */
     void OnMaskDelete(wxCommandEvent &e);
     /** sets the actual zoom factor */

Modified: hugin/trunk/src/hugin1/hugin/xrc/mask_editor_panel.xrc
===================================================================
--- hugin/trunk/src/hugin1/hugin/xrc/mask_editor_panel.xrc	2010-02-22 23:09:12 UTC (rev 5012)
+++ hugin/trunk/src/hugin1/hugin/xrc/mask_editor_panel.xrc	2010-02-23 03:18:06 UTC (rev 5013)
@@ -33,6 +33,21 @@
             <border>5</border>
           </object>
           <object class="sizeritem">
+            <object class="wxButton" name="mask_editor_load">
+              <label>Load Mask</label>
+            </object>
+            <option>0</option>
+            <flag>wxALL|wxEXPAND</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxButton" name="mask_editor_save">
+              <label>Save mask</label>
+            </object>
+            <flag>wxALL|wxEXPAND</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
             <object class="wxListCtrl" name="mask_editor_mask_list">
               <style>wxLC_REPORT|wxLC_SINGLE_SEL</style>
             </object>


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

Revision: 5023
          http://hugin.svn.sourceforge.net/hugin/?rev=5023&view=rev
Author:   jlegg
Date:     2010-02-24 01:59:03 +0000 (Wed, 24 Feb 2010)

Log Message:
-----------
Fix use of uninitalised memory in MaskImageCtrl and PreviewLayoutLinesTool.

Modified Paths:
--------------
    hugin/trunk/src/hugin1/hugin/MaskImageCtrl.cpp
    hugin/trunk/src/hugin1/hugin/PreviewLayoutLinesTool.cpp

Modified: hugin/trunk/src/hugin1/hugin/MaskImageCtrl.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/MaskImageCtrl.cpp	2010-02-24 00:45:16 UTC (rev 5022)
+++ hugin/trunk/src/hugin1/hugin/MaskImageCtrl.cpp	2010-02-24 01:59:03 UTC (rev 5023)
@@ -69,6 +69,7 @@
     scaleFactor = 1;
     fitToWindow = false;
     m_previewOnly = false;
+    m_activeMask = UINT_MAX;
 
     return true;
 }
@@ -760,15 +761,15 @@
         //and now the actual polygon
         if(maskEditState==POINTS_ADDING || maskEditState==POINTS_MOVING || maskEditState==NEW_POLYGON_CREATING)
             DrawPolygon(dc,m_editingMask,true,true);
-	}
+    }
     else
     {
-		// clear the rectangle and exit
+        // clear the rectangle and exit
         dc.SetPen(wxPen(GetBackgroundColour(), 1, wxSOLID));
         dc.SetBrush(wxBrush(GetBackgroundColour(),wxSOLID));
         dc.Clear();
-		return;
-	};
+        return;
+    };
 }
 
 void MaskImageCtrl::OnSize(wxSizeEvent &e)

Modified: hugin/trunk/src/hugin1/hugin/PreviewLayoutLinesTool.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/PreviewLayoutLinesTool.cpp	2010-02-24 00:45:16 UTC (rev 5022)
+++ hugin/trunk/src/hugin1/hugin/PreviewLayoutLinesTool.cpp	2010-02-24 01:59:03 UTC (rev 5023)
@@ -82,6 +82,7 @@
 PreviewLayoutLinesTool::PreviewLayoutLinesTool(PreviewToolHelper *helper)
     : PreviewTool(helper),
       m_updateStatistics(true),
+      m_nearestLine(-1),
       m_useNearestLine(false)
 {
     helper->GetPanoramaPtr()->addObserver(this);


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

Revision: 5062
          http://hugin.svn.sourceforge.net/hugin/?rev=5062&view=rev
Author:   tmodes
Date:     2010-03-13 15:34:07 +0000 (Sat, 13 Mar 2010)

Log Message:
-----------
Don't draw crosses on great circle arcs in layout mode

Modified Paths:
--------------
    hugin/trunk/src/hugin1/hugin/GreatCircles.cpp
    hugin/trunk/src/hugin1/hugin/GreatCircles.h
    hugin/trunk/src/hugin1/hugin/PreviewLayoutLinesTool.cpp

Modified: hugin/trunk/src/hugin1/hugin/GreatCircles.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/GreatCircles.cpp	2010-03-13 12:39:30 UTC (rev 5061)
+++ hugin/trunk/src/hugin1/hugin/GreatCircles.cpp	2010-03-13 15:34:07 UTC (rev 5062)
@@ -206,7 +206,7 @@
     }
 }
                        
-void GreatCircleArc::draw() const
+void GreatCircleArc::draw(bool withCross) const
 {
     // Just draw all the previously worked out line segments
     /** @todo It is probably more apropriate to use thin rectangles than lines.
@@ -221,17 +221,20 @@
             it->doGL();
         }
     glEnd();
-    double scale = 4 / getxscale();
-    // The scale to draw them: this is 5 pixels outside in every direction.
-	{
-		std::vector<GreatCircleArc::LineSegment>::const_iterator it;
- 		it = m_lines.begin();
-		it->doGLcross(0,scale);
+    if(withCross)
+    {
+        double scale = 4 / getxscale();
+        // The scale to draw them: this is 5 pixels outside in every direction.
+        {
+            std::vector<GreatCircleArc::LineSegment>::const_iterator it;
+            it = m_lines.begin();
+            it->doGLcross(0,scale);
 
-		it = m_lines.end();
-		it--;	//.end points beyond last point.
-		it->doGLcross(1,scale);
-	}
+            it = m_lines.end();
+            it--;	//.end points beyond last point.
+            it->doGLcross(1,scale);
+        }
+    };
 }
 
 void GreatCircleArc::LineSegment::doGL() const

Modified: hugin/trunk/src/hugin1/hugin/GreatCircles.h
===================================================================
--- hugin/trunk/src/hugin1/hugin/GreatCircles.h	2010-03-13 12:39:30 UTC (rev 5061)
+++ hugin/trunk/src/hugin1/hugin/GreatCircles.h	2010-03-13 15:34:07 UTC (rev 5062)
@@ -79,7 +79,7 @@
                        double endLat, double endLong,
                        ViewState & m_viewState);
         /// Draw the great circle arc on the fast preview
-        void draw() const;
+        void draw(bool withCross=true) const;
         /** Return the square of the minimal distance between the great circle arc and a coorinate on the panorama.
          * This is an approximation, but should be reasonable.
          */

Modified: hugin/trunk/src/hugin1/hugin/PreviewLayoutLinesTool.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/PreviewLayoutLinesTool.cpp	2010-03-13 12:39:30 UTC (rev 5061)
+++ hugin/trunk/src/hugin1/hugin/PreviewLayoutLinesTool.cpp	2010-03-13 15:34:07 UTC (rev 5062)
@@ -560,7 +560,7 @@
     if (lineWidth > 5.0) lineWidth = 5.0;
     glLineWidth(lineWidth);
     
-    arc.draw();
+    arc.draw(false);
 }
 
 PreviewLayoutLinesTool::LineDetails::LineDetails()


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

Revision: 5065
          http://hugin.svn.sourceforge.net/hugin/?rev=5065&view=rev
Author:   brunopostle
Date:     2010-03-16 23:27:34 +0000 (Tue, 16 Mar 2010)

Log Message:
-----------
Optimisation preset for Everything not x,y,z (Felix Hagemann)

Modified Paths:
--------------
    hugin/trunk/src/hugin1/hugin/OptimizePanel.cpp
    hugin/trunk/src/hugin1/hugin/xrc/optimize_panel.xrc

Modified: hugin/trunk/src/hugin1/hugin/OptimizePanel.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/OptimizePanel.cpp	2010-03-15 22:05:23 UTC (rev 5064)
+++ hugin/trunk/src/hugin1/hugin/OptimizePanel.cpp	2010-03-16 23:27:34 UTC (rev 5065)
@@ -82,7 +82,7 @@
 
 // local optimize definition. need to be in sync with the xrc file
 enum OptimizeMode { OPT_PAIRWISE=0, OPT_YRP, OPT_YRP_XYZ, OPT_YRP_V, OPT_YRP_XYZ_V,
-                    OPT_YRP_B, OPT_YRP_XYZ_B, OPT_YRP_BV, OPT_YRP_XYZ_BV, OPT_ALL, OPT_CUSTOM,
+                    OPT_YRP_B, OPT_YRP_XYZ_B, OPT_YRP_BV, OPT_YRP_XYZ_BV, OPT_ALL_NOTXYZ, OPT_ALL, OPT_CUSTOM,
                     OPT_END_MARKER};
 
 OptimizePanel::OptimizePanel()
@@ -901,11 +901,26 @@
           SetCheckMark(m_d_list,false);
           SetCheckMark(m_e_list,false);
           break;
-  	    case OPT_ALL:
+  	    case OPT_ALL_NOTXYZ:
           // everything
           SetCheckMark(m_yaw_list,true);
           SetCheckMark(m_roll_list,true);
           SetCheckMark(m_pitch_list,true);
+          SetCheckMark(m_x_list,false);
+          SetCheckMark(m_y_list,false);
+          SetCheckMark(m_z_list,false);
+          SetCheckMark(m_v_list,true);
+          SetCheckMark(m_a_list,true);
+          SetCheckMark(m_b_list,true);
+          SetCheckMark(m_c_list,true);
+          SetCheckMark(m_d_list,true);
+          SetCheckMark(m_e_list,true);
+	  break;
+    	    case OPT_ALL:
+          // everything
+          SetCheckMark(m_yaw_list,true);
+          SetCheckMark(m_roll_list,true);
+          SetCheckMark(m_pitch_list,true);
           SetCheckMark(m_x_list,true);
           SetCheckMark(m_y_list,true);
           SetCheckMark(m_z_list,true);

Modified: hugin/trunk/src/hugin1/hugin/xrc/optimize_panel.xrc
===================================================================
--- hugin/trunk/src/hugin1/hugin/xrc/optimize_panel.xrc	2010-03-15 22:05:23 UTC (rev 5064)
+++ hugin/trunk/src/hugin1/hugin/xrc/optimize_panel.xrc	2010-03-16 23:27:34 UTC (rev 5065)
@@ -44,6 +44,7 @@
                           <item>Positions, Translation and Barrel (y,p,r,x,y,z,b)</item>
                           <item>Positions, View and Barrel (y,p,r,v,b)</item>
                           <item>Positions, Translation, View and Barrel (y,p,r,x,y,z,v,b)</item>
+                          <item>Everything (not x,y,z)</item>
                           <item>Everything</item>
                           <item>the Custom parameters below</item>
                         </content>


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

Revision: 5091
          http://hugin.svn.sourceforge.net/hugin/?rev=5091&view=rev
Author:   tmodes
Date:     2010-03-25 22:08:15 +0000 (Thu, 25 Mar 2010)

Log Message:
-----------
Removed unused xrc files

Modified Paths:
--------------
    hugin/trunk/src/hugin1/hugin/huginApp.cpp
    hugin/trunk/src/hugin1/hugin/xrc/CMakeLists.txt

Removed Paths:
-------------
    hugin/trunk/src/hugin1/hugin/xrc/anchor_orientation.xrc
    hugin/trunk/src/hugin1/hugin/xrc/main_menubar.xrc
    hugin/trunk/src/hugin1/hugin/xrc/vig_corr_dlg.xrc

Modified: hugin/trunk/src/hugin1/hugin/huginApp.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/huginApp.cpp	2010-03-25 20:07:29 UTC (rev 5090)
+++ hugin/trunk/src/hugin1/hugin/huginApp.cpp	2010-03-25 22:08:15 UTC (rev 5091)
@@ -245,7 +245,6 @@
     wxXmlResource::Get()->Load(m_xrcPrefix + wxT("pref_dialog.xrc"));
     wxXmlResource::Get()->Load(m_xrcPrefix + wxT("cpdetector_dialog.xrc"));
     wxXmlResource::Get()->Load(m_xrcPrefix + wxT("reset_dialog.xrc"));
-    wxXmlResource::Get()->Load(m_xrcPrefix + wxT("vig_corr_dlg.xrc"));
     wxXmlResource::Get()->Load(m_xrcPrefix + wxT("optimize_photo_panel.xrc"));
     wxXmlResource::Get()->Load(m_xrcPrefix + wxT("cp_editor_panel.xrc"));
     wxXmlResource::Get()->Load(m_xrcPrefix + wxT("images_panel.xrc"));

Modified: hugin/trunk/src/hugin1/hugin/xrc/CMakeLists.txt
===================================================================
--- hugin/trunk/src/hugin1/hugin/xrc/CMakeLists.txt	2010-03-25 20:07:29 UTC (rev 5090)
+++ hugin/trunk/src/hugin1/hugin/xrc/CMakeLists.txt	2010-03-25 22:08:15 UTC (rev 5091)
@@ -9,7 +9,6 @@
     pref_dialog.xrc
     cpdetector_dialog.xrc
     reset_dialog.xrc
-    vig_corr_dlg.xrc
     optimize_photo_panel.xrc
     cp_editor_panel.xrc
     images_panel.xrc

Deleted: hugin/trunk/src/hugin1/hugin/xrc/anchor_orientation.xrc
===================================================================
--- hugin/trunk/src/hugin1/hugin/xrc/anchor_orientation.xrc	2010-03-25 20:07:29 UTC (rev 5090)
+++ hugin/trunk/src/hugin1/hugin/xrc/anchor_orientation.xrc	2010-03-25 22:08:15 UTC (rev 5091)
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<resource>
-  <object class="wxFrame" name="anchor_orientation_panel">
-    <object class="wxBoxSizer">
-      <orient>wxVERTICAL</orient>
-      <object class="sizeritem">
-        <object class="wxStaticBoxSizer">
-          <label>Anchor Image</label>
-          <orient>wxVERTICAL</orient>
-          <object class="spacer">
-            <size>0,0</size>
-          </object>
-          <object class="sizeritem">
-            <object class="unknown" name="anchor_orientation_panel_unknown">
-              <tooltip>Set Yaw and Pitch with left mouse button. Use right mouse button to set roll</tooltip>
-            </object>
-            <option>1</option>
-            <flag>wxEXPAND</flag>
-          </object>
-          <object class="spacer">
-            <size>0,0</size>
-          </object>
-        </object>
-        <option>1</option>
-        <flag>wxALL|wxEXPAND|wxALIGN_CENTRE</flag>
-        <border>5</border>
-        <minsize>200,150</minsize>
-      </object>
-    </object>
-    <title>Set Anchor Image Orientation</title>
-    <size></size>
-  </object>
-</resource>
\ No newline at end of file

Deleted: hugin/trunk/src/hugin1/hugin/xrc/main_menubar.xrc
===================================================================
--- hugin/trunk/src/hugin1/hugin/xrc/main_menubar.xrc	2010-03-25 20:07:29 UTC (rev 5090)
+++ hugin/trunk/src/hugin1/hugin/xrc/main_menubar.xrc	2010-03-25 22:08:15 UTC (rev 5091)
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<resource>
-  <object class="wxMenuBar" name="main_menubar">
-    <style>wxMB_DOCKABLE</style>
-    <object class="wxMenu" name="file_tool_or_menuitem">
-      <label>_File</label>
-      <style>wxMENU_TEAROFF</style>
-      <object class="wxMenuItem" name="action_exit_hugin">
-        <label>E_xit\tAlt-X</label>
-        <help>Exit this application</help>
-      </object>
-    </object>
-    <object class="wxMenu" name="help_menu">
-      <label>_Help</label>
-      <object class="wxMenuItem" name="action_show_about">
-        <label>_About...</label>
-        <help>About Hugin</help>
-      </object>
-    </object>
-  </object>
-</resource>

Deleted: hugin/trunk/src/hugin1/hugin/xrc/vig_corr_dlg.xrc
===================================================================
--- hugin/trunk/src/hugin1/hugin/xrc/vig_corr_dlg.xrc	2010-03-25 20:07:29 UTC (rev 5090)
+++ hugin/trunk/src/hugin1/hugin/xrc/vig_corr_dlg.xrc	2010-03-25 22:08:15 UTC (rev 5091)
@@ -1,683 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resource>
-  <object class="wxFrame" name="vig_corr_dlg">
-    <title>Vignetting correction</title>
-    <object class="wxBoxSizer">
-      <orient>wxVERTICAL</orient>
-      <object class="sizeritem">
-        <object class="wxBoxSizer">
-          <orient>wxHORIZONTAL</orient>
-          <object class="sizeritem">
-            <object class="wxRadioBox" name="vig_corr_mode_rbbox">
-              
-              
-              
-              
-              
-              <label>Type of Correction</label>
-              
-              
-              
-              
-              
-              <content>
-                <item>No correction</item>
-                <item>Addition ( I=I+c )</item>
-                <item>Division ( I=I/c )</item>
-              </content>
-              
-              
-              
-              
-              
-              <selection>1</selection>
-              
-              
-              
-              
-              
-              <dimension>3</dimension>
-            
-              
-              
-              
-              
-              <style>wxRA_SPECIFY_ROWS</style>
-            </object>
-            
-            
-            
-            
-            
-            <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
-            
-            
-            
-            
-            
-            <border>4</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticBoxSizer">
-              <label>Correction</label>
-              <orient>wxVERTICAL</orient>
-              <object class="sizeritem">
-                <object class="wxFlexGridSizer">
-                  <cols>2</cols>
-                  <rows>2</rows>
-                  <object class="sizeritem">
-                    <object class="wxRadioButton" name="vig_corr_flatfield_rb">
-                      
-                      
-                      
-                      
-                      
-                      <label>Flatfield</label>
-                    </object>
-                    
-                    
-                    
-                    
-                    
-                    <flag>wxBOTTOM|wxALIGN_CENTRE_VERTICAL</flag>
-                    
-                    
-                    
-                    
-                    
-                    <border>6</border>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxBoxSizer">
-                      <orient>wxHORIZONTAL</orient>
-                      <object class="sizeritem">
-                        <object class="wxStaticText">
-                          
-                          
-                          
-                          
-                          
-                          <label>Image file:</label>
-                        </object>
-                        
-                        
-                        
-                        
-                        
-                        <flag>wxALIGN_CENTRE_VERTICAL</flag>
-                      </object>
-                      <object class="sizeritem">
-                        <object class="wxTextCtrl" name="vig_corr_flatfile_edit"/>
-                        
-                        
-                        
-                        
-                        
-                        <option>1</option>
-                        
-                        
-                        
-                        
-                        
-                        <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
-                        
-                        
-                        
-                        
-                        
-                        <border>6</border>
-                      </object>
-                      <object class="sizeritem">
-                        <object class="wxButton" name="vig_corr_flatfield_select">
-                          
-                          
-                          
-                          
-                          
-                          <label>...</label>
-                        </object>
-                        
-                        
-                        
-                        
-                        
-                        <flag>wxALIGN_CENTRE_VERTICAL</flag>
-                      </object>
-                    </object>
-                    
-                    
-                    
-                    
-                    
-                    <option>5</option>
-                    
-                    
-                    
-                    
-                    
-                    <flag>wxBOTTOM|wxEXPAND</flag>
-                    
-                    
-                    
-                    
-                    
-                    <border>6</border>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxRadioButton" name="vig_corr_poly_rb">
-                      
-                      
-                      
-                      
-                      
-                      <label>Polynomial</label>
-                    </object>
-                    
-                    
-                    
-                    
-                    
-                    <option>1</option>
-                    
-                    
-                    
-                    
-                    
-                    <flag>wxALIGN_CENTRE_VERTICAL</flag>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxBoxSizer">
-                      <orient>wxHORIZONTAL</orient>
-                      <object class="sizeritem">
-                        <object class="wxStaticText">
-                          
-                          
-                          
-                          
-                          
-                          
-                          
-                          
-                          <label>c = </label>
-                        </object>
-                        
-                        
-                        
-                        
-                        
-                        
-                        
-                        
-                        <flag>wxALIGN_CENTRE_VERTICAL</flag>
-                      </object>
-                      <object class="sizeritem">
-                        <object class="wxTextCtrl" name="vig_corr_coef0_edit"/>
-                        
-                        
-                        
-                        
-                        
-                        
-                        
-                        
-                        <flag>wxALIGN_CENTRE_VERTICAL</flag>
-                      
-                        
-                        
-                        
-                        
-                        
-                        <minsize>60,-1</minsize>
-                      </object>
-                      <object class="sizeritem">
-                        <object class="wxStaticText">
-                          
-                          
-                          
-                          
-                          
-                          
-                          
-                          
-                          <label> + </label>
-                        </object>
-                        
-                        
-                        
-                        
-                        
-                        
-                        
-                        
-                        <flag>wxALIGN_CENTRE_VERTICAL</flag>
-                      </object>
-                      <object class="sizeritem">
-                        <object class="wxTextCtrl" name="vig_corr_coef1_edit"/>
-                        
-                        
-                        
-                        
-                        
-                        
-                        
-                        
-                        <flag>wxALIGN_CENTRE_VERTICAL</flag>
-                      
-                        
-                        
-                        
-                        
-                        
-                        <minsize>60,-1</minsize>
-                      </object>
-                      <object class="sizeritem">
-                        <object class="wxStaticText">
-                          
-                          
-                          
-                          
-                          
-                          
-                          
-                          
-                          <label>*r^2 + </label>
-                        </object>
-                        
-                        
-                        
-                        
-                        
-                        
-                        
-                        
-                        <flag>wxALIGN_CENTRE_VERTICAL</flag>
-                      </object>
-                      <object class="sizeritem">
-                        <object class="wxTextCtrl" name="vig_corr_coef2_edit"/>
-                        
-                        
-                        
-                        
-                        
-                        
-                        
-                        
-                        <flag>wxALIGN_CENTRE_VERTICAL</flag>
-                      
-                        
-                        
-                        
-                        
-                        
-                        <minsize>60,-1</minsize>
-                      </object>
-                      <object class="sizeritem">
-                        <object class="wxStaticText" name="">
-                          
-                          
-                          
-                          
-                          
-                          
-                          
-                          
-                          <label>*r^4 + </label>
-                        </object>
-                        
-                        
-                        
-                        
-                        
-                        
-                        
-                        
-                        <flag>wxALIGN_CENTRE_VERTICAL</flag>
-                      </object>
-                      <object class="sizeritem">
-                        <object class="wxTextCtrl" name="vig_corr_coef3_edit"/>
-                        
-                        
-                        
-                        
-                        
-                        
-                        
-                        
-                        <flag>wxALIGN_CENTRE_VERTICAL</flag>
-                      
-                        
-                        
-                        
-                        
-                        
-                        <minsize>60,-1</minsize>
-                      </object>
-                      <object class="sizeritem">
-                        <object class="wxStaticText">
-                          
-                          
-                          
-                          
-                          
-                          
-                          
-                          
-                          <label>*r^6</label>
-                        </object>
-                        
-                        
-                        
-                        
-                        
-                        
-                        
-                        
-                        <flag>wxALIGN_CENTRE_VERTICAL</flag>
-                      </object>
-                    </object>
-                  </object>
-                  <vgap>6</vgap>
-                  <hgap>9</hgap>
-                  <growablecols>1</growablecols>
-                  <object class="spacer">
-                    
-                    
-                    
-                    
-                    
-                    <size>0,0</size>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxBoxSizer">
-                      <orient>wxHORIZONTAL</orient>
-                      <object class="sizeritem">
-                        <object class="wxStaticText">
-                          
-                          
-                          
-                          
-                          
-                          
-                          
-                          
-                          <label>center shift x:</label>
-                        </object>
-                        
-                        
-                        
-                        
-                        
-                        
-                        
-                        
-                        <flag>wxALIGN_CENTRE_VERTICAL</flag>
-                      </object>
-                      <object class="sizeritem">
-                        <object class="wxTextCtrl" name="vig_corr_coefx_edit"/>
-                        
-                        
-                        
-                        
-                        
-                        
-                        
-                        
-                        <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
-                      
-                        
-                        
-                        
-                        
-                        
-                        <border>6</border>
-                        
-                        
-                        
-                        
-                        
-                        <minsize>60,-1</minsize>
-                      </object>
-                      <object class="sizeritem">
-                        <object class="wxStaticText">
-                          
-                          
-                          
-                          
-                          
-                          
-                          
-                          
-                          <label>y:</label>
-                        </object>
-                        
-                        
-                        
-                        
-                        
-                        
-                        
-                        
-                        <flag>wxALIGN_CENTRE_VERTICAL</flag>
-                      </object>
-                      <object class="sizeritem">
-                        <object class="wxTextCtrl" name="vig_corr_coefy_edit"/>
-                        
-                        
-                        
-                        
-                        
-                        
-                        
-                        
-                        <flag>wxLEFT|wxRIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-                      
-                        
-                        
-                        
-                        
-                        
-                        <border>6</border>
-                        
-                        
-                        
-                        
-                        
-                        <minsize>60,-1</minsize>
-                      </object>
-                    </object>
-                  
-                    
-                    
-                    
-                    <flag>wxEXPAND</flag>
-                  </object>
-                </object>
-              
-                
-                
-                
-                
-                
-                
-                
-                
-                
-                
-                
-                
-                <flag>wxALL|wxEXPAND</flag>
-                
-                
-                
-                
-                
-                
-                
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="unknown" name="vig_corr_plot_poly">
-                  
-                </object>
-                
-                
-                <option>1</option>
-                
-                <flag>wxALL|wxEXPAND</flag>
-                
-                
-                <border>5</border>
-                
-                
-                <minsize>500,200</minsize>
-              </object>
-            </object>
-            
-            
-            
-            
-            
-            
-            
-            
-            <option>1</option>
-            
-            
-            
-            
-            
-            
-            
-            
-            <flag>wxALL|wxEXPAND</flag>
-          
-            
-            
-            
-            
-            <border>4</border>
-          </object>
-        </object>
-        
-        
-        
-        
-        
-        
-        
-        
-        <option>1</option>
-        
-        
-        
-        
-        
-        
-        
-        
-        <flag>wxALL|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
-        
-        
-        
-        
-        
-        
-        
-        
-        <border>6</border>
-      </object>
-      <object class="sizeritem">
-        <object class="wxBoxSizer">
-          <orient>wxHORIZONTAL</orient>
-          <object class="spacer">
-            
-            
-            
-            
-            
-            
-            
-            <option>1</option>
-            
-            
-            
-            
-            
-            
-            
-            <flag>wxEXPAND</flag>
-          </object>
-          <object class="sizeritem">
-            <object class="wxButton" name="wxID_OK">
-              
-              
-              
-              
-              
-              
-              
-              <label></label>
-            </object>
-          </object>
-          <object class="sizeritem">
-            <object class="wxButton" name="wxID_APPLY">
-              
-              
-              
-              
-              
-              
-              
-              <label></label>
-            </object>
-            
-            
-            
-            
-            
-            
-            
-            <flag>wxLEFT|wxRIGHT</flag>
-            
-            
-            
-            
-            
-            
-            
-            <border>6</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxButton" name="wxID_CANCEL">
-              
-              
-              
-              
-              
-              
-              
-              <label></label>
-            </object>
-          </object>
-        </object>
-        
-        
-        
-        
-        
-        
-        
-        <flag>wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND</flag>
-        
-        
-        
-        
-        
-        
-        
-        <border>5</border>
-      </object>
-    </object>
-    <style></style>
-  </object>
-</resource>
\ No newline at end of file


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

Revision: 5098
          http://hugin.svn.sourceforge.net/hugin/?rev=5098&view=rev
Author:   tmodes
Date:     2010-04-01 17:02:29 +0000 (Thu, 01 Apr 2010)

Log Message:
-----------
Respect Exif orientation tag when reseting image positions

Modified Paths:
--------------
    hugin/trunk/src/hugin1/hugin/ImagesPanel.cpp
    hugin/trunk/src/hugin1/hugin/LensPanel.cpp

Modified: hugin/trunk/src/hugin1/hugin/ImagesPanel.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/ImagesPanel.cpp	2010-03-31 22:53:07 UTC (rev 5097)
+++ hugin/trunk/src/hugin1/hugin/ImagesPanel.cpp	2010-04-01 17:02:29 UTC (rev 5098)
@@ -799,7 +799,7 @@
         {
             vars[i].insert(make_pair("y", Variable("y",0.0)));
             vars[i].insert(make_pair("p", Variable("p",0.0)));
-            vars[i].insert(make_pair("r", Variable("r",0.0)));
+            vars[i].insert(make_pair("r", Variable("r",pano->getSrcImage(*it).getExifOrientation())));
             vars[i].insert(make_pair("TrX", Variable("TrX",0.0)));
             vars[i].insert(make_pair("TrY", Variable("TrY",0.0)));
             vars[i].insert(make_pair("TrZ", Variable("TrZ",0.0)));

Modified: hugin/trunk/src/hugin1/hugin/LensPanel.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/LensPanel.cpp	2010-03-31 22:53:07 UTC (rev 5097)
+++ hugin/trunk/src/hugin1/hugin/LensPanel.cpp	2010-04-01 17:02:29 UTC (rev 5098)
@@ -1099,7 +1099,7 @@
         {
             map_get(ImgVars,"y").setValue(0);
             map_get(ImgVars,"p").setValue(0);
-            map_get(ImgVars,"r").setValue(0);
+            map_get(ImgVars,"r").setValue(pano->getSrcImage(imgNr).getExifOrientation());
             map_get(ImgVars,"TrX").setValue(0);
             map_get(ImgVars,"TrY").setValue(0);
             map_get(ImgVars,"TrZ").setValue(0);


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

Revision: 5105
          http://hugin.svn.sourceforge.net/hugin/?rev=5105&view=rev
Author:   tmodes
Date:     2010-04-04 10:24:11 +0000 (Sun, 04 Apr 2010)

Log Message:
-----------
Tried to fix 64 bit issue with rev 5104

Revision Links:
--------------
    http://hugin.svn.sourceforge.net/hugin/?rev=5104&view=rev

Modified Paths:
--------------
    hugin/trunk/src/hugin1/hugin/HFOVDialog.cpp
    hugin/trunk/src/hugin1/hugin/HFOVDialog.h
    hugin/trunk/src/hugin1/hugin/LensPanel.cpp

Modified: hugin/trunk/src/hugin1/hugin/HFOVDialog.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/HFOVDialog.cpp	2010-04-03 16:23:11 UTC (rev 5104)
+++ hugin/trunk/src/hugin1/hugin/HFOVDialog.cpp	2010-04-04 10:24:11 UTC (rev 5105)
@@ -63,11 +63,11 @@
     list->SetSelection(0);
 };
 
-void SelectProjection(wxControlWithItems* list,int new_projection)
+void SelectProjection(wxControlWithItems* list,size_t new_projection)
 {
     for(unsigned int i=0;i<list->GetCount();i++)
     {
-        if((int)list->GetClientData(i)==new_projection)
+        if((size_t)list->GetClientData(i)==new_projection)
         {
             list->SetSelection(i);
             return;
@@ -76,6 +76,11 @@
     list->SetSelection(0);
 };
 
+size_t GetSelectedProjection(wxControlWithItems* list)
+{
+    return (size_t)(list->GetClientData(list->GetSelection()));
+};
+
 HFOVDialog::HFOVDialog(wxWindow * parent, SrcPanoImage & srcImg, double focalLength, double cropFactor)
     : m_srcImg(srcImg), m_focalLength(focalLength), m_cropFactor(cropFactor)
 {
@@ -140,7 +145,7 @@
 
 void HFOVDialog::OnTypeChanged(wxCommandEvent & e)
 {
-    SrcPanoImage::Projection new_proj=(SrcPanoImage::Projection)((int)m_projChoice->GetClientData(m_projChoice->GetSelection()));
+    SrcPanoImage::Projection new_proj=(SrcPanoImage::Projection)(GetSelectedProjection(m_projChoice));
     DEBUG_DEBUG("new type: " << new_proj);
     m_srcImg.setProjection(new_proj);
     if (m_cropFactor > 0 && m_focalLength > 0) {

Modified: hugin/trunk/src/hugin1/hugin/HFOVDialog.h
===================================================================
--- hugin/trunk/src/hugin1/hugin/HFOVDialog.h	2010-04-03 16:23:11 UTC (rev 5104)
+++ hugin/trunk/src/hugin1/hugin/HFOVDialog.h	2010-04-04 10:24:11 UTC (rev 5105)
@@ -35,7 +35,9 @@
   * the client data contains the associated projection number */
 void FillLensProjectionList(wxControlWithItems* list);
 /** Selects the given projection in the given list item */
-void SelectProjection(wxControlWithItems* list,int new_projection);
+void SelectProjection(wxControlWithItems* list,size_t new_projection);
+/** Returns the selected projection number from list */
+size_t GetSelectedProjection(wxControlWithItems* list);
 
 /** A dialog for HFOV
  *

Modified: hugin/trunk/src/hugin1/hugin/LensPanel.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/LensPanel.cpp	2010-04-03 16:23:11 UTC (rev 5104)
+++ hugin/trunk/src/hugin1/hugin/LensPanel.cpp	2010-04-04 10:24:11 UTC (rev 5105)
@@ -272,8 +272,8 @@
 
     // update gui
     wxChoice* choice_projection=XRCCTRL(*this, "lens_val_projectionFormat",wxChoice);
-    int guiPF = (int)choice_projection->GetClientData(choice_projection->GetSelection());
-    if (lens.getProjection() != (Lens::LensProjectionFormat)guiPF) {
+    Lens::LensProjectionFormat guiPF = (Lens::LensProjectionFormat)(GetSelectedProjection(choice_projection));
+    if (lens.getProjection() != guiPF) {
         DEBUG_DEBUG("changing projection format in gui to: " << lens.getProjection());
         SelectProjection(choice_projection,lens.getProjection());
     }
@@ -370,8 +370,7 @@
         UIntSet imgs;
         // uses enum HuginBase::SrcPanoImage::Projection from SrcPanoImage.h
         wxChoice* choice_projection=XRCCTRL(*this, "lens_val_projectionFormat", wxChoice);
-        HuginBase::SrcPanoImage::Projection var = (HuginBase::SrcPanoImage::Projection)
-            ((int)choice_projection->GetClientData(choice_projection->GetSelection()));
+        HuginBase::SrcPanoImage::Projection var = (HuginBase::SrcPanoImage::Projection)(GetSelectedProjection(choice_projection));
         for (UIntSet::iterator it = m_selectedImages.begin();
              it != m_selectedImages.end(); ++it)
         {


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

Revision: 5114
          http://hugin.svn.sourceforge.net/hugin/?rev=5114&view=rev
Author:   tmodes
Date:     2010-04-14 17:25:05 +0000 (Wed, 14 Apr 2010)

Log Message:
-----------
Fixes auto linking of photometric parameters for optimisation

Modified Paths:
--------------
    hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp
    hugin/trunk/src/hugin1/hugin/OptimizePhotometricPanel.cpp

Modified: hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp	2010-04-13 17:24:29 UTC (rev 5113)
+++ hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp	2010-04-14 17:25:05 UTC (rev 5114)
@@ -652,20 +652,22 @@
         };
     // keep a list of commands needed to fix it:
     HuginBase::ImageVariableGroup & lenses = m_variable_groups->getLenses();
-    for (size_t i = 0; i < lenses.getNumberOfParts(); i++) {
+    for (size_t i = 0; i < lenses.getNumberOfParts(); i++)
+    {
+        std::set<HuginBase::ImageVariableGroup::ImageVariableEnum> links_needed;
+        links_needed.clear();
         for (int v = 0; v < 5; v++)
         {
-            std::set<HuginBase::ImageVariableGroup::ImageVariableEnum> links_needed;
-            if (lenses.getVarLinkedInPart(vars[v], i))
+            if (!lenses.getVarLinkedInPart(vars[v], i))
             {
                 links_needed.insert(vars[v]);
             }
-            if (!links_needed.empty())
-            {
-                GlobalCmdHist::getInstance().addCommand(
-                        new PT::LinkLensVarsCmd(*m_pano, i, links_needed)
-                    );
-            }
+        };
+        if (!links_needed.empty())
+        {
+            GlobalCmdHist::getInstance().addCommand(
+                    new PT::LinkLensVarsCmd(*m_pano, i, links_needed)
+                );
         }
     }
 

Modified: hugin/trunk/src/hugin1/hugin/OptimizePhotometricPanel.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/OptimizePhotometricPanel.cpp	2010-04-13 17:24:29 UTC (rev 5113)
+++ hugin/trunk/src/hugin1/hugin/OptimizePhotometricPanel.cpp	2010-04-14 17:25:05 UTC (rev 5114)
@@ -436,18 +436,20 @@
     // keep a list of commands needed to fix it:
     std::vector<PT::PanoCommand *> commands;
     HuginBase::ConstImageVariableGroup & lenses = variable_groups->getLenses();
-    for (size_t i = 0; i < lenses.getNumberOfParts(); i++) {
+    for (size_t i = 0; i < lenses.getNumberOfParts(); i++)
+    {
+        std::set<HuginBase::ImageVariableGroup::ImageVariableEnum> links_needed;
+        links_needed.clear();
         for (int v = 0; v < 5; v++)
         {
-            std::set<HuginBase::ImageVariableGroup::ImageVariableEnum> links_needed;
             if (!lenses.getVarLinkedInPart(vars[v], i))
             {
                 links_needed.insert(vars[v]);
             }
-            if (!links_needed.empty())
-            {
-                commands.push_back(new PT::LinkLensVarsCmd(*m_pano, i, links_needed));
-            }
+        };
+        if (!links_needed.empty())
+        {
+            commands.push_back(new PT::LinkLensVarsCmd(*m_pano, i, links_needed));
         }
     }
     // if the list of commands is empty, all is good and we don't need a warning.


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

Revision: 5117
          http://hugin.svn.sourceforge.net/hugin/?rev=5117&view=rev
Author:   brunopostle
Date:     2010-04-20 20:49:25 +0000 (Tue, 20 Apr 2010)

Log Message:
-----------
Option to allow XY mosaic dragging in Fast Preview Drag mode, this could/should be made completely automatic (Darko Makreshanski)

Modified Paths:
--------------
    hugin/trunk/src/hugin1/hugin/GLPreviewFrame.cpp
    hugin/trunk/src/hugin1/hugin/GLPreviewFrame.h
    hugin/trunk/src/hugin1/hugin/PreviewDragTool.cpp
    hugin/trunk/src/hugin1/hugin/PreviewDragTool.h
    hugin/trunk/src/hugin1/hugin/xrc/preview_frame.xrc

Modified: hugin/trunk/src/hugin1/hugin/GLPreviewFrame.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/GLPreviewFrame.cpp	2010-04-14 19:52:15 UTC (rev 5116)
+++ hugin/trunk/src/hugin1/hugin/GLPreviewFrame.cpp	2010-04-20 20:49:25 UTC (rev 5117)
@@ -115,6 +115,7 @@
     EVT_SPIN_DOWN(XRCID("exposure_spin"), GLPreviewFrame::OnDecreaseExposure)
     EVT_SPIN_UP(XRCID("exposure_spin"), GLPreviewFrame::OnIncreaseExposure)
     EVT_CHOICE(XRCID("blend_mode_choice"), GLPreviewFrame::OnBlendChoice)
+    EVT_CHOICE(XRCID("drag_mode_choice"), GLPreviewFrame::OnDragChoice)
     EVT_CHOICE(XRCID("projection_choice"), GLPreviewFrame::OnProjectionChoice)
 #ifndef __WXMAC__
     // wxMac does not process these
@@ -357,6 +358,11 @@
     m_BlendModeChoice->Append(_("normal"));
     m_BlendModeChoice->SetSelection(0);
 
+	m_DragModeChoice = XRCCTRL(*this, "drag_mode_choice", wxChoice);
+	m_DragModeChoice->Append(_("normal"));
+	m_DragModeChoice->Append(_("mosaic"));
+	m_DragModeChoice->SetSelection(0);
+
     // TODO implement hdr display in OpenGL, if possible?
     // Disabled until someone can figure out HDR display in OpenGL.
     /*
@@ -1002,6 +1008,28 @@
     }
 }
 
+void GLPreviewFrame::OnDragChoice(wxCommandEvent & e)
+{
+    if (e.GetEventObject() == m_DragModeChoice)
+    {
+        if (drag_tool) {
+        
+		    int index = m_DragModeChoice->GetSelection();
+		    switch (index) {
+		    	case 0: //normal
+		    		drag_tool->setDragMode(PreviewDragTool::drag_mode_normal);
+		    	break; 
+		    	case 1: //mosaic
+		    		drag_tool->setDragMode(PreviewDragTool::drag_mode_mosaic);
+		    	break;
+		    }        
+        }
+    }
+    else
+    {
+        // FIXME DEBUG_WARN("wxChoice event from unknown object received");
+    }
+}
 
 void GLPreviewFrame::OnDefaultExposure( wxCommandEvent & e )
 {
@@ -1572,4 +1600,4 @@
         m_GLViewer->SetLayoutScale(10.0-sqrt(scale_factor));
         m_GLViewer->Refresh();
     };
-};
\ No newline at end of file
+};

Modified: hugin/trunk/src/hugin1/hugin/GLPreviewFrame.h
===================================================================
--- hugin/trunk/src/hugin1/hugin/GLPreviewFrame.h	2010-04-14 19:52:15 UTC (rev 5116)
+++ hugin/trunk/src/hugin1/hugin/GLPreviewFrame.h	2010-04-20 20:49:25 UTC (rev 5117)
@@ -129,6 +129,7 @@
     void OnIncreaseExposure( wxSpinEvent & e );
 
     void OnBlendChoice(wxCommandEvent & e);
+    void OnDragChoice(wxCommandEvent & e);
     void OnProjectionChoice(wxCommandEvent & e);
     /** event handler for changed roi */
     void OnROIChanged(wxCommandEvent & e);
@@ -168,6 +169,7 @@
     wxTextCtrl * m_ROITopTxt;
     wxTextCtrl * m_ROIBottomTxt;
     wxChoice * m_BlendModeChoice;
+    wxChoice * m_DragModeChoice;
     wxChoice * m_ProjectionChoice;
     // No HDR display yet.
     // wxChoice * m_outputModeChoice;

Modified: hugin/trunk/src/hugin1/hugin/PreviewDragTool.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/PreviewDragTool.cpp	2010-04-14 19:52:15 UTC (rev 5116)
+++ hugin/trunk/src/hugin1/hugin/PreviewDragTool.cpp	2010-04-20 20:49:25 UTC (rev 5117)
@@ -41,6 +41,28 @@
 {
 }
 
+void PreviewDragTool::setDragMode(PreviewDragTool::DragMode dmode)
+{
+	drag_mode = dmode;
+}
+
+PreviewDragTool::DragMode PreviewDragTool::getDragMode()
+{
+	return drag_mode;
+}
+
+//find Tr parameters shift based on polar coordinates
+void PreviewDragTool::getTranslationShift(double &delta_x, double &delta_y)
+{
+	double startx = atan(DEG_TO_RAD(start_coordinates.x));
+	double starty = atan(DEG_TO_RAD(start_coordinates.y));
+	double shiftx = atan(DEG_TO_RAD(shift_coordinates.x));
+	double shifty = atan(DEG_TO_RAD(shift_coordinates.y));
+	delta_x = shiftx - startx;
+	delta_y = shifty - starty;
+}
+
+
 void PreviewDragTool::Activate()
 {
     drag_yaw = false; drag_pitch = false; drag_roll = false;
@@ -88,19 +110,37 @@
         }
         // move the selected images on the tempory copies for display.
         // first calculate a matrix representing the transformation
-        SetRotationMatrix(shift_coordinates.x, shift_coordinates.y, shift_angle,
-                          start_coordinates.x,  start_coordinates.y,  0.0);
-        // now transform the images in the ViewState (not the panorama yet)
-        std::map<unsigned int, AngleStore>::iterator i;
-        for (i = image_angles.begin(); i != image_angles.end(); i++ )
-        {
-            HuginBase::SrcPanoImage img = *helper->GetViewStatePtr()->
-                                                          GetSrcImage(i->first);
-            double new_yaw, new_pitch, new_roll;
-            i->second.Move(&rotation_matrix, new_yaw, new_pitch, new_roll);
-            img.setYaw(new_yaw); img.setPitch(new_pitch); img.setRoll(new_roll);
-            helper->GetViewStatePtr()->SetSrcImage(i->first, &img);
-        }
+        if (drag_mode == drag_mode_mosaic) {
+        	//if in mosaic drag mode do not adjust yaw and pitch, just roll
+			SetRotationMatrix(0,0,shift_angle, 0,0,0);
+		} else {
+		    SetRotationMatrix(shift_coordinates.x, shift_coordinates.y, shift_angle,
+		                      start_coordinates.x,  start_coordinates.y,  0.0);
+		}     
+
+	    std::map<unsigned int, ParamStore>::iterator i;
+	    for (i = image_params.begin(); i != image_params.end(); i++ )
+	    {
+	        HuginBase::SrcPanoImage img = *helper->GetViewStatePtr()->
+	                                                      GetSrcImage(i->first);
+	        double new_yaw, new_pitch, new_roll, new_TrX, new_TrY;
+	
+        	if (drag_mode == drag_mode_mosaic) {
+        		//if in mosaic mode shift TrX and TrY parameters based on modified yaw and pitch
+	        	double shift_x, shift_y;
+				getTranslationShift(shift_x, shift_y);
+				i->second.TrX = img.getX() + shift_x;
+				i->second.TrY = img.getY() + shift_y;
+			}
+	        i->second.Move(&rotation_matrix, new_yaw, new_pitch, new_roll, new_TrX, new_TrY);
+        	img.setX(new_TrX);
+        	img.setY(new_TrY);
+	    	img.setYaw(new_yaw); 
+	    	img.setPitch(new_pitch); 
+        	img.setRoll(new_roll);
+	        helper->GetViewStatePtr()->SetSrcImage(i->first, &img);
+	    }
+                          
         // redraw
         helper->GetViewStatePtr()->Redraw();
     }
@@ -193,7 +233,7 @@
                 ViewState *view_state_ptr = helper->GetViewStatePtr();
                 for (unsigned int i = 0; i < imgs; i++)
                 {
-                    image_angles[i].Set(view_state_ptr->GetSrcImage(i));
+                    image_params[i].Set(view_state_ptr->GetSrcImage(i));
                 };
             } else
             {
@@ -217,7 +257,7 @@
                         end = draging_images.end();
                         for (i = draging_images.begin(); i != end; i++)
                         {
-                            image_angles[*i].Set(
+                            image_params[*i].Set(
                                     helper->GetViewStatePtr()->GetSrcImage(*i));
                         }
                         break;
@@ -237,17 +277,19 @@
         // Apply the rotations permanently.
         // find where the images end up.
         std::vector<HuginBase::SrcPanoImage> src_images(draging_images.size() + 1);
-        std::map<unsigned int, AngleStore>::iterator i;
+        std::map<unsigned int, ParamStore>::iterator i;
         unsigned int count = 0;
-        for (i = image_angles.begin(); i != image_angles.end(); i++)
+        for (i = image_params.begin(); i != image_params.end(); i++)
         {
-            double nyaw, npitch, nroll;
-            i->second.Move(&rotation_matrix, nyaw, npitch, nroll);
+            double nyaw, npitch, nroll, nx, ny;
+            i->second.Move(&rotation_matrix, nyaw, npitch, nroll, nx, ny);
             src_images[count] = helper->GetPanoramaPtr()->getSrcImage(i->first);
-            src_images[count].setYaw(nyaw);
-            src_images[count].setPitch(npitch);
-            src_images[count].setRoll(nroll);
-            count++;
+			src_images[count].setX(nx);
+			src_images[count].setY(ny);
+	        src_images[count].setYaw(nyaw);
+	        src_images[count].setPitch(npitch);
+	        src_images[count].setRoll(nroll);
+	        count++;
         }
         GlobalCmdHist::getInstance().addCommand(
             new PT::UpdateSrcImagesCmd(*helper->GetPanoramaPtr(),
@@ -255,7 +297,7 @@
                                             src_images)
             );
         // stop dragging
-        image_angles.clear();
+        image_params.clear();
         
         helper->SetStatusMessage(_("Drag to move images (optionally use shift to constrain), or roll with right-drag or ctrl-drag."));
     }
@@ -323,16 +365,18 @@
 }
 
 
-void PreviewDragTool::AngleStore::Set(HuginBase::SrcPanoImage *img)
+void PreviewDragTool::ParamStore::Set(HuginBase::SrcPanoImage *img)
 {
     yaw = img->getYaw();
     pitch = img->getPitch();
     roll = img->getRoll();
+    TrX = img->getX();
+    TrY = img->getY();
 }
 
-void PreviewDragTool::AngleStore::Move(Matrix3 *matrix,
+void PreviewDragTool::ParamStore::Move(Matrix3 *matrix,
                                        double &yaw_out, double &pitch_out,
-                                       double &roll_out)
+                                       double &roll_out, double &TrX_out, double &TrY_out)
 {
     Matrix3 start, output_matrix;
     // convert the location of this image to a matrix.
@@ -344,6 +388,13 @@
     yaw_out = RAD_TO_DEG(yaw_out);
     pitch_out = RAD_TO_DEG(pitch_out);
     roll_out = RAD_TO_DEG(roll_out);
+    
+	//for non zero Tr parameters correspondence can be kept only for rolling, so adjust TrX and TrY parameters accordingly
+    Vector3 vec(0, TrY, TrX);
+    Vector3 res = matrix->TransformVector(vec);
+    TrX_out = res.z;
+    TrY_out = res.y;
+    
 }
 
 void PreviewDragTool::SetRotationMatrix(double yaw_shift, double pitch_shift,

Modified: hugin/trunk/src/hugin1/hugin/PreviewDragTool.h
===================================================================
--- hugin/trunk/src/hugin1/hugin/PreviewDragTool.h	2010-04-14 19:52:15 UTC (rev 5116)
+++ hugin/trunk/src/hugin1/hugin/PreviewDragTool.h	2010-04-20 20:49:25 UTC (rev 5117)
@@ -54,16 +54,27 @@
     void MouseMoveEvent(double x, double y, wxMouseEvent & e);
     void MouseButtonEvent(wxMouseEvent &e);
     void ReallyAfterDrawImagesEvent();
-    class AngleStore
+    class ParamStore
     {
     public:
-        double yaw, pitch, roll;
+        double yaw, pitch, roll, TrX, TrY;
         void Set(HuginBase::SrcPanoImage *img);
         void Move(Matrix3 *matrix,
-                  double &yaw_out,  double &pitch_out,  double &roll_out);
+                  double &yaw_out,  double &pitch_out,  double &roll_out, double &TrX_out, double &TrY_out);
     };
+
+	//dragging mode
+	enum DragMode {
+		drag_mode_normal,
+		drag_mode_mosaic
+	};
+    void setDragMode(DragMode drag_mode);
+    DragMode getDragMode();
+    
+    void getTranslationShift(double &delta_x, double &delta_y);
+    
 private:
-    std::map<unsigned int, AngleStore> image_angles;
+    std::map<unsigned int, ParamStore> image_params;
     std::set<unsigned int> draging_images;
     bool drag_yaw, drag_pitch, drag_roll;
     double start_angle, shift_angle;
@@ -74,6 +85,7 @@
                            double roll_shift,
                            double yaw_start, double pitch_start,
                            double roll_start);
+    DragMode drag_mode;
 };
 
 #endif

Modified: hugin/trunk/src/hugin1/hugin/xrc/preview_frame.xrc
===================================================================
--- hugin/trunk/src/hugin1/hugin/xrc/preview_frame.xrc	2010-04-14 19:52:15 UTC (rev 5116)
+++ hugin/trunk/src/hugin1/hugin/xrc/preview_frame.xrc	2010-04-20 20:49:25 UTC (rev 5117)
@@ -542,6 +542,24 @@
                   <flag>wxLEFT|wxRIGHT|wxALIGN_CENTRE_VERTICAL</flag>
                   <border>5</border>
                 </object>
+                <object class="sizeritem">
+                  <object class="wxBoxSizer">
+                    <orient>wxHORIZONTAL</orient>
+                    <object class="sizeritem">
+                      <object class="wxStaticText">
+                        <label>Drag mode:</label>
+                      </object>
+                      <flag>wxLEFT|wxRIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                      <border>5</border>
+                    </object>
+                    <object class="sizeritem">
+                      <object class="wxChoice" name="drag_mode_choice">
+                        <content/>
+                      </object>
+                    </object>
+                  </object>
+                  <flag>wxALIGN_CENTRE_VERTICAL</flag>
+                </object>                
               </object>
               <tooltip>Move the panorama or drag images into position</tooltip>
             </object>
@@ -641,4 +659,4 @@
       </object>
     </object>
   </object>
-</resource>
\ No newline at end of file
+</resource>


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

Revision: 5131
          http://hugin.svn.sourceforge.net/hugin/?rev=5131&view=rev
Author:   jlegg
Date:     2010-05-01 20:59:20 +0000 (Sat, 01 May 2010)

Log Message:
-----------
Fix two openGL errors in fast preview tools.

Modified Paths:
--------------
    hugin/trunk/src/hugin1/hugin/GreatCircles.cpp
    hugin/trunk/src/hugin1/hugin/PreviewIdentifyTool.cpp

Modified: hugin/trunk/src/hugin1/hugin/GreatCircles.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/GreatCircles.cpp	2010-04-30 19:09:04 UTC (rev 5130)
+++ hugin/trunk/src/hugin1/hugin/GreatCircles.cpp	2010-05-01 20:59:20 UTC (rev 5131)
@@ -139,7 +139,6 @@
     double b1 = 0.0;
     double b2 = 1.0;
     const double bDifference = 1.0 / double(segments);
-    glBegin(GL_LINE_STRIP);
     // for discontinuity detection.
     int lastSegment = 1;
     // The last processed vertex's position.

Modified: hugin/trunk/src/hugin1/hugin/PreviewIdentifyTool.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/PreviewIdentifyTool.cpp	2010-04-30 19:09:04 UTC (rev 5130)
+++ hugin/trunk/src/hugin1/hugin/PreviewIdentifyTool.cpp	2010-05-01 20:59:20 UTC (rev 5131)
@@ -283,7 +283,7 @@
         if (helper->GetViewStatePtr()->GetSupportMultiTexture())
         {
             helper->GetViewStatePtr()->GetTextureManager()->BindTexture(*it);
-            glActiveTexture(0);
+            glActiveTexture(GL_TEXTURE0);
         }
         // we want to shift the texture so it lines up with the cropped region.
         glPushMatrix();


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

Revision: 5137
          http://hugin.svn.sourceforge.net/hugin/?rev=5137&view=rev
Author:   jlegg
Date:     2010-05-02 22:23:03 +0000 (Sun, 02 May 2010)

Log Message:
-----------
Make OpenGL capabilities check more lenient. Also prevent double GLEW initialisation when opening the fast preview fails.

Modified Paths:
--------------
    hugin/trunk/src/hugin1/hugin/GLViewer.cpp
    hugin/trunk/src/hugin1/hugin/GLViewer.h

Modified: hugin/trunk/src/hugin1/hugin/GLViewer.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/GLViewer.cpp	2010-05-02 21:25:31 UTC (rev 5136)
+++ hugin/trunk/src/hugin1/hugin/GLViewer.cpp	2010-05-02 22:23:03 UTC (rev 5137)
@@ -80,6 +80,7 @@
     frame = frame_in;
     
     started_creation = false;
+    initialised_glew = false;
     redrawing = false;
 }
 
@@ -112,25 +113,29 @@
         // It appears we are setting up for the first time.
         started_creation = true;
         
-        // initialise the glew library.
-        GLenum error_state = glewInit();
-        if (error_state != GLEW_OK)
+        if (!initialised_glew)
         {
-            // glewInit failed
-            started_creation=false;
-            DEBUG_ERROR("Error initialising GLEW: "
-                    << glewGetErrorString(error_state) << ".");
-            frame->Close();
-            wxMessageBox(_("Error initialising GLEW\nFast preview window can not be opened."),_("Error"), wxOK | wxICON_ERROR,MainFrame::Get());
-            return;
+            // initialise the glew library, if not done it before.
+            GLenum error_state = glewInit();
+            initialised_glew = true;
+            if (error_state != GLEW_OK)
+            {
+                // glewInit failed
+                started_creation=false;
+                DEBUG_ERROR("Error initialising GLEW: "
+                        << glewGetErrorString(error_state) << ".");
+                frame->Close();
+                wxMessageBox(_("Error initialising GLEW\nFast preview window can not be opened."),_("Error"), wxOK | wxICON_ERROR,MainFrame::Get());
+                return;
+            }
         }
-        // check the openGL version
-        if (!GLEW_VERSION_1_3)
+        // check the openGL capabilities.
+        if (!(GLEW_VERSION_1_1 && GLEW_ARB_multitexture))
         {
             started_creation=false;
-            DEBUG_ERROR("Sorry, OpenGL 1.3 is required.");
+            DEBUG_ERROR("Sorry, OpenGL 1.1 + GL_ARB_multitexture extension required.");
             frame->Close();
-            wxMessageBox(_("Sorry, for using the fast preview window your graphic card must support at least OpenGL 1.3\nFast preview window can not be opened."),_("Error"), wxOK | wxICON_ERROR,MainFrame::Get());
+            wxMessageBox(_("Sorry, the fast preview window requires a system which supports OpenGL version 1.1 with the GL_ARB_multitexture extension.\nThe fast preview cannot be opened."),_("Error"), wxOK | wxICON_ERROR,MainFrame::Get());
             return;
         }
         

Modified: hugin/trunk/src/hugin1/hugin/GLViewer.h
===================================================================
--- hugin/trunk/src/hugin1/hugin/GLViewer.h	2010-05-02 21:25:31 UTC (rev 5136)
+++ hugin/trunk/src/hugin1/hugin/GLViewer.h	2010-05-02 22:23:03 UTC (rev 5137)
@@ -71,7 +71,7 @@
     wxGLContext *m_glContext;
     PT::Panorama  * m_pano;
     
-    bool started_creation, redrawing;
+    bool started_creation, initialised_glew, redrawing;
     vigra::Diff2D offset;
     GLPreviewFrame *frame;
 };


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

Revision: 5139
          http://hugin.svn.sourceforge.net/hugin/?rev=5139&view=rev
Author:   tmodes
Date:     2010-05-03 16:03:27 +0000 (Mon, 03 May 2010)

Log Message:
-----------
Added new photo projections to assistant tab [2995639]

Modified Paths:
--------------
    hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp
    hugin/trunk/src/hugin1/hugin/xrc/assistant_panel.xrc

Modified: hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp	2010-05-02 22:25:19 UTC (rev 5138)
+++ hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp	2010-05-03 16:03:27 UTC (rev 5139)
@@ -53,6 +53,7 @@
 #include "hugin/TextKillFocusHandler.h"
 #include "base_wx/PTWXDlg.h"
 #include "base_wx/MyProgressDialog.h"
+#include "hugin/HFOVDialog.h"
 #include "hugin/config_defaults.h"
 #include <algorithms/control_points/CleanCP.h>
 
@@ -146,6 +147,7 @@
 
     m_lensTypeChoice = XRCCTRL(*this, "ass_lens_proj_choice", wxChoice);
     DEBUG_ASSERT(m_lensTypeChoice);
+    FillLensProjectionList(m_lensTypeChoice);
     m_lensTypeChoice->SetSelection(0);
 
     m_focalLengthText = XRCCTRL(*this, "ass_focallength_text", wxTextCtrl);
@@ -287,7 +289,7 @@
         m_noImage = false;
 
         // update data in lens display
-        m_lensTypeChoice->SetSelection(lens.getProjection());
+        SelectProjection(m_lensTypeChoice, lens.getProjection());
         double focal_length = lens.getFocalLength();
         m_focalLengthText->SetValue(doubleTowxString(focal_length,m_degDigits));
         double focal_length_factor = lens.getCropFactor();
@@ -875,7 +877,7 @@
 void AssistantPanel::OnLensTypeChanged (wxCommandEvent & e)
 {
     // uses enum Lens::LensProjectionFormat from PanoramaMemento.h
-    int var = m_lensTypeChoice->GetSelection();
+    size_t var = GetSelectedProjection(m_lensTypeChoice);
     Lens lens = m_variable_groups->getLens(0);
     if (lens.getProjection() != (Lens::LensProjectionFormat) var) {
         //double crop = lens.getCropFactor();

Modified: hugin/trunk/src/hugin1/hugin/xrc/assistant_panel.xrc
===================================================================
--- hugin/trunk/src/hugin1/hugin/xrc/assistant_panel.xrc	2010-05-02 22:25:19 UTC (rev 5138)
+++ hugin/trunk/src/hugin1/hugin/xrc/assistant_panel.xrc	2010-05-03 16:03:27 UTC (rev 5139)
@@ -61,11 +61,7 @@
                               <object class="sizeritem">
                                 <object class="wxChoice" name="ass_lens_proj_choice">
                                   <content>
-                                    <item>Normal (rectilinear)</item>
-                                    <item>Panoramic (cylindrical)</item>
-                                    <item>Circular fisheye</item>
-                                    <item>Full frame fisheye</item>
-                                    <item>Equirectangular</item>
+                                    <item></item>
                                   </content>
                                 </object>
                                 <flag>wxALIGN_CENTRE_VERTICAL</flag>


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

Revision: 5140
          http://hugin.svn.sourceforge.net/hugin/?rev=5140&view=rev
Author:   tmodes
Date:     2010-05-03 16:09:55 +0000 (Mon, 03 May 2010)

Log Message:
-----------
Set default output format to TIFF_m 
(When loading a project file it is automatic set to TIFF_m, but when creating a new project it was set to TIFF, so make this behavior consistant)

Modified Paths:
--------------
    hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp
    hugin/trunk/src/hugin1/hugin/MainFrame.cpp
    hugin/trunk/src/hugin1/hugin/huginApp.cpp

Modified: hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp	2010-05-03 16:03:27 UTC (rev 5139)
+++ hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp	2010-05-03 16:09:55 UTC (rev 5140)
@@ -581,7 +581,7 @@
 
     // set TIFF_m with enblend
     PanoramaOptions opts = m_pano->getOptions();
-    opts.outputFormat = PanoramaOptions::TIFF;
+    opts.outputFormat = PanoramaOptions::TIFF_m;
     opts.blendMode = PanoramaOptions::ENBLEND_BLEND;
     opts.remapper = PanoramaOptions::NONA;
     opts.tiff_saveROI = true;

Modified: hugin/trunk/src/hugin1/hugin/MainFrame.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/MainFrame.cpp	2010-05-03 16:03:27 UTC (rev 5139)
+++ hugin/trunk/src/hugin1/hugin/MainFrame.cpp	2010-05-03 16:09:55 UTC (rev 5140)
@@ -772,7 +772,7 @@
     // Setup pano with options from preferences
     PanoramaOptions opts = pano.getOptions();
     wxConfigBase* config = wxConfigBase::Get();
-    opts.outputFormat = PanoramaOptions::TIFF;
+    opts.outputFormat = PanoramaOptions::TIFF_m;
     opts.blendMode = PanoramaOptions::ENBLEND_BLEND;
     opts.enblendOptions = config->Read(wxT("Enblend/Args"),wxT(HUGIN_ENBLEND_ARGS)).mb_str(wxConvLocal);
     opts.enfuseOptions = config->Read(wxT("Enfuse/Args"),wxT(HUGIN_ENFUSE_ARGS)).mb_str(wxConvLocal);

Modified: hugin/trunk/src/hugin1/hugin/huginApp.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/huginApp.cpp	2010-05-03 16:03:27 UTC (rev 5139)
+++ hugin/trunk/src/hugin1/hugin/huginApp.cpp	2010-05-03 16:09:55 UTC (rev 5140)
@@ -319,7 +319,7 @@
 
     // set some suitable defaults
     PanoramaOptions opts = pano.getOptions();
-    opts.outputFormat = PanoramaOptions::TIFF;
+    opts.outputFormat = PanoramaOptions::TIFF_m;
     opts.blendMode = PanoramaOptions::ENBLEND_BLEND;
     opts.enblendOptions = config->Read(wxT("Enblend/Args"),wxT(HUGIN_ENBLEND_ARGS)).mb_str(wxConvLocal);
     opts.enfuseOptions = config->Read(wxT("Enfuse/Args"),wxT(HUGIN_ENFUSE_ARGS)).mb_str(wxConvLocal);


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

Revision: 5154
          http://hugin.svn.sourceforge.net/hugin/?rev=5154&view=rev
Author:   tmodes
Date:     2010-05-13 12:14:25 +0000 (Thu, 13 May 2010)

Log Message:
-----------
Calculate panorama exposure value after appling the optimized variables

Modified Paths:
--------------
    hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp
    hugin/trunk/src/hugin1/hugin/OptimizePhotometricPanel.cpp
    hugin/trunk/src/hugin1/hugin/PreviewPanel.cpp

Modified: hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp	2010-05-13 11:41:29 UTC (rev 5153)
+++ hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp	2010-05-13 12:14:25 UTC (rev 5154)
@@ -748,16 +748,14 @@
         points, *(MainFrame::Get()), error);
     cout << "Auto align, photometric error: " << error *255 << " grey values" << std::endl;
 
-    // calculate the mean exposure.
-    opts.outputExposureValue = calcMeanExposure(*m_pano);
-
     // TODO: merge the following commands.
 
-
     // copy information into the main panorama
     GlobalCmdHist::getInstance().addCommand(
         new PT::UpdateVariablesCPSetCmd(*m_pano, imgs, optPano.getVariables(), optPano.getCtrlPoints())
         );
+    // calculate the mean exposure.
+    opts.outputExposureValue = calcMeanExposure(*m_pano);
 
     // copy information into our panorama
     GlobalCmdHist::getInstance().addCommand(

Modified: hugin/trunk/src/hugin1/hugin/OptimizePhotometricPanel.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/OptimizePhotometricPanel.cpp	2010-05-13 11:41:29 UTC (rev 5153)
+++ hugin/trunk/src/hugin1/hugin/OptimizePhotometricPanel.cpp	2010-05-13 12:14:25 UTC (rev 5154)
@@ -566,17 +566,17 @@
 
     if (ret == wxYES) {
         DEBUG_DEBUG("Applying vignetting corr");
+        // TODO: merge into a single update command
+        const VariableMapVector & vars = optPano.getVariables();
+        GlobalCmdHist::getInstance().addCommand(
+                new PT::UpdateImagesVariablesCmd(*m_pano, imgs, vars)
+                                               );
+        //now update panorama exposure value
         PanoramaOptions opts = m_pano->getOptions();
         opts.outputExposureValue = calcMeanExposure(*m_pano);
-        // TODO: merge into a single update command
         GlobalCmdHist::getInstance().addCommand(
                 new PT::SetPanoOptionsCmd(*m_pano, opts)
                                                );
-
-        const VariableMapVector & vars = optPano.getVariables();
-        GlobalCmdHist::getInstance().addCommand(
-                new PT::UpdateImagesVariablesCmd(*m_pano, imgs, vars)
-                                               );
     }
 }
 

Modified: hugin/trunk/src/hugin1/hugin/PreviewPanel.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/PreviewPanel.cpp	2010-05-13 11:41:29 UTC (rev 5153)
+++ hugin/trunk/src/hugin1/hugin/PreviewPanel.cpp	2010-05-13 12:14:25 UTC (rev 5154)
@@ -147,6 +147,11 @@
         DEBUG_DEBUG("projection parameters changed");
         dirty = true;
     }
+    if (newOpts.outputExposureValue != opts.outputExposureValue )
+    {
+        DEBUG_DEBUG("output exposure value changed");
+        dirty = true;
+    };
 
     opts = newOpts;
     if (dirty) {


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