Menu
▾
▴
hugin-cvs
|
From: <tm...@us...> - 2010-03-25 22:08:21
|
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.
|
|
From: <tm...@us...> - 2010-04-01 17:02:38
|
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.
|
|
From: <tm...@us...> - 2010-04-04 10:24:17
|
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.
|
|
From: <tm...@us...> - 2010-04-14 17:25:11
|
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.
|
|
From: <bru...@us...> - 2010-04-20 20:49:31
|
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.
|
|
From: <jl...@us...> - 2010-05-01 20:59:26
|
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.
|
|
From: <jl...@us...> - 2010-05-02 22:23:10
|
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.
|
|
From: <tm...@us...> - 2010-05-03 16:03:34
|
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.
|
|
From: <tm...@us...> - 2010-05-03 16:10:01
|
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.
|
|
From: <tm...@us...> - 2010-05-13 12:14:32
|
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.
|
Thanks for helping keep SourceForge clean.
X