Skip to content

Commit

Permalink
Bug Fix - 6.0.9
Browse files Browse the repository at this point in the history
Original bug: Terminal does not show the "Creating images finished." message if 'createimages' is called more than once.
  • Loading branch information
Teddy-van-Jerry committed Aug 1, 2021
1 parent 379dbc9 commit 2ac5c62
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 7 deletions.
12 changes: 12 additions & 0 deletions src/create_image_info.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,18 @@ void Create_Image_Info::close_create_image_info()

}

void Create_Image_Info::init()
{
ui->label_Creating->setText("Creating Images ...");
ui->label_leftTime->setVisible(true);
ui->label_speed->setVisible(true);
ui->label_now->setVisible(true);
ui->progressBar->setValue(0);
timer->start(50);
if(!time_left.isValid())
qDebug() << "invalid";
}

void Create_Image_Info::closeEvent(QCloseEvent*)
{
timer->stop();
Expand Down
2 changes: 2 additions & 0 deletions src/create_image_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ public slots:

void close_create_image_info();

void init();

private slots:
void updateTime();

Expand Down
2 changes: 1 addition & 1 deletion src/create_image_info.ui
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
</font>
</property>
<property name="text">
<string>Creating Images...</string>
<string>Creating Images ...</string>
</property>
</widget>
<widget class="QWidget" name="gridLayoutWidget">
Expand Down
10 changes: 6 additions & 4 deletions src/mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,11 @@ MainWindow::MainWindow(QWidget *parent)
">> "); // start of the terminal
ui->textEdit_terminal->moveCursor(QTextCursor::End, QTextCursor::MoveAnchor); // move the cursor

create_image_info = new Create_Image_Info;
connect(this, &MainWindow::build_image_info_signal, create_image_info, &Create_Image_Info::set_info);
connect(this, &MainWindow::build_image_updateInfo_signal, create_image_info, &Create_Image_Info::updateInfo);
connect(create_image_info, &Create_Image_Info::releaseInfo, this, &MainWindow::updateTerminalCreateImagesProgresssBar);

ReadStyle();
updateMaxButton();
}
Expand Down Expand Up @@ -3243,10 +3248,7 @@ void MainWindow::createImages()
currentTerminalWorkName = "Create Images";
initTerminalProgressBar(total_image);

create_image_info = new Create_Image_Info;
connect(this, &MainWindow::build_image_info_signal, create_image_info, &Create_Image_Info::set_info);
connect(this, &MainWindow::build_image_updateInfo_signal, create_image_info, &Create_Image_Info::updateInfo);
connect(create_image_info, &Create_Image_Info::releaseInfo, this, &MainWindow::updateTerminalCreateImagesProgresssBar);
create_image_info->init();
create_image_info->show();

emit build_image_info_signal(path + "/" + name, image_format, total_image, 0);
Expand Down
4 changes: 2 additions & 2 deletions usr/frd/Mandelbrot Sample.frd
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@

// image and video output settings
@output $Output = {
$Time = 65 * 100; // time is measured in millisecond
$Time = 65 * 10; // time is measured in millisecond
$Fps = 30;
$Crf = 18; // constant rate factor, from 0 to 51
$VideoDir = $Your_Local_Dir; // assignment
$VideoFormat = mp4;
$VideoName = Mandelbrot Set Sample;
$ImageDir = D:\FRD\Mandelbrot\img;
$ImagePrefix = img_;
$ImageSize = 1920, 1080; // set as 1080p
$ImageSize = 400, 300; // set as 1080p
$Music =
// Music will be played by sequence.
// Music names are divided by comma.
Expand Down

0 comments on commit 2ac5c62

Please sign in to comment.