Dev

Sources/Widgets/ConnectorSelectWidget.cpp

@@ -183,6 +183,8 @@ void CConnectorSelectWidget::InputConnectorZoneClicked(CConnectorClickZoneWidget
         ConClickZone->SelectConnector();
         mCurSelConnector = ConClickZone->GetConnectorType();
     }
+
+    emit ConnectorSelected(mCurSelConnector);
 }
 
 CConnectorSelectWidget::~CConnectorSelectWidget()

Sources/Widgets/ConnectorSelectWidget.h

@@ -30,6 +30,7 @@ public:
 private:
     CConnectorDefs::eConnectorType mCurSelConnector;
 signals:
+    void ConnectorSelected(CConnectorDefs::eConnectorType ConType);
     
 public slots:
 

Sources/Widgets/ConnectorTestVisualizationWidget.cpp

@@ -8,7 +8,7 @@ CConnectorTestVisualizationWidget::CConnectorTestVisualizationWidget(QWidget *pa
 
 int CConnectorTestVisualizationWidget::SetConnectorPinCount(int Count)
 {
-    if(Count <= 0 || Count > MAX_CONNECTOR_PIN_COUNT)
+    if(Count <= 0)
     {
         return RET_ERROR;
     }
@@ -16,36 +16,39 @@ int CConnectorTestVisualizationWidget::SetConnectorPinCount(int Count)
     ClearConnectorsLists();
 
     CONOFFStatusWidget *NewWidget;
+
+    int row = 0, col = 0;
     for(int i = 0; i < Count; i++)
     {
-       QString pin = QString("pin %1").arg(i);
+       QString pin = QString("%1").arg(i+1);
        NewWidget = new CONOFFStatusWidget(CONOFFStatusWidget::ON_OFF_LED_COLOR_GREEN,this,pin);
        NewWidget->resize(ON_OFF_WIDGET_SIZE,ON_OFF_WIDGET_SIZE);
-       NewWidget->move((i+1)*(ON_OFF_WIDGET_SIZE+5),((i/10)*(ON_OFF_WIDGET_SIZE+5)));
-       mOutputCtorPinsWidgetsList.append(NewWidget);
-//       NewWidget = new CONOFFStatusWidget(CONOFFStatusWidget::ON_OFF_LED_COLOR_GREEN,this,pin);
-//       NewWidget->resize(ON_OFF_WIDGET_SIZE,ON_OFF_WIDGET_SIZE);
-//       NewWidget->move((i+1)*(ON_OFF_WIDGET_SIZE+5),((i%10)*(ON_OFF_WIDGET_SIZE+5)));
-//       mInputCtorPinsWidgetsList.append(NewWidget);
+
+//       NewWidget->move((col)*(ON_OFF_WIDGET_SIZE + col_offset),((row) * (ON_OFF_WIDGET_SIZE + row_offset)));
+       NewWidget->move(col,row);
+       NewWidget->show();
+       mPinsWidgetsList.append(NewWidget);
+
+       col += ON_OFF_WIDGET_SIZE+5;
+       if((col + ON_OFF_WIDGET_SIZE+5) >= geometry().width())
+       {
+          col = 0;
+          row += ON_OFF_WIDGET_SIZE + 5;
+       }
+
     }
 
-    repaint();
+   // repaint();
     return RET_OK;
 }
 
 int CConnectorTestVisualizationWidget::ClearConnectorsLists()
 {
-    for(int i = 0; i < mOutputCtorPinsWidgetsList.size(); i++)
+    for(int i = 0; i < mPinsWidgetsList.size(); i++)
     {
-        delete mOutputCtorPinsWidgetsList.at(i);
+        delete mPinsWidgetsList.at(i);
     }
-    mOutputCtorPinsWidgetsList.clear();
-
-    for(int i = 0; i < mInputCtorPinsWidgetsList.size(); i++)
-    {
-        delete mInputCtorPinsWidgetsList.at(i);
-    }
-    mInputCtorPinsWidgetsList.clear();
+    mPinsWidgetsList.clear();
 
     return RET_OK;
 }

Sources/Widgets/ConnectorTestVisualizationWidget.h

@@ -7,14 +7,14 @@
 #include "CableTestBenchDefs.h"
 
 #define ON_OFF_WIDGET_SIZE 30
+#define LED_PER_LINE_COUNT 10
 class CConnectorTestVisualizationWidget : public QWidget
 {
     Q_OBJECT
 public:
     explicit CConnectorTestVisualizationWidget(QWidget *parent = 0);
 
-    QList<CONOFFStatusWidget*> mInputCtorPinsWidgetsList;
-    QList<CONOFFStatusWidget*> mOutputCtorPinsWidgetsList;
+    QList<CONOFFStatusWidget*> mPinsWidgetsList;
 
     int SetConnectorPinCount(int count);
 

Sources/Widgets/ONOFFStatusWidget.cpp

@@ -23,13 +23,13 @@ CONOFFStatusWidget::CONOFFStatusWidget(eONOFFLedColor Color, QWidget *Parent, QS
     setParent(Parent);
     if(Color == ON_OFF_LED_COLOR_GREEN)
     {
-        mLedOffPixmap = QPixmap("./Images/green-led-off-md.png").scaled(10,10);
-        mLedOnPixmap = QPixmap("./Images/green-led-on-md.png").scaled(10,10);
+        mLedOffPixmap = QPixmap("./Images/green-led-off-md.png");//.scaled(10,10);
+        mLedOnPixmap = QPixmap("./Images/green-led-on-md.png");//.scaled(10,10);
     }
     else
     {
-        mLedOffPixmap = QPixmap("./Images/red-led-off-md.png").scaled(10,10);
-        mLedOnPixmap = QPixmap("./Images/red-led-on-md.png").scaled(10,10);
+        mLedOffPixmap = QPixmap("./Images/red-led-off-md.png");//.scaled(10,10);
+        mLedOnPixmap = QPixmap("./Images/red-led-on-md.png");//.scaled(10,10);
     }
 
     mLabel = new QLabel(Label,this);
@@ -79,15 +79,19 @@ void CONOFFStatusWidget::paintEvent(QPaintEvent *PaintEvent)
 void CONOFFStatusWidget::resizeEvent(QResizeEvent *event)
 {
     int width = geometry().width();
-    int height;
-    if(mLabel->text().isEmpty())
-    {
-        height = geometry().height();
-    }
-    else
+    int height = geometry().height();
+    bool square = height == width;
+
+    if(mLabel->text().isEmpty() == false)
     {
         height = geometry().height() - mLabel->fontMetrics().height();
     }
+
+    if(square)
+    {
+        width = height;
+    }
+
     mLedOffPixmap = QPixmap("./Images/green-led-off-md.png").scaled(width,height);
     mLedOnPixmap = QPixmap("./Images/green-led-on-md.png").scaled(width,height);