diff --git a/vincecontrol.cpp b/vincecontrol.cpp index 31c74a9..ea50e15 100644 --- a/vincecontrol.cpp +++ b/vincecontrol.cpp @@ -1,20 +1,37 @@ #include "vincecontrol.h" #include"QSerialPortInfo" +#include "QDebug" +#include "QThread" VinceControl::VinceControl(ProTools proto) { protools = proto; IsMotorInit = false; RS485ID = "0"; + Speednow = 0; + SpeedisSet = false; } + + VinceControl::~VinceControl() { - serial->close(); - IsMotorInit = false; + if (protools == RS232 || protools == RS485) + { + serial->close(); + IsMotorInit = false; + } + } bool VinceControl::serialconnect(QString comname, QString bandrate) { + if (protools == RS232 || protools == RS485) + { + } + else + { + return false; + } QSerialPortInfo info; QList infos = QSerialPortInfo::availablePorts(); int i = 0; @@ -39,33 +56,50 @@ bool VinceControl::serialconnect(QString comname, QString bandrate) return true; } + + +void VinceControl::Handshacke(QString motorid) +{ + SendCommandtoMotor("dev\n", motorid); +} + void VinceControl::SetRS485ID(QString id) { RS485ID = id; } -void VinceControl::EnableMotro() +void VinceControl::EnableMotro(QString id ) { - QString str = "ena\n"; - SendCommandtoSerial(str); + QString str = "ena\n"; + if (id =="non") + { + + SendCommandtoMotor(str); + } + else + { + SendCommandtoMotor(str, id); + } + } -void VinceControl::DisableMotro() +void VinceControl::DisableMotro(QString id ) { QString str = "off\n"; - SendCommandtoSerial(str); + SendCommandtoMotor(str,id); } -void VinceControl::SendCommandtoSerial(QString str) +void VinceControl::SendCommandtoMotor(QString str) { if (protools == RS232) { QByteArray buf; buf.append(str); serial->write(buf); + serial->waitForBytesWritten(1000); } else if(protools==RS485) { @@ -73,26 +107,175 @@ void VinceControl::SendCommandtoSerial(QString str) QByteArray buf; buf.append(str2); serial->write(buf); + serial->waitForBytesWritten(1000); + + } + else if (protools==NETTCP) + { + if (tcpSocket.length() == 0) + { + return; + } + else + { + tcpSocket[0]->write(str.toUtf8().data()); + } + tcpSocket[0]->waitForBytesWritten(1000); + } +} + +void VinceControl::SendCommandtoMotor(QString str, QString modor) +{ + if (modor == "non") + { + SendCommandtoMotor(str); + return; + + } + + int lenth = tcpSocket.length(); + int lenthstring = Motorlist.length(); + if (lenthstring!=lenth) + { + return; + } + for (size_t i = 0; i < lenth; i++) + { + if (Motorlist.at(i)==modor) + { + tcpSocket[i]->write(str.toUtf8().data()); + tcpSocket[i]->waitForBytesWritten(1000); + return; + } } } -void VinceControl::MoveSetDistance(long distance) +void VinceControl::MoveSetDistance(long distance,QString motornetid ) { + QString commonstr = "rmv " + QString::number(distance) + "\n"; + SendCommandtoMotor(commonstr, motornetid); } -void VinceControl::MoveMotar(bool direction) +void VinceControl::MoveMotar(bool direction, QString motornetid ) { + if (motornetid == "non") + { + if (protools != NETTCP) + { + if (!SpeedisSet) + { + return; + } + if (direction) + { + SettingSpeedByThis(abs(Speednow)); + } + else + { + SettingSpeedByThis(abs(Speednow)*-1); + } + } + if (protools == NETTCP&&Motorlist.length() > 0) + { + + if (!isSettingSpeedlist[0]) + { + return; + } + if (direction) + { + SettingSpeedByThis(abs(Speedlist[0]), motornetid);; + } + else + { + SettingSpeedByThis(abs(Speedlist[0])*-1, motornetid); + } + + } + + } + else + { + + int lenthstring = Motorlist.length(); + + for (size_t i = 0; i < lenthstring; i++) + { + if (Motorlist.at(i) == motornetid) + { + + if (!isSettingSpeedlist[i]) + { + return; + } + if (direction) + { + SettingSpeedByThis(abs( Speedlist[i]), motornetid);; + } + else + + { + int a = abs(Speedlist[i]); + SettingSpeedByThis(abs(Speedlist[i])*-1, motornetid); + } + break; + + } + + } + } + + QThread::msleep(100); + QString commendtosend = "mov\n"; + SendCommandtoMotor(commendtosend, motornetid); } -void VinceControl::SettingSpeed(unsigned long Speed) +void VinceControl::SettingSpeed(unsigned long Speed, QString motornetid /*= "non"*/) { + SettingSpeedByThis(Speed, motornetid); + //speed +} + +void VinceControl::SettingSpeedByThis( long Speed, QString motornetid) +{ + if (motornetid=="non") + { + if (protools==NETTCP&&Motorlist.length()>0) + { + isSettingSpeedlist[0] = true; + Speedlist[0] = Speed; + } + if (protools!=NETTCP) + { + Speednow = Speed; + SpeedisSet = true; + } + + } + else + { + int lenthstring = Motorlist.length(); + + for (size_t i = 0; i < lenthstring; i++) + { + if (Motorlist.at(i) == motornetid) + { + + isSettingSpeedlist[i] = true; + Speedlist[i] = Speed; + } + + } + } + QString commentosend = "cfg spd=" + QString::number(Speed) + "\n"; + SendCommandtoMotor(commentosend, motornetid); } -void VinceControl::MovetoZero() +void VinceControl::MovetoZero(QString motornetid ) { } @@ -111,3 +294,97 @@ void VinceControl::SettingUpandDownSpeed(int addspeed, int downspeed) { } + +void VinceControl::StopMotormove(QString motornetid ) +{ + QString commonstr = "stp\n"; + SendCommandtoMotor(commonstr, motornetid); + +} + +VinceControl::VinceControl(ProTools proto, int port) +{ + if (proto != NETTCP) + { + return; + } + protools = proto; + //Motor1IpAddress.append("192.168.1.1"); + + //监听套接字,指定父对象，让其自动回收空间 + tcpServer = new QTcpServer(); + + //setWindowTitle("服务器：6666"); + tcpServer->listen(QHostAddress::Any, port); + connect(tcpServer, &QTcpServer::newConnection, this, &VinceControl::onNewTcpClinetConnet); + + +} +void VinceControl::onNewTcpClinetConnet() +{ + if (protools != NETTCP) + { + return; + } + QTcpSocket *tcpsocket1; + + tcpSocket.append(tcpServer->nextPendingConnection()); + + QString ip = tcpSocket[tcpSocket.length() - 1]->peerAddress().toString().split("::ffff:")[1]; + Motorlist.append(ip); + bool statofmotor = false; + isSettingSpeedlist.append(statofmotor); + int speed = 200; + Speedlist.append(speed); + qint32 port = tcpSocket[tcpSocket.length() - 1]->peerPort(); + QString str11 = ip + " Connected The Port Number is "+port+"\n"; + SendLog(str11); + qDebug() << ip << ":" << port; +} + +void VinceControl::onReciveFromClinet() +{ + QTcpSocket* sc = dynamic_cast(sender()); + QString ip = sc->peerAddress().toString().split("::ffff:")[1]; + //获取对方发送的内容 +#ifdef LOGOUT + QByteArray array = sc->readAll(); + QString strofrecive; + strofrecive.append(array); + QString strtosend = "sender " + ip + ":" + strofrecive; + SendLog(strtosend); + +#endif + + + +} + +void VinceControl::onClinetDisConnet() +{ + QTcpSocket* sc = dynamic_cast(sender()); + QString ip = sc->peerAddress().toString().split("::ffff:")[1]; + int lenth = Motorlist.length(); + for (size_t i = 0; i < lenth; i++) + { + if (Motorlist[i]==ip) + { + Motorlist.removeAt(i); + isSettingSpeedlist.removeAt(i); + Speedlist.removeAt(i); + delete tcpSocket[i]; + tcpSocket.removeAt(i); + return; + } + + } +} + +void VinceControl::SendLog(QString str) +{ +#ifdef LOGOUT + emit SendLogToCallClass(str); +#endif // LOGOUT + +} + diff --git a/vincecontrol.h b/vincecontrol.h index 4479d87..a109657 100644 --- a/vincecontrol.h +++ b/vincecontrol.h @@ -35,13 +35,28 @@ #ifndef VINCECONTROL_H #define VINCECONTROL_H +#ifdef VINCECONTROL_LIB +# define VINCECONTROL_EXPORT Q_DECL_EXPORT +#else +# define VINCECONTROL_EXPORT Q_DECL_IMPORT +#endif +#define LOGOUT + #include "vincecontrol_global.h" #include "QString" +#include "QStringList" +#include "QList" +#include #include +#include //鐩戝惉濂楁帴瀛 +#include //閫氫俊濂楁帴瀛 +#include "QByteArray" + enum ProTools { RS232 = 0, -RS485 = 1 +RS485 = 1, +NETTCP=2 }; /******************************************************************** * 鎻忚堪锛氶┈杈炬帶鍒剁▼搴 @@ -52,8 +67,10 @@ RS485 = 1 * 4锛変娇鐢 * 2020-8-5锛氱珛鏂 *******************************************************************/ -class VINCECONTROL_EXPORT VinceControl +class VINCECONTROL_EXPORT VinceControl:public QObject { + Q_OBJECT + public: //************************************ // Method: VinceControl @@ -64,6 +81,16 @@ public: // Parameter: ProTools 閫氳鍗忚 RS485 鎴栬 RS232 //************************************ VinceControl(ProTools proto); + //************************************ + // Method: VinceControl //璧扮綉缁滃崗璁 闇瑕佷袱涓弬鏁 绗竴涓负NETTCP 绗簩涓负绔彛 6000鎴栬6001 + // FullName: VinceControl::VinceControl + // Access: public + // Returns: + // Qualifier: + // Parameter: ProTools proto + // Parameter: int port + //************************************ + VinceControl(ProTools proto,int port); ~VinceControl(); //************************************ // Method: serialconnect @@ -74,8 +101,19 @@ public: // Parameter: QString comname 涓插彛鍚嶇О // Parameter: QString bandrate 涓插彛娉㈢壒鐜 //************************************ + bool serialconnect(QString comname,QString bandrate); //************************************ + // Method: Handshacke + // FullName: VinceControl::Handshacke + // Access: public + // Returns: void + // Qualifier: + //************************************ + + + void Handshacke(QString motorid = "non"); + //************************************ // Method: SetRS485ID // FullName: VinceControl::SetRS485ID // Access: public @@ -91,7 +129,7 @@ public: // Returns: void // Qualifier: //************************************ - void EnableMotro(); + void EnableMotro(QString motornetid="non"); //************************************ // Method: 鍙栨秷浣胯兘 // FullName: VinceControl::DisableMotro @@ -99,16 +137,27 @@ public: // Returns: void // Qualifier: //************************************ - void DisableMotro(); + void DisableMotro(QString motornetid = "non"); //************************************ // Method: SendCommandtoSerial // FullName: VinceControl::SendCommandtoSerial // Access: public // Returns: void // Qualifier: - // Parameter: QString str 鍛戒护 涓嶅寘鍚玦d + // Parameter: QString str 鍛戒护 涓嶅寘鍚玦d 濡傛灉鏄痭ettcp 榛樿鎯崇涓涓彂閫 //************************************ - void SendCommandtoSerial(QString str); + void SendCommandtoMotor(QString str); + + //************************************ + // Method: SendCommandtoMotor //涓や釜鍙傛暟 浠呯綉缁滃崗璁 绗竴涓负鍛戒护 绗簩涓负椹揪 + // FullName: VinceControl::SendCommandtoMotor + // Access: public + // Returns: void + // Qualifier: + // Parameter: QString str + // Parameter: int motorid + //************************************ + void SendCommandtoMotor(QString str,QString modor); //************************************ // Method: MoveSetDistance 鐢垫満宸︾Щ/鍙崇Щ 涓瀹氭暟閲忥紙涓嶆槸璺濈锛 // FullName: VinceControl::MoveSetDistance @@ -117,7 +166,8 @@ public: // Qualifier: // Parameter: long distance //************************************ - void MoveSetDistance(long distance); + + void MoveSetDistance(long distance, QString motornetid = "non"); //************************************ // Method: MoveModar 鐢垫満宸︾Щ/鍙崇Щ direction鏄柟鍚 // FullName: VinceControl::MoveModar @@ -126,16 +176,17 @@ public: // Qualifier: // Parameter: bool direction 鏂瑰悜 //************************************ - void MoveMotar(bool direction); + void MoveMotar(bool direction, QString motornetid = "non"); //************************************ // Method: SettingSpeed 璁剧疆閫熷害 // FullName: VinceControl::SettingSpeed // Access: public // Returns: void // Qualifier: - // Parameter: unsigned long Speed 閫熷害 鏃犳柟鍚 + // Parameter: unsigned long Speed 閫熷害 姝ｅ 鏃犳柟鍚 //************************************ - void SettingSpeed(unsigned long Speed); + void SettingSpeed(unsigned long Speed, QString motornetid = "non"); + //************************************ // Method: MovetoZero 褰掗浂 // FullName: VinceControl::MovetoZero @@ -143,7 +194,7 @@ public: // Returns: void // Qualifier: //************************************ - void MovetoZero(); + void MovetoZero(QString motornetid = "non"); //************************************ // Method: GetLocationNow 鑾峰彇褰撳墠鑷0鐐逛綅缃 // FullName: VinceControl::GetLocationNow @@ -171,6 +222,17 @@ public: // Parameter: int downspeed 鍑忛熷害 //************************************ void SettingUpandDownSpeed(int addspeed, int downspeed); + + void StopMotormove(QString motornetid = "non"); + + + QStringList Motorlist; +signals: + void SendLogToCallClass(QString str); + public slots : + void onNewTcpClinetConnet(); + void onReciveFromClinet(); + void onClinetDisConnet(); private: QSerialPort *serial; @@ -178,6 +240,15 @@ private: ProTools protools; QString RS485ID; unsigned long speed; + QTcpServer *tcpServer; //瀹氫箟鐩戝惉濂楁帴瀛梩cpServer + QListtcpSocket; //瀹氫箟閫氫俊濂楁帴瀛梩cpSocke + void SendLog(QString str); + QList isSettingSpeedlist; + QList Speedlist; + bool SpeedisSet; + int Speednow; + // + void SettingSpeedByThis(long Speed, QString motornetid = "non"); }; diff --git a/vincecontrol.vcxproj b/vincecontrol.vcxproj index 69ed90d..25bd9fb 100644 --- a/vincecontrol.vcxproj +++ b/vincecontrol.vcxproj @@ -34,7 +34,7 @@ DynamicLibrary - v141 + v120 DynamicLibrary @@ -73,8 +73,8 @@ - UNICODE;WIN32;WIN64;QT_DLL;QT_CORE_LIB;QT_SERIALPORT_LIB;VINCECONTROL_LIB;%(PreprocessorDefinitions) - .\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtSerialPort;%(AdditionalIncludeDirectories) + UNICODE;WIN32;WIN64;QT_DLL;QT_CORE_LIB;QT_SERIALPORT_LIB;VINCECONTROL_LIB;QT_NETWORK_LIB;%(PreprocessorDefinitions) + .\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtSerialPort;$(QTDIR)\include\QtNetwork;%(AdditionalIncludeDirectories) Disabled ProgramDatabase MultiThreadedDebugDLL @@ -85,13 +85,13 @@ $(OutDir)\$(ProjectName).dll $(QTDIR)\lib;%(AdditionalLibraryDirectories) true - qtmaind.lib;Qt5Cored.lib;Qt5SerialPortd.lib;%(AdditionalDependencies) + qtmaind.lib;Qt5Cored.lib;Qt5SerialPortd.lib;Qt5Networkd.lib;%(AdditionalDependencies) - UNICODE;WIN32;WIN64;QT_DLL;QT_CORE_LIB;QT_SERIALPORT_LIB;VINCECONTROL_LIB;%(PreprocessorDefinitions) - .\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtSerialPort;%(AdditionalIncludeDirectories) + UNICODE;WIN32;WIN64;QT_DLL;QT_CORE_LIB;QT_SERIALPORT_LIB;VINCECONTROL_LIB;QT_NETWORK_LIB;%(PreprocessorDefinitions) + .\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtSerialPort;$(QTDIR)\include\QtNetwork;%(AdditionalIncludeDirectories) Disabled ProgramDatabase MultiThreadedDebugDLL @@ -102,13 +102,13 @@ $(OutDir)\$(ProjectName).dll $(QTDIR)\lib;%(AdditionalLibraryDirectories) true - qtmaind.lib;Qt5Cored.lib;Qt5SerialPortd.lib;%(AdditionalDependencies) + qtmaind.lib;Qt5Cored.lib;Qt5SerialPortd.lib;Qt5Networkd.lib;%(AdditionalDependencies) - UNICODE;WIN32;WIN64;QT_DLL;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_SERIALPORT_LIB;VINCECONTROL_LIB;%(PreprocessorDefinitions) - .\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtSerialPort;%(AdditionalIncludeDirectories) + UNICODE;WIN32;WIN64;QT_DLL;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_SERIALPORT_LIB;VINCECONTROL_LIB;QT_NETWORK_LIB;%(PreprocessorDefinitions) + .\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtSerialPort;$(QTDIR)\include\QtNetwork;%(AdditionalIncludeDirectories) MultiThreadedDLL true @@ -118,13 +118,13 @@ $(OutDir)\$(ProjectName).dll $(QTDIR)\lib;%(AdditionalLibraryDirectories) false - qtmain.lib;Qt5Core.lib;Qt5SerialPort.lib;%(AdditionalDependencies) + qtmain.lib;Qt5Core.lib;Qt5SerialPort.lib;Qt5Network.lib;%(AdditionalDependencies) - UNICODE;WIN32;WIN64;QT_DLL;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_SERIALPORT_LIB;VINCECONTROL_LIB;%(PreprocessorDefinitions) - .\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtSerialPort;%(AdditionalIncludeDirectories) + UNICODE;WIN32;WIN64;QT_DLL;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_SERIALPORT_LIB;VINCECONTROL_LIB;QT_NETWORK_LIB;%(PreprocessorDefinitions) + .\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtSerialPort;$(QTDIR)\include\QtNetwork;%(AdditionalIncludeDirectories) MultiThreadedDLL true @@ -134,14 +134,39 @@ $(OutDir)\$(ProjectName).dll $(QTDIR)\lib;%(AdditionalLibraryDirectories) false - qtmain.lib;Qt5Core.lib;Qt5SerialPort.lib;%(AdditionalDependencies) + qtmain.lib;Qt5Core.lib;Qt5SerialPort.lib;Qt5Network.lib;%(AdditionalDependencies) + + true + true + + + true + true + - + + $(QTDIR)\bin\moc.exe;%(FullPath) + Moc%27ing vincecontrol.h... + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_SERIALPORT_LIB -DVINCECONTROL_LIB -DQT_NETWORK_LIB -D_WINDLL "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtSerialPort" "-I$(QTDIR)\include\QtNetwork" + $(QTDIR)\bin\moc.exe;%(FullPath) + Moc%27ing vincecontrol.h... + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_SERIALPORT_LIB -DVINCECONTROL_LIB -DQT_NETWORK_LIB -D_WINDLL "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtSerialPort" "-I$(QTDIR)\include\QtNetwork" + $(QTDIR)\bin\moc.exe;%(FullPath) + Moc%27ing vincecontrol.h... + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_SERIALPORT_LIB -DVINCECONTROL_LIB -DQT_NETWORK_LIB -D_WINDLL "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtSerialPort" "-I$(QTDIR)\include\QtNetwork" + $(QTDIR)\bin\moc.exe;%(FullPath) + Moc%27ing vincecontrol.h... + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_SERIALPORT_LIB -DVINCECONTROL_LIB -DQT_NETWORK_LIB -D_WINDLL "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtSerialPort" "-I$(QTDIR)\include\QtNetwork" + diff --git a/vincecontrol.vcxproj.filters b/vincecontrol.vcxproj.filters index d17c8b9..813951a 100644 --- a/vincecontrol.vcxproj.filters +++ b/vincecontrol.vcxproj.filters @@ -23,18 +23,36 @@ moc;h;cpp False + + {0eced450-ed05-4314-9059-efad8e7c787f} + cpp;moc + False + + + {c531b976-50f1-46c0-8a19-c46be8bc3ed0} + cpp;moc + False + Source Files + + Generated Files\Debug + + + Generated Files\Release + - - Header Files - Header Files + + + Header Files + + \ No newline at end of file diff --git a/vincecontrol.vcxproj.user b/vincecontrol.vcxproj.user index be25078..c657ef0 100644 --- a/vincecontrol.vcxproj.user +++ b/vincecontrol.vcxproj.user @@ -1,4 +1,12 @@ 锘 + + C:\Qt\Qt5.8.0\5.8\msvc2013_64 + PATH=$(QTDIR)\bin%3b"$(QTDIR)\bin%3b$(QTDIR)\bin%3b$(PATH) + + + C:\Qt\Qt5.8.0\5.8\msvc2013_64 + PATH=$(QTDIR)\bin%3b"$(QTDIR)\bin%3b$(QTDIR)\bin%3b$(PATH) + \ No newline at end of file diff --git a/vincecontrol_global.h b/vincecontrol_global.h index dcd4aec..9adc07d 100644 --- a/vincecontrol_global.h +++ b/vincecontrol_global.h @@ -3,10 +3,6 @@ #include -#ifdef VINCECONTROL_LIB -# define VINCECONTROL_EXPORT Q_DECL_EXPORT -#else -# define VINCECONTROL_EXPORT Q_DECL_IMPORT -#endif + #endif // VINCECONTROL_GLOBAL_H