Learn how easy it is to sync an existing GitHub or Google Code repo to a SourceForge project! See Demo

Close

Diff of /src/hugin1/hugin/GLPreviewFrame.cpp [8d6de6] .. [dd7a6b] Maximize Restore

  Switch to unified view

a/src/hugin1/hugin/GLPreviewFrame.cpp b/src/hugin1/hugin/GLPreviewFrame.cpp
...
...
429
    wxBoxSizer *sizer = new wxBoxSizer(wxHORIZONTAL);
429
    wxBoxSizer *sizer = new wxBoxSizer(wxHORIZONTAL);
430
    sizer->Add(select_all,0,wxALIGN_CENTER_VERTICAL | wxLEFT | wxTOP | wxBOTTOM,5);
430
    sizer->Add(select_all,0,wxALIGN_CENTER_VERTICAL | wxLEFT | wxTOP | wxBOTTOM,5);
431
    sizer->Add(select_none,0,wxALIGN_CENTER_VERTICAL | wxRIGHT | wxTOP | wxBOTTOM,5);
431
    sizer->Add(select_none,0,wxALIGN_CENTER_VERTICAL | wxRIGHT | wxTOP | wxBOTTOM,5);
432
    panel->SetSizer(sizer);
432
    panel->SetSizer(sizer);
433
    m_ToggleButtonSizer->Add(panel, 0, wxALIGN_CENTER_VERTICAL);
433
    m_ToggleButtonSizer->Add(panel, 0, wxALIGN_CENTER_VERTICAL);
434
    m_ToggleButtonSizer->Add(m_ButtonPanel, 1, wxEXPAND | wxADJUST_MINSIZE | wxALIGN_CENTER_VERTICAL, 0);
434
    m_ToggleButtonSizer->Add(m_ButtonPanel, 1, wxEXPAND | wxALIGN_CENTER_VERTICAL, 0);
435
435
436
    m_topsizer->Add(tool_panel, 0, wxEXPAND | wxALL, 2);
436
    m_topsizer->Add(tool_panel, 0, wxEXPAND | wxALL, 2);
437
    m_topsizer->Add(toggle_panel, 0, wxEXPAND | wxADJUST_MINSIZE | wxBOTTOM, 5);
437
    m_topsizer->Add(toggle_panel, 0, wxEXPAND | wxBOTTOM, 5);
438
438
439
#if wxCHECK_VERSION(2, 9, 1)
439
#if wxCHECK_VERSION(2, 9, 1)
440
    m_infoBar = new wxInfoBar(this);
440
    m_infoBar = new wxInfoBar(this);
441
    m_infoBar->AddButton(ID_HIDE_HINTS,_("Hide"));
441
    m_infoBar->AddButton(ID_HIDE_HINTS,_("Hide"));
442
    m_infoBar->Connect(ID_HIDE_HINTS,wxEVT_COMMAND_BUTTON_CLICKED,wxCommandEventHandler(GLPreviewFrame::OnHideProjectionHints),NULL,this);
442
    m_infoBar->Connect(ID_HIDE_HINTS,wxEVT_COMMAND_BUTTON_CLICKED,wxCommandEventHandler(GLPreviewFrame::OnHideProjectionHints),NULL,this);
...
...
488
                                wxSL_VERTICAL | wxSL_AUTOTICKS,
488
                                wxSL_VERTICAL | wxSL_AUTOTICKS,
489
                                wxDefaultValidator,
489
                                wxDefaultValidator,
490
                                _("VFOV"));
490
                                _("VFOV"));
491
    m_VFOVSlider->SetLineSize(2);
491
    m_VFOVSlider->SetLineSize(2);
492
    m_VFOVSlider->SetPageSize(10);
492
    m_VFOVSlider->SetPageSize(10);
493
#if wxCHECK_VERSION(3,0,1)
494
    m_VFOVSlider->SetTickFreq(5);
495
#else
493
    m_VFOVSlider->SetTickFreq(5,0);
496
    m_VFOVSlider->SetTickFreq(5,0);
497
#endif
494
    m_VFOVSlider->SetToolTip(_("drag to change the vertical field of view"));
498
    m_VFOVSlider->SetToolTip(_("drag to change the vertical field of view"));
495
499
496
    flexSizer->Add(m_VFOVSlider, 0, wxEXPAND);
500
    flexSizer->Add(m_VFOVSlider, 0, wxEXPAND);
497
501
498
    m_HFOVSlider = new wxSlider(preview_panel, -1, 1,
502
    m_HFOVSlider = new wxSlider(preview_panel, -1, 1,
...
...
501
                                wxSL_HORIZONTAL | wxSL_AUTOTICKS,
505
                                wxSL_HORIZONTAL | wxSL_AUTOTICKS,
502
                                wxDefaultValidator,
506
                                wxDefaultValidator,
503
                                _("HFOV"));
507
                                _("HFOV"));
504
    m_HFOVSlider->SetPageSize(10);
508
    m_HFOVSlider->SetPageSize(10);
505
    m_HFOVSlider->SetLineSize(2);
509
    m_HFOVSlider->SetLineSize(2);
510
#if wxCHECK_VERSION(3,0,1)
511
    m_HFOVSlider->SetTickFreq(5);
512
#else
506
    m_HFOVSlider->SetTickFreq(5,0);
513
    m_HFOVSlider->SetTickFreq(5,0);
514
#endif
507
515
508
    m_HFOVSlider->SetToolTip(_("drag to change the horizontal field of view"));
516
    m_HFOVSlider->SetToolTip(_("drag to change the horizontal field of view"));
509
517
510
    m_HFOVText = XRCCTRL(*this, "pano_text_hfov" ,wxTextCtrl);
518
    m_HFOVText = XRCCTRL(*this, "pano_text_hfov" ,wxTextCtrl);
511
    DEBUG_ASSERT(m_HFOVText);
519
    DEBUG_ASSERT(m_HFOVText);
...
...
1294
                butcheck->Show(individualDragging() && m_mode==mode_drag);
1302
                butcheck->Show(individualDragging() && m_mode==mode_drag);
1295
1303
1296
                but->SetValue(true);
1304
                but->SetValue(true);
1297
                m_ButtonSizer->Add(pan,
1305
                m_ButtonSizer->Add(pan,
1298
                                   0,
1306
                                   0,
1299
                                   wxLEFT | wxTOP | wxADJUST_MINSIZE,
1307
                                   wxLEFT | wxTOP,
1300
                                   0);
1308
                                   0);
1301
                m_ToggleButtons.push_back(but);
1309
                m_ToggleButtons.push_back(but);
1302
                m_GroupToggleButtons.push_back(butcheck);
1310
                m_GroupToggleButtons.push_back(butcheck);
1303
                m_ToggleButtonPanel.push_back(pan);
1311
                m_ToggleButtonPanel.push_back(pan);
1304
                dirty = true;
1312
                dirty = true;
...
...
1313
        wxFileName tFilename(wxString (pano.getImage(i).getFilename().c_str(), HUGIN_CONV_FILENAME));
1321
        wxFileName tFilename(wxString (pano.getImage(i).getFilename().c_str(), HUGIN_CONV_FILENAME));
1314
        m_ToggleButtons[i]->SetToolTip(tFilename.GetFullName());
1322
        m_ToggleButtons[i]->SetToolTip(tFilename.GetFullName());
1315
    }
1323
    }
1316
1324
1317
    if (dirty) {
1325
    if (dirty) {
1326
#if wxCHECK_VERSION(3,0,0)
1327
        m_ButtonSizer->FitInside(m_ButtonPanel);
1328
#else
1318
        m_ButtonSizer->SetVirtualSizeHints(m_ButtonPanel);
1329
        m_ButtonSizer->SetVirtualSizeHints(m_ButtonPanel);
1330
#endif
1319
        // Layout();
1331
        // Layout();
1320
        DEBUG_INFO("New m_ButtonPanel width: " << (m_ButtonPanel->GetSize()).GetWidth());
1332
        DEBUG_INFO("New m_ButtonPanel width: " << (m_ButtonPanel->GetSize()).GetWidth());
1321
        DEBUG_INFO("New m_ButtonPanel Height: " << (m_ButtonPanel->GetSize()).GetHeight());
1333
        DEBUG_INFO("New m_ButtonPanel Height: " << (m_ButtonPanel->GetSize()).GetHeight());
1322
    }
1334
    }
1323
1335