robomon: rearrange group boxes to make them occupy less space

diff --git a/src/robomon/RobomonAtlantis.cpp b/src/robomon/RobomonAtlantis.cpp
index 2926a7222e37130a55c041883f156b2db17a9817..4b5d287cb43631a64aeab3dff98bead611cfcd16 100644 (file)
--- a/src/robomon/RobomonAtlantis.cpp
+++ b/src/robomon/RobomonAtlantis.cpp
@@ -82,7 +82,7 @@ void RobomonAtlantis::createLeftLayout()
        debugWindowEnabled = true;
        createPlaygroundGroupBox();
        leftLayout->addWidget(playgroundGroupBox);
-       leftLayout->addWidget(debugGroupBox);
+       //leftLayout->addWidget(debugGroupBox); // FIXME: move this to separate tab
 }
 
 void RobomonAtlantis::createRightLayout()
@@ -100,11 +100,11 @@ void RobomonAtlantis::createRightLayout()
        vlayout->addWidget(positionGroupBox);
        vlayout->addWidget(miscGroupBox);
        vlayout->addWidget(fsmGroupBox);
+       vlayout->addWidget(powerGroupBox);
        layout->addLayout(vlayout, 0, 0);
        layout->addWidget(actuatorsGroupBox, 0, 1);
 
        rightLayout->addLayout(layout);
-       rightLayout->addWidget(powerGroupBox);
 }
 
 void RobomonAtlantis::createPlaygroundGroupBox()
@@ -237,8 +237,7 @@ void RobomonAtlantis::createActuatorsGroupBox()
 void RobomonAtlantis::createPowerGroupBox()
 {
        powerGroupBox = new QGroupBox(tr("Power management"));
-       powerGroupBox->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
-       powerGroupBox->setMaximumWidth(450);
+       powerGroupBox->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
        QGridLayout *layout = new QGridLayout();
 
        voltage33CheckBox = new QCheckBox(tr("&3.3V"));
@@ -250,9 +249,9 @@ void RobomonAtlantis::createPowerGroupBox()
        voltage80CheckBox->setShortcut(tr("8"));
 
        layout->addWidget(voltage33CheckBox, 0, 0);
-       layout->addWidget(voltage50CheckBox, 0, 2);
-       layout->addWidget(voltage80CheckBox, 0, 4); //1, 0);
-       layout->addWidget(MiscGui::createLabel("BAT"), 0, 6); //1, 2);
+       layout->addWidget(voltage50CheckBox, 1, 0);
+       layout->addWidget(voltage80CheckBox, 2, 0);
+       layout->addWidget(MiscGui::createLabel("BAT"), 3, 0);
 
        voltage33LineEdit = new QLineEdit();
        voltage50LineEdit = new QLineEdit();
@@ -265,9 +264,9 @@ void RobomonAtlantis::createPowerGroupBox()
        voltageBATLineEdit->setReadOnly(true);
 
        layout->addWidget(voltage33LineEdit, 0, 1);
-       layout->addWidget(voltage50LineEdit, 0, 3);
-       layout->addWidget(voltage80LineEdit, 0, 5); //1, 1);
-       layout->addWidget(voltageBATLineEdit, 0, 7); //1, 3);
+       layout->addWidget(voltage50LineEdit, 1, 1);
+       layout->addWidget(voltage80LineEdit, 2, 1);
+       layout->addWidget(voltageBATLineEdit, 3, 1);
 
        powerGroupBox->setLayout(layout);
 }
@@ -359,7 +358,6 @@ void RobomonAtlantis::createActions()
                        this, SLOT(stopMotors()));
 
        connect(startPlug, SIGNAL(stateChanged(int)), this, SLOT(sendStart(int)));
-       connect(puckInside, SIGNAL(stateChanged(int)), this, SLOT(sendPuckInside(int)));
        
        /* obstacle simulation */
        simulationEnabled = 0;
@@ -781,8 +779,6 @@ void RobomonAtlantis::createOrte()
                        this, SLOT(actualPositionReceived()));
        connect(this, SIGNAL(estimatedPositionReceivedSignal()), 
                        this, SLOT(estimatedPositionReceived()));
-       connect(this, SIGNAL(diReceivedSignal()), 
-                       this, SLOT(diReceived()));
        connect(this, SIGNAL(powerVoltageReceivedSignal()), 
                        this, SLOT(powerVoltageReceived()));
 }

diff --git a/src/robomon/robomon_orte.cpp b/src/robomon/robomon_orte.cpp
index 348c5453e321982a991a9bd22554559bd9aee5e5..59d003e67716c12a576f1c04c4e98ec2464d30bf 100644 (file)
--- a/src/robomon/robomon_orte.cpp
+++ b/src/robomon/robomon_orte.cpp
@@ -51,19 +51,6 @@ void dummy_publisher_callback(const ORTESendInfo *info,
        Q_UNUSED(vinstance);
        Q_UNUSED(arg);
 }
-void sendServoCallBack(const ORTESendInfo *info,
-                       void *vinstance, void *arg)
-{
-       Q_UNUSED(vinstance);
-       Q_UNUSED(arg);
-       switch (info->status) {
-               case NEED_DATA:         
-                       break;
-               case CQL:  /* criticalQueueLevel */
-                       break;
-       }
-}
-
 
 void sendSharpLongsCallBack(const ORTESendInfo *info, 
                        void *vinstance, void *arg) 
@@ -139,20 +126,6 @@ void receiveActualPositionCallBack(const ORTERecvInfo *info,
 }
 
 
-void receiveActuatorStatusCallBack(const ORTERecvInfo *info,
-                       void *vinstance, void *arg)
-{
-//     Q_UNUSED(vinstance);
-//     switch (info->status) {
-//             case NEW_DATA:
-//                     POST_QEVENT(arg, QEV_SHARP_LONGS);
-//                     break;
-//             case DEADLINE:
-//                     printf("sharp1 deadline occurred\n");
-//                     break;
-//     }
-}
-
 void receiveSharpShortsCallBack(const ORTERecvInfo *info,
                        void *vinstance, void *arg)
 {

diff --git a/src/robomon/robomon_orte.h b/src/robomon/robomon_orte.h
index be12c70df44e36d8eeef35a5c5ab67eeac03b29e..80c6765a09dc207d40610c206c9dbcd4458a7867 100644 (file)
--- a/src/robomon/robomon_orte.h
+++ b/src/robomon/robomon_orte.h
@@ -81,8 +81,6 @@ void dummy_publisher_callback(const ORTESendInfo *info,
                        void *vinstance, void *arg);
 void sendMotorCallBack(const ORTESendInfo *info,
                        void *vinstance, void *arg);
-void sendServoCallBack(const ORTESendInfo *info,
-                       void *vinstance, void *arg);
 void sendSharpLongsCallBack(const ORTESendInfo *info, 
                        void *vinstance, void *arg);
 void sendSharpShortsCallBack(const ORTESendInfo *info,