jfmartel/CableTestBench
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Développement et correction de bugs.

Browse Source 
V1.2
This commit is contained in:
JF
2019-12-06 12:25:23 -05:00
parent 90f0f33252
commit d27459602d
20 changed files with 460 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/CableTestBench.cpp
+7 -1
View File
@@ -137,10 +137,16 @@ int CCableTestBench::StartPauseAutomaticTestRequest()
{
if(mCableTestEngine.GetTestEngineCurrentMode() == CCableTestEngine::CABLE_TEST_STBY_MODE)
{
int TestPinCount = mActualCable.GetOutputConnector()->GetPinCount();
if(mActualCable.GetInputConnector()->GetPinCount() < TestPinCount)
{
TestPinCount = mActualCable.GetInputConnector()->GetPinCount();
}
mCableTestPageHandle->FillReportCableParametersData(mCableTestReport.GetReportCableParameters());
mCableTestReport.GetReportCableParameters()->SetCableType(CConnectorDefs::GetConnectorDescription(mActualCable.GetInputConnector()->GetConnectorType()),
CConnectorDefs::GetConnectorDescription(mActualCable.GetOutputConnector()->GetConnectorType()));
mCableTestReport.GetAutomatedTestReport()->SetPinCount(mActualCable.GetOutputConnector()->GetPinCount());
mCableTestReport.GetAutomatedTestReport()->SetPinCount(TestPinCount);
mCableTestEngine.StartAutomatedTest();
return RET_OK;
Sources/CableTestEngine.cpp
+6 -1
View File
@@ -232,7 +232,12 @@ void CCableTestEngine::CableTestEngineStateMachine(int Event)
}
mCurPinUnderTest++;
if(mCurPinUnderTest > (mTestOutputConnectorHandle->GetPinCount()))
int TestPinCount = mTestOutputConnectorHandle->GetPinCount();
if(mTestInputConnectorHandle->GetPinCount() < TestPinCount)
{
TestPinCount = mTestInputConnectorHandle->GetPinCount();
}
if(mCurPinUnderTest > TestPinCount)
{
//Test finished.
Sources/CableTestPage.cpp
+4 -4
View File
@@ -67,7 +67,7 @@ CCableTestPage::CCableTestPage(QWidget *parent) :
ui->mCableIdentStepLabel->setText("1. Identification du câble: À REMPLIR");
ui->mConnectorSelStepLabel->setPalette(pal);
ui->mConnectorSelStepLabel->setText("3. Sélection du connecteur d'entrée: À SÉLECTIONNER");
ui->mConnectorSelStepLabel->setText("3. Sélection du connecteur d'entrée: À FAIRE");
@@ -90,7 +90,7 @@ int CCableTestPage::SetVisualInspectionDone(bool Done)
if(Done)
{
ui->mInspectionDoneIcon->setPixmap(mInspectionDonePixmap);
ui->mExecInspVisuelleBtn->setText(QString("Réviser Inspection").toUtf8());
ui->mExecInspVisuelleBtn->setText(QString("Réviser\n Inspection").toUtf8());
QPalette pal;
pal.setColor(QPalette::WindowText,Qt::darkGreen);
@@ -100,7 +100,7 @@ int CCableTestPage::SetVisualInspectionDone(bool Done)
else
{
ui->mInspectionDoneIcon->setPixmap(mInspectionNotDonePixmap);
ui->mExecInspVisuelleBtn->setText("Effectuer Inspection");
ui->mExecInspVisuelleBtn->setText("Effectuer\n Inspection");
QPalette pal;
pal.setColor(QPalette::WindowText,Qt::red);
@@ -124,7 +124,7 @@ int CCableTestPage::SetConnectorSelStep(bool done)
{
pal.setColor(QPalette::WindowText,Qt::red);
ui->mConnectorSelStepLabel->setPalette(pal);
ui->mConnectorSelStepLabel->setText("3. Sélection du connecteur d'entrée: À SÉLECTIONNER");
ui->mConnectorSelStepLabel->setText("3. Sélection du connecteur d'entrée: À FAIRE");
}
return RET_OK;
Sources/CableTestPage.ui
+155 -75
View File
@@ -22,14 +22,19 @@
<height>537</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>11</pointsize>
</font>
</property>
</widget>
<widget class="QFrame" name="mCableConfigFrame">
<property name="geometry">
<rect>
<x>50</x>
<y>50</y>
<y>40</y>
<width>471</width>
<height>121</height>
<height>161</height>
</rect>
</property>
<property name="frameShape">
@@ -46,9 +51,9 @@
<property name="geometry">
<rect>
<x>60</x>
<y>60</y>
<y>50</y>
<width>451</width>
<height>100</height>
<height>144</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout">
@@ -56,7 +61,7 @@
<widget class="QLabel" name="mNomTesteurLabel">
<property name="font">
<font>
<pointsize>12</pointsize>
<pointsize>14</pointsize>
</font>
</property>
<property name="text">
@@ -66,6 +71,11 @@
</item>
<item row="2" column="1" colspan="2">
<widget class="QComboBox" name="mTypeCableCombo">
<property name="font">
<font>
<pointsize>14</pointsize>
</font>
</property>
<item>
<property name="text">
<string>Permanent</string>
@@ -79,16 +89,28 @@
</widget>
</item>
<item row="1" column="1" colspan="2">
<widget class="QLineEdit" name="mIdentCableEditBox"/>
<widget class="QLineEdit" name="mIdentCableEditBox">
<property name="font">
<font>
<pointsize>14</pointsize>
</font>
</property>
</widget>
</item>
<item row="0" column="1" colspan="2">
<widget class="QComboBox" name="mStationNameCombo"/>
<widget class="QComboBox" name="mStationNameCombo">
<property name="font">
<font>
<pointsize>14</pointsize>
</font>
</property>
</widget>
</item>
<item row="0" column="0" alignment="Qt::AlignRight">
<widget class="QLabel" name="StationNameLabel">
<property name="font">
<font>
<pointsize>12</pointsize>
<pointsize>14</pointsize>
</font>
</property>
<property name="text">
@@ -100,7 +122,7 @@
<widget class="QLabel" name="mTypeCableLabel">
<property name="font">
<font>
<pointsize>12</pointsize>
<pointsize>14</pointsize>
</font>
</property>
<property name="text">
@@ -112,7 +134,7 @@
<widget class="QLabel" name="mIdentCableLabel">
<property name="font">
<font>
<pointsize>12</pointsize>
<pointsize>14</pointsize>
</font>
</property>
<property name="text">
@@ -122,6 +144,11 @@
</item>
<item row="3" column="1" colspan="2">
<widget class="QLineEdit" name="mNomTesteurEditBox">
<property name="font">
<font>
<pointsize>14</pointsize>
</font>
</property>
<property name="text">
<string/>
</property>
@@ -133,14 +160,14 @@
<property name="geometry">
<rect>
<x>60</x>
<y>20</y>
<y>10</y>
<width>271</width>
<height>20</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>12</pointsize>
<pointsize>16</pointsize>
</font>
</property>
<property name="text">
@@ -187,13 +214,19 @@
<property name="geometry">
<rect>
<x>10</x>
<y>50</y>
<width>121</width>
<height>23</height>
<y>30</y>
<width>101</width>
<height>51</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>12</pointsize>
</font>
</property>
<property name="text">
<string>Effectuer Inspection</string>
<string>Effectuer
Inspection</string>
</property>
</widget>
<widget class="QLabel" name="mInspectionDoneIcon">
@@ -213,7 +246,7 @@
<widget class="CConnectorTestVisualizationWidget" name="mInputTestVisualisationWidget" native="true">
<property name="geometry">
<rect>
<x>10</x>
<x>500</x>
<y>410</y>
<width>461</width>
<height>351</height>
@@ -222,6 +255,8 @@
<property name="autoFillBackground">
<bool>false</bool>
</property>
<zorder>mOutputContactsTextLabel</zorder>
<zorder>mOutputTestVisualisationWidget</zorder>
</widget>
<widget class="Line" name="line">
<property name="geometry">
@@ -236,19 +271,6 @@
<enum>Qt::Horizontal</enum>
</property>
</widget>
<widget class="CConnectorTestVisualizationWidget" name="mOutputTestVisualisationWidget" native="true">
<property name="geometry">
<rect>
<x>500</x>
<y>410</y>
<width>461</width>
<height>351</height>
</rect>
</property>
<property name="autoFillBackground">
<bool>false</bool>
</property>
</widget>
<widget class="Line" name="line_2">
<property name="geometry">
<rect>
@@ -265,9 +287,9 @@
<widget class="QLabel" name="mInputContactsTextLabel">
<property name="geometry">
<rect>
<x>130</x>
<x>620</x>
<y>370</y>
<width>161</width>
<width>241</width>
<height>41</height>
</rect>
</property>
@@ -280,33 +302,20 @@
<string>Contacts entrée</string>
</property>
</widget>
<widget class="QLabel" name="mOutputContactsTextLabel">
<widget class="QPushButton" name="mNewCableBtn">
<property name="geometry">
<rect>
<x>670</x>
<y>370</y>
<width>161</width>
<height>41</height>
<x>400</x>
<y>10</y>
<width>121</width>
<height>23</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>16</pointsize>
<pointsize>12</pointsize>
</font>
</property>
<property name="text">
<string>Contacts sortie</string>
</property>
</widget>
<widget class="QPushButton" name="mNewCableBtn">
<property name="geometry">
<rect>
<x>430</x>
<y>20</y>
<width>91</width>
<height>23</height>
</rect>
</property>
<property name="text">
<string>Nouveau Câble</string>
</property>
@@ -316,8 +325,8 @@
<rect>
<x>50</x>
<y>220</y>
<width>621</width>
<height>131</height>
<width>661</width>
<height>141</height>
</rect>
</property>
<property name="frameShape">
@@ -329,9 +338,9 @@
<widget class="QGroupBox" name="groupBox">
<property name="geometry">
<rect>
<x>310</x>
<x>360</x>
<y>10</y>
<width>121</width>
<width>141</width>
<height>91</height>
</rect>
</property>
@@ -343,10 +352,15 @@
<rect>
<x>20</x>
<y>20</y>
<width>91</width>
<width>111</width>
<height>23</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>11</pointsize>
</font>
</property>
<property name="text">
<string>Démarrer test</string>
</property>
@@ -356,10 +370,15 @@
<rect>
<x>20</x>
<y>50</y>
<width>91</width>
<width>111</width>
<height>23</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>11</pointsize>
</font>
</property>
<property name="text">
<string>Réinitialiser test</string>
</property>
@@ -368,7 +387,7 @@
<widget class="QGroupBox" name="groupBox_2">
<property name="geometry">
<rect>
<x>480</x>
<x>530</x>
<y>10</y>
<width>111</width>
<height>80</height>
@@ -386,6 +405,11 @@
<height>23</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>12</pointsize>
</font>
</property>
<property name="text">
<string>Exécuter</string>
</property>
@@ -394,12 +418,17 @@
<widget class="QPushButton" name="mSaveReportBtn">
<property name="geometry">
<rect>
<x>480</x>
<y>100</y>
<width>121</width>
<height>23</height>
<x>470</x>
<y>102</y>
<width>161</width>
<height>31</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>12</pointsize>
</font>
</property>
<property name="text">
<string>Sauvegarder Rapport</string>
</property>
@@ -408,11 +437,16 @@
<property name="geometry">
<rect>
<x>20</x>
<y>20</y>
<width>201</width>
<y>30</y>
<width>341</width>
<height>16</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>14</pointsize>
</font>
</property>
<property name="text">
<string>1. Identification du câble: À REMPLIR</string>
</property>
@@ -421,11 +455,16 @@
<property name="geometry">
<rect>
<x>20</x>
<y>50</y>
<width>201</width>
<y>70</y>
<width>331</width>
<height>16</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>14</pointsize>
</font>
</property>
<property name="text">
<string>2. Inspection visuelle: À EXÉCUTER</string>
</property>
@@ -434,13 +473,18 @@
<property name="geometry">
<rect>
<x>20</x>
<y>80</y>
<width>271</width>
<y>110</y>
<width>451</width>
<height>16</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>14</pointsize>
</font>
</property>
<property name="text">
<string>3. Sélection du connecteur d'entrée: À SÉLECTIONNER</string>
<string>3. Sélection du connecteur d'entrée: À FAIRE</string>
</property>
</widget>
</widget>
@@ -493,8 +537,8 @@
<widget class="QLabel" name="mAutoTestResultLabel">
<property name="geometry">
<rect>
<x>30</x>
<y>40</y>
<x>20</x>
<y>30</y>
<width>181</width>
<height>41</height>
</rect>
@@ -514,17 +558,53 @@
<widget class="QPushButton" name="mOpenReportBtn">
<property name="geometry">
<rect>
<x>70</x>
<y>100</y>
<width>101</width>
<height>23</height>
<x>40</x>
<y>90</y>
<width>141</width>
<height>31</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>12</pointsize>
</font>
</property>
<property name="text">
<string>Ouvrir Rapport</string>
</property>
</widget>
</widget>
<widget class="CConnectorTestVisualizationWidget" name="mOutputTestVisualisationWidget" native="true">
<property name="geometry">
<rect>
<x>20</x>
<y>410</y>
<width>461</width>
<height>351</height>
</rect>
</property>
<property name="autoFillBackground">
<bool>false</bool>
</property>
</widget>
<widget class="QLabel" name="mOutputContactsTextLabel">
<property name="geometry">
<rect>
<x>190</x>
<y>370</y>
<width>221</width>
<height>41</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>16</pointsize>
</font>
</property>
<property name="text">
<string>Contacts sortie</string>
</property>
</widget>
</widget>
<customwidgets>
<customwidget>
Sources/IOModulesInterface.cpp
+15
View File
@@ -11,6 +11,7 @@ CIOModulesInterface::CIOModulesInterface()
// mIOModulesQueryTimer->setInterval(IO_MODULES_REFRESH_INTERVAL);
// mIOModulesQueryTimer->setSingleShot(true);
hndl=0;
@@ -69,11 +70,15 @@ int CIOModulesInterface::OpenIOModules(QString IPAddress)
ResetOutputs();
return RET_OK;
}
int CIOModulesInterface::CloseIOModules()
{
if(hndl == 0)
return RET_ERROR;
// mIOModulesQueryTimer->stop();
int ret = SM_Close(&hndl);
@@ -93,6 +98,7 @@ int CIOModulesInterface::CloseIOModules()
void CIOModulesInterface::IOModulesQueryTimerExpired()
{
DoAllIOTransactions();
// mIOModulesQueryTimer->start();
qDebug("timerout");
@@ -100,6 +106,9 @@ void CIOModulesInterface::IOModulesQueryTimerExpired()
int CIOModulesInterface::ReadInputModules()
{
if(hndl == 0)
return RET_ERROR;
unsigned char TempBuf[4];
SM_SelectDevice(hndl,INPUTS_MODULE_1_SLAVE_ID);
@@ -123,6 +132,9 @@ int CIOModulesInterface::ReadInputModules()
int CIOModulesInterface::WriteOutputModules()
{
if(hndl == 0)
return RET_ERROR;
SM_SelectDevice(hndl,OUTPUTS_MODULE_1_SLAVE_ID);
SM_WriteDigitalOutputs(hndl,0,32,&mOutputsBuffer[0]);
@@ -140,6 +152,9 @@ int CIOModulesInterface::WriteOutputModules()
int CIOModulesInterface::ReadOutputStates()
{
if(hndl == 0)
return RET_ERROR;
unsigned char TempBuf[4];
SM_SelectDevice(hndl,OUTPUTS_MODULE_1_SLAVE_ID);
Sources/MainWindow.cpp
-3
View File
@@ -27,9 +27,6 @@ MainWindow::MainWindow(QWidget *parent,CCableTestBench* ProgramHandle)
//setCentralWidget(mVisualInspPage);
}
MainWindow::~MainWindow()
Sources/OptionsPage.ui
+59 -19
View File
@@ -18,7 +18,7 @@
<rect>
<x>170</x>
<y>40</y>
<width>181</width>
<width>321</width>
<height>31</height>
</rect>
</property>
@@ -53,15 +53,15 @@
<widget class="QLabel" name="label_3">
<property name="geometry">
<rect>
<x>140</x>
<x>100</x>
<y>110</y>
<width>171</width>
<width>211</width>
<height>20</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>10</pointsize>
<pointsize>12</pointsize>
</font>
</property>
<property name="text">
@@ -71,12 +71,17 @@
<widget class="QSpinBox" name="mIPAdd1SpinBox">
<property name="geometry">
<rect>
<x>140</x>
<x>131</x>
<y>361</y>
<width>42</width>
<width>51</width>
<height>22</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>11</pointsize>
</font>
</property>
<property name="maximum">
<number>255</number>
</property>
@@ -89,10 +94,15 @@
<rect>
<x>190</x>
<y>361</y>
<width>42</width>
<width>51</width>
<height>22</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>11</pointsize>
</font>
</property>
<property name="maximum">
<number>255</number>
</property>
@@ -103,12 +113,17 @@
<widget class="QSpinBox" name="mIPAdd3SpinBox">
<property name="geometry">
<rect>
<x>240</x>
<y>361</y>
<width>42</width>
<x>250</x>
<y>360</y>
<width>51</width>
<height>22</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>11</pointsize>
</font>
</property>
<property name="maximum">
<number>255</number>
</property>
@@ -116,12 +131,17 @@
<widget class="QSpinBox" name="mIPAdd4SpinBox">
<property name="geometry">
<rect>
<x>290</x>
<y>361</y>
<width>42</width>
<x>300</x>
<y>360</y>
<width>51</width>
<height>22</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>11</pointsize>
</font>
</property>
<property name="maximum">
<number>255</number>
</property>
@@ -140,7 +160,7 @@
</property>
<property name="font">
<font>
<pointsize>10</pointsize>
<pointsize>12</pointsize>
</font>
</property>
<property name="text">
@@ -153,10 +173,15 @@
<rect>
<x>170</x>
<y>470</y>
<width>131</width>
<width>181</width>
<height>23</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>11</pointsize>
</font>
</property>
<property name="text">
<string>Appliquer &amp;&amp; Sauvegarder</string>
</property>
@@ -166,10 +191,15 @@
<rect>
<x>140</x>
<y>160</y>
<width>221</width>
<height>17</height>
<width>321</width>
<height>21</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>12</pointsize>
</font>
</property>
<property name="text">
<string>Ignorer l'inspection visuelle</string>
</property>
@@ -179,10 +209,15 @@
<rect>
<x>140</x>
<y>200</y>
<width>221</width>
<width>321</width>
<height>17</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>12</pointsize>
</font>
</property>
<property name="text">
<string>Inclure LOG dans le rapport</string>
</property>
@@ -192,10 +227,15 @@
<rect>
<x>140</x>
<y>240</y>
<width>221</width>
<width>281</width>
<height>17</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>12</pointsize>
</font>
</property>
<property name="text">
<string>Exécuter 2è passe de tests</string>
</property>
Sources/TestBenchVersion.h
+8 -1
View File
@@ -2,11 +2,18 @@
#define TESTBENCHVERSION_H
#define TEST_BENCH_VERSION "V1.0"
#define TEST_BENCH_VERSION "V1.2"
//LOG DES CHANGEMENTS
//Version 1.1
//- Correction d'un bug qui testait 108 points pour le
// connecteur 90 points, il manquait la partie du rapport...
//Version 1.1
//- Ajustements suite aux premiers essais à l'atelier
//- Correction d'un bug qui testait 108 points pour le
// connecteur 90 points.
//Version 0.10_ING_DEV
//-Version de développement, pré-production
Sources/VisualInspectionPage.ui
+36 -23
View File
@@ -17,9 +17,9 @@
<property name="geometry">
<rect>
<x>230</x>
<y>30</y>
<width>611</width>
<height>81</height>
<y>10</y>
<width>771</width>
<height>101</height>
</rect>
</property>
<property name="font">
@@ -38,13 +38,13 @@ ont été complétés (chaque câble doit être vérifié)</string>
<rect>
<x>380</x>
<y>230</y>
<width>261</width>
<height>16</height>
<width>411</width>
<height>21</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>12</pointsize>
<pointsize>14</pointsize>
</font>
</property>
<property name="text">
@@ -56,13 +56,13 @@ ont été complétés (chaque câble doit être vérifié)</string>
<rect>
<x>380</x>
<y>280</y>
<width>311</width>
<height>16</height>
<width>441</width>
<height>31</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>12</pointsize>
<pointsize>14</pointsize>
</font>
</property>
<property name="text">
@@ -74,13 +74,13 @@ ont été complétés (chaque câble doit être vérifié)</string>
<rect>
<x>380</x>
<y>330</y>
<width>311</width>
<height>16</height>
<width>511</width>
<height>21</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>12</pointsize>
<pointsize>14</pointsize>
</font>
</property>
<property name="text">
@@ -92,13 +92,13 @@ ont été complétés (chaque câble doit être vérifié)</string>
<rect>
<x>380</x>
<y>380</y>
<width>471</width>
<height>16</height>
<width>611</width>
<height>21</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>12</pointsize>
<pointsize>14</pointsize>
</font>
</property>
<property name="text">
@@ -110,13 +110,13 @@ ont été complétés (chaque câble doit être vérifié)</string>
<rect>
<x>380</x>
<y>430</y>
<width>471</width>
<height>16</height>
<width>591</width>
<height>21</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>12</pointsize>
<pointsize>14</pointsize>
</font>
</property>
<property name="text">
@@ -128,7 +128,7 @@ ont été complétés (chaque câble doit être vérifié)</string>
<rect>
<x>120</x>
<y>140</y>
<width>811</width>
<width>941</width>
<height>20</height>
</rect>
</property>
@@ -146,8 +146,8 @@ ont été complétés (chaque câble doit être vérifié)</string>
<rect>
<x>330</x>
<y>200</y>
<width>46</width>
<height>13</height>
<width>81</width>
<height>16</height>
</rect>
</property>
<property name="text">
@@ -159,7 +159,7 @@ ont été complétés (chaque câble doit être vérifié)</string>
<rect>
<x>230</x>
<y>200</y>
<width>71</width>
<width>91</width>
<height>16</height>
</rect>
</property>
@@ -336,6 +336,11 @@ ont été complétés (chaque câble doit être vérifié)</string>
<height>23</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>12</pointsize>
</font>
</property>
<property name="text">
<string>OK</string>
</property>
@@ -349,6 +354,9 @@ ont été complétés (chaque câble doit être vérifié)</string>
<height>141</height>
</rect>
</property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
</widget>
<widget class="QLabel" name="label_10">
<property name="geometry">
@@ -373,10 +381,15 @@ ont été complétés (chaque câble doit être vérifié)</string>
<rect>
<x>790</x>
<y>260</y>
<width>75</width>
<width>121</width>
<height>23</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>12</pointsize>
</font>
</property>
<property name="text">
<string>Réinitialiser</string>
</property>
Sources/Widgets/ConnectorSelectWidget.cpp
+12 -12
View File
@@ -14,7 +14,7 @@ CConnectorSelectWidget::CConnectorSelectWidget(QWidget *parent) :
//6 pins
InputClickZoneHandle = new CConnectorClickZoneWidget(CConnectorDefs::INPUT_6_PINS_CONNECTOR_TYPE,this);
InputClickZoneHandle->setGeometry(7,149,53,54);
InputClickZoneHandle->setGeometry(316,152,53,54);
InputClickZoneHandle->show();
InputClickZoneHandle->raise();
connect(InputClickZoneHandle,SIGNAL(ConnectorZoneClicked(CConnectorClickZoneWidget*)),this,SLOT(InputConnectorZoneClicked(CConnectorClickZoneWidget*)));
@@ -22,7 +22,7 @@ CConnectorSelectWidget::CConnectorSelectWidget(QWidget *parent) :
//14 pins
InputClickZoneHandle = new CConnectorClickZoneWidget(CConnectorDefs::INPUT_14_PINS_CONNECTOR_TYPE,this);
InputClickZoneHandle->setGeometry(7,23,53,54);
InputClickZoneHandle->setGeometry(316,21,53,54);
InputClickZoneHandle->show();
InputClickZoneHandle->raise();
connect(InputClickZoneHandle,SIGNAL(ConnectorZoneClicked(CConnectorClickZoneWidget*)),this,SLOT(InputConnectorZoneClicked(CConnectorClickZoneWidget*)));
@@ -30,7 +30,7 @@ CConnectorSelectWidget::CConnectorSelectWidget(QWidget *parent) :
//24 pins
InputClickZoneHandle = new CConnectorClickZoneWidget(CConnectorDefs::INPUT_24_PINS_CONNECTOR_TYPE,this);
InputClickZoneHandle->setGeometry(92,23,48,86);
InputClickZoneHandle->setGeometry(236,23,48,86);
InputClickZoneHandle->show();
InputClickZoneHandle->raise();
connect(InputClickZoneHandle,SIGNAL(ConnectorZoneClicked(CConnectorClickZoneWidget*)),this,SLOT(InputConnectorZoneClicked(CConnectorClickZoneWidget*)));
@@ -38,7 +38,7 @@ CConnectorSelectWidget::CConnectorSelectWidget(QWidget *parent) :
//72 pins
InputClickZoneHandle = new CConnectorClickZoneWidget(CConnectorDefs::INPUT_72_PINS_CONNECTOR_TYPE,this);
InputClickZoneHandle->setGeometry(92,149,47,120);
InputClickZoneHandle->setGeometry(234,150,47,120);
InputClickZoneHandle->show();
InputClickZoneHandle->raise();
connect(InputClickZoneHandle,SIGNAL(ConnectorZoneClicked(CConnectorClickZoneWidget*)),this,SLOT(InputConnectorZoneClicked(CConnectorClickZoneWidget*)));
@@ -46,7 +46,7 @@ CConnectorSelectWidget::CConnectorSelectWidget(QWidget *parent) :
//90 pins
InputClickZoneHandle = new CConnectorClickZoneWidget(CConnectorDefs::INPUT_90_PINS_CONNECTOR_TYPE,this);
InputClickZoneHandle->setGeometry(17,286,33,73);
InputClickZoneHandle->setGeometry(320,306,33,73);
InputClickZoneHandle->show();
InputClickZoneHandle->raise();
connect(InputClickZoneHandle,SIGNAL(ConnectorZoneClicked(CConnectorClickZoneWidget*)),this,SLOT(InputConnectorZoneClicked(CConnectorClickZoneWidget*)));
@@ -54,7 +54,7 @@ CConnectorSelectWidget::CConnectorSelectWidget(QWidget *parent) :
//108 pins
InputClickZoneHandle = new CConnectorClickZoneWidget(CConnectorDefs::INPUT_108_PINS_CONNECTOR_TYPE,this);
InputClickZoneHandle->setGeometry(92,308,47,149);
InputClickZoneHandle->setGeometry(235,308,47,149);
InputClickZoneHandle->show();
InputClickZoneHandle->raise();
connect(InputClickZoneHandle,SIGNAL(ConnectorZoneClicked(CConnectorClickZoneWidget*)),this,SLOT(InputConnectorZoneClicked(CConnectorClickZoneWidget*)));
@@ -62,7 +62,7 @@ CConnectorSelectWidget::CConnectorSelectWidget(QWidget *parent) :
//120 pins
InputClickZoneHandle = new CConnectorClickZoneWidget(CConnectorDefs::INPUT_120_PINS_CONNECTOR_TYPE,this);
InputClickZoneHandle->setGeometry(13,382,42,74);
InputClickZoneHandle->setGeometry(316,403,42,74);
InputClickZoneHandle->show();
InputClickZoneHandle->raise();
connect(InputClickZoneHandle,SIGNAL(ConnectorZoneClicked(CConnectorClickZoneWidget*)),this,SLOT(InputConnectorZoneClicked(CConnectorClickZoneWidget*)));
@@ -73,35 +73,35 @@ CConnectorSelectWidget::CConnectorSelectWidget(QWidget *parent) :
//6 pins
OutputSelectZoneHandle = new CConnectorClickZoneWidget(CConnectorDefs::OUTPUT_6_PINS_CONNECTOR_TYPE,this);
OutputSelectZoneHandle->setGeometry(329,149,38,38);
OutputSelectZoneHandle->setGeometry(12,148,38,38);
OutputSelectZoneHandle->show();
OutputSelectZoneHandle->raise();
mOutputSelectZoneList.append(OutputSelectZoneHandle);
//14 pins
OutputSelectZoneHandle = new CConnectorClickZoneWidget(CConnectorDefs::OUTPUT_14_PINS_CONNECTOR_TYPE,this);
OutputSelectZoneHandle->setGeometry(327,23,41,42);
OutputSelectZoneHandle->setGeometry(13,24,41,42);
OutputSelectZoneHandle->show();
OutputSelectZoneHandle->raise();
mOutputSelectZoneList.append(OutputSelectZoneHandle);
//24 pins
OutputSelectZoneHandle = new CConnectorClickZoneWidget(CConnectorDefs::OUTPUT_24_PINS_CONNECTOR_TYPE,this);
OutputSelectZoneHandle->setGeometry(235,23,48,86);
OutputSelectZoneHandle->setGeometry(91,23,48,86);
OutputSelectZoneHandle->show();
OutputSelectZoneHandle->raise();
mOutputSelectZoneList.append(OutputSelectZoneHandle);
//72 pins
OutputSelectZoneHandle = new CConnectorClickZoneWidget(CConnectorDefs::OUTPUT_72_PINS_CONNECTOR_TYPE,this);
OutputSelectZoneHandle->setGeometry(235,149,46,121);
OutputSelectZoneHandle->setGeometry(92,150,46,121);
OutputSelectZoneHandle->show();
OutputSelectZoneHandle->raise();
mOutputSelectZoneList.append(OutputSelectZoneHandle);
//108 pins
OutputSelectZoneHandle = new CConnectorClickZoneWidget(CConnectorDefs::OUTPUT_108_PINS_CONNECTOR_TYPE,this);
OutputSelectZoneHandle->setGeometry(235,308,47,148);
OutputSelectZoneHandle->setGeometry(92,308,47,148);
OutputSelectZoneHandle->show();
OutputSelectZoneHandle->raise();
mOutputSelectZoneList.append(OutputSelectZoneHandle);