Skip to content
This repository has been archived by the owner. It is now read-only.

Commit

Permalink
add first windows addaptation
Browse files Browse the repository at this point in the history
  • Loading branch information
MPIBR-tushevg committed Jan 7, 2019
1 parent 8165178 commit 048406e
Show file tree
Hide file tree
Showing 8 changed files with 540 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# C++ objects and libs
.DS_Store
#libs/
libs/opencv/

*.slo
*.lo
Expand Down
20 changes: 16 additions & 4 deletions BrainATUMtome/BrainATUMtome.pro
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,24 @@ qnx: target.path = /tmp/$${TARGET}/bin
else: unix:!android: target.path = /opt/$${TARGET}/bin
!isEmpty(target.path): INSTALLS += target

win32: LIBS += -L$$PWD/../libs/epos/lib/ -lEposCmd64
win32 {
# eops
LIBS += -L$$PWD/../libs/epos/win/ -lEposCmd64
INCLUDEPATH += $$PWD/../libs/epos/win
DEPENDPATH += $$PWD/../libs/epos/win

INCLUDEPATH += $$PWD/../libs/epos/include
DEPENDPATH += $$PWD/../libs/epos/include
# opencv
CONFIG(release, debug|release): LIBS += -L$$PWD/../libs/opencv/lib/ -lopencv_world340
CONFIG(debug, debug|release): LIBS += -L$$PWD/../libs/opencv/lib/ -lopencv_world340d

macx{
INCLUDEPATH += $$PWD/../libs/opencv/include
DEPENDPATH += $$PWD/../libs/opencv/include
}


macx {

# epos
INCLUDEPATH += $$PWD/../libs/epos/macx
LIBS += -L$$PWD/../libs/epos/macx -lepos

Expand Down
1 change: 1 addition & 0 deletions BrainATUMtome/epos.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,7 @@ void Epos::throwError(const QString &errorMessage)
if (!VCS_GetErrorInfo(m_errorCode, errorInfo, errorInfoSize))
{
//std::copy(errorInfo, "failed to read error information", errorInfoSize);

}

emit log(Qt::red, "EPOS :: Error, " + errorMessage + "\n" + QString(errorInfo) + ", errorCode: " + QString::number(m_errorCode, 16));
Expand Down
8 changes: 4 additions & 4 deletions BrainATUMtome/mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@ MainWindow::MainWindow(QWidget *parent) :
ui->setupUi(this);

// open settings
QString fileIni = "/Users/tushevg/Desktop/BrainATUMtome/config/settings.ini";
QString fileIni = "D:\\Developer\\BrainATUMtome\\config\\settings.ini";
if (!(QFileInfo::exists(fileIni) && QFileInfo(fileIni).isFile()))
ui->widget_board->on_log(Qt::red, "MainWindow :: provided INI file " + fileIni + " is not valid.");
m_settings = new QSettings(fileIni, QSettings::IniFormat);

configure_logs();
configure_video();
//configure_video();
configure_epos();
configure_microtome();
configure_syringe();
//configure_microtome();
//configure_syringe();
}

MainWindow::~MainWindow()
Expand Down
14 changes: 7 additions & 7 deletions config/settings.ini
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
[export]
path=/Users/tushevg/Desktop/export
path=D:\Developer\logs

[microtome]
#deviceName=LeicaEMUC7
#port=COM2
#baudRate=19200
deviceName=Arduino
port=/dev/cu.usbmodem14311
baudRate=9600
deviceName=LeicaEMUC7
port=COM2
baudRate=19200
#deviceName=Arduino
#port=/dev/cu.usbmodem14311
#baudRate=9600

[epos]
deviceName=EPOS2
Expand Down
511 changes: 511 additions & 0 deletions libs/epos/win/Definitions.h

Large diffs are not rendered by default.

Binary file added libs/epos/win/EposCmd.lib
Binary file not shown.
Binary file added libs/epos/win/EposCmd64.lib
Binary file not shown.

0 comments on commit 048406e

Please sign in to comment.