diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5b2da3c --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +.idea +cmake-build-debug +build \ No newline at end of file diff --git a/FTSPlotMain.cpp b/FTSPlotMain.cpp index cb9bf5e..c2ae22a 100644 --- a/FTSPlotMain.cpp +++ b/FTSPlotMain.cpp @@ -19,26 +19,58 @@ #include #include #include "mainwindow.h" +#include "FTSPrep.h" #include #include #ifdef Q_WS_X11 + #include + #endif using namespace std; -int main ( int argc, char *argv[] ) -{ +bool isnt_config_file(char *filename) { + unsigned length = strlen(filename); + return strcmp(filename + (length - 4), ".cfg"); +} + +void preprocess(int argc, char *argv[]) { + FTSPrep ftsPrep; + + for (unsigned i = 1; i < argc; i++) { + if (isnt_config_file(argv[i])) { + QString str(argv[i]); + ftsPrep.setNewFile(str); + ftsPrep.run(); + } + } + +} + +int main(int argc, char *argv[]) { #ifdef Q_WS_X11 XInitThreads(); #endif - QApplication app ( argc, argv ); + QApplication app(argc, argv); + + MainWindow *mainwidget = new MainWindow(); - MainWindow* mainwidget = new MainWindow(); + if (argc > 1) { + preprocess(argc, argv); + unsigned i; + for (i = 1; i < argc; i++) { + QString str(argv[i]); + if (isnt_config_file(argv[i])) { + str.append(".cfg"); + } + mainwidget->MySimpleViewWidget->addTimeSeries(str); + } + } mainwidget->show(); return app.exec(); diff --git a/FTSPrep.h b/FTSPrep.h index 9da70bf..8e87ead 100644 --- a/FTSPrep.h +++ b/FTSPrep.h @@ -49,6 +49,8 @@ class FTSPrep : public QThread void setProgressGranularity( quint64 gran = 2048 ); ResumeData getResumeData(); + void run(); + public slots: void stopforResume(); @@ -56,8 +58,6 @@ public slots: void QDTexception( QString msg ); void progressUpdate( int totalProgress, int level, int levelProgress ); -protected: - void run(); private: enum workstate {ready, busy}; diff --git a/mainwindow.h b/mainwindow.h index 6d3c40c..89b5e21 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -26,7 +26,7 @@ using namespace FTSPlot; -class MainWindow : public QMainWindow, private Ui::MainWindow +class MainWindow : public QMainWindow, public Ui::MainWindow { Q_OBJECT public: