Advertisement
Guest User

Untitled

a guest
Feb 24th, 2017
100
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 5.76 KB | None | 0 0
  1. --- assets/reports/documents/pipelineinduction.lhtml
  2. +++ assets/reports/documents/pipelineinduction.lhtml
  3. @@ -433,9 +433,9 @@ end
  4.                  unitAc = unitAc .. ", " .. lCable.acResistanceCurrent .. " A"
  5.              end
  6.  
  7. -            local unit1m = "Ω/km " .. ltr("CableView","at") .. " " .. lCable.internalReactance1ftFrequency .. " Hz"
  8. +            local unit1ft = "Ω/km " .. ltr("CableView","at") .. " " .. lCable.internalReactance1ftFrequency .. " Hz"
  9.              if lCable.isSteel then
  10. -                unit1m = unit1m .. ", " .. lCable.internalReactance1ftCurrent .. " A"
  11. +                unit1ft = unit1ft .. ", " .. lCable.internalReactance1ftCurrent .. " A"
  12.              end
  13.              ?>
  14.  
  15. @@ -468,7 +468,7 @@ end
  16.                  </tr>
  17.                  <tr><td>-</td>
  18.                      <td>Reatância interna - 1 ft</td>
  19. -                    <td><?= lCable.internalReactance1ft ?> <?= unit1m ?></td>
  20. +                    <td><?= lCable.internalReactance1ft ?> <?= unit1ft ?></td>
  21.                  </tr>
  22.              </table>
  23.              <br/>
  24. --- src/views/towersview.cpp
  25. +++ src/views/towersview.cpp
  26. @@ -645,6 +645,7 @@ QString TowersView::exportATP()
  27.      QString transmitterName;
  28.      if(transmitter)
  29.          transmitterName = transmitter->getName();
  30. +    QVector<int> spaces;
  31.  
  32.      QString begin, body, end;
  33.  
  34. @@ -661,19 +662,11 @@ QString TowersView::exportATP()
  35.      tl->calculateSections();
  36.  
  37.      int phaseNumber = 1;
  38. -    int circuitNumber = 1;
  39. +    int circuitNumber = 0;
  40.      for(Circuit *circuit : tower->getCircuits()) {
  41.          for(Phase *phase : circuit->getPhases()) {
  42.              for(Cable *cable : phase->getCables()) {
  43. -
  44. -                double acResistence = cable->getType()->getACResistance();
  45. -                double diameter = cable->getType()->getDiameter();
  46. -                double x = cable->getTowerX();
  47. -                double y = cable->getTowerY();
  48. -                double re = cable->getType()->getInternalReactance1m();
  49. -                body += QString::asprintf("  %d      %.4f   %.d  %.4f   %02.3f  %+.2f   %.2f   %.2f    %02.1f   %02.0f       %d\n",
  50. -                                          phaseNumber, acResistence, 0.0, re, diameter/10, x, y, y-cable->getSag(AverageSag),
  51. -                                          0.0, 0.0, circuitNumber);
  52. +                body += generateATPBody(phaseNumber, circuitNumber, cable);
  53.              }
  54.              phaseNumber++;
  55.          }
  56. @@ -684,14 +677,7 @@ QString TowersView::exportATP()
  57.      circuitNumber = 0;
  58.      for(ShieldWire *shieldWire : tower->getShieldWires()) {
  59.          for(Cable *cable : shieldWire->getCables()) {
  60. -            double acResistence = cable->getType()->getACResistance();
  61. -            double diameter = cable->getType()->getDiameter();
  62. -            double x = cable->getTowerX();
  63. -            double y = cable->getTowerY();
  64. -            double re = cable->getType()->getInternalReactance1m();
  65. -            body += QString::asprintf("  %d      %.4f   %.d  %.4f   %02.3f  %+.2f   %.2f   %.2f    %02.1f   %02.0f       %d\n",
  66. -                                      phaseNumber, acResistence, 0.0, re, diameter/10, x, y, y-cable->getSag(AverageSag),
  67. -                                      0.0, 0.0, circuitNumber);
  68. +            body += generateATPBody(phaseNumber, circuitNumber, cable);
  69.          }
  70.      }
  71.      end += "BLANK CARD ENDING CONDUCTOR CARDS\n";
  72. @@ -705,6 +691,44 @@ QString TowersView::exportATP()
  73.      return begin + body + end;
  74.  }
  75.  
  76. +QString TowersView::generateATPBody(int phaseNumber, double circuitNumber, Cable* cable)
  77. +{
  78. +    double acResistence = cable->getType()->getACResistance();
  79. +    double diameter = cable->getType()->getDiameter();
  80. +    double x = cable->getTowerX();
  81. +    double y = cable->getTowerY();
  82. +    double re = cable->getType()->getInternalReactance1m();
  83. +
  84. +    QString sPhaseNumber = numberToFormatedStr(QString::asprintf("%d", phaseNumber), 0);
  85. +    QString sACResistance = numberToFormatedStr(QString::asprintf("%.4f", acResistence), 1);
  86. +    QString sZero1 = numberToFormatedStr(QString::asprintf("%d", 0), 2);
  87. +    QString sRe = numberToFormatedStr(QString::asprintf("%.4f", re), 3);
  88. +    QString sDiameter = numberToFormatedStr(QString::asprintf("%02.3f", diameter/10), 4);
  89. +    QString sTX = numberToFormatedStr(QString::asprintf("%.3f", x), 5);
  90. +    QString sTY = numberToFormatedStr(QString::asprintf("%.3f", y), 6);
  91. +    QString sSag = numberToFormatedStr(QString::asprintf("%.3f", y-cable->getSag(AverageSag)), 7);
  92. +    QString sZero2 = numberToFormatedStr(QString::asprintf("%02.1f", 0.0), 8);
  93. +    QString sZero3 = numberToFormatedStr(QString::asprintf("%02.1f", 0.0), 9);
  94. +    QString sZero4 = numberToFormatedStr(QString::asprintf("%d", circuitNumber), 10);
  95. +
  96. +    QString body = "  " + sPhaseNumber + "     " + sACResistance + sZero1 + sRe + sDiameter + sTX
  97. +            + sTY + sSag + sZero2 + sZero3 + "      " + sZero4 + "\n";
  98. +
  99. +    return body;
  100. +}
  101. +
  102. +QString TowersView::numberToFormatedStr(QString number, int index)
  103. +{
  104. +    QVector<int> spacing = {1,8,2,8,8,8,8,8,8,6,2};
  105. +    int spaceLength = spacing.at(index);
  106. +
  107. +    while(number.length() < spaceLength) {
  108. +        number = " " + number;
  109. +    }
  110. +
  111. +    return number;
  112. +}
  113. +
  114.  void TowersView::manageButtonClicked()
  115.  {
  116.      int tlIndex = m_transmissionLines->currentIndex();
  117. --- src/views/towersview.h
  118. +++ src/views/towersview.h
  119. @@ -2,6 +2,7 @@
  120.  #define TOWERVIEW_H
  121.  
  122.  #include <QScrollArea>
  123. +#include <core/cable.h>
  124.  
  125.  class InputView;
  126.  class QComboBox;
  127. @@ -80,6 +81,8 @@ private:
  128.      InputView *m_inputView;
  129.  
  130.      QString exportATP();
  131. +    QString generateATPBody(int phaseNumber, double circuitNumber, Cable* cable);
  132. +    QString numberToFormatedStr(QString number, int index);
  133.  };
  134.  
  135.  #endif // TOWERVIEW_H
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement