From: Good Guy Date: Mon, 14 Jan 2019 00:47:13 +0000 (-0700) Subject: edit drag handle cursor per track, batchrender col width fix, batchrender path errmsg... X-Git-Tag: 2019-08~120 X-Git-Url: https://cinelerra-gg.org/git/?a=commitdiff_plain;h=010024a919b463542b843cf2dd50e0ccb30f1269;p=goodguy%2Fcinelerra.git edit drag handle cursor per track, batchrender col width fix, batchrender path errmsg fix, disable opencv python3 --- diff --git a/cinelerra-5.1/cinelerra/batchrender.C b/cinelerra-5.1/cinelerra/batchrender.C index e75c7109..ae1cef93 100644 --- a/cinelerra-5.1/cinelerra/batchrender.C +++ b/cinelerra-5.1/cinelerra/batchrender.C @@ -392,7 +392,7 @@ int BatchRenderThread::test_edl_files() for( int i=0; !ret && ienabled ) continue; - const char *path = jobs.values[i]->edl_path; + path = jobs.values[i]->edl_path; int is_script = *path == '@' ? 1 : 0; if( is_script ) ++path; FILE *fp = fopen(path, "r"); @@ -1211,9 +1211,14 @@ int BatchRenderList::selection_changed() int BatchRenderList::column_resize_event() { - for( int i = 0; i < BATCHRENDER_COLUMNS; i++ ) { - thread->list_width[i] = get_column_width(i); - } + int col = 0; + thread->list_width[ENABLED_COL] = get_column_width(col++); + thread->list_width[LABELED_COL] = get_column_width(col++); + if( thread->gui->use_renderfarm ) + thread->list_width[FARMED_COL] = get_column_width(col++); + thread->list_width[OUTPUT_COL] = get_column_width(col++); + thread->list_width[EDL_COL] = get_column_width(col++); + thread->list_width[ELAPSED_COL] = get_column_width(col); return 1; } diff --git a/cinelerra-5.1/cinelerra/trackcanvas.C b/cinelerra-5.1/cinelerra/trackcanvas.C index 03fac258..638e0434 100644 --- a/cinelerra-5.1/cinelerra/trackcanvas.C +++ b/cinelerra-5.1/cinelerra/trackcanvas.C @@ -1943,8 +1943,12 @@ void TrackCanvas::draw_drag_handle() if( !mwindow->session->drag_edit ) return; int group_id = mwindow->session->drag_edit->group_id; if( !group_id ) return; + int64_t dx, dy, dw, dh; + edit_dimensions(mwindow->session->drag_edit, dx, dy, dw, dh); int drag_handle = mwindow->session->drag_handle; - set_color(RED); + int64_t pixel0 = !drag_handle ? dx : dx + dw; + int delta = pixel1 - pixel0; + set_color(LTPURPLE); set_line_width(3); for( Track *track=mwindow->edl->tracks->first; track; track=track->next ) { @@ -1975,10 +1979,10 @@ void TrackCanvas::draw_drag_handle() can_drag = 0; int64_t x, y, w, h; edit_dimensions(edit, x, y, w, h); + if( y+h < 0 || y >= get_h() ) continue; int edge_x = !drag_handle ? x : x + w; int edge_y = y + h/2, k = 10; - if( edge_x >= 0 && edge_x < get_w() && - edge_y >= 0 && edge_y < get_h() ) { + if( edge_x >= 0 && edge_x < get_w() ) { if( !can_drag ) { draw_line(edge_x-k,edge_y-k, edge_x+k,edge_y+k); draw_line(edge_x-k,edge_y+k, edge_x+k,edge_y-k); @@ -1992,6 +1996,10 @@ void TrackCanvas::draw_drag_handle() draw_line(edge_x,edge_y, edge_x-k,edge_y+k); } } + edge_x += delta; + if( edge_x >= 0 && edge_x < get_w() ) { + draw_line(edge_x, y, edge_x, y+h); + } } set_line_width(1); } diff --git a/cinelerra-5.1/opencv_build b/cinelerra-5.1/opencv_build index b42fb611..caacceeb 100644 --- a/cinelerra-5.1/opencv_build +++ b/cinelerra-5.1/opencv_build @@ -79,6 +79,7 @@ $(opencv)/build: $(opencv).src -DINSTALL_C_EXAMPLES=OFF \ -DINSTALL_PYTHON_EXAMPLES=OFF \ -DBUILD_EXAMPLES=OFF .. \ + -DBUILD_opencv_python3=no \ -DCMAKE_INSTALL_PREFIX=/usr/local \ -DOPENCV_EXTRA_MODULES_PATH="$(opencv)_contrib/modules/" @@ -98,6 +99,7 @@ $(opencv)/build: $(opencv).src -DINSTALL_C_EXAMPLES=ON \ -DINSTALL_PYTHON_EXAMPLES=ON \ -DBUILD_EXAMPLES=ON .. \ + -DBUILD_opencv_python3=no \ -DCMAKE_INSTALL_PREFIX=/usr/local \ -DOPENCV_EXTRA_MODULES_PATH="$(opencv)_contrib/modules/"