Watch changes a measurement file.

--HG--
branch : feature
This commit is contained in:
Roman Telezhynskyi 2015-08-20 11:54:48 +03:00
parent 6c2c36a11d
commit be336aba41
3 changed files with 91 additions and 18 deletions

View File

@ -107,7 +107,7 @@ int main(int argc, char *argv[])
{ {
fprintf(stderr, "%s\n", qPrintable(QCoreApplication::translate("main", fprintf(stderr, "%s\n", qPrintable(QCoreApplication::translate("main",
"Error: Invalid base height argument. Must be 92, 98, 104, 110, 116, 122, 128, 134, 140, 146, 152, 158, " "Error: Invalid base height argument. Must be 92, 98, 104, 110, 116, 122, 128, 134, 140, 146, 152, 158, "
"164, 170, 176, 182 or 188."))); "164, 170, 176, 182 or 188.")));
parser.showHelp(1); parser.showHelp(1);
} }
} }
@ -127,7 +127,7 @@ int main(int argc, char *argv[])
{ {
fprintf(stderr, "%s\n", qPrintable(QCoreApplication::translate("main", fprintf(stderr, "%s\n", qPrintable(QCoreApplication::translate("main",
"Error: Invalid base size argument. Must be 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, " "Error: Invalid base size argument. Must be 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, "
"52, 54 or 56."))); "52, 54 or 56.")));
parser.showHelp(1); parser.showHelp(1);
} }
} }

View File

@ -67,6 +67,8 @@
#if QT_VERSION >= QT_VERSION_CHECK(5, 1, 0) #if QT_VERSION >= QT_VERSION_CHECK(5, 1, 0)
# include <QLockFile> # include <QLockFile>
#endif #endif
#include <chrono>
#include <thread>
Q_LOGGING_CATEGORY(vMainWindow, "v.mainwindow") Q_LOGGING_CATEGORY(vMainWindow, "v.mainwindow")
@ -76,14 +78,14 @@ Q_LOGGING_CATEGORY(vMainWindow, "v.mainwindow")
* @param parent parent widget. * @param parent parent widget.
*/ */
MainWindow::MainWindow(QWidget *parent) MainWindow::MainWindow(QWidget *parent)
:MainWindowsNoGUI(parent), ui(new Ui::MainWindow), currentTool(Tool::Arrow), :MainWindowsNoGUI(parent), ui(new Ui::MainWindow), watcher(new QFileSystemWatcher(this)), currentTool(Tool::Arrow),
lastUsedTool(Tool::Arrow), sceneDraw(nullptr), sceneDetails(nullptr), lastUsedTool(Tool::Arrow), sceneDraw(nullptr), sceneDetails(nullptr),
mouseCoordinate(nullptr), helpLabel(nullptr), isInitialized(false), dialogTable(nullptr), dialogTool(nullptr), mouseCoordinate(nullptr), helpLabel(nullptr), isInitialized(false), dialogTable(nullptr), dialogTool(nullptr),
dialogHistory(nullptr), comboBoxDraws(nullptr), mode(Draw::Calculation), currentDrawIndex(0), dialogHistory(nullptr), comboBoxDraws(nullptr), mode(Draw::Calculation), currentDrawIndex(0),
currentToolBoxIndex(0), drawMode(true), recentFileActs(), currentToolBoxIndex(0), drawMode(true), recentFileActs(),
separatorAct(nullptr), separatorAct(nullptr),
leftGoToStage(nullptr), rightGoToStage(nullptr), autoSaveTimer(nullptr), guiEnabled(true), gradationHeights(nullptr), leftGoToStage(nullptr), rightGoToStage(nullptr), autoSaveTimer(nullptr), guiEnabled(true),
gradationSizes(nullptr), gradationHeights(nullptr), gradationSizes(nullptr),
#if QT_VERSION >= QT_VERSION_CHECK(5, 1, 0) #if QT_VERSION >= QT_VERSION_CHECK(5, 1, 0)
toolOptions(nullptr), lock(nullptr) toolOptions(nullptr), lock(nullptr)
#else #else
@ -139,6 +141,8 @@ MainWindow::MainWindow(QWidget *parent)
connect(ui->listWidget, &QListWidget::currentRowChanged, this, &MainWindow::ShowPaper); connect(ui->listWidget, &QListWidget::currentRowChanged, this, &MainWindow::ShowPaper);
ui->dockWidgetLayoutPages->setVisible(false); ui->dockWidgetLayoutPages->setVisible(false);
connect(watcher, &QFileSystemWatcher::fileChanged, this, &MainWindow::MeasurementsChanged);
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
@ -233,11 +237,11 @@ void MainWindow::InitScenes()
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void MainWindow::LoadMeasurements(const QString &path) bool MainWindow::LoadMeasurements(const QString &path)
{ {
if (path.isEmpty()) if (path.isEmpty())
{ {
return; return false;
} }
VMeasurements *m = nullptr; VMeasurements *m = nullptr;
@ -280,7 +284,7 @@ void MainWindow::LoadMeasurements(const QString &path)
QMessageBox::critical(this, tr("Wrong units."), QMessageBox::critical(this, tr("Wrong units."),
tr("Application doesn't support standard table with inches.")); tr("Application doesn't support standard table with inches."));
qCDebug(vMainWindow, "Application doesn't support standard table with inches."); qCDebug(vMainWindow, "Application doesn't support standard table with inches.");
return; return false;
} }
m->SetDataSize(); m->SetDataSize();
m->SetDataHeight(); m->SetDataHeight();
@ -291,17 +295,14 @@ void MainWindow::LoadMeasurements(const QString &path)
pattern->ClearVariables(VarType::Measurement); pattern->ClearVariables(VarType::Measurement);
m->ReadMeasurements(); m->ReadMeasurements();
delete m; delete m;
doc->SetPath(path);
PatternWasModified(false);
ui->actionShowM->setEnabled(true);
} }
catch (VException &e) catch (VException &e)
{ {
e.CriticalMessageBox(tr("File error."), this); e.CriticalMessageBox(tr("File error."), this);
delete m; delete m;
return; return false;
} }
helpLabel->setText(tr("Measurements loaded")); return true;
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
@ -984,8 +985,19 @@ void MainWindow::LoadIndividual()
if (not mPath.isEmpty()) if (not mPath.isEmpty())
{ {
LoadMeasurements(mPath); if (LoadMeasurements(mPath))
doc->LiteParseTree(Document::LiteParse); {
if (not doc->MPath().isEmpty())
{
watcher->removePath(doc->MPath());
}
doc->SetPath(mPath);
watcher->addPath(mPath);
PatternWasModified(false);
ui->actionShowM->setEnabled(true);
helpLabel->setText(tr("Measurements loaded"));
doc->LiteParseTree(Document::LiteParse);
}
} }
} }
@ -999,8 +1011,19 @@ void MainWindow::LoadStandard()
if (not mPath.isEmpty()) if (not mPath.isEmpty())
{ {
LoadMeasurements(mPath); if(LoadMeasurements(mPath))
doc->LiteParseTree(Document::LiteParse); {
if (not doc->MPath().isEmpty())
{
watcher->removePath(doc->MPath());
}
doc->SetPath(mPath);
watcher->addPath(mPath);
PatternWasModified(false);
ui->actionShowM->setEnabled(true);
helpLabel->setText(tr("Measurements loaded"));
doc->LiteParseTree(Document::LiteParse);
}
} }
} }
@ -1036,6 +1059,51 @@ void MainWindow::ShowMeasurements()
} }
} }
//---------------------------------------------------------------------------------------------------------------------
void MainWindow::MeasurementsChanged(const QString &path)
{
bool mChanges = false;
QFileInfo checkFile(path);
if (checkFile.exists())
{
mChanges = true;
}
else
{
for(int i=0; i<=1000; i=i+10)
{
if (checkFile.exists())
{
mChanges = true;
break;
}
else
{
std::this_thread::sleep_for(std::chrono::milliseconds(10));
}
}
}
if (mChanges)
{
QMessageBox::StandardButton reply = QMessageBox::question(this, tr("Update measurements"),
tr("Measurement file was changed. Do you want to update?"),
QMessageBox::Yes|QMessageBox::No);
if (reply == QMessageBox::Yes)
{
if(LoadMeasurements(path))
{
if (not watcher->files().contains(path))
{
watcher->addPath(path);
}
helpLabel->setText(tr("Measurements updated"));
doc->LiteParseTree(Document::LiteParse);
}
}
}
}
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
/** /**
* @brief ToolBarOption enable option toolbar. * @brief ToolBarOption enable option toolbar.

View File

@ -37,6 +37,8 @@
#include "tools/vtooluniondetails.h" #include "tools/vtooluniondetails.h"
#include "tools/drawTools/drawtools.h" #include "tools/drawTools/drawtools.h"
#include <QFileSystemWatcher>
namespace Ui namespace Ui
{ {
class MainWindow; class MainWindow;
@ -164,11 +166,14 @@ private slots:
void LoadStandard(); void LoadStandard();
void CreateMeasurements(); void CreateMeasurements();
void ShowMeasurements(); void ShowMeasurements();
void MeasurementsChanged(const QString &path);
private: private:
Q_DISABLE_COPY(MainWindow) Q_DISABLE_COPY(MainWindow)
/** @brief ui keeps information about user interface */ /** @brief ui keeps information about user interface */
Ui::MainWindow *ui; Ui::MainWindow *ui;
QFileSystemWatcher *watcher;
/** @brief tool current tool */ /** @brief tool current tool */
Tool currentTool; Tool currentTool;
@ -288,7 +293,7 @@ private:
void InitScenes(); void InitScenes();
void LoadMeasurements(const QString &path); bool LoadMeasurements(const QString &path);
}; };
#endif // MAINWINDOW_H #endif // MAINWINDOW_H