Hugin

Revision: 3768
          http://hugin.svn.sourceforge.net/hugin/?rev=3768&view=rev
Author:   jlegg
Date:     2009-03-30 14:09:50 +0000 (Mon, 30 Mar 2009)

Log Message:
-----------
Fix bug 2318435: Hugin crashes when Crop is used in OpenGL preview.

Modified Paths:
--------------
    hugin/trunk/src/hugin1/hugin/GLPreviewFrame.cpp

Modified: hugin/trunk/src/hugin1/hugin/GLPreviewFrame.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/GLPreviewFrame.cpp	2009-03-29 16:12:21 UTC (rev 3767)
+++ hugin/trunk/src/hugin1/hugin/GLPreviewFrame.cpp	2009-03-30 14:09:50 UTC (rev 3768)
@@ -407,7 +407,6 @@
     if (config->Read(wxT("/GLPreviewFrame/isShown"), 0l) != 0) {
         Show();
     }
-    crop_tool = 0;
 }
 
 GLPreviewFrame::~GLPreviewFrame()


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

Revision: 3770
          http://hugin.svn.sourceforge.net/hugin/?rev=3770&view=rev
Author:   tmodes
Date:     2009-04-01 05:37:15 +0000 (Wed, 01 Apr 2009)

Log Message:
-----------
Redraw fast preview after resize

Modified Paths:
--------------
    hugin/trunk/src/hugin1/hugin/GLPreviewFrame.cpp

Modified: hugin/trunk/src/hugin1/hugin/GLPreviewFrame.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/GLPreviewFrame.cpp	2009-03-31 23:00:31 UTC (rev 3769)
+++ hugin/trunk/src/hugin1/hugin/GLPreviewFrame.cpp	2009-04-01 05:37:15 UTC (rev 3770)
@@ -914,7 +914,7 @@
                 new PT::SetPanoOptionsCmd( m_pano, opt )
                                             );
         DEBUG_DEBUG ("Projection changed: "  << lt);
-
+        Refresh();
     } else {
         // FIXME DEBUG_WARN("wxChoice event from unknown object received");
     }


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

Revision: 3773
          http://hugin.svn.sourceforge.net/hugin/?rev=3773&view=rev
Author:   jlegg
Date:     2009-04-02 20:42:23 +0000 (Thu, 02 Apr 2009)

Log Message:
-----------
Fix crash when Hugin was closed without using the fast preview introduced in 3768.

Modified Paths:
--------------
    hugin/trunk/src/hugin1/hugin/GLPreviewFrame.cpp

Modified: hugin/trunk/src/hugin1/hugin/GLPreviewFrame.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/GLPreviewFrame.cpp	2009-04-01 14:02:41 UTC (rev 3772)
+++ hugin/trunk/src/hugin1/hugin/GLPreviewFrame.cpp	2009-04-02 20:42:23 UTC (rev 3773)
@@ -142,6 +142,12 @@
     DEBUG_ASSERT(crop_tool_id != -2);
     identify_tool_id = wxXmlResource::Get()->GetXRCID(wxT("preview_identify_tool"));
     DEBUG_ASSERT(identify_tool_id != -2);
+
+    /* We zero this pointer as it is used to check if the tool objects were ever
+     * created when the GLPreviewFrame is deleted, and therefore if the tools
+     * need freeing. The tools are created only when the preview is used.
+     */
+    crop_tool = 0;
     
 
     m_topsizer = new wxBoxSizer( wxVERTICAL );


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

Revision: 3776
          http://hugin.svn.sourceforge.net/hugin/?rev=3776&view=rev
Author:   tmodes
Date:     2009-04-06 05:37:04 +0000 (Mon, 06 Apr 2009)

Log Message:
-----------
Restore last used blend mode in fast preview window at next startup

Modified Paths:
--------------
    hugin/trunk/src/hugin1/hugin/GLPreviewFrame.cpp

Modified: hugin/trunk/src/hugin1/hugin/GLPreviewFrame.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/GLPreviewFrame.cpp	2009-04-04 14:43:18 UTC (rev 3775)
+++ hugin/trunk/src/hugin1/hugin/GLPreviewFrame.cpp	2009-04-06 05:37:04 UTC (rev 3776)
@@ -277,8 +277,7 @@
     m_BlendModeChoice = new wxChoice(this, ID_BLEND_CHOICE,
                                      wxDefaultPosition, wxDefaultSize,
                                      2, m_choices);
-    // TODO
-    // m_BlendModeChoice->SetSelection((PreviewCanvas::BlendMode) oldMode);
+    m_BlendModeChoice->SetSelection(oldMode);
 
     blendModeSizer->Add(m_BlendModeChoice,
                         0,
@@ -1008,6 +1007,10 @@
     
     // activate tools that are always active.
     helper->ActivateTool(pano_mask_tool);
+    // activate difference tool, when selected difference mode at last use
+    int blendMode = wxConfigBase::Get()->Read(wxT("/GLPreviewFrame/blendMode"), 0l);
+    if(blendMode==1)
+        helper->ActivateTool(difference_tool);
 }
 
 void GLPreviewFrame::OnCrop(wxCommandEvent & e)


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

Revision: 3885
          http://hugin.svn.sourceforge.net/hugin/?rev=3885&view=rev
Author:   brunopostle
Date:     2009-05-26 23:31:07 +0000 (Tue, 26 May 2009)

Log Message:
-----------
Remove GLEW related segfault on startup caused by second call to glewInit()

Modified Paths:
--------------
    hugin/trunk/src/hugin1/hugin/GLPreviewFrame.cpp

Modified: hugin/trunk/src/hugin1/hugin/GLPreviewFrame.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/GLPreviewFrame.cpp	2009-05-25 14:06:55 UTC (rev 3884)
+++ hugin/trunk/src/hugin1/hugin/GLPreviewFrame.cpp	2009-05-26 23:31:07 UTC (rev 3885)
@@ -278,15 +278,11 @@
     int numBlendChoices = 0;
     m_choices[numBlendChoices++] = _("normal");
     // test of OpenGL extension GL_ARB_imaging for difference blend
-    GLenum err = glewInit();
-    if (GLEW_OK != err)
-    {
         if (glewIsSupported("GL_ARB_imaging"))
         {
             // GL_ARB_imaging available, add difference mode to choice
             m_choices[numBlendChoices++] = _("difference");
         }        
-    }
     // create choice item
     m_BlendModeChoice = new wxChoice(this, ID_BLEND_CHOICE,
                                      wxDefaultPosition, wxDefaultSize,


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

Revision: 3940
          http://hugin.svn.sourceforge.net/hugin/?rev=3940&view=rev
Author:   gpatters1
Date:     2009-06-12 05:14:25 +0000 (Fri, 12 Jun 2009)

Log Message:
-----------
[2801663] - fix for crash when pressing crop button on empty GL preview.

Modified Paths:
--------------
    hugin/trunk/src/hugin1/hugin/GLPreviewFrame.cpp

Modified: hugin/trunk/src/hugin1/hugin/GLPreviewFrame.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/GLPreviewFrame.cpp	2009-06-11 15:11:57 UTC (rev 3939)
+++ hugin/trunk/src/hugin1/hugin/GLPreviewFrame.cpp	2009-06-12 05:14:25 UTC (rev 3940)
@@ -415,7 +415,6 @@
     if (config->Read(wxT("/GLPreviewFrame/isShown"), 0l) != 0) {
         Show();
     }
-    crop_tool = 0;
 }
 
 GLPreviewFrame::~GLPreviewFrame()


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

Revision: 4832
          http://hugin.svn.sourceforge.net/hugin/?rev=4832&view=rev
Author:   jlegg
Date:     2009-12-23 21:07:25 +0000 (Wed, 23 Dec 2009)

Log Message:
-----------
Disbale the control points tool when in layout mode. The control points don't make sense without the images in the right position, and drawing them slows line highlighting significantly for complex projects.

Modified Paths:
--------------
    hugin/trunk/src/hugin1/hugin/GLPreviewFrame.cpp

Modified: hugin/trunk/src/hugin1/hugin/GLPreviewFrame.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/GLPreviewFrame.cpp	2009-12-23 20:08:13 UTC (rev 4831)
+++ hugin/trunk/src/hugin1/hugin/GLPreviewFrame.cpp	2009-12-23 21:07:25 UTC (rev 4832)
@@ -706,14 +706,17 @@
         tools.insert(crop_tool);
         tools.insert(drag_tool);
         tools.insert(identify_tool);
+        tools.insert(control_point_tool);
         helper->DeactivateTool(crop_tool);
         helper->DeactivateTool(drag_tool);
         helper->DeactivateTool(identify_tool);
+        helper->DeactivateTool(control_point_tool);
         TurnOffTools(tools);
         // hide UI items that are not applicable to layout mode.
         m_ToolBar->EnableTool(drag_tool_id, false);
         m_ToolBar->EnableTool(identify_tool_id, false);
         m_ToolBar->EnableTool(crop_tool_id, false);
+        m_ToolBar->EnableTool(control_point_tool_id, false);
         // Turn on the layout mode view
         m_GLViewer->SetLayoutMode(true);
         helper->ActivateTool(m_layoutLinesTool);
@@ -727,6 +730,7 @@
         m_ToolBar->EnableTool(drag_tool_id, true );
         m_ToolBar->EnableTool(identify_tool_id, true );
         m_ToolBar->EnableTool(crop_tool_id, true);
+        m_ToolBar->EnableTool(control_point_tool_id, true);
     }
 }
 


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

Revision: 4971
          http://hugin.svn.sourceforge.net/hugin/?rev=4971&view=rev
Author:   jlegg
Date:     2010-02-10 04:34:41 +0000 (Wed, 10 Feb 2010)

Log Message:
-----------
Fix a bug where scrolling the layout image scale slider with the mouse wheel was ignored.

Modified Paths:
--------------
    hugin/trunk/src/hugin1/hugin/GLPreviewFrame.cpp

Modified: hugin/trunk/src/hugin1/hugin/GLPreviewFrame.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/GLPreviewFrame.cpp	2010-02-08 21:20:35 UTC (rev 4970)
+++ hugin/trunk/src/hugin1/hugin/GLPreviewFrame.cpp	2010-02-10 04:34:41 UTC (rev 4971)
@@ -937,6 +937,9 @@
     } else if (e.GetEventObject() == m_VFOVSlider) {
         DEBUG_DEBUG("VFOV changed (slider): " << e.GetInt());
         opt.setVFOV(e.GetInt());
+    } else if (e.GetEventObject() == XRCCTRL(*this,"layout_scale_slider",wxSlider)) {
+        DEBUG_DEBUG("Layout scale changed (slider): " << e.GetInt());
+        GLPreviewFrame::OnLayoutScaleChange(e);
     } else {
         int nParam = opt.m_projFeatures.numberOfParameters;
         std::vector<double> para = opt.getProjectionParameters();


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

Revision: 5127
          http://hugin.svn.sourceforge.net/hugin/?rev=5127&view=rev
Author:   tmodes
Date:     2010-04-30 16:36:20 +0000 (Fri, 30 Apr 2010)

Log Message:
-----------
Disable numeric transform input in mosaic drag mode

Modified Paths:
--------------
    hugin/trunk/src/hugin1/hugin/GLPreviewFrame.cpp

Modified: hugin/trunk/src/hugin1/hugin/GLPreviewFrame.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/GLPreviewFrame.cpp	2010-04-28 11:41:11 UTC (rev 5126)
+++ hugin/trunk/src/hugin1/hugin/GLPreviewFrame.cpp	2010-04-30 16:36:20 UTC (rev 5127)
@@ -1022,7 +1022,14 @@
 		    	case 1: //mosaic
 		    		drag_tool->setDragMode(PreviewDragTool::drag_mode_mosaic);
 		    	break;
-		    }        
+		    }
+            XRCCTRL(*this,"label_yaw",wxStaticText)->Enable(index==0);
+            XRCCTRL(*this,"input_yaw",wxTextCtrl)->Enable(index==0);
+            XRCCTRL(*this,"label_pitch",wxStaticText)->Enable(index==0);
+            XRCCTRL(*this,"input_pitch",wxTextCtrl)->Enable(index==0);
+            XRCCTRL(*this,"label_roll",wxStaticText)->Enable(index==0);
+            XRCCTRL(*this,"input_roll",wxTextCtrl)->Enable(index==0);
+            XRCCTRL(*this,"apply_num_transform",wxButton)->Enable(index==0);
         }
     }
     else


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