diff --git a/.travis.yml b/.travis.yml index cdfafe0..6923721 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ matrix: - wget -c -nv "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" - chmod a+x linuxdeployqt-continuous-x86_64.AppImage # export VERSION=... # linuxdeployqt uses this for naming the file - - ./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/local/share/applications/SavvyCAN.desktop -appimage -extra-plugins=iconengines,platformthemes.libqgtk3.so + - ./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/local/share/applications/SavvyCAN.desktop -appimage -extra-plugins=iconengines,platformthemes/libqgtk3.so,canbus after_success: # find appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq # for debugging @@ -50,7 +50,8 @@ matrix: script: - qmake CONFIG+=release -spec macx-xcode SavvyCAN.pro - xcodebuild - - cp *.q* Release/SavvyCAN.app/Contents/MacOS/ + - mkdir Release/SavvyCAN.app/Contents/MacOS/help + - cp -R help/*.* Release/SavvyCAN.app/Contents/MacOS/help - cd Release - ls SavvyCAN.app/Contents/MacOS - macdeployqt SavvyCAN.app -dmg @@ -78,7 +79,8 @@ matrix: - rm *.cpp - rm *.h - rm *.obj - - cp ../*.q* . + - mkdir help + - cp -R ../help/*.* ./help - cp -r ../examples . - 7z a -tzip SavvyCAN32.zip -r * @@ -92,6 +94,6 @@ matrix: draft: false branches: - only: - - master - - WIP + except: + - # Do not build tags that we create when we upload to GitHub Releases + - /^(?i:continuous)/ diff --git a/SavvyCAN.pro b/SavvyCAN.pro index f954497..605b90b 100644 --- a/SavvyCAN.pro +++ b/SavvyCAN.pro @@ -68,7 +68,8 @@ SOURCES += main.cpp\ blfhandler.cpp \ re/sniffer/SnifferDelegate.cpp \ connections/newconnectiondialog.cpp \ - re/temporalgraphwindow.cpp + re/temporalgraphwindow.cpp \ + filterutility.cpp HEADERS += mainwindow.h \ can_structs.h \ @@ -127,7 +128,8 @@ HEADERS += mainwindow.h \ blfhandler.h \ re/sniffer/SnifferDelegate.h \ connections/newconnectiondialog.h \ - re/temporalgraphwindow.h + re/temporalgraphwindow.h \ + filterutility.h FORMS += ui/candatagrid.ui \ ui/connectionwindow.ui \ @@ -186,8 +188,8 @@ iconfiles.files=icons iconfiles.path = $$PREFIX/share/icons INSTALLS += iconfiles -helpfiles.files=SavvyCAN.q* -helpfiles.path = $$PREFIX/bin +helpfiles.files=help/* +helpfiles.path = $$PREFIX/bin/help INSTALLS += helpfiles INSTALLS += target diff --git a/SavvyCAN.qch b/SavvyCAN.qch deleted file mode 100644 index 997519a..0000000 Binary files a/SavvyCAN.qch and /dev/null differ diff --git a/SavvyCAN.qhc b/SavvyCAN.qhc deleted file mode 100644 index e218082..0000000 Binary files a/SavvyCAN.qhc and /dev/null differ diff --git a/SavvyCAN.qhcp b/SavvyCAN.qhcp deleted file mode 100644 index fad8e16..0000000 --- a/SavvyCAN.qhcp +++ /dev/null @@ -1,19 +0,0 @@ - - - - SavvyCAN 189 documentation - qthelp://org.sphinx.savvycan.189/doc/index.html - qthelp://org.sphinx.savvycan.189/doc/index.html - - - - - SavvyCAN.qhp - SavvyCAN.qch - - - - SavvyCAN.qch - - - \ No newline at end of file diff --git a/SavvyCAN.qhp b/SavvyCAN.qhp deleted file mode 100644 index c5acc7a..0000000 --- a/SavvyCAN.qhp +++ /dev/null @@ -1,170 +0,0 @@ - - - org.sphinx.savvycan.189 - doc - - SavvyCAN - 189 - - - SavvyCAN - 189 - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- - - - - - bisector.html - connectionwindow.html - customsender.html - dbc_editor.html - dbc_manager.html - filecomparison.html - firmwareuploader.html - flowview.html - framedetails.html - fuzzingwindow.html - genindex.html - graphsetup.html - graphwindow.html - index.html - isotp_decoder.html - mainscreen.html - playbackwindow.html - preferences.html - rangestate.html - scriptingwindow.html - search.html - signaleditor.html - sniffer.html - uds_scanner.html - _static/ajax-loader.gif - _static/alabaster.css - _static/basic.css - _static/comment-bright.png - _static/comment-close.png - _static/comment.png - _static/down-pressed.png - _static/down.png - _static/file.png - _static/minus.png - _static/nonav.css - _static/plus.png - _static/pygments.css - _static/up-pressed.png - _static/up.png - _images/Bisector.png - _images/ConnectionWindow.png - _images/CustomSender.png - _images/DBCEditor.png - _images/DBCManager.png - _images/FileComparator.png - _images/FlowView.png - _images/FrameInfoWindow.png - _images/FuzzingWindow.png - _images/GraphSetup.png - _images/GraphingView.png - _images/ISOTPDecoder.png - _images/MainScreen.png - _images/Playback.png - _images/Preferences.png - _images/RangeState.png - _images/ScriptingWindow.png - _images/SignalEditor.png - _images/Sniffer.png - _images/UDS_Scanner.png - - - \ No newline at end of file diff --git a/bisectwindow.cpp b/bisectwindow.cpp index 22d3e78..99a27ca 100644 --- a/bisectwindow.cpp +++ b/bisectwindow.cpp @@ -66,7 +66,7 @@ void BisectWindow::refreshIDList() int id; for (int i = 0; i < modelFrames->count(); i++) { - id = modelFrames->at(i).ID; + id = modelFrames->at(i).frameId(); if (!foundID.contains(id)) { foundID.append(id); @@ -129,7 +129,7 @@ void BisectWindow::handleCalculateButton() uint32_t upperID = Utility::ParseStringToNum2(ui->cbIDUpper->currentText()); for (int i = 0; i < modelFrames->count(); i++) { - if (modelFrames->at(i).ID >= lowerID && modelFrames->at(i).ID <= upperID) splitFrames.append(modelFrames->at(i)); + if (modelFrames->at(i).frameId() >= lowerID && modelFrames->at(i).frameId() <= upperID) splitFrames.append(modelFrames->at(i)); } } refreshFrameNumbers(); diff --git a/blfhandler.cpp b/blfhandler.cpp index 7dde7b3..9c3fb1a 100644 --- a/blfhandler.cpp +++ b/blfhandler.cpp @@ -78,7 +78,7 @@ bool BLFHandler::loadBLF(QString filename, QVector* frames) } qDebug() << "Uncompressed size: " << uncompressedData.count(); pos = 0; - bool foundHeader = false; + //bool foundHeader = false; //first skip forward to find a header signature - usually not necessary while ( (int)(pos + sizeof(BLF_OBJ_HEADER)) < uncompressedData.count()) { @@ -100,19 +100,20 @@ bool BLFHandler::loadBLF(QString filename, QVector* frames) memcpy(&canObject, fileData.constData(), sizeof(BLF_CAN_OBJ)); CANFrame frame; frame.bus = canObject.channel; - frame.extended = (canObject.id & 0x80000000ull)?true:false; - frame.ID = canObject.id & 0x1FFFFFFFull; + frame.setExtendedFrameFormat((canObject.id & 0x80000000ull)?true:false); + frame.setFrameId(canObject.id & 0x1FFFFFFFull); frame.isReceived = true; - frame.len = canObject.dlc; + QByteArray bytes(canObject.dlc, 0); if (canObject.flags & BLF_REMOTE_FLAG) { - frame.remote = true; + frame.setFrameType(QCanBusFrame::RemoteRequestFrame); } else { - frame.remote = false; - for (int i = 0; i < 8; i++) frame.data[i] = canObject.data[i]; + frame.setFrameType(QCanBusFrame::DataFrame); + for (int i = 0; i < 8; i++) bytes[i] = canObject.data[i]; } + frame.setPayload(bytes); //Should we divide by a thousand or a million? Unsure here. It appears some logs are stamped in microseconds and some in milliseconds? - frame.timestamp = obj.header.v1Obj.uncompSize / 1000.0; //uncompsize field also used for timestamp oddly enough + frame.setTimeStamp(QCanBusFrame::TimeStamp(0, obj.header.v1Obj.uncompSize / 1000.0)); //uncompsize field also used for timestamp oddly enough frames->append(frame); } else if (obj.header.base.objType == BLF_CAN_MSG2) @@ -120,19 +121,19 @@ bool BLFHandler::loadBLF(QString filename, QVector* frames) memcpy(&canObject2, fileData.constData(), sizeof(BLF_CAN_OBJ2)); CANFrame frame; frame.bus = canObject2.channel; - frame.extended = (canObject2.id & 0x80000000ull)?true:false; - frame.ID = canObject2.id & 0x1FFFFFFFull; + frame.setExtendedFrameFormat((canObject2.id & 0x80000000ull)?true:false); + frame.setFrameId(canObject2.id & 0x1FFFFFFFull); frame.isReceived = true; - frame.len = canObject2.dlc; + QByteArray bytes(canObject2.dlc, 0); if (canObject2.flags & BLF_REMOTE_FLAG) { - frame.remote = true; + frame.setFrameType(QCanBusFrame::RemoteRequestFrame); } else { - frame.remote = false; - for (int i = 0; i < 8; i++) frame.data[i] = canObject2.data[i]; + frame.setFrameType(QCanBusFrame::DataFrame); + for (int i = 0; i < 8; i++) bytes[i] = canObject2.data[i]; } //Should we divide by a thousand or a million? Unsure here. It appears some logs are stamped in microseconds and some in milliseconds? - frame.timestamp = obj.header.v1Obj.uncompSize / 1000.0; //uncompsize field also used for timestamp oddly enough + frame.setTimeStamp(QCanBusFrame::TimeStamp(0, obj.header.v1Obj.uncompSize / 1000.0)); //uncompsize field also used for timestamp oddly enough frames->append(frame); } else @@ -162,5 +163,7 @@ bool BLFHandler::loadBLF(QString filename, QVector* frames) bool BLFHandler::saveBLF(QString filename, QVector *frames) { + Q_UNUSED(filename) + Q_UNUSED(frames) return false; } diff --git a/bus_protocols/isotp_handler.cpp b/bus_protocols/isotp_handler.cpp index 840bbd7..d56477c 100644 --- a/bus_protocols/isotp_handler.cpp +++ b/bus_protocols/isotp_handler.cpp @@ -9,7 +9,6 @@ ISOTP_HANDLER::ISOTP_HANDLER() processAll = false; lastSenderBus = 0; lastSenderID = 0; - issuedMultiFrame = false; modelFrames = MainWindow::getReference()->getCANFrameModel()->getListReference(); @@ -48,10 +47,10 @@ void ISOTP_HANDLER::setReception(bool mode) } } -void ISOTP_HANDLER::sendISOTPFrame(int bus, int ID, QVector data) +void ISOTP_HANDLER::sendISOTPFrame(int bus, int ID, QByteArray data) { CANFrame frame; - frame.remote = false; + frame.setFrameType(QCanBusFrame::DataFrame); int currByte = 0; int index = 0; if (bus < 0) return; @@ -62,29 +61,28 @@ void ISOTP_HANDLER::sendISOTPFrame(int bus, int ID, QVector data) if (data.length() < 8) { - issuedMultiFrame = false; - frame.bus = bus; - frame.ID = ID; - if (ID > 0x7FF) frame.extended = true; - else frame.extended = false; - frame.len = 8; - for (int b = 0; b < 8; b++) frame.data[b] = 0x00; - frame.data[0] = data.length(); - for (int i = 0; i < frame.data[0]; i++) frame.data[i + 1] = data[i]; + frame.bus = bus; + frame.setFrameId(ID); + if (ID > 0x7FF) frame.setExtendedFrameFormat(true); + else frame.setExtendedFrameFormat(false); + QByteArray bytes(8,0); + bytes.resize(8); + bytes[0] = data.length(); + for (int i = 0; i < data.length(); i++) bytes[i + 1] = data[i]; + frame.setPayload(bytes); CANConManager::getInstance()->sendFrame(frame); } else //need to send a multi-part ISO_TP message - Respects timing and frame number based flow control { - issuedMultiFrame = true; frame.bus = bus; - frame.ID = ID; - if (ID > 0x7FF) frame.extended = true; - else frame.extended = false; - frame.len = 8; - for (int b = 0; b < 8; b++) frame.data[b] = 0x00; - frame.data[0] = 0x10 + (data.length() / 256); - frame.data[1] = data.length() & 0xFF; - for (int i = 0; i < 6; i++) frame.data[2 + i] = data[currByte++]; + frame.setFrameId(ID); + if (ID > 0x7FF) frame.setExtendedFrameFormat(true); + else frame.setExtendedFrameFormat(false); + QByteArray bytes(8, 0); + bytes[0] = 0x10 + (data.length() / 256); + bytes[1] = data.length() & 0xFF; + for (int i = 0; i < 6; i++) bytes[2 + i] = data[currByte++]; + frame.setPayload(bytes); CANConManager::getInstance()->sendFrame(frame); //Queue up the rest of the frames waitingForFlow = true; @@ -93,13 +91,13 @@ void ISOTP_HANDLER::sendISOTPFrame(int bus, int ID, QVector data) frameTimer.start(); while (currByte < data.length()) { - for (int b = 0; b < 8; b++) frame.data[b] = 0x00; - frame.data[0] = 0x20 + index; + for (int b = 0; b < 8; b++) bytes[b] = 0x00; + bytes[0] = 0x20 + index; index = (index + 1) & 0xF; int bytesToGo = data.length() - currByte; if (bytesToGo > 7) bytesToGo = 7; - for (int i = 0; i < bytesToGo; i++) frame.data[1 + i] = data[currByte++]; - frame.len = 8; + for (int i = 0; i < bytesToGo; i++) bytes[1 + i] = data[currByte++]; + frame.setPayload(bytes); sendingFrames.append(frame); //CANConManager::getInstance()->sendFrame(frame); } @@ -141,7 +139,7 @@ void ISOTP_HANDLER::rapidFrames(const CANConnection* conn, const QVector(frame.payload().data()); + //int dataLen = frame.payload().count(); frameType = 0; frameLen = 0; @@ -168,14 +168,14 @@ void ISOTP_HANDLER::processFrame(const CANFrame &frame) if (useExtendedAddressing) { ID = ID << 8; - ID += frame.data[0]; - frameType = frame.data[1] >> 4; - frameLen = frame.data[1] & 0xF; + ID += data[0]; + frameType = data[1] >> 4; + frameLen = data[1] & 0xF; } else { - frameType = frame.data[0] >> 4; - frameLen = frame.data[0] & 0xF; + frameType = data[0] >> 4; + frameLen = data[0] & 0xF; } switch(frameType) @@ -188,87 +188,89 @@ void ISOTP_HANDLER::processFrame(const CANFrame &frame) if (frameLen > 7) return; msg.bus = frame.bus; - msg.extended = frame.extended; - msg.ID = ID; + msg.setExtendedFrameFormat( frame.hasExtendedFrameFormat() ); + msg.setFrameId(ID); msg.isReceived = frame.isReceived; - msg.len = frameLen; - msg.data.reserve(frameLen); - msg.timestamp = frame.timestamp; - if (useExtendedAddressing) for (int j = 0; j < frameLen; j++) msg.data.append(frame.data[j+2]); - else for (int j = 0; j < frameLen; j++) msg.data.append(frame.data[j+1]); + msg.payload().reserve(frameLen); + msg.reportedLength = frameLen; + msg.setTimeStamp(frame.timeStamp()); + msg.isMultiframe = false; + if (useExtendedAddressing) for (int j = 0; j < frameLen; j++) msg.payload().append(frame.payload()[j+2]); + else for (int j = 0; j < frameLen; j++) msg.payload().append(frame.payload()[j+1]); //qDebug() << "Emitting single frame ISOTP message"; emit newISOMessage(msg); break; case 1: //first frame of a multi-frame message checkNeedFlush(ID); msg.bus = frame.bus; - msg.extended = frame.extended; - msg.ID = ID; - msg.timestamp = frame.timestamp; + msg.setExtendedFrameFormat( frame.hasExtendedFrameFormat() ); + msg.setFrameId(ID); + msg.setTimeStamp(frame.timeStamp()); msg.isReceived = frame.isReceived; - issuedMultiFrame = true; + msg.isMultiframe = true; frameLen = frameLen << 8; if (useExtendedAddressing) { - frameLen += frame.data[2]; + frameLen += data[2]; frameLen = frameLen & 0xFFF; - msg.len = frameLen; - msg.data.reserve(frameLen); - for (int j = 0; j < 5; j++) msg.data.append(frame.data[3 + j]); + msg.payload().reserve(frameLen); + msg.reportedLength = frameLen; + for (int j = 0; j < 5; j++) msg.payload().append(frame.payload()[3 + j]); } else { - frameLen += frame.data[1]; + frameLen += data[1]; frameLen = frameLen & 0xFFF; - msg.len = frameLen; - msg.data.reserve(frameLen); - for (int j = 0; j < 6; j++) msg.data.append(frame.data[2 + j]); + msg.payload().reserve(frameLen); + msg.reportedLength = frameLen; + for (int j = 0; j < 6; j++) msg.payload().append(frame.payload()[2 + j]); } + msg.lastSequence = -1; messageBuffer.append(msg); //The sending ID is set to the last ID we used to send from this class which is //very likely to be correct. But, caution, there is a chance that it isn't. Beware. - if (issueFlowMsgs && lastSenderID > 0 && issuedMultiFrame) + if (issueFlowMsgs && lastSenderID > 0) { CANFrame outFrame; outFrame.bus = lastSenderBus; - outFrame.extended = false; - outFrame.ID = lastSenderID; - outFrame.len = 8; - for (int b = 0; b < 8; b++) outFrame.data[b] = 0x00; - outFrame.data[0] = 0x30; //flow control, go ahead and send - outFrame.data[1] = 0; //dont ask again about flow control - outFrame.data[2] = 3; //separation time in milliseconds between messages. + outFrame.setExtendedFrameFormat(false); + outFrame.setFrameId(lastSenderID); + QByteArray bytes(8, 0); + bytes[0] = 0x30; //flow control, go ahead and send + bytes[1] = 0; //dont ask again about flow control + bytes[2] = 3; //separation time in milliseconds between messages. + outFrame.setPayload(bytes); CANConManager::getInstance()->sendFrame(outFrame); } break; case 2: //subsequent frames for multi-frame messages - pMsg = NULL; + pMsg = nullptr; for (int i = 0; i < messageBuffer.length(); i++) { - if (messageBuffer[i].ID == ID) + if (messageBuffer[i].frameId() == ID) { pMsg = &messageBuffer[i]; break; } } if (!pMsg) return; - ln = pMsg->len - pMsg->data.count(); + if (!pMsg->isMultiframe) return; //if we didn't get a frame type 1 (start of multiframe) first then ignore this frame. + ln = pMsg->payload().length() - pMsg->payload().count(); //offset = pMsg->data.count(); if (useExtendedAddressing) { if (ln > 6) ln = 6; - for (int j = 0; j < ln; j++) pMsg->data.append(frame.data[j+2]); + for (int j = 0; j < ln; j++) pMsg->payload().append(frame.payload()[j+2]); } else { if (ln > 7) ln = 7; - for (int j = 0; j < ln; j++) pMsg->data.append(frame.data[j+1]); + for (int j = 0; j < ln; j++) pMsg->payload().append(frame.payload()[j+1]); } - if (pMsg->len <= pMsg->data.count()) + if (pMsg->reportedLength <= pMsg->payload().count()) { //qDebug() << "Emitting multiframe ISOTP message"; - issuedMultiFrame = false; - emit newISOMessage(*pMsg); + checkNeedFlush(pMsg->frameId()); } break; case 3: //flow control messages @@ -277,10 +279,10 @@ void ISOTP_HANDLER::processFrame(const CANFrame &frame) case 0: //continue to send frames but maybe change inter-frame delay waitingForFlow = false; //data[1] contains number of frames to send before waiting for next flow control - framesUntilFlow = frame.data[1]; + framesUntilFlow = data[1]; if (framesUntilFlow == 0) framesUntilFlow = -1; //-1 means don't count frames and just keep going //data[2] contains the interframe delay to use (0xF1 through 0xF9 are special through) - if (frame.data[2] < 0xF1) frameTimer.start(frame.data[2]); //set proper delay between frames + if (data[2] < 0xF1) frameTimer.start(data[2]); //set proper delay between frames else frameTimer.start(1); //can't do sub-millisecond sending with this code so just use 1ms timing break; case 1: //wait - do not send any more frames until other side says so @@ -303,12 +305,21 @@ void ISOTP_HANDLER::checkNeedFlush(uint64_t ID) { for (int i = 0; i < messageBuffer.length(); i++) { - if (messageBuffer[i].ID == ID) + if (messageBuffer[i].frameId() == ID) { //used to pass by reference but now newISOMessage should pass by value which makes it easier to use cross thread - //qDebug() << "Flushing a partial frame"; + if (messageBuffer[i].frameId() > 0x600 && messageBuffer[i].frameId() < 0x630) + { + if (messageBuffer[i].reportedLength <= messageBuffer[i].payload().count()) + { + qDebug() << "Flushing full frame" << QString::number(messageBuffer[i].frameId(), 16) << " " << messageBuffer[i].reportedLength << " " << messageBuffer[i].payload().count(); + } + else + { + qDebug() << "Flushing a partial frame " << QString::number(messageBuffer[i].frameId(), 16) << " " << messageBuffer[i].reportedLength << " " << messageBuffer[i].payload().count(); + } + } emit newISOMessage(messageBuffer[i]); - issuedMultiFrame = false; messageBuffer.removeAt(i); return; } diff --git a/bus_protocols/isotp_handler.h b/bus_protocols/isotp_handler.h index 1aa4652..72ada5e 100644 --- a/bus_protocols/isotp_handler.h +++ b/bus_protocols/isotp_handler.h @@ -1,5 +1,4 @@ -#ifndef ISOTP_HANDLER_H -#define ISOTP_HANDLER_H +#pragma once #include #include @@ -20,7 +19,7 @@ public: ~ISOTP_HANDLER(); void setExtendedAddressing(bool mode); void setReception(bool mode); //set whether to accept and forward frames or not - void sendISOTPFrame(int bus, int ID, QVector data); + void sendISOTPFrame(int bus, int ID, QByteArray data); void setProcessAll(bool state); void setFlowCtrl(bool state); void addFilter(uint32_t pBusId, uint32_t ID, uint32_t mask); @@ -46,7 +45,6 @@ private: int framesUntilFlow; bool processAll; bool issueFlowMsgs; - bool issuedMultiFrame; QTimer frameTimer; uint32_t lastSenderID; uint32_t lastSenderBus; @@ -54,5 +52,3 @@ private: void processFrame(const CANFrame &frame); void checkNeedFlush(uint64_t ID); }; - -#endif // ISOTP_HANDLER_H diff --git a/bus_protocols/isotp_message.h b/bus_protocols/isotp_message.h index 5de2c21..788a069 100644 --- a/bus_protocols/isotp_message.h +++ b/bus_protocols/isotp_message.h @@ -1,18 +1,18 @@ #ifndef ISOTP_MESSAGE_H #define ISOTP_MESSAGE_H -//the same as the CANFrame struct but with arbitrary data size. -class ISOTP_MESSAGE +#include +#include +#include + +//Now a child class of CANFrame. We just add the ability to track how long it was supposed to be and other +//ISOTP related details. But, mostly just CANFrame. +class ISOTP_MESSAGE : public CANFrame { public: - uint32_t ID; - int bus; - bool extended; - bool isReceived; - uint32_t len; //# of bytes this message should have (as reported) - uint32_t actualSize; //# we actually got - QVector data; - uint64_t timestamp; + int reportedLength; + int lastSequence; + bool isMultiframe; }; #endif // ISOTP_MESSAGE_H diff --git a/bus_protocols/uds_handler.cpp b/bus_protocols/uds_handler.cpp index e9e0ed0..e0fb085 100644 --- a/bus_protocols/uds_handler.cpp +++ b/bus_protocols/uds_handler.cpp @@ -4,14 +4,14 @@ #include "isotp_handler.h" #include -QVector UDS_DIAG_CTRL_SUB = { +static QVector UDS_DIAG_CTRL_SUB = { {1,"DFLT_SESS", "Default session"}, {2,"PROG_SESS", "Programming Session"}, {3,"EXT_SESS", "Extended Diagnostics Session"}, {4,"SAFETY_SESS", "Safety System Diagnostics Session"}, }; -QVector UDS_ECU_RESET_SUB = { +static QVector UDS_ECU_RESET_SUB = { {1,"HARD_RESET", "Hard reset of ECU"}, {2,"KEYOFFON_RESET", "Simulated key off then on reset"}, {3,"SOFT_RESET", "Soft reset - leaving RAM intact"}, @@ -19,7 +19,7 @@ QVector UDS_ECU_RESET_SUB = { {5,"DIS_POWERDOWN_RESET", "Disable sleep mode"}, }; -QVector UDS_COMM_CTRL_SUB = { +static QVector UDS_COMM_CTRL_SUB = { {0,"COMM_NORMAL", "Enable both Rx and Tx of normal messages"}, {1,"COMM_DIS_TX", "Enable reception of normal messages but don't Tx them"}, {3,"COMM_DIS_ALL", "Disable both Rx and Tx of non-diagnostics messages"}, @@ -27,13 +27,13 @@ QVector UDS_COMM_CTRL_SUB = { {5,"COMM_ENHANC", "Addressed bus master should set related sub-bus to app scheduling mode"}, }; -QVector UDS_ROUTINE_SUB = { +static QVector UDS_ROUTINE_SUB = { {1,"START_ROUTINE", "Start routine by given ID"}, {2,"STOP_ROUTINE", "Stop routine by given ID"}, {3,"GET_ROUTINE_RESULTS", "Get results from routine specified by ID"}, }; -QVector UDS_SERVICE_DESC = { +static QVector UDS_SERVICE_DESC = { {1, "OBDII_SHOW_CURRENT", "OBDII - Show current data"}, {2, "OBDII_SHOW_FREEZE", "OBDII - Show freeze data"}, {3, "OBDII_SHOW_STORED_DTC", "OBDII - Show stored DTC codes"}, @@ -50,7 +50,8 @@ QVector UDS_SERVICE_DESC = { {0x14, "CLEAR_DIAG", "Clear diagnostic trouble codes"}, {0x19, "READ_DTC", "Read diagnostic trouble codes"}, {0x1A, "GMLAN_READ_DIAGNOSTIC_ID", "GMLAN - Read diagnostics ID"}, - {0x20, "RETURN_TO_NORMAL", "Return to normal mode"}, + {0x20, "RETURN_TO_NORMAL", "Return to normal mode"}, + {0x21, "READ_BY_LOCALID", "Read data by Local ID"}, {0x22, "READ_BY_ID", "Read data by ID"}, {0x23, "READ_BY_ADDR", "Read data by address"}, {0x24, "READ_SCALING_ID", "Read scaling data by ID"}, @@ -84,7 +85,7 @@ QVector UDS_SERVICE_DESC = { {0xFF, "UNKNOWN_CODE", "Unknown, likely proprietary UDS function code"} }; -QVector UDS_NEG_RESPONSE = +static QVector UDS_NEG_RESPONSE = { {0x10, "GENERAL_REJECT", "General rejection (no other codes matched)"}, {0x11, "SERVICE_NOTSUPP", "ECU does not support this service code"}, @@ -157,7 +158,6 @@ UDS_MESSAGE::UDS_MESSAGE() subFunc = 0; service = 0; subFuncLen = 1; - extended = false; isErrorReply = false; } @@ -177,35 +177,39 @@ UDS_HANDLER::~UDS_HANDLER() void UDS_HANDLER::gotISOTPFrame(ISOTP_MESSAGE msg) { qDebug() << "UDS handler got ISOTP frame"; + unsigned char *data = reinterpret_cast(msg.payload().data()); + int dataLen = msg.payload().count(); UDS_MESSAGE udsMsg; udsMsg.bus = msg.bus; - udsMsg.extended = msg.extended; - udsMsg.ID = msg.ID; + udsMsg.setExtendedFrameFormat(msg.hasExtendedFrameFormat()); + udsMsg.setFrameId(msg.frameId()); udsMsg.isReceived = msg.isReceived; - udsMsg.timestamp = msg.timestamp; - udsMsg.actualSize = msg.actualSize; - udsMsg.len = msg.len; - if (msg.data.length() > 0) { - udsMsg.service = msg.data.at(0); + udsMsg.setTimeStamp(msg.timeStamp()); + udsMsg.reportedLength = msg.reportedLength; + udsMsg.service = 0; + udsMsg.subFunc = 0; + udsMsg.subFuncLen = 0; + udsMsg.isErrorReply = false; + udsMsg.setPayload(msg.payload()); + if (dataLen > 0) { + udsMsg.service = data[0]; if (udsMsg.service == 0x7F) { udsMsg.isErrorReply = true; - if (msg.data.length() > 1) + if (dataLen > 1) { - udsMsg.service = msg.data.at(1); - if (msg.data.length() > 2) udsMsg.subFunc = msg.data.at(2); + udsMsg.service = data[1]; + if (dataLen > 2) udsMsg.subFunc = data[2]; else return; } else return; - udsMsg.data = msg.data.mid(2, -1); //don't copy error byte nor service byte - udsMsg.len -= 2; //and remove those bytes from the length reported too. + udsMsg.payload().remove(0, 2); } else { udsMsg.isErrorReply = false; - if (msg.data.length() > 1) udsMsg.subFunc = msg.data.at(1); - udsMsg.data = msg.data.mid(1, -1); //don't copy service byte - udsMsg.len -= 1; //and remove service byte from length too. + if (dataLen > 1) udsMsg.subFunc = data[1]; + udsMsg.payload().remove(0, 1); } } else return; @@ -240,7 +244,7 @@ void UDS_HANDLER::setReception(bool mode) void UDS_HANDLER::sendUDSFrame(const UDS_MESSAGE &msg) { - QVector data; + QByteArray data; if (msg.bus < 0) return; if (msg.bus >= CANConManager::getInstance()->getNumBuses()) return; if (msg.service > 0xFF) return; @@ -251,8 +255,8 @@ void UDS_HANDLER::sendUDSFrame(const UDS_MESSAGE &msg) data.append((msg.subFunc >> (8 * b)) & 0xFF); } - data.append(msg.data); - isoHandler->sendISOTPFrame(msg.bus, msg.ID, data); + data.append(msg.payload()); + isoHandler->sendISOTPFrame(msg.bus, msg.frameId(), data); qDebug() << "Sent UDS service: " << getServiceShortDesc(msg.service) << " on bus " << msg.bus; } @@ -323,6 +327,8 @@ QString UDS_HANDLER::getDetailedMessageAnalysis(const UDS_MESSAGE &msg) bool isResponse = true; int dataSize; int addrSize; + unsigned char *data = reinterpret_cast(msg.payload().data()); + int dataLen = msg.payload().length(); if (msg.isErrorReply) { @@ -358,15 +364,15 @@ QString UDS_HANDLER::getDetailedMessageAnalysis(const UDS_MESSAGE &msg) case UDS_SERVICES::DIAG_CONTROL + 0x40: //positive response buildString.append("Session Request: " + getLongDesc(UDS_DIAG_CTRL_SUB, msg.subFunc)); //there should be four extra bytes now - if (msg.data.length() < 5) //5 because subfunc codes are left in data so it starts with one subfunc byte + if (dataLen < 5) //5 because subfunc codes are left in data so it starts with one subfunc byte { //buildString.append("\nReturned data payload wasn't at least \n4 bytes like it should have been"); } else { - int p2 = msg.data[1] * 256 + msg.data[2]; + int p2 = data[1] * 256 + data[2]; buildString.append("\nP2MAX (Max Wait / Resp Time): " + QString::number(p2) + "ms"); - p2 = (msg.data[3] * 256 + msg.data[4]) * 10; + p2 = (data[3] * 256 + data[4]) * 10; buildString.append("\nP2 Ext MAX: " + QString::number(p2) + "ms"); } break; @@ -377,11 +383,11 @@ QString UDS_HANDLER::getDetailedMessageAnalysis(const UDS_MESSAGE &msg) case UDS_SERVICES::ECU_RESET + 0x40: buildString.append("Reset Type: " + getLongDesc(UDS_ECU_RESET_SUB, msg.subFunc)); //There should be one additional byte which encodes power down time - if (msg.data.length() > 1) + if (dataLen > 1) { - if (msg.data[1] < 0xFF) + if (data[1] < 0xFF) { - buildString.append("\nMinimum powered down time: " + QString::number(msg.data[1])); + buildString.append("\nMinimum powered down time: " + QString::number(data[1])); } else buildString.append("\nPowerdown time not available"); } @@ -390,11 +396,11 @@ QString UDS_HANDLER::getDetailedMessageAnalysis(const UDS_MESSAGE &msg) case UDS_SERVICES::COMM_CTRL: //Comm control has potentially a lot of parameters. control type, comm type, nodeID buildString.append("Control type: " + getLongDesc(UDS_COMM_CTRL_SUB, msg.subFunc)); - if (msg.data.length() > 1) - buildString.append("\nComm Type: " + QString::number(msg.data[1])); //TODO: no attempt to interpret yet - if (msg.data.length() > 3) + if (dataLen > 1) + buildString.append("\nComm Type: " + QString::number(data[1])); //TODO: no attempt to interpret yet + if (dataLen > 3) { - int nodeID = (msg.data[2] * 256 + msg.data[3]); + int nodeID = (data[2] * 256 + data[3]); buildString.append("\nNode ID: " + Utility::formatHexNum(nodeID)); } break; @@ -402,19 +408,19 @@ QString UDS_HANDLER::getDetailedMessageAnalysis(const UDS_MESSAGE &msg) if ((msg.subFunc % 2) == 1) { buildString.append("Seed request for security level: " + QString::number(msg.subFunc) + "\n"); - if (msg.data.length()> 1) + if (dataLen > 1) { buildString.append("Data payload: "); - for (int j = 1; j < msg.data.length(); j++) buildString.append(Utility::formatHexNum(msg.data[j]) + " "); + for (int j = 1; j < dataLen; j++) buildString.append(Utility::formatHexNum(data[j]) + " "); } } else { buildString.append("Key sending for security level: " + QString::number(msg.subFunc - 1)); - if (msg.data.length()> 1) //and it sure as hell should be! + if (dataLen > 1) //and it sure as hell should be! { buildString.append("KEY: "); - for (int j = 1; j < msg.data.length(); j++) buildString.append(Utility::formatHexNum(msg.data[j]) + " "); + for (int j = 1; j < dataLen; j++) buildString.append(Utility::formatHexNum(data[j]) + " "); } } break; @@ -422,10 +428,10 @@ QString UDS_HANDLER::getDetailedMessageAnalysis(const UDS_MESSAGE &msg) if ((msg.subFunc % 2) == 1) { buildString.append("Seed response for security level: " + QString::number(msg.subFunc) + "\n"); - if (msg.data.length()> 1) //be kinda pointless if it weren't + if (dataLen > 1) //be kinda pointless if it weren't { buildString.append("SEED: "); - for (int j = 1; j < msg.data.length(); j++) buildString.append(Utility::formatHexNum(msg.data[j]) + " "); + for (int j = 1; j < dataLen; j++) buildString.append(Utility::formatHexNum(data[j]) + " "); } } else @@ -436,33 +442,33 @@ QString UDS_HANDLER::getDetailedMessageAnalysis(const UDS_MESSAGE &msg) break; case UDS_SERVICES::READ_BY_ID: //parameter is groups of two bytes, each of which specify an ID to read - if (msg.data.length() > 2) + if (dataLen > 2) { uint32_t id; - for (int i = 1; i < msg.data.length(); i = i + 2) + for (int i = 1; i < dataLen; i = i + 2) { - id = (msg.data[i] * 256) + msg.data[i+1]; + id = (data[i] * 256) + data[i+1]; buildString.append("\nID to read: " + Utility::formatHexNum(id)); } } break; case UDS_SERVICES::READ_BY_ID + 0x40: //reply buildString.append("Reply is non-standard and so no decoding is done. The format is (ID) followed by how ever much data that ID returns, followed by more ID/data pairs if applicable.\nPayload: "); - for (int i = 1; i < msg.data.length(); i++) + for (int i = 1; i < dataLen; i++) { - buildString.append(Utility::formatHexNum(msg.data[i]) + " "); + buildString.append(Utility::formatHexNum(data[i]) + " "); } break; case UDS_SERVICES::READ_BY_ADDR: //subfunc byte specifies address and length format, then address, then size dataSize = msg.subFunc >> 4; addrSize = msg.subFunc & 0xF; - if (msg.data.length() > (dataSize + addrSize)) + if (dataLen > (dataSize + addrSize)) { buildString.append("Address: 0x"); - for (int i = 0; i < addrSize; i++) buildString.append(QString::number(msg.data[1+i], 16).toUpper().rightJustified(2,'0')); + for (int i = 0; i < addrSize; i++) buildString.append(QString::number(data[1+i], 16).toUpper().rightJustified(2,'0')); buildString.append("\nSize: 0x"); - for (int i = 0; i < dataSize; i++) buildString.append(QString::number(msg.data[1+i+addrSize], 16).toUpper().rightJustified(2,'0')); + for (int i = 0; i < dataSize; i++) buildString.append(QString::number(data[1+i+addrSize], 16).toUpper().rightJustified(2,'0')); } else { @@ -471,44 +477,44 @@ QString UDS_HANDLER::getDetailedMessageAnalysis(const UDS_MESSAGE &msg) break; case UDS_SERVICES::READ_BY_ADDR + 0x40: buildString.append("Reply is a raw packet of data of the size requested.\nPayload: "); - for (int i = 1; i < msg.data.length(); i++) + for (int i = 1; i < dataLen; i++) { - buildString.append(Utility::formatHexNum(msg.data[i]) + " "); + buildString.append(Utility::formatHexNum(data[i]) + " "); } break; case UDS_SERVICES::WRITE_BY_ID: break; case UDS_SERVICES::ROUTINE_CTRL: buildString.append("Routine Control: " + getLongDesc(UDS_ROUTINE_SUB, msg.subFunc)); - if (msg.data.length() > 2) + if (dataLen > 2) { int routineID; - routineID = (msg.data[1] * 256 + msg.data[2]); + routineID = (data[1] * 256 + data[2]); buildString.append("\nRoutine ID: " + Utility::formatHexNum(routineID)); } - if (msg.data.length() > 3) + if (dataLen > 3) { buildString.append("\nParameter bytes to routine: "); - for (int i = 4; i < msg.data.length(); i++) + for (int i = 4; i < dataLen; i++) { - buildString.append(Utility::formatHexNum(msg.data[i]) + " "); + buildString.append(Utility::formatHexNum(data[i]) + " "); } } break; case UDS_SERVICES::ROUTINE_CTRL + 0x40: buildString.append("Routine Control: " + getLongDesc(UDS_ROUTINE_SUB, msg.subFunc)); - if (msg.data.length() > 2) + if (dataLen > 2) { int routineID; - routineID = (msg.data[1] * 256 + msg.data[2]); + routineID = (data[1] * 256 + data[2]); buildString.append("\nRoutine ID: " + Utility::formatHexNum(routineID)); } - if (msg.data.length() > 3) + if (dataLen > 3) { buildString.append("\nBytes returned by routine: "); - for (int i = 4; i < msg.data.length(); i++) + for (int i = 4; i < dataLen; i++) { - buildString.append(Utility::formatHexNum(msg.data[i]) + " "); + buildString.append(Utility::formatHexNum(data[i]) + " "); } } break; diff --git a/bus_protocols/uds_handler.h b/bus_protocols/uds_handler.h index b17af69..5c5ea4f 100644 --- a/bus_protocols/uds_handler.h +++ b/bus_protocols/uds_handler.h @@ -65,7 +65,7 @@ namespace UDS_SERVICES struct CODE_STRUCT { - unsigned int code; + int code; QString shortDesc; QString longDesc; }; @@ -73,9 +73,9 @@ struct CODE_STRUCT class UDS_MESSAGE: public ISOTP_MESSAGE { public: - unsigned int service; - unsigned int subFunc; - unsigned int subFuncLen; + int service; + int subFunc; + int subFuncLen; bool isErrorReply; UDS_MESSAGE(); diff --git a/can_structs.h b/can_structs.h index df976f5..6b8cdee 100644 --- a/can_structs.h +++ b/can_structs.h @@ -4,35 +4,32 @@ #include #include #include +#include -struct CANFrame +//Now inherits from the built-in CAN frame class from Qt. This should be more future proof and easier to integrate with other code + +struct CANFrame : public QCanBusFrame { public: - uint32_t ID; - uint32_t bus; - bool extended; - bool remote; + int bus; bool isReceived; //did we receive this or send it? - uint32_t len; - unsigned char data[8]; - uint64_t timestamp; uint64_t timedelta; uint32_t frameCount; //used in overwrite mode friend bool operator<(const CANFrame& l, const CANFrame& r) { - return l.timestamp < r.timestamp; + qint64 lStamp = l.timeStamp().seconds() * 1000000 + l.timeStamp().microSeconds(); + qint64 rStamp = r.timeStamp().seconds() * 1000000 + r.timeStamp().microSeconds(); + return lStamp < rStamp; } CANFrame() { - ID = 0; + setFrameId(0); bus = 0; - extended = false; - remote = false; + setExtendedFrameFormat(false); + setFrameType(QCanBusFrame::DataFrame); isReceived = true; - len = 0; - timestamp = 0; timedelta = 0; frameCount = 1; } diff --git a/canframemodel.cpp b/canframemodel.cpp index 79f557c..167f822 100644 --- a/canframemodel.cpp +++ b/canframemodel.cpp @@ -102,7 +102,7 @@ void CANFrameModel::setSysTimeMode(bool mode) } } -void CANFrameModel::setInterpetMode(bool mode) +void CANFrameModel::setInterpretMode(bool mode) { //if the state of interpretFrames changes then we need to reset the model //so that QT will refresh the view properly @@ -114,6 +114,11 @@ void CANFrameModel::setInterpetMode(bool mode) } } +bool CANFrameModel::getInterpretMode() +{ + return interpretFrames; +} + void CANFrameModel::setTimeFormat(QString format) { Utility::timeFormat = format; @@ -128,23 +133,23 @@ void CANFrameModel::normalizeTiming() { mutex.lock(); if (frames.count() == 0) return; - timeOffset = frames[0].timestamp; + timeOffset = frames[0].timeStamp().microSeconds(); //find the absolute lowest timestamp in the whole time. Needed because maybe timestamp was reset in the middle. for (int j = 0; j < frames.count(); j++) { - if (frames[j].timestamp < timeOffset) timeOffset = frames[j].timestamp; + if (frames[j].timeStamp().microSeconds() < timeOffset) timeOffset = frames[j].timeStamp().microSeconds(); } for (int i = 0; i < frames.count(); i++) { - frames[i].timestamp -= timeOffset; + frames[i].setTimeStamp(QCanBusFrame::TimeStamp(0, frames[i].timeStamp().microSeconds() - timeOffset)); } this->beginResetModel(); for (int i = 0; i < filteredFrames.count(); i++) { - filteredFrames[i].timestamp -= timeOffset; + filteredFrames[i].setTimeStamp(QCanBusFrame::TimeStamp(0, filteredFrames[i].timeStamp().microSeconds() - timeOffset)); } this->endResetModel(); @@ -190,29 +195,32 @@ uint64_t CANFrameModel::getCANFrameVal(int row, Column col) { case Column::TimeStamp: if (overwriteDups) return frame.timedelta; - return frame.timestamp; + return frame.timeStamp().microSeconds(); case Column::FrameId: - return frame.ID; + return frame.frameId(); case Column::Extended: - if (frame.extended) return 1; + if (frame.hasExtendedFrameFormat()) return 1; return 0; case Column::Remote: if (overwriteDups) return frame.frameCount; - if (frame.remote) return 1; + if (frame.frameType() == QCanBusFrame::RemoteRequestFrame) return 1; return 0; case Column::Direction: if (frame.isReceived) return 1; return 0; case Column::Bus: - return frame.bus; + return static_cast(frame.bus); case Column::Length: - return frame.len; + return static_cast(frame.payload().length()); case Column::ASCII: //sort both the same for now case Column::Data: - for (int i = 0; i < frame.len; i++) temp += ((uint64_t)frame.data[i] << (56 - (8 * i))); + for (int i = 0; i < frame.payload().length(); i++) temp += (static_cast(frame.payload()[i]) << (56 - (8 * i))); //qDebug() << temp; return temp; + case Column::NUM_COLUMN: + return 0; } + return 0; } void CANFrameModel::qSortCANFrameAsc(QVector *frames, Column column, int lowerBound, int upperBound) @@ -295,9 +303,6 @@ void CANFrameModel::recalcOverwrite() qDebug() << "recalcOverwrite called in model"; - int lastUnique = 0; - bool found; - mutex.lock(); beginResetModel(); @@ -306,7 +311,7 @@ void CANFrameModel::recalcOverwrite() uint64_t idAugmented; //id in lower 29 bits, bus number shifted up 29 bits foreach(CANFrame frame, frames) { - idAugmented = frame.ID; + idAugmented = frame.frameId(); idAugmented = idAugmented + (frame.bus << 29ull); if (!overWriteFrames.contains(idAugmented)) { @@ -316,7 +321,7 @@ void CANFrameModel::recalcOverwrite() } else { - frame.timedelta = frame.timestamp - overWriteFrames[idAugmented].timestamp; + frame.timedelta = frame.timeStamp().microSeconds() - overWriteFrames[idAugmented].timeStamp().microSeconds(); frame.frameCount = overWriteFrames[idAugmented].frameCount + 1; overWriteFrames[idAugmented] = frame; } @@ -330,7 +335,7 @@ void CANFrameModel::recalcOverwrite() for (int i = 0; i < frames.count(); i++) { - if (filters[frames[i].ID]) + if (filters[frames[i].frameId()]) { filteredFrames.append(frames[i]); } @@ -342,7 +347,6 @@ void CANFrameModel::recalcOverwrite() QVariant CANFrameModel::data(const QModelIndex &index, int role) const { - int dLen; QString tempString; CANFrame thisFrame; static bool rowFlip = false; @@ -356,12 +360,15 @@ QVariant CANFrameModel::data(const QModelIndex &index, int role) const thisFrame = filteredFrames.at(index.row()); + unsigned char *data = reinterpret_cast(thisFrame.payload().data()); + int dataLen = thisFrame.payload().count(); + if (role == Qt::BackgroundColorRole) { - if (dbcHandler != NULL && interpretFrames) + if (dbcHandler != nullptr && interpretFrames) { DBC_MESSAGE *msg = dbcHandler->findMessage(thisFrame); - if (msg != NULL) + if (msg != nullptr) { return msg->bgColor; } @@ -378,10 +385,10 @@ QVariant CANFrameModel::data(const QModelIndex &index, int role) const if (role == Qt::TextColorRole) { - if (dbcHandler != NULL && interpretFrames) + if (dbcHandler != nullptr && interpretFrames) { DBC_MESSAGE *msg = dbcHandler->findMessage(thisFrame); - if (msg != NULL) + if (msg != nullptr) { return msg->fgColor; } @@ -399,17 +406,17 @@ QVariant CANFrameModel::data(const QModelIndex &index, int role) const if (timeSeconds) return QString::number(thisFrame.timedelta / 1000000.0, 'f', 5); return QString::number(thisFrame.timedelta); } - else ts = Utility::formatTimestamp(thisFrame.timestamp); + else ts = Utility::formatTimestamp(thisFrame.timeStamp().microSeconds()); if (ts.type() == QVariant::Double) return QString::number(ts.toDouble(), 'f', 5); //never scientific notation, 5 decimal places if (ts.type() == QVariant::LongLong) return QString::number(ts.toLongLong()); //never scientific notion, all digits shown if (ts.type() == QVariant::DateTime) return ts.toDateTime().toString(timeFormat); //custom set format for dates and times - return Utility::formatTimestamp(thisFrame.timestamp); + return Utility::formatTimestamp(thisFrame.timeStamp().microSeconds()); case Column::FrameId: - return Utility::formatCANID(thisFrame.ID, thisFrame.extended); + return Utility::formatCANID(thisFrame.frameId(), thisFrame.hasExtendedFrameFormat()); case Column::Extended: - return QString::number(thisFrame.extended); + return QString::number(thisFrame.hasExtendedFrameFormat()); case Column::Remote: - if (!overwriteDups) return QString::number(thisFrame.remote); + if (!overwriteDups) return QString::number(thisFrame.frameType() == QCanBusFrame::RemoteRequestFrame); return QString::number(thisFrame.frameCount); case Column::Direction: if (thisFrame.isReceived) return QString(tr("Rx")); @@ -417,47 +424,44 @@ QVariant CANFrameModel::data(const QModelIndex &index, int role) const case Column::Bus: return QString::number(thisFrame.bus); case Column::Length: - return QString::number(thisFrame.len); + return QString::number(dataLen); case Column::ASCII: - if (thisFrame.ID >= 0x7FFFFFF0ull) + if (thisFrame.frameId() >= 0x7FFFFFF0ull) { tempString.append("MARK "); - tempString.append(QString::number(thisFrame.ID & 0x7)); + tempString.append(QString::number(thisFrame.frameId() & 0x7)); return tempString; } - dLen = thisFrame.len; - if (!thisFrame.remote) { - if (dLen < 0) dLen = 0; - if (dLen > 8) dLen = 8; - for (int i = 0; i < dLen; i++) + if (thisFrame.frameType() != QCanBusFrame::RemoteRequestFrame) { + if (dataLen < 0) dataLen = 0; + //if (dLen > 8) dLen = 8; + for (int i = 0; i < dataLen; i++) { - quint8 byt = thisFrame.data[i]; + char byt = thisFrame.payload()[i]; //0x20 through 0x7E are printable characters. Outside of that range they aren't. So use dots instead if (byt < 0x20) byt = 0x2E; //dot character if (byt > 0x7E) byt = 0x2E; - tempString.append(QString::fromUtf8((char *)&byt, 1)); + tempString.append(QString::fromUtf8(&byt, 1)); } } return tempString; case Column::Data: - dLen = thisFrame.len; - if (dLen < 0) dLen = 0; - if (dLen > 8) dLen = 8; + if (dataLen < 0) dataLen = 0; //if (useHexMode) tempString.append("0x "); - if (thisFrame.remote) { + if (thisFrame.frameType() == QCanBusFrame::RemoteRequestFrame) { return tempString; } - for (int i = 0; i < dLen; i++) + for (int i = 0; i < dataLen; i++) { - if (useHexMode) tempString.append( QString::number(thisFrame.data[i], 16).toUpper().rightJustified(2, '0')); - else tempString.append(QString::number(thisFrame.data[i], 10)); + if (useHexMode) tempString.append( QString::number(data[i], 16).toUpper().rightJustified(2, '0')); + else tempString.append(QString::number(data[i], 10)); tempString.append(" "); } //now, if we're supposed to interpret the data and the DBC handler is loaded then use it - if (dbcHandler != NULL && interpretFrames) + if (dbcHandler != nullptr && interpretFrames) { DBC_MESSAGE *msg = dbcHandler->findMessage(thisFrame); - if (msg != NULL) + if (msg != nullptr) { tempString.append(" \n"); tempString.append(msg->name + "\n" + msg->comment + "\n"); @@ -547,25 +551,25 @@ void CANFrameModel::addFrame(const CANFrame& frame, bool autoRefresh = false) mutex.lock(); CANFrame tempFrame; tempFrame = frame; - tempFrame.timestamp -= timeOffset; + tempFrame.setTimeStamp(QCanBusFrame::TimeStamp(0, tempFrame.timeStamp().microSeconds() - timeOffset)); lastUpdateNumFrames++; //if this ID isn't found in the filters list then add it and show it by default - if (!filters.contains(tempFrame.ID)) + if (!filters.contains(tempFrame.frameId())) { // if there are any filters already configured, leave the new filter disabled if (any_filters_are_configured()) - filters.insert(tempFrame.ID, false); + filters.insert(tempFrame.frameId(), false); else - filters.insert(tempFrame.ID, true); + filters.insert(tempFrame.frameId(), true); needFilterRefresh = true; } if (!overwriteDups) { frames.append(tempFrame); - if (filters[tempFrame.ID]) + if (filters[tempFrame.frameId()]) { if (autoRefresh) beginInsertRows(QModelIndex(), filteredFrames.count(), filteredFrames.count()); tempFrame.frameCount = 1; @@ -578,10 +582,10 @@ void CANFrameModel::addFrame(const CANFrame& frame, bool autoRefresh = false) bool found = false; for (int i = 0; i < frames.count(); i++) { - if ( (frames[i].ID == tempFrame.ID) && (frames[i].bus == tempFrame.bus) ) + if ( (frames[i].frameId() == tempFrame.frameId()) && (frames[i].bus == tempFrame.bus) ) { tempFrame.frameCount = frames[i].frameCount + 1; - tempFrame.timedelta = tempFrame.timestamp - frames[i].timestamp; + tempFrame.timedelta = tempFrame.timeStamp().microSeconds() - frames[i].timeStamp().microSeconds(); frames.replace(i, tempFrame); found = true; break; @@ -590,7 +594,7 @@ void CANFrameModel::addFrame(const CANFrame& frame, bool autoRefresh = false) if (!found) { frames.append(tempFrame); - if (filters[tempFrame.ID]) + if (filters[tempFrame.frameId()]) { if (autoRefresh) beginInsertRows(QModelIndex(), filteredFrames.count(), filteredFrames.count()); tempFrame.frameCount = 1; @@ -603,7 +607,7 @@ void CANFrameModel::addFrame(const CANFrame& frame, bool autoRefresh = false) { for (int j = 0; j < filteredFrames.count(); j++) { - if ( (filteredFrames[j].ID == tempFrame.ID) && (filteredFrames[j].bus == tempFrame.bus) ) + if ( (filteredFrames[j].frameId() == tempFrame.frameId()) && (filteredFrames[j].bus == tempFrame.bus) ) { if (autoRefresh) beginResetModel(); filteredFrames.replace(j, tempFrame); @@ -637,7 +641,7 @@ void CANFrameModel::sendRefresh() int count = frames.count(); for (int i = 0; i < count; i++) { - if (filters[frames[i].ID]) + if (filters[frames[i].frameId()]) { tempContainer.append(frames[i]); } @@ -713,12 +717,12 @@ void CANFrameModel::insertFrames(const QVector &newFrames) for (int i = 0; i < newFrames.count(); i++) { frames.append(newFrames[i]); - if (!filters.contains(newFrames[i].ID)) + if (!filters.contains(newFrames[i].frameId())) { - filters.insert(newFrames[i].ID, true); + filters.insert(newFrames[i].frameId(), true); needFilterRefresh = true; } - if (filters[newFrames[i].ID]) + if (filters[newFrames[i].frameId()]) { insertedFiltered++; filteredFrames.append(newFrames[i]); @@ -735,12 +739,12 @@ void CANFrameModel::insertFrames(const QVector &newFrames) int CANFrameModel::getIndexFromTimeID(unsigned int ID, double timestamp) { int bestIndex = -1; - uint64_t intTimeStamp = timestamp * 1000000l; + int64_t intTimeStamp = static_cast (timestamp * 1000000l); for (int i = 0; i < frames.count(); i++) { - if ((frames[i].ID == ID)) + if ((frames[i].frameId() == ID)) { - if (frames[i].timestamp <= intTimeStamp) bestIndex = i; + if (frames[i].timeStamp().microSeconds() <= intTimeStamp) bestIndex = i; else break; //drop out of loop as soon as we pass the proper timestamp } } @@ -763,7 +767,7 @@ void CANFrameModel::loadFilterFile(QString filename) if (line.length() > 2) { QList tokens = line.split(','); - ID = tokens[0].toInt(NULL, 16); + ID = tokens[0].toInt(nullptr, 16); if (tokens[1].toUpper() == "T") filters.insert(ID, true); else filters.insert(ID, false); } diff --git a/canframemodel.h b/canframemodel.h index 011bf8f..51762a1 100644 --- a/canframemodel.h +++ b/canframemodel.h @@ -42,7 +42,8 @@ public: void sendRefresh(int); int sendBulkRefresh(); void clearFrames(); - void setInterpetMode(bool); + void setInterpretMode(bool); + bool getInterpretMode(); void setOverwriteMode(bool); void setHexMode(bool); void setSysTimeMode(bool); @@ -87,7 +88,7 @@ private: bool timeSeconds; bool useSystemTime; bool needFilterRefresh; - uint64_t timeOffset; + int64_t timeOffset; int lastUpdateNumFrames; uint32_t preallocSize; bool sortDirAsc; diff --git a/connections/canconfactory.cpp b/connections/canconfactory.cpp index d40dd98..d506524 100644 --- a/connections/canconfactory.cpp +++ b/connections/canconfactory.cpp @@ -17,5 +17,5 @@ CANConnection* CanConFactory::create(type pType, QString pPortName, QString pDri default: {} } - return NULL; + return nullptr; } diff --git a/connections/canconmanager.cpp b/connections/canconmanager.cpp index 6e5020d..9ae1f11 100644 --- a/connections/canconmanager.cpp +++ b/connections/canconmanager.cpp @@ -4,7 +4,7 @@ #include "canconmanager.h" #include "canconfactory.h" -CANConManager* CANConManager::mInstance = NULL; +CANConManager* CANConManager::mInstance = nullptr; CANConManager* CANConManager::getInstance() { @@ -43,7 +43,7 @@ void CANConManager::resetTimeBasis() CANConManager::~CANConManager() { mTimer.stop(); - mInstance = NULL; + mInstance = nullptr; } void CANConManager::stopAllConnections() @@ -142,7 +142,7 @@ CANConnection* CANConManager::getByName(const QString& pName) const return conn_p; } - return NULL; + return nullptr; } @@ -159,9 +159,9 @@ void CANConManager::refreshConnection(CANConnection* pConn_p) emit connectionStatusUpdated(buses); } - if (pConn_p->getQueue().peek() == NULL) return; + if (pConn_p->getQueue().peek() == nullptr) return; - CANFrame* frame_p = NULL; + CANFrame* frame_p = nullptr; QVector frames; //Each connection only knows about its own bus numbers @@ -220,11 +220,11 @@ bool CANConManager::sendFrame(const CANFrame& pFrame) workingFrame.isReceived = false; if (useSystemTime) { - workingFrame.timestamp = (QDateTime::currentMSecsSinceEpoch() * 1000); + workingFrame.setTimeStamp(QCanBusFrame::TimeStamp(0,QDateTime::currentMSecsSinceEpoch() * 1000)); } else { - workingFrame.timestamp = mElapsedTimer.nsecsElapsed() / 1000; + workingFrame.setTimeStamp(QCanBusFrame::TimeStamp(0, mElapsedTimer.nsecsElapsed() / 1000)); //workingFrame.timestamp -= mTimestampBasis; } txFrame = conn->getQueue().get(); @@ -253,13 +253,13 @@ bool CANConManager::sendFrames(const QList& pFrames) //the bus numbers if bus wasn't -1 so that they're local to the device bool CANConManager::addTargettedFrame(int pBusId, uint32_t ID, uint32_t mask, QObject *receiver) { - int tempBusVal; + //int tempBusVal; int busBase = 0; foreach (CANConnection* conn, mConns) { if (pBusId == -1) conn->addTargettedFrame(pBusId, ID, mask, receiver); - else if (pBusId < (uint32_t)(busBase + conn->getNumBuses())) + else if (pBusId < (busBase + conn->getNumBuses())) { qDebug() << "Forwarding targetted frame setting to a connection object"; conn->addTargettedFrame(pBusId - busBase, ID, mask, receiver); @@ -272,13 +272,13 @@ bool CANConManager::addTargettedFrame(int pBusId, uint32_t ID, uint32_t mask, QO bool CANConManager::removeTargettedFrame(int pBusId, uint32_t ID, uint32_t mask, QObject *receiver) { - int tempBusVal; + //int tempBusVal; int busBase = 0; foreach (CANConnection* conn, mConns) { if (pBusId == -1) conn->removeTargettedFrame(pBusId, ID, mask, receiver); - else if (pBusId < (uint32_t)(busBase + conn->getNumBuses())) + else if (pBusId < (busBase + conn->getNumBuses())) { qDebug() << "Forwarding targetted frame setting to a connection object"; conn->removeTargettedFrame(pBusId - busBase, ID, mask, receiver); diff --git a/connections/canconnection.cpp b/connections/canconnection.cpp index 6a41758..27850ff 100644 --- a/connections/canconnection.cpp +++ b/connections/canconnection.cpp @@ -16,7 +16,7 @@ CANConnection::CANConnection(QString pPort, mIsCapSuspended(false), mStatus(CANCon::NOT_CONNECTED), mStarted(false), - mThread_p(NULL) + mThread_p(nullptr) { /* register types */ qRegisterMetaType("CANBus"); @@ -48,7 +48,7 @@ CANConnection::~CANConnection() mThread_p->quit(); mThread_p->wait(); delete mThread_p; - mThread_p = NULL; + mThread_p = nullptr; } mBusData.clear(); @@ -343,7 +343,7 @@ void CANConnection::checkTargettedFrame(CANFrame &frame) foreach (const CANFltObserver filt, mBusData[frame.bus].mTargettedFrames) { //qDebug() << "Checking filter with id " << filt.id << " mask " << filt.mask; - maskedID = frame.ID & filt.mask; + maskedID = frame.frameId() & filt.mask; if (maskedID == filt.id) { qDebug() << "In connection object I got a targetted frame. Forwarding it."; QMetaObject::invokeMethod(filt.observer, "gotTargettedFrame",Qt::QueuedConnection, Q_ARG(CANFrame, frame)); diff --git a/connections/canconnectionmodel.cpp b/connections/canconnectionmodel.cpp index 6c68564..35a0c1e 100644 --- a/connections/canconnectionmodel.cpp +++ b/connections/canconnectionmodel.cpp @@ -70,10 +70,10 @@ QVariant CANConnectionModel::data(const QModelIndex &index, int role) const //qDebug() << "Row: " << index.row(); CANConnection *conn_p = getAtIdx(index.row()); - bool ret; + if (!conn_p) return QVariant(); - bool isSocketCAN = (conn_p->getType() == CANCon::SERIALBUS) ? true: false; + //bool isSocketCAN = (conn_p->getType() == CANCon::SERIALBUS) ? true: false; if (role == Qt::DisplayRole) { @@ -87,11 +87,11 @@ QVariant CANConnectionModel::data(const QModelIndex &index, int role) const case CANCon::GVRET_SERIAL: return "GVRET"; default: {} } - else qDebug() << "Tried to show connection type but connection was NULL"; + else qDebug() << "Tried to show connection type but connection was nullptr"; break; case Column::Port: if (conn_p) return conn_p->getPort(); - else qDebug() << "Tried to show connection port but connection was NULL"; + else qDebug() << "Tried to show connection port but connection was nullptr"; break; case Column::Subtype: return conn_p->getDriver(); @@ -138,7 +138,7 @@ void CANConnectionModel::replace(int idx , CANConnection* pConn_p) CANConnection* CANConnectionModel::getAtIdx(int pIdx) const { if (pIdx < 0) - return NULL; + return nullptr; QList& conns = CANConManager::getInstance()->getConnections(); @@ -147,6 +147,8 @@ CANConnection* CANConnectionModel::getAtIdx(int pIdx) const void CANConnectionModel::refresh(int pIndex) { + Q_UNUSED(pIndex) + beginResetModel(); endResetModel(); /* diff --git a/connections/connectionwindow.cpp b/connections/connectionwindow.cpp index 56dff96..3a5fabf 100644 --- a/connections/connectionwindow.cpp +++ b/connections/connectionwindow.cpp @@ -312,8 +312,8 @@ void ConnectionWindow::populateBusDetails(int offset) } else { - bool ret; - int numBuses; + //bool ret; + //int numBuses; CANConnection* conn_p = connModel->getAtIdx(selIdx); CANBus bus; @@ -365,7 +365,7 @@ void ConnectionWindow::currentRowChanged(const QModelIndex ¤t, const QMode } else { - bool ret; + //bool ret; ui->groupBus->setEnabled(true); int numBuses; diff --git a/connections/gvretserial.cpp b/connections/gvretserial.cpp index 0d42518..d84a875 100644 --- a/connections/gvretserial.cpp +++ b/connections/gvretserial.cpp @@ -15,9 +15,9 @@ GVRetSerial::GVRetSerial(QString portName, bool useTcp) : { sendDebug("GVRetSerial()"); - serial = NULL; - tcpClient = NULL; - udpClient = NULL; + serial = nullptr; + tcpClient = nullptr; + udpClient = nullptr; rx_state = IDLE; rx_step = 0; validationCounter = 10; //how many times we can miss validation before we die @@ -46,7 +46,7 @@ void GVRetSerial::sendDebug(const QString debugText) void GVRetSerial::sendToSerial(const QByteArray &bytes) { - if (serial == NULL && tcpClient == NULL && udpClient == NULL) + if (serial == nullptr && tcpClient == nullptr && udpClient == nullptr) { sendDebug("Attempt to write to serial port when it has not been initialized!"); return; @@ -192,14 +192,14 @@ void GVRetSerial::piSetBusSettings(int pBusIdx, CANBus bus) sendDebug("Got signal to update bauds. 1: " + QString::number((can0Baud & 0xFFFFFFF)) + " 2: " + QString::number((can1Baud & 0xFFFFFFF))); buffer[0] = (char)0xF1; //start of a command over serial buffer[1] = 5; //setup canbus - buffer[2] = (unsigned char)(can0Baud & 0xFF); //four bytes of ID LSB first - buffer[3] = (unsigned char)(can0Baud >> 8); - buffer[4] = (unsigned char)(can0Baud >> 16); - buffer[5] = (unsigned char)(can0Baud >> 24); - buffer[6] = (unsigned char)(can1Baud & 0xFF); //four bytes of ID LSB first - buffer[7] = (unsigned char)(can1Baud >> 8); - buffer[8] = (unsigned char)(can1Baud >> 16); - buffer[9] = (unsigned char)(can1Baud >> 24); + buffer[2] = (char)(can0Baud & 0xFF); //four bytes of ID LSB first + buffer[3] = (char)(can0Baud >> 8); + buffer[4] = (char)(can0Baud >> 16); + buffer[5] = (char)(can0Baud >> 24); + buffer[6] = (char)(can1Baud & 0xFF); //four bytes of ID LSB first + buffer[7] = (char)(can1Baud >> 8); + buffer[8] = (char)(can1Baud >> 16); + buffer[9] = (char)(can1Baud >> 24); buffer[10] = 0; sendToSerial(buffer); } @@ -210,18 +210,18 @@ void GVRetSerial::piSetBusSettings(int pBusIdx, CANBus bus) sendDebug("Got signal to update extended bus speeds SWCAN: " + QString::number(swcanBaud) + " LIN1: " + QString::number(lin1Baud) + " LIN2: " + QString::number(lin2Baud)); buffer[0] = (char)0xF1; //start of a command over serial buffer[1] = 14; //setup extended buses - buffer[2] = (unsigned char)(swcanBaud & 0xFF); //four bytes of ID LSB first - buffer[3] = (unsigned char)(swcanBaud >> 8); - buffer[4] = (unsigned char)(swcanBaud >> 16); - buffer[5] = (unsigned char)(swcanBaud >> 24); - buffer[6] = (unsigned char)(lin1Baud & 0xFF); //four bytes of ID LSB first - buffer[7] = (unsigned char)(lin1Baud >> 8); - buffer[8] = (unsigned char)(lin1Baud >> 16); - buffer[9] = (unsigned char)(lin1Baud >> 24); - buffer[10] = (unsigned char)(lin2Baud & 0xFF); //four bytes of ID LSB first - buffer[11] = (unsigned char)(lin2Baud >> 8); - buffer[12] = (unsigned char)(lin2Baud >> 16); - buffer[13] = (unsigned char)(lin2Baud >> 24); + buffer[2] = (char)(swcanBaud & 0xFF); //four bytes of ID LSB first + buffer[3] = (char)(swcanBaud >> 8); + buffer[4] = (char)(swcanBaud >> 16); + buffer[5] = (char)(swcanBaud >> 24); + buffer[6] = (char)(lin1Baud & 0xFF); //four bytes of ID LSB first + buffer[7] = (char)(lin1Baud >> 8); + buffer[8] = (char)(lin1Baud >> 16); + buffer[9] = (char)(lin1Baud >> 24); + buffer[10] = (char)(lin2Baud & 0xFF); //four bytes of ID LSB first + buffer[11] = (char)(lin2Baud >> 8); + buffer[12] = (char)(lin2Baud >> 16); + buffer[13] = (char)(lin2Baud >> 24); buffer[14] = 0; sendToSerial(buffer); } @@ -231,14 +231,14 @@ void GVRetSerial::piSetBusSettings(int pBusIdx, CANBus bus) bool GVRetSerial::piSendFrame(const CANFrame& frame) { QByteArray buffer; - unsigned int c; - int ID; + int c; + quint32 ID; //qDebug() << "Sending out GVRET frame with id " << frame.ID << " on bus " << frame.bus; framesRapid++; - if (serial == NULL && tcpClient == NULL && udpClient == NULL) return false; + if (serial == nullptr && tcpClient == nullptr && udpClient == nullptr) return false; if (serial && !serial->isOpen()) return false; if (tcpClient && !tcpClient->isOpen()) return false; if (udpClient && !udpClient->isOpen()) return false; @@ -246,25 +246,25 @@ bool GVRetSerial::piSendFrame(const CANFrame& frame) // Doesn't make sense to send an error frame // to an adapter - if (frame.ID & 0x20000000) { + if (frame.frameId() & 0x20000000) { return true; } - ID = frame.ID; - if (frame.extended) ID |= 1 << 31; + ID = frame.frameId(); + if (frame.hasExtendedFrameFormat()) ID |= 1u << 31; - buffer[0] = (unsigned char)0xF1; //start of a command over serial + buffer[0] = (char)0xF1; //start of a command over serial buffer[1] = 0; //command ID for sending a CANBUS frame - buffer[2] = (unsigned char)(ID & 0xFF); //four bytes of ID LSB first - buffer[3] = (unsigned char)(ID >> 8); - buffer[4] = (unsigned char)(ID >> 16); - buffer[5] = (unsigned char)(ID >> 24); - buffer[6] = (unsigned char)((frame.bus) & 3); - buffer[7] = (unsigned char)frame.len; - for (c = 0; c < frame.len; c++) + buffer[2] = (char)(ID & 0xFF); //four bytes of ID LSB first + buffer[3] = (char)(ID >> 8); + buffer[4] = (char)(ID >> 16); + buffer[5] = (char)(ID >> 24); + buffer[6] = (char)((frame.bus) & 3); + buffer[7] = (char)frame.payload().length(); + for (c = 0; c < frame.payload().length(); c++) { - buffer[8 + c] = frame.data[c]; + buffer[8 + c] = frame.payload()[c]; } - buffer[8 + frame.len] = 0; + buffer[8 + frame.payload().length()] = 0; sendToSerial(buffer); @@ -375,18 +375,18 @@ void GVRetSerial::deviceConnected() { sendDebug("Connecting to GVRET Device!"); QByteArray output; - output.append((unsigned char)0xE7); //this puts the device into binary comm mode - output.append((unsigned char)0xE7); + output.append((char)0xE7); //this puts the device into binary comm mode + output.append((char)0xE7); - output.append((unsigned char)0xF1); - output.append((unsigned char)0x0C); //get number of actually implemented buses. Not implemented except on M2RET + output.append((char)0xF1); + output.append((char)0x0C); //get number of actually implemented buses. Not implemented except on M2RET mNumBuses = 2; //the proper number if C/12 is not implemented - output.append((unsigned char)0xF1); //signal we want to issue a command - output.append((unsigned char)0x06); //request canbus stats from the board + output.append((char)0xF1); //signal we want to issue a command + output.append((char)0x06); //request canbus stats from the board - output.append((unsigned char)0xF1); //another command to the GVRET - output.append((unsigned char)0x07); //request device information + output.append((char)0xF1); //another command to the GVRET + output.append((char)0x07); //request device information /*output.append((char)0xF1); output.append((char)0x08); //setting singlewire mode @@ -399,11 +399,11 @@ void GVRetSerial::deviceConnected() output.append((char)0xFF); //signal we don't want single wire mode }*/ - output.append((unsigned char)0xF1); //and another command - output.append((unsigned char)0x01); //Time Sync - Not implemented until 333 but we can try + output.append((char)0xF1); //and another command + output.append((char)0x01); //Time Sync - Not implemented until 333 but we can try - output.append((unsigned char)0xF1); //yet another command - output.append((unsigned char)0x09); //comm validation command + output.append((char)0xF1); //yet another command + output.append((char)0x09); //comm validation command continuousTimeSync = true; @@ -422,7 +422,7 @@ void GVRetSerial::deviceConnected() } void GVRetSerial::disconnectDevice() { - if (serial != NULL) + if (serial != nullptr) { if (serial->isOpen()) { @@ -432,9 +432,9 @@ void GVRetSerial::disconnectDevice() { } serial->disconnect(); //disconnect all signals delete serial; - serial = NULL; + serial = nullptr; } - if (tcpClient != NULL) + if (tcpClient != nullptr) { if (tcpClient->isOpen()) { @@ -442,9 +442,9 @@ void GVRetSerial::disconnectDevice() { } tcpClient->disconnect(); delete tcpClient; - tcpClient = NULL; + tcpClient = nullptr; } - if (udpClient != NULL) + if (udpClient != nullptr) { if (udpClient->isOpen()) { @@ -452,7 +452,7 @@ void GVRetSerial::disconnectDevice() { } udpClient->disconnect(); delete udpClient; - udpClient = NULL; + udpClient = nullptr; } setStatus(CANCon::NOT_CONNECTED); @@ -659,57 +659,59 @@ void GVRetSerial::procRXChar(unsigned char c) switch (rx_step) { case 0: - buildFrame.timestamp = c; + buildTimestamp = c; break; case 1: - buildFrame.timestamp |= (uint)(c << 8); + buildTimestamp |= (uint)(c << 8); break; case 2: - buildFrame.timestamp |= (uint)c << 16; + buildTimestamp |= (uint)c << 16; break; case 3: - buildFrame.timestamp |= (uint)c << 24; + buildTimestamp |= (uint)c << 24; - buildFrame.timestamp += timeBasis; + buildTimestamp += timeBasis; if (useSystemTime) { - buildFrame.timestamp = QDateTime::currentMSecsSinceEpoch() * 1000l; + buildTimestamp = QDateTime::currentMSecsSinceEpoch() * 1000l; } + buildFrame.setTimeStamp(QCanBusFrame::TimeStamp(0, buildTimestamp)); break; case 4: - buildFrame.ID = c; + buildId = c; break; case 5: - buildFrame.ID |= c << 8; + buildId |= c << 8; break; case 6: - buildFrame.ID |= c << 16; + buildId |= c << 16; break; case 7: - buildFrame.ID |= c << 24; - if ((buildFrame.ID & 1 << 31) == 1u << 31) + buildId |= c << 24; + if ((buildId & 1 << 31) == 1u << 31) { - buildFrame.ID &= 0x7FFFFFFF; - buildFrame.extended = true; + buildId &= 0x7FFFFFFF; + buildFrame.setExtendedFrameFormat(true); } - else buildFrame.extended = false; + else buildFrame.setExtendedFrameFormat(false); + buildFrame.setFrameId(buildId); break; case 8: - buildFrame.len = c & 0xF; - if (buildFrame.len > 8) buildFrame.len = 8; + buildData.resize(c & 0xF); buildFrame.bus = (c & 0xF0) >> 4; break; default: - if (rx_step < buildFrame.len + 9) + if (rx_step < buildData.length() + 9) { - buildFrame.data[rx_step - 9] = c; + buildData[rx_step - 9] = c; } else { rx_state = IDLE; rx_step = 0; buildFrame.isReceived = true; - + buildFrame.setPayload(buildData); + buildFrame.setFrameType(QCanBusFrame::FrameType::DataFrame); if (!isCapSuspended()) { /* get frame from queue */ @@ -717,8 +719,7 @@ void GVRetSerial::procRXChar(unsigned char c) if(frame_p) { //qDebug() << "GVRET got frame on bus " << frame_p->bus; /* copy frame */ - *frame_p = buildFrame; - frame_p->remote = false; + *frame_p = buildFrame; checkTargettedFrame(buildFrame); /* enqueue frame */ getQueue().queue(); @@ -941,6 +942,7 @@ void GVRetSerial::procRXChar(unsigned char c) break; case 9: lin1Baud |= c << 24; + break; case 10: lin2Enabled = (c & 0xF); break; @@ -1004,7 +1006,7 @@ void GVRetSerial::handleTick() //qDebug() << validationCounter; if (validationCounter == 0 && doValidation) { - if (serial == NULL && tcpClient == NULL) return; + if (serial == nullptr && tcpClient == nullptr) return; if ( (serial && serial->isOpen()) || (tcpClient && tcpClient->isOpen()) || (udpClient && udpClient->isOpen())) //if it's still false we have a problem... { sendDebug("Comm validation failed."); @@ -1018,7 +1020,10 @@ void GVRetSerial::handleTick() return; } } - else if (doValidation); //qDebug() << "Comm connection validated"; + else if (doValidation) + { + //qDebug() << "Comm connection validated"; + } } if (doValidation && serial && serial->isOpen()) sendCommValidation(); if (doValidation && tcpClient && tcpClient->isOpen()) sendCommValidation(); diff --git a/connections/gvretserial.h b/connections/gvretserial.h index dba664f..3df1350 100644 --- a/connections/gvretserial.h +++ b/connections/gvretserial.h @@ -93,6 +93,9 @@ protected: STATE rx_state; uint32_t rx_step; CANFrame buildFrame; + qint64 buildTimestamp; + quint32 buildId; + QByteArray buildData; int can0Baud, can1Baud, swcanBaud, lin1Baud, lin2Baud; bool can0Enabled, can1Enabled, swcanEnabled, lin1Enabled, lin2Enabled; bool can0ListenOnly, can1ListenOnly, swcanListenOnly; diff --git a/connections/serialbusconnection.cpp b/connections/serialbusconnection.cpp index 03891ff..72e1e90 100644 --- a/connections/serialbusconnection.cpp +++ b/connections/serialbusconnection.cpp @@ -77,7 +77,7 @@ bool SerialBusConnection::piGetBusSettings(int pBusIdx, CANBus& pBus) void SerialBusConnection::piSetBusSettings(int pBusIdx, CANBus bus) { - CANConStatus stats; + //CANConStatus stats; /* sanity checks */ if(0 != pBusIdx) return; @@ -115,22 +115,11 @@ void SerialBusConnection::piSetBusSettings(int pBusIdx, CANBus bus) bool SerialBusConnection::piSendFrame(const CANFrame& pFrame) { /* sanity checks */ - if(0 != pFrame.bus || pFrame.len>8) + if(0 != pFrame.bus /*|| pFrame.len>8*/) return false; if (!mDev_p) return false; - /* fill frame */ - QCanBusFrame frame; - frame.setExtendedFrameFormat(pFrame.extended); - frame.setFrameId(pFrame.ID); - if (pFrame.remote) { - frame.setFrameType(QCanBusFrame::FrameType::RemoteRequestFrame); - } else { - frame.setFrameType(QCanBusFrame::FrameType::DataFrame); - } - frame.setPayload(QByteArray(reinterpret_cast(pFrame.data), - static_cast(pFrame.len))); - return mDev_p->writeFrame(frame); + return mDev_p->writeFrame(pFrame); } @@ -193,14 +182,16 @@ void SerialBusConnection::framesReceived() if (recFrame.payload().length() <= 8) { CANFrame* frame_p = getQueue().get(); if(frame_p) { - frame_p->len = static_cast(recFrame.payload().length()); - frame_p->bus = 0; + frame_p->setPayload(recFrame.payload()); + frame_p->bus = 0; if (recFrame.frameType() == QCanBusFrame::ErrorFrame) { // Constants defined in include/uapi/linux/can/error.h + //since the whole program uses QCanBusFrame now we can just grab errors directly out of the proper place from now on + /* switch (recFrame.error()) { case QCanBusFrame::TransmissionTimeoutError: - frame_p->ID = 0x20000001; + frame_p->setFrameId(0x20000001); break; case QCanBusFrame::LostArbitrationError: frame_p->ID = 0x20000002; @@ -230,19 +221,21 @@ void SerialBusConnection::framesReceived() break; } frame_p->extended = true; + */ } else { - frame_p->extended = recFrame.hasExtendedFrameFormat(); - frame_p->ID = recFrame.frameId(); - frame_p->remote = (recFrame.frameType() == recFrame.RemoteRequestFrame); - memcpy(frame_p->data, recFrame.payload().data(), frame_p->len); + frame_p->setExtendedFrameFormat(recFrame.hasExtendedFrameFormat()); + frame_p->setFrameId(recFrame.frameId()); + frame_p->setTimeStamp(recFrame.timeStamp()); + frame_p->setFrameType(recFrame.frameType()); + frame_p->setError(recFrame.error()); frame_p->isReceived = true; } frame_p->isReceived = true; if (useSystemTime) { - frame_p->timestamp = QDateTime::currentMSecsSinceEpoch() * 1000ul; + frame_p->setTimeStamp(QCanBusFrame::TimeStamp(0, QDateTime::currentMSecsSinceEpoch() * 1000ul)); } - else frame_p->timestamp = (recFrame.timeStamp().seconds() * 1000000ul + recFrame.timeStamp().microSeconds()) - timeBasis; + else frame_p->setTimeStamp(QCanBusFrame::TimeStamp(0, (recFrame.timeStamp().seconds() * 1000000ul + recFrame.timeStamp().microSeconds()) - timeBasis)); checkTargettedFrame(*frame_p); diff --git a/dbc/dbc_classes.cpp b/dbc/dbc_classes.cpp index f46b4b7..c0f11ac 100644 --- a/dbc/dbc_classes.cpp +++ b/dbc/dbc_classes.cpp @@ -47,7 +47,7 @@ bool DBC_SIGNAL::processAsText(const CANFrame &frame, QString &outString, bool o QString buildString; int startByte = startBit / 8; int bytes = signalSize / 8; - for (int x = 0; x < bytes; x++) buildString.append(frame.data[startByte + x]); + for (int x = 0; x < bytes; x++) buildString.append(frame.payload().data()[startByte + x]); outString = buildString; cachedValue = outString; return true; @@ -56,7 +56,7 @@ bool DBC_SIGNAL::processAsText(const CANFrame &frame, QString &outString, bool o //if this is a multiplexed signal then we have to see if it is even found in the current message if (isMultiplexed) { - if (parentMessage->multiplexorSignal != NULL) + if (parentMessage->multiplexorSignal != nullptr) { int val; if (!parentMessage->multiplexorSignal->processAsInt(frame, val)) return false; @@ -68,7 +68,7 @@ bool DBC_SIGNAL::processAsText(const CANFrame &frame, QString &outString, bool o if (valType == SIGNED_INT) isSigned = true; if (valType == SIGNED_INT || valType == UNSIGNED_INT) { - result = Utility::processIntegerSignal(frame.data, startBit, signalSize, intelByteOrder, isSigned); + result = Utility::processIntegerSignal(frame.payload(), startBit, signalSize, intelByteOrder, isSigned); endResult = ((double)result * factor) + bias; result = (int64_t)endResult; } @@ -79,19 +79,19 @@ bool DBC_SIGNAL::processAsText(const CANFrame &frame, QString &outString, bool o //that the bytes that make up the integer are instead treated as having made up //a 32 bit single precision float. That's evil incarnate but it is very fast and small //in terms of new code. - result = Utility::processIntegerSignal(frame.data, startBit, 32, false, false); + result = Utility::processIntegerSignal(frame.payload(), startBit, 32, intelByteOrder, false); endResult = (*((float *)(&result)) * factor) + bias; } else //double precision float { - if ( frame.len < 8 ) + if ( frame.payload().length() < 8 ) { result = 0; return false; } //like the above, this is rotten and evil and wrong in so many ways. Force //calculation of a 64 bit integer and then cast it into a double. - result = Utility::processIntegerSignal(frame.data, 0, 64, false, false); + result = Utility::processIntegerSignal(frame.payload(), 0, 64, intelByteOrder, false); endResult = (*((double *)(&result)) * factor) + bias; } @@ -145,7 +145,7 @@ bool DBC_SIGNAL::processAsInt(const CANFrame &frame, int32_t &outValue) //if this is a multiplexed signal then we have to see if it is even found in the current message if (isMultiplexed) { - if (parentMessage->multiplexorSignal != NULL) + if (parentMessage->multiplexorSignal != nullptr) { int val; if (!parentMessage->multiplexorSignal->processAsInt(frame, val)) return false; @@ -155,15 +155,16 @@ bool DBC_SIGNAL::processAsInt(const CANFrame &frame, int32_t &outValue) } if (valType == SIGNED_INT) isSigned = true; - if ( frame.len*8 < (startBit+signalSize) ) + if ( static_cast(frame.payload().length() * 8) < (startBit + signalSize) ) { result = 0; return false; } - result = Utility::processIntegerSignal(frame.data, startBit, signalSize, intelByteOrder, isSigned); - double endResult = ((double)result * factor) + bias; - result = (int32_t)endResult; + result = static_cast(Utility::processIntegerSignal(frame.payload(), startBit, signalSize, intelByteOrder, isSigned)); + + double endResult = (result * factor) + bias; + result = static_cast(endResult); cachedValue = result; outValue = result; return true; @@ -187,7 +188,7 @@ bool DBC_SIGNAL::processAsDouble(const CANFrame &frame, double &outValue) //if this is a multiplexed signal then we have to see if it is even found in the current message if (isMultiplexed) { - if (parentMessage->multiplexorSignal != NULL) + if (parentMessage->multiplexorSignal != nullptr) { int val; if (!parentMessage->multiplexorSignal->processAsInt(frame, val)) return false; @@ -199,19 +200,19 @@ bool DBC_SIGNAL::processAsDouble(const CANFrame &frame, double &outValue) if (valType == SIGNED_INT) isSigned = true; if (valType == SIGNED_INT || valType == UNSIGNED_INT) { - if ( frame.len*8 < (startBit+signalSize) ) + if ( frame.payload().length() * 8 < (startBit+signalSize) ) { result = 0; return false; } - result = Utility::processIntegerSignal(frame.data, startBit, signalSize, intelByteOrder, isSigned); + result = Utility::processIntegerSignal(frame.payload(), startBit, signalSize, intelByteOrder, isSigned); endResult = ((double)result * factor) + bias; result = (int64_t)endResult; } /*TODO: It should be noted that the below floating point has not even been tested. For shame! Test it!*/ else if (valType == SP_FLOAT) { - if ( frame.len*8 < (startBit+32) ) + if ( frame.payload().length() * 8 < (startBit + 32) ) { result = 0; return false; @@ -221,19 +222,19 @@ bool DBC_SIGNAL::processAsDouble(const CANFrame &frame, double &outValue) //that the bytes that make up the integer are instead treated as having made up //a 32 bit single precision float. That's evil incarnate but it is very fast and small //in terms of new code. - result = Utility::processIntegerSignal(frame.data, startBit, 32, false, false); + result = Utility::processIntegerSignal(frame.payload(), startBit, 32, false, false); endResult = (*((float *)(&result)) * factor) + bias; } else //double precision float { - if ( frame.len < 8 ) + if ( frame.payload().length() < 8 ) { result = 0; return false; } //like the above, this is rotten and evil and wrong in so many ways. Force //calculation of a 64 bit integer and then cast it into a double. - result = Utility::processIntegerSignal(frame.data, 0, 64, false, false); + result = Utility::processIntegerSignal(frame.payload(), 0, 64, false, false); endResult = (*((double *)(&result)) * factor) + bias; } cachedValue = endResult; @@ -243,7 +244,7 @@ bool DBC_SIGNAL::processAsDouble(const CANFrame &frame, double &outValue) DBC_ATTRIBUTE_VALUE *DBC_SIGNAL::findAttrValByName(QString name) { - if (attributes.length() == 0) return NULL; + if (attributes.length() == 0) return nullptr; for (int i = 0; i < attributes.length(); i++) { if (attributes[i].attrName.compare(name, Qt::CaseInsensitive) == 0) @@ -251,19 +252,19 @@ DBC_ATTRIBUTE_VALUE *DBC_SIGNAL::findAttrValByName(QString name) return &attributes[i]; } } - return NULL; + return nullptr; } DBC_ATTRIBUTE_VALUE *DBC_SIGNAL::findAttrValByIdx(int idx) { - if (idx < 0) return NULL; - if (idx >= attributes.count()) return NULL; + if (idx < 0) return nullptr; + if (idx >= attributes.count()) return nullptr; return &attributes[idx]; } DBC_ATTRIBUTE_VALUE *DBC_MESSAGE::findAttrValByName(QString name) { - if (attributes.length() == 0) return NULL; + if (attributes.length() == 0) return nullptr; for (int i = 0; i < attributes.length(); i++) { if (attributes[i].attrName.compare(name, Qt::CaseInsensitive) == 0) @@ -271,19 +272,19 @@ DBC_ATTRIBUTE_VALUE *DBC_MESSAGE::findAttrValByName(QString name) return &attributes[i]; } } - return NULL; + return nullptr; } DBC_ATTRIBUTE_VALUE *DBC_MESSAGE::findAttrValByIdx(int idx) { - if (idx < 0) return NULL; - if (idx >= attributes.count()) return NULL; + if (idx < 0) return nullptr; + if (idx >= attributes.count()) return nullptr; return &attributes[idx]; } DBC_ATTRIBUTE_VALUE *DBC_NODE::findAttrValByName(QString name) { - if (attributes.length() == 0) return NULL; + if (attributes.length() == 0) return nullptr; for (int i = 0; i < attributes.length(); i++) { if (attributes[i].attrName.compare(name, Qt::CaseInsensitive) == 0) @@ -291,12 +292,12 @@ DBC_ATTRIBUTE_VALUE *DBC_NODE::findAttrValByName(QString name) return &attributes[i]; } } - return NULL; + return nullptr; } DBC_ATTRIBUTE_VALUE *DBC_NODE::findAttrValByIdx(int idx) { - if (idx < 0) return NULL; - if (idx >= attributes.count()) return NULL; + if (idx < 0) return nullptr; + if (idx >= attributes.count()) return nullptr; return &attributes[idx]; } diff --git a/dbc/dbchandler.cpp b/dbc/dbchandler.cpp index d56d18b..b2bc9ef 100644 --- a/dbc/dbchandler.cpp +++ b/dbc/dbchandler.cpp @@ -90,7 +90,7 @@ DBC_MESSAGE* DBCMessageHandler::findMsgByID(uint32_t id) if (messages.count() == 0) return nullptr; for (int i = 0; i < messages.count(); i++) { - if (isJ1939Handler) + if (matchingCriteria == J1939) { // include data page and extended data page in the pgn uint32_t pgn = (id & 0x3FFFF00) >> 8; @@ -112,6 +112,13 @@ DBC_MESSAGE* DBCMessageHandler::findMsgByID(uint32_t id) } } } + else if (matchingCriteria == GMLAN) + { + // Match the bits 14-26 (Arbitration Id) of GMLAN 29bit header + uint32_t arbId = id &0x3FFE000; + if ( (arbId != 0) && (messages[i].ID & 0x3FFE000) == arbId ) + return &messages[i]; + } else { if ( messages[i].ID == id ) @@ -206,29 +213,41 @@ int DBCMessageHandler::getCount() return messages.count(); } -bool DBCMessageHandler::isJ1939() +bool DBCMessageHandler::filterLabeling() { - return isJ1939Handler; + return filterLabelingEnabled; } -void DBCMessageHandler::setJ1939(bool j1939) +void DBCMessageHandler::setFilterLabeling(bool filterLabeling) { - isJ1939Handler = j1939; + filterLabelingEnabled = filterLabeling; +} + +MatchingCriteria_t DBCMessageHandler::getMatchingCriteria() +{ + return matchingCriteria; +} + +void DBCMessageHandler::setMatchingCriteria(MatchingCriteria_t _matchingCriteria) +{ + matchingCriteria = _matchingCriteria; } DBCFile::DBCFile() { messageHandler = new DBCMessageHandler; - messageHandler->setJ1939(false); + messageHandler->setMatchingCriteria(EXACT); + messageHandler->setFilterLabeling(false); } -DBCFile::DBCFile(const DBCFile& cpy) +DBCFile::DBCFile(const DBCFile& cpy) : QObject() { messageHandler = new DBCMessageHandler; for (int i = 0 ; i < cpy.messageHandler->getCount() ; i++) messageHandler->addMessage(*cpy.messageHandler->findMsgByIdx(i)); - messageHandler->setJ1939(cpy.messageHandler->isJ1939()); + messageHandler->setMatchingCriteria(cpy.messageHandler->getMatchingCriteria()); + messageHandler->setFilterLabeling(cpy.messageHandler->filterLabeling()); fileName = cpy.fileName; filePath = cpy.filePath; assocBuses = cpy.assocBuses; @@ -296,9 +315,10 @@ int DBCFile::getAssocBus() void DBCFile::setAssocBus(int bus) { - int numBuses = CANConManager::getInstance()->getNumBuses(); if (bus < -1) return; - if (bus >= numBuses) return; + // To allow setting bus numbers even before connection is configured, do not enforce "valid" bus numbers + //int numBuses = CANConManager::getInstance()->getNumBuses(); + //if (bus >= numBuses) return; assocBuses = bus; } @@ -448,6 +468,14 @@ DBC_SIGNAL* DBCFile::parseSignalLine(QString line, DBC_MESSAGE *msg) case 4: sig.valType = STRING; break; + case 5: //single point float in little endian + sig.valType = SP_FLOAT; + sig.intelByteOrder = true; + break; + case 6: //double point float in little endian + sig.valType = DP_FLOAT; + sig.intelByteOrder = true; + break; } sig.factor = match.captured(6 + offset).toDouble(); sig.bias = match.captured(7 + offset).toDouble(); @@ -693,7 +721,8 @@ void DBCFile::loadFile(QString fileName) qDebug() << "Starting DBC load"; dbc_nodes.clear(); messageHandler->removeAllMessages(); - messageHandler->setJ1939(false); + messageHandler->setMatchingCriteria(EXACT); + messageHandler->setFilterLabeling(false); DBC_NODE falseNode; falseNode.name = "Vector__XXX"; @@ -887,14 +916,24 @@ void DBCFile::loadFile(QString fileName) fgAttr = findAttributeByName("GenMsgForegroundColor"); } - DBC_ATTRIBUTE *j1939attr = findAttributeByName("isj1939dbc"); - if (j1939attr) + DBC_ATTRIBUTE *mc_attr = findAttributeByName("matchingcriteria"); + if (mc_attr) { - messageHandler->setJ1939(j1939attr->defaultValue > 0); + messageHandler->setMatchingCriteria((MatchingCriteria_t)mc_attr->defaultValue.toInt()); } else { - messageHandler->setJ1939(false); + messageHandler->setMatchingCriteria(EXACT); + } + + DBC_ATTRIBUTE *fl_attr = findAttributeByName("filterlabeling"); + if (fl_attr) + { + messageHandler->setFilterLabeling(fl_attr->defaultValue.toInt()); + } + else + { + messageHandler->setFilterLabeling(false); } QColor DefaultBG = QColor(bgAttr->defaultValue.toString()); @@ -1202,10 +1241,12 @@ void DBCFile::saveFile(QString fileName) else msgOutput.append("0-"); break; case SP_FLOAT: - msgOutput.append("2-"); + if (sig->intelByteOrder) msgOutput.append("5-"); + else msgOutput.append("2-"); break; case DP_FLOAT: - msgOutput.append("3-"); + if (sig->intelByteOrder) msgOutput.append("6-"); + else msgOutput.append("3-"); break; case STRING: msgOutput.append("4-"); @@ -1402,7 +1443,16 @@ int DBCHandler::createBlankFile() attr.enumVals.clear(); attr.lower = 0; attr.upper = 0; - attr.name = "isj1939dbc"; + attr.name = "matchingcriteria"; + attr.valType = QINT; + newFile.dbc_attributes.append(attr); + + attr.attrType = MESSAGE; + attr.defaultValue = 0; + attr.enumVals.clear(); + attr.lower = 0; + attr.upper = 0; + attr.name = "filterlabeling"; attr.valType = QINT; newFile.dbc_attributes.append(attr); @@ -1415,6 +1465,14 @@ int DBCHandler::createBlankFile() return loadedFiles.count(); } +DBCFile* DBCHandler::loadDBCFile(QString filename) +{ + DBCFile newFile; + newFile.loadFile(filename); + loadedFiles.append(newFile); + return &loadedFiles.last(); +} + //the only reason to even bother sending the index is to see if //the user wants to replace an already loaded DBC. //Otherwise add a new one. Well, always add a new one. @@ -1440,11 +1498,8 @@ DBCFile* DBCHandler::loadDBCFile(int idx) { filename = dialog.selectedFiles()[0]; //right now there is only one file type that can be loaded here so just do it. - DBCFile newFile; - newFile.loadFile(filename); - loadedFiles.append(newFile); settings.setValue("DBC/LoadSaveDirectory", dialog.directory().path()); - return &loadedFiles.last(); + return loadDBCFile(filename); } return nullptr; @@ -1650,7 +1705,7 @@ void DBCHandler::swapFiles(int pos1, int pos2) * Convenience function that encapsulates a whole lot of the details. * You give it a canbus frame and it'll tell you whether there is a loaded DBC file that can * interpret that frame for you. - * Returns NULL if there is no message definition that matches. + * Returns nullptr if there is no message definition that matches. */ DBC_MESSAGE* DBCHandler::findMessage(const CANFrame &frame) { @@ -1658,13 +1713,36 @@ DBC_MESSAGE* DBCHandler::findMessage(const CANFrame &frame) { if (loadedFiles[i].getAssocBus() == -1 || frame.bus == (unsigned int)loadedFiles[i].getAssocBus()) { - DBC_MESSAGE* msg = loadedFiles[i].messageHandler->findMsgByID(frame.ID); + DBC_MESSAGE* msg = loadedFiles[i].messageHandler->findMsgByID(frame.frameId()); if (msg != nullptr) return msg; } } return nullptr; } + +// This function won't care which bus the DBC file is associated, but will return any message as long as ID matches and the file +// has filter labeling enabled. +// Returns the found message as well as the matching criteria (exact/J1939/GMLAN) +// Used for quickly populating the Frame Filtering section with interpreted values +DBC_MESSAGE* DBCHandler::findMessageForFilter(uint32_t id, MatchingCriteria_t * matchingCriteria) +{ + for(int i = 0; i < loadedFiles.count(); i++) + { + if (loadedFiles[i].messageHandler->filterLabeling()) + { + DBC_MESSAGE* msg = loadedFiles[i].messageHandler->findMsgByID(id); + if (msg != nullptr) + { + *matchingCriteria = loadedFiles[i].messageHandler->getMatchingCriteria(); + return msg; + } + } + } + return nullptr; +} + + /* * As above, a real shortcut function that searches all files in order to try to find a message with the given name */ @@ -1708,7 +1786,44 @@ DBCFile* DBCHandler::getFileByName(QString name) DBCHandler::DBCHandler() { + // Load previously saved DBC file settings + QSettings settings; + int filecount = settings.value("DBC/FileCount", 0).toInt(); + for (int i=0; isetAssocBus(bus); + MatchingCriteria_t matchingCriteria = (MatchingCriteria_t)settings.value("DBC/MatchingCriteria_" + QString(i),0).toInt(); + + DBC_ATTRIBUTE attr; + + attr.attrType = MESSAGE; + attr.defaultValue = matchingCriteria; + attr.enumVals.clear(); + attr.lower = 0; + attr.upper = 0; + attr.name = "matchingcriteria"; + attr.valType = QINT; + file->dbc_attributes.append(attr); + file->messageHandler->setMatchingCriteria(matchingCriteria); + + bool filterLabeling = settings.value("DBC/FilterLabeling_" + QString(i),0).toBool(); + attr.attrType = MESSAGE; + attr.defaultValue = filterLabeling; + attr.enumVals.clear(); + attr.lower = 0; + attr.upper = 0; + attr.name = "filterlabeling"; + attr.valType = QINT; + file->dbc_attributes.append(attr); + file->messageHandler->setFilterLabeling(filterLabeling); + + qInfo() << "Loaded DBC file" << filename << " (bus:" << bus + << ", Matching Criteria:" << (int)matchingCriteria << "Filter labeling: " << (filterLabeling?"enabled":"disabled") << ")"; + } } DBCHandler* DBCHandler::getReference() diff --git a/dbc/dbchandler.h b/dbc/dbchandler.h index c767a7d..0dfd3fe 100644 --- a/dbc/dbchandler.h +++ b/dbc/dbchandler.h @@ -5,6 +5,13 @@ #include "dbc_classes.h" #include "can_structs.h" + typedef enum + { + EXACT, + J1939, + GMLAN + } MatchingCriteria_t; + /* * TODO: * Finish coding up the decoupled design @@ -40,11 +47,14 @@ public: bool removeMessage(QString name); void removeAllMessages(); int getCount(); - bool isJ1939(); - void setJ1939(bool j1939); + MatchingCriteria_t getMatchingCriteria(); + void setMatchingCriteria(MatchingCriteria_t mc); + void setFilterLabeling( bool labelFiltering ); + bool filterLabeling(); private: QList messages; - bool isJ1939Handler; + MatchingCriteria_t matchingCriteria; + bool filterLabelingEnabled; }; //technically there should be a node handler too but I'm sort of treating nodes as second class @@ -90,6 +100,7 @@ class DBCHandler: public QObject { Q_OBJECT public: + DBCFile* loadDBCFile(QString filename); DBCFile* loadDBCFile(int); void saveDBCFile(int); void removeDBCFile(int); @@ -97,6 +108,7 @@ public: void swapFiles(int pos1, int pos2); DBC_MESSAGE* findMessage(const CANFrame &frame); DBC_MESSAGE* findMessage(const QString msgName); + DBC_MESSAGE* findMessageForFilter(uint32_t id, MatchingCriteria_t * matchingCriteria); int getFileCount(); DBCFile* getFileByIdx(int idx); DBCFile* getFileByName(QString name); diff --git a/dbc/dbcloadsavewindow.cpp b/dbc/dbcloadsavewindow.cpp index 91bee2f..0c9b400 100644 --- a/dbc/dbcloadsavewindow.cpp +++ b/dbc/dbcloadsavewindow.cpp @@ -1,6 +1,8 @@ #include "dbcloadsavewindow.h" #include "ui_dbcloadsavewindow.h" -#include +#include +#include +#include #include "helpwindow.h" #include "connections/canconmanager.h" @@ -15,17 +17,47 @@ DBCLoadSaveWindow::DBCLoadSaveWindow(const QVector *frames, QWidget *p ui->setupUi(this); - inhibitCellProcessing = false; + inhibitCellProcessing = true; QStringList header; - header << "Filename" << "Associated Bus" << "J1939"; - ui->tableFiles->setColumnCount(3); + header << "Filename" << "Associated Bus" << "Matching criteria" << "Label filters"; + ui->tableFiles->setColumnCount(4); ui->tableFiles->setHorizontalHeaderLabels(header); ui->tableFiles->setColumnWidth(0, 265); ui->tableFiles->setColumnWidth(1, 125); - ui->tableFiles->setColumnWidth(2, 80); + ui->tableFiles->setColumnWidth(2, 120); + ui->tableFiles->setColumnWidth(3, 90); ui->tableFiles->horizontalHeader()->setStretchLastSection(true); + // Populate table + for (int idx=0; idxgetFileCount(); idx++) + { + DBCFile * file = dbcHandler->getFileByIdx(idx); + ui->tableFiles->insertRow(ui->tableFiles->rowCount()); + ui->tableFiles->setItem(idx, 0, new QTableWidgetItem(file->getFullFilename())); + QString bus = QString::number(file->getAssocBus() ); + ui->tableFiles->setItem(idx, 1, new QTableWidgetItem(bus)); + + QComboBox * mc_item = addMatchingCriteriaCombobox(idx); + int mc = (int)file->messageHandler->getMatchingCriteria(); + mc_item->setCurrentIndex(mc); + + QTableWidgetItem *item = new QTableWidgetItem(""); + ui->tableFiles->setItem(idx, 3, item); + bool filterLabeling = file->messageHandler->filterLabeling(); + if (filterLabeling) + { + item->setCheckState(Qt::Checked); + } + else + { + item->setCheckState(Qt::Unchecked); + } + + qDebug() << "Populate DBC table:" << file->getFullFilename() << " (bus:" << bus << " - Matching Criteria:" << mc + << "Filter labeling: " << (filterLabeling?"enabled":"disabled") << ")"; + } + connect(ui->btnEdit, &QAbstractButton::clicked, this, &DBCLoadSaveWindow::editFile); connect(ui->btnLoad, &QAbstractButton::clicked, this, &DBCLoadSaveWindow::loadFile); connect(ui->btnMoveDown, &QAbstractButton::clicked, this, &DBCLoadSaveWindow::moveDown); @@ -40,15 +72,51 @@ DBCLoadSaveWindow::DBCLoadSaveWindow(const QVector *frames, QWidget *p editorWindow = new DBCMainEditor(frames, this); currentlyEditingFile = nullptr; + inhibitCellProcessing = false; + installEventFilter(this); } +QComboBox * DBCLoadSaveWindow::addMatchingCriteriaCombobox(int row) +{ + QComboBox *item = new QComboBox(); + item->addItem("Exact"); + item->addItem("J1939"); + item->addItem("GMLAN"); + ui->tableFiles->setCellWidget(row, 2, item); + connect(item, static_cast(&QComboBox::currentIndexChanged), + [this](int box_idx) { matchingCriteriaChanged(box_idx); } ); + return item; +} + DBCLoadSaveWindow::~DBCLoadSaveWindow() { removeEventFilter(this); delete ui; } +void DBCLoadSaveWindow::updateSettings() +{ + QSettings settings; + int filecount = ui->tableFiles->rowCount(); + settings.setValue("DBC/FileCount", filecount); + for (int i=0; igetFileByIdx(i); + if (file) + { + qDebug() << "Save DBC settings #" << i << " File: " << file->getFullFilename() + << "Bus: " << file->getAssocBus() << "MC: " << file->messageHandler->getMatchingCriteria() + << "Filter Labeling: " << (file->messageHandler->filterLabeling() ? "enabled" : "disabled"); + settings.setValue("DBC/Filename_" + QString(i), file->getFullFilename()); + settings.setValue("DBC/AssocBus_" + QString(i), file->getAssocBus()); + settings.setValue("DBC/MatchingCriteria_" + QString(i), file->messageHandler->getMatchingCriteria()); + settings.setValue("DBC/FilterLabeling_" + QString(i), file->messageHandler->filterLabeling()); + } + } + emit updatedDBCSettings(); +} + bool DBCLoadSaveWindow::eventFilter(QObject *obj, QEvent *event) { if (event->type() == QEvent::KeyRelease) { @@ -75,22 +143,34 @@ void DBCLoadSaveWindow::newFile() ui->tableFiles->setItem(idx, 0, new QTableWidgetItem("UNNAMEDFILE")); ui->tableFiles->setItem(idx, 1, new QTableWidgetItem("-1")); + QComboBox * mc_item = addMatchingCriteriaCombobox(idx); + mc_item->setCurrentIndex(EXACT); + QTableWidgetItem *item = new QTableWidgetItem(""); - item->setCheckState(Qt::Unchecked); - ui->tableFiles->setItem(idx, 2, item); + item->setCheckState(Qt::Checked); + ui->tableFiles->setItem(idx, 3, item); } void DBCLoadSaveWindow::loadFile() { DBCFile *file = dbcHandler->loadDBCFile(-1); if(file) { + inhibitCellProcessing=true; int idx = ui->tableFiles->rowCount(); ui->tableFiles->insertRow(ui->tableFiles->rowCount()); ui->tableFiles->setItem(idx, 0, new QTableWidgetItem(file->getFullFilename())); ui->tableFiles->setItem(idx, 1, new QTableWidgetItem("-1")); - DBC_ATTRIBUTE *attr = file->findAttributeByName("isj1939dbc"); + + DBC_ATTRIBUTE *attr = file->findAttributeByName("matchingcriteria"); + QComboBox * mc_item = addMatchingCriteriaCombobox(idx); + if (attr && attr->defaultValue > 0) + { + mc_item->setCurrentIndex(attr->defaultValue.toInt()); + } + + attr = file->findAttributeByName("filterlabeling"); QTableWidgetItem *item = new QTableWidgetItem(""); - ui->tableFiles->setItem(idx, 2, item); + ui->tableFiles->setItem(idx, 3, item); if (attr && attr->defaultValue > 0) { item->setCheckState(Qt::Checked); @@ -99,6 +179,9 @@ void DBCLoadSaveWindow::loadFile() { item->setCheckState(Qt::Unchecked); } + inhibitCellProcessing=false; + + updateSettings(); } } @@ -154,6 +237,7 @@ void DBCLoadSaveWindow::removeFile() dbcHandler->removeDBCFile(idx); ui->tableFiles->removeRow(idx); } + updateSettings(); } void DBCLoadSaveWindow::moveUp() @@ -162,6 +246,7 @@ void DBCLoadSaveWindow::moveUp() if (idx < 1) return; dbcHandler->swapFiles(idx - 1, idx); swapTableRows(true); + updateSettings(); } void DBCLoadSaveWindow::moveDown() @@ -171,6 +256,7 @@ void DBCLoadSaveWindow::moveDown() if (idx > (dbcHandler->getFileCount() - 2)) return; dbcHandler->swapFiles(idx, idx + 1); swapTableRows(false); + updateSettings(); } void DBCLoadSaveWindow::editFile() @@ -182,6 +268,43 @@ void DBCLoadSaveWindow::editFile() editorWindow->show(); } +void DBCLoadSaveWindow::matchingCriteriaChanged(int index) +{ + if (inhibitCellProcessing) return; + // We don't know which combobox changed, so we just update all of them + for (int row=0; rowtableFiles->rowCount(); row++) + { + DBCFile *file = dbcHandler->getFileByIdx(row); + if (file) + { + QComboBox *item = (QComboBox*)ui->tableFiles->cellWidget(row, 2); + MatchingCriteria_t matchingCriteria = (MatchingCriteria_t) item->currentIndex(); + DBC_ATTRIBUTE *attr = file->findAttributeByName("matchingcriteria"); + if (attr) + { + attr->defaultValue = matchingCriteria; + file->messageHandler->setMatchingCriteria(matchingCriteria); + } + else + { + DBC_ATTRIBUTE attr; + + attr.attrType = MESSAGE; + attr.defaultValue = matchingCriteria; + attr.enumVals.clear(); + attr.lower = 0; + attr.upper = 0; + attr.name = "matchingcriteria"; + attr.valType = QINT; + file->dbc_attributes.append(attr); + file->messageHandler->setMatchingCriteria(matchingCriteria); + } + } + } + updateSettings(); +} + + void DBCLoadSaveWindow::cellChanged(int row, int col) { if (inhibitCellProcessing) return; @@ -190,39 +313,40 @@ void DBCLoadSaveWindow::cellChanged(int row, int col) DBCFile *file = dbcHandler->getFileByIdx(row); int bus = ui->tableFiles->item(row, col)->text().toInt(); int numBuses = CANConManager::getInstance()->getNumBuses(); - if (bus > -2 && bus < numBuses) + if (bus > -2) { file->setAssocBus(bus); } - } - else if (col == 2) + updateSettings(); + } + else if (col == 3) // labelfilters { DBCFile *file = dbcHandler->getFileByIdx(row); if (file) { - //int isj1939dbc = ui->tableFiles->item(row, col)->text().toInt(); - bool isj1939dbc = ui->tableFiles->item(row, col)->checkState() == Qt::Checked; - DBC_ATTRIBUTE *attr = file->findAttributeByName("isj1939dbc"); + bool labelFilters = ui->tableFiles->item(row, col)->checkState() == Qt::Checked; + DBC_ATTRIBUTE *attr = file->findAttributeByName("filterlabeling"); if (attr) { - attr->defaultValue = isj1939dbc ? 1 : 0; - file->messageHandler->setJ1939(isj1939dbc); + attr->defaultValue = labelFilters ? 1 : 0; + file->messageHandler->setFilterLabeling(labelFilters); } else { DBC_ATTRIBUTE attr; attr.attrType = MESSAGE; - attr.defaultValue = isj1939dbc ? 1 : 0; + attr.defaultValue = labelFilters ? 1 : 0; attr.enumVals.clear(); attr.lower = 0; attr.upper = 0; - attr.name = "isj1939dbc"; + attr.name = "labelfilters"; attr.valType = QINT; file->dbc_attributes.append(attr); - file->messageHandler->setJ1939(isj1939dbc); + file->messageHandler->setFilterLabeling(labelFilters); } - } + updateSettings(); + } } } @@ -245,10 +369,17 @@ void DBCLoadSaveWindow::swapTableRows(bool up) QList sourceItems = takeRow(idx); QList destItems = takeRow(destIdx); + // QCombobox needs separate handling + int sourceMC = ((QComboBox*)ui->tableFiles->cellWidget(idx,2))->currentIndex(); + int destMC = ((QComboBox*)ui->tableFiles->cellWidget(destIdx,2))->currentIndex(); + // set back in reverse order setRow(idx, destItems); setRow(destIdx, sourceItems); + ((QComboBox*)ui->tableFiles->cellWidget(idx,2))->setCurrentIndex(destMC); + ((QComboBox*)ui->tableFiles->cellWidget(destIdx,2))->setCurrentIndex(sourceMC); + inhibitCellProcessing = false; } diff --git a/dbc/dbcloadsavewindow.h b/dbc/dbcloadsavewindow.h index 18625cc..34961a3 100644 --- a/dbc/dbcloadsavewindow.h +++ b/dbc/dbcloadsavewindow.h @@ -3,6 +3,7 @@ #include #include +#include #include "dbchandler.h" #include "dbcmaineditor.h" @@ -28,8 +29,12 @@ private slots: void editFile(); void cellChanged(int row, int col); void cellDoubleClicked(int row, int col); + void matchingCriteriaChanged(int index); void newFile(); +signals: + void updatedDBCSettings(); + private: Ui::DBCLoadSaveWindow *ui; DBCHandler *dbcHandler; @@ -42,6 +47,8 @@ private: QList takeRow(int row); void setRow(int row, const QList& rowItems); bool eventFilter(QObject *obj, QEvent *event); + void updateSettings(); + QComboBox * addMatchingCriteriaCombobox(int row); }; #endif // DBCLOADSAVEWINDOW_H diff --git a/dbc/dbcmaineditor.cpp b/dbc/dbcmaineditor.cpp index ccf9a1b..8687ce6 100644 --- a/dbc/dbcmaineditor.cpp +++ b/dbc/dbcmaineditor.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include "helpwindow.h" DBCMainEditor::DBCMainEditor( const QVector *frames, QWidget *parent) : @@ -193,7 +194,7 @@ void DBCMainEditor::onCellChangedNode(int row,int col) QString newName = ui->NodesTable->item(row, col)->text().simplified().replace(' ', '_'); qDebug() << "new name: " << newName; if (newName.length() == 0) return; - if (dbcFile->findNodeByName(newName) != NULL) //duplicates an existing node! + if (dbcFile->findNodeByName(newName) != nullptr) //duplicates an existing node! { QMessageBox msg; msg.setParent(0); @@ -217,7 +218,7 @@ void DBCMainEditor::onCellChangedNode(int row,int col) { DBC_NODE *oldNode = dbcFile->findNodeByIdx(row); QString nodeName = ui->NodesTable->item(row, col)->text().simplified().replace(' ', '_'); - if (oldNode == NULL) return; + if (oldNode == nullptr) return; if (row != 0) oldNode->name = nodeName; else nodeName = oldNode->name; inhibitCellChanged = true; @@ -230,7 +231,7 @@ void DBCMainEditor::onCellChangedNode(int row,int col) QString nodeName = ui->NodesTable->item(row, 0)->text().simplified().replace(' ', '_'); qDebug() << "searching for node " << nodeName; DBC_NODE *thisNode = dbcFile->findNodeByName(nodeName); - if (thisNode == NULL) return; + if (thisNode == nullptr) return; thisNode->comment = ui->NodesTable->item(row, col)->text().simplified(); qDebug() << "New comment: " << thisNode->comment; } @@ -240,15 +241,15 @@ void DBCMainEditor::onCellChangedNode(int row,int col) void DBCMainEditor::onCellChangedMessage(int row,int col) { - QTableWidgetItem* item = NULL; + QTableWidgetItem* item = nullptr; bool ret = false; - DBC_MESSAGE *msg = NULL; + DBC_MESSAGE *msg = nullptr; uint msgID; if (inhibitCellChanged) return; DBC_NODE *node = dbcFile->findNodeByIdx(ui->NodesTable->currentRow()); - if (node == NULL) + if (node == nullptr) { qDebug() << "No node set?!? This is bad!"; return; @@ -271,7 +272,7 @@ void DBCMainEditor::onCellChangedMessage(int row,int col) ui->MessagesTable->item(row, 0)->setText(""); return; } - if (msg != NULL) + if (msg != nullptr) { QMessageBox msg; msg.setParent(0); @@ -293,9 +294,9 @@ void DBCMainEditor::onCellChangedMessage(int row,int col) for (int i = 0; i < referenceFrames->length(); i++) { - if ((uint) referenceFrames->at(i).ID == msgID) + if ((uint) referenceFrames->at(i).frameId() == msgID) { - newMsg.len = referenceFrames->at(i).len; + newMsg.len = referenceFrames->at(i).payload().length(); break; } } @@ -328,7 +329,7 @@ void DBCMainEditor::onCellChangedMessage(int row,int col) { QString msgName = ui->MessagesTable->item(row, 1)->text().simplified().replace(' ', '_'); if (msgName.length() == 0) return; - if( ret && (msg!=NULL) ) + if( ret && (msg!=nullptr) ) msg->name = msgName; break; } @@ -349,7 +350,7 @@ void DBCMainEditor::onCellChangedMessage(int row,int col) ui->MessagesTable->item(row, col)->setText(QString::number(msgLen)); } - if( ret && (msg!=NULL) ) + if( ret && (msg!=nullptr) ) msg->len = msgLen; break; } @@ -358,7 +359,7 @@ void DBCMainEditor::onCellChangedMessage(int row,int col) case 6: //comment { QString msgComment = ui->MessagesTable->item(row, col)->text().simplified(); - if( ret && (msgComment!=NULL) ) + if( ret && (msgComment!=nullptr) ) msg->comment = msgComment; break; } @@ -376,7 +377,7 @@ void DBCMainEditor::onCellClickedNode(int row, int col) currRow = row; QTableWidgetItem *item = ui->NodesTable->item(currRow, 0); QString nodeName; - if (item == NULL) return; + if (item == nullptr) return; nodeName = item->text(); qDebug() << "Trying to find node with name " << nodeName; @@ -476,7 +477,7 @@ void DBCMainEditor::refreshNodesTable() int rowIdx; - if (dbcFile->findNodeByName("Vector__XXX") == NULL) + if (dbcFile->findNodeByName("Vector__XXX") == nullptr) { DBC_NODE newNode; newNode.name = "Vector__XXX"; @@ -509,7 +510,7 @@ void DBCMainEditor::refreshMessagesTable(const DBC_NODE *node) int rowIdx; - if (node != NULL) + if (node != nullptr) { for (int x = 0; x < dbcFile->messageHandler->getCount(); x++) { diff --git a/dbc/dbcsignaleditor.cpp b/dbc/dbcsignaleditor.cpp index d86353d..6c579ec 100644 --- a/dbc/dbcsignaleditor.cpp +++ b/dbc/dbcsignaleditor.cpp @@ -4,6 +4,7 @@ #include #include #include +#include #include "helpwindow.h" DBCSignalEditor::DBCSignalEditor(QWidget *parent) : @@ -17,8 +18,8 @@ DBCSignalEditor::DBCSignalEditor(QWidget *parent) : qsrand(QDateTime::currentMSecsSinceEpoch()); dbcHandler = DBCHandler::getReference(); - dbcMessage = NULL; - currentSignal = NULL; + dbcMessage = nullptr; + currentSignal = nullptr; QStringList headers2; headers2 << "Value" << "Text"; @@ -46,23 +47,21 @@ DBCSignalEditor::DBCSignalEditor(QWidget *parent) : connect(ui->cbIntelFormat, &QCheckBox::toggled, [=]() { - if (currentSignal == NULL) return; + if (currentSignal == nullptr) return; currentSignal->intelByteOrder = ui->cbIntelFormat->isChecked(); - if (currentSignal->valType == SP_FLOAT || currentSignal->valType == DP_FLOAT) - currentSignal->intelByteOrder = false; fillSignalForm(currentSignal); }); connect(ui->comboReceiver, &QComboBox::currentTextChanged, [=]() { - if (currentSignal == NULL) return; + if (currentSignal == nullptr) return; currentSignal->receiver = dbcFile->findNodeByName(ui->comboReceiver->currentText()); }); connect(ui->comboType, &QComboBox::currentTextChanged, [=]() { - if (currentSignal == NULL) return; + if (currentSignal == nullptr) return; switch (ui->comboType->currentIndex()) { case 0: @@ -73,13 +72,11 @@ DBCSignalEditor::DBCSignalEditor(QWidget *parent) : break; case 2: currentSignal->valType = SP_FLOAT; - currentSignal->intelByteOrder = false; if (currentSignal->startBit > 39) currentSignal->startBit = 39; currentSignal->signalSize = 32; break; case 3: currentSignal->valType = DP_FLOAT; - currentSignal->intelByteOrder = false; currentSignal->startBit = 7; //has to be! currentSignal->signalSize = 64; break; @@ -92,7 +89,7 @@ DBCSignalEditor::DBCSignalEditor(QWidget *parent) : connect(ui->txtBias, &QLineEdit::editingFinished, [=]() { - if (currentSignal == NULL) return; + if (currentSignal == nullptr) return; double temp; bool result; temp = ui->txtBias->text().toDouble(&result); @@ -102,7 +99,7 @@ DBCSignalEditor::DBCSignalEditor(QWidget *parent) : connect(ui->txtMaxVal, &QLineEdit::editingFinished, [=]() { - if (currentSignal == NULL) return; + if (currentSignal == nullptr) return; double temp; bool result; temp = ui->txtMaxVal->text().toDouble(&result); @@ -112,7 +109,7 @@ DBCSignalEditor::DBCSignalEditor(QWidget *parent) : connect(ui->txtMinVal, &QLineEdit::editingFinished, [=]() { - if (currentSignal == NULL) return; + if (currentSignal == nullptr) return; double temp; bool result; temp = ui->txtMinVal->text().toDouble(&result); @@ -121,7 +118,7 @@ DBCSignalEditor::DBCSignalEditor(QWidget *parent) : connect(ui->txtScale, &QLineEdit::editingFinished, [=]() { - if (currentSignal == NULL) return; + if (currentSignal == nullptr) return; double temp; bool result; temp = ui->txtScale->text().toDouble(&result); @@ -130,24 +127,24 @@ DBCSignalEditor::DBCSignalEditor(QWidget *parent) : connect(ui->txtComment, &QLineEdit::editingFinished, [=]() { - if (currentSignal == NULL) return; + if (currentSignal == nullptr) return; currentSignal->comment = ui->txtComment->text().simplified().replace(' ', '_'); }); connect(ui->txtUnitName, &QLineEdit::editingFinished, [=]() { - if (currentSignal == NULL) return; + if (currentSignal == nullptr) return; currentSignal->unitName = ui->txtUnitName->text().simplified().replace(' ', '_'); }); connect(ui->txtBitLength, &QLineEdit::textChanged, [=]() { - if (currentSignal == NULL) return; + if (currentSignal == nullptr) return; int temp; temp = Utility::ParseStringToNum(ui->txtBitLength->text()); - if (temp < 0) return; - if (temp > 63) return; + if (temp < 1) return; + if (temp > 64) return; if (currentSignal->valType != SP_FLOAT && currentSignal->valType != DP_FLOAT) currentSignal->signalSize = temp; fillSignalForm(currentSignal); @@ -155,7 +152,7 @@ DBCSignalEditor::DBCSignalEditor(QWidget *parent) : connect(ui->txtName, &QLineEdit::editingFinished, [=]() { - if (currentSignal == NULL) return; + if (currentSignal == nullptr) return; QString tempNameStr = ui->txtName->text().simplified().replace(' ', '_'); if (tempNameStr.length() > 0) currentSignal->name = tempNameStr; //need to update the list too. @@ -165,7 +162,7 @@ DBCSignalEditor::DBCSignalEditor(QWidget *parent) : connect(ui->txtMultiplexValue, &QLineEdit::editingFinished, [=]() { - if (currentSignal == NULL) return; + if (currentSignal == nullptr) return; int temp; temp = Utility::ParseStringToNum(ui->txtMultiplexValue->text()); //TODO: could look up the multiplexor and ensure that the value is within a range that the multiplexor could return @@ -179,7 +176,7 @@ DBCSignalEditor::DBCSignalEditor(QWidget *parent) : currentSignal->isMultiplexed = true; currentSignal->isMultiplexor = false; //if the set multiplexor for the message was this signal then clear it - if (dbcMessage->multiplexorSignal == currentSignal) dbcMessage->multiplexorSignal = NULL; + if (dbcMessage->multiplexorSignal == currentSignal) dbcMessage->multiplexorSignal = nullptr; } }); @@ -189,7 +186,7 @@ DBCSignalEditor::DBCSignalEditor(QWidget *parent) : if (state && currentSignal) //signal is now set as a multiplexed signal { //don't allow this signal to be a multiplexor if there is already one for this message. - //if (dbcMessage->multiplexorSignal != currentSignal && dbcMessage->multiplexorSignal != NULL) return; //I spoke too soon above... + //if (dbcMessage->multiplexorSignal != currentSignal && dbcMessage->multiplexorSignal != nullptr) return; //I spoke too soon above... currentSignal->isMultiplexed = false; currentSignal->isMultiplexor = true; //we just set that this is the multiplexor so update the message to show that as well. @@ -204,7 +201,7 @@ DBCSignalEditor::DBCSignalEditor(QWidget *parent) : { currentSignal->isMultiplexed = false; currentSignal->isMultiplexor = false; - if (dbcMessage->multiplexorSignal == currentSignal) dbcMessage->multiplexorSignal = NULL; + if (dbcMessage->multiplexorSignal == currentSignal) dbcMessage->multiplexorSignal = nullptr; } }); @@ -286,7 +283,7 @@ void DBCSignalEditor::showEvent(QShowEvent* event) { QDialog::showEvent(event); - currentSignal = NULL; + currentSignal = nullptr; refreshSignalsList(); } @@ -422,7 +419,7 @@ void DBCSignalEditor::deleteCurrentSignal() { delete(ui->signalsList->item(currIdx)); dbcMessage->sigHandler->removeSignal(currIdx); - currentSignal = NULL; + currentSignal = nullptr; } } @@ -461,7 +458,7 @@ void DBCSignalEditor::fillSignalForm(DBC_SIGNAL *sig) { unsigned char bitpattern[8]; - if (sig == NULL) { + if (sig == nullptr) { ui->groupBox->setEnabled(false); ui->txtName->setText(""); ui->txtBias->setText(""); @@ -578,7 +575,7 @@ void DBCSignalEditor::fillValueTable(DBC_SIGNAL *sig) ui->valuesTable->clearContents(); ui->valuesTable->setRowCount(0); - if (sig == NULL) { + if (sig == nullptr) { ui->valuesTable->setEnabled(false); inhibitCellChanged = false; return; @@ -588,7 +585,7 @@ void DBCSignalEditor::fillValueTable(DBC_SIGNAL *sig) for (int i = 0; i < sig->valList.count(); i++) { - QTableWidgetItem *val = new QTableWidgetItem(Utility::formatNumber(sig->valList[i].value)); + QTableWidgetItem *val = new QTableWidgetItem(Utility::formatNumber((uint64_t)sig->valList[i].value)); QTableWidgetItem *desc = new QTableWidgetItem(sig->valList[i].descript); rowIdx = ui->valuesTable->rowCount(); ui->valuesTable->insertRow(rowIdx); @@ -606,7 +603,7 @@ void DBCSignalEditor::clickSignalList(int row) { //qDebug() << ui->signalsList->item(row)->text(); - DBC_SIGNAL *thisSig = (row<0) ? NULL : dbcMessage->sigHandler->findSignalByName(ui->signalsList->item(row)->text()); + DBC_SIGNAL *thisSig = (row<0) ? nullptr : dbcMessage->sigHandler->findSignalByName(ui->signalsList->item(row)->text()); currentSignal = thisSig; fillSignalForm(thisSig); fillValueTable(thisSig); @@ -615,7 +612,7 @@ void DBCSignalEditor::clickSignalList(int row) void DBCSignalEditor::bitfieldClicked(int x, int y) { int bit = (7 - x) + (y * 8); - if (currentSignal == NULL) return; + if (currentSignal == nullptr) return; currentSignal->startBit = bit; if (currentSignal->valType == SP_FLOAT) { diff --git a/docs/build.sh b/docs/build.sh index db03507..195b50e 100755 --- a/docs/build.sh +++ b/docs/build.sh @@ -1,4 +1,4 @@ make qthelp -~/Qt/5.12.1/gcc_64/bin/qcollectiongenerator build/qthelp/SavvyCAN.qhcp -~/Qt/5.12.1/gcc_64/bin/assistant -collectionFile build/qthelp/SavvyCAN.qhc +cp -R build/qthelp/* ../help +rm ../help/SavvyCAN.q* diff --git a/filterutility.cpp b/filterutility.cpp new file mode 100644 index 0000000..b577c3d --- /dev/null +++ b/filterutility.cpp @@ -0,0 +1,80 @@ +#include "utility.h" +#include "filterutility.h" +#include "dbc/dbchandler.h" +#include + +uint32_t FilterUtility::getIdAsInt( QListWidgetItem * item ) +{ + return Utility::ParseStringToNum(getId(item)); +} + +QString FilterUtility::getId( QString itemText ) +{ + if (itemText.contains(" ")) + // Strip away the filter label + return itemText.left(itemText.indexOf(" ")); + else + return itemText; +} + +QString FilterUtility::getId( QListWidgetItem * item ) +{ + return getId(item->text()); +} + +uint32_t FilterUtility::getGMLanArbitrationId(int32_t id) +{ + return (id >> 13) & 0x1FFF; +} + +uint32_t FilterUtility::getGMLanPriorityBits(int32_t id) +{ + return (id >> 26) & 0x7; +} + +uint32_t FilterUtility::getGMLanSenderId(int32_t id) +{ + return id & 0x1FFF; +} + +QListWidgetItem * FilterUtility::createCheckableFilterItem(int32_t id, bool checked, QListWidget* parent) +{ + QListWidgetItem * thisItem = createFilterItem(id,parent); + thisItem->setFlags(thisItem->flags() | Qt::ItemIsUserCheckable); + if (checked) + thisItem->setCheckState(Qt::Checked); + else + thisItem->setCheckState(Qt::Unchecked); + return thisItem; +} + +QListWidgetItem * FilterUtility::createFilterItem(int32_t id, QListWidget* parent) +{ + QSettings settings; + DBCHandler * dbcHandler = DBCHandler::getReference(); + QListWidgetItem *thisItem = new QListWidgetItem(parent); + QString filterItemName = Utility::formatCANID(id); + + if (settings.value("Main/FilterLabeling", false).toBool()) + { + // Filter labeling (show interpreted frame names next to the CAN addr ID) + MatchingCriteria_t matchingCriteria; + DBC_MESSAGE *msg = dbcHandler->findMessageForFilter(id,&matchingCriteria); + if (msg != NULL) + { + filterItemName.append(" "); + filterItemName.append(msg->name); + + // Create tooltip to show the whole name just in case it's too long to fit in the filter window. + // Also if the matching criteria is set to GMLAN, show the Arbitration ID as well + QString tooltip; + if (matchingCriteria == GMLAN) + tooltip.append("0x" + QString::number(FilterUtility::getGMLanArbitrationId(id), 16).toUpper().rightJustified(4,'0') + ": "); + tooltip.append(msg->name); + thisItem->setToolTip(tooltip); + } + } + + thisItem->setText(filterItemName); + return thisItem; +} diff --git a/filterutility.h b/filterutility.h new file mode 100644 index 0000000..e346c31 --- /dev/null +++ b/filterutility.h @@ -0,0 +1,23 @@ +#ifndef FILTERUTILITY_H +#define FILTERUTILITY_H + +#include + + +class FilterUtility +{ + +public: + static QListWidgetItem * createFilterItem(int32_t id, QListWidget* parent=NULL); // if parent is given, add item automatically to listwidget + static QListWidgetItem * createCheckableFilterItem(int32_t id, bool checked, QListWidget* parent=NULL); + + static uint32_t getIdAsInt( QListWidgetItem * item ); + static QString getId( QListWidgetItem * item ); + static QString getId( QString itemText ); + + static uint32_t getGMLanArbitrationId(int32_t id); + static uint32_t getGMLanSenderId(int32_t id); + static uint32_t getGMLanPriorityBits(int32_t id); +}; + +#endif // DBCLOADSAVEWINDOW_H diff --git a/firmwareuploaderwindow.cpp b/firmwareuploaderwindow.cpp index 2b13746..6480e25 100644 --- a/firmwareuploaderwindow.cpp +++ b/firmwareuploaderwindow.cpp @@ -4,6 +4,13 @@ #include +//You might wonder: Collin, what in the hell is this for? Firmware uploader? For what? I'm interested! Well, it's a custom +//firmware uploader for a motor controller I built. Why would that be in this project. Cuz. It's not really relevant +//to anyone else but might serve as a decent reference for a few things: How to make an uploader interface that runs over CAN, +//how to lay out a screen like this, how to make a comm protocol for firmware updating over CAN. But, most things use UDS +//for firmware updates and wouldn't need this specific code. But, it might be able to be turned into a UDS firmware uploader or downloader. +//Note that this screen is specifically hidden by default because of it's oddball status. You have to re-enable it in mainwindow.cpp to see it. + FirmwareUploaderWindow::FirmwareUploaderWindow(const QVector *frames, QWidget *parent) : QDialog(parent), ui(new Ui::FirmwareUploaderWindow) @@ -70,17 +77,20 @@ void FirmwareUploaderWindow::updatedFrames(int numFrames) void FirmwareUploaderWindow::gotTargettedFrame(CANFrame frame) { - qDebug() << "FUW: Got targetted frame with id " << frame.ID; - if (frame.ID == (uint32_t)(baseAddress + 0x10)) { + unsigned char *data = reinterpret_cast(frame.payload().data()); + int dataLen = frame.payload().count(); + + qDebug() << "FUW: Got targetted frame with id " << frame.frameId(); + if (frame.frameId() == (uint32_t)(baseAddress + 0x10) && (dataLen == 8) ) { qDebug() << "Start firmware reply"; - if ((frame.data[0] == 0xAD) && (frame.data[1] == 0xDE)) + if ((data[0] == 0xAD) && (data[1] == 0xDE)) { - if ((frame.data[2] == 0xAF) && (frame.data[3] == 0xDE)) + if ((data[2] == 0xAF) && (data[3] == 0xDE)) { - qDebug() << "THere's dead beef here"; - if ((frame.data[4] == (token & 0xFF)) && (frame.data[5] == ((token >> 8) & 0xFF))) + qDebug() << "There's dead beef here"; + if ( (data[4] == (token & 0xFF)) && (data[5] == ((token >> 8) & 0xFF) ) ) { - if ((frame.data[6] == ((token >> 16) & 0xFF)) && (frame.data[7] == ((token >> 24) & 0xFF))) + if ((data[6] == ((token >> 16) & 0xFF)) && (data[7] == ((token >> 24) & 0xFF))) { qDebug() << "starting firmware process"; //MainWindow::getReference()->setTargettedID(baseAddress + 0x20); @@ -92,9 +102,9 @@ void FirmwareUploaderWindow::gotTargettedFrame(CANFrame frame) } } - if (frame.ID == (uint32_t)(baseAddress + 0x20)) { + if (frame.frameId() == (uint32_t)(baseAddress + 0x20)) { qDebug() << "Firmware reception success reply"; - int seq = frame.data[0] + (256 * frame.data[1]); + int seq = data[0] + (256 * data[1]); if (seq == currentSendingPosition) { currentSendingPosition++; @@ -126,18 +136,19 @@ void FirmwareUploaderWindow::sendFirmwareChunk() CANFrame *output = new CANFrame; int firmwareLocation = currentSendingPosition * 4; int xorByte = 0; - output->extended = false; - output->len = 7; + output->setExtendedFrameFormat(false); + QByteArray bytes(7,0); output->bus = bus; - output->ID = baseAddress + 0x16; - output->data[0] = currentSendingPosition & 0xFF; - output->data[1] = (currentSendingPosition >> 8) & 0xFF; - output->data[2] = firmwareData[firmwareLocation++]; - output->data[3] = firmwareData[firmwareLocation++]; - output->data[4] = firmwareData[firmwareLocation++]; - output->data[5] = firmwareData[firmwareLocation++]; - for (int i = 0; i < 6; i++) xorByte = xorByte ^ output->data[i]; - output->data[6] = xorByte; + output->setFrameId(baseAddress + 0x16); + output->payload()[0] = currentSendingPosition & 0xFF; + output->payload()[1] = (currentSendingPosition >> 8) & 0xFF; + output->payload()[2] = firmwareData[firmwareLocation++]; + output->payload()[3] = firmwareData[firmwareLocation++]; + output->payload()[4] = firmwareData[firmwareLocation++]; + output->payload()[5] = firmwareData[firmwareLocation++]; + for (int i = 0; i < 6; i++) xorByte = xorByte ^ static_cast(output->payload()[i]); + output->payload()[6] = xorByte; + output->setPayload(bytes); sendCANFrame(output); timer->start(); } @@ -145,14 +156,15 @@ void FirmwareUploaderWindow::sendFirmwareChunk() void FirmwareUploaderWindow::sendFirmwareEnding() { CANFrame *output = new CANFrame; - output->extended = false; + output->setExtendedFrameFormat(false); output->bus = bus; - output->len = 4; - output->ID = baseAddress + 0x30; - output->data[3] = 0xC0; - output->data[2] = 0xDE; - output->data[1] = 0xFA; - output->data[0] = 0xDE; + QByteArray bytes(4,0); + output->setFrameId(baseAddress + 0x30); + output->payload()[3] = 0xC0; + output->payload()[2] = 0xDE; + output->payload()[1] = 0xFA; + output->payload()[0] = 0xDE; + output->setPayload(bytes); //sendCANFrame(output, bus); } @@ -171,19 +183,19 @@ void FirmwareUploaderWindow::handleStartStopTransfer() CANConManager::getInstance()->addTargettedFrame(bus, baseAddress + 0x10, 0x7FF, this); CANConManager::getInstance()->addTargettedFrame(bus, baseAddress + 0x20, 0x7FF, this); CANFrame *output = new CANFrame; - output->extended = false; - output->len = 8; + output->setExtendedFrameFormat(false); + QByteArray bytes(8,0); output->bus = bus; - output->ID = baseAddress; + output->setFrameId(baseAddress); - output->data[0] = 0xEF; - output->data[1] = 0xBE; - output->data[2] = 0xAD; - output->data[3] = 0xDE; - output->data[4] = token & 0xFF; - output->data[5] = (token >> 8) & 0xFF; - output->data[6] = (token >> 16) & 0xFF; - output->data[7] = (token >> 24) & 0xFF; + output->payload()[0] = 0xEF; + output->payload()[1] = 0xBE; + output->payload()[2] = 0xAD; + output->payload()[3] = 0xDE; + output->payload()[4] = token & 0xFF; + output->payload()[5] = (token >> 8) & 0xFF; + output->payload()[6] = (token >> 16) & 0xFF; + output->payload()[7] = (token >> 24) & 0xFF; sendCANFrame(output); } else //stop anything in process diff --git a/framefileio.cpp b/framefileio.cpp index 71e21c4..741d8b1 100644 --- a/framefileio.cpp +++ b/framefileio.cpp @@ -50,7 +50,7 @@ bool FrameFileIO::saveFrameFile(QString &fileName, const QVector* fram QProgressDialog progress(qApp->activeWindow()); progress.setWindowModality(Qt::WindowModal); progress.setLabelText("Saving file..."); - progress.setCancelButton(0); + progress.setCancelButton(nullptr); progress.setRange(0,0); progress.setMinimumDuration(0); progress.show(); @@ -155,6 +155,7 @@ bool FrameFileIO::loadFrameFile(QString &fileName, QVector* frameCache filters.append(QString(tr("CAN-DO Log (*.avc *.can *.evc *.qcc *.AVC *.CAN *.EVC *.QCC)"))); filters.append(QString(tr("Vehicle Spy (*.csv *.CSV)"))); filters.append(QString(tr("Candump/Kayak (*.log *.LOG)"))); + filters.append(QString(tr("CANDump Lawicel (*.txt *.TXT *.LOG *.log)"))); filters.append(QString(tr("PCAN Viewer (*.trc *.TRC)"))); filters.append(QString(tr("Kvaser Log Decimal (*.txt *.TXT)"))); filters.append(QString(tr("Kvaser Log Hex (*.txt *.TXT)"))); @@ -176,7 +177,7 @@ bool FrameFileIO::loadFrameFile(QString &fileName, QVector* frameCache QProgressDialog progress(qApp->activeWindow()); progress.setWindowModality(Qt::WindowModal); progress.setLabelText("Loading file..."); - progress.setCancelButton(0); + progress.setCancelButton(nullptr); progress.setRange(0,0); progress.setMinimumDuration(0); progress.show(); @@ -194,14 +195,15 @@ bool FrameFileIO::loadFrameFile(QString &fileName, QVector* frameCache if (dialog.selectedNameFilter() == filters[8]) result = loadCANDOFile(filename, frameCache); if (dialog.selectedNameFilter() == filters[9]) result = loadVehicleSpyFile(filename, frameCache); if (dialog.selectedNameFilter() == filters[10]) result = loadCanDumpFile(filename, frameCache); - if (dialog.selectedNameFilter() == filters[11]) result = loadPCANFile(filename, frameCache); - if (dialog.selectedNameFilter() == filters[12]) result = loadKvaserFile(filename, frameCache, false); - if (dialog.selectedNameFilter() == filters[13]) result = loadKvaserFile(filename, frameCache, true); - if (dialog.selectedNameFilter() == filters[14]) result = loadCanalyzerASC(filename, frameCache); - if (dialog.selectedNameFilter() == filters[15]) result = loadCanalyzerBLF(filename, frameCache); - if (dialog.selectedNameFilter() == filters[16]) result = loadCANHackerFile(filename, frameCache); - if (dialog.selectedNameFilter() == filters[17]) result = loadCabanaFile(filename, frameCache); - if (dialog.selectedNameFilter() == filters[18]) result = loadCANOpenFile(filename, frameCache); + if (dialog.selectedNameFilter() == filters[11]) result = loadLawicelFile(filename, frameCache); + if (dialog.selectedNameFilter() == filters[12]) result = loadPCANFile(filename, frameCache); + if (dialog.selectedNameFilter() == filters[13]) result = loadKvaserFile(filename, frameCache, false); + if (dialog.selectedNameFilter() == filters[14]) result = loadKvaserFile(filename, frameCache, true); + if (dialog.selectedNameFilter() == filters[15]) result = loadCanalyzerASC(filename, frameCache); + if (dialog.selectedNameFilter() == filters[16]) result = loadCanalyzerBLF(filename, frameCache); + if (dialog.selectedNameFilter() == filters[17]) result = loadCANHackerFile(filename, frameCache); + if (dialog.selectedNameFilter() == filters[18]) result = loadCabanaFile(filename, frameCache); + if (dialog.selectedNameFilter() == filters[19]) result = loadCANOpenFile(filename, frameCache); progress.cancel(); @@ -229,6 +231,7 @@ bool FrameFileIO::loadFrameFile(QString &fileName, QVector* frameCache //whether a file could be loaded or not by a given loader. The loader return is still used in case the guess was wrong. bool FrameFileIO::autoDetectLoadFile(QString filename, QVector* frames) { + qDebug() << "Attempting Canalyzer BLF"; if (isCanalyzerBLF(filename)) { if (loadCanalyzerBLF(filename, frames)) @@ -238,6 +241,7 @@ bool FrameFileIO::autoDetectLoadFile(QString filename, QVector* frames } } + qDebug() << "Attempting native CSV"; if (isNativeCSVFile(filename)) { if (loadNativeCSVFile(filename, frames)) @@ -247,6 +251,7 @@ bool FrameFileIO::autoDetectLoadFile(QString filename, QVector* frames } } + qDebug() << "Attempting canalyzer ASC"; if (isCanalyzerASC(filename)) { if (loadCanalyzerASC(filename, frames)) @@ -256,6 +261,7 @@ bool FrameFileIO::autoDetectLoadFile(QString filename, QVector* frames } } + qDebug() << "Attempting CRTD"; if (isCRTDFile(filename)) { if (loadCRTDFile(filename, frames)) @@ -266,6 +272,7 @@ bool FrameFileIO::autoDetectLoadFile(QString filename, QVector* frames } + qDebug() << "Attempting trace file"; if (isTraceFile(filename)) { if (loadTraceFile(filename, frames)) @@ -275,6 +282,7 @@ bool FrameFileIO::autoDetectLoadFile(QString filename, QVector* frames } } + qDebug() << "Attempting vehicle spy"; if (isVehicleSpyFile(filename)) { if (loadVehicleSpyFile(filename, frames)) @@ -284,6 +292,7 @@ bool FrameFileIO::autoDetectLoadFile(QString filename, QVector* frames } } + qDebug() << "Attempting candump"; if (isCanDumpFile(filename)) { if (loadCanDumpFile(filename, frames)) @@ -293,6 +302,17 @@ bool FrameFileIO::autoDetectLoadFile(QString filename, QVector* frames } } + qDebug() << "Attempting lawicel"; + if (isLawicelFile(filename)) + { + if (loadLawicelFile(filename, frames)) + { + qDebug() << "Loaded as lawicel successfully!"; + return true; + } + } + + qDebug() << "Attempting canhacker"; if (isCANHackerFile(filename)) { if (loadCANHackerFile(filename, frames)) @@ -302,6 +322,7 @@ bool FrameFileIO::autoDetectLoadFile(QString filename, QVector* frames } } + qDebug() << "Attempting cabana"; if (isCabanaFile(filename)) { if (loadCabanaFile(filename, frames)) @@ -311,6 +332,7 @@ bool FrameFileIO::autoDetectLoadFile(QString filename, QVector* frames } } + qDebug() << "Attempting canopen"; if (isCANOpenFile(filename)) { if (loadCANOpenFile(filename, frames)) @@ -320,6 +342,7 @@ bool FrameFileIO::autoDetectLoadFile(QString filename, QVector* frames } } + qDebug() << "Attempting busmaster log"; if (isLogFile(filename)) { if (loadLogFile(filename, frames)) @@ -329,6 +352,7 @@ bool FrameFileIO::autoDetectLoadFile(QString filename, QVector* frames } } + qDebug() << "Attempting pcan"; if (isPCANFile(filename)) { if (loadPCANFile(filename, frames)) @@ -338,6 +362,7 @@ bool FrameFileIO::autoDetectLoadFile(QString filename, QVector* frames } } + qDebug() << "Attempting ixxat"; if (isIXXATFile(filename)) { if (loadIXXATFile(filename, frames)) @@ -347,6 +372,7 @@ bool FrameFileIO::autoDetectLoadFile(QString filename, QVector* frames } } + qDebug() << "Attempting microchip"; if (isMicrochipFile(filename)) { if (loadMicrochipFile(filename, frames)) @@ -356,6 +382,7 @@ bool FrameFileIO::autoDetectLoadFile(QString filename, QVector* frames } } + qDebug() << "Attempting CANDo"; if (isCANDOFile(filename)) { if (loadCANDOFile(filename, frames)) @@ -365,6 +392,7 @@ bool FrameFileIO::autoDetectLoadFile(QString filename, QVector* frames } } + qDebug() << "Attempting kvaser"; if (isKvaserFile(filename)) { if (loadKvaserFile(filename, frames,true)) @@ -379,6 +407,7 @@ bool FrameFileIO::autoDetectLoadFile(QString filename, QVector* frames } } + qDebug() << "Attempting generic CSV"; if (isGenericCSVFile(filename)) { if (loadGenericCSVFile(filename, frames)) @@ -388,6 +417,7 @@ bool FrameFileIO::autoDetectLoadFile(QString filename, QVector* frames } } + qDebug() << "Nothing worked... sorry..."; return false; } @@ -424,7 +454,7 @@ bool FrameFileIO::isVehicleSpyFile(QString filename) QList tokens = line.split(','); if (tokens.length() > 20) { - if (tokens[9].toInt(NULL, 16) > 0) isMatch = true; + if (tokens[9].toInt(nullptr, 16) > 0) isMatch = true; } } } @@ -481,26 +511,25 @@ bool FrameFileIO::loadVehicleSpyFile(QString filename, QVector *frames if (tokens.length() > 20) { thisFrame.bus = 0; - thisFrame.remote = false; + thisFrame.setFrameType(QCanBusFrame::DataFrame); tempTime = now; - tempTime.addMSecs(tokens[1].toDouble() * 1000.0); - thisFrame.timestamp = tempTime.toMSecsSinceEpoch() * 1000ul; + tempTime = tempTime.addMSecs(static_cast(tokens[1].toDouble() * 1000.0)); + thisFrame.setTimeStamp(QCanBusFrame::TimeStamp(0, static_cast(tempTime.toMSecsSinceEpoch() * 1000))); if (tokens[5].startsWith("T")) thisFrame.isReceived = false; else thisFrame.isReceived = true; - thisFrame.ID = tokens[9].toInt(NULL, 16); - if (tokens[11].startsWith("T")) thisFrame.extended = true; - else thisFrame.extended = false; - - thisFrame.len = 0; + thisFrame.setFrameId(static_cast(tokens[9].toInt(nullptr, 16))); + if (tokens[11].startsWith("T")) thisFrame.setExtendedFrameFormat(true); + else thisFrame.setExtendedFrameFormat(false); + QByteArray bytes; for (int i = 0; i < 8; i++) { if (tokens[12 + i].length() > 0) { - thisFrame.data[i] = tokens[12 + i].toInt(NULL, 16); - thisFrame.len++; + bytes.append(static_cast(tokens[12 + i].toInt(nullptr, 16))); } else break; } + thisFrame.setPayload(bytes); frames->append(thisFrame); } else foundErrors = true; @@ -637,7 +666,7 @@ bool FrameFileIO::loadCRTDFile(QString filename, QVector* frames) multiplier = 1; //special case. Assume no decimal means microseconds } //qDebug() << "decimal places " << decimalPlaces; - thisFrame.timestamp = (int64_t)(tokens[0].toDouble() * multiplier); + thisFrame.setTimeStamp(QCanBusFrame::TimeStamp(0, static_cast((tokens[0].toDouble() * multiplier)))); thisFrame.bus = 0; char firstChar = tokens[1].left(1)[0]; if (firstChar >= '1' && firstChar <= '9') @@ -648,21 +677,22 @@ bool FrameFileIO::loadCRTDFile(QString filename, QVector* frames) } if (firstChar == 'R' || firstChar == 'T') { - thisFrame.ID = tokens[2].toInt(NULL, 16); - if (tokens[1] == "R29" || tokens[1] == "T29") thisFrame.extended = true; - else thisFrame.extended = false; + thisFrame.setFrameId(static_cast(tokens[2].toInt(nullptr, 16))); + if (tokens[1] == "R29" || tokens[1] == "T29") thisFrame.setExtendedFrameFormat(true); + else thisFrame.setExtendedFrameFormat(false); if (firstChar == 'T') thisFrame.isReceived = false; else thisFrame.isReceived = true; - thisFrame.len = tokens.length() - 3; - thisFrame.remote = false; - for (unsigned int d = 0; d < thisFrame.len; d++) + QByteArray bytes(tokens.length() - 3, 0); + thisFrame.setFrameType(QCanBusFrame::DataFrame); + for (int d = 0; d < bytes.length(); d++) { if (tokens[d + 3] != "") { - thisFrame.data[d] = tokens[d + 3].toInt(NULL, 16); + bytes[d] = static_cast(tokens[d + 3].toInt(nullptr, 16)); } - else thisFrame.data[d] = 0; + else bytes[d] = 0; } + thisFrame.setPayload(bytes); frames->append(thisFrame); } } @@ -700,7 +730,7 @@ bool FrameFileIO::isCANHackerFile(QString filename) QList tokens = line.split(' '); if (tokens.length() > 3) { - if (tokens[1].toInt(NULL, 16) > 0) + if (tokens[1].toInt(nullptr, 16) > 0) { int len = tokens[2].toInt(); if (len > -1 && len < 9) @@ -768,21 +798,22 @@ bool FrameFileIO::loadCANHackerFile(QString filename, QVector* frames) multiplier = 1; //special case. Assume no decimal means microseconds } //qDebug() << "decimal places " << decimalPlaces; - thisFrame.timestamp = (int64_t)(tokens[0].toDouble() * multiplier); - thisFrame.ID = tokens[1].toInt(NULL, 16); - thisFrame.extended = (thisFrame.ID > 0x7FF); + thisFrame.setTimeStamp(QCanBusFrame::TimeStamp(0, static_cast(tokens[0].toDouble() * multiplier))); + thisFrame.setFrameId( static_cast(tokens[1].toInt(nullptr, 16)) ); + thisFrame.setExtendedFrameFormat((thisFrame.frameId() > 0x7FF)); thisFrame.isReceived = true; - thisFrame.remote = false; + thisFrame.setFrameType(QCanBusFrame::DataFrame); thisFrame.bus = 0; - thisFrame.len = tokens[2].toInt(NULL, 16); - for (unsigned int d = 0; d < thisFrame.len; d++) + QByteArray bytes( tokens[2].toInt(nullptr, 16), 0); + for (int d = 0; d < thisFrame.payload().length(); d++) { if (tokens[d + 3] != "") { - thisFrame.data[d] = tokens[d + 3].toInt(NULL, 16); + bytes[d] = static_cast(tokens[d + 3].toInt(nullptr, 16)); } - else thisFrame.data[d] = 0; + else bytes[d] = 0; } + thisFrame.setPayload(bytes); frames->append(thisFrame); } else foundErrors = true; @@ -884,22 +915,23 @@ bool FrameFileIO::loadCANOpenFile(QString filename, QVector* frames) QList tokens = line.split(','); if (tokens.length() > 11) { - thisFrame.timestamp = (int64_t)(tokens[1].simplified().toDouble() * 1000.0); - thisFrame.ID = Utility::ParseStringToNum(tokens[5].simplified()); - thisFrame.extended = (thisFrame.ID > 0x7FF); + thisFrame.setTimeStamp(QCanBusFrame::TimeStamp(0, static_cast(tokens[1].simplified().toDouble() * 1000.0))); + thisFrame.setFrameId(static_cast(Utility::ParseStringToNum(tokens[5].simplified()))); + thisFrame.setExtendedFrameFormat( (thisFrame.frameId() > 0x7FF) ); thisFrame.isReceived = true; - thisFrame.remote = false; + thisFrame.setFrameType(QCanBusFrame::DataFrame); thisFrame.bus = 0; QList dataTok = tokens[11].simplified().split(' '); - thisFrame.len = dataTok.length(); - for (unsigned int d = 0; d < thisFrame.len; d++) + QByteArray bytes(dataTok.length(), 0); + for (int d = 0; d < thisFrame.payload().length(); d++) { if (dataTok[d] != "") { - thisFrame.data[d] = dataTok[d].simplified().toInt(NULL, 16); + bytes[d] = static_cast(dataTok[d].simplified().toInt(nullptr, 16)); } - else thisFrame.data[d] = 0; + else bytes[d] = 0; } + thisFrame.setPayload(bytes); frames->append(thisFrame); } else foundErrors = true; @@ -915,6 +947,10 @@ bool FrameFileIO::saveCRTDFile(QString filename, const QVector* frames QFile *outFile = new QFile(filename); int lineCounter = 0; + unsigned char *data; + int dataLen; + const CANFrame *frame; + if (!outFile->open(QIODevice::WriteOnly | QIODevice::Text)) { delete outFile; @@ -922,7 +958,7 @@ bool FrameFileIO::saveCRTDFile(QString filename, const QVector* frames } //write in float format with 6 digits after the decimal point - outFile->write(QString::number(frames->at(0).timestamp / 1000000.0, 'f', 6).toUtf8() + tr(" CXX GVRET-PC Reverse Engineering Tool Output V").toUtf8() + QString::number(VERSION).toUtf8()); + outFile->write(QString::number(frames->at(0).timeStamp().microSeconds() / 1000000.0, 'f', 6).toUtf8() + tr(" CXX GVRET-PC Reverse Engineering Tool Output V").toUtf8() + QString::number(VERSION).toUtf8()); outFile->write("\n"); for (int c = 0; c < frames->count(); c++) @@ -934,24 +970,28 @@ bool FrameFileIO::saveCRTDFile(QString filename, const QVector* frames lineCounter = 0; } - outFile->write(QString::number(frames->at(c).timestamp / 1000000.0, 'f', 6).toUtf8()); + frame = &frames->at(c); + data = reinterpret_cast(frame->payload().data()); + dataLen = frame->payload().count(); + + outFile->write(QString::number(frame->timeStamp().microSeconds() / 1000000.0, 'f', 6).toUtf8()); outFile->putChar(' '); - outFile->write(QString::number(frames->at(c).bus + 1).toUtf8()); - if (frames->at(c).isReceived) outFile->putChar('R'); + outFile->write(QString::number(frame->bus + 1).toUtf8()); + if (frame->isReceived) outFile->putChar('R'); else outFile->putChar('T'); - if (frames->at(c).extended) + if (frame->hasExtendedFrameFormat()) { outFile->write("29 "); } else outFile->write("11 "); - outFile->write(QString::number(frames->at(c).ID, 16).toUpper().rightJustified(8, '0').toUtf8()); + outFile->write(QString::number(frame->frameId(), 16).toUpper().rightJustified(8, '0').toUtf8()); outFile->putChar(' '); - for (unsigned int temp = 0; temp < frames->at(c).len; temp++) + for (int temp = 0; temp < dataLen; temp++) { - outFile->write(QString::number(frames->at(c).data[temp], 16).toUpper().rightJustified(2, '0').toUtf8()); + outFile->write(QString::number(data[temp], 16).toUpper().rightJustified(2, '0').toUtf8()); outFile->putChar(' '); } @@ -993,7 +1033,7 @@ bool FrameFileIO::isPCANFile(QString filename) { if (fileVersion == 1) { - int id = line.mid(28, 8).simplified().toUInt(NULL, 16); + uint32_t id = line.mid(28, 8).simplified().toUInt(nullptr, 16); if (id > 0 && id < 0x1FFFFFFF) { int len = line.mid(38,1).toInt(); @@ -1004,7 +1044,7 @@ bool FrameFileIO::isPCANFile(QString filename) else if (fileVersion == 2) { - int id = line.mid(25, 8).simplified().toUInt(NULL, 16); + uint32_t id = line.mid(25, 8).simplified().toUInt(nullptr, 16); if (id > 0 && id < 0x1FFFFFFF) { int len = line.mid(37,2).trimmed().toInt(); @@ -1082,65 +1122,67 @@ bool FrameFileIO::loadPCANFile(QString filename, QVector* frames) { if (fileVersion == 1) { - thisFrame.timestamp = (uint64_t)(line.mid(10, 8).simplified().toDouble() * 1000.0); - thisFrame.ID = line.mid(28, 8).simplified().toUInt(NULL, 16); - if (thisFrame.ID < 0x1FFFFFFF) + thisFrame.setTimeStamp(QCanBusFrame::TimeStamp(0, (uint64_t)(line.mid(10, 8).simplified().toDouble() * 1000.0))); + thisFrame.setFrameId(line.mid(28, 8).simplified().toUInt(nullptr, 16)); + if (thisFrame.frameId() < 0x1FFFFFFF) { - thisFrame.len = line.mid(38,1).toInt(); + QByteArray bytes(line.mid(38,1).toInt(), 0); thisFrame.isReceived = true; thisFrame.bus = 0; if (line.at(28) == ' ') { - thisFrame.extended = false; + thisFrame.setExtendedFrameFormat(false); } else { - thisFrame.extended = true; + thisFrame.setExtendedFrameFormat(true); } if (line.at(41) == 'R') { - thisFrame.remote = true; + thisFrame.setFrameType(QCanBusFrame::RemoteRequestFrame); } else { - QList tokens = line.mid(41, thisFrame.len * 3).split(' '); - thisFrame.remote = false; - for (unsigned int d = 0; d < thisFrame.len; d++) + QList tokens = line.mid(41, thisFrame.payload().length() * 3).split(' '); + thisFrame.setFrameType(QCanBusFrame::DataFrame); + for (int d = 0; d < thisFrame.payload().length(); d++) { if (tokens[d] != "") { - thisFrame.data[d] = tokens[d].toInt(NULL, 16); + bytes[d] = static_cast(tokens[d].toInt(nullptr, 16)); } - else thisFrame.data[d] = 0; + else bytes[d] = 0; } } + thisFrame.setPayload(bytes); frames->append(thisFrame); } } else if (fileVersion == 2) { - thisFrame.timestamp = (uint64_t)(line.mid(8, 13).simplified().toDouble() * 1000.0); - thisFrame.ID = line.mid(25, 8).simplified().toUInt(NULL, 16); - if (thisFrame.ID < 0x1FFFFFFF) + thisFrame.setTimeStamp(QCanBusFrame::TimeStamp(0, static_cast(line.mid(8, 13).simplified().toDouble() * 1000.0))); + thisFrame.setFrameId(line.mid(25, 8).simplified().toUInt(nullptr, 16)); + if (thisFrame.frameId() < 0x1FFFFFFF) { - thisFrame.len = line.mid(37,2).trimmed().toInt(); - qDebug() << thisFrame.len; + QByteArray bytes(line.mid(37,2).trimmed().toInt(), 0); + qDebug() << thisFrame.payload().length(); thisFrame.isReceived = true; thisFrame.bus = 0; if (line.at(25) == ' ') { - thisFrame.extended = false; + thisFrame.setExtendedFrameFormat(false); } else { - thisFrame.extended = true; + thisFrame.setExtendedFrameFormat(true); } if (line.at(40) == 'R') { - thisFrame.remote = true; + thisFrame.setFrameType(QCanBusFrame::RemoteRequestFrame); } else { - QList tokens = line.mid(40, thisFrame.len * 3).split(' '); - thisFrame.remote = false; - for (unsigned int d = 0; d < thisFrame.len; d++) + QList tokens = line.mid(40, thisFrame.payload().length() * 3).split(' '); + thisFrame.setFrameType(QCanBusFrame::DataFrame); + for (int d = 0; d < thisFrame.payload().length(); d++) { if (tokens[d] != "") { - thisFrame.data[d] = tokens[d].toInt(NULL, 16); + bytes[d] = static_cast(tokens[d].toInt(nullptr, 16)); } - else thisFrame.data[d] = 0; + else bytes[d] = 0; } } + thisFrame.setPayload(bytes); frames->append(thisFrame); } } @@ -1157,7 +1199,7 @@ bool FrameFileIO::isCanalyzerASC(QString filename) QFile *inFile = new QFile(filename); QByteArray line; int lineCounter = 0; - bool isMatch = true; + bool isMatch = false; bool inHeader = true; QList tokens; @@ -1190,17 +1232,15 @@ bool FrameFileIO::isCanalyzerASC(QString filename) tokens = line.simplified().split(' '); if (tokens.length() > 5) { - uint64_t time = (uint64_t)(tokens[0].toDouble() * (double)1000000.0); - if (time <= 0) isMatch = false; - int id = tokens[2].toUInt(NULL, 16); - if (id < 1 || id > 0x1FFFFFFF) isMatch = false; - int len = tokens[5].toUInt(); - if (len < 0 || len > 8) isMatch = false; - if (tokens.count() < (len + 6)) isMatch = false; + uint64_t time = static_cast(tokens[0].toDouble() * 1000000.0); + if (time > 0) isMatch = true; + uint32_t id = static_cast(tokens[2].toUInt(nullptr, 16)); + if (id > 0 && id < 0x20000000) isMatch = true; + int len = tokens[5].toInt(); + if (len > 0 && len < 9) isMatch = true; + if (tokens.count() >= (len + 6)) isMatch = true; } - else isMatch = false; } - else isMatch = false; } } catch (...) @@ -1227,7 +1267,7 @@ bool FrameFileIO::loadCanalyzerASC(QString filename, QVector* frames) int lineCounter = 0; bool foundErrors = false; bool inHeader = true; - thisFrame.remote = false; + thisFrame.setFrameType(QCanBusFrame::DataFrame); QList tokens; if (!inFile->open(QIODevice::ReadOnly | QIODevice::Text)) @@ -1258,26 +1298,38 @@ bool FrameFileIO::loadCanalyzerASC(QString filename, QVector* frames) tokens = line.simplified().split(' '); if (tokens.length() > 5) { - thisFrame.timestamp = (uint64_t)(tokens[0].toDouble() * (double)1000000.0); - thisFrame.ID = tokens[2].toUInt(NULL, 16); - thisFrame.len = tokens[5].toUInt(); - if (thisFrame.len > 8) return false; + thisFrame.setTimeStamp(QCanBusFrame::TimeStamp(0, static_cast(tokens[0].toDouble() * 1000000.0))); + if (tokens[2].endsWith('x')) + { + QByteArray copied_id = tokens[2]; + copied_id.chop(1); + thisFrame.setFrameId(copied_id.toUInt(nullptr, 16)); + thisFrame.setExtendedFrameFormat(true); + } + else + { + thisFrame.setFrameId(tokens[2].toUInt(nullptr, 16)); + thisFrame.setExtendedFrameFormat(false); + } + QByteArray bytes(tokens[5].toInt(), 0); + if (thisFrame.payload().length() > 8) return false; + if (thisFrame.payload().length() < 0) return false; thisFrame.isReceived = tokens[3].toUpper().contains("RX"); - thisFrame.bus = tokens[1].toUInt(); - thisFrame.extended = (thisFrame.ID > 0x7FF); - thisFrame.remote = false; - for (unsigned int d = 6; d < (6 + thisFrame.len); d++) + thisFrame.bus = tokens[1].toInt(); + if (tokens[4] == "r") thisFrame.setFrameType(QCanBusFrame::RemoteRequestFrame); + for (int d = 6; d < (6 + static_cast(thisFrame.payload().length())); d++) { if (tokens.count() > d) { - thisFrame.data[d - 6] = tokens[d].toInt(NULL, 16); + bytes[d - 6] = static_cast(tokens[d].toInt(nullptr, 16)); } else //expected byte wasn't there to read. Set it zero and set error flag { - thisFrame.data[d - 6] = 0; + bytes[d - 6] = 0; foundErrors = true; } } + thisFrame.setPayload(bytes); } frames->append(thisFrame); } @@ -1292,10 +1344,15 @@ bool FrameFileIO::saveCanalyzerASC(QString filename, const QVector* fr { QFile *outFile = new QFile(filename); int lineCounter = 0; - uint64_t offsetTime = frames->at(0).timestamp; + int64_t offsetTime = frames->at(0).timeStamp().microSeconds(); + + unsigned char *data; + int dataLen; + const CANFrame *frame; + for (int c = 0; c < frames->count(); c++) { - if (frames->at(c).timestamp < offsetTime) offsetTime = frames->at(c).timestamp; + if (frames->at(c).timeStamp().microSeconds() < offsetTime) offsetTime = frames->at(c).timeStamp().microSeconds(); } if (!outFile->open(QIODevice::WriteOnly | QIODevice::Text)) @@ -1325,34 +1382,44 @@ bool FrameFileIO::saveCanalyzerASC(QString filename, const QVector* fr lineCounter = 0; } - uint64_t timeStamp = (frames->at(c).timestamp - offsetTime) / 1000000ull; + frame = &frames->at(c); + data = reinterpret_cast(frame->payload().data()); + dataLen = frame->payload().count(); + + uint64_t timeStamp = (frame->timeStamp().microSeconds() - offsetTime) / 1000000ull; int tsLen = QString::number(timeStamp).length(); int precision = 6; //vector seems to keep 10 bytes at the start of the line for the timestamp. It should never exceed this //and there should never be a precision over 6 digits after the decimal if (tsLen > 3) precision = 9 - tsLen; - outFile->write(QString::number((frames->at(c).timestamp - offsetTime) / 1000000.0, 'f', precision).rightJustified(10, ' ').toUtf8()); + outFile->write(QString::number((frame->timeStamp().microSeconds() - offsetTime) / 1000000.0, 'f', precision).rightJustified(10, ' ').toUtf8()); outFile->putChar(' '); - outFile->write(QString::number(frames->at(c).bus + 1).toUtf8()); + outFile->write(QString::number(frame->bus + 1).toUtf8()); outFile->write(" "); - if (frames->at(c).extended) - outFile->write(QString::number(frames->at(c).ID, 16).toUpper().rightJustified(8, '0').toUtf8()); + if (frames->at(c).hasExtendedFrameFormat()) + { + outFile->write(QString::number(frame->frameId(), 16).toUpper().rightJustified(8, '0').toUtf8()); + outFile->write("x"); + } else { - outFile->write(QString::number(frames->at(c).ID, 16).toUpper().rightJustified(3, '0').toUtf8()); - outFile->write(" "); + outFile->write(QString::number(frame->frameId(), 16).toUpper().rightJustified(3, '0').toUtf8()); + outFile->write(" "); } outFile->write(" "); - if (frames->at(c).isReceived) outFile->write("Rx D "); - else outFile->write("Tx D "); + if (frames->at(c).isReceived) outFile->write("Rx "); + else outFile->write("Tx "); - outFile->write(QString::number(frames->at(c).len).toUtf8()); + if (frames->at(c).frameType() == QCanBusFrame::RemoteRequestFrame) outFile->write("r "); + else outFile->write("d "); + + outFile->write(QString::number(dataLen).toUtf8()); outFile->write(" "); - for (unsigned int temp = 0; temp < frames->at(c).len; temp++) + for (int temp = 0; temp < dataLen; temp++) { - outFile->write(QString::number(frames->at(c).data[temp], 16).toUpper().rightJustified(2, '0').toUtf8()); + outFile->write(QString::number(data[temp], 16).toUpper().rightJustified(2, '0').toUtf8()); outFile->write(" "); } @@ -1376,7 +1443,7 @@ bool FrameFileIO::isCanalyzerBLF(QString filename) delete inFile; return false; } - inFile->read((char *)&header, sizeof(header)); + inFile->read(reinterpret_cast(&header), sizeof(header)); if (qFromLittleEndian(header.sig) == 0x47474F4C) { qDebug() << "Proper BLF file header token"; @@ -1458,10 +1525,10 @@ bool FrameFileIO::loadNativeCSVFile(QString filename, QVector* frames) CANFrame thisFrame; QByteArray line; int fileVersion = 1; - long long timeStamp = Utility::GetTimeMS(); + uint64_t timeStamp = Utility::GetTimeMS(); int lineCounter = 0; bool foundErrors = false; - thisFrame.remote = false; + thisFrame.setFrameType(QCanBusFrame::DataFrame); if (!inFile->open(QIODevice::ReadOnly | QIODevice::Text)) { @@ -1488,43 +1555,48 @@ bool FrameFileIO::loadNativeCSVFile(QString filename, QVector* frames) { if (tokens[0].length() > 3) { - long long temp = tokens[0].toLongLong(); - thisFrame.timestamp = temp; + thisFrame.setTimeStamp(QCanBusFrame::TimeStamp(0, tokens[0].toULongLong())); } else { timeStamp += 5; - thisFrame.timestamp = timeStamp; + thisFrame.setTimeStamp(QCanBusFrame::TimeStamp(0, timeStamp)); } - thisFrame.ID = tokens[1].toInt(NULL, 16); - if (tokens[2].toUpper().contains("TRUE")) thisFrame.extended = 1; - else thisFrame.extended = 0; + thisFrame.setFrameId(tokens[1].toUInt(nullptr, 16)); + if (tokens[2].toUpper().contains("TRUE")) thisFrame.setExtendedFrameFormat(true); + else thisFrame.setExtendedFrameFormat(false); - thisFrame.remote = false; + thisFrame.setFrameType(QCanBusFrame::DataFrame); if (fileVersion == 1) { thisFrame.isReceived = true; thisFrame.bus = tokens[3].toInt(); - thisFrame.len = tokens[4].toUInt(); - if (thisFrame.len > 8) thisFrame.len = 8; - for (int c = 0; c < 8; c++) thisFrame.data[c] = 0; - if (thisFrame.len + 5 > (unsigned int) tokens.length()) thisFrame.len = tokens.length() - 5; - for (unsigned int d = 0; d < thisFrame.len; d++) - thisFrame.data[d] = tokens[5 + d].toInt(NULL, 16); + int lng = tokens[4].toInt(); + if (lng > 8) lng = 8; + if (lng < 0) lng = 0; + if (lng + 5 > tokens.length()) lng = tokens.length() - 5; + QByteArray bytes(lng, 0); + for (int c = 0; c < 8; c++) bytes[c] = 0; + for (int d = 0; d < thisFrame.payload().length(); d++) + bytes[d] = static_cast(tokens[5 + d].toInt(nullptr, 16)); + thisFrame.setPayload(bytes); } else if (fileVersion == 2) { if (tokens[3].at(0) == 'R') thisFrame.isReceived = true; else thisFrame.isReceived = false; - thisFrame.bus = tokens[4].toInt(); - thisFrame.len = tokens[5].toUInt(); - if (thisFrame.len > 8) thisFrame.len = 8; - if (thisFrame.len + 6 > (unsigned int) tokens.length()) thisFrame.len = tokens.length() - 6; - for (int c = 0; c < 8; c++) thisFrame.data[c] = 0; - for (unsigned int d = 0; d < thisFrame.len; d++) - thisFrame.data[d] = tokens[6 + d].toInt(NULL, 16); + thisFrame.bus = tokens[4].toInt(); + int lng = tokens[5].toInt(); + if (lng > 8) lng = 8; + if (lng < 0) lng = 0; + if (lng + 6 > tokens.length()) lng = tokens.length() - 6; + QByteArray bytes(lng, 0); + for (int c = 0; c < 8; c++) bytes[c] = 0; + for (int d = 0; d < thisFrame.payload().length(); d++) + bytes[d] = static_cast(tokens[6 + d].toInt(nullptr, 16)); + thisFrame.setPayload(bytes); } frames->append(thisFrame); @@ -1542,6 +1614,10 @@ bool FrameFileIO::saveNativeCSVFile(QString filename, const QVector* f QFile *outFile = new QFile(filename); int lineCounter = 0; + unsigned char *data; + int dataLen; + const CANFrame *frame; + if (!outFile->open(QIODevice::WriteOnly | QIODevice::Text)) { delete outFile; @@ -1560,28 +1636,32 @@ bool FrameFileIO::saveNativeCSVFile(QString filename, const QVector* f lineCounter = 0; } - outFile->write(QString::number(frames->at(c).timestamp).toUtf8()); + frame = &frames->at(c); + data = reinterpret_cast(frame->payload().data()); + dataLen = frame->payload().count(); + + outFile->write(QString::number(frame->timeStamp().microSeconds()).toUtf8()); outFile->putChar(44); - outFile->write(QString::number(frames->at(c).ID, 16).toUpper().rightJustified(8, '0').toUtf8()); + outFile->write(QString::number(frame->frameId(), 16).toUpper().rightJustified(8, '0').toUtf8()); outFile->putChar(44); - if (frames->at(c).extended) outFile->write("true,"); + if (frame->hasExtendedFrameFormat()) outFile->write("true,"); else outFile->write("false,"); - if (frames->at(c).isReceived) outFile->write("Rx,"); + if (frame->isReceived) outFile->write("Rx,"); else outFile->write("Tx,"); - outFile->write(QString::number(frames->at(c).bus).toUtf8()); + outFile->write(QString::number(frame->bus).toUtf8()); outFile->putChar(44); - outFile->write(QString::number(frames->at(c).len).toUtf8()); + outFile->write(QString::number(dataLen).toUtf8()); outFile->putChar(44); - for (unsigned int temp = 0; temp < 8; temp++) + for (int temp = 0; temp < 8; temp++) { - if (temp < frames->at(c).len) - outFile->write(QString::number(frames->at(c).data[temp], 16).toUpper().rightJustified(2, '0').toUtf8()); + if (temp < dataLen) + outFile->write(QString::number(data[temp], 16).toUpper().rightJustified(2, '0').toUtf8()); else outFile->write("00"); outFile->putChar(44); @@ -1639,32 +1719,41 @@ bool FrameFileIO::closeContinuousNative() bool FrameFileIO::writeContinuousNative(const QVector* frames, int beginningFrame) { + + unsigned char *data; + int dataLen; + const CANFrame *frame; + if (!continuousFile.isOpen()) return false; qDebug() << "Bgn: " << beginningFrame << " Count: " << frames->count(); for (int c = beginningFrame; c < frames->count(); c++) { - continuousFile.write(QString::number(frames->at(c).timestamp).toUtf8()); + frame = &frames->at(c); + data = reinterpret_cast(frame->payload().data()); + dataLen = frame->payload().count(); + + continuousFile.write(QString::number(frame->timeStamp().microSeconds()).toUtf8()); continuousFile.putChar(44); - continuousFile.write(QString::number(frames->at(c).ID, 16).toUpper().rightJustified(8, '0').toUtf8()); + continuousFile.write(QString::number(frame->frameId(), 16).toUpper().rightJustified(8, '0').toUtf8()); continuousFile.putChar(44); - if (frames->at(c).extended) continuousFile.write("true,"); + if (frame->hasExtendedFrameFormat()) continuousFile.write("true,"); else continuousFile.write("false,"); - if (frames->at(c).isReceived) continuousFile.write("Rx,"); + if (frame->isReceived) continuousFile.write("Rx,"); else continuousFile.write("Tx,"); - continuousFile.write(QString::number(frames->at(c).bus).toUtf8()); + continuousFile.write(QString::number(frame->bus).toUtf8()); continuousFile.putChar(44); - continuousFile.write(QString::number(frames->at(c).len).toUtf8()); + continuousFile.write(QString::number(dataLen).toUtf8()); continuousFile.putChar(44); - for (unsigned int temp = 0; temp < 8; temp++) + for (int temp = 0; temp < 8; temp++) { - if (temp < frames->at(c).len) - continuousFile.write(QString::number(frames->at(c).data[temp], 16).toUpper().rightJustified(2, '0').toUtf8()); + if (temp < dataLen) + continuousFile.write(QString::number(data[temp], 16).toUpper().rightJustified(2, '0').toUtf8()); else continuousFile.write("00"); continuousFile.putChar(44); @@ -1706,7 +1795,7 @@ bool FrameFileIO::isGenericCSVFile(QString filename) { QList tokens = line.split(','); - int ID = tokens[0].toInt(NULL, 16); + int ID = tokens[0].toInt(nullptr, 16); if (ID < 1 || ID > 0x1FFFFFFF) isMatch = false; if (tokens.count() < 2) @@ -1739,10 +1828,10 @@ bool FrameFileIO::loadGenericCSVFile(QString filename, QVector* frames QFile *inFile = new QFile(filename); CANFrame thisFrame; QByteArray line; - long long timeStamp = Utility::GetTimeMS(); + uint64_t timeStamp = Utility::GetTimeMS(); int lineCounter = 0; bool foundErrors = false; - thisFrame.remote = false; + thisFrame.setFrameType(QCanBusFrame::DataFrame); if (!inFile->open(QIODevice::ReadOnly | QIODevice::Text)) { @@ -1766,17 +1855,16 @@ bool FrameFileIO::loadGenericCSVFile(QString filename, QVector* frames QList tokens = line.split(','); timeStamp += 5000; - thisFrame.timestamp = timeStamp; - thisFrame.ID = tokens[0].toInt(NULL, 16); - if (thisFrame.ID > 0x7FF) thisFrame.extended = true; - else thisFrame.extended = false; + thisFrame.setTimeStamp(QCanBusFrame::TimeStamp(0, timeStamp)); + thisFrame.setFrameId(tokens[0].toUInt(nullptr, 16)); + if (thisFrame.frameId() > 0x7FF) thisFrame.setExtendedFrameFormat(true); + else thisFrame.setExtendedFrameFormat(false); thisFrame.bus = 0; - thisFrame.remote = false; + thisFrame.setFrameType(QCanBusFrame::DataFrame); QList dataTok = tokens[1].split(' '); - thisFrame.len = dataTok.length(); - if (thisFrame.len > 8) thisFrame.len = 8; - for (unsigned int d = 0; d < thisFrame.len; d++) thisFrame.data[d] = dataTok[d].toInt(NULL, 16); - + QByteArray bytes(dataTok.length(), 0); + for (int d = 0; d < thisFrame.payload().length(); d++) bytes[d] = static_cast(dataTok[d].toInt(nullptr, 16)); + thisFrame.setPayload(bytes); frames->append(thisFrame); } else foundErrors = true; @@ -1792,6 +1880,10 @@ bool FrameFileIO::saveGenericCSVFile(QString filename, const QVector* QFile *outFile = new QFile(filename); int lineCounter = 0; + unsigned char *data; + int dataLen; + const CANFrame *frame; + if (!outFile->open(QIODevice::WriteOnly | QIODevice::Text)) { delete outFile; @@ -1810,12 +1902,16 @@ bool FrameFileIO::saveGenericCSVFile(QString filename, const QVector* lineCounter = 0; } - outFile->write(QString::number(frames->at(c).ID, 16).toUpper().rightJustified(8, '0').toUtf8()); + frame = &frames->at(c); + data = reinterpret_cast(frame->payload().data()); + dataLen = frame->payload().count(); + + outFile->write(QString::number(frame->frameId(), 16).toUpper().rightJustified(8, '0').toUtf8()); outFile->putChar(44); - for (unsigned int temp = 0; temp < frames->at(c).len; temp++) + for (int temp = 0; temp < dataLen; temp++) { - outFile->write(QString::number(frames->at(c).data[temp], 16).toUpper().rightJustified(2, '0').toUtf8()); + outFile->write(QString::number(data[temp], 16).toUpper().rightJustified(2, '0').toUtf8()); outFile->putChar(' '); } @@ -1859,10 +1955,10 @@ bool FrameFileIO::isLogFile(QString filename) QList timeToks = tokens[0].split(':'); if (timeToks.count() != 4) isMatch = false; - int ID = tokens[3].right(tokens[3].length() - 2).toInt(NULL, 16); + int ID = tokens[3].right(tokens[3].length() - 2).toInt(nullptr, 16); if (ID < 1 || ID > 0x1FFFFFFF) isMatch = false; if (tokens[4] != "S" && tokens[4] != "X" && tokens[4] != "SR" && tokens[4] != "XR") isMatch = false; - int len = tokens[5].toUInt(); + int len = tokens[5].toInt(); if (len > 8) isMatch = false; } else isMatch = false; @@ -1944,32 +2040,36 @@ bool FrameFileIO::loadLogFile(QString filename, QVector* frames) if (tokens.length() >= 6) { QList timeToks = tokens[0].split(':'); - timeStamp = (timeToks[0].toInt() * (1000ul * 1000ul * 60ul * 60ul)) + (timeToks[1].toInt() * (1000ul * 1000ul * 60ul)) - + (timeToks[2].toInt() * (1000ul * 1000ul)) + (timeToks[3].toInt() * 100ul); - thisFrame.timestamp = timeStamp; + timeStamp = (timeToks[0].toUInt() * (1000ul * 1000ul * 60ul * 60ul)) + (timeToks[1].toUInt() * (1000ul * 1000ul * 60ul)) + + (timeToks[2].toUInt() * (1000ul * 1000ul)) + (timeToks[3].toUInt() * 100ul); + thisFrame.setTimeStamp(QCanBusFrame::TimeStamp(0, timeStamp)); if (tokens[1].at(0) == 'R') thisFrame.isReceived = true; else thisFrame.isReceived = false; - thisFrame.ID = tokens[3].right(tokens[3].length() - 2).toInt(NULL, 16); + thisFrame.setFrameId(tokens[3].right(tokens[3].length() - 2).toUInt(nullptr, 16)); if (tokens[4] == "S") { - thisFrame.extended = false; - thisFrame.remote = false; + thisFrame.setExtendedFrameFormat(false); + thisFrame.setFrameType(QCanBusFrame::DataFrame); } else if (tokens[4] == "X") { - thisFrame.extended = true; - thisFrame.remote = false; + thisFrame.setExtendedFrameFormat(true); + thisFrame.setFrameType(QCanBusFrame::DataFrame); } else if (tokens[4] == "SR") { - thisFrame.extended = false; - thisFrame.remote = true; + thisFrame.setExtendedFrameFormat(false); + thisFrame.setFrameType(QCanBusFrame::RemoteRequestFrame); } else { // XR - thisFrame.extended = true; - thisFrame.remote = true; + thisFrame.setExtendedFrameFormat(true); + thisFrame.setFrameType(QCanBusFrame::RemoteRequestFrame); } thisFrame.bus = tokens[2].toInt() - 1; - thisFrame.len = tokens[5].toUInt(); - if (thisFrame.len > 8) thisFrame.len = 8; - if (!thisFrame.remote) { - for (unsigned int d = 0; d < thisFrame.len; d++) - thisFrame.data[d] = tokens[d + 6].toInt(NULL, 16); + + int lng = tokens[5].toInt(); + if (lng > 8) lng = 8; + if (lng < 0) lng = 0; + QByteArray bytes(lng, 0); + if (thisFrame.frameType() != QCanBusFrame::RemoteRequestFrame) { + for (int d = 0; d < thisFrame.payload().length(); d++) + bytes[d] = static_cast(tokens[d + 6].toInt(nullptr, 16)); } + thisFrame.setPayload(bytes); frames->append(thisFrame); } else foundErrors = true; @@ -1986,6 +2086,10 @@ bool FrameFileIO::saveLogFile(QString filename, const QVector* frames) QDateTime timestamp, tempStamp; int lineCounter = 0; + unsigned char *data; + int dataLen; + const CANFrame *frame; + //timestamp = QDateTime::currentDateTime(); if (!outFile->open(QIODevice::WriteOnly | QIODevice::Text)) @@ -2019,28 +2123,32 @@ bool FrameFileIO::saveLogFile(QString filename, const QVector* frames) lineCounter = 0; } - tempStamp = QDateTime::fromMSecsSinceEpoch(frames->at(c).timestamp / 1000); + frame = &frames->at(c); + data = reinterpret_cast(frame->payload().data()); + dataLen = frame->payload().count(); + + tempStamp = QDateTime::fromMSecsSinceEpoch(frame->timeStamp().microSeconds() / 1000); outFile->write(tempStamp.toString("hh:mm:ss:zzz").toUtf8()); - if (frames->at(c).isReceived) outFile->write(" Rx "); + if (frame->isReceived) outFile->write(" Rx "); else outFile->write(" Tx "); // busmaster channel start at 1 - outFile->write(QString::number(frames->at(c).bus+1).toUtf8() + " "); + outFile->write(QString::number(frame->bus + 1).toUtf8() + " "); outFile->write("0x"); - if (frames->at(c).extended && frames->at(c).ID > 0x7FF) { - outFile->write(QString::number(frames->at(c).ID, 16).toUpper().rightJustified(8, '0').toUtf8()); + if (frame->hasExtendedFrameFormat() && frame->frameId() > 0x7FF) { + outFile->write(QString::number(frame->frameId(), 16).toUpper().rightJustified(8, '0').toUtf8()); } else { - outFile->write(QString::number(frames->at(c).ID, 16).toUpper().rightJustified(3, '0').toUtf8()); + outFile->write(QString::number(frame->frameId(), 16).toUpper().rightJustified(3, '0').toUtf8()); } - if (frames->at(c).extended) outFile->write(" x"); + if (frame->hasExtendedFrameFormat()) outFile->write(" x"); else outFile->write(" s"); - if (frames->at(c).remote) outFile->write("r "); + if (frame->frameType() == QCanBusFrame::RemoteRequestFrame) outFile->write("r "); else outFile->write(" "); - outFile->write(QString::number(frames->at(c).len).toUtf8() + " "); + outFile->write(QString::number(dataLen).toUtf8() + " "); - if (!frames->at(c).remote) { - for (unsigned int temp = 0; temp < frames->at(c).len; temp++) + if (frame->frameType() != QCanBusFrame::RemoteRequestFrame) { + for (int temp = 0; temp < dataLen; temp++) { - outFile->write(QString::number(frames->at(c).data[temp], 16).toUpper().rightJustified(2, '0').toUtf8()); + outFile->write(QString::number(data[temp], 16).toUpper().rightJustified(2, '0').toUtf8()); outFile->putChar(' '); } } @@ -2097,7 +2205,7 @@ bool FrameFileIO::loadIXXATFile(QString filename, QVector* frames) uint64_t timeStamp = Utility::GetTimeMS(); int lineCounter = 0; bool foundErrors = false; - thisFrame.remote = false; + thisFrame.setFrameType(QCanBusFrame::DataFrame); if (!inFile->open(QIODevice::ReadOnly | QIODevice::Text)) { @@ -2125,8 +2233,8 @@ bool FrameFileIO::loadIXXATFile(QString filename, QVector* frames) QStringList timeToks = timePortion.split(':'); if (timeToks.length() >= 3) { - timeStamp = (timeToks[0].toInt() * (1000ul * 1000ul * 60ul * 60ul)) + (timeToks[1].toInt() * (1000ul * 1000ul * 60ul)) - + (timeToks[2].toDouble() * (1000.0 * 1000.0)); + timeStamp = (timeToks[0].toUInt() * (1000ul * 1000ul * 60ul * 60ul)) + (timeToks[1].toUInt() * (1000ul * 1000ul * 60ul)) + + static_cast(timeToks[2].toDouble() * (1000.0 * 1000.0)); } else { @@ -2134,29 +2242,30 @@ bool FrameFileIO::loadIXXATFile(QString filename, QVector* frames) foundErrors = true; return false; } - thisFrame.timestamp = timeStamp; - thisFrame.ID = Utility::unQuote(tokens[1]).toInt(NULL, 16); + thisFrame.setTimeStamp(QCanBusFrame::TimeStamp(0, timeStamp)); + thisFrame.setFrameId(Utility::unQuote(tokens[1]).toUInt(nullptr, 16)); QString tempStr = Utility::unQuote(tokens[2]).toUpper(); if (tempStr.length() > 0) { - if (tempStr.at(0) == 'S') thisFrame.extended = false; - else thisFrame.extended = true; + if (tempStr.at(0) == 'S') thisFrame.setExtendedFrameFormat(false); + else thisFrame.setExtendedFrameFormat(true); } else { - thisFrame.extended = false; + thisFrame.setExtendedFrameFormat(false); foundErrors = true; return false; } thisFrame.isReceived = true; thisFrame.bus = 0; - thisFrame.remote = false; + thisFrame.setFrameType(QCanBusFrame::DataFrame); QStringList dataToks = Utility::unQuote(tokens[4]).simplified().split(' '); - thisFrame.len = dataToks.length(); - if (thisFrame.len > 8) return false; - for (unsigned int d = 0; d < thisFrame.len; d++) thisFrame.data[d] = dataToks[d].toInt(NULL, 16); + QByteArray bytes(dataToks.length(), 0); + if (thisFrame.payload().length() > 8) return false; + for (int d = 0; d < thisFrame.payload().length(); d++) bytes[d] = static_cast(dataToks[d].toInt(nullptr, 16)); + thisFrame.setPayload(bytes); frames->append(thisFrame); } else return false; @@ -2173,6 +2282,10 @@ bool FrameFileIO::saveIXXATFile(QString filename, const QVector* frame QDateTime timestamp, tempStamp; int lineCounter = 0; + unsigned char *data; + int dataLen; + const CANFrame *frame; + timestamp = QDateTime::currentDateTime(); if (!outFile->open(QIODevice::WriteOnly | QIODevice::Text)) @@ -2184,7 +2297,7 @@ bool FrameFileIO::saveIXXATFile(QString filename, const QVector* frame outFile->write("ASCII Trace IXXAT SavvyCAN V" + QString::number(VERSION).toUtf8() + "\n"); outFile->write("Date: " + timestamp.toString("d:M:yyyy").toUtf8() + "\n"); outFile->write("Start time: " + timestamp.toString("h:m:s").toUtf8() + "\n"); - timestamp.addMSecs((frames->last().timestamp - frames->first().timestamp) / 1000); + timestamp = timestamp.addMSecs((frames->last().timeStamp().microSeconds() - frames->first().timeStamp().microSeconds()) / 1000); outFile->write("Stop time: " + timestamp.toString("h:m:s").toUtf8() + "\n"); outFile->write("Overruns: 0\n"); outFile->write("Baudrate: 500 kbit/s\n"); //could be a lie... this code has no way to know the baud rate (at the moment) @@ -2198,17 +2311,22 @@ bool FrameFileIO::saveIXXATFile(QString filename, const QVector* frame qApp->processEvents(); lineCounter = 0; } - tempStamp = QDateTime::fromMSecsSinceEpoch(frames->at(c).timestamp / 1000); + + frame = &frames->at(c); + data = reinterpret_cast(frame->payload().data()); + dataLen = frame->payload().count(); + + tempStamp = QDateTime::fromMSecsSinceEpoch(frame->timeStamp().microSeconds() / 1000); outFile->write("\"" + tempStamp.toString("h:m:s.").toUtf8() + tempStamp.toString("z").rightJustified(3, '0').toUtf8() + "\""); - outFile->write(",\"" + QString::number(frames->at(c).ID, 16).toUpper().rightJustified(8, '0').toUtf8() + "\""); - if (frames->at(c).extended) outFile->write(",\"Ext\""); + outFile->write(",\"" + QString::number(frame->frameId(), 16).toUpper().rightJustified(8, '0').toUtf8() + "\""); + if (frame->hasExtendedFrameFormat()) outFile->write(",\"Ext\""); else outFile->write(",\"Std\""); outFile->write(",\"\",\""); - for (unsigned int temp = 0; temp < frames->at(c).len; temp++) + for (int temp = 0; temp < dataLen; temp++) { - outFile->write(QString::number(frames->at(c).data[temp], 16).toUpper().rightJustified(2, '0').toUtf8()); + outFile->write(QString::number(data[temp], 16).toUpper().rightJustified(2, '0').toUtf8()); outFile->putChar(' '); } @@ -2245,14 +2363,14 @@ bool FrameFileIO::isCANDOFile(QString filename) data = inFile->read(12); - int ID = (((unsigned int)data[3] & 0x0F) * 256 + (unsigned int)data[2]); - int len = (unsigned char)data[3] >> 4; + int ID = ((data[3] & 0x0F) * 256 + data[2]); + int len = data[3] >> 4; if (len <= 8 && ID <= 0x7FF) { if (len < 8) { - if (data[4 + len] != (char)0xFF) isMatch = false; + if (data[4 + len] != static_cast(0xFF)) isMatch = false; } } else isMatch = false; @@ -2275,9 +2393,9 @@ bool FrameFileIO::loadCANDOFile(QString filename, QVector* frames) int lineCounter = 0; QByteArray data; int timeOffset = 0; - uint64_t lastTimeStamp = 0; + int64_t lastTimeStamp = 0; bool foundErrors = false; - thisFrame.remote = false; + thisFrame.setFrameType(QCanBusFrame::DataFrame); if (!inFile->open(QIODevice::ReadOnly)) { @@ -2300,26 +2418,29 @@ bool FrameFileIO::loadCANDOFile(QString filename, QVector* frames) } data = inFile->read(12); + unsigned char *uData = reinterpret_cast(data.data()); thisFrame.bus = 0; thisFrame.isReceived = true; - thisFrame.extended = false; //format is incapable of extended frames - thisFrame.remote = false; - - thisFrame.timestamp = 1000000ul * ((unsigned char)data[0] >> 2); - thisFrame.timestamp += (((data[0] & 3) << 8) + (unsigned char)data[1]) * 1000; - thisFrame.timestamp += timeOffset; - if (thisFrame.timestamp < lastTimeStamp) + thisFrame.setExtendedFrameFormat(false); //format is incapable of extended frames + thisFrame.setFrameType(QCanBusFrame::DataFrame); + qint64 tempStamp; + tempStamp = 1000000ul * (uData[0] >> 2); + tempStamp += (((uData[0] & 3) << 8) + uData[1]) * 1000; + tempStamp += timeOffset; + if (tempStamp < lastTimeStamp) { timeOffset += 60000000ul; } - lastTimeStamp = thisFrame.timestamp; - thisFrame.ID = (((unsigned char)data[3] & 0x0F) * 256 + (unsigned char)data[2]) & 0x7FF; - thisFrame.len = (unsigned char)data[3] >> 4; + lastTimeStamp = tempStamp; + thisFrame.setTimeStamp(QCanBusFrame::TimeStamp(0, tempStamp)); + thisFrame.setFrameId(((uData[3] & 0x0F) * 256 + uData[2]) & 0x7FF); + QByteArray bytes(uData[3] >> 4, 0); - if (thisFrame.len <= 8 && thisFrame.ID <= 0x7FF) + if (thisFrame.payload().length() <= 8 && thisFrame.frameId() <= 0x7FF) { - for (unsigned int d = 0; d < thisFrame.len; d++) thisFrame.data[d] = (unsigned char)data[4 + d]; + for (int d = 0; d < thisFrame.payload().length(); d++) bytes[d] = data[4 + d]; + thisFrame.setPayload(bytes); frames->append(thisFrame); } else foundErrors = true; @@ -2336,7 +2457,12 @@ bool FrameFileIO::saveCANDOFile(QString filename, const QVector* frame int lineCounter = 0; QByteArray data; CANFrame thisFrame; - int ms, id; + int id; + qint64 ms; + + unsigned char *inData; + int inDataLen; + const CANFrame *frame; if (!outFile->open(QIODevice::WriteOnly)) { @@ -2348,7 +2474,7 @@ bool FrameFileIO::saveCANDOFile(QString filename, const QVector* frame //The initial frame in official files sets the global time but I don't care so it is set all zeros here. thisFrame = frames->at(0); - ms = (thisFrame.timestamp / 1000); + ms = (thisFrame.timeStamp().microSeconds() / 1000); data[0] = (((ms / 1000) % 60) << 2) + ((ms % 1000) >> 8); data[1] = (char)(ms & 0xFF); data[2] = (char)0xFF; @@ -2364,18 +2490,22 @@ bool FrameFileIO::saveCANDOFile(QString filename, const QVector* frame qApp->processEvents(); lineCounter = 0; } + + frame = &frames->at(c); + inData = reinterpret_cast(frame->payload().data()); + inDataLen = frame->payload().count(); + for (int j = 0; j < 8; j++) data[4 + j] = (char)0xFF; - thisFrame = frames->at(c); - if (!thisFrame.extended) + if (!frame->hasExtendedFrameFormat()) { - ms = (thisFrame.timestamp / 1000); - id = thisFrame.ID & 0x7FF; + ms = (frame->timeStamp().microSeconds() / 1000); + id = frame->frameId() & 0x7FF; data[0] = (((ms / 1000) % 60) << 2) + ((ms % 1000) >> 8); data[1] = (char)(ms & 0xFF); data[2] = (char)(id & 0xFF); - data[3] = (char)((id >> 8) + (thisFrame.len << 4)); - for (unsigned int d = 0; d < thisFrame.len; d++) data[4 + d] = (char)thisFrame.data[d]; + data[3] = (char)((id >> 8) + (inDataLen << 4)); + for (int d = 0; d < inDataLen; d++) data[4 + d] = (char)inData[d]; outFile->write(data); } } @@ -2455,7 +2585,7 @@ bool FrameFileIO::loadMicrochipFile(QString filename, QVector* frames) long long timeStamp; int lineCounter = 0; bool foundErrors = false; - thisFrame.remote = false; + thisFrame.setFrameType(QCanBusFrame::DataFrame); if (!inFile->open(QIODevice::ReadOnly | QIODevice::Text)) { @@ -2488,18 +2618,19 @@ bool FrameFileIO::loadMicrochipFile(QString filename, QVector* frames) if (tokens.length() >= 4) { timeStamp = tokens[0].toInt() * 1000; - thisFrame.timestamp = timeStamp; + thisFrame.setTimeStamp(QCanBusFrame::TimeStamp(0, timeStamp)); if (tokens[1].at(0) == 'R') thisFrame.isReceived = true; else thisFrame.isReceived = false; - thisFrame.remote = false; - thisFrame.ID = Utility::ParseStringToNum(tokens[2]); - if (thisFrame.ID <= 0x7FF) thisFrame.extended = false; - else thisFrame.extended = true; + thisFrame.setFrameType(QCanBusFrame::DataFrame); + thisFrame.setFrameId(static_cast( Utility::ParseStringToNum(tokens[2])) ); + if (thisFrame.frameId() <= 0x7FF) thisFrame.setExtendedFrameFormat(false); + else thisFrame.setExtendedFrameFormat(true); thisFrame.bus = 0; - thisFrame.len = tokens[3].toUInt(); - if (thisFrame.len > 8) thisFrame.len = 8; - if (thisFrame.len + 4 > (unsigned int) tokens.length()) thisFrame.len = tokens.length() - 4; - for (unsigned int d = 0; d < thisFrame.len; d++) thisFrame.data[d] = (unsigned char)Utility::ParseStringToNum(tokens[4 + d]); + QByteArray bytes(tokens[3].toInt(), 0); + if (thisFrame.payload().length() > 8) thisFrame.payload().resize(8); + if (thisFrame.payload().length() + 4 > tokens.length()) thisFrame.payload().resize( tokens.length() - 4 ); + for (int d = 0; d < thisFrame.payload().length(); d++) bytes[d] = static_cast( Utility::ParseStringToNum(tokens[4 + d]) ); + thisFrame.setPayload(bytes); frames->append(thisFrame); } else foundErrors = true; @@ -2529,6 +2660,10 @@ bool FrameFileIO::saveMicrochipFile(QString filename, const QVector* f QDateTime timestamp, tempStamp; int lineCounter = 0; + unsigned char *data; + int dataLen; + const CANFrame *frame; + timestamp = QDateTime::currentDateTime(); if (!outFile->open(QIODevice::WriteOnly | QIODevice::Text)) @@ -2555,15 +2690,19 @@ bool FrameFileIO::saveMicrochipFile(QString filename, const QVector* f lineCounter = 0; } - outFile->write(QString::number((int)(frames->at(c).timestamp / 1000)).toUtf8()); - if (frames->at(c).isReceived) outFile->write(";RX;"); - else outFile->write(";TX;"); - outFile->write("0x" + QString::number(frames->at(c).ID, 16).toUpper().rightJustified(8, '0').toUtf8() + ";"); - outFile->write(QString::number(frames->at(c).len).toUtf8() + ";"); + frame = &frames->at(c); + data = reinterpret_cast(frame->payload().data()); + dataLen = frame->payload().count(); - for (unsigned int temp = 0; temp < frames->at(c).len; temp++) + outFile->write(QString::number((frame->timeStamp().microSeconds() / 1000)).toUtf8()); + if (frame->isReceived) outFile->write(";RX;"); + else outFile->write(";TX;"); + outFile->write("0x" + QString::number(frame->frameId(), 16).toUpper().rightJustified(8, '0').toUtf8() + ";"); + outFile->write(QString::number(dataLen).toUtf8() + ";"); + + for (int temp = 0; temp < dataLen; temp++) { - outFile->write("0x" + QString::number(frames->at(c).data[temp], 16).toUpper().rightJustified(2, '0').toUtf8()); + outFile->write("0x" + QString::number(data[temp], 16).toUpper().rightJustified(2, '0').toUtf8()); outFile->putChar(';'); } @@ -2609,12 +2748,12 @@ bool FrameFileIO::isTraceFile(QString filename) QList timestampToks = tokens[1].split(':'); if (timestampToks.count() != 4) isMatch = false; - int ID = tokens[2].toLong(NULL, 16); + long ID = tokens[2].toLong(nullptr, 16); if (ID < 1 || ID > 0x1FFFFFFF) isMatch = false; int len = tokens[3].toInt(); if (len > 8 || len < 0) isMatch = false; QList dataToks = tokens[4].split(' '); - if (len > (unsigned int) dataToks.length()) isMatch = false; + if (len > dataToks.length()) isMatch = false; } else isMatch = false; } @@ -2668,7 +2807,7 @@ bool FrameFileIO::loadTraceFile(QString filename, QVector* frames) long long timeStamp = 0; int lineCounter = 0; bool foundErrors = false; - thisFrame.remote = false; + thisFrame.setFrameType(QCanBusFrame::DataFrame); if (!inFile->open(QIODevice::ReadOnly | QIODevice::Text)) { @@ -2699,23 +2838,24 @@ bool FrameFileIO::loadTraceFile(QString filename, QVector* frames) { QList timestampToks = tokens[1].split(':'); - timeStamp = timestampToks[0].toInt() * 1000000ul * 60 * 60; - timeStamp += timestampToks[1].toInt() * 1000000ul * 60; - timeStamp += timestampToks[2].toInt() * 1000000ul; + timeStamp = timestampToks[0].toInt() * 1000000l * 60 * 60; + timeStamp += timestampToks[1].toInt() * 1000000l * 60; + timeStamp += timestampToks[2].toInt() * 1000000l; timeStamp += timestampToks[3].toInt() * 100; - thisFrame.timestamp = timeStamp; + thisFrame.setTimeStamp(QCanBusFrame::TimeStamp(0, static_cast(timeStamp))); - thisFrame.ID = tokens[2].toLong(NULL, 16); - if (thisFrame.ID <= 0x7FF) thisFrame.extended = false; - else thisFrame.extended = true; + thisFrame.setFrameId(static_cast(tokens[2].toLong(nullptr, 16))); + if (thisFrame.frameId() <= 0x7FF) thisFrame.setExtendedFrameFormat(false); + else thisFrame.setExtendedFrameFormat(true); thisFrame.bus = 0; - thisFrame.remote = false; - thisFrame.len = tokens[3].toUInt(); - if (thisFrame.len > 8) thisFrame.len = 8; + thisFrame.setFrameType(QCanBusFrame::DataFrame); + QByteArray bytes(tokens[3].toInt(), 0); + if (thisFrame.payload().length() > 8) thisFrame.payload().resize(8); QList dataToks = tokens[4].split(' '); - if (thisFrame.len > (unsigned int) dataToks.length()) thisFrame.len = (unsigned int) dataToks.length(); - for (unsigned int d = 0; d < thisFrame.len; d++) thisFrame.data[d] = (unsigned char)dataToks[d].toInt(NULL, 16); + if (thisFrame.payload().length() > dataToks.length()) thisFrame.payload().resize(dataToks.length()); + for (int d = 0; d < thisFrame.payload().length(); d++) bytes[d] = static_cast(dataToks[d].toInt(nullptr, 16)); + thisFrame.setPayload(bytes); frames->append(thisFrame); } else foundErrors = true; @@ -2732,9 +2872,13 @@ bool FrameFileIO::saveTraceFile(QString filename, const QVector * fram QFile *outFile = new QFile(filename); QDateTime timestamp; int lineCounter = 0; - uint64_t tempTime; + int64_t tempTime; int tempTimePiece; + unsigned char *data; + int dataLen; + const CANFrame *frame; + timestamp = QDateTime::currentDateTime(); if (!outFile->open(QIODevice::WriteOnly | QIODevice::Text)) @@ -2773,38 +2917,41 @@ bool FrameFileIO::saveTraceFile(QString filename, const QVector * fram //lineCounter = 0; } + frame = &frames->at(c); + data = reinterpret_cast(frame->payload().data()); + dataLen = frame->payload().count(); //1F D3 3F FF 08 FF E0 CB outFile->write(QString::number(lineCounter).rightJustified(10, ' ').toUtf8()); outFile->write("\t"); - tempTime = frames->at(c).timestamp; - tempTimePiece = tempTime / 1000000ul / 60 / 60; - tempTime -= tempTimePiece * 1000000ul * 60 * 60; + tempTime = frame->timeStamp().microSeconds(); + tempTimePiece = static_cast(tempTime / 1000000l / 60 / 60); + tempTime -= tempTimePiece * 1000000l * 60 * 60; outFile->write(QString::number(tempTimePiece).rightJustified(2, '0').toUtf8()); outFile->write(":"); - tempTimePiece = tempTime / 1000000ul / 60; - tempTime -= tempTimePiece * 1000000ul * 60; + tempTimePiece = static_cast(tempTime / 1000000l / 60); + tempTime -= tempTimePiece * 1000000l * 60; outFile->write(QString::number(tempTimePiece).rightJustified(2, '0').toUtf8()); outFile->write(":"); - tempTimePiece = tempTime / 1000000ul; - tempTime -= tempTimePiece * 1000000ul; + tempTimePiece = static_cast(tempTime / 1000000l); + tempTime -= tempTimePiece * 1000000l; outFile->write(QString::number(tempTimePiece).rightJustified(2, '0').toUtf8()); outFile->write(":"); - tempTimePiece = tempTime / 100; + tempTimePiece = static_cast(tempTime / 100); outFile->write(QString::number(tempTimePiece).rightJustified(4, '0').toUtf8()); outFile->write("\t"); - outFile->write(QString::number(frames->at(c).ID, 16).toUpper().rightJustified(8, '0').toUtf8() + "\t"); + outFile->write(QString::number(frame->frameId(), 16).toUpper().rightJustified(8, '0').toUtf8() + "\t"); - outFile->write(QString::number(frames->at(c).len).toUtf8() + "\t"); + outFile->write(QString::number(dataLen).toUtf8() + "\t"); - for (unsigned int temp = 0; temp < frames->at(c).len; temp++) + for (int temp = 0; temp < dataLen; temp++) { - outFile->write(QString::number(frames->at(c).data[temp], 16).toUpper().rightJustified(2, '0').toUtf8()); + outFile->write(QString::number(data[temp], 16).toUpper().rightJustified(2, '0').toUtf8()); outFile->putChar(' '); } @@ -2823,6 +2970,10 @@ bool FrameFileIO::saveCanDumpFile(QString filename, const QVector * fr int lineCounter = 0; double tempTime; + unsigned char *data; + int dataLen; + const CANFrame *frame; + timestamp = QDateTime::currentDateTime(); if (!outFile->open(QIODevice::WriteOnly | QIODevice::Text)) @@ -2839,27 +2990,31 @@ bool FrameFileIO::saveCanDumpFile(QString filename, const QVector * fr qApp->processEvents(); } + frame = &frames->at(c); + data = reinterpret_cast(frame->payload().data()); + dataLen = frame->payload().count(); + outFile->write("("); - tempTime = frames->at(c).timestamp / 1000000.0; + tempTime = frame->timeStamp().microSeconds() / 1000000.0; outFile->write(QString::number(tempTime,'f', 6).rightJustified(17, '0').toUtf8()); outFile->write(") vcan0 "); - if (frames->at(c).extended) { - outFile->write(QString::number(frames->at(c).ID, 16).rightJustified(8,'0').toUpper().toUtf8()); + if (frame->hasExtendedFrameFormat()) { + outFile->write(QString::number(frame->frameId(), 16).rightJustified(8,'0').toUpper().toUtf8()); } else { - outFile->write(QString::number(frames->at(c).ID, 16).rightJustified(3,'0').toUpper().toUtf8()); + outFile->write(QString::number(frame->frameId(), 16).rightJustified(3,'0').toUpper().toUtf8()); } outFile->write("#"); - if (frames->at(c).remote) { + if (frame->frameType() == QCanBusFrame::RemoteRequestFrame) { outFile->write("R"); - outFile->write(QString::number(frames->at(c).len).toUtf8()); + outFile->write(QString::number(dataLen).toUtf8()); } else { - for (unsigned int temp = 0; temp < frames->at(c).len; temp++) + for (int temp = 0; temp < dataLen; temp++) { - outFile->write(QString::number(frames->at(c).data[temp], 16).rightJustified(2,'0').toUpper().toUtf8()); + outFile->write(QString::number(data[temp], 16).rightJustified(2,'0').toUpper().toUtf8()); } } @@ -2907,7 +3062,7 @@ bool FrameFileIO::isCanDumpFile(QString filename) ret = timeExp.exactMatch(tokens[0]); if(!ret) isMatch = false; - uint64_t timestamp = (uint64_t)(timeExp.cap(1).toDouble(&ret) * (double)1000000.0); + /*uint64_t timestamp = (uint64_t)*/(timeExp.cap(1).toDouble(&ret) /** (double)1000000.0*/); if(!ret) isMatch = false; if (line.contains('[')) //the expanded format @@ -2941,7 +3096,7 @@ bool FrameFileIO::isCanDumpFile(QString filename) } /* ID */ - int ID = IdValExp.cap(1).toInt(&ret, 16); + /*int ID = */IdValExp.cap(1).toInt(&ret, 16); QString val= IdValExp.cap(2); @@ -2965,7 +3120,7 @@ bool FrameFileIO::isCanDumpFile(QString filename) isMatch = false; break; } - int data = valExp.cap(1).toInt(&ret, 16); + /*int data = */valExp.cap(1).toInt(&ret, 16); if(!ret) { isMatch = false; @@ -3032,22 +3187,23 @@ bool FrameFileIO::loadCanDumpFile(QString filename, QVector* frames) ret = timeExp.exactMatch(tokens[0]); if(!ret) continue; - thisFrame.timestamp = (uint64_t)(timeExp.cap(1).toDouble(&ret) * (double)1000000.0); + thisFrame.setTimeStamp(QCanBusFrame::TimeStamp(0, (uint64_t)(timeExp.cap(1).toDouble(&ret) * (double)1000000.0))); if(!ret) continue; if (line.contains('[')) //the expanded format (second one from the above list) { //(1551774790.942758) can1 7A8 [8] F4 DC D1 83 0E 02 00 00 // 0 1 2 3 4 5 6 7 8 9 10 11 - thisFrame.ID = tokens[2].toULong(nullptr, 16); - if (thisFrame.ID > 0x7FF) thisFrame.extended = true; - else thisFrame.extended = false; - thisFrame.remote = false; - thisFrame.len = tokens[3].at(1) - '0'; - for (int c = 0; c < thisFrame.len; c++) + thisFrame.setFrameId(tokens[2].toLong(nullptr, 16)); + if (thisFrame.frameId() > 0x7FF) thisFrame.setExtendedFrameFormat(true); + else thisFrame.setExtendedFrameFormat(false); + thisFrame.setFrameType(QCanBusFrame::DataFrame); + QByteArray bytes(tokens[3].at(1) - '0', 0); + for (int c = 0; c < thisFrame.payload().length(); c++) { - thisFrame.data[c] = tokens[4 + c].toInt(nullptr, 16); + bytes[c] = static_cast(tokens[4 + c].toInt(nullptr, 16)); } + thisFrame.setPayload(bytes); } else //the more concise format (first one from list above) { @@ -3061,32 +3217,32 @@ bool FrameFileIO::loadCanDumpFile(QString filename, QVector* frames) } /* ID */ - thisFrame.ID = IdValExp.cap(1).toInt(&ret, 16); + thisFrame.setFrameId(static_cast(IdValExp.cap(1).toInt(&ret, 16))); if (IdValExp.cap(1).length() > 3) { - thisFrame.extended = true; + thisFrame.setExtendedFrameFormat(true); } else { - thisFrame.extended = false; + thisFrame.setExtendedFrameFormat(false); } QString val= IdValExp.cap(2); pos = 0; - thisFrame.len = 0; + QByteArray bytes; if (val.startsWith("R") && val.at(1).isDigit()) { - thisFrame.len = val.at(1).toLatin1() - '0'; - thisFrame.remote = true; + thisFrame.payload().resize( val.at(1).toLatin1() - '0' ); + thisFrame.setFrameType(QCanBusFrame::RemoteRequestFrame); } else { - thisFrame.remote = false; + thisFrame.setFrameType(QCanBusFrame::DataFrame); /* val byte per byte */ while ((pos = valExp.indexIn(val, pos)) != -1) { - thisFrame.data[thisFrame.len] = valExp.cap(1).toInt(&ret, 16); + bytes.append((char)valExp.cap(1).toInt(&ret, 16)); if(!ret) continue; - thisFrame.len++; pos += valExp.matchedLength(); } } + thisFrame.setPayload(bytes); } /*NB: should we make sure len <= 8? */ @@ -3100,6 +3256,96 @@ bool FrameFileIO::loadCanDumpFile(QString filename, QVector* frames) return true; } +bool FrameFileIO::isLawicelFile(QString filename) +{ + QFile *inFile = new QFile(filename); + QByteArray line; + int lineCounter = 0; + bool isMatch = false; + + if (!inFile->open(QIODevice::ReadOnly | QIODevice::Text)) + { + delete inFile; + return false; + } + + try + { + while (!inFile->atEnd() && lineCounter < 100) { + lineCounter++; + + line = inFile->readLine().toUpper(); + if (line.length() > 4 && !line.startsWith("S")) + { + int ID = line.mid(0, 3).toInt(nullptr, 16); + if (ID > 0 && ID < 0x800) + { + line.remove(0, 3); + int len = line.length() / 2; + if (len > -1 && len < 9) isMatch = true; + } + } + } + } + catch (...) + { + isMatch = false; + } + inFile->close(); + delete inFile; + return isMatch; +} + +/*Example line: +1D5210000000000E0D7 +The first three digits are the ID, all bytes are then two hex digits after that. So, the length is determined by line length +Skip all lines that start with an S +*/ +bool FrameFileIO::loadLawicelFile(QString filename, QVector* frames) +{ + QFile *inFile = new QFile(filename); + CANFrame thisFrame; + QByteArray line; + int lineCounter = 0; + bool foundErrors = false; + quint64 timeStamp = 0; + + if (!inFile->open(QIODevice::ReadOnly | QIODevice::Text)) + { + delete inFile; + return false; + } + + while (!inFile->atEnd()) { + lineCounter++; + if (lineCounter > 100) + { + qApp->processEvents(); + lineCounter = 0; + } + line = inFile->readLine().simplified(); + if (line.length() > 4 && !line.startsWith("S")) + { + thisFrame.setTimeStamp(QCanBusFrame::TimeStamp(0, timeStamp += 100)); + thisFrame.setFrameId( line.mid(0, 3).toInt(nullptr, 16) ); + thisFrame.setExtendedFrameFormat(false); + thisFrame.isReceived = true; + thisFrame.setFrameType(QCanBusFrame::DataFrame); + thisFrame.bus = 0; + line.remove(0, 3); + QByteArray bytes(line.length() / 2, 0); + for (int d = 0; d < bytes.length(); d++) + { + bytes[d] = static_cast(line.mid(d * 2, 2).toInt(nullptr, 16)); + } + thisFrame.setPayload(bytes); + frames->append(thisFrame); + } + } + inFile->close(); + delete inFile; + return !foundErrors; +} bool FrameFileIO::isKvaserFile(QString filename) { @@ -3155,7 +3401,7 @@ bool FrameFileIO::loadKvaserFile(QString filename, QVector *frames, bo int lineCounter = 0; int base = 10; bool foundErrors = false; - thisFrame.remote = false; + thisFrame.setFrameType(QCanBusFrame::DataFrame); if (useHex) base = 16; @@ -3185,18 +3431,18 @@ bool FrameFileIO::loadKvaserFile(QString filename, QVector *frames, bo //Chn Identifier Flg DLC D0...1...2...3...4...5...6..D7 Time Dir // 0 000000AD 8 FF FF 00 00 00 00 00 00 154.266550 R thisFrame.bus = line.mid(0,3).simplified().toInt(); - thisFrame.ID = line.mid(4,10).simplified().toInt(NULL, base); - if (thisFrame.ID > 0x7FF) thisFrame.extended = true; - else thisFrame.extended = false; - thisFrame.remote = false; - thisFrame.len = line.mid(21, 3).simplified().toInt(); + thisFrame.setFrameId(line.mid(4,10).simplified().toInt(nullptr, base)); + if (thisFrame.frameId() > 0x7FF) thisFrame.setExtendedFrameFormat(true); + else thisFrame.setExtendedFrameFormat(false); + thisFrame.setFrameType(QCanBusFrame::DataFrame); + QByteArray bytes(line.mid(21, 3).simplified().toInt(), 0); for (int i = 0; i < 8; i++) { - thisFrame.data[i] = line.mid(25 + i * 4, 3).simplified().toInt(NULL, base); + bytes[i] = line.mid(25 + i * 4, 3).simplified().toInt(nullptr, base); } - thisFrame.timestamp = line.mid(57, 14).simplified().toDouble() * 1000000; + thisFrame.setTimeStamp(QCanBusFrame::TimeStamp(0, line.mid(57, 14).simplified().toDouble() * 1000000)); if (line.mid(72, 1).toUpper() == "R") thisFrame.isReceived = true; else thisFrame.isReceived = false; - + thisFrame.setPayload(bytes); frames->append(thisFrame); } //else foundErrors = true; @@ -3267,7 +3513,7 @@ bool FrameFileIO::loadCabanaFile(QString filename, QVector* frames) uint64_t lastTimeStamp = 0; int lineCounter = 0; bool foundErrors = false; - thisFrame.remote = false; + thisFrame.setFrameType(QCanBusFrame::DataFrame); if (!inFile->open(QIODevice::ReadOnly | QIODevice::Text)) { @@ -3303,42 +3549,41 @@ bool FrameFileIO::loadCabanaFile(QString filename, QVector* frames) } if(timeStampBaseSet) { - thisFrame.timestamp = ((uint64_t)(temp) - timeStampBase); - lastTimeStamp = thisFrame.timestamp; + thisFrame.setTimeStamp(QCanBusFrame::TimeStamp(0, ((uint64_t)(temp) - timeStampBase))); + lastTimeStamp = thisFrame.timeStamp().microSeconds(); } else { - thisFrame.timestamp = (lastTimeStamp + 1); - lastTimeStamp = thisFrame.timestamp; + thisFrame.setTimeStamp(QCanBusFrame::TimeStamp(0, (lastTimeStamp + 1))); + lastTimeStamp = thisFrame.timeStamp().microSeconds(); } } else { - thisFrame.timestamp = (lastTimeStamp + 1); - lastTimeStamp = thisFrame.timestamp; + thisFrame.setTimeStamp(QCanBusFrame::TimeStamp(0, (lastTimeStamp + 1))); + lastTimeStamp = thisFrame.timeStamp().microSeconds(); } - thisFrame.ID = tokens[1].toInt(); - if (thisFrame.ID > 0x7ff) thisFrame.extended = 1; - else thisFrame.extended = 0; + thisFrame.setFrameId(tokens[1].toInt()); + if (thisFrame.frameId() > 0x7ff) thisFrame.setExtendedFrameFormat(true); + else thisFrame.setExtendedFrameFormat(false); - thisFrame.remote = false; + thisFrame.setFrameType(QCanBusFrame::DataFrame); thisFrame.isReceived = true; thisFrame.bus = tokens[2].toInt(); - thisFrame.len = 8; - + QByteArray bytes(8,0); { - unsigned long long int tempData = tokens[3].toULongLong(NULL, 16); - thisFrame.data[0] = ((tempData >> 56) & 0xFF); - thisFrame.data[1] = ((tempData >> 48) & 0xFF); - thisFrame.data[2] = ((tempData >> 40) & 0xFF); - thisFrame.data[3] = ((tempData >> 32) & 0xFF); - thisFrame.data[4] = ((tempData >> 24) & 0xFF); - thisFrame.data[5] = ((tempData >> 16) & 0xFF); - thisFrame.data[6] = ((tempData >> 8) & 0xFF); - thisFrame.data[7] = (tempData & 0xFF); + unsigned long long int tempData = tokens[3].toULongLong(nullptr, 16); + bytes[0] = ((tempData >> 56) & 0xFF); + bytes[1] = ((tempData >> 48) & 0xFF); + bytes[2] = ((tempData >> 40) & 0xFF); + bytes[3] = ((tempData >> 32) & 0xFF); + bytes[4] = ((tempData >> 24) & 0xFF); + bytes[5] = ((tempData >> 16) & 0xFF); + bytes[6] = ((tempData >> 8) & 0xFF); + bytes[7] = (tempData & 0xFF); } - + thisFrame.setPayload(bytes); frames->append(thisFrame); } else foundErrors = true; @@ -3354,6 +3599,10 @@ bool FrameFileIO::saveCabanaFile(QString filename, const QVector* fram QFile *outFile = new QFile(filename); int lineCounter = 0; + unsigned char *data; + int dataLen; + const CANFrame *frame; + if (!outFile->open(QIODevice::WriteOnly | QIODevice::Text)) { delete outFile; @@ -3372,23 +3621,27 @@ bool FrameFileIO::saveCabanaFile(QString filename, const QVector* fram lineCounter = 0; } - double tempTimeStamp = frames->at(c).timestamp; + frame = &frames->at(c); + data = reinterpret_cast(frame->payload().data()); + dataLen = frame->payload().count(); + + double tempTimeStamp = frame->timeStamp().microSeconds(); tempTimeStamp /= 1000000; outFile->write(QString::number(tempTimeStamp, 'f').toUtf8()); outFile->write(".0"); outFile->putChar(44); - outFile->write(QString::number(frames->at(c).ID, 10).toUpper().toUtf8()); + outFile->write(QString::number(frame->frameId(), 10).toUpper().toUtf8()); outFile->putChar(44); - outFile->write(QString::number(frames->at(c).bus).toUtf8()); + outFile->write(QString::number(frame->bus).toUtf8()); outFile->putChar(44); - for (unsigned int temp = 0; temp < 8; temp++) + for (int temp = 0; temp < 8; temp++) { - if (temp < frames->at(c).len) - outFile->write(QString::number(frames->at(c).data[temp], 16).toUpper().rightJustified(2, '0').toUtf8()); + if (temp < dataLen) + outFile->write(QString::number(data[temp], 16).toUpper().rightJustified(2, '0').toUtf8()); else outFile->write("00"); } diff --git a/framefileio.h b/framefileio.h index 8839e76..06da738 100644 --- a/framefileio.h +++ b/framefileio.h @@ -41,6 +41,7 @@ public: static bool loadCANDOFile(QString, QVector*); static bool loadVehicleSpyFile(QString, QVector*); static bool loadCanDumpFile(QString, QVector*); + static bool loadLawicelFile(QString, QVector*); static bool loadPCANFile(QString, QVector*); static bool loadKvaserFile(QString, QVector*, bool); static bool loadCanalyzerASC(QString, QVector*); @@ -61,6 +62,7 @@ public: static bool isCANDOFile(QString); static bool isVehicleSpyFile(QString); static bool isCanDumpFile(QString); + static bool isLawicelFile(QString); static bool isPCANFile(QString); static bool isKvaserFile(QString); static bool isCanalyzerASC(QString); diff --git a/frameplaybackobject.cpp b/frameplaybackobject.cpp index e990efe..b918b07 100644 --- a/frameplaybackobject.cpp +++ b/frameplaybackobject.cpp @@ -68,7 +68,7 @@ quint64 FramePlaybackObject::updatePosition(bool forward) //only send frame out if its ID is checked in the list. Otherwise discard it. CANFrame *thisFrame = ¤tSeqItem->data[currentPosition]; uint32_t originalBus = thisFrame->bus; - if (currentSeqItem->idFilters.find(thisFrame->ID).value()) + if (currentSeqItem->idFilters.find(thisFrame->frameId()).value()) { if (whichBusSend > -1) { @@ -90,7 +90,7 @@ quint64 FramePlaybackObject::updatePosition(bool forward) thisFrame->bus = originalBus; } - return thisFrame->timestamp; + return thisFrame->timeStamp().microSeconds(); } quint64 FramePlaybackObject::peekPosition(bool forward) @@ -113,7 +113,7 @@ quint64 FramePlaybackObject::peekPosition(bool forward) } } CANFrame *thisFrame = ¤tSeqItem->data[peekCurrentPosition]; - return thisFrame->timestamp; + return thisFrame->timeStamp().microSeconds(); } void FramePlaybackObject::piStart() @@ -197,8 +197,8 @@ void FramePlaybackObject::startPlaybackForward() { playbackTimer->setInterval(1); playbackElapsed.start(); - if (currentSeqItem->data[currentPosition].timestamp > 2000) - playbackLastTimeStamp = currentSeqItem->data[currentPosition].timestamp - 2000; + if (currentSeqItem->data[currentPosition].timeStamp().microSeconds() > 2000) + playbackLastTimeStamp = currentSeqItem->data[currentPosition].timeStamp().microSeconds() - 2000; else playbackLastTimeStamp = 0; } playbackTimer->start(); @@ -219,7 +219,7 @@ void FramePlaybackObject::startPlaybackBackward() { playbackElapsed.start(); playbackTimer->setInterval(1); - playbackLastTimeStamp = currentSeqItem->data[currentPosition].timestamp + 2000; + playbackLastTimeStamp = currentSeqItem->data[currentPosition].timeStamp().microSeconds() + 2000; } playbackTimer->start(); } @@ -350,8 +350,8 @@ void FramePlaybackObject::timerTriggered() if (peekPosition(true) == 0xFFFFFFFFFFFFFFFFull) { updatePosition(true); //this'll go to the next log (if there is one) - if (currentSeqItem->data[currentPosition].timestamp > 1000) - playbackLastTimeStamp = currentSeqItem->data[currentPosition].timestamp - 1000; + if (currentSeqItem->data[currentPosition].timeStamp().microSeconds() > 1000) + playbackLastTimeStamp = currentSeqItem->data[currentPosition].timeStamp().microSeconds() - 1000; else playbackLastTimeStamp = 0; } } @@ -367,7 +367,7 @@ void FramePlaybackObject::timerTriggered() if (peekPosition(false) == 0xFFFFFFFFFFFFFFFFull) { updatePosition(false); //this'll go to the next log (if there is one) - playbackLastTimeStamp = currentSeqItem->data[currentPosition].timestamp + 1000; + playbackLastTimeStamp = currentSeqItem->data[currentPosition].timeStamp().microSeconds() + 1000; } } statusCounter++; diff --git a/frameplaybackwindow.cpp b/frameplaybackwindow.cpp index 7da98ef..85fd517 100644 --- a/frameplaybackwindow.cpp +++ b/frameplaybackwindow.cpp @@ -4,8 +4,11 @@ #include #include #include +#include +#include #include "connections/canconmanager.h" #include "helpwindow.h" +#include "filterutility.h" /* * Notes about new functionality: @@ -40,7 +43,7 @@ FramePlaybackWindow::FramePlaybackWindow(const QVector *frames, QWidge modelFrames = frames; - currentSeqItem = NULL; + currentSeqItem = nullptr; currentSeqNum = -1; currentPosition = 0; forward = true; @@ -78,6 +81,9 @@ FramePlaybackWindow::FramePlaybackWindow(const QVector *frames, QWidge playbackObject.setPlaybackInterval(ui->spinPlaySpeed->value()); + // Prevent annoying accidental horizontal scrolling when filter list is populated with long interpreted message names + ui->listID->horizontalScrollBar()->setEnabled(false); + QStringList headers; headers << "Source" << "Loops"; ui->tblSequence->setColumnCount(2); @@ -197,7 +203,7 @@ void FramePlaybackWindow::saveFilters() for (int c = 0; c < ui->listID->count(); c++) { - outFile->write(QString::number(ui->listID->item(c)->text().toInt(NULL, 16), 16).toUtf8()); + outFile->write(QString::number(FilterUtility::getId(ui->listID->item(c)).toInt(nullptr, 16), 16).toUtf8()); outFile->putChar(','); if (ui->listID->item(c)->checkState() == Qt::Checked) outFile->putChar('T'); else outFile->putChar('F'); @@ -244,7 +250,7 @@ void FramePlaybackWindow::loadFilters() if (line.length() > 2) { QList tokens = line.split(','); - ID = tokens[0].toInt(NULL, 16); + ID = tokens[0].toInt(nullptr, 16); if (tokens[1].toUpper() == "T") checked = true; else checked = false; if (checked) @@ -260,7 +266,7 @@ void FramePlaybackWindow::loadFilters() for (int c = 0; c < ui->listID->count(); c++) { QListWidgetItem *item = ui->listID->item(c); - if (item->text().toInt(NULL, 16) == ID) + if (FilterUtility::getId(item).toInt(nullptr, 16) == ID) { item->setCheckState(Qt::Checked); } @@ -275,7 +281,7 @@ void FramePlaybackWindow::loadFilters() void FramePlaybackWindow::refreshIDList() { - if (currentSeqNum < 0 || currentSeqItem == NULL) + if (currentSeqNum < 0 || currentSeqItem == nullptr) { ui->listID->clear(); return; @@ -291,10 +297,7 @@ void FramePlaybackWindow::refreshIDList() QHash::Iterator filterIter; for (filterIter = currentSeqItem->idFilters.begin(); filterIter != currentSeqItem->idFilters.end(); ++filterIter) { - QListWidgetItem* listItem = new QListWidgetItem(Utility::formatCANID(filterIter.key()), ui->listID); - listItem->setFlags(listItem->flags() | Qt::ItemIsUserCheckable); // set checkable flag - if (filterIter.value()) listItem->setCheckState(Qt::Checked); - else listItem->setCheckState(Qt::Unchecked); + /*QListWidgetItem* listItem = */ FilterUtility::createCheckableFilterItem(filterIter.key(), filterIter.value(), ui->listID); } //default is to sort in ascending order ui->listID->sortItems(); @@ -423,7 +426,7 @@ void FramePlaybackWindow::fillIDHash(SequenceItem &item) for (int i = 0; i < item.data.count(); i++) { - id = item.data[i].ID; + id = item.data[i].frameId(); if (!item.idFilters.contains(id)) { item.idFilters.insert(id, true); @@ -463,7 +466,7 @@ void FramePlaybackWindow::btnDeleteCurrSeq() else { currentSeqNum = -1; - currentSeqItem = NULL; + currentSeqItem = nullptr; } refreshIDList(); updateFrameLabel(); @@ -476,7 +479,7 @@ void FramePlaybackWindow::btnLoadFile() if (FrameFileIO::loadFrameFile(filename, &item.data)) { - qSort(item.data); //sort by timestamp to be sure it's in order + std::sort(item.data.begin(), item.data.end()); //sort by timestamp to be sure it's in order QStringList fileList = filename.split('/'); item.filename = fileList[fileList.length() - 1]; item.currentLoopCount = 0; @@ -510,7 +513,7 @@ void FramePlaybackWindow::btnLoadLive() item.currentLoopCount = 0; item.maxLoops = 1; item.data = QVector(*modelFrames); //create a copy of the current frames from the main view - qSort(item.data); //be sure it's all in time based order + std::sort(item.data.begin(), item.data.end()); //be sure it's all in time based order fillIDHash(item); if (ui->tblSequence->currentRow() == -1) { @@ -564,7 +567,7 @@ void FramePlaybackWindow::btnStopClick() } else { currentSeqNum = -1; - currentSeqItem = NULL; + currentSeqItem = nullptr; } if (ui->tblSequence->rowCount() > 0) { @@ -604,13 +607,14 @@ void FramePlaybackWindow::changeLooping(bool check) void FramePlaybackWindow::changeSendingBus(int newIdx) { + Q_UNUSED(newIdx); calculateWhichBus(); } void FramePlaybackWindow::changeIDFiltering(QListWidgetItem *item) { qDebug() << "Changed ID filter " << item->text() << " : " << item->checkState(); - int ID = Utility::ParseStringToNum(item->text()); + int ID = FilterUtility::getIdAsInt(item); currentSeqItem->idFilters[ID] = (item->checkState() == Qt::Checked) ? true : false; } diff --git a/framesenderwindow.cpp b/framesenderwindow.cpp index 9d11332..d107428 100644 --- a/framesenderwindow.cpp +++ b/framesenderwindow.cpp @@ -130,13 +130,13 @@ void FrameSenderWindow::buildFrameCache() for (int i = 0; i < modelFrames->count(); i++) { thisFrame = modelFrames->at(i); - if (!frameCache.contains(thisFrame.ID)) + if (!frameCache.contains(thisFrame.frameId())) { - frameCache.insert(thisFrame.ID, thisFrame); + frameCache.insert(thisFrame.frameId(), thisFrame); } else { - frameCache[thisFrame.ID] = thisFrame; + frameCache[thisFrame.frameId()] = thisFrame; } } } @@ -160,13 +160,13 @@ void FrameSenderWindow::updatedFrames(int numFrames) for (int i = modelFrames->count() - numFrames; i < modelFrames->count(); i++) { thisFrame = modelFrames->at(i); - if (!frameCache.contains(thisFrame.ID)) + if (!frameCache.contains(thisFrame.frameId())) { - frameCache.insert(thisFrame.ID, thisFrame); + frameCache.insert(thisFrame.frameId(), thisFrame); } else { - frameCache[thisFrame.ID] = thisFrame; + frameCache[thisFrame.frameId()] = thisFrame; } processIncomingFrame(&thisFrame); } @@ -182,10 +182,10 @@ void FrameSenderWindow::processIncomingFrame(CANFrame *frame) { Trigger *thisTrigger = &sendingData[sd].triggers[trig]; qDebug() << "Trigger ID: " << thisTrigger->ID; - qDebug() << "Frame ID: " << frame->ID; - if (thisTrigger->ID > 0 && (uint32_t)thisTrigger->ID == frame->ID) + qDebug() << "Frame ID: " << frame->frameId(); + if (thisTrigger->ID > 0 && (uint32_t)thisTrigger->ID == frame->frameId()) { - if ((uint32_t)thisTrigger->bus == frame->bus || thisTrigger->bus == -1) + if (thisTrigger->bus == frame->bus || thisTrigger->bus == -1) { if (thisTrigger->currCount < thisTrigger->maxCount) { @@ -511,13 +511,13 @@ void FrameSenderWindow::doModifiers(int idx) } } //Finally, drop the result into the proper data byte - sendData->data[mod->destByte] = (unsigned char) shadowReg; + sendData->payload().data()[mod->destByte] = (char) shadowReg; } } int FrameSenderWindow::fetchOperand(int idx, ModifierOperand op) { - CANFrame *tempFrame = NULL; + CANFrame *tempFrame = nullptr; if (op.ID == 0) //numeric constant { if (op.notOper) return ~op.databyte; @@ -525,16 +525,16 @@ int FrameSenderWindow::fetchOperand(int idx, ModifierOperand op) } else if (op.ID == -2) //fetch data from a data byte within the output frame { - if (op.notOper) return ~sendingData.at(idx).data[op.databyte]; - else return sendingData.at(idx).data[op.databyte]; + if (op.notOper) return ~((unsigned char)sendingData.at(idx).payload()[op.databyte]); + else return (unsigned char)sendingData.at(idx).payload()[op.databyte]; } else //look up external data byte { tempFrame = lookupFrame(op.ID, op.bus); - if (tempFrame != NULL) + if (tempFrame != nullptr) { - if (op.notOper) return ~tempFrame->data[op.databyte]; - else return tempFrame->data[op.databyte]; + if (op.notOper) return ~((unsigned char)tempFrame->payload()[op.databyte]); + else return (unsigned char)tempFrame->payload()[op.databyte]; } else return 0; } @@ -548,11 +548,11 @@ int FrameSenderWindow::fetchOperand(int idx, ModifierOperand op) /// CANFrame* FrameSenderWindow::lookupFrame(int ID, int bus) { - if (!frameCache.contains(ID)) return NULL; + if (!frameCache.contains(ID)) return nullptr; - if (bus == -1 || frameCache[ID].bus == (unsigned int)bus) return &frameCache[ID]; + if (bus == -1 || frameCache[ID].bus == bus) return &frameCache[ID]; - return NULL; + return nullptr; } /// @@ -643,7 +643,7 @@ void FrameSenderWindow::processModifierText(int line) } else thisOp.second.notOper = false; thisOp.second.bus = sendingData[line].bus; - thisOp.second.ID = sendingData[line].ID; + thisOp.second.ID = sendingData[line].frameId(); parseOperandString(secondOp.split(":"), thisOp.second); thisMod.operations.append(thisOp); } @@ -786,17 +786,21 @@ ModifierOperationType FrameSenderWindow::parseOperation(QString op) void FrameSenderWindow::updateGridRow(int idx) { qDebug() << "updateGridRow"; + inhibitChanged = true; FrameSendData *temp = &sendingData[idx]; int gridLine = idx; QString dataString; QTableWidgetItem *item = ui->tableSender->item(gridLine, 9); - if (item == NULL) item = new QTableWidgetItem(); + unsigned char *data = reinterpret_cast(temp->payload().data()); + int dataLen = temp->payload().length(); + + if (item == nullptr) item = new QTableWidgetItem(); item->setText(QString::number(temp->count)); - if (!temp->remote) { - for (unsigned int i = 0; i < temp->len; i++) + if (temp->frameType() != QCanBusFrame::RemoteRequestFrame) { + for (int i = 0; i < dataLen; i++) { - dataString.append(Utility::formatNumber(temp->data[i])); + dataString.append(Utility::formatNumber(data[i])); dataString.append(" "); } ui->tableSender->item(gridLine, 6)->setText(dataString); @@ -818,8 +822,8 @@ void FrameSenderWindow::processCellChange(int line, int col) { FrameSendData tempData; tempData.enabled = false; - tempData.remote = false; - tempData.extended = false; + tempData.setFrameType(QCanBusFrame::DataFrame); + tempData.setExtendedFrameFormat(false); sendingData.append(tempData); } @@ -848,9 +852,9 @@ void FrameSenderWindow::processCellChange(int line, int col) tempVal = Utility::ParseStringToNum(ui->tableSender->item(line, 2)->text()); if (tempVal < 0) tempVal = 0; if (tempVal > 0x7FFFFFFF) tempVal = 0x7FFFFFFF; - sendingData[line].ID = tempVal; - if (sendingData[line].ID > 0x7FF) { - sendingData[line].extended = true; + sendingData[line].setFrameId(tempVal); + if (sendingData[line].frameId() > 0x7FF) { + sendingData[line].setExtendedFrameFormat(true); ui->tableSender->blockSignals(true); ui->tableSender->item(line, 4)->setCheckState(Qt::Checked); ui->tableSender->blockSignals(false); @@ -861,29 +865,29 @@ void FrameSenderWindow::processCellChange(int line, int col) tempVal = Utility::ParseStringToNum(ui->tableSender->item(line, 3)->text()); if (tempVal < 0) tempVal = 0; if (tempVal > 8) tempVal = 8; - sendingData[line].len = tempVal; + sendingData[line].payload().resize(tempVal); break; case 4: // Ext if (ui->tableSender->item(line, 4)->checkState() == Qt::Checked) { - sendingData[line].extended = true; + sendingData[line].setExtendedFrameFormat(true); } else { - sendingData[line].extended = false; + sendingData[line].setExtendedFrameFormat(false); } break; case 5: // Rem if (ui->tableSender->item(line, 5)->checkState() == Qt::Checked) { - sendingData[line].remote = true; + sendingData[line].setFrameType(QCanBusFrame::RemoteRequestFrame); } else { - sendingData[line].remote = false; + sendingData[line].setFrameType(QCanBusFrame::DataFrame); } break; case 6: //Data bytes - for (int i = 0; i < 8; i++) sendingData[line].data[i] = 0; + for (int i = 0; i < 8; i++) sendingData[line].payload().data()[i] = 0; tokens = ui->tableSender->item(line, 6)->text().split(" "); for (int j = 0; j < tokens.count(); j++) { - sendingData[line].data[j] = (uint8_t)Utility::ParseStringToNum(tokens[j]); + sendingData[line].payload().data()[j] = (uint8_t)Utility::ParseStringToNum(tokens[j]); } break; case 7: //triggers diff --git a/help/_images/Bisector.png b/help/_images/Bisector.png new file mode 100644 index 0000000..79e0f94 Binary files /dev/null and b/help/_images/Bisector.png differ diff --git a/help/_images/ConnectionWindow.png b/help/_images/ConnectionWindow.png new file mode 100644 index 0000000..07132aa Binary files /dev/null and b/help/_images/ConnectionWindow.png differ diff --git a/help/_images/CustomSender.png b/help/_images/CustomSender.png new file mode 100644 index 0000000..e40f980 Binary files /dev/null and b/help/_images/CustomSender.png differ diff --git a/help/_images/DBCEditor.png b/help/_images/DBCEditor.png new file mode 100644 index 0000000..28a7af9 Binary files /dev/null and b/help/_images/DBCEditor.png differ diff --git a/help/_images/DBCManager.png b/help/_images/DBCManager.png new file mode 100644 index 0000000..42ff749 Binary files /dev/null and b/help/_images/DBCManager.png differ diff --git a/help/_images/FileComparator.png b/help/_images/FileComparator.png new file mode 100644 index 0000000..7eb99ba Binary files /dev/null and b/help/_images/FileComparator.png differ diff --git a/help/_images/FlowView.png b/help/_images/FlowView.png new file mode 100644 index 0000000..3f8389c Binary files /dev/null and b/help/_images/FlowView.png differ diff --git a/help/_images/FrameInfoWindow.png b/help/_images/FrameInfoWindow.png new file mode 100644 index 0000000..4f7cb1b Binary files /dev/null and b/help/_images/FrameInfoWindow.png differ diff --git a/help/_images/FuzzingWindow.png b/help/_images/FuzzingWindow.png new file mode 100644 index 0000000..6a4950b Binary files /dev/null and b/help/_images/FuzzingWindow.png differ diff --git a/help/_images/GraphSetup.png b/help/_images/GraphSetup.png new file mode 100644 index 0000000..9a9d995 Binary files /dev/null and b/help/_images/GraphSetup.png differ diff --git a/help/_images/GraphingView.png b/help/_images/GraphingView.png new file mode 100644 index 0000000..1d1279d Binary files /dev/null and b/help/_images/GraphingView.png differ diff --git a/help/_images/ISOTPDecoder.png b/help/_images/ISOTPDecoder.png new file mode 100644 index 0000000..41cbe7b Binary files /dev/null and b/help/_images/ISOTPDecoder.png differ diff --git a/help/_images/MainScreen.png b/help/_images/MainScreen.png new file mode 100644 index 0000000..66326c4 Binary files /dev/null and b/help/_images/MainScreen.png differ diff --git a/help/_images/Playback.png b/help/_images/Playback.png new file mode 100644 index 0000000..fa4e892 Binary files /dev/null and b/help/_images/Playback.png differ diff --git a/help/_images/Preferences.png b/help/_images/Preferences.png new file mode 100644 index 0000000..f682e3c Binary files /dev/null and b/help/_images/Preferences.png differ diff --git a/help/_images/RangeState.png b/help/_images/RangeState.png new file mode 100644 index 0000000..bcda793 Binary files /dev/null and b/help/_images/RangeState.png differ diff --git a/help/_images/ScriptingWindow.png b/help/_images/ScriptingWindow.png new file mode 100644 index 0000000..95d3904 Binary files /dev/null and b/help/_images/ScriptingWindow.png differ diff --git a/help/_images/SignalEditor.png b/help/_images/SignalEditor.png new file mode 100644 index 0000000..1ae6589 Binary files /dev/null and b/help/_images/SignalEditor.png differ diff --git a/help/_images/Sniffer.png b/help/_images/Sniffer.png new file mode 100644 index 0000000..c473ce8 Binary files /dev/null and b/help/_images/Sniffer.png differ diff --git a/help/_images/TemporalWindow.png b/help/_images/TemporalWindow.png new file mode 100644 index 0000000..836fa70 Binary files /dev/null and b/help/_images/TemporalWindow.png differ diff --git a/help/_images/UDS_Scanner.png b/help/_images/UDS_Scanner.png new file mode 100644 index 0000000..c60e1bd Binary files /dev/null and b/help/_images/UDS_Scanner.png differ diff --git a/help/_static/ajax-loader.gif b/help/_static/ajax-loader.gif new file mode 100644 index 0000000..61faf8c Binary files /dev/null and b/help/_static/ajax-loader.gif differ diff --git a/help/_static/basic.css b/help/_static/basic.css new file mode 100644 index 0000000..0807176 --- /dev/null +++ b/help/_static/basic.css @@ -0,0 +1,676 @@ +/* + * basic.css + * ~~~~~~~~~ + * + * Sphinx stylesheet -- basic theme. + * + * :copyright: Copyright 2007-2019 by the Sphinx team, see AUTHORS. + * :license: BSD, see LICENSE for details. + * + */ + +/* -- main layout ----------------------------------------------------------- */ + +div.clearer { + clear: both; +} + +/* -- relbar ---------------------------------------------------------------- */ + +div.related { + width: 100%; + font-size: 90%; +} + +div.related h3 { + display: none; +} + +div.related ul { + margin: 0; + padding: 0 0 0 10px; + list-style: none; +} + +div.related li { + display: inline; +} + +div.related li.right { + float: right; + margin-right: 5px; +} + +/* -- sidebar --------------------------------------------------------------- */ + +div.sphinxsidebarwrapper { + padding: 10px 5px 0 10px; +} + +div.sphinxsidebar { + float: left; + width: 230px; + margin-left: -100%; + font-size: 90%; + word-wrap: break-word; + overflow-wrap : break-word; +} + +div.sphinxsidebar ul { + list-style: none; +} + +div.sphinxsidebar ul ul, +div.sphinxsidebar ul.want-points { + margin-left: 20px; + list-style: square; +} + +div.sphinxsidebar ul ul { + margin-top: 0; + margin-bottom: 0; +} + +div.sphinxsidebar form { + margin-top: 10px; +} + +div.sphinxsidebar input { + border: 1px solid #98dbcc; + font-family: sans-serif; + font-size: 1em; +} + +div.sphinxsidebar #searchbox form.search { + overflow: hidden; +} + +div.sphinxsidebar #searchbox input[type="text"] { + float: left; + width: 80%; + padding: 0.25em; + box-sizing: border-box; +} + +div.sphinxsidebar #searchbox input[type="submit"] { + float: left; + width: 20%; + border-left: none; + padding: 0.25em; + box-sizing: border-box; +} + + +img { + border: 0; + max-width: 100%; +} + +/* -- search page ----------------------------------------------------------- */ + +ul.search { + margin: 10px 0 0 20px; + padding: 0; +} + +ul.search li { + padding: 5px 0 5px 20px; + background-image: url(file.png); + background-repeat: no-repeat; + background-position: 0 7px; +} + +ul.search li a { + font-weight: bold; +} + +ul.search li div.context { + color: #888; + margin: 2px 0 0 30px; + text-align: left; +} + +ul.keywordmatches li.goodmatch a { + font-weight: bold; +} + +/* -- index page ------------------------------------------------------------ */ + +table.contentstable { + width: 90%; + margin-left: auto; + margin-right: auto; +} + +table.contentstable p.biglink { + line-height: 150%; +} + +a.biglink { + font-size: 1.3em; +} + +span.linkdescr { + font-style: italic; + padding-top: 5px; + font-size: 90%; +} + +/* -- general index --------------------------------------------------------- */ + +table.indextable { + width: 100%; +} + +table.indextable td { + text-align: left; + vertical-align: top; +} + +table.indextable ul { + margin-top: 0; + margin-bottom: 0; + list-style-type: none; +} + +table.indextable > tbody > tr > td > ul { + padding-left: 0em; +} + +table.indextable tr.pcap { + height: 10px; +} + +table.indextable tr.cap { + margin-top: 10px; + background-color: #f2f2f2; +} + +img.toggler { + margin-right: 3px; + margin-top: 3px; + cursor: pointer; +} + +div.modindex-jumpbox { + border-top: 1px solid #ddd; + border-bottom: 1px solid #ddd; + margin: 1em 0 1em 0; + padding: 0.4em; +} + +div.genindex-jumpbox { + border-top: 1px solid #ddd; + border-bottom: 1px solid #ddd; + margin: 1em 0 1em 0; + padding: 0.4em; +} + +/* -- domain module index --------------------------------------------------- */ + +table.modindextable td { + padding: 2px; + border-collapse: collapse; +} + +/* -- general body styles --------------------------------------------------- */ + +div.body { + min-width: 450px; + max-width: 800px; +} + +div.body p, div.body dd, div.body li, div.body blockquote { + -moz-hyphens: auto; + -ms-hyphens: auto; + -webkit-hyphens: auto; + hyphens: auto; +} + +a.headerlink { + visibility: hidden; +} + +h1:hover > a.headerlink, +h2:hover > a.headerlink, +h3:hover > a.headerlink, +h4:hover > a.headerlink, +h5:hover > a.headerlink, +h6:hover > a.headerlink, +dt:hover > a.headerlink, +caption:hover > a.headerlink, +p.caption:hover > a.headerlink, +div.code-block-caption:hover > a.headerlink { + visibility: visible; +} + +div.body p.caption { + text-align: inherit; +} + +div.body td { + text-align: left; +} + +.first { + margin-top: 0 !important; +} + +p.rubric { + margin-top: 30px; + font-weight: bold; +} + +img.align-left, .figure.align-left, object.align-left { + clear: left; + float: left; + margin-right: 1em; +} + +img.align-right, .figure.align-right, object.align-right { + clear: right; + float: right; + margin-left: 1em; +} + +img.align-center, .figure.align-center, object.align-center { + display: block; + margin-left: auto; + margin-right: auto; +} + +.align-left { + text-align: left; +} + +.align-center { + text-align: center; +} + +.align-right { + text-align: right; +} + +/* -- sidebars -------------------------------------------------------------- */ + +div.sidebar { + margin: 0 0 0.5em 1em; + border: 1px solid #ddb; + padding: 7px 7px 0 7px; + background-color: #ffe; + width: 40%; + float: right; +} + +p.sidebar-title { + font-weight: bold; +} + +/* -- topics ---------------------------------------------------------------- */ + +div.topic { + border: 1px solid #ccc; + padding: 7px 7px 0 7px; + margin: 10px 0 10px 0; +} + +p.topic-title { + font-size: 1.1em; + font-weight: bold; + margin-top: 10px; +} + +/* -- admonitions ----------------------------------------------------------- */ + +div.admonition { + margin-top: 10px; + margin-bottom: 10px; + padding: 7px; +} + +div.admonition dt { + font-weight: bold; +} + +div.admonition dl { + margin-bottom: 0; +} + +p.admonition-title { + margin: 0px 10px 5px 0px; + font-weight: bold; +} + +div.body p.centered { + text-align: center; + margin-top: 25px; +} + +/* -- tables ---------------------------------------------------------------- */ + +table.docutils { + border: 0; + border-collapse: collapse; +} + +table.align-center { + margin-left: auto; + margin-right: auto; +} + +table caption span.caption-number { + font-style: italic; +} + +table caption span.caption-text { +} + +table.docutils td, table.docutils th { + padding: 1px 8px 1px 5px; + border-top: 0; + border-left: 0; + border-right: 0; + border-bottom: 1px solid #aaa; +} + +table.footnote td, table.footnote th { + border: 0 !important; +} + +th { + text-align: left; + padding-right: 5px; +} + +table.citation { + border-left: solid 1px gray; + margin-left: 1px; +} + +table.citation td { + border-bottom: none; +} + +/* -- figures --------------------------------------------------------------- */ + +div.figure { + margin: 0.5em; + padding: 0.5em; +} + +div.figure p.caption { + padding: 0.3em; +} + +div.figure p.caption span.caption-number { + font-style: italic; +} + +div.figure p.caption span.caption-text { +} + +/* -- field list styles ----------------------------------------------------- */ + +table.field-list td, table.field-list th { + border: 0 !important; +} + +.field-list ul { + margin: 0; + padding-left: 1em; +} + +.field-list p { + margin: 0; +} + +.field-name { + -moz-hyphens: manual; + -ms-hyphens: manual; + -webkit-hyphens: manual; + hyphens: manual; +} + +/* -- hlist styles ---------------------------------------------------------- */ + +table.hlist td { + vertical-align: top; +} + + +/* -- other body styles ----------------------------------------------------- */ + +ol.arabic { + list-style: decimal; +} + +ol.loweralpha { + list-style: lower-alpha; +} + +ol.upperalpha { + list-style: upper-alpha; +} + +ol.lowerroman { + list-style: lower-roman; +} + +ol.upperroman { + list-style: upper-roman; +} + +dl { + margin-bottom: 15px; +} + +dd p { + margin-top: 0px; +} + +dd ul, dd table { + margin-bottom: 10px; +} + +dd { + margin-top: 3px; + margin-bottom: 10px; + margin-left: 30px; +} + +dt:target, span.highlighted { + background-color: #fbe54e; +} + +rect.highlighted { + fill: #fbe54e; +} + +dl.glossary dt { + font-weight: bold; + font-size: 1.1em; +} + +.optional { + font-size: 1.3em; +} + +.sig-paren { + font-size: larger; +} + +.versionmodified { + font-style: italic; +} + +.system-message { + background-color: #fda; + padding: 5px; + border: 3px solid red; +} + +.footnote:target { + background-color: #ffa; +} + +.line-block { + display: block; + margin-top: 1em; + margin-bottom: 1em; +} + +.line-block .line-block { + margin-top: 0; + margin-bottom: 0; + margin-left: 1.5em; +} + +.guilabel, .menuselection { + font-family: sans-serif; +} + +.accelerator { + text-decoration: underline; +} + +.classifier { + font-style: oblique; +} + +abbr, acronym { + border-bottom: dotted 1px; + cursor: help; +} + +/* -- code displays --------------------------------------------------------- */ + +pre { + overflow: auto; + overflow-y: hidden; /* fixes display issues on Chrome browsers */ +} + +span.pre { + -moz-hyphens: none; + -ms-hyphens: none; + -webkit-hyphens: none; + hyphens: none; +} + +td.linenos pre { + padding: 5px 0px; + border: 0; + background-color: transparent; + color: #aaa; +} + +table.highlighttable { + margin-left: 0.5em; +} + +table.highlighttable td { + padding: 0 0.5em 0 0.5em; +} + +div.code-block-caption { + padding: 2px 5px; + font-size: small; +} + +div.code-block-caption code { + background-color: transparent; +} + +div.code-block-caption + div > div.highlight > pre { + margin-top: 0; +} + +div.code-block-caption span.caption-number { + padding: 0.1em 0.3em; + font-style: italic; +} + +div.code-block-caption span.caption-text { +} + +div.literal-block-wrapper { + padding: 1em 1em 0; +} + +div.literal-block-wrapper div.highlight { + margin: 0; +} + +code.descname { + background-color: transparent; + font-weight: bold; + font-size: 1.2em; +} + +code.descclassname { + background-color: transparent; +} + +code.xref, a code { + background-color: transparent; + font-weight: bold; +} + +h1 code, h2 code, h3 code, h4 code, h5 code, h6 code { + background-color: transparent; +} + +.viewcode-link { + float: right; +} + +.viewcode-back { + float: right; + font-family: sans-serif; +} + +div.viewcode-block:target { + margin: -1px -10px; + padding: 0 10px; +} + +/* -- math display ---------------------------------------------------------- */ + +img.math { + vertical-align: middle; +} + +div.body div.math p { + text-align: center; +} + +span.eqno { + float: right; +} + +span.eqno a.headerlink { + position: relative; + left: 0px; + z-index: 1; +} + +div.math:hover a.headerlink { + visibility: visible; +} + +/* -- printout stylesheet --------------------------------------------------- */ + +@media print { + div.document, + div.documentwrapper, + div.bodywrapper { + margin: 0 !important; + width: 100%; + } + + div.sphinxsidebar, + div.related, + div.footer, + #top-link { + display: none; + } +} \ No newline at end of file diff --git a/help/_static/comment-bright.png b/help/_static/comment-bright.png new file mode 100644 index 0000000..15e27ed Binary files /dev/null and b/help/_static/comment-bright.png differ diff --git a/help/_static/comment-close.png b/help/_static/comment-close.png new file mode 100644 index 0000000..4d91bcf Binary files /dev/null and b/help/_static/comment-close.png differ diff --git a/help/_static/comment.png b/help/_static/comment.png new file mode 100644 index 0000000..dfbc0cb Binary files /dev/null and b/help/_static/comment.png differ diff --git a/help/_static/doctools.js b/help/_static/doctools.js new file mode 100644 index 0000000..344db17 --- /dev/null +++ b/help/_static/doctools.js @@ -0,0 +1,315 @@ +/* + * doctools.js + * ~~~~~~~~~~~ + * + * Sphinx JavaScript utilities for all documentation. + * + * :copyright: Copyright 2007-2019 by the Sphinx team, see AUTHORS. + * :license: BSD, see LICENSE for details. + * + */ + +/** + * select a different prefix for underscore + */ +$u = _.noConflict(); + +/** + * make the code below compatible with browsers without + * an installed firebug like debugger +if (!window.console || !console.firebug) { + var names = ["log", "debug", "info", "warn", "error", "assert", "dir", + "dirxml", "group", "groupEnd", "time", "timeEnd", "count", "trace", + "profile", "profileEnd"]; + window.console = {}; + for (var i = 0; i < names.length; ++i) + window.console[names[i]] = function() {}; +} + */ + +/** + * small helper function to urldecode strings + */ +jQuery.urldecode = function(x) { + return decodeURIComponent(x).replace(/\+/g, ' '); +}; + +/** + * small helper function to urlencode strings + */ +jQuery.urlencode = encodeURIComponent; + +/** + * This function returns the parsed url parameters of the + * current request. Multiple values per key are supported, + * it will always return arrays of strings for the value parts. + */ +jQuery.getQueryParameters = function(s) { + if (typeof s === 'undefined') + s = document.location.search; + var parts = s.substr(s.indexOf('?') + 1).split('&'); + var result = {}; + for (var i = 0; i < parts.length; i++) { + var tmp = parts[i].split('=', 2); + var key = jQuery.urldecode(tmp[0]); + var value = jQuery.urldecode(tmp[1]); + if (key in result) + result[key].push(value); + else + result[key] = [value]; + } + return result; +}; + +/** + * highlight a given string on a jquery object by wrapping it in + * span elements with the given class name. + */ +jQuery.fn.highlightText = function(text, className) { + function highlight(node, addItems) { + if (node.nodeType === 3) { + var val = node.nodeValue; + var pos = val.toLowerCase().indexOf(text); + if (pos >= 0 && + !jQuery(node.parentNode).hasClass(className) && + !jQuery(node.parentNode).hasClass("nohighlight")) { + var span; + var isInSVG = jQuery(node).closest("body, svg, foreignObject").is("svg"); + if (isInSVG) { + span = document.createElementNS("http://www.w3.org/2000/svg", "tspan"); + } else { + span = document.createElement("span"); + span.className = className; + } + span.appendChild(document.createTextNode(val.substr(pos, text.length))); + node.parentNode.insertBefore(span, node.parentNode.insertBefore( + document.createTextNode(val.substr(pos + text.length)), + node.nextSibling)); + node.nodeValue = val.substr(0, pos); + if (isInSVG) { + var bbox = span.getBBox(); + var rect = document.createElementNS("http://www.w3.org/2000/svg", "rect"); + rect.x.baseVal.value = bbox.x; + rect.y.baseVal.value = bbox.y; + rect.width.baseVal.value = bbox.width; + rect.height.baseVal.value = bbox.height; + rect.setAttribute('class', className); + var parentOfText = node.parentNode.parentNode; + addItems.push({ + "parent": node.parentNode, + "target": rect}); + } + } + } + else if (!jQuery(node).is("button, select, textarea")) { + jQuery.each(node.childNodes, function() { + highlight(this, addItems); + }); + } + } + var addItems = []; + var result = this.each(function() { + highlight(this, addItems); + }); + for (var i = 0; i < addItems.length; ++i) { + jQuery(addItems[i].parent).before(addItems[i].target); + } + return result; +}; + +/* + * backward compatibility for jQuery.browser + * This will be supported until firefox bug is fixed. + */ +if (!jQuery.browser) { + jQuery.uaMatch = function(ua) { + ua = ua.toLowerCase(); + + var match = /(chrome)[ \/]([\w.]+)/.exec(ua) || + /(webkit)[ \/]([\w.]+)/.exec(ua) || + /(opera)(?:.*version|)[ \/]([\w.]+)/.exec(ua) || + /(msie) ([\w.]+)/.exec(ua) || + ua.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec(ua) || + []; + + return { + browser: match[ 1 ] || "", + version: match[ 2 ] || "0" + }; + }; + jQuery.browser = {}; + jQuery.browser[jQuery.uaMatch(navigator.userAgent).browser] = true; +} + +/** + * Small JavaScript module for the documentation. + */ +var Documentation = { + + init : function() { + this.fixFirefoxAnchorBug(); + this.highlightSearchWords(); + this.initIndexTable(); + if (DOCUMENTATION_OPTIONS.NAVIGATION_WITH_KEYS) { + this.initOnKeyListeners(); + } + }, + + /** + * i18n support + */ + TRANSLATIONS : {}, + PLURAL_EXPR : function(n) { return n === 1 ? 0 : 1; }, + LOCALE : 'unknown', + + // gettext and ngettext don't access this so that the functions + // can safely bound to a different name (_ = Documentation.gettext) + gettext : function(string) { + var translated = Documentation.TRANSLATIONS[string]; + if (typeof translated === 'undefined') + return string; + return (typeof translated === 'string') ? translated : translated[0]; + }, + + ngettext : function(singular, plural, n) { + var translated = Documentation.TRANSLATIONS[singular]; + if (typeof translated === 'undefined') + return (n == 1) ? singular : plural; + return translated[Documentation.PLURALEXPR(n)]; + }, + + addTranslations : function(catalog) { + for (var key in catalog.messages) + this.TRANSLATIONS[key] = catalog.messages[key]; + this.PLURAL_EXPR = new Function('n', 'return +(' + catalog.plural_expr + ')'); + this.LOCALE = catalog.locale; + }, + + /** + * add context elements like header anchor links + */ + addContextElements : function() { + $('div[id] > :header:first').each(function() { + $('\u00B6'). + attr('href', '#' + this.id). + attr('title', _('Permalink to this headline')). + appendTo(this); + }); + $('dt[id]').each(function() { + $('\u00B6'). + attr('href', '#' + this.id). + attr('title', _('Permalink to this definition')). + appendTo(this); + }); + }, + + /** + * workaround a firefox stupidity + * see: https://bugzilla.mozilla.org/show_bug.cgi?id=645075 + */ + fixFirefoxAnchorBug : function() { + if (document.location.hash && $.browser.mozilla) + window.setTimeout(function() { + document.location.href += ''; + }, 10); + }, + + /** + * highlight the search words provided in the url in the text + */ + highlightSearchWords : function() { + var params = $.getQueryParameters(); + var terms = (params.highlight) ? params.highlight[0].split(/\s+/) : []; + if (terms.length) { + var body = $('div.body'); + if (!body.length) { + body = $('body'); + } + window.setTimeout(function() { + $.each(terms, function() { + body.highlightText(this.toLowerCase(), 'highlighted'); + }); + }, 10); + $('

' + _('Hide Search Matches') + '

') + .appendTo($('#searchbox')); + } + }, + + /** + * init the domain index toggle buttons + */ + initIndexTable : function() { + var togglers = $('img.toggler').click(function() { + var src = $(this).attr('src'); + var idnum = $(this).attr('id').substr(7); + $('tr.cg-' + idnum).toggle(); + if (src.substr(-9) === 'minus.png') + $(this).attr('src', src.substr(0, src.length-9) + 'plus.png'); + else + $(this).attr('src', src.substr(0, src.length-8) + 'minus.png'); + }).css('display', ''); + if (DOCUMENTATION_OPTIONS.COLLAPSE_INDEX) { + togglers.click(); + } + }, + + /** + * helper function to hide the search marks again + */ + hideSearchWords : function() { + $('#searchbox .highlight-link').fadeOut(300); + $('span.highlighted').removeClass('highlighted'); + }, + + /** + * make the url absolute + */ + makeURL : function(relativeURL) { + return DOCUMENTATION_OPTIONS.URL_ROOT + '/' + relativeURL; + }, + + /** + * get the current relative url + */ + getCurrentURL : function() { + var path = document.location.pathname; + var parts = path.split(/\//); + $.each(DOCUMENTATION_OPTIONS.URL_ROOT.split(/\//), function() { + if (this === '..') + parts.pop(); + }); + var url = parts.join('/'); + return path.substring(url.lastIndexOf('/') + 1, path.length - 1); + }, + + initOnKeyListeners: function() { + $(document).keyup(function(event) { + var activeElementType = document.activeElement.tagName; + // don't navigate when in search box or textarea + if (activeElementType !== 'TEXTAREA' && activeElementType !== 'INPUT' && activeElementType !== 'SELECT') { + switch (event.keyCode) { + case 37: // left + var prevHref = $('link[rel="prev"]').prop('href'); + if (prevHref) { + window.location.href = prevHref; + return false; + } + case 39: // right + var nextHref = $('link[rel="next"]').prop('href'); + if (nextHref) { + window.location.href = nextHref; + return false; + } + } + } + }); + } +}; + +// quick alias for translations +_ = Documentation.gettext; + +$(document).ready(function() { + Documentation.init(); +}); diff --git a/help/_static/documentation_options.js b/help/_static/documentation_options.js new file mode 100644 index 0000000..0bdc960 --- /dev/null +++ b/help/_static/documentation_options.js @@ -0,0 +1,10 @@ +var DOCUMENTATION_OPTIONS = { + URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'), + VERSION: '189', + LANGUAGE: 'None', + COLLAPSE_INDEX: false, + FILE_SUFFIX: '.html', + HAS_SOURCE: true, + SOURCELINK_SUFFIX: '.txt', + NAVIGATION_WITH_KEYS: false, +}; \ No newline at end of file diff --git a/help/_static/down-pressed.png b/help/_static/down-pressed.png new file mode 100644 index 0000000..5756c8c Binary files /dev/null and b/help/_static/down-pressed.png differ diff --git a/help/_static/down.png b/help/_static/down.png new file mode 100644 index 0000000..1b3bdad Binary files /dev/null and b/help/_static/down.png differ diff --git a/help/_static/file.png b/help/_static/file.png new file mode 100644 index 0000000..a858a41 Binary files /dev/null and b/help/_static/file.png differ diff --git a/help/_static/jquery.js b/help/_static/jquery.js new file mode 100644 index 0000000..00129ea --- /dev/null +++ b/help/_static/jquery.js @@ -0,0 +1,10364 @@ +/*! + * jQuery JavaScript Library v3.3.1-dfsg + * https://jquery.com/ + * + * Includes Sizzle.js + * https://sizzlejs.com/ + * + * Copyright JS Foundation and other contributors + * Released under the MIT license + * https://jquery.org/license + * + * Date: 2019-01-30T03:06Z + */ +( function( global, factory ) { + + "use strict"; + + if ( typeof module === "object" && typeof module.exports === "object" ) { + + // For CommonJS and CommonJS-like environments where a proper `window` + // is present, execute the factory and get jQuery. + // For environments that do not have a `window` with a `document` + // (such as Node.js), expose a factory as module.exports. + // This accentuates the need for the creation of a real `window`. + // e.g. var jQuery = require("jquery")(window); + // See ticket #14549 for more info. + module.exports = global.document ? + factory( global, true ) : + function( w ) { + if ( !w.document ) { + throw new Error( "jQuery requires a window with a document" ); + } + return factory( w ); + }; + } else { + factory( global ); + } + +// Pass this if window is not defined yet +} )( typeof window !== "undefined" ? window : this, function( window, noGlobal ) { + +// Edge <= 12 - 13+, Firefox <=18 - 45+, IE 10 - 11, Safari 5.1 - 9+, iOS 6 - 9.1 +// throw exceptions when non-strict code (e.g., ASP.NET 4.5) accesses strict mode +// arguments.callee.caller (trac-13335). But as of jQuery 3.0 (2016), strict mode should be common +// enough that all such attempts are guarded in a try block. + + +var arr = []; + +var document = window.document; + +var getProto = Object.getPrototypeOf; + +var slice = arr.slice; + +var concat = arr.concat; + +var push = arr.push; + +var indexOf = arr.indexOf; + +var class2type = {}; + +var toString = class2type.toString; + +var hasOwn = class2type.hasOwnProperty; + +var fnToString = hasOwn.toString; + +var ObjectFunctionString = fnToString.call( Object ); + +var support = {}; + +var isFunction = function isFunction( obj ) { + + // Support: Chrome <=57, Firefox <=52 + // In some browsers, typeof returns "function" for HTML elements + // (i.e., `typeof document.createElement( "object" ) === "function"`). + // We don't want to classify *any* DOM node as a function. + return typeof obj === "function" && typeof obj.nodeType !== "number"; + }; + + +var isWindow = function isWindow( obj ) { + return obj != null && obj === obj.window; + }; + + + + + var preservedScriptAttributes = { + type: true, + src: true, + noModule: true + }; + + function DOMEval( code, doc, node ) { + doc = doc || document; + + var i, + script = doc.createElement( "script" ); + + script.text = code; + if ( node ) { + for ( i in preservedScriptAttributes ) { + if ( node[ i ] ) { + script[ i ] = node[ i ]; + } + } + } + doc.head.appendChild( script ).parentNode.removeChild( script ); + } + + +function toType( obj ) { + if ( obj == null ) { + return obj + ""; + } + + // Support: Android <=2.3 only (functionish RegExp) + return typeof obj === "object" || typeof obj === "function" ? + class2type[ toString.call( obj ) ] || "object" : + typeof obj; +} +/* global Symbol */ +// Defining this global in .eslintrc.json would create a danger of using the global +// unguarded in another place, it seems safer to define global only for this module + + + +var + version = "3.3.1", + + // Define a local copy of jQuery + jQuery = function( selector, context ) { + + // The jQuery object is actually just the init constructor 'enhanced' + // Need init if jQuery is called (just allow error to be thrown if not included) + return new jQuery.fn.init( selector, context ); + }, + + // Support: Android <=4.0 only + // Make sure we trim BOM and NBSP + rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g; + +jQuery.fn = jQuery.prototype = { + + // The current version of jQuery being used + jquery: version, + + constructor: jQuery, + + // The default length of a jQuery object is 0 + length: 0, + + toArray: function() { + return slice.call( this ); + }, + + // Get the Nth element in the matched element set OR + // Get the whole matched element set as a clean array + get: function( num ) { + + // Return all the elements in a clean array + if ( num == null ) { + return slice.call( this ); + } + + // Return just the one element from the set + return num < 0 ? this[ num + this.length ] : this[ num ]; + }, + + // Take an array of elements and push it onto the stack + // (returning the new matched element set) + pushStack: function( elems ) { + + // Build a new jQuery matched element set + var ret = jQuery.merge( this.constructor(), elems ); + + // Add the old object onto the stack (as a reference) + ret.prevObject = this; + + // Return the newly-formed element set + return ret; + }, + + // Execute a callback for every element in the matched set. + each: function( callback ) { + return jQuery.each( this, callback ); + }, + + map: function( callback ) { + return this.pushStack( jQuery.map( this, function( elem, i ) { + return callback.call( elem, i, elem ); + } ) ); + }, + + slice: function() { + return this.pushStack( slice.apply( this, arguments ) ); + }, + + first: function() { + return this.eq( 0 ); + }, + + last: function() { + return this.eq( -1 ); + }, + + eq: function( i ) { + var len = this.length, + j = +i + ( i < 0 ? len : 0 ); + return this.pushStack( j >= 0 && j < len ? [ this[ j ] ] : [] ); + }, + + end: function() { + return this.prevObject || this.constructor(); + }, + + // For internal use only. + // Behaves like an Array's method, not like a jQuery method. + push: push, + sort: arr.sort, + splice: arr.splice +}; + +jQuery.extend = jQuery.fn.extend = function() { + var options, name, src, copy, copyIsArray, clone, + target = arguments[ 0 ] || {}, + i = 1, + length = arguments.length, + deep = false; + + // Handle a deep copy situation + if ( typeof target === "boolean" ) { + deep = target; + + // Skip the boolean and the target + target = arguments[ i ] || {}; + i++; + } + + // Handle case when target is a string or something (possible in deep copy) + if ( typeof target !== "object" && !isFunction( target ) ) { + target = {}; + } + + // Extend jQuery itself if only one argument is passed + if ( i === length ) { + target = this; + i--; + } + + for ( ; i < length; i++ ) { + + // Only deal with non-null/undefined values + if ( ( options = arguments[ i ] ) != null ) { + + // Extend the base object + for ( name in options ) { + src = target[ name ]; + copy = options[ name ]; + + // Prevent never-ending loop + if ( target === copy ) { + continue; + } + + // Recurse if we're merging plain objects or arrays + if ( deep && copy && ( jQuery.isPlainObject( copy ) || + ( copyIsArray = Array.isArray( copy ) ) ) ) { + + if ( copyIsArray ) { + copyIsArray = false; + clone = src && Array.isArray( src ) ? src : []; + + } else { + clone = src && jQuery.isPlainObject( src ) ? src : {}; + } + + // Never move original objects, clone them + target[ name ] = jQuery.extend( deep, clone, copy ); + + // Don't bring in undefined values + } else if ( copy !== undefined ) { + target[ name ] = copy; + } + } + } + } + + // Return the modified object + return target; +}; + +jQuery.extend( { + + // Unique for each copy of jQuery on the page + expando: "jQuery" + ( version + Math.random() ).replace( /\D/g, "" ), + + // Assume jQuery is ready without the ready module + isReady: true, + + error: function( msg ) { + throw new Error( msg ); + }, + + noop: function() {}, + + isPlainObject: function( obj ) { + var proto, Ctor; + + // Detect obvious negatives + // Use toString instead of jQuery.type to catch host objects + if ( !obj || toString.call( obj ) !== "[object Object]" ) { + return false; + } + + proto = getProto( obj ); + + // Objects with no prototype (e.g., `Object.create( null )`) are plain + if ( !proto ) { + return true; + } + + // Objects with prototype are plain iff they were constructed by a global Object function + Ctor = hasOwn.call( proto, "constructor" ) && proto.constructor; + return typeof Ctor === "function" && fnToString.call( Ctor ) === ObjectFunctionString; + }, + + isEmptyObject: function( obj ) { + + /* eslint-disable no-unused-vars */ + // See https://github.com/eslint/eslint/issues/6125 + var name; + + for ( name in obj ) { + return false; + } + return true; + }, + + // Evaluates a script in a global context + globalEval: function( code ) { + DOMEval( code ); + }, + + each: function( obj, callback ) { + var length, i = 0; + + if ( isArrayLike( obj ) ) { + length = obj.length; + for ( ; i < length; i++ ) { + if ( callback.call( obj[ i ], i, obj[ i ] ) === false ) { + break; + } + } + } else { + for ( i in obj ) { + if ( callback.call( obj[ i ], i, obj[ i ] ) === false ) { + break; + } + } + } + + return obj; + }, + + // Support: Android <=4.0 only + trim: function( text ) { + return text == null ? + "" : + ( text + "" ).replace( rtrim, "" ); + }, + + // results is for internal usage only + makeArray: function( arr, results ) { + var ret = results || []; + + if ( arr != null ) { + if ( isArrayLike( Object( arr ) ) ) { + jQuery.merge( ret, + typeof arr === "string" ? + [ arr ] : arr + ); + } else { + push.call( ret, arr ); + } + } + + return ret; + }, + + inArray: function( elem, arr, i ) { + return arr == null ? -1 : indexOf.call( arr, elem, i ); + }, + + // Support: Android <=4.0 only, PhantomJS 1 only + // push.apply(_, arraylike) throws on ancient WebKit + merge: function( first, second ) { + var len = +second.length, + j = 0, + i = first.length; + + for ( ; j < len; j++ ) { + first[ i++ ] = second[ j ]; + } + + first.length = i; + + return first; + }, + + grep: function( elems, callback, invert ) { + var callbackInverse, + matches = [], + i = 0, + length = elems.length, + callbackExpect = !invert; + + // Go through the array, only saving the items + // that pass the validator function + for ( ; i < length; i++ ) { + callbackInverse = !callback( elems[ i ], i ); + if ( callbackInverse !== callbackExpect ) { + matches.push( elems[ i ] ); + } + } + + return matches; + }, + + // arg is for internal usage only + map: function( elems, callback, arg ) { + var length, value, + i = 0, + ret = []; + + // Go through the array, translating each of the items to their new values + if ( isArrayLike( elems ) ) { + length = elems.length; + for ( ; i < length; i++ ) { + value = callback( elems[ i ], i, arg ); + + if ( value != null ) { + ret.push( value ); + } + } + + // Go through every key on the object, + } else { + for ( i in elems ) { + value = callback( elems[ i ], i, arg ); + + if ( value != null ) { + ret.push( value ); + } + } + } + + // Flatten any nested arrays + return concat.apply( [], ret ); + }, + + // A global GUID counter for objects + guid: 1, + + // jQuery.support is not used in Core but other projects attach their + // properties to it so it needs to exist. + support: support +} ); + +if ( typeof Symbol === "function" ) { + jQuery.fn[ Symbol.iterator ] = arr[ Symbol.iterator ]; +} + +// Populate the class2type map +jQuery.each( "Boolean Number String Function Array Date RegExp Object Error Symbol".split( " " ), +function( i, name ) { + class2type[ "[object " + name + "]" ] = name.toLowerCase(); +} ); + +function isArrayLike( obj ) { + + // Support: real iOS 8.2 only (not reproducible in simulator) + // `in` check used to prevent JIT error (gh-2145) + // hasOwn isn't used here due to false negatives + // regarding Nodelist length in IE + var length = !!obj && "length" in obj && obj.length, + type = toType( obj ); + + if ( isFunction( obj ) || isWindow( obj ) ) { + return false; + } + + return type === "array" || length === 0 || + typeof length === "number" && length > 0 && ( length - 1 ) in obj; +} +var Sizzle = +/*! + * Sizzle CSS Selector Engine v2.3.3 + * https://sizzlejs.com/ + * + * Copyright jQuery Foundation and other contributors + * Released under the MIT license + * http://jquery.org/license + * + * Date: 2016-08-08 + */ +(function( window ) { + +var i, + support, + Expr, + getText, + isXML, + tokenize, + compile, + select, + outermostContext, + sortInput, + hasDuplicate, + + // Local document vars + setDocument, + document, + docElem, + documentIsHTML, + rbuggyQSA, + rbuggyMatches, + matches, + contains, + + // Instance-specific data + expando = "sizzle" + 1 * new Date(), + preferredDoc = window.document, + dirruns = 0, + done = 0, + classCache = createCache(), + tokenCache = createCache(), + compilerCache = createCache(), + sortOrder = function( a, b ) { + if ( a === b ) { + hasDuplicate = true; + } + return 0; + }, + + // Instance methods + hasOwn = ({}).hasOwnProperty, + arr = [], + pop = arr.pop, + push_native = arr.push, + push = arr.push, + slice = arr.slice, + // Use a stripped-down indexOf as it's faster than native + // https://jsperf.com/thor-indexof-vs-for/5 + indexOf = function( list, elem ) { + var i = 0, + len = list.length; + for ( ; i < len; i++ ) { + if ( list[i] === elem ) { + return i; + } + } + return -1; + }, + + booleans = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped", + + // Regular expressions + + // http://www.w3.org/TR/css3-selectors/#whitespace + whitespace = "[\\x20\\t\\r\\n\\f]", + + // http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier + identifier = "(?:\\\\.|[\\w-]|[^\0-\\xa0])+", + + // Attribute selectors: http://www.w3.org/TR/selectors/#attribute-selectors + attributes = "\\[" + whitespace + "*(" + identifier + ")(?:" + whitespace + + // Operator (capture 2) + "*([*^$|!~]?=)" + whitespace + + // "Attribute values must be CSS identifiers [capture 5] or strings [capture 3 or capture 4]" + "*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|(" + identifier + "))|)" + whitespace + + "*\\]", + + pseudos = ":(" + identifier + ")(?:\\((" + + // To reduce the number of selectors needing tokenize in the preFilter, prefer arguments: + // 1. quoted (capture 3; capture 4 or capture 5) + "('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|" + + // 2. simple (capture 6) + "((?:\\\\.|[^\\\\()[\\]]|" + attributes + ")*)|" + + // 3. anything else (capture 2) + ".*" + + ")\\)|)", + + // Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter + rwhitespace = new RegExp( whitespace + "+", "g" ), + rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ), + + rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ), + rcombinators = new RegExp( "^" + whitespace + "*([>+~]|" + whitespace + ")" + whitespace + "*" ), + + rattributeQuotes = new RegExp( "=" + whitespace + "*([^\\]'\"]*?)" + whitespace + "*\\]", "g" ), + + rpseudo = new RegExp( pseudos ), + ridentifier = new RegExp( "^" + identifier + "$" ), + + matchExpr = { + "ID": new RegExp( "^#(" + identifier + ")" ), + "CLASS": new RegExp( "^\\.(" + identifier + ")" ), + "TAG": new RegExp( "^(" + identifier + "|[*])" ), + "ATTR": new RegExp( "^" + attributes ), + "PSEUDO": new RegExp( "^" + pseudos ), + "CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + whitespace + + "*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace + + "*(\\d+)|))" + whitespace + "*\\)|)", "i" ), + "bool": new RegExp( "^(?:" + booleans + ")$", "i" ), + // For use in libraries implementing .is() + // We use this for POS matching in `select` + "needsContext": new RegExp( "^" + whitespace + "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" + + whitespace + "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" ) + }, + + rinputs = /^(?:input|select|textarea|button)$/i, + rheader = /^h\d$/i, + + rnative = /^[^{]+\{\s*\[native \w/, + + // Easily-parseable/retrievable ID or TAG or CLASS selectors + rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/, + + rsibling = /[+~]/, + + // CSS escapes + // http://www.w3.org/TR/CSS21/syndata.html#escaped-characters + runescape = new RegExp( "\\\\([\\da-f]{1,6}" + whitespace + "?|(" + whitespace + ")|.)", "ig" ), + funescape = function( _, escaped, escapedWhitespace ) { + var high = "0x" + escaped - 0x10000; + // NaN means non-codepoint + // Support: Firefox<24 + // Workaround erroneous numeric interpretation of +"0x" + return high !== high || escapedWhitespace ? + escaped : + high < 0 ? + // BMP codepoint + String.fromCharCode( high + 0x10000 ) : + // Supplemental Plane codepoint (surrogate pair) + String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 ); + }, + + // CSS string/identifier serialization + // https://drafts.csswg.org/cssom/#common-serializing-idioms + rcssescape = /([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g, + fcssescape = function( ch, asCodePoint ) { + if ( asCodePoint ) { + + // U+0000 NULL becomes U+FFFD REPLACEMENT CHARACTER + if ( ch === "\0" ) { + return "\uFFFD"; + } + + // Control characters and (dependent upon position) numbers get escaped as code points + return ch.slice( 0, -1 ) + "\\" + ch.charCodeAt( ch.length - 1 ).toString( 16 ) + " "; + } + + // Other potentially-special ASCII characters get backslash-escaped + return "\\" + ch; + }, + + // Used for iframes + // See setDocument() + // Removing the function wrapper causes a "Permission Denied" + // error in IE + unloadHandler = function() { + setDocument(); + }, + + disabledAncestor = addCombinator( + function( elem ) { + return elem.disabled === true && ("form" in elem || "label" in elem); + }, + { dir: "parentNode", next: "legend" } + ); + +// Optimize for push.apply( _, NodeList ) +try { + push.apply( + (arr = slice.call( preferredDoc.childNodes )), + preferredDoc.childNodes + ); + // Support: Android<4.0 + // Detect silently failing push.apply + arr[ preferredDoc.childNodes.length ].nodeType; +} catch ( e ) { + push = { apply: arr.length ? + + // Leverage slice if possible + function( target, els ) { + push_native.apply( target, slice.call(els) ); + } : + + // Support: IE<9 + // Otherwise append directly + function( target, els ) { + var j = target.length, + i = 0; + // Can't trust NodeList.length + while ( (target[j++] = els[i++]) ) {} + target.length = j - 1; + } + }; +} + +function Sizzle( selector, context, results, seed ) { + var m, i, elem, nid, match, groups, newSelector, + newContext = context && context.ownerDocument, + + // nodeType defaults to 9, since context defaults to document + nodeType = context ? context.nodeType : 9; + + results = results || []; + + // Return early from calls with invalid selector or context + if ( typeof selector !== "string" || !selector || + nodeType !== 1 && nodeType !== 9 && nodeType !== 11 ) { + + return results; + } + + // Try to shortcut find operations (as opposed to filters) in HTML documents + if ( !seed ) { + + if ( ( context ? context.ownerDocument || context : preferredDoc ) !== document ) { + setDocument( context ); + } + context = context || document; + + if ( documentIsHTML ) { + + // If the selector is sufficiently simple, try using a "get*By*" DOM method + // (excepting DocumentFragment context, where the methods don't exist) + if ( nodeType !== 11 && (match = rquickExpr.exec( selector )) ) { + + // ID selector + if ( (m = match[1]) ) { + + // Document context + if ( nodeType === 9 ) { + if ( (elem = context.getElementById( m )) ) { + + // Support: IE, Opera, Webkit + // TODO: identify versions + // getElementById can match elements by name instead of ID + if ( elem.id === m ) { + results.push( elem ); + return results; + } + } else { + return results; + } + + // Element context + } else { + + // Support: IE, Opera, Webkit + // TODO: identify versions + // getElementById can match elements by name instead of ID + if ( newContext && (elem = newContext.getElementById( m )) && + contains( context, elem ) && + elem.id === m ) { + + results.push( elem ); + return results; + } + } + + // Type selector + } else if ( match[2] ) { + push.apply( results, context.getElementsByTagName( selector ) ); + return results; + + // Class selector + } else if ( (m = match[3]) && support.getElementsByClassName && + context.getElementsByClassName ) { + + push.apply( results, context.getElementsByClassName( m ) ); + return results; + } + } + + // Take advantage of querySelectorAll + if ( support.qsa && + !compilerCache[ selector + " " ] && + (!rbuggyQSA || !rbuggyQSA.test( selector )) ) { + + if ( nodeType !== 1 ) { + newContext = context; + newSelector = selector; + + // qSA looks outside Element context, which is not what we want + // Thanks to Andrew Dupont for this workaround technique + // Support: IE <=8 + // Exclude object elements + } else if ( context.nodeName.toLowerCase() !== "object" ) { + + // Capture the context ID, setting it first if necessary + if ( (nid = context.getAttribute( "id" )) ) { + nid = nid.replace( rcssescape, fcssescape ); + } else { + context.setAttribute( "id", (nid = expando) ); + } + + // Prefix every selector in the list + groups = tokenize( selector ); + i = groups.length; + while ( i-- ) { + groups[i] = "#" + nid + " " + toSelector( groups[i] ); + } + newSelector = groups.join( "," ); + + // Expand context for sibling selectors + newContext = rsibling.test( selector ) && testContext( context.parentNode ) || + context; + } + + if ( newSelector ) { + try { + push.apply( results, + newContext.querySelectorAll( newSelector ) + ); + return results; + } catch ( qsaError ) { + } finally { + if ( nid === expando ) { + context.removeAttribute( "id" ); + } + } + } + } + } + } + + // All others + return select( selector.replace( rtrim, "$1" ), context, results, seed ); +} + +/** + * Create key-value caches of limited size + * @returns {function(string, object)} Returns the Object data after storing it on itself with + * property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength) + * deleting the oldest entry + */ +function createCache() { + var keys = []; + + function cache( key, value ) { + // Use (key + " ") to avoid collision with native prototype properties (see Issue #157) + if ( keys.push( key + " " ) > Expr.cacheLength ) { + // Only keep the most recent entries + delete cache[ keys.shift() ]; + } + return (cache[ key + " " ] = value); + } + return cache; +} + +/** + * Mark a function for special use by Sizzle + * @param {Function} fn The function to mark + */ +function markFunction( fn ) { + fn[ expando ] = true; + return fn; +} + +/** + * Support testing using an element + * @param {Function} fn Passed the created element and returns a boolean result + */ +function assert( fn ) { + var el = document.createElement("fieldset"); + + try { + return !!fn( el ); + } catch (e) { + return false; + } finally { + // Remove from its parent by default + if ( el.parentNode ) { + el.parentNode.removeChild( el ); + } + // release memory in IE + el = null; + } +} + +/** + * Adds the same handler for all of the specified attrs + * @param {String} attrs Pipe-separated list of attributes + * @param {Function} handler The method that will be applied + */ +function addHandle( attrs, handler ) { + var arr = attrs.split("|"), + i = arr.length; + + while ( i-- ) { + Expr.attrHandle[ arr[i] ] = handler; + } +} + +/** + * Checks document order of two siblings + * @param {Element} a + * @param {Element} b + * @returns {Number} Returns less than 0 if a precedes b, greater than 0 if a follows b + */ +function siblingCheck( a, b ) { + var cur = b && a, + diff = cur && a.nodeType === 1 && b.nodeType === 1 && + a.sourceIndex - b.sourceIndex; + + // Use IE sourceIndex if available on both nodes + if ( diff ) { + return diff; + } + + // Check if b follows a + if ( cur ) { + while ( (cur = cur.nextSibling) ) { + if ( cur === b ) { + return -1; + } + } + } + + return a ? 1 : -1; +} + +/** + * Returns a function to use in pseudos for input types + * @param {String} type + */ +function createInputPseudo( type ) { + return function( elem ) { + var name = elem.nodeName.toLowerCase(); + return name === "input" && elem.type === type; + }; +} + +/** + * Returns a function to use in pseudos for buttons + * @param {String} type + */ +function createButtonPseudo( type ) { + return function( elem ) { + var name = elem.nodeName.toLowerCase(); + return (name === "input" || name === "button") && elem.type === type; + }; +} + +/** + * Returns a function to use in pseudos for :enabled/:disabled + * @param {Boolean} disabled true for :disabled; false for :enabled + */ +function createDisabledPseudo( disabled ) { + + // Known :disabled false positives: fieldset[disabled] > legend:nth-of-type(n+2) :can-disable + return function( elem ) { + + // Only certain elements can match :enabled or :disabled + // https://html.spec.whatwg.org/multipage/scripting.html#selector-enabled + // https://html.spec.whatwg.org/multipage/scripting.html#selector-disabled + if ( "form" in elem ) { + + // Check for inherited disabledness on relevant non-disabled elements: + // * listed form-associated elements in a disabled fieldset + // https://html.spec.whatwg.org/multipage/forms.html#category-listed + // https://html.spec.whatwg.org/multipage/forms.html#concept-fe-disabled + // * option elements in a disabled optgroup + // https://html.spec.whatwg.org/multipage/forms.html#concept-option-disabled + // All such elements have a "form" property. + if ( elem.parentNode && elem.disabled === false ) { + + // Option elements defer to a parent optgroup if present + if ( "label" in elem ) { + if ( "label" in elem.parentNode ) { + return elem.parentNode.disabled === disabled; + } else { + return elem.disabled === disabled; + } + } + + // Support: IE 6 - 11 + // Use the isDisabled shortcut property to check for disabled fieldset ancestors + return elem.isDisabled === disabled || + + // Where there is no isDisabled, check manually + /* jshint -W018 */ + elem.isDisabled !== !disabled && + disabledAncestor( elem ) === disabled; + } + + return elem.disabled === disabled; + + // Try to winnow out elements that can't be disabled before trusting the disabled property. + // Some victims get caught in our net (label, legend, menu, track), but it shouldn't + // even exist on them, let alone have a boolean value. + } else if ( "label" in elem ) { + return elem.disabled === disabled; + } + + // Remaining elements are neither :enabled nor :disabled + return false; + }; +} + +/** + * Returns a function to use in pseudos for positionals + * @param {Function} fn + */ +function createPositionalPseudo( fn ) { + return markFunction(function( argument ) { + argument = +argument; + return markFunction(function( seed, matches ) { + var j, + matchIndexes = fn( [], seed.length, argument ), + i = matchIndexes.length; + + // Match elements found at the specified indexes + while ( i-- ) { + if ( seed[ (j = matchIndexes[i]) ] ) { + seed[j] = !(matches[j] = seed[j]); + } + } + }); + }); +} + +/** + * Checks a node for validity as a Sizzle context + * @param {Element|Object=} context + * @returns {Element|Object|Boolean} The input node if acceptable, otherwise a falsy value + */ +function testContext( context ) { + return context && typeof context.getElementsByTagName !== "undefined" && context; +} + +// Expose support vars for convenience +support = Sizzle.support = {}; + +/** + * Detects XML nodes + * @param {Element|Object} elem An element or a document + * @returns {Boolean} True iff elem is a non-HTML XML node + */ +isXML = Sizzle.isXML = function( elem ) { + // documentElement is verified for cases where it doesn't yet exist + // (such as loading iframes in IE - #4833) + var documentElement = elem && (elem.ownerDocument || elem).documentElement; + return documentElement ? documentElement.nodeName !== "HTML" : false; +}; + +/** + * Sets document-related variables once based on the current document + * @param {Element|Object} [doc] An element or document object to use to set the document + * @returns {Object} Returns the current document + */ +setDocument = Sizzle.setDocument = function( node ) { + var hasCompare, subWindow, + doc = node ? node.ownerDocument || node : preferredDoc; + + // Return early if doc is invalid or already selected + if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) { + return document; + } + + // Update global variables + document = doc; + docElem = document.documentElement; + documentIsHTML = !isXML( document ); + + // Support: IE 9-11, Edge + // Accessing iframe documents after unload throws "permission denied" errors (jQuery #13936) + if ( preferredDoc !== document && + (subWindow = document.defaultView) && subWindow.top !== subWindow ) { + + // Support: IE 11, Edge + if ( subWindow.addEventListener ) { + subWindow.addEventListener( "unload", unloadHandler, false ); + + // Support: IE 9 - 10 only + } else if ( subWindow.attachEvent ) { + subWindow.attachEvent( "onunload", unloadHandler ); + } + } + + /* Attributes + ---------------------------------------------------------------------- */ + + // Support: IE<8 + // Verify that getAttribute really returns attributes and not properties + // (excepting IE8 booleans) + support.attributes = assert(function( el ) { + el.className = "i"; + return !el.getAttribute("className"); + }); + + /* getElement(s)By* + ---------------------------------------------------------------------- */ + + // Check if getElementsByTagName("*") returns only elements + support.getElementsByTagName = assert(function( el ) { + el.appendChild( document.createComment("") ); + return !el.getElementsByTagName("*").length; + }); + + // Support: IE<9 + support.getElementsByClassName = rnative.test( document.getElementsByClassName ); + + // Support: IE<10 + // Check if getElementById returns elements by name + // The broken getElementById methods don't pick up programmatically-set names, + // so use a roundabout getElementsByName test + support.getById = assert(function( el ) { + docElem.appendChild( el ).id = expando; + return !document.getElementsByName || !document.getElementsByName( expando ).length; + }); + + // ID filter and find + if ( support.getById ) { + Expr.filter["ID"] = function( id ) { + var attrId = id.replace( runescape, funescape ); + return function( elem ) { + return elem.getAttribute("id") === attrId; + }; + }; + Expr.find["ID"] = function( id, context ) { + if ( typeof context.getElementById !== "undefined" && documentIsHTML ) { + var elem = context.getElementById( id ); + return elem ? [ elem ] : []; + } + }; + } else { + Expr.filter["ID"] = function( id ) { + var attrId = id.replace( runescape, funescape ); + return function( elem ) { + var node = typeof elem.getAttributeNode !== "undefined" && + elem.getAttributeNode("id"); + return node && node.value === attrId; + }; + }; + + // Support: IE 6 - 7 only + // getElementById is not reliable as a find shortcut + Expr.find["ID"] = function( id, context ) { + if ( typeof context.getElementById !== "undefined" && documentIsHTML ) { + var node, i, elems, + elem = context.getElementById( id ); + + if ( elem ) { + + // Verify the id attribute + node = elem.getAttributeNode("id"); + if ( node && node.value === id ) { + return [ elem ]; + } + + // Fall back on getElementsByName + elems = context.getElementsByName( id ); + i = 0; + while ( (elem = elems[i++]) ) { + node = elem.getAttributeNode("id"); + if ( node && node.value === id ) { + return [ elem ]; + } + } + } + + return []; + } + }; + } + + // Tag + Expr.find["TAG"] = support.getElementsByTagName ? + function( tag, context ) { + if ( typeof context.getElementsByTagName !== "undefined" ) { + return context.getElementsByTagName( tag ); + + // DocumentFragment nodes don't have gEBTN + } else if ( support.qsa ) { + return context.querySelectorAll( tag ); + } + } : + + function( tag, context ) { + var elem, + tmp = [], + i = 0, + // By happy coincidence, a (broken) gEBTN appears on DocumentFragment nodes too + results = context.getElementsByTagName( tag ); + + // Filter out possible comments + if ( tag === "*" ) { + while ( (elem = results[i++]) ) { + if ( elem.nodeType === 1 ) { + tmp.push( elem ); + } + } + + return tmp; + } + return results; + }; + + // Class + Expr.find["CLASS"] = support.getElementsByClassName && function( className, context ) { + if ( typeof context.getElementsByClassName !== "undefined" && documentIsHTML ) { + return context.getElementsByClassName( className ); + } + }; + + /* QSA/matchesSelector + ---------------------------------------------------------------------- */ + + // QSA and matchesSelector support + + // matchesSelector(:active) reports false when true (IE9/Opera 11.5) + rbuggyMatches = []; + + // qSa(:focus) reports false when true (Chrome 21) + // We allow this because of a bug in IE8/9 that throws an error + // whenever `document.activeElement` is accessed on an iframe + // So, we allow :focus to pass through QSA all the time to avoid the IE error + // See https://bugs.jquery.com/ticket/13378 + rbuggyQSA = []; + + if ( (support.qsa = rnative.test( document.querySelectorAll )) ) { + // Build QSA regex + // Regex strategy adopted from Diego Perini + assert(function( el ) { + // Select is set to empty string on purpose + // This is to test IE's treatment of not explicitly + // setting a boolean content attribute, + // since its presence should be enough + // https://bugs.jquery.com/ticket/12359 + docElem.appendChild( el ).innerHTML = "" + + ""; + + // Support: IE8, Opera 11-12.16 + // Nothing should be selected when empty strings follow ^= or $= or *= + // The test attribute must be unknown in Opera but "safe" for WinRT + // https://msdn.microsoft.com/en-us/library/ie/hh465388.aspx#attribute_section + if ( el.querySelectorAll("[msallowcapture^='']").length ) { + rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" ); + } + + // Support: IE8 + // Boolean attributes and "value" are not treated correctly + if ( !el.querySelectorAll("[selected]").length ) { + rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" ); + } + + // Support: Chrome<29, Android<4.4, Safari<7.0+, iOS<7.0+, PhantomJS<1.9.8+ + if ( !el.querySelectorAll( "[id~=" + expando + "-]" ).length ) { + rbuggyQSA.push("~="); + } + + // Webkit/Opera - :checked should return selected option elements + // http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked + // IE8 throws error here and will not see later tests + if ( !el.querySelectorAll(":checked").length ) { + rbuggyQSA.push(":checked"); + } + + // Support: Safari 8+, iOS 8+ + // https://bugs.webkit.org/show_bug.cgi?id=136851 + // In-page `selector#id sibling-combinator selector` fails + if ( !el.querySelectorAll( "a#" + expando + "+*" ).length ) { + rbuggyQSA.push(".#.+[+~]"); + } + }); + + assert(function( el ) { + el.innerHTML = "" + + ""; + + // Support: Windows 8 Native Apps + // The type and name attributes are restricted during .innerHTML assignment + var input = document.createElement("input"); + input.setAttribute( "type", "hidden" ); + el.appendChild( input ).setAttribute( "name", "D" ); + + // Support: IE8 + // Enforce case-sensitivity of name attribute + if ( el.querySelectorAll("[name=d]").length ) { + rbuggyQSA.push( "name" + whitespace + "*[*^$|!~]?=" ); + } + + // FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled) + // IE8 throws error here and will not see later tests + if ( el.querySelectorAll(":enabled").length !== 2 ) { + rbuggyQSA.push( ":enabled", ":disabled" ); + } + + // Support: IE9-11+ + // IE's :disabled selector does not pick up the children of disabled fieldsets + docElem.appendChild( el ).disabled = true; + if ( el.querySelectorAll(":disabled").length !== 2 ) { + rbuggyQSA.push( ":enabled", ":disabled" ); + } + + // Opera 10-11 does not throw on post-comma invalid pseudos + el.querySelectorAll("*,:x"); + rbuggyQSA.push(",.*:"); + }); + } + + if ( (support.matchesSelector = rnative.test( (matches = docElem.matches || + docElem.webkitMatchesSelector || + docElem.mozMatchesSelector || + docElem.oMatchesSelector || + docElem.msMatchesSelector) )) ) { + + assert(function( el ) { + // Check to see if it's possible to do matchesSelector + // on a disconnected node (IE 9) + support.disconnectedMatch = matches.call( el, "*" ); + + // This should fail with an exception + // Gecko does not error, returns false instead + matches.call( el, "[s!='']:x" ); + rbuggyMatches.push( "!=", pseudos ); + }); + } + + rbuggyQSA = rbuggyQSA.length && new RegExp( rbuggyQSA.join("|") ); + rbuggyMatches = rbuggyMatches.length && new RegExp( rbuggyMatches.join("|") ); + + /* Contains + ---------------------------------------------------------------------- */ + hasCompare = rnative.test( docElem.compareDocumentPosition ); + + // Element contains another + // Purposefully self-exclusive + // As in, an element does not contain itself + contains = hasCompare || rnative.test( docElem.contains ) ? + function( a, b ) { + var adown = a.nodeType === 9 ? a.documentElement : a, + bup = b && b.parentNode; + return a === bup || !!( bup && bup.nodeType === 1 && ( + adown.contains ? + adown.contains( bup ) : + a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16 + )); + } : + function( a, b ) { + if ( b ) { + while ( (b = b.parentNode) ) { + if ( b === a ) { + return true; + } + } + } + return false; + }; + + /* Sorting + ---------------------------------------------------------------------- */ + + // Document order sorting + sortOrder = hasCompare ? + function( a, b ) { + + // Flag for duplicate removal + if ( a === b ) { + hasDuplicate = true; + return 0; + } + + // Sort on method existence if only one input has compareDocumentPosition + var compare = !a.compareDocumentPosition - !b.compareDocumentPosition; + if ( compare ) { + return compare; + } + + // Calculate position if both inputs belong to the same document + compare = ( a.ownerDocument || a ) === ( b.ownerDocument || b ) ? + a.compareDocumentPosition( b ) : + + // Otherwise we know they are disconnected + 1; + + // Disconnected nodes + if ( compare & 1 || + (!support.sortDetached && b.compareDocumentPosition( a ) === compare) ) { + + // Choose the first element that is related to our preferred document + if ( a === document || a.ownerDocument === preferredDoc && contains(preferredDoc, a) ) { + return -1; + } + if ( b === document || b.ownerDocument === preferredDoc && contains(preferredDoc, b) ) { + return 1; + } + + // Maintain original order + return sortInput ? + ( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) : + 0; + } + + return compare & 4 ? -1 : 1; + } : + function( a, b ) { + // Exit early if the nodes are identical + if ( a === b ) { + hasDuplicate = true; + return 0; + } + + var cur, + i = 0, + aup = a.parentNode, + bup = b.parentNode, + ap = [ a ], + bp = [ b ]; + + // Parentless nodes are either documents or disconnected + if ( !aup || !bup ) { + return a === document ? -1 : + b === document ? 1 : + aup ? -1 : + bup ? 1 : + sortInput ? + ( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) : + 0; + + // If the nodes are siblings, we can do a quick check + } else if ( aup === bup ) { + return siblingCheck( a, b ); + } + + // Otherwise we need full lists of their ancestors for comparison + cur = a; + while ( (cur = cur.parentNode) ) { + ap.unshift( cur ); + } + cur = b; + while ( (cur = cur.parentNode) ) { + bp.unshift( cur ); + } + + // Walk down the tree looking for a discrepancy + while ( ap[i] === bp[i] ) { + i++; + } + + return i ? + // Do a sibling check if the nodes have a common ancestor + siblingCheck( ap[i], bp[i] ) : + + // Otherwise nodes in our document sort first + ap[i] === preferredDoc ? -1 : + bp[i] === preferredDoc ? 1 : + 0; + }; + + return document; +}; + +Sizzle.matches = function( expr, elements ) { + return Sizzle( expr, null, null, elements ); +}; + +Sizzle.matchesSelector = function( elem, expr ) { + // Set document vars if needed + if ( ( elem.ownerDocument || elem ) !== document ) { + setDocument( elem ); + } + + // Make sure that attribute selectors are quoted + expr = expr.replace( rattributeQuotes, "='$1']" ); + + if ( support.matchesSelector && documentIsHTML && + !compilerCache[ expr + " " ] && + ( !rbuggyMatches || !rbuggyMatches.test( expr ) ) && + ( !rbuggyQSA || !rbuggyQSA.test( expr ) ) ) { + + try { + var ret = matches.call( elem, expr ); + + // IE 9's matchesSelector returns false on disconnected nodes + if ( ret || support.disconnectedMatch || + // As well, disconnected nodes are said to be in a document + // fragment in IE 9 + elem.document && elem.document.nodeType !== 11 ) { + return ret; + } + } catch (e) {} + } + + return Sizzle( expr, document, null, [ elem ] ).length > 0; +}; + +Sizzle.contains = function( context, elem ) { + // Set document vars if needed + if ( ( context.ownerDocument || context ) !== document ) { + setDocument( context ); + } + return contains( context, elem ); +}; + +Sizzle.attr = function( elem, name ) { + // Set document vars if needed + if ( ( elem.ownerDocument || elem ) !== document ) { + setDocument( elem ); + } + + var fn = Expr.attrHandle[ name.toLowerCase() ], + // Don't get fooled by Object.prototype properties (jQuery #13807) + val = fn && hasOwn.call( Expr.attrHandle, name.toLowerCase() ) ? + fn( elem, name, !documentIsHTML ) : + undefined; + + return val !== undefined ? + val : + support.attributes || !documentIsHTML ? + elem.getAttribute( name ) : + (val = elem.getAttributeNode(name)) && val.specified ? + val.value : + null; +}; + +Sizzle.escape = function( sel ) { + return (sel + "").replace( rcssescape, fcssescape ); +}; + +Sizzle.error = function( msg ) { + throw new Error( "Syntax error, unrecognized expression: " + msg ); +}; + +/** + * Document sorting and removing duplicates + * @param {ArrayLike} results + */ +Sizzle.uniqueSort = function( results ) { + var elem, + duplicates = [], + j = 0, + i = 0; + + // Unless we *know* we can detect duplicates, assume their presence + hasDuplicate = !support.detectDuplicates; + sortInput = !support.sortStable && results.slice( 0 ); + results.sort( sortOrder ); + + if ( hasDuplicate ) { + while ( (elem = results[i++]) ) { + if ( elem === results[ i ] ) { + j = duplicates.push( i ); + } + } + while ( j-- ) { + results.splice( duplicates[ j ], 1 ); + } + } + + // Clear input after sorting to release objects + // See https://github.com/jquery/sizzle/pull/225 + sortInput = null; + + return results; +}; + +/** + * Utility function for retrieving the text value of an array of DOM nodes + * @param {Array|Element} elem + */ +getText = Sizzle.getText = function( elem ) { + var node, + ret = "", + i = 0, + nodeType = elem.nodeType; + + if ( !nodeType ) { + // If no nodeType, this is expected to be an array + while ( (node = elem[i++]) ) { + // Do not traverse comment nodes + ret += getText( node ); + } + } else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) { + // Use textContent for elements + // innerText usage removed for consistency of new lines (jQuery #11153) + if ( typeof elem.textContent === "string" ) { + return elem.textContent; + } else { + // Traverse its children + for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) { + ret += getText( elem ); + } + } + } else if ( nodeType === 3 || nodeType === 4 ) { + return elem.nodeValue; + } + // Do not include comment or processing instruction nodes + + return ret; +}; + +Expr = Sizzle.selectors = { + + // Can be adjusted by the user + cacheLength: 50, + + createPseudo: markFunction, + + match: matchExpr, + + attrHandle: {}, + + find: {}, + + relative: { + ">": { dir: "parentNode", first: true }, + " ": { dir: "parentNode" }, + "+": { dir: "previousSibling", first: true }, + "~": { dir: "previousSibling" } + }, + + preFilter: { + "ATTR": function( match ) { + match[1] = match[1].replace( runescape, funescape ); + + // Move the given value to match[3] whether quoted or unquoted + match[3] = ( match[3] || match[4] || match[5] || "" ).replace( runescape, funescape ); + + if ( match[2] === "~=" ) { + match[3] = " " + match[3] + " "; + } + + return match.slice( 0, 4 ); + }, + + "CHILD": function( match ) { + /* matches from matchExpr["CHILD"] + 1 type (only|nth|...) + 2 what (child|of-type) + 3 argument (even|odd|\d*|\d*n([+-]\d+)?|...) + 4 xn-component of xn+y argument ([+-]?\d*n|) + 5 sign of xn-component + 6 x of xn-component + 7 sign of y-component + 8 y of y-component + */ + match[1] = match[1].toLowerCase(); + + if ( match[1].slice( 0, 3 ) === "nth" ) { + // nth-* requires argument + if ( !match[3] ) { + Sizzle.error( match[0] ); + } + + // numeric x and y parameters for Expr.filter.CHILD + // remember that false/true cast respectively to 0/1 + match[4] = +( match[4] ? match[5] + (match[6] || 1) : 2 * ( match[3] === "even" || match[3] === "odd" ) ); + match[5] = +( ( match[7] + match[8] ) || match[3] === "odd" ); + + // other types prohibit arguments + } else if ( match[3] ) { + Sizzle.error( match[0] ); + } + + return match; + }, + + "PSEUDO": function( match ) { + var excess, + unquoted = !match[6] && match[2]; + + if ( matchExpr["CHILD"].test( match[0] ) ) { + return null; + } + + // Accept quoted arguments as-is + if ( match[3] ) { + match[2] = match[4] || match[5] || ""; + + // Strip excess characters from unquoted arguments + } else if ( unquoted && rpseudo.test( unquoted ) && + // Get excess from tokenize (recursively) + (excess = tokenize( unquoted, true )) && + // advance to the next closing parenthesis + (excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length) ) { + + // excess is a negative index + match[0] = match[0].slice( 0, excess ); + match[2] = unquoted.slice( 0, excess ); + } + + // Return only captures needed by the pseudo filter method (type and argument) + return match.slice( 0, 3 ); + } + }, + + filter: { + + "TAG": function( nodeNameSelector ) { + var nodeName = nodeNameSelector.replace( runescape, funescape ).toLowerCase(); + return nodeNameSelector === "*" ? + function() { return true; } : + function( elem ) { + return elem.nodeName && elem.nodeName.toLowerCase() === nodeName; + }; + }, + + "CLASS": function( className ) { + var pattern = classCache[ className + " " ]; + + return pattern || + (pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) && + classCache( className, function( elem ) { + return pattern.test( typeof elem.className === "string" && elem.className || typeof elem.getAttribute !== "undefined" && elem.getAttribute("class") || "" ); + }); + }, + + "ATTR": function( name, operator, check ) { + return function( elem ) { + var result = Sizzle.attr( elem, name ); + + if ( result == null ) { + return operator === "!="; + } + if ( !operator ) { + return true; + } + + result += ""; + + return operator === "=" ? result === check : + operator === "!=" ? result !== check : + operator === "^=" ? check && result.indexOf( check ) === 0 : + operator === "*=" ? check && result.indexOf( check ) > -1 : + operator === "$=" ? check && result.slice( -check.length ) === check : + operator === "~=" ? ( " " + result.replace( rwhitespace, " " ) + " " ).indexOf( check ) > -1 : + operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" : + false; + }; + }, + + "CHILD": function( type, what, argument, first, last ) { + var simple = type.slice( 0, 3 ) !== "nth", + forward = type.slice( -4 ) !== "last", + ofType = what === "of-type"; + + return first === 1 && last === 0 ? + + // Shortcut for :nth-*(n) + function( elem ) { + return !!elem.parentNode; + } : + + function( elem, context, xml ) { + var cache, uniqueCache, outerCache, node, nodeIndex, start, + dir = simple !== forward ? "nextSibling" : "previousSibling", + parent = elem.parentNode, + name = ofType && elem.nodeName.toLowerCase(), + useCache = !xml && !ofType, + diff = false; + + if ( parent ) { + + // :(first|last|only)-(child|of-type) + if ( simple ) { + while ( dir ) { + node = elem; + while ( (node = node[ dir ]) ) { + if ( ofType ? + node.nodeName.toLowerCase() === name : + node.nodeType === 1 ) { + + return false; + } + } + // Reverse direction for :only-* (if we haven't yet done so) + start = dir = type === "only" && !start && "nextSibling"; + } + return true; + } + + start = [ forward ? parent.firstChild : parent.lastChild ]; + + // non-xml :nth-child(...) stores cache data on `parent` + if ( forward && useCache ) { + + // Seek `elem` from a previously-cached index + + // ...in a gzip-friendly way + node = parent; + outerCache = node[ expando ] || (node[ expando ] = {}); + + // Support: IE <9 only + // Defend against cloned attroperties (jQuery gh-1709) + uniqueCache = outerCache[ node.uniqueID ] || + (outerCache[ node.uniqueID ] = {}); + + cache = uniqueCache[ type ] || []; + nodeIndex = cache[ 0 ] === dirruns && cache[ 1 ]; + diff = nodeIndex && cache[ 2 ]; + node = nodeIndex && parent.childNodes[ nodeIndex ]; + + while ( (node = ++nodeIndex && node && node[ dir ] || + + // Fallback to seeking `elem` from the start + (diff = nodeIndex = 0) || start.pop()) ) { + + // When found, cache indexes on `parent` and break + if ( node.nodeType === 1 && ++diff && node === elem ) { + uniqueCache[ type ] = [ dirruns, nodeIndex, diff ]; + break; + } + } + + } else { + // Use previously-cached element index if available + if ( useCache ) { + // ...in a gzip-friendly way + node = elem; + outerCache = node[ expando ] || (node[ expando ] = {}); + + // Support: IE <9 only + // Defend against cloned attroperties (jQuery gh-1709) + uniqueCache = outerCache[ node.uniqueID ] || + (outerCache[ node.uniqueID ] = {}); + + cache = uniqueCache[ type ] || []; + nodeIndex = cache[ 0 ] === dirruns && cache[ 1 ]; + diff = nodeIndex; + } + + // xml :nth-child(...) + // or :nth-last-child(...) or :nth(-last)?-of-type(...) + if ( diff === false ) { + // Use the same loop as above to seek `elem` from the start + while ( (node = ++nodeIndex && node && node[ dir ] || + (diff = nodeIndex = 0) || start.pop()) ) { + + if ( ( ofType ? + node.nodeName.toLowerCase() === name : + node.nodeType === 1 ) && + ++diff ) { + + // Cache the index of each encountered element + if ( useCache ) { + outerCache = node[ expando ] || (node[ expando ] = {}); + + // Support: IE <9 only + // Defend against cloned attroperties (jQuery gh-1709) + uniqueCache = outerCache[ node.uniqueID ] || + (outerCache[ node.uniqueID ] = {}); + + uniqueCache[ type ] = [ dirruns, diff ]; + } + + if ( node === elem ) { + break; + } + } + } + } + } + + // Incorporate the offset, then check against cycle size + diff -= last; + return diff === first || ( diff % first === 0 && diff / first >= 0 ); + } + }; + }, + + "PSEUDO": function( pseudo, argument ) { + // pseudo-class names are case-insensitive + // http://www.w3.org/TR/selectors/#pseudo-classes + // Prioritize by case sensitivity in case custom pseudos are added with uppercase letters + // Remember that setFilters inherits from pseudos + var args, + fn = Expr.pseudos[ pseudo ] || Expr.setFilters[ pseudo.toLowerCase() ] || + Sizzle.error( "unsupported pseudo: " + pseudo ); + + // The user may use createPseudo to indicate that + // arguments are needed to create the filter function + // just as Sizzle does + if ( fn[ expando ] ) { + return fn( argument ); + } + + // But maintain support for old signatures + if ( fn.length > 1 ) { + args = [ pseudo, pseudo, "", argument ]; + return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ? + markFunction(function( seed, matches ) { + var idx, + matched = fn( seed, argument ), + i = matched.length; + while ( i-- ) { + idx = indexOf( seed, matched[i] ); + seed[ idx ] = !( matches[ idx ] = matched[i] ); + } + }) : + function( elem ) { + return fn( elem, 0, args ); + }; + } + + return fn; + } + }, + + pseudos: { + // Potentially complex pseudos + "not": markFunction(function( selector ) { + // Trim the selector passed to compile + // to avoid treating leading and trailing + // spaces as combinators + var input = [], + results = [], + matcher = compile( selector.replace( rtrim, "$1" ) ); + + return matcher[ expando ] ? + markFunction(function( seed, matches, context, xml ) { + var elem, + unmatched = matcher( seed, null, xml, [] ), + i = seed.length; + + // Match elements unmatched by `matcher` + while ( i-- ) { + if ( (elem = unmatched[i]) ) { + seed[i] = !(matches[i] = elem); + } + } + }) : + function( elem, context, xml ) { + input[0] = elem; + matcher( input, null, xml, results ); + // Don't keep the element (issue #299) + input[0] = null; + return !results.pop(); + }; + }), + + "has": markFunction(function( selector ) { + return function( elem ) { + return Sizzle( selector, elem ).length > 0; + }; + }), + + "contains": markFunction(function( text ) { + text = text.replace( runescape, funescape ); + return function( elem ) { + return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1; + }; + }), + + // "Whether an element is represented by a :lang() selector + // is based solely on the element's language value + // being equal to the identifier C, + // or beginning with the identifier C immediately followed by "-". + // The matching of C against the element's language value is performed case-insensitively. + // The identifier C does not have to be a valid language name." + // http://www.w3.org/TR/selectors/#lang-pseudo + "lang": markFunction( function( lang ) { + // lang value must be a valid identifier + if ( !ridentifier.test(lang || "") ) { + Sizzle.error( "unsupported lang: " + lang ); + } + lang = lang.replace( runescape, funescape ).toLowerCase(); + return function( elem ) { + var elemLang; + do { + if ( (elemLang = documentIsHTML ? + elem.lang : + elem.getAttribute("xml:lang") || elem.getAttribute("lang")) ) { + + elemLang = elemLang.toLowerCase(); + return elemLang === lang || elemLang.indexOf( lang + "-" ) === 0; + } + } while ( (elem = elem.parentNode) && elem.nodeType === 1 ); + return false; + }; + }), + + // Miscellaneous + "target": function( elem ) { + var hash = window.location && window.location.hash; + return hash && hash.slice( 1 ) === elem.id; + }, + + "root": function( elem ) { + return elem === docElem; + }, + + "focus": function( elem ) { + return elem === document.activeElement && (!document.hasFocus || document.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex); + }, + + // Boolean properties + "enabled": createDisabledPseudo( false ), + "disabled": createDisabledPseudo( true ), + + "checked": function( elem ) { + // In CSS3, :checked should return both checked and selected elements + // http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked + var nodeName = elem.nodeName.toLowerCase(); + return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected); + }, + + "selected": function( elem ) { + // Accessing this property makes selected-by-default + // options in Safari work properly + if ( elem.parentNode ) { + elem.parentNode.selectedIndex; + } + + return elem.selected === true; + }, + + // Contents + "empty": function( elem ) { + // http://www.w3.org/TR/selectors/#empty-pseudo + // :empty is negated by element (1) or content nodes (text: 3; cdata: 4; entity ref: 5), + // but not by others (comment: 8; processing instruction: 7; etc.) + // nodeType < 6 works because attributes (2) do not appear as children + for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) { + if ( elem.nodeType < 6 ) { + return false; + } + } + return true; + }, + + "parent": function( elem ) { + return !Expr.pseudos["empty"]( elem ); + }, + + // Element/input types + "header": function( elem ) { + return rheader.test( elem.nodeName ); + }, + + "input": function( elem ) { + return rinputs.test( elem.nodeName ); + }, + + "button": function( elem ) { + var name = elem.nodeName.toLowerCase(); + return name === "input" && elem.type === "button" || name === "button"; + }, + + "text": function( elem ) { + var attr; + return elem.nodeName.toLowerCase() === "input" && + elem.type === "text" && + + // Support: IE<8 + // New HTML5 attribute values (e.g., "search") appear with elem.type === "text" + ( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === "text" ); + }, + + // Position-in-collection + "first": createPositionalPseudo(function() { + return [ 0 ]; + }), + + "last": createPositionalPseudo(function( matchIndexes, length ) { + return [ length - 1 ]; + }), + + "eq": createPositionalPseudo(function( matchIndexes, length, argument ) { + return [ argument < 0 ? argument + length : argument ]; + }), + + "even": createPositionalPseudo(function( matchIndexes, length ) { + var i = 0; + for ( ; i < length; i += 2 ) { + matchIndexes.push( i ); + } + return matchIndexes; + }), + + "odd": createPositionalPseudo(function( matchIndexes, length ) { + var i = 1; + for ( ; i < length; i += 2 ) { + matchIndexes.push( i ); + } + return matchIndexes; + }), + + "lt": createPositionalPseudo(function( matchIndexes, length, argument ) { + var i = argument < 0 ? argument + length : argument; + for ( ; --i >= 0; ) { + matchIndexes.push( i ); + } + return matchIndexes; + }), + + "gt": createPositionalPseudo(function( matchIndexes, length, argument ) { + var i = argument < 0 ? argument + length : argument; + for ( ; ++i < length; ) { + matchIndexes.push( i ); + } + return matchIndexes; + }) + } +}; + +Expr.pseudos["nth"] = Expr.pseudos["eq"]; + +// Add button/input type pseudos +for ( i in { radio: true, checkbox: true, file: true, password: true, image: true } ) { + Expr.pseudos[ i ] = createInputPseudo( i ); +} +for ( i in { submit: true, reset: true } ) { + Expr.pseudos[ i ] = createButtonPseudo( i ); +} + +// Easy API for creating new setFilters +function setFilters() {} +setFilters.prototype = Expr.filters = Expr.pseudos; +Expr.setFilters = new setFilters(); + +tokenize = Sizzle.tokenize = function( selector, parseOnly ) { + var matched, match, tokens, type, + soFar, groups, preFilters, + cached = tokenCache[ selector + " " ]; + + if ( cached ) { + return parseOnly ? 0 : cached.slice( 0 ); + } + + soFar = selector; + groups = []; + preFilters = Expr.preFilter; + + while ( soFar ) { + + // Comma and first run + if ( !matched || (match = rcomma.exec( soFar )) ) { + if ( match ) { + // Don't consume trailing commas as valid + soFar = soFar.slice( match[0].length ) || soFar; + } + groups.push( (tokens = []) ); + } + + matched = false; + + // Combinators + if ( (match = rcombinators.exec( soFar )) ) { + matched = match.shift(); + tokens.push({ + value: matched, + // Cast descendant combinators to space + type: match[0].replace( rtrim, " " ) + }); + soFar = soFar.slice( matched.length ); + } + + // Filters + for ( type in Expr.filter ) { + if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] || + (match = preFilters[ type ]( match ))) ) { + matched = match.shift(); + tokens.push({ + value: matched, + type: type, + matches: match + }); + soFar = soFar.slice( matched.length ); + } + } + + if ( !matched ) { + break; + } + } + + // Return the length of the invalid excess + // if we're just parsing + // Otherwise, throw an error or return tokens + return parseOnly ? + soFar.length : + soFar ? + Sizzle.error( selector ) : + // Cache the tokens + tokenCache( selector, groups ).slice( 0 ); +}; + +function toSelector( tokens ) { + var i = 0, + len = tokens.length, + selector = ""; + for ( ; i < len; i++ ) { + selector += tokens[i].value; + } + return selector; +} + +function addCombinator( matcher, combinator, base ) { + var dir = combinator.dir, + skip = combinator.next, + key = skip || dir, + checkNonElements = base && key === "parentNode", + doneName = done++; + + return combinator.first ? + // Check against closest ancestor/preceding element + function( elem, context, xml ) { + while ( (elem = elem[ dir ]) ) { + if ( elem.nodeType === 1 || checkNonElements ) { + return matcher( elem, context, xml ); + } + } + return false; + } : + + // Check against all ancestor/preceding elements + function( elem, context, xml ) { + var oldCache, uniqueCache, outerCache, + newCache = [ dirruns, doneName ]; + + // We can't set arbitrary data on XML nodes, so they don't benefit from combinator caching + if ( xml ) { + while ( (elem = elem[ dir ]) ) { + if ( elem.nodeType === 1 || checkNonElements ) { + if ( matcher( elem, context, xml ) ) { + return true; + } + } + } + } else { + while ( (elem = elem[ dir ]) ) { + if ( elem.nodeType === 1 || checkNonElements ) { + outerCache = elem[ expando ] || (elem[ expando ] = {}); + + // Support: IE <9 only + // Defend against cloned attroperties (jQuery gh-1709) + uniqueCache = outerCache[ elem.uniqueID ] || (outerCache[ elem.uniqueID ] = {}); + + if ( skip && skip === elem.nodeName.toLowerCase() ) { + elem = elem[ dir ] || elem; + } else if ( (oldCache = uniqueCache[ key ]) && + oldCache[ 0 ] === dirruns && oldCache[ 1 ] === doneName ) { + + // Assign to newCache so results back-propagate to previous elements + return (newCache[ 2 ] = oldCache[ 2 ]); + } else { + // Reuse newcache so results back-propagate to previous elements + uniqueCache[ key ] = newCache; + + // A match means we're done; a fail means we have to keep checking + if ( (newCache[ 2 ] = matcher( elem, context, xml )) ) { + return true; + } + } + } + } + } + return false; + }; +} + +function elementMatcher( matchers ) { + return matchers.length > 1 ? + function( elem, context, xml ) { + var i = matchers.length; + while ( i-- ) { + if ( !matchers[i]( elem, context, xml ) ) { + return false; + } + } + return true; + } : + matchers[0]; +} + +function multipleContexts( selector, contexts, results ) { + var i = 0, + len = contexts.length; + for ( ; i < len; i++ ) { + Sizzle( selector, contexts[i], results ); + } + return results; +} + +function condense( unmatched, map, filter, context, xml ) { + var elem, + newUnmatched = [], + i = 0, + len = unmatched.length, + mapped = map != null; + + for ( ; i < len; i++ ) { + if ( (elem = unmatched[i]) ) { + if ( !filter || filter( elem, context, xml ) ) { + newUnmatched.push( elem ); + if ( mapped ) { + map.push( i ); + } + } + } + } + + return newUnmatched; +} + +function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postSelector ) { + if ( postFilter && !postFilter[ expando ] ) { + postFilter = setMatcher( postFilter ); + } + if ( postFinder && !postFinder[ expando ] ) { + postFinder = setMatcher( postFinder, postSelector ); + } + return markFunction(function( seed, results, context, xml ) { + var temp, i, elem, + preMap = [], + postMap = [], + preexisting = results.length, + + // Get initial elements from seed or context + elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [] ), + + // Prefilter to get matcher input, preserving a map for seed-results synchronization + matcherIn = preFilter && ( seed || !selector ) ? + condense( elems, preMap, preFilter, context, xml ) : + elems, + + matcherOut = matcher ? + // If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results, + postFinder || ( seed ? preFilter : preexisting || postFilter ) ? + + // ...intermediate processing is necessary + [] : + + // ...otherwise use results directly + results : + matcherIn; + + // Find primary matches + if ( matcher ) { + matcher( matcherIn, matcherOut, context, xml ); + } + + // Apply postFilter + if ( postFilter ) { + temp = condense( matcherOut, postMap ); + postFilter( temp, [], context, xml ); + + // Un-match failing elements by moving them back to matcherIn + i = temp.length; + while ( i-- ) { + if ( (elem = temp[i]) ) { + matcherOut[ postMap[i] ] = !(matcherIn[ postMap[i] ] = elem); + } + } + } + + if ( seed ) { + if ( postFinder || preFilter ) { + if ( postFinder ) { + // Get the final matcherOut by condensing this intermediate into postFinder contexts + temp = []; + i = matcherOut.length; + while ( i-- ) { + if ( (elem = matcherOut[i]) ) { + // Restore matcherIn since elem is not yet a final match + temp.push( (matcherIn[i] = elem) ); + } + } + postFinder( null, (matcherOut = []), temp, xml ); + } + + // Move matched elements from seed to results to keep them synchronized + i = matcherOut.length; + while ( i-- ) { + if ( (elem = matcherOut[i]) && + (temp = postFinder ? indexOf( seed, elem ) : preMap[i]) > -1 ) { + + seed[temp] = !(results[temp] = elem); + } + } + } + + // Add elements to results, through postFinder if defined + } else { + matcherOut = condense( + matcherOut === results ? + matcherOut.splice( preexisting, matcherOut.length ) : + matcherOut + ); + if ( postFinder ) { + postFinder( null, results, matcherOut, xml ); + } else { + push.apply( results, matcherOut ); + } + } + }); +} + +function matcherFromTokens( tokens ) { + var checkContext, matcher, j, + len = tokens.length, + leadingRelative = Expr.relative[ tokens[0].type ], + implicitRelative = leadingRelative || Expr.relative[" "], + i = leadingRelative ? 1 : 0, + + // The foundational matcher ensures that elements are reachable from top-level context(s) + matchContext = addCombinator( function( elem ) { + return elem === checkContext; + }, implicitRelative, true ), + matchAnyContext = addCombinator( function( elem ) { + return indexOf( checkContext, elem ) > -1; + }, implicitRelative, true ), + matchers = [ function( elem, context, xml ) { + var ret = ( !leadingRelative && ( xml || context !== outermostContext ) ) || ( + (checkContext = context).nodeType ? + matchContext( elem, context, xml ) : + matchAnyContext( elem, context, xml ) ); + // Avoid hanging onto element (issue #299) + checkContext = null; + return ret; + } ]; + + for ( ; i < len; i++ ) { + if ( (matcher = Expr.relative[ tokens[i].type ]) ) { + matchers = [ addCombinator(elementMatcher( matchers ), matcher) ]; + } else { + matcher = Expr.filter[ tokens[i].type ].apply( null, tokens[i].matches ); + + // Return special upon seeing a positional matcher + if ( matcher[ expando ] ) { + // Find the next relative operator (if any) for proper handling + j = ++i; + for ( ; j < len; j++ ) { + if ( Expr.relative[ tokens[j].type ] ) { + break; + } + } + return setMatcher( + i > 1 && elementMatcher( matchers ), + i > 1 && toSelector( + // If the preceding token was a descendant combinator, insert an implicit any-element `*` + tokens.slice( 0, i - 1 ).concat({ value: tokens[ i - 2 ].type === " " ? "*" : "" }) + ).replace( rtrim, "$1" ), + matcher, + i < j && matcherFromTokens( tokens.slice( i, j ) ), + j < len && matcherFromTokens( (tokens = tokens.slice( j )) ), + j < len && toSelector( tokens ) + ); + } + matchers.push( matcher ); + } + } + + return elementMatcher( matchers ); +} + +function matcherFromGroupMatchers( elementMatchers, setMatchers ) { + var bySet = setMatchers.length > 0, + byElement = elementMatchers.length > 0, + superMatcher = function( seed, context, xml, results, outermost ) { + var elem, j, matcher, + matchedCount = 0, + i = "0", + unmatched = seed && [], + setMatched = [], + contextBackup = outermostContext, + // We must always have either seed elements or outermost context + elems = seed || byElement && Expr.find["TAG"]( "*", outermost ), + // Use integer dirruns iff this is the outermost matcher + dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.random() || 0.1), + len = elems.length; + + if ( outermost ) { + outermostContext = context === document || context || outermost; + } + + // Add elements passing elementMatchers directly to results + // Support: IE<9, Safari + // Tolerate NodeList properties (IE: "length"; Safari: ) matching elements by id + for ( ; i !== len && (elem = elems[i]) != null; i++ ) { + if ( byElement && elem ) { + j = 0; + if ( !context && elem.ownerDocument !== document ) { + setDocument( elem ); + xml = !documentIsHTML; + } + while ( (matcher = elementMatchers[j++]) ) { + if ( matcher( elem, context || document, xml) ) { + results.push( elem ); + break; + } + } + if ( outermost ) { + dirruns = dirrunsUnique; + } + } + + // Track unmatched elements for set filters + if ( bySet ) { + // They will have gone through all possible matchers + if ( (elem = !matcher && elem) ) { + matchedCount--; + } + + // Lengthen the array for every element, matched or not + if ( seed ) { + unmatched.push( elem ); + } + } + } + + // `i` is now the count of elements visited above, and adding it to `matchedCount` + // makes the latter nonnegative. + matchedCount += i; + + // Apply set filters to unmatched elements + // NOTE: This can be skipped if there are no unmatched elements (i.e., `matchedCount` + // equals `i`), unless we didn't visit _any_ elements in the above loop because we have + // no element matchers and no seed. + // Incrementing an initially-string "0" `i` allows `i` to remain a string only in that + // case, which will result in a "00" `matchedCount` that differs from `i` but is also + // numerically zero. + if ( bySet && i !== matchedCount ) { + j = 0; + while ( (matcher = setMatchers[j++]) ) { + matcher( unmatched, setMatched, context, xml ); + } + + if ( seed ) { + // Reintegrate element matches to eliminate the need for sorting + if ( matchedCount > 0 ) { + while ( i-- ) { + if ( !(unmatched[i] || setMatched[i]) ) { + setMatched[i] = pop.call( results ); + } + } + } + + // Discard index placeholder values to get only actual matches + setMatched = condense( setMatched ); + } + + // Add matches to results + push.apply( results, setMatched ); + + // Seedless set matches succeeding multiple successful matchers stipulate sorting + if ( outermost && !seed && setMatched.length > 0 && + ( matchedCount + setMatchers.length ) > 1 ) { + + Sizzle.uniqueSort( results ); + } + } + + // Override manipulation of globals by nested matchers + if ( outermost ) { + dirruns = dirrunsUnique; + outermostContext = contextBackup; + } + + return unmatched; + }; + + return bySet ? + markFunction( superMatcher ) : + superMatcher; +} + +compile = Sizzle.compile = function( selector, match /* Internal Use Only */ ) { + var i, + setMatchers = [], + elementMatchers = [], + cached = compilerCache[ selector + " " ]; + + if ( !cached ) { + // Generate a function of recursive functions that can be used to check each element + if ( !match ) { + match = tokenize( selector ); + } + i = match.length; + while ( i-- ) { + cached = matcherFromTokens( match[i] ); + if ( cached[ expando ] ) { + setMatchers.push( cached ); + } else { + elementMatchers.push( cached ); + } + } + + // Cache the compiled function + cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) ); + + // Save selector and tokenization + cached.selector = selector; + } + return cached; +}; + +/** + * A low-level selection function that works with Sizzle's compiled + * selector functions + * @param {String|Function} selector A selector or a pre-compiled + * selector function built with Sizzle.compile + * @param {Element} context + * @param {Array} [results] + * @param {Array} [seed] A set of elements to match against + */ +select = Sizzle.select = function( selector, context, results, seed ) { + var i, tokens, token, type, find, + compiled = typeof selector === "function" && selector, + match = !seed && tokenize( (selector = compiled.selector || selector) ); + + results = results || []; + + // Try to minimize operations if there is only one selector in the list and no seed + // (the latter of which guarantees us context) + if ( match.length === 1 ) { + + // Reduce context if the leading compound selector is an ID + tokens = match[0] = match[0].slice( 0 ); + if ( tokens.length > 2 && (token = tokens[0]).type === "ID" && + context.nodeType === 9 && documentIsHTML && Expr.relative[ tokens[1].type ] ) { + + context = ( Expr.find["ID"]( token.matches[0].replace(runescape, funescape), context ) || [] )[0]; + if ( !context ) { + return results; + + // Precompiled matchers will still verify ancestry, so step up a level + } else if ( compiled ) { + context = context.parentNode; + } + + selector = selector.slice( tokens.shift().value.length ); + } + + // Fetch a seed set for right-to-left matching + i = matchExpr["needsContext"].test( selector ) ? 0 : tokens.length; + while ( i-- ) { + token = tokens[i]; + + // Abort if we hit a combinator + if ( Expr.relative[ (type = token.type) ] ) { + break; + } + if ( (find = Expr.find[ type ]) ) { + // Search, expanding context for leading sibling combinators + if ( (seed = find( + token.matches[0].replace( runescape, funescape ), + rsibling.test( tokens[0].type ) && testContext( context.parentNode ) || context + )) ) { + + // If seed is empty or no tokens remain, we can return early + tokens.splice( i, 1 ); + selector = seed.length && toSelector( tokens ); + if ( !selector ) { + push.apply( results, seed ); + return results; + } + + break; + } + } + } + } + + // Compile and execute a filtering function if one is not provided + // Provide `match` to avoid retokenization if we modified the selector above + ( compiled || compile( selector, match ) )( + seed, + context, + !documentIsHTML, + results, + !context || rsibling.test( selector ) && testContext( context.parentNode ) || context + ); + return results; +}; + +// One-time assignments + +// Sort stability +support.sortStable = expando.split("").sort( sortOrder ).join("") === expando; + +// Support: Chrome 14-35+ +// Always assume duplicates if they aren't passed to the comparison function +support.detectDuplicates = !!hasDuplicate; + +// Initialize against the default document +setDocument(); + +// Support: Webkit<537.32 - Safari 6.0.3/Chrome 25 (fixed in Chrome 27) +// Detached nodes confoundingly follow *each other* +support.sortDetached = assert(function( el ) { + // Should return 1, but returns 4 (following) + return el.compareDocumentPosition( document.createElement("fieldset") ) & 1; +}); + +// Support: IE<8 +// Prevent attribute/property "interpolation" +// https://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx +if ( !assert(function( el ) { + el.innerHTML = ""; + return el.firstChild.getAttribute("href") === "#" ; +}) ) { + addHandle( "type|href|height|width", function( elem, name, isXML ) { + if ( !isXML ) { + return elem.getAttribute( name, name.toLowerCase() === "type" ? 1 : 2 ); + } + }); +} + +// Support: IE<9 +// Use defaultValue in place of getAttribute("value") +if ( !support.attributes || !assert(function( el ) { + el.innerHTML = ""; + el.firstChild.setAttribute( "value", "" ); + return el.firstChild.getAttribute( "value" ) === ""; +}) ) { + addHandle( "value", function( elem, name, isXML ) { + if ( !isXML && elem.nodeName.toLowerCase() === "input" ) { + return elem.defaultValue; + } + }); +} + +// Support: IE<9 +// Use getAttributeNode to fetch booleans when getAttribute lies +if ( !assert(function( el ) { + return el.getAttribute("disabled") == null; +}) ) { + addHandle( booleans, function( elem, name, isXML ) { + var val; + if ( !isXML ) { + return elem[ name ] === true ? name.toLowerCase() : + (val = elem.getAttributeNode( name )) && val.specified ? + val.value : + null; + } + }); +} + +return Sizzle; + +})( window ); + + + +jQuery.find = Sizzle; +jQuery.expr = Sizzle.selectors; + +// Deprecated +jQuery.expr[ ":" ] = jQuery.expr.pseudos; +jQuery.uniqueSort = jQuery.unique = Sizzle.uniqueSort; +jQuery.text = Sizzle.getText; +jQuery.isXMLDoc = Sizzle.isXML; +jQuery.contains = Sizzle.contains; +jQuery.escapeSelector = Sizzle.escape; + + + + +var dir = function( elem, dir, until ) { + var matched = [], + truncate = until !== undefined; + + while ( ( elem = elem[ dir ] ) && elem.nodeType !== 9 ) { + if ( elem.nodeType === 1 ) { + if ( truncate && jQuery( elem ).is( until ) ) { + break; + } + matched.push( elem ); + } + } + return matched; +}; + + +var siblings = function( n, elem ) { + var matched = []; + + for ( ; n; n = n.nextSibling ) { + if ( n.nodeType === 1 && n !== elem ) { + matched.push( n ); + } + } + + return matched; +}; + + +var rneedsContext = jQuery.expr.match.needsContext; + + + +function nodeName( elem, name ) { + + return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase(); + +}; +var rsingleTag = ( /^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i ); + + + +// Implement the identical functionality for filter and not +function winnow( elements, qualifier, not ) { + if ( isFunction( qualifier ) ) { + return jQuery.grep( elements, function( elem, i ) { + return !!qualifier.call( elem, i, elem ) !== not; + } ); + } + + // Single element + if ( qualifier.nodeType ) { + return jQuery.grep( elements, function( elem ) { + return ( elem === qualifier ) !== not; + } ); + } + + // Arraylike of elements (jQuery, arguments, Array) + if ( typeof qualifier !== "string" ) { + return jQuery.grep( elements, function( elem ) { + return ( indexOf.call( qualifier, elem ) > -1 ) !== not; + } ); + } + + // Filtered directly for both simple and complex selectors + return jQuery.filter( qualifier, elements, not ); +} + +jQuery.filter = function( expr, elems, not ) { + var elem = elems[ 0 ]; + + if ( not ) { + expr = ":not(" + expr + ")"; + } + + if ( elems.length === 1 && elem.nodeType === 1 ) { + return jQuery.find.matchesSelector( elem, expr ) ? [ elem ] : []; + } + + return jQuery.find.matches( expr, jQuery.grep( elems, function( elem ) { + return elem.nodeType === 1; + } ) ); +}; + +jQuery.fn.extend( { + find: function( selector ) { + var i, ret, + len = this.length, + self = this; + + if ( typeof selector !== "string" ) { + return this.pushStack( jQuery( selector ).filter( function() { + for ( i = 0; i < len; i++ ) { + if ( jQuery.contains( self[ i ], this ) ) { + return true; + } + } + } ) ); + } + + ret = this.pushStack( [] ); + + for ( i = 0; i < len; i++ ) { + jQuery.find( selector, self[ i ], ret ); + } + + return len > 1 ? jQuery.uniqueSort( ret ) : ret; + }, + filter: function( selector ) { + return this.pushStack( winnow( this, selector || [], false ) ); + }, + not: function( selector ) { + return this.pushStack( winnow( this, selector || [], true ) ); + }, + is: function( selector ) { + return !!winnow( + this, + + // If this is a positional/relative selector, check membership in the returned set + // so $("p:first").is("p:last") won't return true for a doc with two "p". + typeof selector === "string" && rneedsContext.test( selector ) ? + jQuery( selector ) : + selector || [], + false + ).length; + } +} ); + + +// Initialize a jQuery object + + +// A central reference to the root jQuery(document) +var rootjQuery, + + // A simple way to check for HTML strings + // Prioritize #id over to avoid XSS via location.hash (#9521) + // Strict HTML recognition (#11290: must start with <) + // Shortcut simple #id case for speed + rquickExpr = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/, + + init = jQuery.fn.init = function( selector, context, root ) { + var match, elem; + + // HANDLE: $(""), $(null), $(undefined), $(false) + if ( !selector ) { + return this; + } + + // Method init() accepts an alternate rootjQuery + // so migrate can support jQuery.sub (gh-2101) + root = root || rootjQuery; + + // Handle HTML strings + if ( typeof selector === "string" ) { + if ( selector[ 0 ] === "<" && + selector[ selector.length - 1 ] === ">" && + selector.length >= 3 ) { + + // Assume that strings that start and end with <> are HTML and skip the regex check + match = [ null, selector, null ]; + + } else { + match = rquickExpr.exec( selector ); + } + + // Match html or make sure no context is specified for #id + if ( match && ( match[ 1 ] || !context ) ) { + + // HANDLE: $(html) -> $(array) + if ( match[ 1 ] ) { + context = context instanceof jQuery ? context[ 0 ] : context; + + // Option to run scripts is true for back-compat + // Intentionally let the error be thrown if parseHTML is not present + jQuery.merge( this, jQuery.parseHTML( + match[ 1 ], + context && context.nodeType ? context.ownerDocument || context : document, + true + ) ); + + // HANDLE: $(html, props) + if ( rsingleTag.test( match[ 1 ] ) && jQuery.isPlainObject( context ) ) { + for ( match in context ) { + + // Properties of context are called as methods if possible + if ( isFunction( this[ match ] ) ) { + this[ match ]( context[ match ] ); + + // ...and otherwise set as attributes + } else { + this.attr( match, context[ match ] ); + } + } + } + + return this; + + // HANDLE: $(#id) + } else { + elem = document.getElementById( match[ 2 ] ); + + if ( elem ) { + + // Inject the element directly into the jQuery object + this[ 0 ] = elem; + this.length = 1; + } + return this; + } + + // HANDLE: $(expr, $(...)) + } else if ( !context || context.jquery ) { + return ( context || root ).find( selector ); + + // HANDLE: $(expr, context) + // (which is just equivalent to: $(context).find(expr) + } else { + return this.constructor( context ).find( selector ); + } + + // HANDLE: $(DOMElement) + } else if ( selector.nodeType ) { + this[ 0 ] = selector; + this.length = 1; + return this; + + // HANDLE: $(function) + // Shortcut for document ready + } else if ( isFunction( selector ) ) { + return root.ready !== undefined ? + root.ready( selector ) : + + // Execute immediately if ready is not present + selector( jQuery ); + } + + return jQuery.makeArray( selector, this ); + }; + +// Give the init function the jQuery prototype for later instantiation +init.prototype = jQuery.fn; + +// Initialize central reference +rootjQuery = jQuery( document ); + + +var rparentsprev = /^(?:parents|prev(?:Until|All))/, + + // Methods guaranteed to produce a unique set when starting from a unique set + guaranteedUnique = { + children: true, + contents: true, + next: true, + prev: true + }; + +jQuery.fn.extend( { + has: function( target ) { + var targets = jQuery( target, this ), + l = targets.length; + + return this.filter( function() { + var i = 0; + for ( ; i < l; i++ ) { + if ( jQuery.contains( this, targets[ i ] ) ) { + return true; + } + } + } ); + }, + + closest: function( selectors, context ) { + var cur, + i = 0, + l = this.length, + matched = [], + targets = typeof selectors !== "string" && jQuery( selectors ); + + // Positional selectors never match, since there's no _selection_ context + if ( !rneedsContext.test( selectors ) ) { + for ( ; i < l; i++ ) { + for ( cur = this[ i ]; cur && cur !== context; cur = cur.parentNode ) { + + // Always skip document fragments + if ( cur.nodeType < 11 && ( targets ? + targets.index( cur ) > -1 : + + // Don't pass non-elements to Sizzle + cur.nodeType === 1 && + jQuery.find.matchesSelector( cur, selectors ) ) ) { + + matched.push( cur ); + break; + } + } + } + } + + return this.pushStack( matched.length > 1 ? jQuery.uniqueSort( matched ) : matched ); + }, + + // Determine the position of an element within the set + index: function( elem ) { + + // No argument, return index in parent + if ( !elem ) { + return ( this[ 0 ] && this[ 0 ].parentNode ) ? this.first().prevAll().length : -1; + } + + // Index in selector + if ( typeof elem === "string" ) { + return indexOf.call( jQuery( elem ), this[ 0 ] ); + } + + // Locate the position of the desired element + return indexOf.call( this, + + // If it receives a jQuery object, the first element is used + elem.jquery ? elem[ 0 ] : elem + ); + }, + + add: function( selector, context ) { + return this.pushStack( + jQuery.uniqueSort( + jQuery.merge( this.get(), jQuery( selector, context ) ) + ) + ); + }, + + addBack: function( selector ) { + return this.add( selector == null ? + this.prevObject : this.prevObject.filter( selector ) + ); + } +} ); + +function sibling( cur, dir ) { + while ( ( cur = cur[ dir ] ) && cur.nodeType !== 1 ) {} + return cur; +} + +jQuery.each( { + parent: function( elem ) { + var parent = elem.parentNode; + return parent && parent.nodeType !== 11 ? parent : null; + }, + parents: function( elem ) { + return dir( elem, "parentNode" ); + }, + parentsUntil: function( elem, i, until ) { + return dir( elem, "parentNode", until ); + }, + next: function( elem ) { + return sibling( elem, "nextSibling" ); + }, + prev: function( elem ) { + return sibling( elem, "previousSibling" ); + }, + nextAll: function( elem ) { + return dir( elem, "nextSibling" ); + }, + prevAll: function( elem ) { + return dir( elem, "previousSibling" ); + }, + nextUntil: function( elem, i, until ) { + return dir( elem, "nextSibling", until ); + }, + prevUntil: function( elem, i, until ) { + return dir( elem, "previousSibling", until ); + }, + siblings: function( elem ) { + return siblings( ( elem.parentNode || {} ).firstChild, elem ); + }, + children: function( elem ) { + return siblings( elem.firstChild ); + }, + contents: function( elem ) { + if ( nodeName( elem, "iframe" ) ) { + return elem.contentDocument; + } + + // Support: IE 9 - 11 only, iOS 7 only, Android Browser <=4.3 only + // Treat the template element as a regular one in browsers that + // don't support it. + if ( nodeName( elem, "template" ) ) { + elem = elem.content || elem; + } + + return jQuery.merge( [], elem.childNodes ); + } +}, function( name, fn ) { + jQuery.fn[ name ] = function( until, selector ) { + var matched = jQuery.map( this, fn, until ); + + if ( name.slice( -5 ) !== "Until" ) { + selector = until; + } + + if ( selector && typeof selector === "string" ) { + matched = jQuery.filter( selector, matched ); + } + + if ( this.length > 1 ) { + + // Remove duplicates + if ( !guaranteedUnique[ name ] ) { + jQuery.uniqueSort( matched ); + } + + // Reverse order for parents* and prev-derivatives + if ( rparentsprev.test( name ) ) { + matched.reverse(); + } + } + + return this.pushStack( matched ); + }; +} ); +var rnothtmlwhite = ( /[^\x20\t\r\n\f]+/g ); + + + +// Convert String-formatted options into Object-formatted ones +function createOptions( options ) { + var object = {}; + jQuery.each( options.match( rnothtmlwhite ) || [], function( _, flag ) { + object[ flag ] = true; + } ); + return object; +} + +/* + * Create a callback list using the following parameters: + * + * options: an optional list of space-separated options that will change how + * the callback list behaves or a more traditional option object + * + * By default a callback list will act like an event callback list and can be + * "fired" multiple times. + * + * Possible options: + * + * once: will ensure the callback list can only be fired once (like a Deferred) + * + * memory: will keep track of previous values and will call any callback added + * after the list has been fired right away with the latest "memorized" + * values (like a Deferred) + * + * unique: will ensure a callback can only be added once (no duplicate in the list) + * + * stopOnFalse: interrupt callings when a callback returns false + * + */ +jQuery.Callbacks = function( options ) { + + // Convert options from String-formatted to Object-formatted if needed + // (we check in cache first) + options = typeof options === "string" ? + createOptions( options ) : + jQuery.extend( {}, options ); + + var // Flag to know if list is currently firing + firing, + + // Last fire value for non-forgettable lists + memory, + + // Flag to know if list was already fired + fired, + + // Flag to prevent firing + locked, + + // Actual callback list + list = [], + + // Queue of execution data for repeatable lists + queue = [], + + // Index of currently firing callback (modified by add/remove as needed) + firingIndex = -1, + + // Fire callbacks + fire = function() { + + // Enforce single-firing + locked = locked || options.once; + + // Execute callbacks for all pending executions, + // respecting firingIndex overrides and runtime changes + fired = firing = true; + for ( ; queue.length; firingIndex = -1 ) { + memory = queue.shift(); + while ( ++firingIndex < list.length ) { + + // Run callback and check for early termination + if ( list[ firingIndex ].apply( memory[ 0 ], memory[ 1 ] ) === false && + options.stopOnFalse ) { + + // Jump to end and forget the data so .add doesn't re-fire + firingIndex = list.length; + memory = false; + } + } + } + + // Forget the data if we're done with it + if ( !options.memory ) { + memory = false; + } + + firing = false; + + // Clean up if we're done firing for good + if ( locked ) { + + // Keep an empty list if we have data for future add calls + if ( memory ) { + list = []; + + // Otherwise, this object is spent + } else { + list = ""; + } + } + }, + + // Actual Callbacks object + self = { + + // Add a callback or a collection of callbacks to the list + add: function() { + if ( list ) { + + // If we have memory from a past run, we should fire after adding + if ( memory && !firing ) { + firingIndex = list.length - 1; + queue.push( memory ); + } + + ( function add( args ) { + jQuery.each( args, function( _, arg ) { + if ( isFunction( arg ) ) { + if ( !options.unique || !self.has( arg ) ) { + list.push( arg ); + } + } else if ( arg && arg.length && toType( arg ) !== "string" ) { + + // Inspect recursively + add( arg ); + } + } ); + } )( arguments ); + + if ( memory && !firing ) { + fire(); + } + } + return this; + }, + + // Remove a callback from the list + remove: function() { + jQuery.each( arguments, function( _, arg ) { + var index; + while ( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) { + list.splice( index, 1 ); + + // Handle firing indexes + if ( index <= firingIndex ) { + firingIndex--; + } + } + } ); + return this; + }, + + // Check if a given callback is in the list. + // If no argument is given, return whether or not list has callbacks attached. + has: function( fn ) { + return fn ? + jQuery.inArray( fn, list ) > -1 : + list.length > 0; + }, + + // Remove all callbacks from the list + empty: function() { + if ( list ) { + list = []; + } + return this; + }, + + // Disable .fire and .add + // Abort any current/pending executions + // Clear all callbacks and values + disable: function() { + locked = queue = []; + list = memory = ""; + return this; + }, + disabled: function() { + return !list; + }, + + // Disable .fire + // Also disable .add unless we have memory (since it would have no effect) + // Abort any pending executions + lock: function() { + locked = queue = []; + if ( !memory && !firing ) { + list = memory = ""; + } + return this; + }, + locked: function() { + return !!locked; + }, + + // Call all callbacks with the given context and arguments + fireWith: function( context, args ) { + if ( !locked ) { + args = args || []; + args = [ context, args.slice ? args.slice() : args ]; + queue.push( args ); + if ( !firing ) { + fire(); + } + } + return this; + }, + + // Call all the callbacks with the given arguments + fire: function() { + self.fireWith( this, arguments ); + return this; + }, + + // To know if the callbacks have already been called at least once + fired: function() { + return !!fired; + } + }; + + return self; +}; + + +function Identity( v ) { + return v; +} +function Thrower( ex ) { + throw ex; +} + +function adoptValue( value, resolve, reject, noValue ) { + var method; + + try { + + // Check for promise aspect first to privilege synchronous behavior + if ( value && isFunction( ( method = value.promise ) ) ) { + method.call( value ).done( resolve ).fail( reject ); + + // Other thenables + } else if ( value && isFunction( ( method = value.then ) ) ) { + method.call( value, resolve, reject ); + + // Other non-thenables + } else { + + // Control `resolve` arguments by letting Array#slice cast boolean `noValue` to integer: + // * false: [ value ].slice( 0 ) => resolve( value ) + // * true: [ value ].slice( 1 ) => resolve() + resolve.apply( undefined, [ value ].slice( noValue ) ); + } + + // For Promises/A+, convert exceptions into rejections + // Since jQuery.when doesn't unwrap thenables, we can skip the extra checks appearing in + // Deferred#then to conditionally suppress rejection. + } catch ( value ) { + + // Support: Android 4.0 only + // Strict mode functions invoked without .call/.apply get global-object context + reject.apply( undefined, [ value ] ); + } +} + +jQuery.extend( { + + Deferred: function( func ) { + var tuples = [ + + // action, add listener, callbacks, + // ... .then handlers, argument index, [final state] + [ "notify", "progress", jQuery.Callbacks( "memory" ), + jQuery.Callbacks( "memory" ), 2 ], + [ "resolve", "done", jQuery.Callbacks( "once memory" ), + jQuery.Callbacks( "once memory" ), 0, "resolved" ], + [ "reject", "fail", jQuery.Callbacks( "once memory" ), + jQuery.Callbacks( "once memory" ), 1, "rejected" ] + ], + state = "pending", + promise = { + state: function() { + return state; + }, + always: function() { + deferred.done( arguments ).fail( arguments ); + return this; + }, + "catch": function( fn ) { + return promise.then( null, fn ); + }, + + // Keep pipe for back-compat + pipe: function( /* fnDone, fnFail, fnProgress */ ) { + var fns = arguments; + + return jQuery.Deferred( function( newDefer ) { + jQuery.each( tuples, function( i, tuple ) { + + // Map tuples (progress, done, fail) to arguments (done, fail, progress) + var fn = isFunction( fns[ tuple[ 4 ] ] ) && fns[ tuple[ 4 ] ]; + + // deferred.progress(function() { bind to newDefer or newDefer.notify }) + // deferred.done(function() { bind to newDefer or newDefer.resolve }) + // deferred.fail(function() { bind to newDefer or newDefer.reject }) + deferred[ tuple[ 1 ] ]( function() { + var returned = fn && fn.apply( this, arguments ); + if ( returned && isFunction( returned.promise ) ) { + returned.promise() + .progress( newDefer.notify ) + .done( newDefer.resolve ) + .fail( newDefer.reject ); + } else { + newDefer[ tuple[ 0 ] + "With" ]( + this, + fn ? [ returned ] : arguments + ); + } + } ); + } ); + fns = null; + } ).promise(); + }, + then: function( onFulfilled, onRejected, onProgress ) { + var maxDepth = 0; + function resolve( depth, deferred, handler, special ) { + return function() { + var that = this, + args = arguments, + mightThrow = function() { + var returned, then; + + // Support: Promises/A+ section 2.3.3.3.3 + // https://promisesaplus.com/#point-59 + // Ignore double-resolution attempts + if ( depth < maxDepth ) { + return; + } + + returned = handler.apply( that, args ); + + // Support: Promises/A+ section 2.3.1 + // https://promisesaplus.com/#point-48 + if ( returned === deferred.promise() ) { + throw new TypeError( "Thenable self-resolution" ); + } + + // Support: Promises/A+ sections 2.3.3.1, 3.5 + // https://promisesaplus.com/#point-54 + // https://promisesaplus.com/#point-75 + // Retrieve `then` only once + then = returned && + + // Support: Promises/A+ section 2.3.4 + // https://promisesaplus.com/#point-64 + // Only check objects and functions for thenability + ( typeof returned === "object" || + typeof returned === "function" ) && + returned.then; + + // Handle a returned thenable + if ( isFunction( then ) ) { + + // Special processors (notify) just wait for resolution + if ( special ) { + then.call( + returned, + resolve( maxDepth, deferred, Identity, special ), + resolve( maxDepth, deferred, Thrower, special ) + ); + + // Normal processors (resolve) also hook into progress + } else { + + // ...and disregard older resolution values + maxDepth++; + + then.call( + returned, + resolve( maxDepth, deferred, Identity, special ), + resolve( maxDepth, deferred, Thrower, special ), + resolve( maxDepth, deferred, Identity, + deferred.notifyWith ) + ); + } + + // Handle all other returned values + } else { + + // Only substitute handlers pass on context + // and multiple values (non-spec behavior) + if ( handler !== Identity ) { + that = undefined; + args = [ returned ]; + } + + // Process the value(s) + // Default process is resolve + ( special || deferred.resolveWith )( that, args ); + } + }, + + // Only normal processors (resolve) catch and reject exceptions + process = special ? + mightThrow : + function() { + try { + mightThrow(); + } catch ( e ) { + + if ( jQuery.Deferred.exceptionHook ) { + jQuery.Deferred.exceptionHook( e, + process.stackTrace ); + } + + // Support: Promises/A+ section 2.3.3.3.4.1 + // https://promisesaplus.com/#point-61 + // Ignore post-resolution exceptions + if ( depth + 1 >= maxDepth ) { + + // Only substitute handlers pass on context + // and multiple values (non-spec behavior) + if ( handler !== Thrower ) { + that = undefined; + args = [ e ]; + } + + deferred.rejectWith( that, args ); + } + } + }; + + // Support: Promises/A+ section 2.3.3.3.1 + // https://promisesaplus.com/#point-57 + // Re-resolve promises immediately to dodge false rejection from + // subsequent errors + if ( depth ) { + process(); + } else { + + // Call an optional hook to record the stack, in case of exception + // since it's otherwise lost when execution goes async + if ( jQuery.Deferred.getStackHook ) { + process.stackTrace = jQuery.Deferred.getStackHook(); + } + window.setTimeout( process ); + } + }; + } + + return jQuery.Deferred( function( newDefer ) { + + // progress_handlers.add( ... ) + tuples[ 0 ][ 3 ].add( + resolve( + 0, + newDefer, + isFunction( onProgress ) ? + onProgress : + Identity, + newDefer.notifyWith + ) + ); + + // fulfilled_handlers.add( ... ) + tuples[ 1 ][ 3 ].add( + resolve( + 0, + newDefer, + isFunction( onFulfilled ) ? + onFulfilled : + Identity + ) + ); + + // rejected_handlers.add( ... ) + tuples[ 2 ][ 3 ].add( + resolve( + 0, + newDefer, + isFunction( onRejected ) ? + onRejected : + Thrower + ) + ); + } ).promise(); + }, + + // Get a promise for this deferred + // If obj is provided, the promise aspect is added to the object + promise: function( obj ) { + return obj != null ? jQuery.extend( obj, promise ) : promise; + } + }, + deferred = {}; + + // Add list-specific methods + jQuery.each( tuples, function( i, tuple ) { + var list = tuple[ 2 ], + stateString = tuple[ 5 ]; + + // promise.progress = list.add + // promise.done = list.add + // promise.fail = list.add + promise[ tuple[ 1 ] ] = list.add; + + // Handle state + if ( stateString ) { + list.add( + function() { + + // state = "resolved" (i.e., fulfilled) + // state = "rejected" + state = stateString; + }, + + // rejected_callbacks.disable + // fulfilled_callbacks.disable + tuples[ 3 - i ][ 2 ].disable, + + // rejected_handlers.disable + // fulfilled_handlers.disable + tuples[ 3 - i ][ 3 ].disable, + + // progress_callbacks.lock + tuples[ 0 ][ 2 ].lock, + + // progress_handlers.lock + tuples[ 0 ][ 3 ].lock + ); + } + + // progress_handlers.fire + // fulfilled_handlers.fire + // rejected_handlers.fire + list.add( tuple[ 3 ].fire ); + + // deferred.notify = function() { deferred.notifyWith(...) } + // deferred.resolve = function() { deferred.resolveWith(...) } + // deferred.reject = function() { deferred.rejectWith(...) } + deferred[ tuple[ 0 ] ] = function() { + deferred[ tuple[ 0 ] + "With" ]( this === deferred ? undefined : this, arguments ); + return this; + }; + + // deferred.notifyWith = list.fireWith + // deferred.resolveWith = list.fireWith + // deferred.rejectWith = list.fireWith + deferred[ tuple[ 0 ] + "With" ] = list.fireWith; + } ); + + // Make the deferred a promise + promise.promise( deferred ); + + // Call given func if any + if ( func ) { + func.call( deferred, deferred ); + } + + // All done! + return deferred; + }, + + // Deferred helper + when: function( singleValue ) { + var + + // count of uncompleted subordinates + remaining = arguments.length, + + // count of unprocessed arguments + i = remaining, + + // subordinate fulfillment data + resolveContexts = Array( i ), + resolveValues = slice.call( arguments ), + + // the master Deferred + master = jQuery.Deferred(), + + // subordinate callback factory + updateFunc = function( i ) { + return function( value ) { + resolveContexts[ i ] = this; + resolveValues[ i ] = arguments.length > 1 ? slice.call( arguments ) : value; + if ( !( --remaining ) ) { + master.resolveWith( resolveContexts, resolveValues ); + } + }; + }; + + // Single- and empty arguments are adopted like Promise.resolve + if ( remaining <= 1 ) { + adoptValue( singleValue, master.done( updateFunc( i ) ).resolve, master.reject, + !remaining ); + + // Use .then() to unwrap secondary thenables (cf. gh-3000) + if ( master.state() === "pending" || + isFunction( resolveValues[ i ] && resolveValues[ i ].then ) ) { + + return master.then(); + } + } + + // Multiple arguments are aggregated like Promise.all array elements + while ( i-- ) { + adoptValue( resolveValues[ i ], updateFunc( i ), master.reject ); + } + + return master.promise(); + } +} ); + + +// These usually indicate a programmer mistake during development, +// warn about them ASAP rather than swallowing them by default. +var rerrorNames = /^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/; + +jQuery.Deferred.exceptionHook = function( error, stack ) { + + // Support: IE 8 - 9 only + // Console exists when dev tools are open, which can happen at any time + if ( window.console && window.console.warn && error && rerrorNames.test( error.name ) ) { + window.console.warn( "jQuery.Deferred exception: " + error.message, error.stack, stack ); + } +}; + + + + +jQuery.readyException = function( error ) { + window.setTimeout( function() { + throw error; + } ); +}; + + + + +// The deferred used on DOM ready +var readyList = jQuery.Deferred(); + +jQuery.fn.ready = function( fn ) { + + readyList + .then( fn ) + + // Wrap jQuery.readyException in a function so that the lookup + // happens at the time of error handling instead of callback + // registration. + .catch( function( error ) { + jQuery.readyException( error ); + } ); + + return this; +}; + +jQuery.extend( { + + // Is the DOM ready to be used? Set to true once it occurs. + isReady: false, + + // A counter to track how many items to wait for before + // the ready event fires. See #6781 + readyWait: 1, + + // Handle when the DOM is ready + ready: function( wait ) { + + // Abort if there are pending holds or we're already ready + if ( wait === true ? --jQuery.readyWait : jQuery.isReady ) { + return; + } + + // Remember that the DOM is ready + jQuery.isReady = true; + + // If a normal DOM Ready event fired, decrement, and wait if need be + if ( wait !== true && --jQuery.readyWait > 0 ) { + return; + } + + // If there are functions bound, to execute + readyList.resolveWith( document, [ jQuery ] ); + } +} ); + +jQuery.ready.then = readyList.then; + +// The ready event handler and self cleanup method +function completed() { + document.removeEventListener( "DOMContentLoaded", completed ); + window.removeEventListener( "load", completed ); + jQuery.ready(); +} + +// Catch cases where $(document).ready() is called +// after the browser event has already occurred. +// Support: IE <=9 - 10 only +// Older IE sometimes signals "interactive" too soon +if ( document.readyState === "complete" || + ( document.readyState !== "loading" && !document.documentElement.doScroll ) ) { + + // Handle it asynchronously to allow scripts the opportunity to delay ready + window.setTimeout( jQuery.ready ); + +} else { + + // Use the handy event callback + document.addEventListener( "DOMContentLoaded", completed ); + + // A fallback to window.onload, that will always work + window.addEventListener( "load", completed ); +} + + + + +// Multifunctional method to get and set values of a collection +// The value/s can optionally be executed if it's a function +var access = function( elems, fn, key, value, chainable, emptyGet, raw ) { + var i = 0, + len = elems.length, + bulk = key == null; + + // Sets many values + if ( toType( key ) === "object" ) { + chainable = true; + for ( i in key ) { + access( elems, fn, i, key[ i ], true, emptyGet, raw ); + } + + // Sets one value + } else if ( value !== undefined ) { + chainable = true; + + if ( !isFunction( value ) ) { + raw = true; + } + + if ( bulk ) { + + // Bulk operations run against the entire set + if ( raw ) { + fn.call( elems, value ); + fn = null; + + // ...except when executing function values + } else { + bulk = fn; + fn = function( elem, key, value ) { + return bulk.call( jQuery( elem ), value ); + }; + } + } + + if ( fn ) { + for ( ; i < len; i++ ) { + fn( + elems[ i ], key, raw ? + value : + value.call( elems[ i ], i, fn( elems[ i ], key ) ) + ); + } + } + } + + if ( chainable ) { + return elems; + } + + // Gets + if ( bulk ) { + return fn.call( elems ); + } + + return len ? fn( elems[ 0 ], key ) : emptyGet; +}; + + +// Matches dashed string for camelizing +var rmsPrefix = /^-ms-/, + rdashAlpha = /-([a-z])/g; + +// Used by camelCase as callback to replace() +function fcamelCase( all, letter ) { + return letter.toUpperCase(); +} + +// Convert dashed to camelCase; used by the css and data modules +// Support: IE <=9 - 11, Edge 12 - 15 +// Microsoft forgot to hump their vendor prefix (#9572) +function camelCase( string ) { + return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase ); +} +var acceptData = function( owner ) { + + // Accepts only: + // - Node + // - Node.ELEMENT_NODE + // - Node.DOCUMENT_NODE + // - Object + // - Any + return owner.nodeType === 1 || owner.nodeType === 9 || !( +owner.nodeType ); +}; + + + + +function Data() { + this.expando = jQuery.expando + Data.uid++; +} + +Data.uid = 1; + +Data.prototype = { + + cache: function( owner ) { + + // Check if the owner object already has a cache + var value = owner[ this.expando ]; + + // If not, create one + if ( !value ) { + value = {}; + + // We can accept data for non-element nodes in modern browsers, + // but we should not, see #8335. + // Always return an empty object. + if ( acceptData( owner ) ) { + + // If it is a node unlikely to be stringify-ed or looped over + // use plain assignment + if ( owner.nodeType ) { + owner[ this.expando ] = value; + + // Otherwise secure it in a non-enumerable property + // configurable must be true to allow the property to be + // deleted when data is removed + } else { + Object.defineProperty( owner, this.expando, { + value: value, + configurable: true + } ); + } + } + } + + return value; + }, + set: function( owner, data, value ) { + var prop, + cache = this.cache( owner ); + + // Handle: [ owner, key, value ] args + // Always use camelCase key (gh-2257) + if ( typeof data === "string" ) { + cache[ camelCase( data ) ] = value; + + // Handle: [ owner, { properties } ] args + } else { + + // Copy the properties one-by-one to the cache object + for ( prop in data ) { + cache[ camelCase( prop ) ] = data[ prop ]; + } + } + return cache; + }, + get: function( owner, key ) { + return key === undefined ? + this.cache( owner ) : + + // Always use camelCase key (gh-2257) + owner[ this.expando ] && owner[ this.expando ][ camelCase( key ) ]; + }, + access: function( owner, key, value ) { + + // In cases where either: + // + // 1. No key was specified + // 2. A string key was specified, but no value provided + // + // Take the "read" path and allow the get method to determine + // which value to return, respectively either: + // + // 1. The entire cache object + // 2. The data stored at the key + // + if ( key === undefined || + ( ( key && typeof key === "string" ) && value === undefined ) ) { + + return this.get( owner, key ); + } + + // When the key is not a string, or both a key and value + // are specified, set or extend (existing objects) with either: + // + // 1. An object of properties + // 2. A key and value + // + this.set( owner, key, value ); + + // Since the "set" path can have two possible entry points + // return the expected data based on which path was taken[*] + return value !== undefined ? value : key; + }, + remove: function( owner, key ) { + var i, + cache = owner[ this.expando ]; + + if ( cache === undefined ) { + return; + } + + if ( key !== undefined ) { + + // Support array or space separated string of keys + if ( Array.isArray( key ) ) { + + // If key is an array of keys... + // We always set camelCase keys, so remove that. + key = key.map( camelCase ); + } else { + key = camelCase( key ); + + // If a key with the spaces exists, use it. + // Otherwise, create an array by matching non-whitespace + key = key in cache ? + [ key ] : + ( key.match( rnothtmlwhite ) || [] ); + } + + i = key.length; + + while ( i-- ) { + delete cache[ key[ i ] ]; + } + } + + // Remove the expando if there's no more data + if ( key === undefined || jQuery.isEmptyObject( cache ) ) { + + // Support: Chrome <=35 - 45 + // Webkit & Blink performance suffers when deleting properties + // from DOM nodes, so set to undefined instead + // https://bugs.chromium.org/p/chromium/issues/detail?id=378607 (bug restricted) + if ( owner.nodeType ) { + owner[ this.expando ] = undefined; + } else { + delete owner[ this.expando ]; + } + } + }, + hasData: function( owner ) { + var cache = owner[ this.expando ]; + return cache !== undefined && !jQuery.isEmptyObject( cache ); + } +}; +var dataPriv = new Data(); + +var dataUser = new Data(); + + + +// Implementation Summary +// +// 1. Enforce API surface and semantic compatibility with 1.9.x branch +// 2. Improve the module's maintainability by reducing the storage +// paths to a single mechanism. +// 3. Use the same single mechanism to support "private" and "user" data. +// 4. _Never_ expose "private" data to user code (TODO: Drop _data, _removeData) +// 5. Avoid exposing implementation details on user objects (eg. expando properties) +// 6. Provide a clear path for implementation upgrade to WeakMap in 2014 + +var rbrace = /^(?:\{[\w\W]*\}|\[[\w\W]*\])$/, + rmultiDash = /[A-Z]/g; + +function getData( data ) { + if ( data === "true" ) { + return true; + } + + if ( data === "false" ) { + return false; + } + + if ( data === "null" ) { + return null; + } + + // Only convert to a number if it doesn't change the string + if ( data === +data + "" ) { + return +data; + } + + if ( rbrace.test( data ) ) { + return JSON.parse( data ); + } + + return data; +} + +function dataAttr( elem, key, data ) { + var name; + + // If nothing was found internally, try to fetch any + // data from the HTML5 data-* attribute + if ( data === undefined && elem.nodeType === 1 ) { + name = "data-" + key.replace( rmultiDash, "-$&" ).toLowerCase(); + data = elem.getAttribute( name ); + + if ( typeof data === "string" ) { + try { + data = getData( data ); + } catch ( e ) {} + + // Make sure we set the data so it isn't changed later + dataUser.set( elem, key, data ); + } else { + data = undefined; + } + } + return data; +} + +jQuery.extend( { + hasData: function( elem ) { + return dataUser.hasData( elem ) || dataPriv.hasData( elem ); + }, + + data: function( elem, name, data ) { + return dataUser.access( elem, name, data ); + }, + + removeData: function( elem, name ) { + dataUser.remove( elem, name ); + }, + + // TODO: Now that all calls to _data and _removeData have been replaced + // with direct calls to dataPriv methods, these can be deprecated. + _data: function( elem, name, data ) { + return dataPriv.access( elem, name, data ); + }, + + _removeData: function( elem, name ) { + dataPriv.remove( elem, name ); + } +} ); + +jQuery.fn.extend( { + data: function( key, value ) { + var i, name, data, + elem = this[ 0 ], + attrs = elem && elem.attributes; + + // Gets all values + if ( key === undefined ) { + if ( this.length ) { + data = dataUser.get( elem ); + + if ( elem.nodeType === 1 && !dataPriv.get( elem, "hasDataAttrs" ) ) { + i = attrs.length; + while ( i-- ) { + + // Support: IE 11 only + // The attrs elements can be null (#14894) + if ( attrs[ i ] ) { + name = attrs[ i ].name; + if ( name.indexOf( "data-" ) === 0 ) { + name = camelCase( name.slice( 5 ) ); + dataAttr( elem, name, data[ name ] ); + } + } + } + dataPriv.set( elem, "hasDataAttrs", true ); + } + } + + return data; + } + + // Sets multiple values + if ( typeof key === "object" ) { + return this.each( function() { + dataUser.set( this, key ); + } ); + } + + return access( this, function( value ) { + var data; + + // The calling jQuery object (element matches) is not empty + // (and therefore has an element appears at this[ 0 ]) and the + // `value` parameter was not undefined. An empty jQuery object + // will result in `undefined` for elem = this[ 0 ] which will + // throw an exception if an attempt to read a data cache is made. + if ( elem && value === undefined ) { + + // Attempt to get data from the cache + // The key will always be camelCased in Data + data = dataUser.get( elem, key ); + if ( data !== undefined ) { + return data; + } + + // Attempt to "discover" the data in + // HTML5 custom data-* attrs + data = dataAttr( elem, key ); + if ( data !== undefined ) { + return data; + } + + // We tried really hard, but the data doesn't exist. + return; + } + + // Set the data... + this.each( function() { + + // We always store the camelCased key + dataUser.set( this, key, value ); + } ); + }, null, value, arguments.length > 1, null, true ); + }, + + removeData: function( key ) { + return this.each( function() { + dataUser.remove( this, key ); + } ); + } +} ); + + +jQuery.extend( { + queue: function( elem, type, data ) { + var queue; + + if ( elem ) { + type = ( type || "fx" ) + "queue"; + queue = dataPriv.get( elem, type ); + + // Speed up dequeue by getting out quickly if this is just a lookup + if ( data ) { + if ( !queue || Array.isArray( data ) ) { + queue = dataPriv.access( elem, type, jQuery.makeArray( data ) ); + } else { + queue.push( data ); + } + } + return queue || []; + } + }, + + dequeue: function( elem, type ) { + type = type || "fx"; + + var queue = jQuery.queue( elem, type ), + startLength = queue.length, + fn = queue.shift(), + hooks = jQuery._queueHooks( elem, type ), + next = function() { + jQuery.dequeue( elem, type ); + }; + + // If the fx queue is dequeued, always remove the progress sentinel + if ( fn === "inprogress" ) { + fn = queue.shift(); + startLength--; + } + + if ( fn ) { + + // Add a progress sentinel to prevent the fx queue from being + // automatically dequeued + if ( type === "fx" ) { + queue.unshift( "inprogress" ); + } + + // Clear up the last queue stop function + delete hooks.stop; + fn.call( elem, next, hooks ); + } + + if ( !startLength && hooks ) { + hooks.empty.fire(); + } + }, + + // Not public - generate a queueHooks object, or return the current one + _queueHooks: function( elem, type ) { + var key = type + "queueHooks"; + return dataPriv.get( elem, key ) || dataPriv.access( elem, key, { + empty: jQuery.Callbacks( "once memory" ).add( function() { + dataPriv.remove( elem, [ type + "queue", key ] ); + } ) + } ); + } +} ); + +jQuery.fn.extend( { + queue: function( type, data ) { + var setter = 2; + + if ( typeof type !== "string" ) { + data = type; + type = "fx"; + setter--; + } + + if ( arguments.length < setter ) { + return jQuery.queue( this[ 0 ], type ); + } + + return data === undefined ? + this : + this.each( function() { + var queue = jQuery.queue( this, type, data ); + + // Ensure a hooks for this queue + jQuery._queueHooks( this, type ); + + if ( type === "fx" && queue[ 0 ] !== "inprogress" ) { + jQuery.dequeue( this, type ); + } + } ); + }, + dequeue: function( type ) { + return this.each( function() { + jQuery.dequeue( this, type ); + } ); + }, + clearQueue: function( type ) { + return this.queue( type || "fx", [] ); + }, + + // Get a promise resolved when queues of a certain type + // are emptied (fx is the type by default) + promise: function( type, obj ) { + var tmp, + count = 1, + defer = jQuery.Deferred(), + elements = this, + i = this.length, + resolve = function() { + if ( !( --count ) ) { + defer.resolveWith( elements, [ elements ] ); + } + }; + + if ( typeof type !== "string" ) { + obj = type; + type = undefined; + } + type = type || "fx"; + + while ( i-- ) { + tmp = dataPriv.get( elements[ i ], type + "queueHooks" ); + if ( tmp && tmp.empty ) { + count++; + tmp.empty.add( resolve ); + } + } + resolve(); + return defer.promise( obj ); + } +} ); +var pnum = ( /[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/ ).source; + +var rcssNum = new RegExp( "^(?:([+-])=|)(" + pnum + ")([a-z%]*)$", "i" ); + + +var cssExpand = [ "Top", "Right", "Bottom", "Left" ]; + +var isHiddenWithinTree = function( elem, el ) { + + // isHiddenWithinTree might be called from jQuery#filter function; + // in that case, element will be second argument + elem = el || elem; + + // Inline style trumps all + return elem.style.display === "none" || + elem.style.display === "" && + + // Otherwise, check computed style + // Support: Firefox <=43 - 45 + // Disconnected elements can have computed display: none, so first confirm that elem is + // in the document. + jQuery.contains( elem.ownerDocument, elem ) && + + jQuery.css( elem, "display" ) === "none"; + }; + +var swap = function( elem, options, callback, args ) { + var ret, name, + old = {}; + + // Remember the old values, and insert the new ones + for ( name in options ) { + old[ name ] = elem.style[ name ]; + elem.style[ name ] = options[ name ]; + } + + ret = callback.apply( elem, args || [] ); + + // Revert the old values + for ( name in options ) { + elem.style[ name ] = old[ name ]; + } + + return ret; +}; + + + + +function adjustCSS( elem, prop, valueParts, tween ) { + var adjusted, scale, + maxIterations = 20, + currentValue = tween ? + function() { + return tween.cur(); + } : + function() { + return jQuery.css( elem, prop, "" ); + }, + initial = currentValue(), + unit = valueParts && valueParts[ 3 ] || ( jQuery.cssNumber[ prop ] ? "" : "px" ), + + // Starting value computation is required for potential unit mismatches + initialInUnit = ( jQuery.cssNumber[ prop ] || unit !== "px" && +initial ) && + rcssNum.exec( jQuery.css( elem, prop ) ); + + if ( initialInUnit && initialInUnit[ 3 ] !== unit ) { + + // Support: Firefox <=54 + // Halve the iteration target value to prevent interference from CSS upper bounds (gh-2144) + initial = initial / 2; + + // Trust units reported by jQuery.css + unit = unit || initialInUnit[ 3 ]; + + // Iteratively approximate from a nonzero starting point + initialInUnit = +initial || 1; + + while ( maxIterations-- ) { + + // Evaluate and update our best guess (doubling guesses that zero out). + // Finish if the scale equals or crosses 1 (making the old*new product non-positive). + jQuery.style( elem, prop, initialInUnit + unit ); + if ( ( 1 - scale ) * ( 1 - ( scale = currentValue() / initial || 0.5 ) ) <= 0 ) { + maxIterations = 0; + } + initialInUnit = initialInUnit / scale; + + } + + initialInUnit = initialInUnit * 2; + jQuery.style( elem, prop, initialInUnit + unit ); + + // Make sure we update the tween properties later on + valueParts = valueParts || []; + } + + if ( valueParts ) { + initialInUnit = +initialInUnit || +initial || 0; + + // Apply relative offset (+=/-=) if specified + adjusted = valueParts[ 1 ] ? + initialInUnit + ( valueParts[ 1 ] + 1 ) * valueParts[ 2 ] : + +valueParts[ 2 ]; + if ( tween ) { + tween.unit = unit; + tween.start = initialInUnit; + tween.end = adjusted; + } + } + return adjusted; +} + + +var defaultDisplayMap = {}; + +function getDefaultDisplay( elem ) { + var temp, + doc = elem.ownerDocument, + nodeName = elem.nodeName, + display = defaultDisplayMap[ nodeName ]; + + if ( display ) { + return display; + } + + temp = doc.body.appendChild( doc.createElement( nodeName ) ); + display = jQuery.css( temp, "display" ); + + temp.parentNode.removeChild( temp ); + + if ( display === "none" ) { + display = "block"; + } + defaultDisplayMap[ nodeName ] = display; + + return display; +} + +function showHide( elements, show ) { + var display, elem, + values = [], + index = 0, + length = elements.length; + + // Determine new display value for elements that need to change + for ( ; index < length; index++ ) { + elem = elements[ index ]; + if ( !elem.style ) { + continue; + } + + display = elem.style.display; + if ( show ) { + + // Since we force visibility upon cascade-hidden elements, an immediate (and slow) + // check is required in this first loop unless we have a nonempty display value (either + // inline or about-to-be-restored) + if ( display === "none" ) { + values[ index ] = dataPriv.get( elem, "display" ) || null; + if ( !values[ index ] ) { + elem.style.display = ""; + } + } + if ( elem.style.display === "" && isHiddenWithinTree( elem ) ) { + values[ index ] = getDefaultDisplay( elem ); + } + } else { + if ( display !== "none" ) { + values[ index ] = "none"; + + // Remember what we're overwriting + dataPriv.set( elem, "display", display ); + } + } + } + + // Set the display of the elements in a second loop to avoid constant reflow + for ( index = 0; index < length; index++ ) { + if ( values[ index ] != null ) { + elements[ index ].style.display = values[ index ]; + } + } + + return elements; +} + +jQuery.fn.extend( { + show: function() { + return showHide( this, true ); + }, + hide: function() { + return showHide( this ); + }, + toggle: function( state ) { + if ( typeof state === "boolean" ) { + return state ? this.show() : this.hide(); + } + + return this.each( function() { + if ( isHiddenWithinTree( this ) ) { + jQuery( this ).show(); + } else { + jQuery( this ).hide(); + } + } ); + } +} ); +var rcheckableType = ( /^(?:checkbox|radio)$/i ); + +var rtagName = ( /<([a-z][^\/\0>\x20\t\r\n\f]+)/i ); + +var rscriptType = ( /^$|^module$|\/(?:java|ecma)script/i ); + + + +// We have to close these tags to support XHTML (#13200) +var wrapMap = { + + // Support: IE <=9 only + option: [ 1, "" ], + + // XHTML parsers do not magically insert elements in the + // same way that tag soup parsers do. So we cannot shorten + // this by omitting or other required elements. + thead: [ 1, "", "
" ], + col: [ 2, "", "
" ], + tr: [ 2, "", "
" ], + td: [ 3, "", "
" ], + + _default: [ 0, "", "" ] +}; + +// Support: IE <=9 only +wrapMap.optgroup = wrapMap.option; + +wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead; +wrapMap.th = wrapMap.td; + + +function getAll( context, tag ) { + + // Support: IE <=9 - 11 only + // Use typeof to avoid zero-argument method invocation on host objects (#15151) + var ret; + + if ( typeof context.getElementsByTagName !== "undefined" ) { + ret = context.getElementsByTagName( tag || "*" ); + + } else if ( typeof context.querySelectorAll !== "undefined" ) { + ret = context.querySelectorAll( tag || "*" ); + + } else { + ret = []; + } + + if ( tag === undefined || tag && nodeName( context, tag ) ) { + return jQuery.merge( [ context ], ret ); + } + + return ret; +} + + +// Mark scripts as having already been evaluated +function setGlobalEval( elems, refElements ) { + var i = 0, + l = elems.length; + + for ( ; i < l; i++ ) { + dataPriv.set( + elems[ i ], + "globalEval", + !refElements || dataPriv.get( refElements[ i ], "globalEval" ) + ); + } +} + + +var rhtml = /<|&#?\w+;/; + +function buildFragment( elems, context, scripts, selection, ignored ) { + var elem, tmp, tag, wrap, contains, j, + fragment = context.createDocumentFragment(), + nodes = [], + i = 0, + l = elems.length; + + for ( ; i < l; i++ ) { + elem = elems[ i ]; + + if ( elem || elem === 0 ) { + + // Add nodes directly + if ( toType( elem ) === "object" ) { + + // Support: Android <=4.0 only, PhantomJS 1 only + // push.apply(_, arraylike) throws on ancient WebKit + jQuery.merge( nodes, elem.nodeType ? [ elem ] : elem ); + + // Convert non-html into a text node + } else if ( !rhtml.test( elem ) ) { + nodes.push( context.createTextNode( elem ) ); + + // Convert html into DOM nodes + } else { + tmp = tmp || fragment.appendChild( context.createElement( "div" ) ); + + // Deserialize a standard representation + tag = ( rtagName.exec( elem ) || [ "", "" ] )[ 1 ].toLowerCase(); + wrap = wrapMap[ tag ] || wrapMap._default; + tmp.innerHTML = wrap[ 1 ] + jQuery.htmlPrefilter( elem ) + wrap[ 2 ]; + + // Descend through wrappers to the right content + j = wrap[ 0 ]; + while ( j-- ) { + tmp = tmp.lastChild; + } + + // Support: Android <=4.0 only, PhantomJS 1 only + // push.apply(_, arraylike) throws on ancient WebKit + jQuery.merge( nodes, tmp.childNodes ); + + // Remember the top-level container + tmp = fragment.firstChild; + + // Ensure the created nodes are orphaned (#12392) + tmp.textContent = ""; + } + } + } + + // Remove wrapper from fragment + fragment.textContent = ""; + + i = 0; + while ( ( elem = nodes[ i++ ] ) ) { + + // Skip elements already in the context collection (trac-4087) + if ( selection && jQuery.inArray( elem, selection ) > -1 ) { + if ( ignored ) { + ignored.push( elem ); + } + continue; + } + + contains = jQuery.contains( elem.ownerDocument, elem ); + + // Append to fragment + tmp = getAll( fragment.appendChild( elem ), "script" ); + + // Preserve script evaluation history + if ( contains ) { + setGlobalEval( tmp ); + } + + // Capture executables + if ( scripts ) { + j = 0; + while ( ( elem = tmp[ j++ ] ) ) { + if ( rscriptType.test( elem.type || "" ) ) { + scripts.push( elem ); + } + } + } + } + + return fragment; +} + + +( function() { + var fragment = document.createDocumentFragment(), + div = fragment.appendChild( document.createElement( "div" ) ), + input = document.createElement( "input" ); + + // Support: Android 4.0 - 4.3 only + // Check state lost if the name is set (#11217) + // Support: Windows Web Apps (WWA) + // `name` and `type` must use .setAttribute for WWA (#14901) + input.setAttribute( "type", "radio" ); + input.setAttribute( "checked", "checked" ); + input.setAttribute( "name", "t" ); + + div.appendChild( input ); + + // Support: Android <=4.1 only + // Older WebKit doesn't clone checked state correctly in fragments + support.checkClone = div.cloneNode( true ).cloneNode( true ).lastChild.checked; + + // Support: IE <=11 only + // Make sure textarea (and checkbox) defaultValue is properly cloned + div.innerHTML = ""; + support.noCloneChecked = !!div.cloneNode( true ).lastChild.defaultValue; +} )(); +var documentElement = document.documentElement; + + + +var + rkeyEvent = /^key/, + rmouseEvent = /^(?:mouse|pointer|contextmenu|drag|drop)|click/, + rtypenamespace = /^([^.]*)(?:\.(.+)|)/; + +function returnTrue() { + return true; +} + +function returnFalse() { + return false; +} + +// Support: IE <=9 only +// See #13393 for more info +function safeActiveElement() { + try { + return document.activeElement; + } catch ( err ) { } +} + +function on( elem, types, selector, data, fn, one ) { + var origFn, type; + + // Types can be a map of types/handlers + if ( typeof types === "object" ) { + + // ( types-Object, selector, data ) + if ( typeof selector !== "string" ) { + + // ( types-Object, data ) + data = data || selector; + selector = undefined; + } + for ( type in types ) { + on( elem, type, selector, data, types[ type ], one ); + } + return elem; + } + + if ( data == null && fn == null ) { + + // ( types, fn ) + fn = selector; + data = selector = undefined; + } else if ( fn == null ) { + if ( typeof selector === "string" ) { + + // ( types, selector, fn ) + fn = data; + data = undefined; + } else { + + // ( types, data, fn ) + fn = data; + data = selector; + selector = undefined; + } + } + if ( fn === false ) { + fn = returnFalse; + } else if ( !fn ) { + return elem; + } + + if ( one === 1 ) { + origFn = fn; + fn = function( event ) { + + // Can use an empty set, since event contains the info + jQuery().off( event ); + return origFn.apply( this, arguments ); + }; + + // Use same guid so caller can remove using origFn + fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ ); + } + return elem.each( function() { + jQuery.event.add( this, types, fn, data, selector ); + } ); +} + +/* + * Helper functions for managing events -- not part of the public interface. + * Props to Dean Edwards' addEvent library for many of the ideas. + */ +jQuery.event = { + + global: {}, + + add: function( elem, types, handler, data, selector ) { + + var handleObjIn, eventHandle, tmp, + events, t, handleObj, + special, handlers, type, namespaces, origType, + elemData = dataPriv.get( elem ); + + // Don't attach events to noData or text/comment nodes (but allow plain objects) + if ( !elemData ) { + return; + } + + // Caller can pass in an object of custom data in lieu of the handler + if ( handler.handler ) { + handleObjIn = handler; + handler = handleObjIn.handler; + selector = handleObjIn.selector; + } + + // Ensure that invalid selectors throw exceptions at attach time + // Evaluate against documentElement in case elem is a non-element node (e.g., document) + if ( selector ) { + jQuery.find.matchesSelector( documentElement, selector ); + } + + // Make sure that the handler has a unique ID, used to find/remove it later + if ( !handler.guid ) { + handler.guid = jQuery.guid++; + } + + // Init the element's event structure and main handler, if this is the first + if ( !( events = elemData.events ) ) { + events = elemData.events = {}; + } + if ( !( eventHandle = elemData.handle ) ) { + eventHandle = elemData.handle = function( e ) { + + // Discard the second event of a jQuery.event.trigger() and + // when an event is called after a page has unloaded + return typeof jQuery !== "undefined" && jQuery.event.triggered !== e.type ? + jQuery.event.dispatch.apply( elem, arguments ) : undefined; + }; + } + + // Handle multiple events separated by a space + types = ( types || "" ).match( rnothtmlwhite ) || [ "" ]; + t = types.length; + while ( t-- ) { + tmp = rtypenamespace.exec( types[ t ] ) || []; + type = origType = tmp[ 1 ]; + namespaces = ( tmp[ 2 ] || "" ).split( "." ).sort(); + + // There *must* be a type, no attaching namespace-only handlers + if ( !type ) { + continue; + } + + // If event changes its type, use the special event handlers for the changed type + special = jQuery.event.special[ type ] || {}; + + // If selector defined, determine special event api type, otherwise given type + type = ( selector ? special.delegateType : special.bindType ) || type; + + // Update special based on newly reset type + special = jQuery.event.special[ type ] || {}; + + // handleObj is passed to all event handlers + handleObj = jQuery.extend( { + type: type, + origType: origType, + data: data, + handler: handler, + guid: handler.guid, + selector: selector, + needsContext: selector && jQuery.expr.match.needsContext.test( selector ), + namespace: namespaces.join( "." ) + }, handleObjIn ); + + // Init the event handler queue if we're the first + if ( !( handlers = events[ type ] ) ) { + handlers = events[ type ] = []; + handlers.delegateCount = 0; + + // Only use addEventListener if the special events handler returns false + if ( !special.setup || + special.setup.call( elem, data, namespaces, eventHandle ) === false ) { + + if ( elem.addEventListener ) { + elem.addEventListener( type, eventHandle ); + } + } + } + + if ( special.add ) { + special.add.call( elem, handleObj ); + + if ( !handleObj.handler.guid ) { + handleObj.handler.guid = handler.guid; + } + } + + // Add to the element's handler list, delegates in front + if ( selector ) { + handlers.splice( handlers.delegateCount++, 0, handleObj ); + } else { + handlers.push( handleObj ); + } + + // Keep track of which events have ever been used, for event optimization + jQuery.event.global[ type ] = true; + } + + }, + + // Detach an event or set of events from an element + remove: function( elem, types, handler, selector, mappedTypes ) { + + var j, origCount, tmp, + events, t, handleObj, + special, handlers, type, namespaces, origType, + elemData = dataPriv.hasData( elem ) && dataPriv.get( elem ); + + if ( !elemData || !( events = elemData.events ) ) { + return; + } + + // Once for each type.namespace in types; type may be omitted + types = ( types || "" ).match( rnothtmlwhite ) || [ "" ]; + t = types.length; + while ( t-- ) { + tmp = rtypenamespace.exec( types[ t ] ) || []; + type = origType = tmp[ 1 ]; + namespaces = ( tmp[ 2 ] || "" ).split( "." ).sort(); + + // Unbind all events (on this namespace, if provided) for the element + if ( !type ) { + for ( type in events ) { + jQuery.event.remove( elem, type + types[ t ], handler, selector, true ); + } + continue; + } + + special = jQuery.event.special[ type ] || {}; + type = ( selector ? special.delegateType : special.bindType ) || type; + handlers = events[ type ] || []; + tmp = tmp[ 2 ] && + new RegExp( "(^|\\.)" + namespaces.join( "\\.(?:.*\\.|)" ) + "(\\.|$)" ); + + // Remove matching events + origCount = j = handlers.length; + while ( j-- ) { + handleObj = handlers[ j ]; + + if ( ( mappedTypes || origType === handleObj.origType ) && + ( !handler || handler.guid === handleObj.guid ) && + ( !tmp || tmp.test( handleObj.namespace ) ) && + ( !selector || selector === handleObj.selector || + selector === "**" && handleObj.selector ) ) { + handlers.splice( j, 1 ); + + if ( handleObj.selector ) { + handlers.delegateCount--; + } + if ( special.remove ) { + special.remove.call( elem, handleObj ); + } + } + } + + // Remove generic event handler if we removed something and no more handlers exist + // (avoids potential for endless recursion during removal of special event handlers) + if ( origCount && !handlers.length ) { + if ( !special.teardown || + special.teardown.call( elem, namespaces, elemData.handle ) === false ) { + + jQuery.removeEvent( elem, type, elemData.handle ); + } + + delete events[ type ]; + } + } + + // Remove data and the expando if it's no longer used + if ( jQuery.isEmptyObject( events ) ) { + dataPriv.remove( elem, "handle events" ); + } + }, + + dispatch: function( nativeEvent ) { + + // Make a writable jQuery.Event from the native event object + var event = jQuery.event.fix( nativeEvent ); + + var i, j, ret, matched, handleObj, handlerQueue, + args = new Array( arguments.length ), + handlers = ( dataPriv.get( this, "events" ) || {} )[ event.type ] || [], + special = jQuery.event.special[ event.type ] || {}; + + // Use the fix-ed jQuery.Event rather than the (read-only) native event + args[ 0 ] = event; + + for ( i = 1; i < arguments.length; i++ ) { + args[ i ] = arguments[ i ]; + } + + event.delegateTarget = this; + + // Call the preDispatch hook for the mapped type, and let it bail if desired + if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) { + return; + } + + // Determine handlers + handlerQueue = jQuery.event.handlers.call( this, event, handlers ); + + // Run delegates first; they may want to stop propagation beneath us + i = 0; + while ( ( matched = handlerQueue[ i++ ] ) && !event.isPropagationStopped() ) { + event.currentTarget = matched.elem; + + j = 0; + while ( ( handleObj = matched.handlers[ j++ ] ) && + !event.isImmediatePropagationStopped() ) { + + // Triggered event must either 1) have no namespace, or 2) have namespace(s) + // a subset or equal to those in the bound event (both can have no namespace). + if ( !event.rnamespace || event.rnamespace.test( handleObj.namespace ) ) { + + event.handleObj = handleObj; + event.data = handleObj.data; + + ret = ( ( jQuery.event.special[ handleObj.origType ] || {} ).handle || + handleObj.handler ).apply( matched.elem, args ); + + if ( ret !== undefined ) { + if ( ( event.result = ret ) === false ) { + event.preventDefault(); + event.stopPropagation(); + } + } + } + } + } + + // Call the postDispatch hook for the mapped type + if ( special.postDispatch ) { + special.postDispatch.call( this, event ); + } + + return event.result; + }, + + handlers: function( event, handlers ) { + var i, handleObj, sel, matchedHandlers, matchedSelectors, + handlerQueue = [], + delegateCount = handlers.delegateCount, + cur = event.target; + + // Find delegate handlers + if ( delegateCount && + + // Support: IE <=9 + // Black-hole SVG instance trees (trac-13180) + cur.nodeType && + + // Support: Firefox <=42 + // Suppress spec-violating clicks indicating a non-primary pointer button (trac-3861) + // https://www.w3.org/TR/DOM-Level-3-Events/#event-type-click + // Support: IE 11 only + // ...but not arrow key "clicks" of radio inputs, which can have `button` -1 (gh-2343) + !( event.type === "click" && event.button >= 1 ) ) { + + for ( ; cur !== this; cur = cur.parentNode || this ) { + + // Don't check non-elements (#13208) + // Don't process clicks on disabled elements (#6911, #8165, #11382, #11764) + if ( cur.nodeType === 1 && !( event.type === "click" && cur.disabled === true ) ) { + matchedHandlers = []; + matchedSelectors = {}; + for ( i = 0; i < delegateCount; i++ ) { + handleObj = handlers[ i ]; + + // Don't conflict with Object.prototype properties (#13203) + sel = handleObj.selector + " "; + + if ( matchedSelectors[ sel ] === undefined ) { + matchedSelectors[ sel ] = handleObj.needsContext ? + jQuery( sel, this ).index( cur ) > -1 : + jQuery.find( sel, this, null, [ cur ] ).length; + } + if ( matchedSelectors[ sel ] ) { + matchedHandlers.push( handleObj ); + } + } + if ( matchedHandlers.length ) { + handlerQueue.push( { elem: cur, handlers: matchedHandlers } ); + } + } + } + } + + // Add the remaining (directly-bound) handlers + cur = this; + if ( delegateCount < handlers.length ) { + handlerQueue.push( { elem: cur, handlers: handlers.slice( delegateCount ) } ); + } + + return handlerQueue; + }, + + addProp: function( name, hook ) { + Object.defineProperty( jQuery.Event.prototype, name, { + enumerable: true, + configurable: true, + + get: isFunction( hook ) ? + function() { + if ( this.originalEvent ) { + return hook( this.originalEvent ); + } + } : + function() { + if ( this.originalEvent ) { + return this.originalEvent[ name ]; + } + }, + + set: function( value ) { + Object.defineProperty( this, name, { + enumerable: true, + configurable: true, + writable: true, + value: value + } ); + } + } ); + }, + + fix: function( originalEvent ) { + return originalEvent[ jQuery.expando ] ? + originalEvent : + new jQuery.Event( originalEvent ); + }, + + special: { + load: { + + // Prevent triggered image.load events from bubbling to window.load + noBubble: true + }, + focus: { + + // Fire native event if possible so blur/focus sequence is correct + trigger: function() { + if ( this !== safeActiveElement() && this.focus ) { + this.focus(); + return false; + } + }, + delegateType: "focusin" + }, + blur: { + trigger: function() { + if ( this === safeActiveElement() && this.blur ) { + this.blur(); + return false; + } + }, + delegateType: "focusout" + }, + click: { + + // For checkbox, fire native event so checked state will be right + trigger: function() { + if ( this.type === "checkbox" && this.click && nodeName( this, "input" ) ) { + this.click(); + return false; + } + }, + + // For cross-browser consistency, don't fire native .click() on links + _default: function( event ) { + return nodeName( event.target, "a" ); + } + }, + + beforeunload: { + postDispatch: function( event ) { + + // Support: Firefox 20+ + // Firefox doesn't alert if the returnValue field is not set. + if ( event.result !== undefined && event.originalEvent ) { + event.originalEvent.returnValue = event.result; + } + } + } + } +}; + +jQuery.removeEvent = function( elem, type, handle ) { + + // This "if" is needed for plain objects + if ( elem.removeEventListener ) { + elem.removeEventListener( type, handle ); + } +}; + +jQuery.Event = function( src, props ) { + + // Allow instantiation without the 'new' keyword + if ( !( this instanceof jQuery.Event ) ) { + return new jQuery.Event( src, props ); + } + + // Event object + if ( src && src.type ) { + this.originalEvent = src; + this.type = src.type; + + // Events bubbling up the document may have been marked as prevented + // by a handler lower down the tree; reflect the correct value. + this.isDefaultPrevented = src.defaultPrevented || + src.defaultPrevented === undefined && + + // Support: Android <=2.3 only + src.returnValue === false ? + returnTrue : + returnFalse; + + // Create target properties + // Support: Safari <=6 - 7 only + // Target should not be a text node (#504, #13143) + this.target = ( src.target && src.target.nodeType === 3 ) ? + src.target.parentNode : + src.target; + + this.currentTarget = src.currentTarget; + this.relatedTarget = src.relatedTarget; + + // Event type + } else { + this.type = src; + } + + // Put explicitly provided properties onto the event object + if ( props ) { + jQuery.extend( this, props ); + } + + // Create a timestamp if incoming event doesn't have one + this.timeStamp = src && src.timeStamp || Date.now(); + + // Mark it as fixed + this[ jQuery.expando ] = true; +}; + +// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding +// https://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html +jQuery.Event.prototype = { + constructor: jQuery.Event, + isDefaultPrevented: returnFalse, + isPropagationStopped: returnFalse, + isImmediatePropagationStopped: returnFalse, + isSimulated: false, + + preventDefault: function() { + var e = this.originalEvent; + + this.isDefaultPrevented = returnTrue; + + if ( e && !this.isSimulated ) { + e.preventDefault(); + } + }, + stopPropagation: function() { + var e = this.originalEvent; + + this.isPropagationStopped = returnTrue; + + if ( e && !this.isSimulated ) { + e.stopPropagation(); + } + }, + stopImmediatePropagation: function() { + var e = this.originalEvent; + + this.isImmediatePropagationStopped = returnTrue; + + if ( e && !this.isSimulated ) { + e.stopImmediatePropagation(); + } + + this.stopPropagation(); + } +}; + +// Includes all common event props including KeyEvent and MouseEvent specific props +jQuery.each( { + altKey: true, + bubbles: true, + cancelable: true, + changedTouches: true, + ctrlKey: true, + detail: true, + eventPhase: true, + metaKey: true, + pageX: true, + pageY: true, + shiftKey: true, + view: true, + "char": true, + charCode: true, + key: true, + keyCode: true, + button: true, + buttons: true, + clientX: true, + clientY: true, + offsetX: true, + offsetY: true, + pointerId: true, + pointerType: true, + screenX: true, + screenY: true, + targetTouches: true, + toElement: true, + touches: true, + + which: function( event ) { + var button = event.button; + + // Add which for key events + if ( event.which == null && rkeyEvent.test( event.type ) ) { + return event.charCode != null ? event.charCode : event.keyCode; + } + + // Add which for click: 1 === left; 2 === middle; 3 === right + if ( !event.which && button !== undefined && rmouseEvent.test( event.type ) ) { + if ( button & 1 ) { + return 1; + } + + if ( button & 2 ) { + return 3; + } + + if ( button & 4 ) { + return 2; + } + + return 0; + } + + return event.which; + } +}, jQuery.event.addProp ); + +// Create mouseenter/leave events using mouseover/out and event-time checks +// so that event delegation works in jQuery. +// Do the same for pointerenter/pointerleave and pointerover/pointerout +// +// Support: Safari 7 only +// Safari sends mouseenter too often; see: +// https://bugs.chromium.org/p/chromium/issues/detail?id=470258 +// for the description of the bug (it existed in older Chrome versions as well). +jQuery.each( { + mouseenter: "mouseover", + mouseleave: "mouseout", + pointerenter: "pointerover", + pointerleave: "pointerout" +}, function( orig, fix ) { + jQuery.event.special[ orig ] = { + delegateType: fix, + bindType: fix, + + handle: function( event ) { + var ret, + target = this, + related = event.relatedTarget, + handleObj = event.handleObj; + + // For mouseenter/leave call the handler if related is outside the target. + // NB: No relatedTarget if the mouse left/entered the browser window + if ( !related || ( related !== target && !jQuery.contains( target, related ) ) ) { + event.type = handleObj.origType; + ret = handleObj.handler.apply( this, arguments ); + event.type = fix; + } + return ret; + } + }; +} ); + +jQuery.fn.extend( { + + on: function( types, selector, data, fn ) { + return on( this, types, selector, data, fn ); + }, + one: function( types, selector, data, fn ) { + return on( this, types, selector, data, fn, 1 ); + }, + off: function( types, selector, fn ) { + var handleObj, type; + if ( types && types.preventDefault && types.handleObj ) { + + // ( event ) dispatched jQuery.Event + handleObj = types.handleObj; + jQuery( types.delegateTarget ).off( + handleObj.namespace ? + handleObj.origType + "." + handleObj.namespace : + handleObj.origType, + handleObj.selector, + handleObj.handler + ); + return this; + } + if ( typeof types === "object" ) { + + // ( types-object [, selector] ) + for ( type in types ) { + this.off( type, selector, types[ type ] ); + } + return this; + } + if ( selector === false || typeof selector === "function" ) { + + // ( types [, fn] ) + fn = selector; + selector = undefined; + } + if ( fn === false ) { + fn = returnFalse; + } + return this.each( function() { + jQuery.event.remove( this, types, fn, selector ); + } ); + } +} ); + + +var + + /* eslint-disable max-len */ + + // See https://github.com/eslint/eslint/issues/3229 + rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([a-z][^\/\0>\x20\t\r\n\f]*)[^>]*)\/>/gi, + + /* eslint-enable */ + + // Support: IE <=10 - 11, Edge 12 - 13 only + // In IE/Edge using regex groups here causes severe slowdowns. + // See https://connect.microsoft.com/IE/feedback/details/1736512/ + rnoInnerhtml = /\s*$/g; + +// Prefer a tbody over its parent table for containing new rows +function manipulationTarget( elem, content ) { + if ( nodeName( elem, "table" ) && + nodeName( content.nodeType !== 11 ? content : content.firstChild, "tr" ) ) { + + return jQuery( elem ).children( "tbody" )[ 0 ] || elem; + } + + return elem; +} + +// Replace/restore the type attribute of script elements for safe DOM manipulation +function disableScript( elem ) { + elem.type = ( elem.getAttribute( "type" ) !== null ) + "/" + elem.type; + return elem; +} +function restoreScript( elem ) { + if ( ( elem.type || "" ).slice( 0, 5 ) === "true/" ) { + elem.type = elem.type.slice( 5 ); + } else { + elem.removeAttribute( "type" ); + } + + return elem; +} + +function cloneCopyEvent( src, dest ) { + var i, l, type, pdataOld, pdataCur, udataOld, udataCur, events; + + if ( dest.nodeType !== 1 ) { + return; + } + + // 1. Copy private data: events, handlers, etc. + if ( dataPriv.hasData( src ) ) { + pdataOld = dataPriv.access( src ); + pdataCur = dataPriv.set( dest, pdataOld ); + events = pdataOld.events; + + if ( events ) { + delete pdataCur.handle; + pdataCur.events = {}; + + for ( type in events ) { + for ( i = 0, l = events[ type ].length; i < l; i++ ) { + jQuery.event.add( dest, type, events[ type ][ i ] ); + } + } + } + } + + // 2. Copy user data + if ( dataUser.hasData( src ) ) { + udataOld = dataUser.access( src ); + udataCur = jQuery.extend( {}, udataOld ); + + dataUser.set( dest, udataCur ); + } +} + +// Fix IE bugs, see support tests +function fixInput( src, dest ) { + var nodeName = dest.nodeName.toLowerCase(); + + // Fails to persist the checked state of a cloned checkbox or radio button. + if ( nodeName === "input" && rcheckableType.test( src.type ) ) { + dest.checked = src.checked; + + // Fails to return the selected option to the default selected state when cloning options + } else if ( nodeName === "input" || nodeName === "textarea" ) { + dest.defaultValue = src.defaultValue; + } +} + +function domManip( collection, args, callback, ignored ) { + + // Flatten any nested arrays + args = concat.apply( [], args ); + + var fragment, first, scripts, hasScripts, node, doc, + i = 0, + l = collection.length, + iNoClone = l - 1, + value = args[ 0 ], + valueIsFunction = isFunction( value ); + + // We can't cloneNode fragments that contain checked, in WebKit + if ( valueIsFunction || + ( l > 1 && typeof value === "string" && + !support.checkClone && rchecked.test( value ) ) ) { + return collection.each( function( index ) { + var self = collection.eq( index ); + if ( valueIsFunction ) { + args[ 0 ] = value.call( this, index, self.html() ); + } + domManip( self, args, callback, ignored ); + } ); + } + + if ( l ) { + fragment = buildFragment( args, collection[ 0 ].ownerDocument, false, collection, ignored ); + first = fragment.firstChild; + + if ( fragment.childNodes.length === 1 ) { + fragment = first; + } + + // Require either new content or an interest in ignored elements to invoke the callback + if ( first || ignored ) { + scripts = jQuery.map( getAll( fragment, "script" ), disableScript ); + hasScripts = scripts.length; + + // Use the original fragment for the last item + // instead of the first because it can end up + // being emptied incorrectly in certain situations (#8070). + for ( ; i < l; i++ ) { + node = fragment; + + if ( i !== iNoClone ) { + node = jQuery.clone( node, true, true ); + + // Keep references to cloned scripts for later restoration + if ( hasScripts ) { + + // Support: Android <=4.0 only, PhantomJS 1 only + // push.apply(_, arraylike) throws on ancient WebKit + jQuery.merge( scripts, getAll( node, "script" ) ); + } + } + + callback.call( collection[ i ], node, i ); + } + + if ( hasScripts ) { + doc = scripts[ scripts.length - 1 ].ownerDocument; + + // Reenable scripts + jQuery.map( scripts, restoreScript ); + + // Evaluate executable scripts on first document insertion + for ( i = 0; i < hasScripts; i++ ) { + node = scripts[ i ]; + if ( rscriptType.test( node.type || "" ) && + !dataPriv.access( node, "globalEval" ) && + jQuery.contains( doc, node ) ) { + + if ( node.src && ( node.type || "" ).toLowerCase() !== "module" ) { + + // Optional AJAX dependency, but won't run scripts if not present + if ( jQuery._evalUrl ) { + jQuery._evalUrl( node.src ); + } + } else { + DOMEval( node.textContent.replace( rcleanScript, "" ), doc, node ); + } + } + } + } + } + } + + return collection; +} + +function remove( elem, selector, keepData ) { + var node, + nodes = selector ? jQuery.filter( selector, elem ) : elem, + i = 0; + + for ( ; ( node = nodes[ i ] ) != null; i++ ) { + if ( !keepData && node.nodeType === 1 ) { + jQuery.cleanData( getAll( node ) ); + } + + if ( node.parentNode ) { + if ( keepData && jQuery.contains( node.ownerDocument, node ) ) { + setGlobalEval( getAll( node, "script" ) ); + } + node.parentNode.removeChild( node ); + } + } + + return elem; +} + +jQuery.extend( { + htmlPrefilter: function( html ) { + return html.replace( rxhtmlTag, "<$1>" ); + }, + + clone: function( elem, dataAndEvents, deepDataAndEvents ) { + var i, l, srcElements, destElements, + clone = elem.cloneNode( true ), + inPage = jQuery.contains( elem.ownerDocument, elem ); + + // Fix IE cloning issues + if ( !support.noCloneChecked && ( elem.nodeType === 1 || elem.nodeType === 11 ) && + !jQuery.isXMLDoc( elem ) ) { + + // We eschew Sizzle here for performance reasons: https://jsperf.com/getall-vs-sizzle/2 + destElements = getAll( clone ); + srcElements = getAll( elem ); + + for ( i = 0, l = srcElements.length; i < l; i++ ) { + fixInput( srcElements[ i ], destElements[ i ] ); + } + } + + // Copy the events from the original to the clone + if ( dataAndEvents ) { + if ( deepDataAndEvents ) { + srcElements = srcElements || getAll( elem ); + destElements = destElements || getAll( clone ); + + for ( i = 0, l = srcElements.length; i < l; i++ ) { + cloneCopyEvent( srcElements[ i ], destElements[ i ] ); + } + } else { + cloneCopyEvent( elem, clone ); + } + } + + // Preserve script evaluation history + destElements = getAll( clone, "script" ); + if ( destElements.length > 0 ) { + setGlobalEval( destElements, !inPage && getAll( elem, "script" ) ); + } + + // Return the cloned set + return clone; + }, + + cleanData: function( elems ) { + var data, elem, type, + special = jQuery.event.special, + i = 0; + + for ( ; ( elem = elems[ i ] ) !== undefined; i++ ) { + if ( acceptData( elem ) ) { + if ( ( data = elem[ dataPriv.expando ] ) ) { + if ( data.events ) { + for ( type in data.events ) { + if ( special[ type ] ) { + jQuery.event.remove( elem, type ); + + // This is a shortcut to avoid jQuery.event.remove's overhead + } else { + jQuery.removeEvent( elem, type, data.handle ); + } + } + } + + // Support: Chrome <=35 - 45+ + // Assign undefined instead of using delete, see Data#remove + elem[ dataPriv.expando ] = undefined; + } + if ( elem[ dataUser.expando ] ) { + + // Support: Chrome <=35 - 45+ + // Assign undefined instead of using delete, see Data#remove + elem[ dataUser.expando ] = undefined; + } + } + } + } +} ); + +jQuery.fn.extend( { + detach: function( selector ) { + return remove( this, selector, true ); + }, + + remove: function( selector ) { + return remove( this, selector ); + }, + + text: function( value ) { + return access( this, function( value ) { + return value === undefined ? + jQuery.text( this ) : + this.empty().each( function() { + if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) { + this.textContent = value; + } + } ); + }, null, value, arguments.length ); + }, + + append: function() { + return domManip( this, arguments, function( elem ) { + if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) { + var target = manipulationTarget( this, elem ); + target.appendChild( elem ); + } + } ); + }, + + prepend: function() { + return domManip( this, arguments, function( elem ) { + if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) { + var target = manipulationTarget( this, elem ); + target.insertBefore( elem, target.firstChild ); + } + } ); + }, + + before: function() { + return domManip( this, arguments, function( elem ) { + if ( this.parentNode ) { + this.parentNode.insertBefore( elem, this ); + } + } ); + }, + + after: function() { + return domManip( this, arguments, function( elem ) { + if ( this.parentNode ) { + this.parentNode.insertBefore( elem, this.nextSibling ); + } + } ); + }, + + empty: function() { + var elem, + i = 0; + + for ( ; ( elem = this[ i ] ) != null; i++ ) { + if ( elem.nodeType === 1 ) { + + // Prevent memory leaks + jQuery.cleanData( getAll( elem, false ) ); + + // Remove any remaining nodes + elem.textContent = ""; + } + } + + return this; + }, + + clone: function( dataAndEvents, deepDataAndEvents ) { + dataAndEvents = dataAndEvents == null ? false : dataAndEvents; + deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents; + + return this.map( function() { + return jQuery.clone( this, dataAndEvents, deepDataAndEvents ); + } ); + }, + + html: function( value ) { + return access( this, function( value ) { + var elem = this[ 0 ] || {}, + i = 0, + l = this.length; + + if ( value === undefined && elem.nodeType === 1 ) { + return elem.innerHTML; + } + + // See if we can take a shortcut and just use innerHTML + if ( typeof value === "string" && !rnoInnerhtml.test( value ) && + !wrapMap[ ( rtagName.exec( value ) || [ "", "" ] )[ 1 ].toLowerCase() ] ) { + + value = jQuery.htmlPrefilter( value ); + + try { + for ( ; i < l; i++ ) { + elem = this[ i ] || {}; + + // Remove element nodes and prevent memory leaks + if ( elem.nodeType === 1 ) { + jQuery.cleanData( getAll( elem, false ) ); + elem.innerHTML = value; + } + } + + elem = 0; + + // If using innerHTML throws an exception, use the fallback method + } catch ( e ) {} + } + + if ( elem ) { + this.empty().append( value ); + } + }, null, value, arguments.length ); + }, + + replaceWith: function() { + var ignored = []; + + // Make the changes, replacing each non-ignored context element with the new content + return domManip( this, arguments, function( elem ) { + var parent = this.parentNode; + + if ( jQuery.inArray( this, ignored ) < 0 ) { + jQuery.cleanData( getAll( this ) ); + if ( parent ) { + parent.replaceChild( elem, this ); + } + } + + // Force callback invocation + }, ignored ); + } +} ); + +jQuery.each( { + appendTo: "append", + prependTo: "prepend", + insertBefore: "before", + insertAfter: "after", + replaceAll: "replaceWith" +}, function( name, original ) { + jQuery.fn[ name ] = function( selector ) { + var elems, + ret = [], + insert = jQuery( selector ), + last = insert.length - 1, + i = 0; + + for ( ; i <= last; i++ ) { + elems = i === last ? this : this.clone( true ); + jQuery( insert[ i ] )[ original ]( elems ); + + // Support: Android <=4.0 only, PhantomJS 1 only + // .get() because push.apply(_, arraylike) throws on ancient WebKit + push.apply( ret, elems.get() ); + } + + return this.pushStack( ret ); + }; +} ); +var rnumnonpx = new RegExp( "^(" + pnum + ")(?!px)[a-z%]+$", "i" ); + +var getStyles = function( elem ) { + + // Support: IE <=11 only, Firefox <=30 (#15098, #14150) + // IE throws on elements created in popups + // FF meanwhile throws on frame elements through "defaultView.getComputedStyle" + var view = elem.ownerDocument.defaultView; + + if ( !view || !view.opener ) { + view = window; + } + + return view.getComputedStyle( elem ); + }; + +var rboxStyle = new RegExp( cssExpand.join( "|" ), "i" ); + + + +( function() { + + // Executing both pixelPosition & boxSizingReliable tests require only one layout + // so they're executed at the same time to save the second computation. + function computeStyleTests() { + + // This is a singleton, we need to execute it only once + if ( !div ) { + return; + } + + container.style.cssText = "position:absolute;left:-11111px;width:60px;" + + "margin-top:1px;padding:0;border:0"; + div.style.cssText = + "position:relative;display:block;box-sizing:border-box;overflow:scroll;" + + "margin:auto;border:1px;padding:1px;" + + "width:60%;top:1%"; + documentElement.appendChild( container ).appendChild( div ); + + var divStyle = window.getComputedStyle( div ); + pixelPositionVal = divStyle.top !== "1%"; + + // Support: Android 4.0 - 4.3 only, Firefox <=3 - 44 + reliableMarginLeftVal = roundPixelMeasures( divStyle.marginLeft ) === 12; + + // Support: Android 4.0 - 4.3 only, Safari <=9.1 - 10.1, iOS <=7.0 - 9.3 + // Some styles come back with percentage values, even though they shouldn't + div.style.right = "60%"; + pixelBoxStylesVal = roundPixelMeasures( divStyle.right ) === 36; + + // Support: IE 9 - 11 only + // Detect misreporting of content dimensions for box-sizing:border-box elements + boxSizingReliableVal = roundPixelMeasures( divStyle.width ) === 36; + + // Support: IE 9 only + // Detect overflow:scroll screwiness (gh-3699) + div.style.position = "absolute"; + scrollboxSizeVal = div.offsetWidth === 36 || "absolute"; + + documentElement.removeChild( container ); + + // Nullify the div so it wouldn't be stored in the memory and + // it will also be a sign that checks already performed + div = null; + } + + function roundPixelMeasures( measure ) { + return Math.round( parseFloat( measure ) ); + } + + var pixelPositionVal, boxSizingReliableVal, scrollboxSizeVal, pixelBoxStylesVal, + reliableMarginLeftVal, + container = document.createElement( "div" ), + div = document.createElement( "div" ); + + // Finish early in limited (non-browser) environments + if ( !div.style ) { + return; + } + + // Support: IE <=9 - 11 only + // Style of cloned element affects source element cloned (#8908) + div.style.backgroundClip = "content-box"; + div.cloneNode( true ).style.backgroundClip = ""; + support.clearCloneStyle = div.style.backgroundClip === "content-box"; + + jQuery.extend( support, { + boxSizingReliable: function() { + computeStyleTests(); + return boxSizingReliableVal; + }, + pixelBoxStyles: function() { + computeStyleTests(); + return pixelBoxStylesVal; + }, + pixelPosition: function() { + computeStyleTests(); + return pixelPositionVal; + }, + reliableMarginLeft: function() { + computeStyleTests(); + return reliableMarginLeftVal; + }, + scrollboxSize: function() { + computeStyleTests(); + return scrollboxSizeVal; + } + } ); +} )(); + + +function curCSS( elem, name, computed ) { + var width, minWidth, maxWidth, ret, + + // Support: Firefox 51+ + // Retrieving style before computed somehow + // fixes an issue with getting wrong values + // on detached elements + style = elem.style; + + computed = computed || getStyles( elem ); + + // getPropertyValue is needed for: + // .css('filter') (IE 9 only, #12537) + // .css('--customProperty) (#3144) + if ( computed ) { + ret = computed.getPropertyValue( name ) || computed[ name ]; + + if ( ret === "" && !jQuery.contains( elem.ownerDocument, elem ) ) { + ret = jQuery.style( elem, name ); + } + + // A tribute to the "awesome hack by Dean Edwards" + // Android Browser returns percentage for some values, + // but width seems to be reliably pixels. + // This is against the CSSOM draft spec: + // https://drafts.csswg.org/cssom/#resolved-values + if ( !support.pixelBoxStyles() && rnumnonpx.test( ret ) && rboxStyle.test( name ) ) { + + // Remember the original values + width = style.width; + minWidth = style.minWidth; + maxWidth = style.maxWidth; + + // Put in the new values to get a computed value out + style.minWidth = style.maxWidth = style.width = ret; + ret = computed.width; + + // Revert the changed values + style.width = width; + style.minWidth = minWidth; + style.maxWidth = maxWidth; + } + } + + return ret !== undefined ? + + // Support: IE <=9 - 11 only + // IE returns zIndex value as an integer. + ret + "" : + ret; +} + + +function addGetHookIf( conditionFn, hookFn ) { + + // Define the hook, we'll check on the first run if it's really needed. + return { + get: function() { + if ( conditionFn() ) { + + // Hook not needed (or it's not possible to use it due + // to missing dependency), remove it. + delete this.get; + return; + } + + // Hook needed; redefine it so that the support test is not executed again. + return ( this.get = hookFn ).apply( this, arguments ); + } + }; +} + + +var + + // Swappable if display is none or starts with table + // except "table", "table-cell", or "table-caption" + // See here for display values: https://developer.mozilla.org/en-US/docs/CSS/display + rdisplayswap = /^(none|table(?!-c[ea]).+)/, + rcustomProp = /^--/, + cssShow = { position: "absolute", visibility: "hidden", display: "block" }, + cssNormalTransform = { + letterSpacing: "0", + fontWeight: "400" + }, + + cssPrefixes = [ "Webkit", "Moz", "ms" ], + emptyStyle = document.createElement( "div" ).style; + +// Return a css property mapped to a potentially vendor prefixed property +function vendorPropName( name ) { + + // Shortcut for names that are not vendor prefixed + if ( name in emptyStyle ) { + return name; + } + + // Check for vendor prefixed names + var capName = name[ 0 ].toUpperCase() + name.slice( 1 ), + i = cssPrefixes.length; + + while ( i-- ) { + name = cssPrefixes[ i ] + capName; + if ( name in emptyStyle ) { + return name; + } + } +} + +// Return a property mapped along what jQuery.cssProps suggests or to +// a vendor prefixed property. +function finalPropName( name ) { + var ret = jQuery.cssProps[ name ]; + if ( !ret ) { + ret = jQuery.cssProps[ name ] = vendorPropName( name ) || name; + } + return ret; +} + +function setPositiveNumber( elem, value, subtract ) { + + // Any relative (+/-) values have already been + // normalized at this point + var matches = rcssNum.exec( value ); + return matches ? + + // Guard against undefined "subtract", e.g., when used as in cssHooks + Math.max( 0, matches[ 2 ] - ( subtract || 0 ) ) + ( matches[ 3 ] || "px" ) : + value; +} + +function boxModelAdjustment( elem, dimension, box, isBorderBox, styles, computedVal ) { + var i = dimension === "width" ? 1 : 0, + extra = 0, + delta = 0; + + // Adjustment may not be necessary + if ( box === ( isBorderBox ? "border" : "content" ) ) { + return 0; + } + + for ( ; i < 4; i += 2 ) { + + // Both box models exclude margin + if ( box === "margin" ) { + delta += jQuery.css( elem, box + cssExpand[ i ], true, styles ); + } + + // If we get here with a content-box, we're seeking "padding" or "border" or "margin" + if ( !isBorderBox ) { + + // Add padding + delta += jQuery.css( elem, "padding" + cssExpand[ i ], true, styles ); + + // For "border" or "margin", add border + if ( box !== "padding" ) { + delta += jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles ); + + // But still keep track of it otherwise + } else { + extra += jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles ); + } + + // If we get here with a border-box (content + padding + border), we're seeking "content" or + // "padding" or "margin" + } else { + + // For "content", subtract padding + if ( box === "content" ) { + delta -= jQuery.css( elem, "padding" + cssExpand[ i ], true, styles ); + } + + // For "content" or "padding", subtract border + if ( box !== "margin" ) { + delta -= jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles ); + } + } + } + + // Account for positive content-box scroll gutter when requested by providing computedVal + if ( !isBorderBox && computedVal >= 0 ) { + + // offsetWidth/offsetHeight is a rounded sum of content, padding, scroll gutter, and border + // Assuming integer scroll gutter, subtract the rest and round down + delta += Math.max( 0, Math.ceil( + elem[ "offset" + dimension[ 0 ].toUpperCase() + dimension.slice( 1 ) ] - + computedVal - + delta - + extra - + 0.5 + ) ); + } + + return delta; +} + +function getWidthOrHeight( elem, dimension, extra ) { + + // Start with computed style + var styles = getStyles( elem ), + val = curCSS( elem, dimension, styles ), + isBorderBox = jQuery.css( elem, "boxSizing", false, styles ) === "border-box", + valueIsBorderBox = isBorderBox; + + // Support: Firefox <=54 + // Return a confounding non-pixel value or feign ignorance, as appropriate. + if ( rnumnonpx.test( val ) ) { + if ( !extra ) { + return val; + } + val = "auto"; + } + + // Check for style in case a browser which returns unreliable values + // for getComputedStyle silently falls back to the reliable elem.style + valueIsBorderBox = valueIsBorderBox && + ( support.boxSizingReliable() || val === elem.style[ dimension ] ); + + // Fall back to offsetWidth/offsetHeight when value is "auto" + // This happens for inline elements with no explicit setting (gh-3571) + // Support: Android <=4.1 - 4.3 only + // Also use offsetWidth/offsetHeight for misreported inline dimensions (gh-3602) + if ( val === "auto" || + !parseFloat( val ) && jQuery.css( elem, "display", false, styles ) === "inline" ) { + + val = elem[ "offset" + dimension[ 0 ].toUpperCase() + dimension.slice( 1 ) ]; + + // offsetWidth/offsetHeight provide border-box values + valueIsBorderBox = true; + } + + // Normalize "" and auto + val = parseFloat( val ) || 0; + + // Adjust for the element's box model + return ( val + + boxModelAdjustment( + elem, + dimension, + extra || ( isBorderBox ? "border" : "content" ), + valueIsBorderBox, + styles, + + // Provide the current computed size to request scroll gutter calculation (gh-3589) + val + ) + ) + "px"; +} + +jQuery.extend( { + + // Add in style property hooks for overriding the default + // behavior of getting and setting a style property + cssHooks: { + opacity: { + get: function( elem, computed ) { + if ( computed ) { + + // We should always get a number back from opacity + var ret = curCSS( elem, "opacity" ); + return ret === "" ? "1" : ret; + } + } + } + }, + + // Don't automatically add "px" to these possibly-unitless properties + cssNumber: { + "animationIterationCount": true, + "columnCount": true, + "fillOpacity": true, + "flexGrow": true, + "flexShrink": true, + "fontWeight": true, + "lineHeight": true, + "opacity": true, + "order": true, + "orphans": true, + "widows": true, + "zIndex": true, + "zoom": true + }, + + // Add in properties whose names you wish to fix before + // setting or getting the value + cssProps: {}, + + // Get and set the style property on a DOM Node + style: function( elem, name, value, extra ) { + + // Don't set styles on text and comment nodes + if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) { + return; + } + + // Make sure that we're working with the right name + var ret, type, hooks, + origName = camelCase( name ), + isCustomProp = rcustomProp.test( name ), + style = elem.style; + + // Make sure that we're working with the right name. We don't + // want to query the value if it is a CSS custom property + // since they are user-defined. + if ( !isCustomProp ) { + name = finalPropName( origName ); + } + + // Gets hook for the prefixed version, then unprefixed version + hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ]; + + // Check if we're setting a value + if ( value !== undefined ) { + type = typeof value; + + // Convert "+=" or "-=" to relative numbers (#7345) + if ( type === "string" && ( ret = rcssNum.exec( value ) ) && ret[ 1 ] ) { + value = adjustCSS( elem, name, ret ); + + // Fixes bug #9237 + type = "number"; + } + + // Make sure that null and NaN values aren't set (#7116) + if ( value == null || value !== value ) { + return; + } + + // If a number was passed in, add the unit (except for certain CSS properties) + if ( type === "number" ) { + value += ret && ret[ 3 ] || ( jQuery.cssNumber[ origName ] ? "" : "px" ); + } + + // background-* props affect original clone's values + if ( !support.clearCloneStyle && value === "" && name.indexOf( "background" ) === 0 ) { + style[ name ] = "inherit"; + } + + // If a hook was provided, use that value, otherwise just set the specified value + if ( !hooks || !( "set" in hooks ) || + ( value = hooks.set( elem, value, extra ) ) !== undefined ) { + + if ( isCustomProp ) { + style.setProperty( name, value ); + } else { + style[ name ] = value; + } + } + + } else { + + // If a hook was provided get the non-computed value from there + if ( hooks && "get" in hooks && + ( ret = hooks.get( elem, false, extra ) ) !== undefined ) { + + return ret; + } + + // Otherwise just get the value from the style object + return style[ name ]; + } + }, + + css: function( elem, name, extra, styles ) { + var val, num, hooks, + origName = camelCase( name ), + isCustomProp = rcustomProp.test( name ); + + // Make sure that we're working with the right name. We don't + // want to modify the value if it is a CSS custom property + // since they are user-defined. + if ( !isCustomProp ) { + name = finalPropName( origName ); + } + + // Try prefixed name followed by the unprefixed name + hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ]; + + // If a hook was provided get the computed value from there + if ( hooks && "get" in hooks ) { + val = hooks.get( elem, true, extra ); + } + + // Otherwise, if a way to get the computed value exists, use that + if ( val === undefined ) { + val = curCSS( elem, name, styles ); + } + + // Convert "normal" to computed value + if ( val === "normal" && name in cssNormalTransform ) { + val = cssNormalTransform[ name ]; + } + + // Make numeric if forced or a qualifier was provided and val looks numeric + if ( extra === "" || extra ) { + num = parseFloat( val ); + return extra === true || isFinite( num ) ? num || 0 : val; + } + + return val; + } +} ); + +jQuery.each( [ "height", "width" ], function( i, dimension ) { + jQuery.cssHooks[ dimension ] = { + get: function( elem, computed, extra ) { + if ( computed ) { + + // Certain elements can have dimension info if we invisibly show them + // but it must have a current display style that would benefit + return rdisplayswap.test( jQuery.css( elem, "display" ) ) && + + // Support: Safari 8+ + // Table columns in Safari have non-zero offsetWidth & zero + // getBoundingClientRect().width unless display is changed. + // Support: IE <=11 only + // Running getBoundingClientRect on a disconnected node + // in IE throws an error. + ( !elem.getClientRects().length || !elem.getBoundingClientRect().width ) ? + swap( elem, cssShow, function() { + return getWidthOrHeight( elem, dimension, extra ); + } ) : + getWidthOrHeight( elem, dimension, extra ); + } + }, + + set: function( elem, value, extra ) { + var matches, + styles = getStyles( elem ), + isBorderBox = jQuery.css( elem, "boxSizing", false, styles ) === "border-box", + subtract = extra && boxModelAdjustment( + elem, + dimension, + extra, + isBorderBox, + styles + ); + + // Account for unreliable border-box dimensions by comparing offset* to computed and + // faking a content-box to get border and padding (gh-3699) + if ( isBorderBox && support.scrollboxSize() === styles.position ) { + subtract -= Math.ceil( + elem[ "offset" + dimension[ 0 ].toUpperCase() + dimension.slice( 1 ) ] - + parseFloat( styles[ dimension ] ) - + boxModelAdjustment( elem, dimension, "border", false, styles ) - + 0.5 + ); + } + + // Convert to pixels if value adjustment is needed + if ( subtract && ( matches = rcssNum.exec( value ) ) && + ( matches[ 3 ] || "px" ) !== "px" ) { + + elem.style[ dimension ] = value; + value = jQuery.css( elem, dimension ); + } + + return setPositiveNumber( elem, value, subtract ); + } + }; +} ); + +jQuery.cssHooks.marginLeft = addGetHookIf( support.reliableMarginLeft, + function( elem, computed ) { + if ( computed ) { + return ( parseFloat( curCSS( elem, "marginLeft" ) ) || + elem.getBoundingClientRect().left - + swap( elem, { marginLeft: 0 }, function() { + return elem.getBoundingClientRect().left; + } ) + ) + "px"; + } + } +); + +// These hooks are used by animate to expand properties +jQuery.each( { + margin: "", + padding: "", + border: "Width" +}, function( prefix, suffix ) { + jQuery.cssHooks[ prefix + suffix ] = { + expand: function( value ) { + var i = 0, + expanded = {}, + + // Assumes a single number if not a string + parts = typeof value === "string" ? value.split( " " ) : [ value ]; + + for ( ; i < 4; i++ ) { + expanded[ prefix + cssExpand[ i ] + suffix ] = + parts[ i ] || parts[ i - 2 ] || parts[ 0 ]; + } + + return expanded; + } + }; + + if ( prefix !== "margin" ) { + jQuery.cssHooks[ prefix + suffix ].set = setPositiveNumber; + } +} ); + +jQuery.fn.extend( { + css: function( name, value ) { + return access( this, function( elem, name, value ) { + var styles, len, + map = {}, + i = 0; + + if ( Array.isArray( name ) ) { + styles = getStyles( elem ); + len = name.length; + + for ( ; i < len; i++ ) { + map[ name[ i ] ] = jQuery.css( elem, name[ i ], false, styles ); + } + + return map; + } + + return value !== undefined ? + jQuery.style( elem, name, value ) : + jQuery.css( elem, name ); + }, name, value, arguments.length > 1 ); + } +} ); + + +function Tween( elem, options, prop, end, easing ) { + return new Tween.prototype.init( elem, options, prop, end, easing ); +} +jQuery.Tween = Tween; + +Tween.prototype = { + constructor: Tween, + init: function( elem, options, prop, end, easing, unit ) { + this.elem = elem; + this.prop = prop; + this.easing = easing || jQuery.easing._default; + this.options = options; + this.start = this.now = this.cur(); + this.end = end; + this.unit = unit || ( jQuery.cssNumber[ prop ] ? "" : "px" ); + }, + cur: function() { + var hooks = Tween.propHooks[ this.prop ]; + + return hooks && hooks.get ? + hooks.get( this ) : + Tween.propHooks._default.get( this ); + }, + run: function( percent ) { + var eased, + hooks = Tween.propHooks[ this.prop ]; + + if ( this.options.duration ) { + this.pos = eased = jQuery.easing[ this.easing ]( + percent, this.options.duration * percent, 0, 1, this.options.duration + ); + } else { + this.pos = eased = percent; + } + this.now = ( this.end - this.start ) * eased + this.start; + + if ( this.options.step ) { + this.options.step.call( this.elem, this.now, this ); + } + + if ( hooks && hooks.set ) { + hooks.set( this ); + } else { + Tween.propHooks._default.set( this ); + } + return this; + } +}; + +Tween.prototype.init.prototype = Tween.prototype; + +Tween.propHooks = { + _default: { + get: function( tween ) { + var result; + + // Use a property on the element directly when it is not a DOM element, + // or when there is no matching style property that exists. + if ( tween.elem.nodeType !== 1 || + tween.elem[ tween.prop ] != null && tween.elem.style[ tween.prop ] == null ) { + return tween.elem[ tween.prop ]; + } + + // Passing an empty string as a 3rd parameter to .css will automatically + // attempt a parseFloat and fallback to a string if the parse fails. + // Simple values such as "10px" are parsed to Float; + // complex values such as "rotate(1rad)" are returned as-is. + result = jQuery.css( tween.elem, tween.prop, "" ); + + // Empty strings, null, undefined and "auto" are converted to 0. + return !result || result === "auto" ? 0 : result; + }, + set: function( tween ) { + + // Use step hook for back compat. + // Use cssHook if its there. + // Use .style if available and use plain properties where available. + if ( jQuery.fx.step[ tween.prop ] ) { + jQuery.fx.step[ tween.prop ]( tween ); + } else if ( tween.elem.nodeType === 1 && + ( tween.elem.style[ jQuery.cssProps[ tween.prop ] ] != null || + jQuery.cssHooks[ tween.prop ] ) ) { + jQuery.style( tween.elem, tween.prop, tween.now + tween.unit ); + } else { + tween.elem[ tween.prop ] = tween.now; + } + } + } +}; + +// Support: IE <=9 only +// Panic based approach to setting things on disconnected nodes +Tween.propHooks.scrollTop = Tween.propHooks.scrollLeft = { + set: function( tween ) { + if ( tween.elem.nodeType && tween.elem.parentNode ) { + tween.elem[ tween.prop ] = tween.now; + } + } +}; + +jQuery.easing = { + linear: function( p ) { + return p; + }, + swing: function( p ) { + return 0.5 - Math.cos( p * Math.PI ) / 2; + }, + _default: "swing" +}; + +jQuery.fx = Tween.prototype.init; + +// Back compat <1.8 extension point +jQuery.fx.step = {}; + + + + +var + fxNow, inProgress, + rfxtypes = /^(?:toggle|show|hide)$/, + rrun = /queueHooks$/; + +function schedule() { + if ( inProgress ) { + if ( document.hidden === false && window.requestAnimationFrame ) { + window.requestAnimationFrame( schedule ); + } else { + window.setTimeout( schedule, jQuery.fx.interval ); + } + + jQuery.fx.tick(); + } +} + +// Animations created synchronously will run synchronously +function createFxNow() { + window.setTimeout( function() { + fxNow = undefined; + } ); + return ( fxNow = Date.now() ); +} + +// Generate parameters to create a standard animation +function genFx( type, includeWidth ) { + var which, + i = 0, + attrs = { height: type }; + + // If we include width, step value is 1 to do all cssExpand values, + // otherwise step value is 2 to skip over Left and Right + includeWidth = includeWidth ? 1 : 0; + for ( ; i < 4; i += 2 - includeWidth ) { + which = cssExpand[ i ]; + attrs[ "margin" + which ] = attrs[ "padding" + which ] = type; + } + + if ( includeWidth ) { + attrs.opacity = attrs.width = type; + } + + return attrs; +} + +function createTween( value, prop, animation ) { + var tween, + collection = ( Animation.tweeners[ prop ] || [] ).concat( Animation.tweeners[ "*" ] ), + index = 0, + length = collection.length; + for ( ; index < length; index++ ) { + if ( ( tween = collection[ index ].call( animation, prop, value ) ) ) { + + // We're done with this property + return tween; + } + } +} + +function defaultPrefilter( elem, props, opts ) { + var prop, value, toggle, hooks, oldfire, propTween, restoreDisplay, display, + isBox = "width" in props || "height" in props, + anim = this, + orig = {}, + style = elem.style, + hidden = elem.nodeType && isHiddenWithinTree( elem ), + dataShow = dataPriv.get( elem, "fxshow" ); + + // Queue-skipping animations hijack the fx hooks + if ( !opts.queue ) { + hooks = jQuery._queueHooks( elem, "fx" ); + if ( hooks.unqueued == null ) { + hooks.unqueued = 0; + oldfire = hooks.empty.fire; + hooks.empty.fire = function() { + if ( !hooks.unqueued ) { + oldfire(); + } + }; + } + hooks.unqueued++; + + anim.always( function() { + + // Ensure the complete handler is called before this completes + anim.always( function() { + hooks.unqueued--; + if ( !jQuery.queue( elem, "fx" ).length ) { + hooks.empty.fire(); + } + } ); + } ); + } + + // Detect show/hide animations + for ( prop in props ) { + value = props[ prop ]; + if ( rfxtypes.test( value ) ) { + delete props[ prop ]; + toggle = toggle || value === "toggle"; + if ( value === ( hidden ? "hide" : "show" ) ) { + + // Pretend to be hidden if this is a "show" and + // there is still data from a stopped show/hide + if ( value === "show" && dataShow && dataShow[ prop ] !== undefined ) { + hidden = true; + + // Ignore all other no-op show/hide data + } else { + continue; + } + } + orig[ prop ] = dataShow && dataShow[ prop ] || jQuery.style( elem, prop ); + } + } + + // Bail out if this is a no-op like .hide().hide() + propTween = !jQuery.isEmptyObject( props ); + if ( !propTween && jQuery.isEmptyObject( orig ) ) { + return; + } + + // Restrict "overflow" and "display" styles during box animations + if ( isBox && elem.nodeType === 1 ) { + + // Support: IE <=9 - 11, Edge 12 - 15 + // Record all 3 overflow attributes because IE does not infer the shorthand + // from identically-valued overflowX and overflowY and Edge just mirrors + // the overflowX value there. + opts.overflow = [ style.overflow, style.overflowX, style.overflowY ]; + + // Identify a display type, preferring old show/hide data over the CSS cascade + restoreDisplay = dataShow && dataShow.display; + if ( restoreDisplay == null ) { + restoreDisplay = dataPriv.get( elem, "display" ); + } + display = jQuery.css( elem, "display" ); + if ( display === "none" ) { + if ( restoreDisplay ) { + display = restoreDisplay; + } else { + + // Get nonempty value(s) by temporarily forcing visibility + showHide( [ elem ], true ); + restoreDisplay = elem.style.display || restoreDisplay; + display = jQuery.css( elem, "display" ); + showHide( [ elem ] ); + } + } + + // Animate inline elements as inline-block + if ( display === "inline" || display === "inline-block" && restoreDisplay != null ) { + if ( jQuery.css( elem, "float" ) === "none" ) { + + // Restore the original display value at the end of pure show/hide animations + if ( !propTween ) { + anim.done( function() { + style.display = restoreDisplay; + } ); + if ( restoreDisplay == null ) { + display = style.display; + restoreDisplay = display === "none" ? "" : display; + } + } + style.display = "inline-block"; + } + } + } + + if ( opts.overflow ) { + style.overflow = "hidden"; + anim.always( function() { + style.overflow = opts.overflow[ 0 ]; + style.overflowX = opts.overflow[ 1 ]; + style.overflowY = opts.overflow[ 2 ]; + } ); + } + + // Implement show/hide animations + propTween = false; + for ( prop in orig ) { + + // General show/hide setup for this element animation + if ( !propTween ) { + if ( dataShow ) { + if ( "hidden" in dataShow ) { + hidden = dataShow.hidden; + } + } else { + dataShow = dataPriv.access( elem, "fxshow", { display: restoreDisplay } ); + } + + // Store hidden/visible for toggle so `.stop().toggle()` "reverses" + if ( toggle ) { + dataShow.hidden = !hidden; + } + + // Show elements before animating them + if ( hidden ) { + showHide( [ elem ], true ); + } + + /* eslint-disable no-loop-func */ + + anim.done( function() { + + /* eslint-enable no-loop-func */ + + // The final step of a "hide" animation is actually hiding the element + if ( !hidden ) { + showHide( [ elem ] ); + } + dataPriv.remove( elem, "fxshow" ); + for ( prop in orig ) { + jQuery.style( elem, prop, orig[ prop ] ); + } + } ); + } + + // Per-property setup + propTween = createTween( hidden ? dataShow[ prop ] : 0, prop, anim ); + if ( !( prop in dataShow ) ) { + dataShow[ prop ] = propTween.start; + if ( hidden ) { + propTween.end = propTween.start; + propTween.start = 0; + } + } + } +} + +function propFilter( props, specialEasing ) { + var index, name, easing, value, hooks; + + // camelCase, specialEasing and expand cssHook pass + for ( index in props ) { + name = camelCase( index ); + easing = specialEasing[ name ]; + value = props[ index ]; + if ( Array.isArray( value ) ) { + easing = value[ 1 ]; + value = props[ index ] = value[ 0 ]; + } + + if ( index !== name ) { + props[ name ] = value; + delete props[ index ]; + } + + hooks = jQuery.cssHooks[ name ]; + if ( hooks && "expand" in hooks ) { + value = hooks.expand( value ); + delete props[ name ]; + + // Not quite $.extend, this won't overwrite existing keys. + // Reusing 'index' because we have the correct "name" + for ( index in value ) { + if ( !( index in props ) ) { + props[ index ] = value[ index ]; + specialEasing[ index ] = easing; + } + } + } else { + specialEasing[ name ] = easing; + } + } +} + +function Animation( elem, properties, options ) { + var result, + stopped, + index = 0, + length = Animation.prefilters.length, + deferred = jQuery.Deferred().always( function() { + + // Don't match elem in the :animated selector + delete tick.elem; + } ), + tick = function() { + if ( stopped ) { + return false; + } + var currentTime = fxNow || createFxNow(), + remaining = Math.max( 0, animation.startTime + animation.duration - currentTime ), + + // Support: Android 2.3 only + // Archaic crash bug won't allow us to use `1 - ( 0.5 || 0 )` (#12497) + temp = remaining / animation.duration || 0, + percent = 1 - temp, + index = 0, + length = animation.tweens.length; + + for ( ; index < length; index++ ) { + animation.tweens[ index ].run( percent ); + } + + deferred.notifyWith( elem, [ animation, percent, remaining ] ); + + // If there's more to do, yield + if ( percent < 1 && length ) { + return remaining; + } + + // If this was an empty animation, synthesize a final progress notification + if ( !length ) { + deferred.notifyWith( elem, [ animation, 1, 0 ] ); + } + + // Resolve the animation and report its conclusion + deferred.resolveWith( elem, [ animation ] ); + return false; + }, + animation = deferred.promise( { + elem: elem, + props: jQuery.extend( {}, properties ), + opts: jQuery.extend( true, { + specialEasing: {}, + easing: jQuery.easing._default + }, options ), + originalProperties: properties, + originalOptions: options, + startTime: fxNow || createFxNow(), + duration: options.duration, + tweens: [], + createTween: function( prop, end ) { + var tween = jQuery.Tween( elem, animation.opts, prop, end, + animation.opts.specialEasing[ prop ] || animation.opts.easing ); + animation.tweens.push( tween ); + return tween; + }, + stop: function( gotoEnd ) { + var index = 0, + + // If we are going to the end, we want to run all the tweens + // otherwise we skip this part + length = gotoEnd ? animation.tweens.length : 0; + if ( stopped ) { + return this; + } + stopped = true; + for ( ; index < length; index++ ) { + animation.tweens[ index ].run( 1 ); + } + + // Resolve when we played the last frame; otherwise, reject + if ( gotoEnd ) { + deferred.notifyWith( elem, [ animation, 1, 0 ] ); + deferred.resolveWith( elem, [ animation, gotoEnd ] ); + } else { + deferred.rejectWith( elem, [ animation, gotoEnd ] ); + } + return this; + } + } ), + props = animation.props; + + propFilter( props, animation.opts.specialEasing ); + + for ( ; index < length; index++ ) { + result = Animation.prefilters[ index ].call( animation, elem, props, animation.opts ); + if ( result ) { + if ( isFunction( result.stop ) ) { + jQuery._queueHooks( animation.elem, animation.opts.queue ).stop = + result.stop.bind( result ); + } + return result; + } + } + + jQuery.map( props, createTween, animation ); + + if ( isFunction( animation.opts.start ) ) { + animation.opts.start.call( elem, animation ); + } + + // Attach callbacks from options + animation + .progress( animation.opts.progress ) + .done( animation.opts.done, animation.opts.complete ) + .fail( animation.opts.fail ) + .always( animation.opts.always ); + + jQuery.fx.timer( + jQuery.extend( tick, { + elem: elem, + anim: animation, + queue: animation.opts.queue + } ) + ); + + return animation; +} + +jQuery.Animation = jQuery.extend( Animation, { + + tweeners: { + "*": [ function( prop, value ) { + var tween = this.createTween( prop, value ); + adjustCSS( tween.elem, prop, rcssNum.exec( value ), tween ); + return tween; + } ] + }, + + tweener: function( props, callback ) { + if ( isFunction( props ) ) { + callback = props; + props = [ "*" ]; + } else { + props = props.match( rnothtmlwhite ); + } + + var prop, + index = 0, + length = props.length; + + for ( ; index < length; index++ ) { + prop = props[ index ]; + Animation.tweeners[ prop ] = Animation.tweeners[ prop ] || []; + Animation.tweeners[ prop ].unshift( callback ); + } + }, + + prefilters: [ defaultPrefilter ], + + prefilter: function( callback, prepend ) { + if ( prepend ) { + Animation.prefilters.unshift( callback ); + } else { + Animation.prefilters.push( callback ); + } + } +} ); + +jQuery.speed = function( speed, easing, fn ) { + var opt = speed && typeof speed === "object" ? jQuery.extend( {}, speed ) : { + complete: fn || !fn && easing || + isFunction( speed ) && speed, + duration: speed, + easing: fn && easing || easing && !isFunction( easing ) && easing + }; + + // Go to the end state if fx are off + if ( jQuery.fx.off ) { + opt.duration = 0; + + } else { + if ( typeof opt.duration !== "number" ) { + if ( opt.duration in jQuery.fx.speeds ) { + opt.duration = jQuery.fx.speeds[ opt.duration ]; + + } else { + opt.duration = jQuery.fx.speeds._default; + } + } + } + + // Normalize opt.queue - true/undefined/null -> "fx" + if ( opt.queue == null || opt.queue === true ) { + opt.queue = "fx"; + } + + // Queueing + opt.old = opt.complete; + + opt.complete = function() { + if ( isFunction( opt.old ) ) { + opt.old.call( this ); + } + + if ( opt.queue ) { + jQuery.dequeue( this, opt.queue ); + } + }; + + return opt; +}; + +jQuery.fn.extend( { + fadeTo: function( speed, to, easing, callback ) { + + // Show any hidden elements after setting opacity to 0 + return this.filter( isHiddenWithinTree ).css( "opacity", 0 ).show() + + // Animate to the value specified + .end().animate( { opacity: to }, speed, easing, callback ); + }, + animate: function( prop, speed, easing, callback ) { + var empty = jQuery.isEmptyObject( prop ), + optall = jQuery.speed( speed, easing, callback ), + doAnimation = function() { + + // Operate on a copy of prop so per-property easing won't be lost + var anim = Animation( this, jQuery.extend( {}, prop ), optall ); + + // Empty animations, or finishing resolves immediately + if ( empty || dataPriv.get( this, "finish" ) ) { + anim.stop( true ); + } + }; + doAnimation.finish = doAnimation; + + return empty || optall.queue === false ? + this.each( doAnimation ) : + this.queue( optall.queue, doAnimation ); + }, + stop: function( type, clearQueue, gotoEnd ) { + var stopQueue = function( hooks ) { + var stop = hooks.stop; + delete hooks.stop; + stop( gotoEnd ); + }; + + if ( typeof type !== "string" ) { + gotoEnd = clearQueue; + clearQueue = type; + type = undefined; + } + if ( clearQueue && type !== false ) { + this.queue( type || "fx", [] ); + } + + return this.each( function() { + var dequeue = true, + index = type != null && type + "queueHooks", + timers = jQuery.timers, + data = dataPriv.get( this ); + + if ( index ) { + if ( data[ index ] && data[ index ].stop ) { + stopQueue( data[ index ] ); + } + } else { + for ( index in data ) { + if ( data[ index ] && data[ index ].stop && rrun.test( index ) ) { + stopQueue( data[ index ] ); + } + } + } + + for ( index = timers.length; index--; ) { + if ( timers[ index ].elem === this && + ( type == null || timers[ index ].queue === type ) ) { + + timers[ index ].anim.stop( gotoEnd ); + dequeue = false; + timers.splice( index, 1 ); + } + } + + // Start the next in the queue if the last step wasn't forced. + // Timers currently will call their complete callbacks, which + // will dequeue but only if they were gotoEnd. + if ( dequeue || !gotoEnd ) { + jQuery.dequeue( this, type ); + } + } ); + }, + finish: function( type ) { + if ( type !== false ) { + type = type || "fx"; + } + return this.each( function() { + var index, + data = dataPriv.get( this ), + queue = data[ type + "queue" ], + hooks = data[ type + "queueHooks" ], + timers = jQuery.timers, + length = queue ? queue.length : 0; + + // Enable finishing flag on private data + data.finish = true; + + // Empty the queue first + jQuery.queue( this, type, [] ); + + if ( hooks && hooks.stop ) { + hooks.stop.call( this, true ); + } + + // Look for any active animations, and finish them + for ( index = timers.length; index--; ) { + if ( timers[ index ].elem === this && timers[ index ].queue === type ) { + timers[ index ].anim.stop( true ); + timers.splice( index, 1 ); + } + } + + // Look for any animations in the old queue and finish them + for ( index = 0; index < length; index++ ) { + if ( queue[ index ] && queue[ index ].finish ) { + queue[ index ].finish.call( this ); + } + } + + // Turn off finishing flag + delete data.finish; + } ); + } +} ); + +jQuery.each( [ "toggle", "show", "hide" ], function( i, name ) { + var cssFn = jQuery.fn[ name ]; + jQuery.fn[ name ] = function( speed, easing, callback ) { + return speed == null || typeof speed === "boolean" ? + cssFn.apply( this, arguments ) : + this.animate( genFx( name, true ), speed, easing, callback ); + }; +} ); + +// Generate shortcuts for custom animations +jQuery.each( { + slideDown: genFx( "show" ), + slideUp: genFx( "hide" ), + slideToggle: genFx( "toggle" ), + fadeIn: { opacity: "show" }, + fadeOut: { opacity: "hide" }, + fadeToggle: { opacity: "toggle" } +}, function( name, props ) { + jQuery.fn[ name ] = function( speed, easing, callback ) { + return this.animate( props, speed, easing, callback ); + }; +} ); + +jQuery.timers = []; +jQuery.fx.tick = function() { + var timer, + i = 0, + timers = jQuery.timers; + + fxNow = Date.now(); + + for ( ; i < timers.length; i++ ) { + timer = timers[ i ]; + + // Run the timer and safely remove it when done (allowing for external removal) + if ( !timer() && timers[ i ] === timer ) { + timers.splice( i--, 1 ); + } + } + + if ( !timers.length ) { + jQuery.fx.stop(); + } + fxNow = undefined; +}; + +jQuery.fx.timer = function( timer ) { + jQuery.timers.push( timer ); + jQuery.fx.start(); +}; + +jQuery.fx.interval = 13; +jQuery.fx.start = function() { + if ( inProgress ) { + return; + } + + inProgress = true; + schedule(); +}; + +jQuery.fx.stop = function() { + inProgress = null; +}; + +jQuery.fx.speeds = { + slow: 600, + fast: 200, + + // Default speed + _default: 400 +}; + + +// Based off of the plugin by Clint Helfers, with permission. +// https://web.archive.org/web/20100324014747/http://blindsignals.com/index.php/2009/07/jquery-delay/ +jQuery.fn.delay = function( time, type ) { + time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time; + type = type || "fx"; + + return this.queue( type, function( next, hooks ) { + var timeout = window.setTimeout( next, time ); + hooks.stop = function() { + window.clearTimeout( timeout ); + }; + } ); +}; + + +( function() { + var input = document.createElement( "input" ), + select = document.createElement( "select" ), + opt = select.appendChild( document.createElement( "option" ) ); + + input.type = "checkbox"; + + // Support: Android <=4.3 only + // Default value for a checkbox should be "on" + support.checkOn = input.value !== ""; + + // Support: IE <=11 only + // Must access selectedIndex to make default options select + support.optSelected = opt.selected; + + // Support: IE <=11 only + // An input loses its value after becoming a radio + input = document.createElement( "input" ); + input.value = "t"; + input.type = "radio"; + support.radioValue = input.value === "t"; +} )(); + + +var boolHook, + attrHandle = jQuery.expr.attrHandle; + +jQuery.fn.extend( { + attr: function( name, value ) { + return access( this, jQuery.attr, name, value, arguments.length > 1 ); + }, + + removeAttr: function( name ) { + return this.each( function() { + jQuery.removeAttr( this, name ); + } ); + } +} ); + +jQuery.extend( { + attr: function( elem, name, value ) { + var ret, hooks, + nType = elem.nodeType; + + // Don't get/set attributes on text, comment and attribute nodes + if ( nType === 3 || nType === 8 || nType === 2 ) { + return; + } + + // Fallback to prop when attributes are not supported + if ( typeof elem.getAttribute === "undefined" ) { + return jQuery.prop( elem, name, value ); + } + + // Attribute hooks are determined by the lowercase version + // Grab necessary hook if one is defined + if ( nType !== 1 || !jQuery.isXMLDoc( elem ) ) { + hooks = jQuery.attrHooks[ name.toLowerCase() ] || + ( jQuery.expr.match.bool.test( name ) ? boolHook : undefined ); + } + + if ( value !== undefined ) { + if ( value === null ) { + jQuery.removeAttr( elem, name ); + return; + } + + if ( hooks && "set" in hooks && + ( ret = hooks.set( elem, value, name ) ) !== undefined ) { + return ret; + } + + elem.setAttribute( name, value + "" ); + return value; + } + + if ( hooks && "get" in hooks && ( ret = hooks.get( elem, name ) ) !== null ) { + return ret; + } + + ret = jQuery.find.attr( elem, name ); + + // Non-existent attributes return null, we normalize to undefined + return ret == null ? undefined : ret; + }, + + attrHooks: { + type: { + set: function( elem, value ) { + if ( !support.radioValue && value === "radio" && + nodeName( elem, "input" ) ) { + var val = elem.value; + elem.setAttribute( "type", value ); + if ( val ) { + elem.value = val; + } + return value; + } + } + } + }, + + removeAttr: function( elem, value ) { + var name, + i = 0, + + // Attribute names can contain non-HTML whitespace characters + // https://html.spec.whatwg.org/multipage/syntax.html#attributes-2 + attrNames = value && value.match( rnothtmlwhite ); + + if ( attrNames && elem.nodeType === 1 ) { + while ( ( name = attrNames[ i++ ] ) ) { + elem.removeAttribute( name ); + } + } + } +} ); + +// Hooks for boolean attributes +boolHook = { + set: function( elem, value, name ) { + if ( value === false ) { + + // Remove boolean attributes when set to false + jQuery.removeAttr( elem, name ); + } else { + elem.setAttribute( name, name ); + } + return name; + } +}; + +jQuery.each( jQuery.expr.match.bool.source.match( /\w+/g ), function( i, name ) { + var getter = attrHandle[ name ] || jQuery.find.attr; + + attrHandle[ name ] = function( elem, name, isXML ) { + var ret, handle, + lowercaseName = name.toLowerCase(); + + if ( !isXML ) { + + // Avoid an infinite loop by temporarily removing this function from the getter + handle = attrHandle[ lowercaseName ]; + attrHandle[ lowercaseName ] = ret; + ret = getter( elem, name, isXML ) != null ? + lowercaseName : + null; + attrHandle[ lowercaseName ] = handle; + } + return ret; + }; +} ); + + + + +var rfocusable = /^(?:input|select|textarea|button)$/i, + rclickable = /^(?:a|area)$/i; + +jQuery.fn.extend( { + prop: function( name, value ) { + return access( this, jQuery.prop, name, value, arguments.length > 1 ); + }, + + removeProp: function( name ) { + return this.each( function() { + delete this[ jQuery.propFix[ name ] || name ]; + } ); + } +} ); + +jQuery.extend( { + prop: function( elem, name, value ) { + var ret, hooks, + nType = elem.nodeType; + + // Don't get/set properties on text, comment and attribute nodes + if ( nType === 3 || nType === 8 || nType === 2 ) { + return; + } + + if ( nType !== 1 || !jQuery.isXMLDoc( elem ) ) { + + // Fix name and attach hooks + name = jQuery.propFix[ name ] || name; + hooks = jQuery.propHooks[ name ]; + } + + if ( value !== undefined ) { + if ( hooks && "set" in hooks && + ( ret = hooks.set( elem, value, name ) ) !== undefined ) { + return ret; + } + + return ( elem[ name ] = value ); + } + + if ( hooks && "get" in hooks && ( ret = hooks.get( elem, name ) ) !== null ) { + return ret; + } + + return elem[ name ]; + }, + + propHooks: { + tabIndex: { + get: function( elem ) { + + // Support: IE <=9 - 11 only + // elem.tabIndex doesn't always return the + // correct value when it hasn't been explicitly set + // https://web.archive.org/web/20141116233347/http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/ + // Use proper attribute retrieval(#12072) + var tabindex = jQuery.find.attr( elem, "tabindex" ); + + if ( tabindex ) { + return parseInt( tabindex, 10 ); + } + + if ( + rfocusable.test( elem.nodeName ) || + rclickable.test( elem.nodeName ) && + elem.href + ) { + return 0; + } + + return -1; + } + } + }, + + propFix: { + "for": "htmlFor", + "class": "className" + } +} ); + +// Support: IE <=11 only +// Accessing the selectedIndex property +// forces the browser to respect setting selected +// on the option +// The getter ensures a default option is selected +// when in an optgroup +// eslint rule "no-unused-expressions" is disabled for this code +// since it considers such accessions noop +if ( !support.optSelected ) { + jQuery.propHooks.selected = { + get: function( elem ) { + + /* eslint no-unused-expressions: "off" */ + + var parent = elem.parentNode; + if ( parent && parent.parentNode ) { + parent.parentNode.selectedIndex; + } + return null; + }, + set: function( elem ) { + + /* eslint no-unused-expressions: "off" */ + + var parent = elem.parentNode; + if ( parent ) { + parent.selectedIndex; + + if ( parent.parentNode ) { + parent.parentNode.selectedIndex; + } + } + } + }; +} + +jQuery.each( [ + "tabIndex", + "readOnly", + "maxLength", + "cellSpacing", + "cellPadding", + "rowSpan", + "colSpan", + "useMap", + "frameBorder", + "contentEditable" +], function() { + jQuery.propFix[ this.toLowerCase() ] = this; +} ); + + + + + // Strip and collapse whitespace according to HTML spec + // https://infra.spec.whatwg.org/#strip-and-collapse-ascii-whitespace + function stripAndCollapse( value ) { + var tokens = value.match( rnothtmlwhite ) || []; + return tokens.join( " " ); + } + + +function getClass( elem ) { + return elem.getAttribute && elem.getAttribute( "class" ) || ""; +} + +function classesToArray( value ) { + if ( Array.isArray( value ) ) { + return value; + } + if ( typeof value === "string" ) { + return value.match( rnothtmlwhite ) || []; + } + return []; +} + +jQuery.fn.extend( { + addClass: function( value ) { + var classes, elem, cur, curValue, clazz, j, finalValue, + i = 0; + + if ( isFunction( value ) ) { + return this.each( function( j ) { + jQuery( this ).addClass( value.call( this, j, getClass( this ) ) ); + } ); + } + + classes = classesToArray( value ); + + if ( classes.length ) { + while ( ( elem = this[ i++ ] ) ) { + curValue = getClass( elem ); + cur = elem.nodeType === 1 && ( " " + stripAndCollapse( curValue ) + " " ); + + if ( cur ) { + j = 0; + while ( ( clazz = classes[ j++ ] ) ) { + if ( cur.indexOf( " " + clazz + " " ) < 0 ) { + cur += clazz + " "; + } + } + + // Only assign if different to avoid unneeded rendering. + finalValue = stripAndCollapse( cur ); + if ( curValue !== finalValue ) { + elem.setAttribute( "class", finalValue ); + } + } + } + } + + return this; + }, + + removeClass: function( value ) { + var classes, elem, cur, curValue, clazz, j, finalValue, + i = 0; + + if ( isFunction( value ) ) { + return this.each( function( j ) { + jQuery( this ).removeClass( value.call( this, j, getClass( this ) ) ); + } ); + } + + if ( !arguments.length ) { + return this.attr( "class", "" ); + } + + classes = classesToArray( value ); + + if ( classes.length ) { + while ( ( elem = this[ i++ ] ) ) { + curValue = getClass( elem ); + + // This expression is here for better compressibility (see addClass) + cur = elem.nodeType === 1 && ( " " + stripAndCollapse( curValue ) + " " ); + + if ( cur ) { + j = 0; + while ( ( clazz = classes[ j++ ] ) ) { + + // Remove *all* instances + while ( cur.indexOf( " " + clazz + " " ) > -1 ) { + cur = cur.replace( " " + clazz + " ", " " ); + } + } + + // Only assign if different to avoid unneeded rendering. + finalValue = stripAndCollapse( cur ); + if ( curValue !== finalValue ) { + elem.setAttribute( "class", finalValue ); + } + } + } + } + + return this; + }, + + toggleClass: function( value, stateVal ) { + var type = typeof value, + isValidValue = type === "string" || Array.isArray( value ); + + if ( typeof stateVal === "boolean" && isValidValue ) { + return stateVal ? this.addClass( value ) : this.removeClass( value ); + } + + if ( isFunction( value ) ) { + return this.each( function( i ) { + jQuery( this ).toggleClass( + value.call( this, i, getClass( this ), stateVal ), + stateVal + ); + } ); + } + + return this.each( function() { + var className, i, self, classNames; + + if ( isValidValue ) { + + // Toggle individual class names + i = 0; + self = jQuery( this ); + classNames = classesToArray( value ); + + while ( ( className = classNames[ i++ ] ) ) { + + // Check each className given, space separated list + if ( self.hasClass( className ) ) { + self.removeClass( className ); + } else { + self.addClass( className ); + } + } + + // Toggle whole class name + } else if ( value === undefined || type === "boolean" ) { + className = getClass( this ); + if ( className ) { + + // Store className if set + dataPriv.set( this, "__className__", className ); + } + + // If the element has a class name or if we're passed `false`, + // then remove the whole classname (if there was one, the above saved it). + // Otherwise bring back whatever was previously saved (if anything), + // falling back to the empty string if nothing was stored. + if ( this.setAttribute ) { + this.setAttribute( "class", + className || value === false ? + "" : + dataPriv.get( this, "__className__" ) || "" + ); + } + } + } ); + }, + + hasClass: function( selector ) { + var className, elem, + i = 0; + + className = " " + selector + " "; + while ( ( elem = this[ i++ ] ) ) { + if ( elem.nodeType === 1 && + ( " " + stripAndCollapse( getClass( elem ) ) + " " ).indexOf( className ) > -1 ) { + return true; + } + } + + return false; + } +} ); + + + + +var rreturn = /\r/g; + +jQuery.fn.extend( { + val: function( value ) { + var hooks, ret, valueIsFunction, + elem = this[ 0 ]; + + if ( !arguments.length ) { + if ( elem ) { + hooks = jQuery.valHooks[ elem.type ] || + jQuery.valHooks[ elem.nodeName.toLowerCase() ]; + + if ( hooks && + "get" in hooks && + ( ret = hooks.get( elem, "value" ) ) !== undefined + ) { + return ret; + } + + ret = elem.value; + + // Handle most common string cases + if ( typeof ret === "string" ) { + return ret.replace( rreturn, "" ); + } + + // Handle cases where value is null/undef or number + return ret == null ? "" : ret; + } + + return; + } + + valueIsFunction = isFunction( value ); + + return this.each( function( i ) { + var val; + + if ( this.nodeType !== 1 ) { + return; + } + + if ( valueIsFunction ) { + val = value.call( this, i, jQuery( this ).val() ); + } else { + val = value; + } + + // Treat null/undefined as ""; convert numbers to string + if ( val == null ) { + val = ""; + + } else if ( typeof val === "number" ) { + val += ""; + + } else if ( Array.isArray( val ) ) { + val = jQuery.map( val, function( value ) { + return value == null ? "" : value + ""; + } ); + } + + hooks = jQuery.valHooks[ this.type ] || jQuery.valHooks[ this.nodeName.toLowerCase() ]; + + // If set returns undefined, fall back to normal setting + if ( !hooks || !( "set" in hooks ) || hooks.set( this, val, "value" ) === undefined ) { + this.value = val; + } + } ); + } +} ); + +jQuery.extend( { + valHooks: { + option: { + get: function( elem ) { + + var val = jQuery.find.attr( elem, "value" ); + return val != null ? + val : + + // Support: IE <=10 - 11 only + // option.text throws exceptions (#14686, #14858) + // Strip and collapse whitespace + // https://html.spec.whatwg.org/#strip-and-collapse-whitespace + stripAndCollapse( jQuery.text( elem ) ); + } + }, + select: { + get: function( elem ) { + var value, option, i, + options = elem.options, + index = elem.selectedIndex, + one = elem.type === "select-one", + values = one ? null : [], + max = one ? index + 1 : options.length; + + if ( index < 0 ) { + i = max; + + } else { + i = one ? index : 0; + } + + // Loop through all the selected options + for ( ; i < max; i++ ) { + option = options[ i ]; + + // Support: IE <=9 only + // IE8-9 doesn't update selected after form reset (#2551) + if ( ( option.selected || i === index ) && + + // Don't return options that are disabled or in a disabled optgroup + !option.disabled && + ( !option.parentNode.disabled || + !nodeName( option.parentNode, "optgroup" ) ) ) { + + // Get the specific value for the option + value = jQuery( option ).val(); + + // We don't need an array for one selects + if ( one ) { + return value; + } + + // Multi-Selects return an array + values.push( value ); + } + } + + return values; + }, + + set: function( elem, value ) { + var optionSet, option, + options = elem.options, + values = jQuery.makeArray( value ), + i = options.length; + + while ( i-- ) { + option = options[ i ]; + + /* eslint-disable no-cond-assign */ + + if ( option.selected = + jQuery.inArray( jQuery.valHooks.option.get( option ), values ) > -1 + ) { + optionSet = true; + } + + /* eslint-enable no-cond-assign */ + } + + // Force browsers to behave consistently when non-matching value is set + if ( !optionSet ) { + elem.selectedIndex = -1; + } + return values; + } + } + } +} ); + +// Radios and checkboxes getter/setter +jQuery.each( [ "radio", "checkbox" ], function() { + jQuery.valHooks[ this ] = { + set: function( elem, value ) { + if ( Array.isArray( value ) ) { + return ( elem.checked = jQuery.inArray( jQuery( elem ).val(), value ) > -1 ); + } + } + }; + if ( !support.checkOn ) { + jQuery.valHooks[ this ].get = function( elem ) { + return elem.getAttribute( "value" ) === null ? "on" : elem.value; + }; + } +} ); + + + + +// Return jQuery for attributes-only inclusion + + +support.focusin = "onfocusin" in window; + + +var rfocusMorph = /^(?:focusinfocus|focusoutblur)$/, + stopPropagationCallback = function( e ) { + e.stopPropagation(); + }; + +jQuery.extend( jQuery.event, { + + trigger: function( event, data, elem, onlyHandlers ) { + + var i, cur, tmp, bubbleType, ontype, handle, special, lastElement, + eventPath = [ elem || document ], + type = hasOwn.call( event, "type" ) ? event.type : event, + namespaces = hasOwn.call( event, "namespace" ) ? event.namespace.split( "." ) : []; + + cur = lastElement = tmp = elem = elem || document; + + // Don't do events on text and comment nodes + if ( elem.nodeType === 3 || elem.nodeType === 8 ) { + return; + } + + // focus/blur morphs to focusin/out; ensure we're not firing them right now + if ( rfocusMorph.test( type + jQuery.event.triggered ) ) { + return; + } + + if ( type.indexOf( "." ) > -1 ) { + + // Namespaced trigger; create a regexp to match event type in handle() + namespaces = type.split( "." ); + type = namespaces.shift(); + namespaces.sort(); + } + ontype = type.indexOf( ":" ) < 0 && "on" + type; + + // Caller can pass in a jQuery.Event object, Object, or just an event type string + event = event[ jQuery.expando ] ? + event : + new jQuery.Event( type, typeof event === "object" && event ); + + // Trigger bitmask: & 1 for native handlers; & 2 for jQuery (always true) + event.isTrigger = onlyHandlers ? 2 : 3; + event.namespace = namespaces.join( "." ); + event.rnamespace = event.namespace ? + new RegExp( "(^|\\.)" + namespaces.join( "\\.(?:.*\\.|)" ) + "(\\.|$)" ) : + null; + + // Clean up the event in case it is being reused + event.result = undefined; + if ( !event.target ) { + event.target = elem; + } + + // Clone any incoming data and prepend the event, creating the handler arg list + data = data == null ? + [ event ] : + jQuery.makeArray( data, [ event ] ); + + // Allow special events to draw outside the lines + special = jQuery.event.special[ type ] || {}; + if ( !onlyHandlers && special.trigger && special.trigger.apply( elem, data ) === false ) { + return; + } + + // Determine event propagation path in advance, per W3C events spec (#9951) + // Bubble up to document, then to window; watch for a global ownerDocument var (#9724) + if ( !onlyHandlers && !special.noBubble && !isWindow( elem ) ) { + + bubbleType = special.delegateType || type; + if ( !rfocusMorph.test( bubbleType + type ) ) { + cur = cur.parentNode; + } + for ( ; cur; cur = cur.parentNode ) { + eventPath.push( cur ); + tmp = cur; + } + + // Only add window if we got to document (e.g., not plain obj or detached DOM) + if ( tmp === ( elem.ownerDocument || document ) ) { + eventPath.push( tmp.defaultView || tmp.parentWindow || window ); + } + } + + // Fire handlers on the event path + i = 0; + while ( ( cur = eventPath[ i++ ] ) && !event.isPropagationStopped() ) { + lastElement = cur; + event.type = i > 1 ? + bubbleType : + special.bindType || type; + + // jQuery handler + handle = ( dataPriv.get( cur, "events" ) || {} )[ event.type ] && + dataPriv.get( cur, "handle" ); + if ( handle ) { + handle.apply( cur, data ); + } + + // Native handler + handle = ontype && cur[ ontype ]; + if ( handle && handle.apply && acceptData( cur ) ) { + event.result = handle.apply( cur, data ); + if ( event.result === false ) { + event.preventDefault(); + } + } + } + event.type = type; + + // If nobody prevented the default action, do it now + if ( !onlyHandlers && !event.isDefaultPrevented() ) { + + if ( ( !special._default || + special._default.apply( eventPath.pop(), data ) === false ) && + acceptData( elem ) ) { + + // Call a native DOM method on the target with the same name as the event. + // Don't do default actions on window, that's where global variables be (#6170) + if ( ontype && isFunction( elem[ type ] ) && !isWindow( elem ) ) { + + // Don't re-trigger an onFOO event when we call its FOO() method + tmp = elem[ ontype ]; + + if ( tmp ) { + elem[ ontype ] = null; + } + + // Prevent re-triggering of the same event, since we already bubbled it above + jQuery.event.triggered = type; + + if ( event.isPropagationStopped() ) { + lastElement.addEventListener( type, stopPropagationCallback ); + } + + elem[ type ](); + + if ( event.isPropagationStopped() ) { + lastElement.removeEventListener( type, stopPropagationCallback ); + } + + jQuery.event.triggered = undefined; + + if ( tmp ) { + elem[ ontype ] = tmp; + } + } + } + } + + return event.result; + }, + + // Piggyback on a donor event to simulate a different one + // Used only for `focus(in | out)` events + simulate: function( type, elem, event ) { + var e = jQuery.extend( + new jQuery.Event(), + event, + { + type: type, + isSimulated: true + } + ); + + jQuery.event.trigger( e, null, elem ); + } + +} ); + +jQuery.fn.extend( { + + trigger: function( type, data ) { + return this.each( function() { + jQuery.event.trigger( type, data, this ); + } ); + }, + triggerHandler: function( type, data ) { + var elem = this[ 0 ]; + if ( elem ) { + return jQuery.event.trigger( type, data, elem, true ); + } + } +} ); + + +// Support: Firefox <=44 +// Firefox doesn't have focus(in | out) events +// Related ticket - https://bugzilla.mozilla.org/show_bug.cgi?id=687787 +// +// Support: Chrome <=48 - 49, Safari <=9.0 - 9.1 +// focus(in | out) events fire after focus & blur events, +// which is spec violation - http://www.w3.org/TR/DOM-Level-3-Events/#events-focusevent-event-order +// Related ticket - https://bugs.chromium.org/p/chromium/issues/detail?id=449857 +if ( !support.focusin ) { + jQuery.each( { focus: "focusin", blur: "focusout" }, function( orig, fix ) { + + // Attach a single capturing handler on the document while someone wants focusin/focusout + var handler = function( event ) { + jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ) ); + }; + + jQuery.event.special[ fix ] = { + setup: function() { + var doc = this.ownerDocument || this, + attaches = dataPriv.access( doc, fix ); + + if ( !attaches ) { + doc.addEventListener( orig, handler, true ); + } + dataPriv.access( doc, fix, ( attaches || 0 ) + 1 ); + }, + teardown: function() { + var doc = this.ownerDocument || this, + attaches = dataPriv.access( doc, fix ) - 1; + + if ( !attaches ) { + doc.removeEventListener( orig, handler, true ); + dataPriv.remove( doc, fix ); + + } else { + dataPriv.access( doc, fix, attaches ); + } + } + }; + } ); +} +var location = window.location; + +var nonce = Date.now(); + +var rquery = ( /\?/ ); + + + +// Cross-browser xml parsing +jQuery.parseXML = function( data ) { + var xml; + if ( !data || typeof data !== "string" ) { + return null; + } + + // Support: IE 9 - 11 only + // IE throws on parseFromString with invalid input. + try { + xml = ( new window.DOMParser() ).parseFromString( data, "text/xml" ); + } catch ( e ) { + xml = undefined; + } + + if ( !xml || xml.getElementsByTagName( "parsererror" ).length ) { + jQuery.error( "Invalid XML: " + data ); + } + return xml; +}; + + +var + rbracket = /\[\]$/, + rCRLF = /\r?\n/g, + rsubmitterTypes = /^(?:submit|button|image|reset|file)$/i, + rsubmittable = /^(?:input|select|textarea|keygen)/i; + +function buildParams( prefix, obj, traditional, add ) { + var name; + + if ( Array.isArray( obj ) ) { + + // Serialize array item. + jQuery.each( obj, function( i, v ) { + if ( traditional || rbracket.test( prefix ) ) { + + // Treat each array item as a scalar. + add( prefix, v ); + + } else { + + // Item is non-scalar (array or object), encode its numeric index. + buildParams( + prefix + "[" + ( typeof v === "object" && v != null ? i : "" ) + "]", + v, + traditional, + add + ); + } + } ); + + } else if ( !traditional && toType( obj ) === "object" ) { + + // Serialize object item. + for ( name in obj ) { + buildParams( prefix + "[" + name + "]", obj[ name ], traditional, add ); + } + + } else { + + // Serialize scalar item. + add( prefix, obj ); + } +} + +// Serialize an array of form elements or a set of +// key/values into a query string +jQuery.param = function( a, traditional ) { + var prefix, + s = [], + add = function( key, valueOrFunction ) { + + // If value is a function, invoke it and use its return value + var value = isFunction( valueOrFunction ) ? + valueOrFunction() : + valueOrFunction; + + s[ s.length ] = encodeURIComponent( key ) + "=" + + encodeURIComponent( value == null ? "" : value ); + }; + + // If an array was passed in, assume that it is an array of form elements. + if ( Array.isArray( a ) || ( a.jquery && !jQuery.isPlainObject( a ) ) ) { + + // Serialize the form elements + jQuery.each( a, function() { + add( this.name, this.value ); + } ); + + } else { + + // If traditional, encode the "old" way (the way 1.3.2 or older + // did it), otherwise encode params recursively. + for ( prefix in a ) { + buildParams( prefix, a[ prefix ], traditional, add ); + } + } + + // Return the resulting serialization + return s.join( "&" ); +}; + +jQuery.fn.extend( { + serialize: function() { + return jQuery.param( this.serializeArray() ); + }, + serializeArray: function() { + return this.map( function() { + + // Can add propHook for "elements" to filter or add form elements + var elements = jQuery.prop( this, "elements" ); + return elements ? jQuery.makeArray( elements ) : this; + } ) + .filter( function() { + var type = this.type; + + // Use .is( ":disabled" ) so that fieldset[disabled] works + return this.name && !jQuery( this ).is( ":disabled" ) && + rsubmittable.test( this.nodeName ) && !rsubmitterTypes.test( type ) && + ( this.checked || !rcheckableType.test( type ) ); + } ) + .map( function( i, elem ) { + var val = jQuery( this ).val(); + + if ( val == null ) { + return null; + } + + if ( Array.isArray( val ) ) { + return jQuery.map( val, function( val ) { + return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) }; + } ); + } + + return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) }; + } ).get(); + } +} ); + + +var + r20 = /%20/g, + rhash = /#.*$/, + rantiCache = /([?&])_=[^&]*/, + rheaders = /^(.*?):[ \t]*([^\r\n]*)$/mg, + + // #7653, #8125, #8152: local protocol detection + rlocalProtocol = /^(?:about|app|app-storage|.+-extension|file|res|widget):$/, + rnoContent = /^(?:GET|HEAD)$/, + rprotocol = /^\/\//, + + /* Prefilters + * 1) They are useful to introduce custom dataTypes (see ajax/jsonp.js for an example) + * 2) These are called: + * - BEFORE asking for a transport + * - AFTER param serialization (s.data is a string if s.processData is true) + * 3) key is the dataType + * 4) the catchall symbol "*" can be used + * 5) execution will start with transport dataType and THEN continue down to "*" if needed + */ + prefilters = {}, + + /* Transports bindings + * 1) key is the dataType + * 2) the catchall symbol "*" can be used + * 3) selection will start with transport dataType and THEN go to "*" if needed + */ + transports = {}, + + // Avoid comment-prolog char sequence (#10098); must appease lint and evade compression + allTypes = "*/".concat( "*" ), + + // Anchor tag for parsing the document origin + originAnchor = document.createElement( "a" ); + originAnchor.href = location.href; + +// Base "constructor" for jQuery.ajaxPrefilter and jQuery.ajaxTransport +function addToPrefiltersOrTransports( structure ) { + + // dataTypeExpression is optional and defaults to "*" + return function( dataTypeExpression, func ) { + + if ( typeof dataTypeExpression !== "string" ) { + func = dataTypeExpression; + dataTypeExpression = "*"; + } + + var dataType, + i = 0, + dataTypes = dataTypeExpression.toLowerCase().match( rnothtmlwhite ) || []; + + if ( isFunction( func ) ) { + + // For each dataType in the dataTypeExpression + while ( ( dataType = dataTypes[ i++ ] ) ) { + + // Prepend if requested + if ( dataType[ 0 ] === "+" ) { + dataType = dataType.slice( 1 ) || "*"; + ( structure[ dataType ] = structure[ dataType ] || [] ).unshift( func ); + + // Otherwise append + } else { + ( structure[ dataType ] = structure[ dataType ] || [] ).push( func ); + } + } + } + }; +} + +// Base inspection function for prefilters and transports +function inspectPrefiltersOrTransports( structure, options, originalOptions, jqXHR ) { + + var inspected = {}, + seekingTransport = ( structure === transports ); + + function inspect( dataType ) { + var selected; + inspected[ dataType ] = true; + jQuery.each( structure[ dataType ] || [], function( _, prefilterOrFactory ) { + var dataTypeOrTransport = prefilterOrFactory( options, originalOptions, jqXHR ); + if ( typeof dataTypeOrTransport === "string" && + !seekingTransport && !inspected[ dataTypeOrTransport ] ) { + + options.dataTypes.unshift( dataTypeOrTransport ); + inspect( dataTypeOrTransport ); + return false; + } else if ( seekingTransport ) { + return !( selected = dataTypeOrTransport ); + } + } ); + return selected; + } + + return inspect( options.dataTypes[ 0 ] ) || !inspected[ "*" ] && inspect( "*" ); +} + +// A special extend for ajax options +// that takes "flat" options (not to be deep extended) +// Fixes #9887 +function ajaxExtend( target, src ) { + var key, deep, + flatOptions = jQuery.ajaxSettings.flatOptions || {}; + + for ( key in src ) { + if ( src[ key ] !== undefined ) { + ( flatOptions[ key ] ? target : ( deep || ( deep = {} ) ) )[ key ] = src[ key ]; + } + } + if ( deep ) { + jQuery.extend( true, target, deep ); + } + + return target; +} + +/* Handles responses to an ajax request: + * - finds the right dataType (mediates between content-type and expected dataType) + * - returns the corresponding response + */ +function ajaxHandleResponses( s, jqXHR, responses ) { + + var ct, type, finalDataType, firstDataType, + contents = s.contents, + dataTypes = s.dataTypes; + + // Remove auto dataType and get content-type in the process + while ( dataTypes[ 0 ] === "*" ) { + dataTypes.shift(); + if ( ct === undefined ) { + ct = s.mimeType || jqXHR.getResponseHeader( "Content-Type" ); + } + } + + // Check if we're dealing with a known content-type + if ( ct ) { + for ( type in contents ) { + if ( contents[ type ] && contents[ type ].test( ct ) ) { + dataTypes.unshift( type ); + break; + } + } + } + + // Check to see if we have a response for the expected dataType + if ( dataTypes[ 0 ] in responses ) { + finalDataType = dataTypes[ 0 ]; + } else { + + // Try convertible dataTypes + for ( type in responses ) { + if ( !dataTypes[ 0 ] || s.converters[ type + " " + dataTypes[ 0 ] ] ) { + finalDataType = type; + break; + } + if ( !firstDataType ) { + firstDataType = type; + } + } + + // Or just use first one + finalDataType = finalDataType || firstDataType; + } + + // If we found a dataType + // We add the dataType to the list if needed + // and return the corresponding response + if ( finalDataType ) { + if ( finalDataType !== dataTypes[ 0 ] ) { + dataTypes.unshift( finalDataType ); + } + return responses[ finalDataType ]; + } +} + +/* Chain conversions given the request and the original response + * Also sets the responseXXX fields on the jqXHR instance + */ +function ajaxConvert( s, response, jqXHR, isSuccess ) { + var conv2, current, conv, tmp, prev, + converters = {}, + + // Work with a copy of dataTypes in case we need to modify it for conversion + dataTypes = s.dataTypes.slice(); + + // Create converters map with lowercased keys + if ( dataTypes[ 1 ] ) { + for ( conv in s.converters ) { + converters[ conv.toLowerCase() ] = s.converters[ conv ]; + } + } + + current = dataTypes.shift(); + + // Convert to each sequential dataType + while ( current ) { + + if ( s.responseFields[ current ] ) { + jqXHR[ s.responseFields[ current ] ] = response; + } + + // Apply the dataFilter if provided + if ( !prev && isSuccess && s.dataFilter ) { + response = s.dataFilter( response, s.dataType ); + } + + prev = current; + current = dataTypes.shift(); + + if ( current ) { + + // There's only work to do if current dataType is non-auto + if ( current === "*" ) { + + current = prev; + + // Convert response if prev dataType is non-auto and differs from current + } else if ( prev !== "*" && prev !== current ) { + + // Seek a direct converter + conv = converters[ prev + " " + current ] || converters[ "* " + current ]; + + // If none found, seek a pair + if ( !conv ) { + for ( conv2 in converters ) { + + // If conv2 outputs current + tmp = conv2.split( " " ); + if ( tmp[ 1 ] === current ) { + + // If prev can be converted to accepted input + conv = converters[ prev + " " + tmp[ 0 ] ] || + converters[ "* " + tmp[ 0 ] ]; + if ( conv ) { + + // Condense equivalence converters + if ( conv === true ) { + conv = converters[ conv2 ]; + + // Otherwise, insert the intermediate dataType + } else if ( converters[ conv2 ] !== true ) { + current = tmp[ 0 ]; + dataTypes.unshift( tmp[ 1 ] ); + } + break; + } + } + } + } + + // Apply converter (if not an equivalence) + if ( conv !== true ) { + + // Unless errors are allowed to bubble, catch and return them + if ( conv && s.throws ) { + response = conv( response ); + } else { + try { + response = conv( response ); + } catch ( e ) { + return { + state: "parsererror", + error: conv ? e : "No conversion from " + prev + " to " + current + }; + } + } + } + } + } + } + + return { state: "success", data: response }; +} + +jQuery.extend( { + + // Counter for holding the number of active queries + active: 0, + + // Last-Modified header cache for next request + lastModified: {}, + etag: {}, + + ajaxSettings: { + url: location.href, + type: "GET", + isLocal: rlocalProtocol.test( location.protocol ), + global: true, + processData: true, + async: true, + contentType: "application/x-www-form-urlencoded; charset=UTF-8", + + /* + timeout: 0, + data: null, + dataType: null, + username: null, + password: null, + cache: null, + throws: false, + traditional: false, + headers: {}, + */ + + accepts: { + "*": allTypes, + text: "text/plain", + html: "text/html", + xml: "application/xml, text/xml", + json: "application/json, text/javascript" + }, + + contents: { + xml: /\bxml\b/, + html: /\bhtml/, + json: /\bjson\b/ + }, + + responseFields: { + xml: "responseXML", + text: "responseText", + json: "responseJSON" + }, + + // Data converters + // Keys separate source (or catchall "*") and destination types with a single space + converters: { + + // Convert anything to text + "* text": String, + + // Text to html (true = no transformation) + "text html": true, + + // Evaluate text as a json expression + "text json": JSON.parse, + + // Parse text as xml + "text xml": jQuery.parseXML + }, + + // For options that shouldn't be deep extended: + // you can add your own custom options here if + // and when you create one that shouldn't be + // deep extended (see ajaxExtend) + flatOptions: { + url: true, + context: true + } + }, + + // Creates a full fledged settings object into target + // with both ajaxSettings and settings fields. + // If target is omitted, writes into ajaxSettings. + ajaxSetup: function( target, settings ) { + return settings ? + + // Building a settings object + ajaxExtend( ajaxExtend( target, jQuery.ajaxSettings ), settings ) : + + // Extending ajaxSettings + ajaxExtend( jQuery.ajaxSettings, target ); + }, + + ajaxPrefilter: addToPrefiltersOrTransports( prefilters ), + ajaxTransport: addToPrefiltersOrTransports( transports ), + + // Main method + ajax: function( url, options ) { + + // If url is an object, simulate pre-1.5 signature + if ( typeof url === "object" ) { + options = url; + url = undefined; + } + + // Force options to be an object + options = options || {}; + + var transport, + + // URL without anti-cache param + cacheURL, + + // Response headers + responseHeadersString, + responseHeaders, + + // timeout handle + timeoutTimer, + + // Url cleanup var + urlAnchor, + + // Request state (becomes false upon send and true upon completion) + completed, + + // To know if global events are to be dispatched + fireGlobals, + + // Loop variable + i, + + // uncached part of the url + uncached, + + // Create the final options object + s = jQuery.ajaxSetup( {}, options ), + + // Callbacks context + callbackContext = s.context || s, + + // Context for global events is callbackContext if it is a DOM node or jQuery collection + globalEventContext = s.context && + ( callbackContext.nodeType || callbackContext.jquery ) ? + jQuery( callbackContext ) : + jQuery.event, + + // Deferreds + deferred = jQuery.Deferred(), + completeDeferred = jQuery.Callbacks( "once memory" ), + + // Status-dependent callbacks + statusCode = s.statusCode || {}, + + // Headers (they are sent all at once) + requestHeaders = {}, + requestHeadersNames = {}, + + // Default abort message + strAbort = "canceled", + + // Fake xhr + jqXHR = { + readyState: 0, + + // Builds headers hashtable if needed + getResponseHeader: function( key ) { + var match; + if ( completed ) { + if ( !responseHeaders ) { + responseHeaders = {}; + while ( ( match = rheaders.exec( responseHeadersString ) ) ) { + responseHeaders[ match[ 1 ].toLowerCase() ] = match[ 2 ]; + } + } + match = responseHeaders[ key.toLowerCase() ]; + } + return match == null ? null : match; + }, + + // Raw string + getAllResponseHeaders: function() { + return completed ? responseHeadersString : null; + }, + + // Caches the header + setRequestHeader: function( name, value ) { + if ( completed == null ) { + name = requestHeadersNames[ name.toLowerCase() ] = + requestHeadersNames[ name.toLowerCase() ] || name; + requestHeaders[ name ] = value; + } + return this; + }, + + // Overrides response content-type header + overrideMimeType: function( type ) { + if ( completed == null ) { + s.mimeType = type; + } + return this; + }, + + // Status-dependent callbacks + statusCode: function( map ) { + var code; + if ( map ) { + if ( completed ) { + + // Execute the appropriate callbacks + jqXHR.always( map[ jqXHR.status ] ); + } else { + + // Lazy-add the new callbacks in a way that preserves old ones + for ( code in map ) { + statusCode[ code ] = [ statusCode[ code ], map[ code ] ]; + } + } + } + return this; + }, + + // Cancel the request + abort: function( statusText ) { + var finalText = statusText || strAbort; + if ( transport ) { + transport.abort( finalText ); + } + done( 0, finalText ); + return this; + } + }; + + // Attach deferreds + deferred.promise( jqXHR ); + + // Add protocol if not provided (prefilters might expect it) + // Handle falsy url in the settings object (#10093: consistency with old signature) + // We also use the url parameter if available + s.url = ( ( url || s.url || location.href ) + "" ) + .replace( rprotocol, location.protocol + "//" ); + + // Alias method option to type as per ticket #12004 + s.type = options.method || options.type || s.method || s.type; + + // Extract dataTypes list + s.dataTypes = ( s.dataType || "*" ).toLowerCase().match( rnothtmlwhite ) || [ "" ]; + + // A cross-domain request is in order when the origin doesn't match the current origin. + if ( s.crossDomain == null ) { + urlAnchor = document.createElement( "a" ); + + // Support: IE <=8 - 11, Edge 12 - 15 + // IE throws exception on accessing the href property if url is malformed, + // e.g. http://example.com:80x/ + try { + urlAnchor.href = s.url; + + // Support: IE <=8 - 11 only + // Anchor's host property isn't correctly set when s.url is relative + urlAnchor.href = urlAnchor.href; + s.crossDomain = originAnchor.protocol + "//" + originAnchor.host !== + urlAnchor.protocol + "//" + urlAnchor.host; + } catch ( e ) { + + // If there is an error parsing the URL, assume it is crossDomain, + // it can be rejected by the transport if it is invalid + s.crossDomain = true; + } + } + + // Convert data if not already a string + if ( s.data && s.processData && typeof s.data !== "string" ) { + s.data = jQuery.param( s.data, s.traditional ); + } + + // Apply prefilters + inspectPrefiltersOrTransports( prefilters, s, options, jqXHR ); + + // If request was aborted inside a prefilter, stop there + if ( completed ) { + return jqXHR; + } + + // We can fire global events as of now if asked to + // Don't fire events if jQuery.event is undefined in an AMD-usage scenario (#15118) + fireGlobals = jQuery.event && s.global; + + // Watch for a new set of requests + if ( fireGlobals && jQuery.active++ === 0 ) { + jQuery.event.trigger( "ajaxStart" ); + } + + // Uppercase the type + s.type = s.type.toUpperCase(); + + // Determine if request has content + s.hasContent = !rnoContent.test( s.type ); + + // Save the URL in case we're toying with the If-Modified-Since + // and/or If-None-Match header later on + // Remove hash to simplify url manipulation + cacheURL = s.url.replace( rhash, "" ); + + // More options handling for requests with no content + if ( !s.hasContent ) { + + // Remember the hash so we can put it back + uncached = s.url.slice( cacheURL.length ); + + // If data is available and should be processed, append data to url + if ( s.data && ( s.processData || typeof s.data === "string" ) ) { + cacheURL += ( rquery.test( cacheURL ) ? "&" : "?" ) + s.data; + + // #9682: remove data so that it's not used in an eventual retry + delete s.data; + } + + // Add or update anti-cache param if needed + if ( s.cache === false ) { + cacheURL = cacheURL.replace( rantiCache, "$1" ); + uncached = ( rquery.test( cacheURL ) ? "&" : "?" ) + "_=" + ( nonce++ ) + uncached; + } + + // Put hash and anti-cache on the URL that will be requested (gh-1732) + s.url = cacheURL + uncached; + + // Change '%20' to '+' if this is encoded form body content (gh-2658) + } else if ( s.data && s.processData && + ( s.contentType || "" ).indexOf( "application/x-www-form-urlencoded" ) === 0 ) { + s.data = s.data.replace( r20, "+" ); + } + + // Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode. + if ( s.ifModified ) { + if ( jQuery.lastModified[ cacheURL ] ) { + jqXHR.setRequestHeader( "If-Modified-Since", jQuery.lastModified[ cacheURL ] ); + } + if ( jQuery.etag[ cacheURL ] ) { + jqXHR.setRequestHeader( "If-None-Match", jQuery.etag[ cacheURL ] ); + } + } + + // Set the correct header, if data is being sent + if ( s.data && s.hasContent && s.contentType !== false || options.contentType ) { + jqXHR.setRequestHeader( "Content-Type", s.contentType ); + } + + // Set the Accepts header for the server, depending on the dataType + jqXHR.setRequestHeader( + "Accept", + s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[ 0 ] ] ? + s.accepts[ s.dataTypes[ 0 ] ] + + ( s.dataTypes[ 0 ] !== "*" ? ", " + allTypes + "; q=0.01" : "" ) : + s.accepts[ "*" ] + ); + + // Check for headers option + for ( i in s.headers ) { + jqXHR.setRequestHeader( i, s.headers[ i ] ); + } + + // Allow custom headers/mimetypes and early abort + if ( s.beforeSend && + ( s.beforeSend.call( callbackContext, jqXHR, s ) === false || completed ) ) { + + // Abort if not done already and return + return jqXHR.abort(); + } + + // Aborting is no longer a cancellation + strAbort = "abort"; + + // Install callbacks on deferreds + completeDeferred.add( s.complete ); + jqXHR.done( s.success ); + jqXHR.fail( s.error ); + + // Get transport + transport = inspectPrefiltersOrTransports( transports, s, options, jqXHR ); + + // If no transport, we auto-abort + if ( !transport ) { + done( -1, "No Transport" ); + } else { + jqXHR.readyState = 1; + + // Send global event + if ( fireGlobals ) { + globalEventContext.trigger( "ajaxSend", [ jqXHR, s ] ); + } + + // If request was aborted inside ajaxSend, stop there + if ( completed ) { + return jqXHR; + } + + // Timeout + if ( s.async && s.timeout > 0 ) { + timeoutTimer = window.setTimeout( function() { + jqXHR.abort( "timeout" ); + }, s.timeout ); + } + + try { + completed = false; + transport.send( requestHeaders, done ); + } catch ( e ) { + + // Rethrow post-completion exceptions + if ( completed ) { + throw e; + } + + // Propagate others as results + done( -1, e ); + } + } + + // Callback for when everything is done + function done( status, nativeStatusText, responses, headers ) { + var isSuccess, success, error, response, modified, + statusText = nativeStatusText; + + // Ignore repeat invocations + if ( completed ) { + return; + } + + completed = true; + + // Clear timeout if it exists + if ( timeoutTimer ) { + window.clearTimeout( timeoutTimer ); + } + + // Dereference transport for early garbage collection + // (no matter how long the jqXHR object will be used) + transport = undefined; + + // Cache response headers + responseHeadersString = headers || ""; + + // Set readyState + jqXHR.readyState = status > 0 ? 4 : 0; + + // Determine if successful + isSuccess = status >= 200 && status < 300 || status === 304; + + // Get response data + if ( responses ) { + response = ajaxHandleResponses( s, jqXHR, responses ); + } + + // Convert no matter what (that way responseXXX fields are always set) + response = ajaxConvert( s, response, jqXHR, isSuccess ); + + // If successful, handle type chaining + if ( isSuccess ) { + + // Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode. + if ( s.ifModified ) { + modified = jqXHR.getResponseHeader( "Last-Modified" ); + if ( modified ) { + jQuery.lastModified[ cacheURL ] = modified; + } + modified = jqXHR.getResponseHeader( "etag" ); + if ( modified ) { + jQuery.etag[ cacheURL ] = modified; + } + } + + // if no content + if ( status === 204 || s.type === "HEAD" ) { + statusText = "nocontent"; + + // if not modified + } else if ( status === 304 ) { + statusText = "notmodified"; + + // If we have data, let's convert it + } else { + statusText = response.state; + success = response.data; + error = response.error; + isSuccess = !error; + } + } else { + + // Extract error from statusText and normalize for non-aborts + error = statusText; + if ( status || !statusText ) { + statusText = "error"; + if ( status < 0 ) { + status = 0; + } + } + } + + // Set data for the fake xhr object + jqXHR.status = status; + jqXHR.statusText = ( nativeStatusText || statusText ) + ""; + + // Success/Error + if ( isSuccess ) { + deferred.resolveWith( callbackContext, [ success, statusText, jqXHR ] ); + } else { + deferred.rejectWith( callbackContext, [ jqXHR, statusText, error ] ); + } + + // Status-dependent callbacks + jqXHR.statusCode( statusCode ); + statusCode = undefined; + + if ( fireGlobals ) { + globalEventContext.trigger( isSuccess ? "ajaxSuccess" : "ajaxError", + [ jqXHR, s, isSuccess ? success : error ] ); + } + + // Complete + completeDeferred.fireWith( callbackContext, [ jqXHR, statusText ] ); + + if ( fireGlobals ) { + globalEventContext.trigger( "ajaxComplete", [ jqXHR, s ] ); + + // Handle the global AJAX counter + if ( !( --jQuery.active ) ) { + jQuery.event.trigger( "ajaxStop" ); + } + } + } + + return jqXHR; + }, + + getJSON: function( url, data, callback ) { + return jQuery.get( url, data, callback, "json" ); + }, + + getScript: function( url, callback ) { + return jQuery.get( url, undefined, callback, "script" ); + } +} ); + +jQuery.each( [ "get", "post" ], function( i, method ) { + jQuery[ method ] = function( url, data, callback, type ) { + + // Shift arguments if data argument was omitted + if ( isFunction( data ) ) { + type = type || callback; + callback = data; + data = undefined; + } + + // The url can be an options object (which then must have .url) + return jQuery.ajax( jQuery.extend( { + url: url, + type: method, + dataType: type, + data: data, + success: callback + }, jQuery.isPlainObject( url ) && url ) ); + }; +} ); + + +jQuery._evalUrl = function( url ) { + return jQuery.ajax( { + url: url, + + // Make this explicit, since user can override this through ajaxSetup (#11264) + type: "GET", + dataType: "script", + cache: true, + async: false, + global: false, + "throws": true + } ); +}; + + +jQuery.fn.extend( { + wrapAll: function( html ) { + var wrap; + + if ( this[ 0 ] ) { + if ( isFunction( html ) ) { + html = html.call( this[ 0 ] ); + } + + // The elements to wrap the target around + wrap = jQuery( html, this[ 0 ].ownerDocument ).eq( 0 ).clone( true ); + + if ( this[ 0 ].parentNode ) { + wrap.insertBefore( this[ 0 ] ); + } + + wrap.map( function() { + var elem = this; + + while ( elem.firstElementChild ) { + elem = elem.firstElementChild; + } + + return elem; + } ).append( this ); + } + + return this; + }, + + wrapInner: function( html ) { + if ( isFunction( html ) ) { + return this.each( function( i ) { + jQuery( this ).wrapInner( html.call( this, i ) ); + } ); + } + + return this.each( function() { + var self = jQuery( this ), + contents = self.contents(); + + if ( contents.length ) { + contents.wrapAll( html ); + + } else { + self.append( html ); + } + } ); + }, + + wrap: function( html ) { + var htmlIsFunction = isFunction( html ); + + return this.each( function( i ) { + jQuery( this ).wrapAll( htmlIsFunction ? html.call( this, i ) : html ); + } ); + }, + + unwrap: function( selector ) { + this.parent( selector ).not( "body" ).each( function() { + jQuery( this ).replaceWith( this.childNodes ); + } ); + return this; + } +} ); + + +jQuery.expr.pseudos.hidden = function( elem ) { + return !jQuery.expr.pseudos.visible( elem ); +}; +jQuery.expr.pseudos.visible = function( elem ) { + return !!( elem.offsetWidth || elem.offsetHeight || elem.getClientRects().length ); +}; + + + + +jQuery.ajaxSettings.xhr = function() { + try { + return new window.XMLHttpRequest(); + } catch ( e ) {} +}; + +var xhrSuccessStatus = { + + // File protocol always yields status code 0, assume 200 + 0: 200, + + // Support: IE <=9 only + // #1450: sometimes IE returns 1223 when it should be 204 + 1223: 204 + }, + xhrSupported = jQuery.ajaxSettings.xhr(); + +support.cors = !!xhrSupported && ( "withCredentials" in xhrSupported ); +support.ajax = xhrSupported = !!xhrSupported; + +jQuery.ajaxTransport( function( options ) { + var callback, errorCallback; + + // Cross domain only allowed if supported through XMLHttpRequest + if ( support.cors || xhrSupported && !options.crossDomain ) { + return { + send: function( headers, complete ) { + var i, + xhr = options.xhr(); + + xhr.open( + options.type, + options.url, + options.async, + options.username, + options.password + ); + + // Apply custom fields if provided + if ( options.xhrFields ) { + for ( i in options.xhrFields ) { + xhr[ i ] = options.xhrFields[ i ]; + } + } + + // Override mime type if needed + if ( options.mimeType && xhr.overrideMimeType ) { + xhr.overrideMimeType( options.mimeType ); + } + + // X-Requested-With header + // For cross-domain requests, seeing as conditions for a preflight are + // akin to a jigsaw puzzle, we simply never set it to be sure. + // (it can always be set on a per-request basis or even using ajaxSetup) + // For same-domain requests, won't change header if already provided. + if ( !options.crossDomain && !headers[ "X-Requested-With" ] ) { + headers[ "X-Requested-With" ] = "XMLHttpRequest"; + } + + // Set headers + for ( i in headers ) { + xhr.setRequestHeader( i, headers[ i ] ); + } + + // Callback + callback = function( type ) { + return function() { + if ( callback ) { + callback = errorCallback = xhr.onload = + xhr.onerror = xhr.onabort = xhr.ontimeout = + xhr.onreadystatechange = null; + + if ( type === "abort" ) { + xhr.abort(); + } else if ( type === "error" ) { + + // Support: IE <=9 only + // On a manual native abort, IE9 throws + // errors on any property access that is not readyState + if ( typeof xhr.status !== "number" ) { + complete( 0, "error" ); + } else { + complete( + + // File: protocol always yields status 0; see #8605, #14207 + xhr.status, + xhr.statusText + ); + } + } else { + complete( + xhrSuccessStatus[ xhr.status ] || xhr.status, + xhr.statusText, + + // Support: IE <=9 only + // IE9 has no XHR2 but throws on binary (trac-11426) + // For XHR2 non-text, let the caller handle it (gh-2498) + ( xhr.responseType || "text" ) !== "text" || + typeof xhr.responseText !== "string" ? + { binary: xhr.response } : + { text: xhr.responseText }, + xhr.getAllResponseHeaders() + ); + } + } + }; + }; + + // Listen to events + xhr.onload = callback(); + errorCallback = xhr.onerror = xhr.ontimeout = callback( "error" ); + + // Support: IE 9 only + // Use onreadystatechange to replace onabort + // to handle uncaught aborts + if ( xhr.onabort !== undefined ) { + xhr.onabort = errorCallback; + } else { + xhr.onreadystatechange = function() { + + // Check readyState before timeout as it changes + if ( xhr.readyState === 4 ) { + + // Allow onerror to be called first, + // but that will not handle a native abort + // Also, save errorCallback to a variable + // as xhr.onerror cannot be accessed + window.setTimeout( function() { + if ( callback ) { + errorCallback(); + } + } ); + } + }; + } + + // Create the abort callback + callback = callback( "abort" ); + + try { + + // Do send the request (this may raise an exception) + xhr.send( options.hasContent && options.data || null ); + } catch ( e ) { + + // #14683: Only rethrow if this hasn't been notified as an error yet + if ( callback ) { + throw e; + } + } + }, + + abort: function() { + if ( callback ) { + callback(); + } + } + }; + } +} ); + + + + +// Prevent auto-execution of scripts when no explicit dataType was provided (See gh-2432) +jQuery.ajaxPrefilter( function( s ) { + if ( s.crossDomain ) { + s.contents.script = false; + } +} ); + +// Install script dataType +jQuery.ajaxSetup( { + accepts: { + script: "text/javascript, application/javascript, " + + "application/ecmascript, application/x-ecmascript" + }, + contents: { + script: /\b(?:java|ecma)script\b/ + }, + converters: { + "text script": function( text ) { + jQuery.globalEval( text ); + return text; + } + } +} ); + +// Handle cache's special case and crossDomain +jQuery.ajaxPrefilter( "script", function( s ) { + if ( s.cache === undefined ) { + s.cache = false; + } + if ( s.crossDomain ) { + s.type = "GET"; + } +} ); + +// Bind script tag hack transport +jQuery.ajaxTransport( "script", function( s ) { + + // This transport only deals with cross domain requests + if ( s.crossDomain ) { + var script, callback; + return { + send: function( _, complete ) { + script = jQuery( "