Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.idea
cmake-build-debug
build
40 changes: 36 additions & 4 deletions FTSPlotMain.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,26 +19,58 @@
#include <QTextStream>
#include <QCoreApplication>
#include "mainwindow.h"
#include "FTSPrep.h"
#include <iostream>
#include <QtDebug>

#ifdef Q_WS_X11

#include <X11/Xlib.h>

#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();
Expand Down
4 changes: 2 additions & 2 deletions FTSPrep.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,15 @@ class FTSPrep : public QThread
void setProgressGranularity( quint64 gran = 2048 );
ResumeData getResumeData();

void run();

public slots:
void stopforResume();

signals:
void QDTexception( QString msg );
void progressUpdate( int totalProgress, int level, int levelProgress );

protected:
void run();

private:
enum workstate {ready, busy};
Expand Down
2 changes: 1 addition & 1 deletion mainwindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

using namespace FTSPlot;

class MainWindow : public QMainWindow, private Ui::MainWindow
class MainWindow : public QMainWindow, public Ui::MainWindow
{
Q_OBJECT
public:
Expand Down