Skip to content

Commit fa8a75b

Browse files
gramssgramss
committed
Add missing err:out_of_range code-sections + intent fixes
1 parent bd55f24 commit fa8a75b

1 file changed

Lines changed: 50 additions & 68 deletions

File tree

‎bt_editor/sidepanel_monitor.cpp‎

Lines changed: 50 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -45,62 +45,62 @@ void SidepanelMonitor::on_timer()
4545
ui->labelCount->setText( QString("Messages received: %1").arg(_msg_count) );
4646

4747
const char* buffer = reinterpret_cast<const char*>(msg.data());
48-
48+
4949
const uint32_t header_size = flatbuffers::ReadScalar<uint32_t>( buffer );
5050
const uint32_t num_transitions = flatbuffers::ReadScalar<uint32_t>( &buffer[4+header_size] );
5151

52-
// check uid in the index, if failed load tree from server
53-
try {
54-
for(size_t offset = 4; offset < header_size +4; offset +=3 )
55-
{
56-
const uint16_t uid = flatbuffers::ReadScalar<uint16_t>(&buffer[offset]);
57-
_uid_to_index.at(uid);
58-
}
59-
60-
for(size_t t=0; t < num_transitions; t++)
61-
{
62-
size_t offset = 8 + header_size + 12*t;
63-
const uint16_t uid = flatbuffers::ReadScalar<uint16_t>(&buffer[offset+8]);
64-
_uid_to_index.at(uid);
65-
}
66-
}
67-
catch( std::out_of_range& err) {
68-
qDebug() << "Reload tree from server";
69-
if( !getTreeFromServer() ) {
70-
_connected = false;
71-
ui->lineEdit->setDisabled(false);
72-
_timer->stop();
73-
connectionUpdate(false);
74-
return;
75-
}
76-
}
77-
78-
for(size_t offset = 4; offset < header_size +4; offset +=3 )
79-
{
80-
const uint16_t uid = flatbuffers::ReadScalar<uint16_t>(&buffer[offset]);
81-
const uint16_t index = _uid_to_index.at(uid);
82-
AbstractTreeNode* node = _loaded_tree.node( index );
83-
node->status = convert(flatbuffers::ReadScalar<Serialization::NodeStatus>(&buffer[offset+2] ));
84-
}
85-
8652
std::vector<std::pair<int, NodeStatus>> node_status;
8753

88-
//qDebug() << "--------";
89-
for(size_t t=0; t < num_transitions; t++)
90-
{
91-
size_t offset = 8 + header_size + 12*t;
54+
// check uid in the index, if failed load tree from server
55+
try {
56+
for(size_t offset = 4; offset < header_size +4; offset +=3 )
57+
{
58+
const uint16_t uid = flatbuffers::ReadScalar<uint16_t>(&buffer[offset]);
59+
_uid_to_index.at(uid);
60+
}
61+
62+
for(size_t t=0; t < num_transitions; t++)
63+
{
64+
size_t offset = 8 + header_size + 12*t;
65+
const uint16_t uid = flatbuffers::ReadScalar<uint16_t>(&buffer[offset+8]);
66+
_uid_to_index.at(uid);
67+
}
68+
for(size_t offset = 4; offset < header_size +4; offset +=3 )
69+
{
70+
const uint16_t uid = flatbuffers::ReadScalar<uint16_t>(&buffer[offset]);
71+
const uint16_t index = _uid_to_index.at(uid);
72+
AbstractTreeNode* node = _loaded_tree.node( index );
73+
node->status = convert(flatbuffers::ReadScalar<Serialization::NodeStatus>(&buffer[offset+2] ));
74+
}
75+
9276

93-
// const double t_sec = flatbuffers::ReadScalar<uint32_t>( &buffer[offset] );
94-
// const double t_usec = flatbuffers::ReadScalar<uint32_t>( &buffer[offset+4] );
95-
// double timestamp = t_sec + t_usec* 0.000001;
96-
const uint16_t uid = flatbuffers::ReadScalar<uint16_t>(&buffer[offset+8]);
97-
const uint16_t index = _uid_to_index.at(uid);
98-
// NodeStatus prev_status = convert(flatbuffers::ReadScalar<Serialization::NodeStatus>(&buffer[index+10] ));
99-
NodeStatus status = convert(flatbuffers::ReadScalar<Serialization::NodeStatus>(&buffer[offset+11] ));
77+
//qDebug() << "--------";
78+
for(size_t t=0; t < num_transitions; t++)
79+
{
80+
size_t offset = 8 + header_size + 12*t;
81+
82+
// const double t_sec = flatbuffers::ReadScalar<uint32_t>( &buffer[offset] );
83+
// const double t_usec = flatbuffers::ReadScalar<uint32_t>( &buffer[offset+4] );
84+
// double timestamp = t_sec + t_usec* 0.000001;
85+
const uint16_t uid = flatbuffers::ReadScalar<uint16_t>(&buffer[offset+8]);
86+
const uint16_t index = _uid_to_index.at(uid);
87+
// NodeStatus prev_status = convert(flatbuffers::ReadScalar<Serialization::NodeStatus>(&buffer[index+10] ));
88+
NodeStatus status = convert(flatbuffers::ReadScalar<Serialization::NodeStatus>(&buffer[offset+11] ));
10089

101-
_loaded_tree.node(index)->status = status;
102-
node_status.push_back( {index, status} );
90+
_loaded_tree.node(index)->status = status;
91+
node_status.push_back( {index, status} );
10392

93+
}
94+
}
95+
catch( std::out_of_range& err) {
96+
qDebug() << "Reload tree from server";
97+
if( !getTreeFromServer() ) {
98+
_connected = false;
99+
ui->lineEdit->setDisabled(false);
100+
_timer->stop();
101+
connectionUpdate(false);
102+
return;
103+
}
104104
}
105105
// update the graphic part
106106
emit changeNodeStyle( "BehaviorTree", node_status );
@@ -189,27 +189,11 @@ void SidepanelMonitor::on_Connect()
189189
address = ui->lineEdit->placeholderText();
190190
ui->lineEdit->setText(address);
191191
}
192-
193-
QString publisher_port = ui->lineEdit_publisher->text();
194-
if( publisher_port.isEmpty() )
195-
{
196-
publisher_port = ui->lineEdit_publisher->placeholderText();
197-
ui->lineEdit_publisher->setText(publisher_port);
198-
}
199-
200-
QString server_port = ui->lineEdit_server->text();
201-
if( server_port.isEmpty() )
202-
{
203-
publisher_port = ui->lineEdit_server->placeholderText();
204-
ui->lineEdit_server->setText(publisher_port);
205-
}
206-
207192
bool failed = false;
208193
if( !address.isEmpty() )
209194
{
210-
_connection_address_pub = "tcp://" + address.toStdString() + ":" + publisher_port.toStdString();
211-
_connection_address_req = "tcp://" + address.toStdString() + ":" + server_port.toStdString();
212-
195+
_connection_address_pub = "tcp://" + address.toStdString() + std::string(":1666");
196+
_connection_address_req = "tcp://" + address.toStdString() + std::string(":1667");
213197
try{
214198
_zmq_subscriber.connect( _connection_address_pub.c_str() );
215199

@@ -236,7 +220,6 @@ void SidepanelMonitor::on_Connect()
236220
{
237221
_connected = true;
238222
ui->lineEdit->setDisabled(true);
239-
ui->lineEdit_publisher->setDisabled(true);
240223
_timer->start(20);
241224
connectionUpdate(true);
242225
}
@@ -250,7 +233,6 @@ void SidepanelMonitor::on_Connect()
250233
else{
251234
_connected = false;
252235
ui->lineEdit->setDisabled(false);
253-
ui->lineEdit_publisher->setDisabled(false);
254236
_timer->stop();
255237

256238
connectionUpdate(false);

0 commit comments

Comments
 (0)