Skip to content

raw input streams: remove redundant formats, cleanup #918

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ourairquality wants to merge 1 commit into
base: main
Choose a base branch
from
Open

raw input streams: remove redundant formats, cleanup #918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 41 additions & 35 deletions app/qtapp/rtknavi_qt/mondlg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ MonitorDialog::MonitorDialog(QWidget *parent, rtksvr_t *server, stream_t* stream

fontScale = QFontMetrics(ui->tWConsole->font()).height() * 4;

consoleFormat = 1;
consoleFormat = 1; // ASCII
ui->cBSelectFormat->setCurrentIndex(consoleFormat);
inputStream = solutionStream = 0;

for (int i = 0; i <= MAXRCVFMT; i++) ui->cBSelectFormat->addItem(formatstrs[i]);

init_rtcm(&rtcm);
init_raw(&raw, -1);
init_rtcm(&rtcm);
memset(&raw, 0, sizeof(raw));

connect(ui->btnClear, &QPushButton::clicked, this, &MonitorDialog::clearOutput);
connect(ui->buttonBox, &QDialogButtonBox::rejected, this, &MonitorDialog::reject);
Expand Down Expand Up @@ -106,14 +106,18 @@ int MonitorDialog::getDisplayType()
//---------------------------------------------------------------------------
void MonitorDialog::consoleFormatChanged()
{
if (consoleFormat >= 3 && consoleFormat < 17)
free_raw(&raw);

// update format marker
consoleFormat = ui->cBSelectFormat->currentIndex();

if (consoleFormat >= 3 && consoleFormat < 17)
init_raw(&raw, consoleFormat - 2);
if (consoleFormat >= 2) {
int fmt = consoleFormat - 2;
if (fmt > STRFMT_RTCM3 && fmt < STRFMT_RINEX) free_raw(&raw);
}

// Update format marker.
consoleFormat = ui->cBSelectFormat->currentIndex();

if (consoleFormat >= 2) {
int fmt = consoleFormat - 2;
if (fmt > STRFMT_RTCM3 && fmt < STRFMT_RINEX) init_raw(&raw, fmt);
}
}
//---------------------------------------------------------------------------
void MonitorDialog::inputStreamChanged()
Expand Down Expand Up @@ -285,36 +289,38 @@ void MonitorDialog::showBuffers()
rtcm.outtype = raw.outtype = 1;

if (displayType >= 17) {
addConsole(msg, len, 1, false);
}
else if (consoleFormat < 2) { // ASCII or HEX
addConsole(msg, len, consoleFormat, false);
} else if (consoleFormat - 2 == STRFMT_RTCM2) {
addConsole(msg, len, 1, false);
} else if (consoleFormat == 0 || consoleFormat == 1) { // Hex or ASCII.
addConsole(msg, len, consoleFormat, false);
} else {
int fmt = consoleFormat - 2;
if (fmt == STRFMT_RTCM2) {
for (i = 0; i < len; i++) {
input_rtcm2(&rtcm, msg[i]);
if (rtcm.msgtype[0]) {
addConsole((uint8_t*)rtcm.msgtype, strlen(rtcm.msgtype), 1, true);
rtcm.msgtype[0] = '\0';
}
input_rtcm2(&rtcm, msg[i]);
if (rtcm.msgtype[0]) {
addConsole((uint8_t *)rtcm.msgtype, strlen(rtcm.msgtype), 1, true);
rtcm.msgtype[0] = '\0';
}
}
} else if (consoleFormat - 2 == STRFMT_RTCM3) {
} else if (fmt == STRFMT_RTCM3) {
for (i = 0; i < len; i++) {
input_rtcm3(&rtcm, msg[i]);
if (rtcm.msgtype[0]) {
addConsole((uint8_t*)rtcm.msgtype, strlen(rtcm.msgtype), 1, true);
rtcm.msgtype[0] = '\0';
}
input_rtcm3(&rtcm, msg[i]);
if (rtcm.msgtype[0]) {
addConsole((uint8_t *)rtcm.msgtype, strlen(rtcm.msgtype), 1, true);
rtcm.msgtype[0] = '\0';
}
}
} else if (consoleFormat < 17) {
} else if (fmt > STRFMT_RTCM3 && fmt < STRFMT_RINEX) { // Raw
for (i = 0; i < len; i++) {
input_raw(&raw, consoleFormat - 2, msg[i]);
if (raw.msgtype[0]) {
addConsole((uint8_t*)raw.msgtype, strlen(raw.msgtype), 1, true);
raw.msgtype[0] = '\0';
}
input_raw(&raw, msg[i]);
if (raw.msgtype[0]) {
addConsole((uint8_t *)raw.msgtype, strlen(raw.msgtype), 1, true);
raw.msgtype[0] = '\0';
}
}
}
free(msg);
}
}
free(msg);
}
//---------------------------------------------------------------------------
void MonitorDialog::addConsole(const uint8_t *msg, int n, int mode, bool newline)
Expand Down
102 changes: 54 additions & 48 deletions app/qtapp/strsvr_qt/mondlg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,63 +36,69 @@ StrMonDialog::StrMonDialog(QWidget *parent)
//---------------------------------------------------------------------------
void StrMonDialog::changeFormat()
{
int streamFormat = getStreamFormat();

if ((streamFormat-3 == STRFMT_RTCM2) || (streamFormat-3 == STRFMT_RTCM3)) {
free_rtcm(&rtcm);
} else if (streamFormat >= 3) {
free_raw(&raw);
}

streamFormat = ui->cBSelectFormat->currentIndex();
clearConsole();

if ((streamFormat - 3 == STRFMT_RTCM2) || (streamFormat - 3 == STRFMT_RTCM3)) {
init_rtcm(&rtcm);
rtcm.outtype = 1;
} else if (streamFormat >= 3) {
init_raw(&raw, streamFormat - 3);
raw.outtype = 1;
int streamFormat = getStreamFormat();

if (streamFormat >= 3) {
int fmt = streamFormat - 3;
if (fmt == STRFMT_RTCM2 || fmt == STRFMT_RTCM3)
free_rtcm(&rtcm);
else if (fmt > STRFMT_RTCM3 && fmt < STRFMT_RINEX)
free_raw(&raw);
}

streamFormat = ui->cBSelectFormat->currentIndex();
clearConsole();

if (streamFormat >= 3) {
int fmt = streamFormat - 3;
if (fmt == STRFMT_RTCM2 || fmt == STRFMT_RTCM3) {
init_rtcm(&rtcm);
rtcm.outtype = 1;
} else if (fmt > STRFMT_RTCM3 && fmt < STRFMT_RINEX) {
init_raw(&raw, fmt);
raw.outtype = 1;
}
}
}
//---------------------------------------------------------------------------
void StrMonDialog::addMessage(unsigned char *msg, int len)
{
int streamFormat = getStreamFormat();
int i;

if (len <= 0) {
return;
}else if (streamFormat - 3 == STRFMT_RTCM2) {
for (i = 0; i < len; i++) {
input_rtcm2(&rtcm, msg[i]);
if (rtcm.msgtype[0]) {
addConsole((unsigned char*)rtcm.msgtype, strlen(rtcm.msgtype), 1, true);
rtcm.msgtype[0] = '\0';
}
if (len <= 0) return;

int streamFormat = getStreamFormat();
if (streamFormat == 0) { // Streams
consoleBuffer.clear();
addConsole(msg, len, 1, false);
} else if (streamFormat == 1 || streamFormat == 2) { // Hex or ASCII.
addConsole(msg, len, streamFormat - 1, false);
} else {
int fmt = streamFormat - 3;
if (fmt == STRFMT_RTCM2) {
for (int i = 0; i < len; i++) {
input_rtcm2(&rtcm, msg[i]);
if (rtcm.msgtype[0]) {
addConsole((unsigned char *)rtcm.msgtype, strlen(rtcm.msgtype), 1, true);
rtcm.msgtype[0] = '\0';
}
} else if (streamFormat - 3 == STRFMT_RTCM3) {
for (i = 0; i < len; i++) {
input_rtcm3(&rtcm, msg[i]);
if (rtcm.msgtype[0]) {
addConsole((unsigned char*)rtcm.msgtype, strlen(rtcm.msgtype), 1, true);
rtcm.msgtype[0] = '\0';
}
}
} else if (fmt == STRFMT_RTCM3) {
for (int i = 0; i < len; i++) {
input_rtcm3(&rtcm, msg[i]);
if (rtcm.msgtype[0]) {
addConsole((unsigned char *)rtcm.msgtype, strlen(rtcm.msgtype), 1, true);
rtcm.msgtype[0] = '\0';
}
} else if (streamFormat >= 3) { // raw
for (i = 0; i < len; i++) {
input_raw(&raw, streamFormat - 3, msg[i]);
if (raw.msgtype[0]) {
addConsole((unsigned char*)raw.msgtype, strlen(raw.msgtype), 1, true);
raw.msgtype[0] = '\0';
}
}
} else if (fmt > STRFMT_RTCM3 && fmt < STRFMT_RINEX) { // Raw
for (int i = 0; i < len; i++) {
input_raw(&raw, msg[i]);
if (raw.msgtype[0]) {
addConsole((unsigned char *)raw.msgtype, strlen(raw.msgtype), 1, true);
raw.msgtype[0] = '\0';
}
} else if (streamFormat >= 1 ) { // HEX/ASC
addConsole(msg, len, streamFormat - 1, false);
} else { // Streams
consoleBuffer.clear();
addConsole(msg, len, 1, false);
}
}
}
}
//---------------------------------------------------------------------------
void StrMonDialog::addConsole(unsigned char *msg, int n, int mode, bool newline)
Expand Down
Loading