Index: /trunk/BNC/bncwindow.cpp
===================================================================
--- /trunk/BNC/bncwindow.cpp	(revision 1924)
+++ /trunk/BNC/bncwindow.cpp	(revision 1925)
@@ -56,8 +56,7 @@
 using namespace std;
 
-// Begin new Perlt
-FWidget::FWidget(QWidget *parent)
-    : QWidget(parent)
-{
+// Constructor
+////////////////////////////////////////////////////////////////////////////
+FWidget::FWidget(QWidget *parent) : QWidget(parent) {
   bncSettings settings;
   QListIterator<QString> it(settings.value("mountPoints").toStringList());
@@ -65,51 +64,55 @@
     QStringList hlp = it.next().split(" ");
     QUrl    url(hlp[0]);
-    MPName.append(url.path().toAscii()); bytesMP.append(0);
-    }
-}
-
-FWidget::~FWidget() { };
-
-void FWidget::nextAnimationFrame(){update();}
-
-void FWidget::paintEvent(QPaintEvent *)
-{
-    QRectF rectangle(0, 0, 640, 180);
-    QBrush rBrush(Qt::white,Qt::SolidPattern);
-    QPainter painter(this);
-    painter.fillRect(rectangle,rBrush);
-    painter.drawRect(rectangle);
-    QLine line(50, 140, 630, 140);
-    painter.drawLine(line);
-    line.setLine(50, 140, 50, 10);
-    painter.drawLine(line);
-    QPoint textP(40, 140);
-    painter.drawText(textP, tr("0"));
-    textP.setX(20);
-    textP.setY(25);
-    painter.drawText(textP, tr("3000"));
-    int anker=0;
-    textP.setY(160);
-    painter.drawText(textP, tr(QTime::currentTime().toString().toAscii()));
-    textP.setX(300);
-
-//  QString hlp = (QString("%1").arg(MPName.size()));
-//  if (MPName.isEmpty()) {painter.drawText(textP, tr("Empty"));} else {painter.drawText(textP, tr(hlp.toAscii()));}
-
-    QListIterator<QByteArray> it(MPName);
-    while (it.hasNext()) {
+    _MPName.append(url.path().toAscii()); _bytesMP.append(0);
+  }
+}
+
+// Destructor
+////////////////////////////////////////////////////////////////////////////
+FWidget::~FWidget() { 
+}
+
+// 
+////////////////////////////////////////////////////////////////////////////
+void FWidget::nextAnimationFrame() {
+  update();
+}
+
+// 
+////////////////////////////////////////////////////////////////////////////
+void FWidget::paintEvent(QPaintEvent *) {
+  QRectF rectangle(0, 0, 640, 180);
+  QBrush rBrush(Qt::white,Qt::SolidPattern);
+  QPainter painter(this);
+  painter.fillRect(rectangle,rBrush);
+  painter.drawRect(rectangle);
+  QLine line(50, 140, 630, 140);
+  painter.drawLine(line);
+  line.setLine(50, 140, 50, 10);
+  painter.drawLine(line);
+  QPoint textP(40, 140);
+  painter.drawText(textP, tr("0"));
+  textP.setX(20);
+  textP.setY(25);
+  painter.drawText(textP, tr("3000"));
+  int anker=0;
+  textP.setY(160);
+  painter.drawText(textP, tr(QTime::currentTime().toString().toAscii()));
+  textP.setX(300);
+
+  QListIterator<QByteArray> it(_MPName);
+  while (it.hasNext()) {
     QByteArray hlp=it.next();
-    double bytesnew=bytesMP[MPName.lastIndexOf(hlp)];
+    double bytesnew=_bytesMP[_MPName.lastIndexOf(hlp)];
     double vv = bytesnew/30;
-      QRectF vrect((100+anker*40), (140-vv), (30), (vv));
-      QBrush xBrush(Qt::green,Qt::SolidPattern);
-      textP.setX(100+anker*40);
-      painter.fillRect(vrect,xBrush);
-      painter.drawRect(vrect);
-      painter.drawText(textP, hlp);
-      anker++;
-    }
-}
-// End new Perlt
+    QRectF vrect((100+anker*40), (140-vv), (30), (vv));
+    QBrush xBrush(Qt::green,Qt::SolidPattern);
+    textP.setX(100+anker*40);
+    painter.fillRect(vrect,xBrush);
+    painter.drawRect(vrect);
+    painter.drawText(textP, hlp);
+    anker++;
+  }
+}
 
 // Constructor
@@ -119,8 +122,5 @@
   _caster = 0;
 
-// Begin new Perlt
-  // Figure
   _Figure1 = new FWidget(this);
-// End new Perlt
 
   int ww = QFontMetrics(this->font()).width('w');
@@ -432,5 +432,5 @@
   setCentralWidget(_canvas);
 
-  aogroup = new QTabWidget();
+  _aogroup = new QTabWidget();
   QWidget* pgroup = new QWidget();
   QWidget* ggroup = new QWidget();
@@ -442,21 +442,19 @@
   QWidget* rgroup = new QWidget();
   QWidget* sergroup = new QWidget();
-  aogroup->addTab(pgroup,tr("Proxy"));
-  aogroup->addTab(ggroup,tr("General"));
-  aogroup->addTab(ogroup,tr("RINEX Observations"));
-  aogroup->addTab(egroup,tr("RINEX Ephemeris"));
-  aogroup->addTab(cgroup,tr("Broadcast Corrections"));
-  aogroup->addTab(sgroup,tr("Feed Engine"));
-  aogroup->addTab(sergroup,tr("Serial Output"));
-  aogroup->addTab(agroup,tr("Outages"));
-  aogroup->addTab(rgroup,tr("Miscellaneous"));
-
-// Begin new Perlt
-
-  loggroup = new QTabWidget();
+  _aogroup->addTab(pgroup,tr("Proxy"));
+  _aogroup->addTab(ggroup,tr("General"));
+  _aogroup->addTab(ogroup,tr("RINEX Observations"));
+  _aogroup->addTab(egroup,tr("RINEX Ephemeris"));
+  _aogroup->addTab(cgroup,tr("Broadcast Corrections"));
+  _aogroup->addTab(sgroup,tr("Feed Engine"));
+  _aogroup->addTab(sergroup,tr("Serial Output"));
+  _aogroup->addTab(agroup,tr("Outages"));
+  _aogroup->addTab(rgroup,tr("Miscellaneous"));
+
+  _loggroup = new QTabWidget();
   QWidget* log1group = new QWidget();
   QWidget* log2group = new QWidget();
-  loggroup->addTab(log1group,tr("Log"));
-  loggroup->addTab(log2group,tr("Status"));
+  _loggroup->addTab(log1group,tr("Log"));
+  _loggroup->addTab(log2group,tr("Status"));
 
   // log Tab
@@ -471,6 +469,4 @@
   log2Layout->addWidget(_Figure1,            0,0);
   log2group->setLayout(log2Layout);
-
-// End new Perlt
 
   // Proxy Tab
@@ -789,17 +785,12 @@
 
   QGridLayout* mLayout = new QGridLayout;
-  aogroup->setCurrentIndex(settings.value("startTab").toInt());
-  mLayout->addWidget(aogroup,             0,0);
+  _aogroup->setCurrentIndex(settings.value("startTab").toInt());
+  mLayout->addWidget(_aogroup,             0,0);
   mLayout->addWidget(_mountPointsTable,   1,0);
 
-// Begin new Perlt
-//  mLayout->addWidget(new QLabel(" Logs:"),2,0);
-//  mLayout->addWidget(_log,                3,0);
   QTimer *timer = new QTimer(this);
   connect(timer, SIGNAL(timeout()), _Figure1, SLOT(nextAnimationFrame()));
-  mLayout->addWidget(loggroup,            2,0);
+  mLayout->addWidget(_loggroup,            2,0);
   timer->start(100);
-
-// End new Perlt
 
   _canvas->setLayout(mLayout);
@@ -1124,5 +1115,5 @@
   settings.setValue("serialStopBits",  _serialStopBitsComboBox->currentText());
   settings.setValue("serialFlowControl",_serialFlowControlComboBox->currentText());
-  settings.setValue("startTab",    aogroup->currentIndex());
+  settings.setValue("startTab",    _aogroup->currentIndex());
   settings.setValue("waitTime",    _waitTimeSpinBox->value());
 
@@ -1424,5 +1415,5 @@
   // Proxy
   //------
-  if (aogroup->currentIndex() == 0) {
+  if (_aogroup->currentIndex() == 0) {
     if (!isEmpty) {
       _proxyPortLineEdit->setStyleSheet("background-color: white");
@@ -1436,5 +1427,5 @@
   // RINEX Observations
   // ------------------
-  if (aogroup->currentIndex() == 2) {
+  if (_aogroup->currentIndex() == 2) {
     if (!isEmpty) {
       _rnxSamplSpinBox->setStyleSheet("background-color: white");
@@ -1466,5 +1457,5 @@
   // RINEX Ephemeris
   // ---------------
-  if (aogroup->currentIndex() == 3) {
+  if (_aogroup->currentIndex() == 3) {
     if (!_ephPathLineEdit->text().isEmpty() && !_outEphPortLineEdit->text().isEmpty()) { 
       _ephIntrComboBox->setStyleSheet("background-color: white");
@@ -1499,5 +1490,5 @@
   // Broadcast Corrections
   // ---------------------
-  if (aogroup->currentIndex() == 4) {
+  if (_aogroup->currentIndex() == 4) {
     if (!isEmpty) {
       if (!_corrPathLineEdit->text().isEmpty()) {
@@ -1525,5 +1516,5 @@
   // Feed Engine
   // -----------
-  if (aogroup->currentIndex() == 5) {
+  if (_aogroup->currentIndex() == 5) {
     if ( !_outPortLineEdit->text().isEmpty() || !_outFileLineEdit->text().isEmpty()) {
       _waitTimeSpinBox->setStyleSheet("background-color: white");
@@ -1541,5 +1532,5 @@
   // Serial Output
   // -------------
-  if (aogroup->currentIndex() == 6) {
+  if (_aogroup->currentIndex() == 6) {
     if (!isEmpty) {
       _serialPortNameLineEdit->setStyleSheet("background-color: white");
@@ -1592,5 +1583,5 @@
   // Outages
   // -------
-  if (aogroup->currentIndex() == 7) {
+  if (_aogroup->currentIndex() == 7) {
     if (!isEmpty) {
       _adviseScriptLineEdit->setStyleSheet("background-color: white");
@@ -1612,5 +1603,5 @@
   // Miscellaneous
   // -------------
-  if (aogroup->currentIndex() == 8) {
+  if (_aogroup->currentIndex() == 8) {
     if (!isEmpty) {
       _perfIntrComboBox->setStyleSheet("background-color: white");
Index: /trunk/BNC/bncwindow.h
===================================================================
--- /trunk/BNC/bncwindow.h	(revision 1924)
+++ /trunk/BNC/bncwindow.h	(revision 1925)
@@ -32,28 +32,20 @@
 #include "bnccaster.h"
 
-// Begin new Perlt
-class FWidget : public QWidget
-{
-    Q_OBJECT
+class FWidget : public QWidget {
+  Q_OBJECT
+ public:
+  FWidget(QWidget *parent);
+  ~FWidget();
+ public slots:
+  void nextAnimationFrame();
+ protected:
+  void paintEvent(QPaintEvent *event);
+ private:
+  QList<QByteArray> _MPName;
+  QList<double>     _bytesMP;
+};
 
-public:
-    FWidget(QWidget *parent);
-    ~FWidget();
-
-public slots:
-    void nextAnimationFrame();
-
-protected:
-    void paintEvent(QPaintEvent *event);
-
-private:
-    QList<QByteArray> MPName;
-    QList<double> bytesMP;
-};
-// End new Perlt
-
-  class bncAboutDlg : public QDialog {
+class bncAboutDlg : public QDialog {
   Q_OBJECT
-
   public:
     bncAboutDlg(QWidget* parent);
@@ -172,10 +164,8 @@
 
     QWidget*    _canvas;
-    QTabWidget* aogroup;
+    QTabWidget* _aogroup;
 
-// neu Perlt
-    QTabWidget* loggroup;
+    QTabWidget* _loggroup;
     FWidget*    _Figure1;
-// Ende neu Perlt
 
     bncCaster* _caster;