From: Good Guy Date: Wed, 24 Oct 2018 20:08:02 +0000 (-0600) Subject: fix histogram bez keyframe interp, update plugins/fonts/fonts.scale, edl copy clip... X-Git-Url: https://cinelerra-gg.org/git/?a=commitdiff_plain;h=340840559db419a217ccb6adc7de1f96518d2906;p=goodguy%2Fhistory.git fix histogram bez keyframe interp, update plugins/fonts/fonts.scale, edl copy clip transition position test, fix multiple proxy assets in single clip rescale, editpanel click2play fix, use brender pref applies without restart --- diff --git a/cinelerra-5.1/cinelerra/edit.C b/cinelerra-5.1/cinelerra/edit.C index 34157b1f..c680d8c6 100644 --- a/cinelerra-5.1/cinelerra/edit.C +++ b/cinelerra-5.1/cinelerra/edit.C @@ -189,7 +189,7 @@ int Edit::copy(int64_t start, file->append_tag(); } - if(transition) + if(transition && startsource_in_selection == startsource) { transition->save_xml(file); } diff --git a/cinelerra-5.1/cinelerra/editpanel.C b/cinelerra-5.1/cinelerra/editpanel.C index b370723a..b539bda4 100644 --- a/cinelerra-5.1/cinelerra/editpanel.C +++ b/cinelerra-5.1/cinelerra/editpanel.C @@ -986,10 +986,12 @@ EditClick2Play::EditClick2Play(MWindow *mwindow, EditPanel *panel, int x, int y) int EditClick2Play::handle_event() { int value = get_value(); - if( !panel->is_vwindow() ) - mwindow->edl->session->cwindow_click2play = value; - else + if( panel->is_vwindow() ) { mwindow->edl->session->vwindow_click2play = value; + mwindow->update_vwindow(); + } + else + mwindow->edl->session->cwindow_click2play = value; return 1; } int EditClick2Play::keypress_event() @@ -998,10 +1000,12 @@ int EditClick2Play::keypress_event() if( key == 'p' && !ctrl_down() && !shift_down() && !alt_down() ) { int value = get_value() ? 0 : 1; update(value); - if( !panel->is_vwindow() ) - mwindow->edl->session->cwindow_click2play = value; - else + if( panel->is_vwindow() ) { mwindow->edl->session->vwindow_click2play = value; + mwindow->update_vwindow(); + } + else + mwindow->edl->session->cwindow_click2play = value; return 1; } return 0; diff --git a/cinelerra-5.1/cinelerra/edl.C b/cinelerra-5.1/cinelerra/edl.C index 21abfd7b..77705fcf 100644 --- a/cinelerra-5.1/cinelerra/edl.C +++ b/cinelerra-5.1/cinelerra/edl.C @@ -1543,45 +1543,57 @@ void EDL::set_proxy(int new_scale, int use_scaler, // change original assets to proxy assets int folder_no = use_scaler || new_scale != 1 ? AW_PROXY_FOLDER : AW_MEDIA_FOLDER; for( int i=0,n=proxy_assets->size(); iget(i)->path; Indexable *proxy_idxbl = proxy_assets->get(i); proxy_idxbl->folder_no = folder_no; - Asset *proxy_asset = proxy_idxbl->is_asset ? assets->update((Asset *)proxy_idxbl) : 0; - if( proxy_asset && proxy_idxbl ) { - proxy_asset->width = proxy_idxbl->get_w(); - proxy_asset->height = proxy_idxbl->get_h(); - } - EDL *proxy_edl = !proxy_idxbl->is_asset ? (EDL *)proxy_idxbl : 0; + if( !proxy_idxbl->is_asset ) continue; + Asset *proxy_asset = assets->update((Asset *)proxy_idxbl); + if( proxy_asset == (Asset *)proxy_idxbl ) continue; + proxy_asset->width = proxy_idxbl->get_w(); + proxy_asset->height = proxy_idxbl->get_h(); + } // replace track contents - for( Track *track=tracks->first; track; track=track->next ) { + for( Track *track=tracks->first; track; track=track->next ) { + if( track->data_type != TRACK_VIDEO ) continue; + for( Edit *edit=track->edits->first; edit; edit=edit->next ) { + Indexable *idxbl = (Indexable *)edit->asset; + if( !idxbl ) idxbl = (Indexable *)edit->nested_edl; + if( !idxbl ) continue; + int i = orig_assets->size(); + while( --i>=0 && strcmp(orig_assets->get(i)->path, idxbl->path) ); + if( i < 0 ) continue; + Indexable *proxy_idxbl = proxy_assets->get(i); + Asset *proxy_asset = proxy_idxbl->is_asset ? + assets->update((Asset *)proxy_idxbl) : 0; + EDL *proxy_edl = !proxy_idxbl->is_asset ? + (EDL *)proxy_idxbl : 0; + edit->asset = proxy_asset; + edit->nested_edl = proxy_edl; + } + } + for( int j=0,n=clips.size(); jtracks->first; track; track=track->next ) { if( track->data_type != TRACK_VIDEO ) continue; for( Edit *edit=track->edits->first; edit; edit=edit->next ) { Indexable *idxbl = (Indexable *)edit->asset; if( !idxbl ) idxbl = (Indexable *)edit->nested_edl; if( !idxbl ) continue; - if( strcmp(idxbl->path, orig_path) ) continue; + int i = orig_assets->size(); + while( --i>=0 && strcmp(orig_assets->get(i)->path, idxbl->path) ); + if( i < 0 ) continue; + Indexable *proxy_idxbl = proxy_assets->get(i); + Asset *proxy_asset = proxy_idxbl->is_asset ? + assets->update((Asset *)proxy_idxbl) : 0; + EDL *proxy_edl = !proxy_idxbl->is_asset ? + (EDL *)proxy_idxbl : 0; edit->asset = proxy_asset; edit->nested_edl = proxy_edl; + has_proxy = 1; } } - for( int j=0,m=clips.size(); jtracks->first; track; track=track->next ) { - if( track->data_type != TRACK_VIDEO ) continue; - for( Edit *edit=track->edits->first; edit; edit=edit->next ) { - Indexable *idxbl = (Indexable *)edit->asset; - if( !idxbl ) idxbl = (Indexable *)edit->nested_edl; - if( !idxbl ) continue; - if( strcmp(idxbl->path, orig_path) ) continue; - edit->asset = proxy_asset; - edit->nested_edl = proxy_edl; - has_proxy = 1; - } - } - if( has_proxy && !orig_use_scaler ) - clip->rescale_proxy(orig_scale, new_scale); - } + if( has_proxy && !orig_use_scaler ) + clip->rescale_proxy(orig_scale, new_scale); } } diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C index 25013b43..c1cd79f6 100644 --- a/cinelerra-5.1/cinelerra/mwindow.C +++ b/cinelerra-5.1/cinelerra/mwindow.C @@ -3526,16 +3526,7 @@ void MWindow::update_project(int load_mode) zwindow->start(); } } - else { - if(vwindows.size()) { - VWindow *vwindow = vwindows[DEFAULT_VWINDOW]; - if( vwindow->is_running() ) { - vwindow->gui->lock_window("MWindow::update_project"); - vwindow->update(1); - vwindow->gui->unlock_window(); - } - } - } + update_vwindow(); if(debug) PRINT_TRACE cwindow->gui->lock_window("MWindow::update_project 2"); @@ -3554,6 +3545,18 @@ void MWindow::update_project(int load_mode) if(debug) PRINT_TRACE } +void MWindow::update_vwindow() +{ + for( int i=0; iis_running() ) { + vwindow->gui->lock_window("MWindow::update_vwindow"); + vwindow->update(1); + vwindow->gui->unlock_window(); + } + } +} + void MWindow::remove_indexfile(Indexable *indexable) { if( !indexable->is_asset ) return; diff --git a/cinelerra-5.1/cinelerra/mwindow.h b/cinelerra-5.1/cinelerra/mwindow.h index 2b2f56c0..e0f0d4f8 100644 --- a/cinelerra-5.1/cinelerra/mwindow.h +++ b/cinelerra-5.1/cinelerra/mwindow.h @@ -176,6 +176,7 @@ public: int overwrite); // Reset everything for a load void update_project(int load_mode); + void update_vwindow(); // Fit selected time to horizontal display range void fit_selection(); // Fit selected autos to the vertical display range diff --git a/cinelerra-5.1/cinelerra/preferencesthread.C b/cinelerra-5.1/cinelerra/preferencesthread.C index 3e6f7ee2..fbac1848 100644 --- a/cinelerra-5.1/cinelerra/preferencesthread.C +++ b/cinelerra-5.1/cinelerra/preferencesthread.C @@ -228,7 +228,7 @@ int PreferencesThread::apply_settings() } PreferencesWindow *window = (PreferencesWindow*)get_gui(); if( window ) window->unlock_window(); - mwindow->init_brender(); + mwindow->stop_brender(); if( window ) window->lock_window("PreferencesThread::apply_settings 5"); if( strcmp(preferences->theme, mwindow->preferences->theme) != 0 ) @@ -264,6 +264,7 @@ int PreferencesThread::apply_settings() mwindow->gui->ffmpeg_toggle->set_tooltip(ffmpeg_early_probe ? FFMPEG_EARLY_TIP : FFMPEG_LATE_TIP); mwindow->gui->mainshbtns->load(mwindow->preferences); + mwindow->init_brender(); //edl->session->recording_format->dump(); //mwindow->edl->session->recording_format->dump(); diff --git a/cinelerra-5.1/cinelerra/vwindow.C b/cinelerra-5.1/cinelerra/vwindow.C index b6dc23c6..df7bef70 100644 --- a/cinelerra-5.1/cinelerra/vwindow.C +++ b/cinelerra-5.1/cinelerra/vwindow.C @@ -304,6 +304,7 @@ void VWindow::update(int do_timebar) { if(do_timebar) gui->timebar->update(1); + gui->edit_panel->update(); } void VWindow::update_position(int change_type, diff --git a/cinelerra-5.1/plugins/fonts/fonts.scale b/cinelerra-5.1/plugins/fonts/fonts.scale index 7cf219ee..3fafb4a0 100644 --- a/cinelerra-5.1/plugins/fonts/fonts.scale +++ b/cinelerra-5.1/plugins/fonts/fonts.scale @@ -1,4 +1,4 @@ -870 +644 A Yummy Apology.ttf -misc-a yummy apology-medium-r-normal--0-0-0-0-p-0-iso10646-1 A.C.M.E. Explosive Bold.ttf -misc-a.c.m.e. explosive-bold-r-normal--0-0-0-0-p-0-iso10646-1 A.C.M.E. Explosive.ttf -misc-a.c.m.e. explosive-medium-r-normal--0-0-0-0-p-0-iso10646-1 @@ -12,12 +12,6 @@ Action Man.ttf -misc-action man-medium-r-normal--0-0-0-0-p-0-iso10646-1 AltamonteNF.ttf -misc-altamontenf-medium-r-normal--0-0-0-0-p-0-iso10646-1 American Dream.ttf -macromedia-american dream-medium-r-normal--0-0-0-0-p-0-iso10646-1 O'Connor.ttf -misc-o'connor-medium-r-normal--0-0-0-0-p-0-iso10646-1 -Old English.ttf -alltype-old english-medium-r-normal--0-0-0-0-p-0-ascii-0 -Old English.ttf -alltype-old english-medium-r-normal--0-0-0-0-p-0-ibm-cp437 -Old English.ttf -alltype-old english-medium-r-normal--0-0-0-0-p-0-ibm-cp850 -Old English.ttf -alltype-old english-medium-r-normal--0-0-0-0-p-0-iso10646-1 -Old English.ttf -alltype-old english-medium-r-normal--0-0-0-0-p-0-iso8859-1 -Old English.ttf -alltype-old english-medium-r-normal--0-0-0-0-p-0-iso8859-9 Old Republic Bold.ttf -macromedia-old republic-bold-r-normal--0-0-0-0-p-0-iso10646-1 Old Republic BoldItalic.ttf -macromedia-old republic-black-r-normal--0-0-0-0-p-0-iso10646-1 Old Republic Italic.ttf -macromedia-old republic-medium-i-normal--0-0-0-0-p-0-iso10646-1 @@ -229,64 +223,6 @@ ariali.ttf -monotype-arial-medium-i-normal--0-0-0-0-p-0-koi8-ru ariali.ttf -monotype-arial-medium-i-normal--0-0-0-0-p-0-koi8-u ariali.ttf -monotype-arial-medium-i-normal--0-0-0-0-p-0-koi8-uni ariali.ttf -monotype-arial-medium-i-normal--0-0-0-0-p-0-microsoft-cp1252 -ariblk.ttf -monotype-arial black-medium-r-normal--0-0-0-0-p-0-adobe-standard -ariblk.ttf -monotype-arial black-medium-r-normal--0-0-0-0-p-0-ascii-0 -ariblk.ttf -monotype-arial black-medium-r-normal--0-0-0-0-p-0-ibm-cp437 -ariblk.ttf -monotype-arial black-medium-r-normal--0-0-0-0-p-0-ibm-cp850 -ariblk.ttf -monotype-arial black-medium-r-normal--0-0-0-0-p-0-ibm-cp852 -ariblk.ttf -monotype-arial black-medium-r-normal--0-0-0-0-p-0-ibm-cp866 -ariblk.ttf -monotype-arial black-medium-r-normal--0-0-0-0-p-0-iso10646-1 -ariblk.ttf -monotype-arial black-medium-r-normal--0-0-0-0-p-0-iso8859-1 -ariblk.ttf -monotype-arial black-medium-r-normal--0-0-0-0-p-0-iso8859-10 -ariblk.ttf -monotype-arial black-medium-r-normal--0-0-0-0-p-0-iso8859-13 -ariblk.ttf -monotype-arial black-medium-r-normal--0-0-0-0-p-0-iso8859-15 -ariblk.ttf -monotype-arial black-medium-r-normal--0-0-0-0-p-0-iso8859-2 -ariblk.ttf -monotype-arial black-medium-r-normal--0-0-0-0-p-0-iso8859-3 -ariblk.ttf -monotype-arial black-medium-r-normal--0-0-0-0-p-0-iso8859-4 -ariblk.ttf -monotype-arial black-medium-r-normal--0-0-0-0-p-0-iso8859-5 -ariblk.ttf -monotype-arial black-medium-r-normal--0-0-0-0-p-0-iso8859-9 -ariblk.ttf -monotype-arial black-medium-r-normal--0-0-0-0-p-0-koi8-e -ariblk.ttf -monotype-arial black-medium-r-normal--0-0-0-0-p-0-koi8-r -ariblk.ttf -monotype-arial black-medium-r-normal--0-0-0-0-p-0-koi8-ru -ariblk.ttf -monotype-arial black-medium-r-normal--0-0-0-0-p-0-koi8-u -ariblk.ttf -monotype-arial black-medium-r-normal--0-0-0-0-p-0-koi8-uni -ariblk.ttf -monotype-arial black-medium-r-normal--0-0-0-0-p-0-microsoft-cp1252 -comic.ttf -microsoft-comic sans ms-medium-r-normal--0-0-0-0-p-0-adobe-standard -comic.ttf -microsoft-comic sans ms-medium-r-normal--0-0-0-0-p-0-ascii-0 -comic.ttf -microsoft-comic sans ms-medium-r-normal--0-0-0-0-p-0-iso10646-1 -comic.ttf -microsoft-comic sans ms-medium-r-normal--0-0-0-0-p-0-iso8859-1 -comic.ttf -microsoft-comic sans ms-medium-r-normal--0-0-0-0-p-0-iso8859-10 -comic.ttf -microsoft-comic sans ms-medium-r-normal--0-0-0-0-p-0-iso8859-13 -comic.ttf -microsoft-comic sans ms-medium-r-normal--0-0-0-0-p-0-iso8859-15 -comic.ttf -microsoft-comic sans ms-medium-r-normal--0-0-0-0-p-0-iso8859-2 -comic.ttf -microsoft-comic sans ms-medium-r-normal--0-0-0-0-p-0-iso8859-3 -comic.ttf -microsoft-comic sans ms-medium-r-normal--0-0-0-0-p-0-iso8859-4 -comic.ttf -microsoft-comic sans ms-medium-r-normal--0-0-0-0-p-0-iso8859-5 -comic.ttf -microsoft-comic sans ms-medium-r-normal--0-0-0-0-p-0-iso8859-9 -comic.ttf -microsoft-comic sans ms-medium-r-normal--0-0-0-0-p-0-koi8-e -comic.ttf -microsoft-comic sans ms-medium-r-normal--0-0-0-0-p-0-koi8-r -comic.ttf -microsoft-comic sans ms-medium-r-normal--0-0-0-0-p-0-koi8-ru -comic.ttf -microsoft-comic sans ms-medium-r-normal--0-0-0-0-p-0-koi8-u -comic.ttf -microsoft-comic sans ms-medium-r-normal--0-0-0-0-p-0-koi8-uni -comic.ttf -microsoft-comic sans ms-medium-r-normal--0-0-0-0-p-0-microsoft-cp1252 -comicbd.ttf -microsoft-comic sans ms-bold-r-normal--0-0-0-0-p-0-adobe-standard -comicbd.ttf -microsoft-comic sans ms-bold-r-normal--0-0-0-0-p-0-ascii-0 -comicbd.ttf -microsoft-comic sans ms-bold-r-normal--0-0-0-0-p-0-iso10646-1 -comicbd.ttf -microsoft-comic sans ms-bold-r-normal--0-0-0-0-p-0-iso8859-1 -comicbd.ttf -microsoft-comic sans ms-bold-r-normal--0-0-0-0-p-0-iso8859-10 -comicbd.ttf -microsoft-comic sans ms-bold-r-normal--0-0-0-0-p-0-iso8859-13 -comicbd.ttf -microsoft-comic sans ms-bold-r-normal--0-0-0-0-p-0-iso8859-15 -comicbd.ttf -microsoft-comic sans ms-bold-r-normal--0-0-0-0-p-0-iso8859-2 -comicbd.ttf -microsoft-comic sans ms-bold-r-normal--0-0-0-0-p-0-iso8859-3 -comicbd.ttf -microsoft-comic sans ms-bold-r-normal--0-0-0-0-p-0-iso8859-4 -comicbd.ttf -microsoft-comic sans ms-bold-r-normal--0-0-0-0-p-0-iso8859-5 -comicbd.ttf -microsoft-comic sans ms-bold-r-normal--0-0-0-0-p-0-iso8859-9 -comicbd.ttf -microsoft-comic sans ms-bold-r-normal--0-0-0-0-p-0-koi8-e -comicbd.ttf -microsoft-comic sans ms-bold-r-normal--0-0-0-0-p-0-koi8-r -comicbd.ttf -microsoft-comic sans ms-bold-r-normal--0-0-0-0-p-0-koi8-ru -comicbd.ttf -microsoft-comic sans ms-bold-r-normal--0-0-0-0-p-0-koi8-u -comicbd.ttf -microsoft-comic sans ms-bold-r-normal--0-0-0-0-p-0-koi8-uni -comicbd.ttf -microsoft-comic sans ms-bold-r-normal--0-0-0-0-p-0-microsoft-cp1252 cour.ttf -monotype-courier new-medium-r-normal--0-0-0-0-m-0-adobe-standard cour.ttf -monotype-courier new-medium-r-normal--0-0-0-0-m-0-ascii-0 cour.ttf -monotype-courier new-medium-r-normal--0-0-0-0-m-0-ibm-cp437 @@ -381,100 +317,6 @@ couri.ttf -monotype-courier new-medium-i-normal--0-0-0-0-m-0-koi8-ru couri.ttf -monotype-courier new-medium-i-normal--0-0-0-0-m-0-koi8-u couri.ttf -monotype-courier new-medium-i-normal--0-0-0-0-m-0-koi8-uni couri.ttf -monotype-courier new-medium-i-normal--0-0-0-0-m-0-microsoft-cp1252 -georgia.ttf -microsoft-georgia-medium-r-normal--0-0-0-0-p-0-adobe-standard -georgia.ttf -microsoft-georgia-medium-r-normal--0-0-0-0-p-0-ascii-0 -georgia.ttf -microsoft-georgia-medium-r-normal--0-0-0-0-p-0-iso10646-1 -georgia.ttf -microsoft-georgia-medium-r-normal--0-0-0-0-p-0-iso8859-1 -georgia.ttf -microsoft-georgia-medium-r-normal--0-0-0-0-p-0-iso8859-10 -georgia.ttf -microsoft-georgia-medium-r-normal--0-0-0-0-p-0-iso8859-13 -georgia.ttf -microsoft-georgia-medium-r-normal--0-0-0-0-p-0-iso8859-15 -georgia.ttf -microsoft-georgia-medium-r-normal--0-0-0-0-p-0-iso8859-2 -georgia.ttf -microsoft-georgia-medium-r-normal--0-0-0-0-p-0-iso8859-3 -georgia.ttf -microsoft-georgia-medium-r-normal--0-0-0-0-p-0-iso8859-4 -georgia.ttf -microsoft-georgia-medium-r-normal--0-0-0-0-p-0-iso8859-5 -georgia.ttf -microsoft-georgia-medium-r-normal--0-0-0-0-p-0-iso8859-9 -georgia.ttf -microsoft-georgia-medium-r-normal--0-0-0-0-p-0-koi8-e -georgia.ttf -microsoft-georgia-medium-r-normal--0-0-0-0-p-0-koi8-r -georgia.ttf -microsoft-georgia-medium-r-normal--0-0-0-0-p-0-koi8-ru -georgia.ttf -microsoft-georgia-medium-r-normal--0-0-0-0-p-0-koi8-u -georgia.ttf -microsoft-georgia-medium-r-normal--0-0-0-0-p-0-koi8-uni -georgia.ttf -microsoft-georgia-medium-r-normal--0-0-0-0-p-0-microsoft-cp1252 -georgiab.ttf -microsoft-georgia-bold-r-normal--0-0-0-0-p-0-adobe-standard -georgiab.ttf -microsoft-georgia-bold-r-normal--0-0-0-0-p-0-ascii-0 -georgiab.ttf -microsoft-georgia-bold-r-normal--0-0-0-0-p-0-iso10646-1 -georgiab.ttf -microsoft-georgia-bold-r-normal--0-0-0-0-p-0-iso8859-1 -georgiab.ttf -microsoft-georgia-bold-r-normal--0-0-0-0-p-0-iso8859-10 -georgiab.ttf -microsoft-georgia-bold-r-normal--0-0-0-0-p-0-iso8859-13 -georgiab.ttf -microsoft-georgia-bold-r-normal--0-0-0-0-p-0-iso8859-15 -georgiab.ttf -microsoft-georgia-bold-r-normal--0-0-0-0-p-0-iso8859-2 -georgiab.ttf -microsoft-georgia-bold-r-normal--0-0-0-0-p-0-iso8859-3 -georgiab.ttf -microsoft-georgia-bold-r-normal--0-0-0-0-p-0-iso8859-4 -georgiab.ttf -microsoft-georgia-bold-r-normal--0-0-0-0-p-0-iso8859-5 -georgiab.ttf -microsoft-georgia-bold-r-normal--0-0-0-0-p-0-iso8859-9 -georgiab.ttf -microsoft-georgia-bold-r-normal--0-0-0-0-p-0-koi8-e -georgiab.ttf -microsoft-georgia-bold-r-normal--0-0-0-0-p-0-koi8-r -georgiab.ttf -microsoft-georgia-bold-r-normal--0-0-0-0-p-0-koi8-ru -georgiab.ttf -microsoft-georgia-bold-r-normal--0-0-0-0-p-0-koi8-u -georgiab.ttf -microsoft-georgia-bold-r-normal--0-0-0-0-p-0-koi8-uni -georgiab.ttf -microsoft-georgia-bold-r-normal--0-0-0-0-p-0-microsoft-cp1252 -georgiai.ttf -microsoft-georgia-medium-i-normal--0-0-0-0-p-0-adobe-standard -georgiai.ttf -microsoft-georgia-medium-i-normal--0-0-0-0-p-0-ascii-0 -georgiai.ttf -microsoft-georgia-medium-i-normal--0-0-0-0-p-0-iso10646-1 -georgiai.ttf -microsoft-georgia-medium-i-normal--0-0-0-0-p-0-iso8859-1 -georgiai.ttf -microsoft-georgia-medium-i-normal--0-0-0-0-p-0-iso8859-10 -georgiai.ttf -microsoft-georgia-medium-i-normal--0-0-0-0-p-0-iso8859-13 -georgiai.ttf -microsoft-georgia-medium-i-normal--0-0-0-0-p-0-iso8859-15 -georgiai.ttf -microsoft-georgia-medium-i-normal--0-0-0-0-p-0-iso8859-2 -georgiai.ttf -microsoft-georgia-medium-i-normal--0-0-0-0-p-0-iso8859-3 -georgiai.ttf -microsoft-georgia-medium-i-normal--0-0-0-0-p-0-iso8859-4 -georgiai.ttf -microsoft-georgia-medium-i-normal--0-0-0-0-p-0-iso8859-5 -georgiai.ttf -microsoft-georgia-medium-i-normal--0-0-0-0-p-0-iso8859-9 -georgiai.ttf -microsoft-georgia-medium-i-normal--0-0-0-0-p-0-koi8-e -georgiai.ttf -microsoft-georgia-medium-i-normal--0-0-0-0-p-0-koi8-r -georgiai.ttf -microsoft-georgia-medium-i-normal--0-0-0-0-p-0-koi8-ru -georgiai.ttf -microsoft-georgia-medium-i-normal--0-0-0-0-p-0-koi8-u -georgiai.ttf -microsoft-georgia-medium-i-normal--0-0-0-0-p-0-koi8-uni -georgiai.ttf -microsoft-georgia-medium-i-normal--0-0-0-0-p-0-microsoft-cp1252 -georgiaz.ttf -microsoft-georgia-bold-i-normal--0-0-0-0-p-0-adobe-standard -georgiaz.ttf -microsoft-georgia-bold-i-normal--0-0-0-0-p-0-ascii-0 -georgiaz.ttf -microsoft-georgia-bold-i-normal--0-0-0-0-p-0-iso10646-1 -georgiaz.ttf -microsoft-georgia-bold-i-normal--0-0-0-0-p-0-iso8859-1 -georgiaz.ttf -microsoft-georgia-bold-i-normal--0-0-0-0-p-0-iso8859-10 -georgiaz.ttf -microsoft-georgia-bold-i-normal--0-0-0-0-p-0-iso8859-13 -georgiaz.ttf -microsoft-georgia-bold-i-normal--0-0-0-0-p-0-iso8859-15 -georgiaz.ttf -microsoft-georgia-bold-i-normal--0-0-0-0-p-0-iso8859-2 -georgiaz.ttf -microsoft-georgia-bold-i-normal--0-0-0-0-p-0-iso8859-3 -georgiaz.ttf -microsoft-georgia-bold-i-normal--0-0-0-0-p-0-iso8859-4 -georgiaz.ttf -microsoft-georgia-bold-i-normal--0-0-0-0-p-0-iso8859-5 -georgiaz.ttf -microsoft-georgia-bold-i-normal--0-0-0-0-p-0-iso8859-9 -georgiaz.ttf -microsoft-georgia-bold-i-normal--0-0-0-0-p-0-koi8-e -georgiaz.ttf -microsoft-georgia-bold-i-normal--0-0-0-0-p-0-koi8-r -georgiaz.ttf -microsoft-georgia-bold-i-normal--0-0-0-0-p-0-koi8-ru -georgiaz.ttf -microsoft-georgia-bold-i-normal--0-0-0-0-p-0-koi8-u -georgiaz.ttf -microsoft-georgia-bold-i-normal--0-0-0-0-p-0-koi8-uni -georgiaz.ttf -microsoft-georgia-bold-i-normal--0-0-0-0-p-0-microsoft-cp1252 -impact.ttf -monotype-impact-medium-r-condensed--0-0-0-0-p-0-adobe-standard -impact.ttf -monotype-impact-medium-r-condensed--0-0-0-0-p-0-ascii-0 -impact.ttf -monotype-impact-medium-r-condensed--0-0-0-0-p-0-ibm-cp437 -impact.ttf -monotype-impact-medium-r-condensed--0-0-0-0-p-0-ibm-cp850 -impact.ttf -monotype-impact-medium-r-condensed--0-0-0-0-p-0-ibm-cp852 -impact.ttf -monotype-impact-medium-r-condensed--0-0-0-0-p-0-ibm-cp866 -impact.ttf -monotype-impact-medium-r-condensed--0-0-0-0-p-0-iso10646-1 -impact.ttf -monotype-impact-medium-r-condensed--0-0-0-0-p-0-iso8859-1 -impact.ttf -monotype-impact-medium-r-condensed--0-0-0-0-p-0-iso8859-10 -impact.ttf -monotype-impact-medium-r-condensed--0-0-0-0-p-0-iso8859-13 -impact.ttf -monotype-impact-medium-r-condensed--0-0-0-0-p-0-iso8859-15 -impact.ttf -monotype-impact-medium-r-condensed--0-0-0-0-p-0-iso8859-2 -impact.ttf -monotype-impact-medium-r-condensed--0-0-0-0-p-0-iso8859-3 -impact.ttf -monotype-impact-medium-r-condensed--0-0-0-0-p-0-iso8859-4 -impact.ttf -monotype-impact-medium-r-condensed--0-0-0-0-p-0-iso8859-5 -impact.ttf -monotype-impact-medium-r-condensed--0-0-0-0-p-0-iso8859-9 -impact.ttf -monotype-impact-medium-r-condensed--0-0-0-0-p-0-koi8-e -impact.ttf -monotype-impact-medium-r-condensed--0-0-0-0-p-0-koi8-r -impact.ttf -monotype-impact-medium-r-condensed--0-0-0-0-p-0-koi8-ru -impact.ttf -monotype-impact-medium-r-condensed--0-0-0-0-p-0-koi8-u -impact.ttf -monotype-impact-medium-r-condensed--0-0-0-0-p-0-koi8-uni -impact.ttf -monotype-impact-medium-r-condensed--0-0-0-0-p-0-microsoft-cp1252 l_10646.ttf -b&h-lucida sans unicode-medium-r-normal--0-0-0-0-p-0-adobe-standard l_10646.ttf -b&h-lucida sans unicode-medium-r-normal--0-0-0-0-p-0-ascii-0 l_10646.ttf -b&h-lucida sans unicode-medium-r-normal--0-0-0-0-p-0-ibm-cp850 @@ -543,6 +385,12 @@ micross.ttf -monotype-microsoft sans serif-medium-r-normal--0-0-0-0-p-0-koi8-u micross.ttf -monotype-microsoft sans serif-medium-r-normal--0-0-0-0-p-0-koi8-uni micross.ttf -monotype-microsoft sans serif-medium-r-normal--0-0-0-0-p-0-microsoft-cp1252 micross.ttf -monotype-microsoft sans serif-medium-r-normal--0-0-0-0-p-0-tis620-2 +old_engl.ttf -alltype-old english-medium-r-normal--0-0-0-0-p-0-ascii-0 +old_engl.ttf -alltype-old english-medium-r-normal--0-0-0-0-p-0-ibm-cp437 +old_engl.ttf -alltype-old english-medium-r-normal--0-0-0-0-p-0-ibm-cp850 +old_engl.ttf -alltype-old english-medium-r-normal--0-0-0-0-p-0-iso10646-1 +old_engl.ttf -alltype-old english-medium-r-normal--0-0-0-0-p-0-iso8859-1 +old_engl.ttf -alltype-old english-medium-r-normal--0-0-0-0-p-0-iso8859-9 pala.ttf -linotype-palatino linotype-medium-r-normal--0-0-0-0-p-0-adobe-standard pala.ttf -linotype-palatino linotype-medium-r-normal--0-0-0-0-p-0-ascii-0 pala.ttf -linotype-palatino linotype-medium-r-normal--0-0-0-0-p-0-iso10646-1 @@ -793,79 +641,5 @@ trebucit.ttf -microsoft-trebuchet ms-medium-i-normal--0-0-0-0-p-0-iso8859-15 trebucit.ttf -microsoft-trebuchet ms-medium-i-normal--0-0-0-0-p-0-iso8859-2 trebucit.ttf -microsoft-trebuchet ms-medium-i-normal--0-0-0-0-p-0-iso8859-9 trebucit.ttf -microsoft-trebuchet ms-medium-i-normal--0-0-0-0-p-0-microsoft-cp1252 -verdana.ttf -microsoft-verdana-medium-r-normal--0-0-0-0-p-0-adobe-standard -verdana.ttf -microsoft-verdana-medium-r-normal--0-0-0-0-p-0-ascii-0 -verdana.ttf -microsoft-verdana-medium-r-normal--0-0-0-0-p-0-iso10646-1 -verdana.ttf -microsoft-verdana-medium-r-normal--0-0-0-0-p-0-iso8859-1 -verdana.ttf -microsoft-verdana-medium-r-normal--0-0-0-0-p-0-iso8859-10 -verdana.ttf -microsoft-verdana-medium-r-normal--0-0-0-0-p-0-iso8859-13 -verdana.ttf -microsoft-verdana-medium-r-normal--0-0-0-0-p-0-iso8859-15 -verdana.ttf -microsoft-verdana-medium-r-normal--0-0-0-0-p-0-iso8859-2 -verdana.ttf -microsoft-verdana-medium-r-normal--0-0-0-0-p-0-iso8859-3 -verdana.ttf -microsoft-verdana-medium-r-normal--0-0-0-0-p-0-iso8859-4 -verdana.ttf -microsoft-verdana-medium-r-normal--0-0-0-0-p-0-iso8859-5 -verdana.ttf -microsoft-verdana-medium-r-normal--0-0-0-0-p-0-iso8859-9 -verdana.ttf -microsoft-verdana-medium-r-normal--0-0-0-0-p-0-koi8-e -verdana.ttf -microsoft-verdana-medium-r-normal--0-0-0-0-p-0-koi8-r -verdana.ttf -microsoft-verdana-medium-r-normal--0-0-0-0-p-0-koi8-ru -verdana.ttf -microsoft-verdana-medium-r-normal--0-0-0-0-p-0-koi8-u -verdana.ttf -microsoft-verdana-medium-r-normal--0-0-0-0-p-0-koi8-uni -verdana.ttf -microsoft-verdana-medium-r-normal--0-0-0-0-p-0-microsoft-cp1252 -verdanab.ttf -microsoft-verdana-bold-r-normal--0-0-0-0-p-0-adobe-standard -verdanab.ttf -microsoft-verdana-bold-r-normal--0-0-0-0-p-0-ascii-0 -verdanab.ttf -microsoft-verdana-bold-r-normal--0-0-0-0-p-0-iso10646-1 -verdanab.ttf -microsoft-verdana-bold-r-normal--0-0-0-0-p-0-iso8859-1 -verdanab.ttf -microsoft-verdana-bold-r-normal--0-0-0-0-p-0-iso8859-10 -verdanab.ttf -microsoft-verdana-bold-r-normal--0-0-0-0-p-0-iso8859-13 -verdanab.ttf -microsoft-verdana-bold-r-normal--0-0-0-0-p-0-iso8859-15 -verdanab.ttf -microsoft-verdana-bold-r-normal--0-0-0-0-p-0-iso8859-2 -verdanab.ttf -microsoft-verdana-bold-r-normal--0-0-0-0-p-0-iso8859-3 -verdanab.ttf -microsoft-verdana-bold-r-normal--0-0-0-0-p-0-iso8859-4 -verdanab.ttf -microsoft-verdana-bold-r-normal--0-0-0-0-p-0-iso8859-5 -verdanab.ttf -microsoft-verdana-bold-r-normal--0-0-0-0-p-0-iso8859-9 -verdanab.ttf -microsoft-verdana-bold-r-normal--0-0-0-0-p-0-koi8-e -verdanab.ttf -microsoft-verdana-bold-r-normal--0-0-0-0-p-0-koi8-r -verdanab.ttf -microsoft-verdana-bold-r-normal--0-0-0-0-p-0-koi8-ru -verdanab.ttf -microsoft-verdana-bold-r-normal--0-0-0-0-p-0-koi8-u -verdanab.ttf -microsoft-verdana-bold-r-normal--0-0-0-0-p-0-koi8-uni -verdanab.ttf -microsoft-verdana-bold-r-normal--0-0-0-0-p-0-microsoft-cp1252 -verdanai.ttf -microsoft-verdana-medium-i-normal--0-0-0-0-p-0-adobe-standard -verdanai.ttf -microsoft-verdana-medium-i-normal--0-0-0-0-p-0-ascii-0 -verdanai.ttf -microsoft-verdana-medium-i-normal--0-0-0-0-p-0-iso10646-1 -verdanai.ttf -microsoft-verdana-medium-i-normal--0-0-0-0-p-0-iso8859-1 -verdanai.ttf -microsoft-verdana-medium-i-normal--0-0-0-0-p-0-iso8859-10 -verdanai.ttf -microsoft-verdana-medium-i-normal--0-0-0-0-p-0-iso8859-13 -verdanai.ttf -microsoft-verdana-medium-i-normal--0-0-0-0-p-0-iso8859-15 -verdanai.ttf -microsoft-verdana-medium-i-normal--0-0-0-0-p-0-iso8859-2 -verdanai.ttf -microsoft-verdana-medium-i-normal--0-0-0-0-p-0-iso8859-3 -verdanai.ttf -microsoft-verdana-medium-i-normal--0-0-0-0-p-0-iso8859-4 -verdanai.ttf -microsoft-verdana-medium-i-normal--0-0-0-0-p-0-iso8859-5 -verdanai.ttf -microsoft-verdana-medium-i-normal--0-0-0-0-p-0-iso8859-9 -verdanai.ttf -microsoft-verdana-medium-i-normal--0-0-0-0-p-0-koi8-e -verdanai.ttf -microsoft-verdana-medium-i-normal--0-0-0-0-p-0-koi8-r -verdanai.ttf -microsoft-verdana-medium-i-normal--0-0-0-0-p-0-koi8-ru -verdanai.ttf -microsoft-verdana-medium-i-normal--0-0-0-0-p-0-koi8-u -verdanai.ttf -microsoft-verdana-medium-i-normal--0-0-0-0-p-0-koi8-uni -verdanai.ttf -microsoft-verdana-medium-i-normal--0-0-0-0-p-0-microsoft-cp1252 -verdanaz.ttf -microsoft-verdana-bold-i-normal--0-0-0-0-p-0-adobe-standard -verdanaz.ttf -microsoft-verdana-bold-i-normal--0-0-0-0-p-0-ascii-0 -verdanaz.ttf -microsoft-verdana-bold-i-normal--0-0-0-0-p-0-iso10646-1 -verdanaz.ttf -microsoft-verdana-bold-i-normal--0-0-0-0-p-0-iso8859-1 -verdanaz.ttf -microsoft-verdana-bold-i-normal--0-0-0-0-p-0-iso8859-10 -verdanaz.ttf -microsoft-verdana-bold-i-normal--0-0-0-0-p-0-iso8859-13 -verdanaz.ttf -microsoft-verdana-bold-i-normal--0-0-0-0-p-0-iso8859-15 -verdanaz.ttf -microsoft-verdana-bold-i-normal--0-0-0-0-p-0-iso8859-2 -verdanaz.ttf -microsoft-verdana-bold-i-normal--0-0-0-0-p-0-iso8859-3 -verdanaz.ttf -microsoft-verdana-bold-i-normal--0-0-0-0-p-0-iso8859-4 -verdanaz.ttf -microsoft-verdana-bold-i-normal--0-0-0-0-p-0-iso8859-5 -verdanaz.ttf -microsoft-verdana-bold-i-normal--0-0-0-0-p-0-iso8859-9 -verdanaz.ttf -microsoft-verdana-bold-i-normal--0-0-0-0-p-0-koi8-e -verdanaz.ttf -microsoft-verdana-bold-i-normal--0-0-0-0-p-0-koi8-r -verdanaz.ttf -microsoft-verdana-bold-i-normal--0-0-0-0-p-0-koi8-ru -verdanaz.ttf -microsoft-verdana-bold-i-normal--0-0-0-0-p-0-koi8-u -verdanaz.ttf -microsoft-verdana-bold-i-normal--0-0-0-0-p-0-koi8-uni -verdanaz.ttf -microsoft-verdana-bold-i-normal--0-0-0-0-p-0-microsoft-cp1252 -webdings.ttf -microsoft-webdings-medium-r-normal--0-0-0-0-p-0-iso8859-1 -webdings.ttf -microsoft-webdings-medium-r-normal--0-0-0-0-p-0-microsoft-symbol wingding.ttf -microsoft-wingdings-medium-r-normal--0-0-0-0-p-0-iso8859-1 wingding.ttf -microsoft-wingdings-medium-r-normal--0-0-0-0-p-0-microsoft-symbol diff --git a/cinelerra-5.1/plugins/histogram_bezier/bistogramconfig.C b/cinelerra-5.1/plugins/histogram_bezier/bistogramconfig.C index 20b80f15..267f2560 100644 --- a/cinelerra-5.1/plugins/histogram_bezier/bistogramconfig.C +++ b/cinelerra-5.1/plugins/histogram_bezier/bistogramconfig.C @@ -263,7 +263,7 @@ void HistogramConfig::interpolate(HistogramConfig &prev, for(int i = 0; i < HISTOGRAM_MODES; i++) { - points[i].interpolate(&prev.points[i], &next.points[i], next_scale, prev_scale); + points[i].interpolate(&prev.points[i], &next.points[i], prev_scale, next_scale); output_min[i] = prev.output_min[i] * prev_scale + next.output_min[i] * next_scale; output_max[i] = prev.output_max[i] * prev_scale + next.output_max[i] * next_scale; } diff --git a/cinelerra-5.1/plugins/histogram_bezier/bistogramwindow.C b/cinelerra-5.1/plugins/histogram_bezier/bistogramwindow.C index eb2b0ffa..ee99a174 100644 --- a/cinelerra-5.1/plugins/histogram_bezier/bistogramwindow.C +++ b/cinelerra-5.1/plugins/histogram_bezier/bistogramwindow.C @@ -258,13 +258,13 @@ void HistogramWindow::update_mode() void HistogramWindow::draw_canvas_overlay() { - canvas->set_color(0x00ff00); int y1; // Calculate output curve plugin->tabulate_curve(plugin->mode, 0); // Draw output line + canvas->set_color(0xffff00); for(int i = 0; i < canvas_w; i++) { float input = (float)i / @@ -281,11 +281,13 @@ void HistogramWindow::draw_canvas_overlay() y1 = y2; } + int x0 = 0, y0 = 0; // Draw output points HistogramPoint *current = plugin->config.points[plugin->mode].first; int number = 0; while(current) { + canvas->set_color(0x00ff00); int x = (int)((current->x - HIST_MIN_INPUT) * canvas_w / FLOAT_RANGE); int y = (int)(canvas_h - current->y * canvas_h); if(number == plugin->current_point) @@ -293,26 +295,27 @@ void HistogramWindow::draw_canvas_overlay() else canvas->draw_rectangle(x - BOX_SIZE / 2, y - BOX_SIZE / 2, BOX_SIZE, BOX_SIZE); + if( number > 0 ) + canvas->draw_line(x0, y0, x, y); + x0 = x; y0 = y; //Draw gradients - if (plugin->config.smoothMode > HISTOGRAM_LINEAR) - { - int x1,x2,y1,y2; - canvas->set_color(0x0000ff); - x2 = (int)((current->x + current->xoffset_right - HIST_MIN_INPUT) * canvas_w / FLOAT_RANGE); - x1 = (int)((current->x + current->xoffset_left - HIST_MIN_INPUT) * canvas_w / FLOAT_RANGE); - y2 = (int)(canvas_h - (current->y + current->xoffset_right * current->gradient) * canvas_h); - y1 = (int)(canvas_h - (current->y + current->xoffset_left * current->gradient) * canvas_h); -/* x2 = x + (title3_x - title2_x)/20; - x1 = x - (title3_x - title2_x)/20; - y1 = y + (int)(current->gradient * (float)(canvas_h)/20.0); - y2 = y - (int)(current->gradient * (float)(canvas_h)/20.0); -// int y2 = (int)(canvas_h - canvas_h * (current->y + current->gradient /10));*/ - canvas->draw_line(x1,y1,x2,y2); - - canvas->draw_circle(x1 - BOX_SIZE / 4, y1 - BOX_SIZE / 4, BOX_SIZE/2, BOX_SIZE/2); - canvas->draw_circle(x2 - BOX_SIZE / 4, y2 - BOX_SIZE / 4, BOX_SIZE/2, BOX_SIZE/2); - canvas->set_color(0x00ff00); - } + if (plugin->config.smoothMode > HISTOGRAM_LINEAR) { + int x1,x2,y1,y2; + canvas->set_color(0x0000ff); + x2 = (int)((current->x + current->xoffset_right - HIST_MIN_INPUT) * canvas_w / FLOAT_RANGE); + x1 = (int)((current->x + current->xoffset_left - HIST_MIN_INPUT) * canvas_w / FLOAT_RANGE); + y2 = (int)(canvas_h - (current->y + current->xoffset_right * current->gradient) * canvas_h); + y1 = (int)(canvas_h - (current->y + current->xoffset_left * current->gradient) * canvas_h); +/* x2 = x + (title3_x - title2_x)/20; + x1 = x - (title3_x - title2_x)/20; + y1 = y + (int)(current->gradient * (float)(canvas_h)/20.0); + y2 = y - (int)(current->gradient * (float)(canvas_h)/20.0); +// int y2 = (int)(canvas_h - canvas_h * (current->y + current->gradient /10));*/ + canvas->draw_line(x1,y1,x2,y2); + + canvas->draw_circle(x1 - BOX_SIZE / 4, y1 - BOX_SIZE / 4, BOX_SIZE/2, BOX_SIZE/2); + canvas->draw_circle(x2 - BOX_SIZE / 4, y2 - BOX_SIZE / 4, BOX_SIZE/2, BOX_SIZE/2); + } current = NEXT; number++;