Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- --- assets/reports/documents/pipelineinduction.lhtml
- +++ assets/reports/documents/pipelineinduction.lhtml
- @@ -433,9 +433,9 @@ end
- unitAc = unitAc .. ", " .. lCable.acResistanceCurrent .. " A"
- end
- - local unit1m = "Ω/km " .. ltr("CableView","at") .. " " .. lCable.internalReactance1ftFrequency .. " Hz"
- + local unit1ft = "Ω/km " .. ltr("CableView","at") .. " " .. lCable.internalReactance1ftFrequency .. " Hz"
- if lCable.isSteel then
- - unit1m = unit1m .. ", " .. lCable.internalReactance1ftCurrent .. " A"
- + unit1ft = unit1ft .. ", " .. lCable.internalReactance1ftCurrent .. " A"
- end
- ?>
- @@ -468,7 +468,7 @@ end
- </tr>
- <tr><td>-</td>
- <td>Reatância interna - 1 ft</td>
- - <td><?= lCable.internalReactance1ft ?> <?= unit1m ?></td>
- + <td><?= lCable.internalReactance1ft ?> <?= unit1ft ?></td>
- </tr>
- </table>
- <br/>
- --- src/views/towersview.cpp
- +++ src/views/towersview.cpp
- @@ -645,6 +645,7 @@ QString TowersView::exportATP()
- QString transmitterName;
- if(transmitter)
- transmitterName = transmitter->getName();
- + QVector<int> spaces;
- QString begin, body, end;
- @@ -661,19 +662,11 @@ QString TowersView::exportATP()
- tl->calculateSections();
- int phaseNumber = 1;
- - int circuitNumber = 1;
- + int circuitNumber = 0;
- for(Circuit *circuit : tower->getCircuits()) {
- for(Phase *phase : circuit->getPhases()) {
- for(Cable *cable : phase->getCables()) {
- -
- - double acResistence = cable->getType()->getACResistance();
- - double diameter = cable->getType()->getDiameter();
- - double x = cable->getTowerX();
- - double y = cable->getTowerY();
- - double re = cable->getType()->getInternalReactance1m();
- - body += QString::asprintf(" %d %.4f %.d %.4f %02.3f %+.2f %.2f %.2f %02.1f %02.0f %d\n",
- - phaseNumber, acResistence, 0.0, re, diameter/10, x, y, y-cable->getSag(AverageSag),
- - 0.0, 0.0, circuitNumber);
- + body += generateATPBody(phaseNumber, circuitNumber, cable);
- }
- phaseNumber++;
- }
- @@ -684,14 +677,7 @@ QString TowersView::exportATP()
- circuitNumber = 0;
- for(ShieldWire *shieldWire : tower->getShieldWires()) {
- for(Cable *cable : shieldWire->getCables()) {
- - double acResistence = cable->getType()->getACResistance();
- - double diameter = cable->getType()->getDiameter();
- - double x = cable->getTowerX();
- - double y = cable->getTowerY();
- - double re = cable->getType()->getInternalReactance1m();
- - body += QString::asprintf(" %d %.4f %.d %.4f %02.3f %+.2f %.2f %.2f %02.1f %02.0f %d\n",
- - phaseNumber, acResistence, 0.0, re, diameter/10, x, y, y-cable->getSag(AverageSag),
- - 0.0, 0.0, circuitNumber);
- + body += generateATPBody(phaseNumber, circuitNumber, cable);
- }
- }
- end += "BLANK CARD ENDING CONDUCTOR CARDS\n";
- @@ -705,6 +691,44 @@ QString TowersView::exportATP()
- return begin + body + end;
- }
- +QString TowersView::generateATPBody(int phaseNumber, double circuitNumber, Cable* cable)
- +{
- + double acResistence = cable->getType()->getACResistance();
- + double diameter = cable->getType()->getDiameter();
- + double x = cable->getTowerX();
- + double y = cable->getTowerY();
- + double re = cable->getType()->getInternalReactance1m();
- +
- + QString sPhaseNumber = numberToFormatedStr(QString::asprintf("%d", phaseNumber), 0);
- + QString sACResistance = numberToFormatedStr(QString::asprintf("%.4f", acResistence), 1);
- + QString sZero1 = numberToFormatedStr(QString::asprintf("%d", 0), 2);
- + QString sRe = numberToFormatedStr(QString::asprintf("%.4f", re), 3);
- + QString sDiameter = numberToFormatedStr(QString::asprintf("%02.3f", diameter/10), 4);
- + QString sTX = numberToFormatedStr(QString::asprintf("%.3f", x), 5);
- + QString sTY = numberToFormatedStr(QString::asprintf("%.3f", y), 6);
- + QString sSag = numberToFormatedStr(QString::asprintf("%.3f", y-cable->getSag(AverageSag)), 7);
- + QString sZero2 = numberToFormatedStr(QString::asprintf("%02.1f", 0.0), 8);
- + QString sZero3 = numberToFormatedStr(QString::asprintf("%02.1f", 0.0), 9);
- + QString sZero4 = numberToFormatedStr(QString::asprintf("%d", circuitNumber), 10);
- +
- + QString body = " " + sPhaseNumber + " " + sACResistance + sZero1 + sRe + sDiameter + sTX
- + + sTY + sSag + sZero2 + sZero3 + " " + sZero4 + "\n";
- +
- + return body;
- +}
- +
- +QString TowersView::numberToFormatedStr(QString number, int index)
- +{
- + QVector<int> spacing = {1,8,2,8,8,8,8,8,8,6,2};
- + int spaceLength = spacing.at(index);
- +
- + while(number.length() < spaceLength) {
- + number = " " + number;
- + }
- +
- + return number;
- +}
- +
- void TowersView::manageButtonClicked()
- {
- int tlIndex = m_transmissionLines->currentIndex();
- --- src/views/towersview.h
- +++ src/views/towersview.h
- @@ -2,6 +2,7 @@
- #define TOWERVIEW_H
- #include <QScrollArea>
- +#include <core/cable.h>
- class InputView;
- class QComboBox;
- @@ -80,6 +81,8 @@ private:
- InputView *m_inputView;
- QString exportATP();
- + QString generateATPBody(int phaseNumber, double circuitNumber, Cable* cable);
- + QString numberToFormatedStr(QString number, int index);
- };
- #endif // TOWERVIEW_H
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement