oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed merge errors

Browse Source
This commit is contained in:
itsmattkc
2018-12-26 18:51:46 +11:00
parent 59491250f6
commit a487492842
2 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
panels/viewer.cpp
-13
View File
@@ -66,7 +66,6 @@ Viewer::Viewer(QWidget *parent) :
connect(ui->horizontalScrollBar, SIGNAL(valueChanged(int)), ui->headers, SLOT(set_scroll(int)));
connect(ui->horizontalScrollBar, SIGNAL(valueChanged(int)), viewer_widget, SLOT(set_waveform_scroll(int)));
connect(ui->horizontalScrollBar, SIGNAL(resize_move(double)), this, SLOT(resize_move(double)));
connect(ui->zoomComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(zoom_update(int)));
update_playhead_timecode(0);
update_end_timecode();
@@ -574,18 +573,6 @@ void Viewer::recording_flasher_update() {
}
}
void Viewer::zoom_update(int i) {
if (i == 0) {
ui->glViewerPane->fit = true;
} else {
ui->glViewerPane->fit = false;
QString pc = ui->zoomComboBox->itemText(i);
pc = pc.left(pc.length() - 1);
ui->glViewerPane->zoom = pc.toDouble()*0.01;
}
ui->glViewerPane->adjust();
}
void Viewer::resize_move(double d) {
set_zoom_value(ui->headers->get_zoom()*d);
}
panels/viewer.h
-1
View File
@@ -85,7 +85,6 @@ private slots:
void update_playhead();
void timer_update();
void recording_flasher_update();
void zoom_update(int i);
void resize_move(double d);
private:
void clean_created_seq();