Apple-2-Tools
/
buckshot
mirror of https://github.com/digarok/buckshot.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

cleanup

This commit is contained in:
Dagen Brock 2020-07-17 12:15:15 -05:00
parent 00efb564c5
commit aba2aaad22
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
buckshot/buckshot.pro.user
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject> <!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 4.11.0, 2019-12-20T06:49:17. --> <!-- Written by QtCreator 4.11.0, 2020-07-17T12:09:53. -->
<qtcreator> <qtcreator>
<data> <data>
<variable>EnvironmentId</variable> <variable>EnvironmentId</variable>
@ -69,7 +69,7 @@
<value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/Users/dbrock/Google Drive/appleiigs/buckshot/build-buckshot-Desktop_Qt_5_12_5_clang_64bit-Debug</value> <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/Users/dbrock/GDrive/appleiigs/buckshot/build-buckshot-Desktop_Qt_5_12_5_clang_64bit-Debug</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@ -285,8 +285,9 @@
</valuelist> </valuelist>
<value type="int" key="PE.EnvironmentAspect.Base">2</value> <value type="int" key="PE.EnvironmentAspect.Base">2</value>
<valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/> <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/Users/dbrock/Google Drive/appleiigs/buckshot/buckshot/buckshot.pro</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">buckshot2</value>
<value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">/Users/dbrock/Google Drive/appleiigs/buckshot/buckshot/buckshot.pro</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/Users/dbrock/GDrive/appleiigs/buckshot/buckshot/buckshot.pro</value>
<value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">/Users/dbrock/GDrive/appleiigs/buckshot/buckshot/buckshot.pro</value>
<value type="QString" key="RunConfiguration.Arguments"></value> <value type="QString" key="RunConfiguration.Arguments"></value>
<value type="bool" key="RunConfiguration.Arguments.multi">false</value> <value type="bool" key="RunConfiguration.Arguments.multi">false</value>
<value type="QString" key="RunConfiguration.OverrideDebuggerStartup"></value> <value type="QString" key="RunConfiguration.OverrideDebuggerStartup"></value>
@ -298,7 +299,7 @@
<value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value> <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
<value type="QString" key="RunConfiguration.WorkingDirectory"></value> <value type="QString" key="RunConfiguration.WorkingDirectory"></value>
<value type="QString" key="RunConfiguration.WorkingDirectory.default">/Users/dbrock/Google Drive/appleiigs/buckshot/build-buckshot-Desktop_Qt_5_12_5_clang_64bit-Debug/buckshot.app/Contents/MacOS</value> <value type="QString" key="RunConfiguration.WorkingDirectory.default">/Users/dbrock/GDrive/appleiigs/buckshot/build-buckshot-Desktop_Qt_5_12_5_clang_64bit-Debug/buckshot.app/Contents/MacOS</value>
</valuemap> </valuemap>
<value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value> <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
</valuemap> </valuemap>

6
buckshot/mainwindow.cpp
View File

@ -332,7 +332,7 @@ void MainWindow::on_pushButton_preview_clicked()
process.waitForFinished(); // BLOCKS!!! process.waitForFinished(); // BLOCKS!!!
QString commandString = QString("%1 %2").arg(converterPath, args.join(" ")); QString commandString = QString("%1 %2").arg(converterPath, args.join(" "));
qDebug() << commandString; //qDebug() << commandString;
ui->plainTextEdit_lastCmd->document()->setPlainText(commandString); ui->plainTextEdit_lastCmd->document()->setPlainText(commandString);
// ALL DONE SO TRY TO LOAD PREVIEW // ALL DONE SO TRY TO LOAD PREVIEW
@ -342,13 +342,13 @@ void MainWindow::on_pushButton_preview_clicked()
int scale = 3; int scale = 3;
realScale = scale; realScale = scale;
previewPix = previewPix.scaled(80*scale, 48*scale); previewPix = previewPix.scaled(80*scale, 48*scale);
qDebug() << "W80"; //qDebug() << "W80";
} }
if (previewPix.width() == 560) { if (previewPix.width() == 560) {
float scale = 0.5f; float scale = 0.5f;
realScale = scale; realScale = scale;
previewPix = previewPix.scaled(qRound(560*scale),qRound(384*scale), Qt::KeepAspectRatio,Qt::SmoothTransformation); previewPix = previewPix.scaled(qRound(560*scale),qRound(384*scale), Qt::KeepAspectRatio,Qt::SmoothTransformation);
qDebug() << "W560"; //qDebug() << "W560";
} }
ui->label_preview->setPixmap(previewPix); ui->label_preview->setPixmap(previewPix);
ui->groupBox_preview->setTitle(QString("Preview - Scale %1").arg(qRound(realScale))); ui->groupBox_preview->setTitle(QString("Preview - Scale %1").arg(qRound(realScale)));