load fn from resources, del kfrm speed update, svg exec cmd/file win fixes, undo...

[goodguy/history.git] / cinelerra-5.1 / plugins / motion-cv / motionwindow-cv.C

diff --git a/cinelerra-5.1/plugins/motion-cv/motionwindow-cv.C b/cinelerra-5.1/plugins/motion-cv/motionwindow-cv.C
index 859a43018e96baac3d958c8b8ef7efa4ab42ec1f..eeadec0c2bef68d8602db432f978cc59b9bb0eb2 100644 (file)
--- a/cinelerra-5.1/plugins/motion-cv/motionwindow-cv.C
+++ b/cinelerra-5.1/plugins/motion-cv/motionwindow-cv.C
@@ -31,7 +31,7 @@
 #include "pluginserver.h"
 
 MotionCVWindow::MotionCVWindow(MotionCVMain *plugin)
- : PluginClientWindow(plugin, 815, 575, 815, 575, 0)
+ : PluginClientWindow(plugin, 815, 600, 815, 600, 0)
 {
        this->plugin = plugin;
 }
@@ -100,12 +100,13 @@ void MotionCVWindow::create_objects()
                        this, x + title->get_w() + 10, y));
        mode3->create_objects();
 
+       y += 40;  int y1 = y;
        add_subwindow(title = new BC_Title(x2, y, _("Tracking file:")));
        add_subwindow(tracking_file = new MotionCVTrackingFile(plugin,
                        plugin->config.  tracking_file, this,
                        x2 + title->get_w() + 20, y));
+       y1 += tracking_file->get_h() + 10;
 
-       y += 40;  int y1 = y;
        add_subwindow(title = new BC_Title(x, y + 10, _("Block X:")));
        add_subwindow(block_x = new MotionCVBlockX(plugin, this,
                        x + title->get_w() + 10, y));
@@ -149,10 +150,13 @@ void MotionCVWindow::create_objects()
                new BC_Title(x1=x2, y1=y, _("Frame number:")));
        add_subwindow(track_frame_number =
                new TrackFrameNumber(plugin, this, x1 += title->get_w(), y1));
+       if( plugin->config.mode3 != MotionCVConfig::TRACK_SINGLE )
+               track_frame_number->disable();
+
        add_subwindow(addtrackedframeoffset =
                new AddTrackedFrameOffset(plugin, this, x1=x2, y1+=track_frame_number->get_h()));
        int pef = client->server->mwindow->edl->session->video_every_frame;
-       add_subwindow(pef_title = new BC_Title(x1=x2, y1+=addtrackedframeoffset->get_h() + 5,
+       add_subwindow(pef_title = new BC_Title(x1=x2+50, y1+=addtrackedframeoffset->get_h() + 5,
                !pef ?  _("For best results\n"
                                " Set: Play every frame\n"
                                " Preferences-> Playback-> Video Out") :
@@ -483,8 +487,6 @@ TrackFrameNumber::TrackFrameNumber(MotionCVMain *plugin,
 {
        this->plugin = plugin;
        this->gui = gui;
-       if( plugin->config.mode3 != MotionCVConfig::TRACK_SINGLE )
-               disable();
 }
 
 int TrackFrameNumber::handle_event()