--- /dev/null
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<style>#doc_header { font-size: 3em; color: blue; }
+h1 { border-bottom: 1px solid red; }
+h2 { border-bottom: 1px solid blue; }
+h3 { border-bottom: 1px solid black; }
+</style>
+<body>
+<div id="doc_header">Documentation of ReImgConvert</div>
+<h1>Release Notes</h1>
+<p>
+<ul>
+<li>v1.0 (2016.01.15)<br/>
+ <ul><li>Basic version. User language is English only.</li>
+ </ul>
+</li>
+</ul>
+</p>
+
+<h1>User Manual</h1>
+<h2>Purpose:</h2>
+<p>This program allows to convert image files (pictures) into another format.</p>
+<p>Conversion is done for the dimensions (width/height) and/or the quality/file
+size.</p>
+
+<h2>Simple Mode and Detailed Mode</h2>
+<p>There are two modes of processing:
+<ul>
+<li>Simple mode: You define the maximum width and maximum height of a
+ picture. The converted file will respect these limits.</li>
+<li>Detailed mode: The maximum dimensions for the three format types
+ (portrait, landscape, square) must be defined.</li>
+</ul>
+</p>
+
+<h2>Templates</h2>
+<p>For the simple mode there are predefined limits called "templates".
+Chosing one template with the combobox the fields "max. width" and "max height"
+will be filled with these limits.
+</p>
+
+<h2>Conversion Details</h2>
+
+<p>If an image is lower than the given limits it will be copied without
+conversion.</p>
+<p>This program is only the GUI of the image conversion program "convert"
+from the package ImageMagick.</p>
+<h2>Installation</h2>
+
+<p>Copy reimgconvert into a directory inserted in the execution
+path, e.g. /usr/local/bin and give it the right "executable".</p>
+<p>Install the packages qt5 and imagemagick.</p>
+
+<h2>Requirements</h2>
+<p>
+<ul>
+<li>ImageMagick</li>
+</ul>
+</p>
+
+<h1>Program Documentation</h1>
+
+<h2>Programming Features</h2>
+
+<p>This is a example for a complete QT application with the following features:
+<ul>
+<li>C++</li>
+<li>QT</li>
+<li>Threads</li>
+<li>Using GUI wizzard</li>
+<li>Changing GUI elements from a 2nd thread</li>
+<li>Abstract class as interface</li>
+<li>Calling an external program</li>
+</ul>
+</p>
+
+<h1>(Un)License: Public Domain</h1>
+
+<p>You can use and modify this file without any restriction.<br/>
+Do what you want.<br/>
+No warranties and disclaimer of any damages.<br/>
+More info: <a href="http://unlicense.org">http://unlicense.org</a><br/>
+The latest sources: <a href="https://github.com/republib">https://github.com/republib</a>.
+</p>
+
+</body>
+</html>
*
* If an image is lower than the given limits it will be copied without
* conversion
- * This program is only the GUI of an Perl script which does the conversion.
- * The script uses the
- *
- * @section install_sec Installation
- *
- * Copy reimgconvert into a directory inserted in the executable
- * path, e.g. /usr/local/bin and give them the right "executable".
- *
- * @subsection req_sec Requirements
- *
- * <ul>
- * <li>ImageMagick</li>
- * </ul>
- *
+ * This program is only the GUI of the image conversion program "convert"
+ * from the package ImageMagick
+ * *
* @section prog_sec Programming Features
*
* This is a example for a complete QT application with the following features:
* <li>Threads</li>
* <li>Using GUI wizzard</li>
* <li>Abstract class as interface</li>
- * <li>Calling an external script</li>
- * <li>Lists the output of the external list line by line at the moment
- * the line is created</li>
+ * <li>Calling an external program</li>
* </ul>
*
* @section version_sec Release Notes
*
* You can use and modify this file without any restriction.
* There is no warranty.
- * You also can use the licence from http://www.wtfpl.net/.
+ * You also can use the licence from http://unlicense.org
* The original sources can be found on https://github.com/republib
*/
int landscapeY, int portraitX, int portraitY, int squareX, int quality,
MainWindow* mainWindow) :
m_dir(directory),
- m_targetDir(
- targetDirectory.indexOf(QDir::separator()) >= 0 ?
- targetDirectory :
- directory + QDir::separator() + targetDirectory),
+ m_targetDir(targetDirectory),
m_sourcePattern(sourcePattern),
m_targetType(targetType),
m_landscapeWidth(landscapeX),
m_simpleMode(simpleConversion),
m_maxWidth(maxWidth),
m_maxHeight(maxHeight)
- {
+{
}
/**
* @param info an info about the change
*/
void Converter::changeState(Converter::State state, const QString& info){
- m_mainWindows->on_threadStateChanged(state, info);
+ m_mainWindows->onThreadStateChanged(state, info);
}
/**
/**
* @brief Converts one file.
*
- * @param source the file's name with path
- * @param target the new filename with path
- * @param size the size of the file (in byte)
+ * @param source the file's name with path
+ * @param target the new filename with path
+ * @param size the size of the file (in byte)
+ * @param sizeTarget OUT: the file size of the target
*/
void Converter::convertOneFile(const QString& source, const QString& target,
- qint64 size){
+ qint64 size, qint64& sizeTarget){
int width = 0;
int height = 0;
QString info;
if (readProperties(source, width, height, info)){
int widthNew = width;
int heightNew = height;
- bool doConvert;
if (m_simpleMode)
- doConvert = handleSimple(width, height, widthNew, heightNew);
+ handleSimple(width, height, widthNew, heightNew);
else
- doConvert = handleUserDefined(width, height, widthNew, heightNew);
+ handleUserDefined(width, height, widthNew, heightNew);
+ QString node = ReFileUtils::nodeOf(source);
log(
- source + " " + info + " " + sizeToString(size)
+ node + " " + info + " " + ReQStringUtils::readableSize(size)
+ QString(" -> %1x%2 ").arg(widthNew).arg(heightNew));
convert(source, target, width, height, widthNew, heightNew, m_quality);
struct stat info;
- if (stat(I18N::s2b(target).constData(), &info) == 0)
- m_mainWindows->logAppendLast(sizeToString(info.st_size) + " ");
+ if (stat(I18N::s2b(target).constData(), &info) == 0){
+ sizeTarget = info.st_size;
+ m_mainWindows->logAppendLast(ReQStringUtils::readableSize(sizeTarget)
+ + " " + ReQStringUtils::readableDuration(
+ clock() - start));
+ }
}
- m_mainWindows->logAppendLast(
- QString("").sprintf("%.3f sec",
- double(clock() - start) / CLOCKS_PER_SEC));
}
/**
*/
void Converter::run(){
QString msg;
+ clock_t start = clock();
+ uint64_t preSize = 0;
+ uint64_t postSize = 0;
+ uint64_t lengthTarget = 0;
int no = 0;
try{
if (!m_dir.exists())
QString nodeTarget = ReFileUtils::replaceExtension(node,
"." + m_targetType);
QString target = m_targetDir.absoluteFilePath(nodeTarget);
- convertOneFile(path, target, length);
+ convertOneFile(path, target, length, lengthTarget);
+ preSize += length;
+ postSize += lengthTarget;
+ m_mainWindows->setStatusMessage(LOG_INFO,
+ tr("%1 file(s) %2 -> %3 (%4 %)")
+ .arg(no)
+ .arg(ReQStringUtils::readableSize(preSize))
+ .arg(ReQStringUtils::readableSize(postSize))
+ .arg(postSize * 100.0 / max(1, preSize), 0,
+ 'f', 2));
}
}
changeState(Converter::STATE_SUB_TASK_STOPPED, msg);
QObject::tr("Execution stopped because of error(s): ")
+ exc.message());
}
- msg = QObject::tr("%1 file(s) converted").arg(no);
+ preSize = max(1, preSize);
+ msg = QObject::tr("%1 file(s) converted, %2 -> %3 (%4 %), duration: %5").arg(no)
+ .arg(ReQStringUtils::readableSize(preSize))
+ .arg(ReQStringUtils::readableSize(postSize))
+ .arg(postSize * 100.0 / preSize, 0, 'f', 2)
+ .arg(ReQStringUtils::readableDuration(clock() - start));
changeState(Converter::STATE_READY, msg);
}
}
return rc;
}
-/**
- * @brief Converts the size into a human readable string.
- *
- * @param size the size in bytes
- * @return the size as human readable string, e.g. "2MiByte"
- */
-QString sizeToString(qint64 size){
- QString rc;
- if (size < 10 * 1024)
- rc.sprintf("%d Bytes", (int) size);
- else if (size < qint64(10 * 1024 * 1024))
- rc.sprintf("%d KiBytes", (int) (size / 1024));
- else if (size < qint64(10 * 1024 * 1024) * 1024)
- rc.sprintf("%d MiBytes", (int) (size / 1024 / 1024));
- else
- rc.sprintf("%d GiBytes", (int) (size / 1024 / 1024 / 1024));
- return rc;
-}
-
void convert(const QString& source, const QString& target, int width,
int height, int widthNew, int heightNew, int quality);
void convertOneFile(const QString& source, const QString& target,
- qint64 size);
+ qint64 size, qint64& sizeTarget);
bool handleSimple(int width, int height, int& widthNew, int& heightNew);
bool handleUserDefined(int width, int height, int& widthNew, int& heightNew);
bool readProperties(const QString& name, int &width, int &height,
QString homeDir = argc > 1 ? argv[1] : "";
QApplication a(argc, argv);
MainWindow w(homeDir);
- QObject::connect(&a, SIGNAL(aboutToQuit()), &w, SLOT(closing()));
w.show();
return a.exec();
}
* @param parent NULL or the parent (who destroys the objects at the end)
*/
MainWindow::MainWindow(const QString& homeDir, QWidget *parent) :
- QMainWindow(parent),
- m_homeDir(homeDir),
- m_storageFile(),
+ ReHomeApplication("reimgconvert", homeDir, 2, 100100100, parent),
ui(new Ui::MainWindow),
m_converter(NULL),
m_logger(),
m_guiQueue(),
m_guiTimer(new QTimer(this)){
ui->setupUi(this);
- initializeHome();
- m_logger.buildStandardAppender(I18N::s2b(m_homeDir + OS_SEPARATOR_STR
- + "reimgconvert").constData());
startStop(false);
m_statusMessage = new QLabel(tr("Welcome at reimgconvert"));
statusBar()->addWidget(m_statusMessage);
+ connect(ui->actionStart, SIGNAL(triggered()), this,
+ SLOT(onConvert()));
+ connect(ui->actionStop, SIGNAL(triggered()), this,
+ SLOT(onStop()));
connect(ui->actionSelectTarget, SIGNAL(triggered()), this,
SLOT(selectTarget()));
connect(ui->actionClear, SIGNAL(triggered()), this, SLOT(clear()));
+ connect(ui->pushButtonConvert, SIGNAL(clicked()), this, SLOT(onConvert()));
+ connect(ui->pushButtonStop, SIGNAL(clicked()), this, SLOT(onStop()));
connect(ui->pushButtonClear, SIGNAL(clicked()), this, SLOT(clear()));
connect(ui->actionSelectTarget, SIGNAL(triggered()), this,
SLOT(selectTarget()));
SLOT(selectSource()));
connect(ui->actionAbout, SIGNAL(triggered()), this, SLOT(about()));
connect(ui->comboBoxTemplate, SIGNAL(currentIndexChanged(const QString&)),
- this, SLOT(on_templateChangeIndex(const QString&)));
- connect(ui->pushButtonActivate, SIGNAL(clicked()), this, SLOT(activate()));
+ this, SLOT(onTemplateChangeIndex(const QString&)));
connect(m_guiTimer, SIGNAL(timeout()), this, SLOT(guiTimerUpdate()));
restoreState();
m_guiTimer->start(100);
}
/**
- * Slot when the pushbutton "activate" is clicked.
+ * Actions while closing the application.
*/
-void MainWindow::activate(){
- QString theTemplate = comboText(ui->comboBoxTemplate);
- QRegularExpression rexpr("(\\d+)x(\\d+)");
- QRegularExpressionMatch matcher = rexpr.match(theTemplate);
- if (matcher.hasMatch()){
- int width = atoi(matcher.captured(1).toLatin1());
- int height = atoi(matcher.captured(2).toLatin1());
- setMaxDimensions(width, height);
- }
+void MainWindow::aboutToQuit(){
+ saveState();
}
/**
ui->listWidget->clear();
}
-/**
- * Actions while closing the application.
- */
-void MainWindow::closing(){
- saveState();
-}
-
/**
* Issues an error message.
*
case ReGuiQueueItem::LogMessage:
say(LOG_INFO, item.m_value);
break;
+ case ReGuiQueueItem::StatusLine:
+ setStatusMessage(false, item.m_value);
+ break;
+ case ReGuiQueueItem::ListAppendToCurrent:
+ {
+ QListWidgetItem* item2 = reinterpret_cast<QListWidget*>(
+ item.m_widget)->currentItem();
+ item2->setText(item2->text() + " " + item.m_value);
+ break;
+ }
default:
say(LOG_ERROR, "unknown item type: " + QString::number(item.m_type)
+ " " + item.m_value);
}
}
}
-/**
- * initializeHomeializes the program home directory.
- */
-void MainWindow::initializeHome(){
- if (m_homeDir.isEmpty()){
- m_homeDir = QDir::home().absoluteFilePath(".reimgconvert");
- }
-
- QDir home(m_homeDir);
- if (!home.exists()){
- if (!home.mkpath(m_homeDir)){
- m_homeDir = home.tempPath() + "/.reimgconvert";
- home.mkpath(m_homeDir);
- }
- }
- if (!m_homeDir.endsWith("/"))
- m_homeDir += "/";
- m_storageFile = m_homeDir + "state.conf";
-}
-
/**
* @brief Logs a message
* @return <code>true</code>
*/
bool MainWindow::logAppendLast(const QString& message){
- m_guiQueue.pushBack(ReGuiQueueItem(ReGuiQueueItem::ListEnd, ui->listWidget, message));
- QListWidgetItem* item = ui->listWidget->item(0);
- item->setText(item->text() + " " + message);
+ m_guiQueue.pushBack(ReGuiQueueItem(ReGuiQueueItem::ListAppendToCurrent,
+ ui->listWidget, message));
return true;
}
/**
- * @brief Handles the click on the button "stop".
+ * @brief Handles the button click on "convert".
*/
-void MainWindow::on_pushButtonStop_clicked(){
- m_converter->stop();
+void MainWindow::onConvert(){
+ startStop(true);
+ delete m_converter;
+ m_errors = 0;
+ int landscapeX = comboInt(ui->comboBoxLandscapeX, 0, "*", 0);
+ int landscapeY = comboInt(ui->comboBoxLandscapeY, 0, "*", 0);
+ int portraitX = comboInt(ui->comboBoxPortraitX, 0, "*", 0);
+ int portraitY = comboInt(ui->comboBoxPortraitY, 0, "*", 0);
+ int squareX = comboInt(ui->comboBoxSquareX, 0);
+ int quality = comboInt(ui->comboBoxQuality, 75);
+ int maxWidth = comboInt(ui->comboBoxMaxWidth, 0);
+ int maxHeight = comboInt(ui->comboBoxMaxHeight, 0);
+ QRegularExpressionMatch match = QRegularExpression("\\dx\\d").match(
+ ui->comboBoxTemplate->currentText());
+ bool simpleConversion = match.hasMatch();
+ if (m_errors == 0){
+ saveState();
+ m_converter = new Converter(ui->comboBoxSourceDir->currentText(),
+ ui->comboBoxTargetDir->currentText(),
+ ui->comboBoxSourcePattern->currentText(),
+ ui->comboBoxDestType->currentText(),
+ simpleConversion, maxWidth, maxHeight,
+ landscapeX, landscapeY, portraitX,
+ portraitY, squareX, quality, this);
+ // start the thread:
+ m_converter->start();
+ }
}
/**
* Shows a selection dialog for directories and sets the source directory
* onto the selected directory.
*/
-void MainWindow::on_pushButtonFileSelect_clicked(){
+void MainWindow::onSourceFileSelect(){
QFileDialog selection;
selection.setFileMode(QFileDialog::DirectoryOnly);
QString dir = ui->comboBoxSourceDir->currentText();
ui->comboBoxSourceDir->setCurrentText(selection.selectedFiles().at(0));
}
+/**
+ * @brief Handles the click on the button "stop".
+ */
+void MainWindow::onStop(){
+ m_converter->stop();
+}
+
/**
* Slot when the value of the template combobox has been changed.
*
* @param text the new selected combobox text
*/
-void MainWindow::on_templateChangeIndex(const QString & text){
+void MainWindow::onTemplateChangeIndex(const QString & text){
QRegularExpression rexpr("(\\d+)x(\\d+)");
QRegularExpressionMatch match = rexpr.match(text);
int width = match.captured(1).toInt();
setMaxDimensions(width, height);
}
-/**
- * @brief Handles the button click on "convert".
- */
-void MainWindow::on_pushButtonConvert_clicked(){
- startStop(true);
- delete m_converter;
- m_errors = 0;
- int landscapeX = comboInt(ui->comboBoxLandscapeX, 0, "*", 0);
- int landscapeY = comboInt(ui->comboBoxLandscapeY, 0, "*", 0);
- int portraitX = comboInt(ui->comboBoxPortraitX, 0, "*", 0);
- int portraitY = comboInt(ui->comboBoxPortraitY, 0, "*", 0);
- int squareX = comboInt(ui->comboBoxSquareX, 0);
- int quality = comboInt(ui->comboBoxQuality, 75);
- int maxWidth = comboInt(ui->comboBoxMaxWidth, 0);
- int maxHeight = comboInt(ui->comboBoxMaxHeight, 0);
- QRegularExpressionMatch match = QRegularExpression("\\dx\\d").match(
- ui->comboBoxTemplate->currentText());
- bool simpleConversion = match.hasMatch();
- if (m_errors == 0){
- m_converter = new Converter(ui->comboBoxSourceDir->currentText(),
- ui->comboBoxLandscapeX->currentText(),
- ui->comboBoxSourcePattern->currentText(),
- ui->comboBoxDestType->currentText(),
- simpleConversion, maxWidth, maxHeight,
- landscapeX, landscapeY, portraitX,
- portraitY, squareX, quality, this);
- // start the thread:
- m_converter->start();
- }
-
-}
-
/**
* @brief Handles the event "thread changed".
*
* @param state the new state of the thread
* @param info info about the new state. Not used
*/
-void MainWindow::on_threadStateChanged(Converter::State state, const QString& info){
+void MainWindow::onThreadStateChanged(Converter::State state, const QString& info){
switch (state) {
case Converter::STATE_READY:
m_guiQueue.pushBack(ReGuiQueueItem(ReGuiQueueItem::ReadyMessage, NULL, info));
ui->comboBoxTargetDir->setCurrentText(dir);
}
+/**
+ * Writes a text to the status line.
+ *
+ * Note: this method is called from a non-main thread
+ *
+ * @param message the text to set
+ */
+void MainWindow::setRemoteStatus(const QString& message){
+ m_guiQueue.pushBack(ReGuiQueueItem(ReGuiQueueItem::StatusLine,
+ NULL, message));
+}
+
/**
* Writes a text to the status line.
*
class MainWindow;
}
-class MainWindow: public QMainWindow,
+class MainWindow: public ReHomeApplication,
public ReGuiValidator,
public ConvertLogger {
Q_OBJECT
explicit MainWindow(const QString& homeDir, QWidget *parent = 0);
~MainWindow();
-public slots:
- void closing();
public:
+ virtual void aboutToQuit();
bool error(const QString& message);
bool log(const QString& message);
bool logAppendLast(const QString& message);
- void on_threadStateChanged(Converter::State state, const QString& info);
+ void onThreadStateChanged(Converter::State state, const QString& info);
+ void setRemoteStatus(const QString& message);
void setStatusMessage(bool error, const QString& message);
public:
virtual bool say(ReLoggerLevel level, const QString& message);
private:
- void initializeHome();
void restoreState();
void saveState();
void setMaxDimensions(int maxWidth, int maxHeight);public slots:
void startStop(bool isStart);
private slots:
- void activate();
void about();
void clear();
void guiTimerUpdate();
- void on_pushButtonFileSelect_clicked();
- void on_pushButtonStop_clicked();
- void on_pushButtonConvert_clicked();
- void on_templateChangeIndex(const QString& text);
+ void onConvert();
+ void onSourceFileSelect();
+ void onStop();
+ void onTemplateChangeIndex(const QString& text);
void selectSource();
void selectTarget();
private:
- QString m_homeDir;
- QString m_storageFile;
Ui::MainWindow *ui;
Converter* m_converter;
QLabel* m_statusMessage;
<widget class="QComboBox" name="comboBoxTemplate">
<property name="minimumSize">
<size>
- <width>315</width>
+ <width>316</width>
<height>0</height>
</size>
</property>
</item>
</layout>
</item>
- <item>
- <widget class="QPushButton" name="pushButtonActivate">
- <property name="text">
- <string>&Activate template</string>
- </property>
- </widget>
- </item>
<item>
<spacer name="horizontalSpacer_5">
<property name="orientation">
CODECFORSRC = UTF-8
OTHER_FILES +=
+
+DISTFILES += \
+ ReImgConvert.html
if (info.isDir()) {
if (!deleteTree(full, false, logger))
rc = false;
- else if (_rmdir(I18N::s2b(full)) != 0) {
+ else if (_rmdir(I18N::s2b(full)) != 0) {
rc = false;
if (logger != NULL)
logger->logv(LOG_ERROR, LOC_DELETE_TREE_1,
}
}
}
- if (withBase && (_rmdir(I18N::s2b(path))) != 0) {
+ if (withBase && (_rmdir(I18N::s2b(path))) != 0) {
rc = false;
logger->logv(LOG_ERROR, LOC_DELETE_TREE_3,
"cannot delete directory (%d): %s", errno, I18N::s2b(path).constData());
if ((cc = filename[ix - 1]) != '/' && cc != '\\')
rc.append(filename + ix);
break;
- } else if (cc == '\\' || cc == '/')
+ } else if (cc == '\\' || cc == '/')
break;
ix--;
}
return rc;
}
+/**
+ * Checks whether path is a root directory.
+ *
+ * @param path the path to inspect
+ * @return <code>true</code>: path is a root directory, e.g. "/" or "c:\\"
+ */
+bool ReFileUtils::isRootDir(const char* path)
+{
+#if defined __linux__
+ return path[0] == OS_SEPARATOR && path[1] == '\0';
+#elif defined WIN32
+ return isalpha(path[0]) && path[1] == ':' && path[2] == '\\' && path[3] = '\0';
+#endif
+}
+
/**
* Extracts the node of a filename.
*
rc += node;
struct stat info;
if (deleteIfExists && stat(rc.constData(), &info) == 0)
- _unlink(rc.constData());
+ _unlink(rc.constData());
return rc;
}
static QByteArray extensionOf(const char* filename);
static bool isAbsolutPath(const QString& path);
static bool isAbsolutPath(const char* path);
+ static bool isRootDir(const char* path);
/** Returns a path with native separators.
* QT under windows can operator with 2 separators: '\\' and '/'.
* '\\' is the native separator.
}
}
+/**
+ * Returns a readable string for a duration given by <code>clock_t</code>.
+ *
+ * @param duration a duration measured by <code>clock()</code>
+ *
+ * @return a string describing the duration.
+ */
+QString ReQStringUtils::readableDuration(clock_t duration){
+ QString rc;
+ char buffer[128];
+ int cl_per_sec = CLOCKS_PER_SEC;
+ double duration2 = (double) duration / CLOCKS_PER_SEC;
+ if (duration2 < 60.0){
+ rc = QString::number(duration2, 'f', 3) + " sec";
+ } else if (duration2 < 3600.0){
+ int duration3 = int(duration2);
+ snprintf(buffer, sizeof buffer, "%d:%02d",
+ duration3 / 60, duration3 % 60);
+ rc = buffer;
+ } else if (duration2 < 3600.0 * 24){
+ int duration3 = int(duration2);
+ snprintf(buffer, sizeof buffer, "%d:%02d:%02d",
+ duration3 / 3600, duration3 % 3600 / 60,
+ duration3 % 60);
+ rc = buffer;
+ } else {
+ int duration3 = int(duration2);
+ snprintf(buffer, sizeof buffer, "%d:%02d:%02d:%02d",
+ int(duration3 / (3600*24)),
+ int(duration3 % (3600*24) / 3600), int(duration3 % 3600 / 60),
+ int(duration3 % 60));
+ rc = buffer;
+ }
+ return rc;
+}
+
+/**
+ * Returns a readable string for a filesize.
+ *
+ * @param filesize the filesize to convert
+ * @return a filesize expression (number and unit) with at least 3 significant digits.
+ */
+QString ReQStringUtils::readableSize(int64_t filesize){
+ QString rc;
+ if (filesize < 1000){
+ rc = QString::number(filesize) + " B";
+ } else if (filesize < 1000*1000){
+ rc = QString::number(filesize / 1e3, 'f', 3) + " kB";
+ } else if (filesize < 1000*1000*1000){
+ rc = QString::number(filesize / 1e6, 'f', 3) + " MB";
+ } else if (filesize < int64_t(1000)*1000*1000*1000){
+ rc = QString::number(filesize / 1e9, 'f', 3) + " GB";
+ } else {
+ rc = QString::number(filesize / 1e12, 'f', 3) + " TB";
+ }
+ return rc;
+}
/**
* @brief Converts a ReString into an utf-8 string
*
return path;
#endif
}
+ static QString readableDuration(clock_t duration);
+ static QString readableSize(int64_t filesize);
static bool replacePlaceholders(QString& text,
const QMap<QString, QString>& placeholders, QString* error);
static void skipExpected(const ReString& text, QChar expected, int& index,
*/
bool ReTest::assertEquals(const char* expected, const char* current,
const char* file, int lineNo) {
- int len1 = strlen(expected);
- int len2 = strlen(current);
bool equal = strcmp(expected, current) == 0;
if (!equal) {
if (strchr(expected, '\n') != NULL || strchr(current, '\n')) {
void testReWriter();
void testReFile();
void testReMatcher();
+ testReQStringUtil();
testReProgArgs();
testReProcess();
testReRandomizer();
testReFileUtils();
testReMatcher();
- testReQStringUtil();
testReFile();
if (s_allTest) {
testReProcess();
testReCryptFileSystem();
}
void allTests() {
+ testBase();
testOs();
testExpr();
- testBase();
testGui();
if (s_allTest) {
testBase();
list.clear();
checkEqu("", ReQStringUtils::longestPrefix(list));
}
+ void testReadableSize(){
+ checkEqu("0 B", ReQStringUtils::readableSize(0));
+ checkEqu("10 B", ReQStringUtils::readableSize(10));
+ checkEqu("999 B", ReQStringUtils::readableSize(999));
+ checkEqu("1.000 kB", ReQStringUtils::readableSize(1000));
+ checkEqu("1.001 kB", ReQStringUtils::readableSize(1001));
+ checkEqu("999.999 kB", ReQStringUtils::readableSize(999999));
+ checkEqu("1.000 MB", ReQStringUtils::readableSize(1000000));
+ checkEqu("1.001 MB", ReQStringUtils::readableSize(1001000));
+ checkEqu("999.999 MB", ReQStringUtils::readableSize(999999000));
+ checkEqu("1.000 GB", ReQStringUtils::readableSize(1000000000));
+ checkEqu("1.001 GB", ReQStringUtils::readableSize(1001000000));
+ checkEqu("999.999 GB", ReQStringUtils::readableSize(999999000000L));
+ checkEqu("1.000 TB", ReQStringUtils::readableSize(1000000000000L));
+ checkEqu("1.001 TB", ReQStringUtils::readableSize(1001000000000l));
+ }
+ void testReadableDuration(){
+#define clf(sec) clock_t(clock_t((sec) * CLOCKS_PER_SEC))
+ checkEqu("0.000 sec", ReQStringUtils::readableDuration(clf(0.0)));
+ checkEqu("1.234 sec", ReQStringUtils::readableDuration(clf(1.234)));
+ checkEqu("59.250 sec", ReQStringUtils::readableDuration(clf(59.250)));
+ checkEqu("1:01", ReQStringUtils::readableDuration(clf(61.251)));
+ checkEqu("59:59", ReQStringUtils::readableDuration(clf(59*60+59.499)));
+ checkEqu("1:00:01", ReQStringUtils::readableDuration(clf(1*3600+1.99)));
+ checkEqu("23:59:59", ReQStringUtils::readableDuration(clf(24*3600-0.1)));
+ checkEqu("1:02:03:04", ReQStringUtils::readableDuration(clf(24*3600+2*3600+3*60+4.0)));
+ }
virtual void runTests(void) {
+ testReadableSize();
+ testReadableDuration();
testLongestPrefix();
testLengtOfTime();
testLengtOfDate();
class ReGuiQueueItem {
public:
enum WidgetType {
- Undef, LabelText, NewTableRow, ListEnd,
- LogMessage, ReadyMessage,
+ Undef, LabelText, NewTableRow, ListEnd, ListAppendToCurrent,
+ LogMessage, ReadyMessage, StatusLine,
UserDefined1, UserDefined2
};
#include "base/rebase.hpp"
#include "gui/regui.hpp"
#include <QDesktopWidget>
+#include <QCoreApplication>
enum {
LOC_INIT_FOR_WRITE_1 = LOC_FIRST_OF(LOC_STATESTORAGE), // 12001
LOC_INIT_FOR_READ_1, // 12002
void ReStateStorage::restore(QComboBox* combo, const char* name,
bool withCurrentText) {
if (initForRead()) {
- QByteArray keyPrefix = fullname(name) + ".item";
- int ix = 0;
- QByteArray key;
- while (true) {
- key = keyPrefix + QByteArray::number(ix);
- if (!m_map.contains(key))
- break;
- combo->addItem(m_map.value(key));
- ix++;
- }
- key = fullname(name) + ".text";
- if (!withCurrentText)
- combo->setCurrentText("");
- else {
- if (m_map.contains(key))
- combo->setCurrentText(m_map.value(key));
+ if (! combo->isEditable()){
+ QByteArray key = fullname(name) + ".index";
+ if (m_map.contains(key)){
+ QString value = m_map[key];
+ int index = atoi(value.toLatin1().constData());
+ combo->setCurrentIndex(index);
+ }
+ } else {
+ QByteArray keyPrefix = fullname(name) + ".item";
+ int ix = 0;
+ QByteArray key;
+ while (true) {
+ key = keyPrefix + QByteArray::number(ix);
+ if (!m_map.contains(key))
+ break;
+ combo->addItem(m_map.value(key));
+ ix++;
+ }
+ key = fullname(name) + ".text";
+ if (!withCurrentText)
+ combo->setCurrentText("");
+ else {
+ if (m_map.contains(key))
+ combo->setCurrentText(m_map.value(key));
+ }
}
}
}
bool withCurrentText) {
if (initForWrite()) {
QByteArray key(fullname(name));
- for (int ii = 0; ii < combo->count(); ii++) {
- *m_stream << key << ".item" << ii << "=" << combo->itemText(ii)
- << endl;
- }
- if (withCurrentText) {
- *m_stream << key << ".text=" << combo->currentText() << endl;
+ if (! combo->isEditable()){
+ *m_stream << key << ".index=" << combo->currentIndex() << endl;
+ } else {
+ for (int ii = 0; ii < combo->count(); ii++) {
+ *m_stream << key << ".item" << ii << "=" << combo->itemText(ii)
+ << endl;
+ }
+ if (withCurrentText) {
+ *m_stream << key << ".text=" << combo->currentText() << endl;
+ }
}
- m_stream->flush();
}
+ m_stream->flush();
}
/**
m_stream->flush();
}
}
+
+/**
+ * Constructor.
+ *
+ * @param applicationName the name of the application. Defines the node
+ * of the home directory
+ * @param homeDirBase "": the user's home directory will be used<br>
+ * otherwise: the home directory will created in this
+ * directory
+ * @param maxLogFiles max. count of (rotating) log files
+ * @param maxLogSize max. size of the (rotating) log files
+ */
+ReHomeApplication::ReHomeApplication(const char* applicationName,
+ const QString& homeDirBase,
+ int maxLogFiles, int maxLogSize,
+ QWidget *parent = NULL) :
+ QMainWindow(parent),
+ m_applicationName(applicationName),
+ m_homeDir(buildHomeDir(homeDirBase, "." + m_applicationName)),
+ m_logger(),
+ m_storageFile()
+{
+ m_logger.buildStandardAppender(I18N::s2b(m_homeDir) + "logger.",
+ maxLogSize, maxLogFiles);
+ m_storageFile = m_homeDir + OS_SEPARATOR_STR + "status.conf";
+ m_storageFile = m_homeDir + "state.conf";
+ QCoreApplication* app = QCoreApplication::instance();
+ QObject::connect(app, SIGNAL(aboutToQuit()), this, SLOT(aboutToQuit()));
+}
+
+void ReHomeApplication::aboutToQuit()
+{
+ m_logger.log(LOG_INFO, 999, "exit");
+}
+
+/**
+ * Build the home directory path name.
+ *
+ * @param homeDirBase "": the user's home directory will be used<br>
+ * otherwise: the home directory will created in this
+ * directory
+ * @param node
+ * @return
+ */
+QString ReHomeApplication::buildHomeDir(QString homeDirBase, const QString& node){
+ QString homeDir;
+ if (homeDirBase.isEmpty()){
+ homeDir = QDir::home().absoluteFilePath(node);
+ } else if (ReFileUtils::isRootDir(homeDirBase.toLatin1().constData())){
+ homeDir = homeDirBase + node;
+ }
+ ReQStringUtils::chomp(homeDir, OS_SEPARATOR);
+ QDir home(homeDir);
+ if (!home.exists()){
+ if (!home.mkpath(homeDir)){
+ homeDir = home.tempPath() + node;
+ home.mkpath(homeDir);
+ }
+ }
+ ReQStringUtils::ensureLastChar(homeDir, OS_SEPARATOR);
+ return homeDir;
+}
ReLogger* m_logger;
};
+/**
+ * An abstract base class for applications which stores their data in a home directory.
+ */
+class ReHomeApplication : public QMainWindow{
+public:
+ ReHomeApplication(const char* applicationName,
+ const QString& homeDir, int maxLogFiles, int maxLogSize,
+ QWidget *parent);
+public slots:
+ /**
+ * Callback method called when the application is closed.
+ */
+ void aboutToQuit();
+public:
+ static QString buildHomeDir(QString homeDirBase, const QString& node);
+protected:
+ QByteArray m_applicationName;
+ QString m_homeDir;
+ ReLogger m_logger;
+ QString m_storageFile;
+};
+
#endif /* GUI_RESTATESTORAGE_HPP_ */
projects / reqt / commitdiff