kopia lustrzana https://gitlab.com/eliggett/wfview
Hopefully fix compile warning on linux
rodzic
7fc3a7bf79
commit
c62d8832f1
|
@ -60,14 +60,14 @@ signals:
|
||||||
void setDebugMode(bool debugOn);
|
void setDebugMode(bool debugOn);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Ui::loggingWindow *ui;
|
Ui::loggingWindow* ui;
|
||||||
|
QString logFilename;
|
||||||
|
QString logDirectory;
|
||||||
QClipboard *clipboard;
|
QClipboard *clipboard;
|
||||||
QMessageBox URLmsgBox;
|
QMessageBox URLmsgBox;
|
||||||
QScrollBar *vertLogScroll;
|
QScrollBar *vertLogScroll;
|
||||||
QScrollBar *horizLogScroll;
|
QScrollBar *horizLogScroll;
|
||||||
QMutex textMutex;
|
QMutex textMutex;
|
||||||
QString logFilename;
|
|
||||||
QString logDirectory;
|
|
||||||
QTcpSocket *socket;
|
QTcpSocket *socket;
|
||||||
void sendToTermbin();
|
void sendToTermbin();
|
||||||
};
|
};
|
||||||
|
|
6
main.cpp
6
main.cpp
|
@ -74,13 +74,11 @@ int main(int argc, char *argv[])
|
||||||
QString serialPortCL;
|
QString serialPortCL;
|
||||||
QString hostCL;
|
QString hostCL;
|
||||||
QString civCL;
|
QString civCL;
|
||||||
|
|
||||||
QDateTime date = QDateTime::currentDateTime();
|
QDateTime date = QDateTime::currentDateTime();
|
||||||
QString formattedTime = date.toString("dd.MM.yyyy hh:mm:ss");
|
QString formattedTime = date.toString("dd.MM.yyyy hh:mm:ss");
|
||||||
#ifdef Q_OS_MAC
|
|
||||||
QString logFilename = (QString("%1/%2-%3.log").arg(QStandardPaths::standardLocations(QStandardPaths::DownloadLocation)[0]).arg(a.applicationName()).arg(date.toString("yyyyMMddhhmmss")));
|
|
||||||
#else
|
|
||||||
QString logFilename = (QString("%1/%2-%3.log").arg(QStandardPaths::standardLocations(QStandardPaths::TempLocation)[0]).arg(a.applicationName()).arg(date.toString("yyyyMMddhhmmss")));
|
QString logFilename = (QString("%1/%2-%3.log").arg(QStandardPaths::standardLocations(QStandardPaths::TempLocation)[0]).arg(a.applicationName()).arg(date.toString("yyyyMMddhhmmss")));
|
||||||
#endif
|
|
||||||
QString settingsFile = NULL;
|
QString settingsFile = NULL;
|
||||||
QString currentArg;
|
QString currentArg;
|
||||||
|
|
||||||
|
|
2
wfmain.h
2
wfmain.h
|
@ -650,6 +650,7 @@ private slots:
|
||||||
private:
|
private:
|
||||||
Ui::wfmain *ui;
|
Ui::wfmain *ui;
|
||||||
void closeEvent(QCloseEvent *event);
|
void closeEvent(QCloseEvent *event);
|
||||||
|
QString logFilename;
|
||||||
bool debugMode;
|
bool debugMode;
|
||||||
QString version;
|
QString version;
|
||||||
QSettings *settings=Q_NULLPTR;
|
QSettings *settings=Q_NULLPTR;
|
||||||
|
@ -662,7 +663,6 @@ private:
|
||||||
void initLogging();
|
void initLogging();
|
||||||
QTimer logCheckingTimer;
|
QTimer logCheckingTimer;
|
||||||
int logCheckingOldPosition = 0;
|
int logCheckingOldPosition = 0;
|
||||||
QString logFilename;
|
|
||||||
|
|
||||||
QCustomPlot *plot; // line plot
|
QCustomPlot *plot; // line plot
|
||||||
QCustomPlot *wf; // waterfall image
|
QCustomPlot *wf; // waterfall image
|
||||||
|
|
Ładowanie…
Reference in New Issue