API tools faq
paste
laferrierejc

10.2 Joshl Path file

laferrierejc
May 19th, 2012
141
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 19.11 KB | None | 0 0
raw download clone embed print report
  1. diff -r f0138e397b1a default_gridviews.dtg
  2. --- a/default_gridviews.dtg Wed Apr 18 18:15:20 2012 +0200
  3. +++ b/default_gridviews.dtg Sat May 19 05:57:06 2012 -0700
  4. @@ -772,7 +772,7 @@
  5. 3\sets\12\columns\6\width=4
  6. 3\sets\13\name=Hauling
  7. 3\sets\13\bg_color=0xc1bfabff
  8. -3\sets\13\columns\size=10
  9. +3\sets\13\columns\size=11
  10. 3\sets\13\columns\1\name=SPACER
  11. 3\sets\13\columns\1\type=SPACER
  12. 3\sets\13\columns\1\width=4
  13. @@ -808,9 +808,13 @@
  14. 3\sets\13\columns\9\type=LABOR
  15. 3\sets\13\columns\9\skill_id=-1
  16. 3\sets\13\columns\9\labor_id=8
  17. -3\sets\13\columns\10\name=SPACER 1
  18. -3\sets\13\columns\10\type=SPACER
  19. -3\sets\13\columns\10\width=4
  20. +3\sets\13\columns\10\name=Haul/Push Vehicles
  21. +3\sets\13\columns\10\type=LABOR
  22. +3\sets\13\columns\10\skill_id=-1
  23. +3\sets\13\columns\10\labor_id=73
  24. +3\sets\13\columns\11\name=SPACER 1
  25. +3\sets\13\columns\11\type=SPACER
  26. +3\sets\13\columns\11\width=4
  27. 3\sets\14\name=Other Jobs
  28. 3\sets\14\bg_color=0xffffffff
  29. 3\sets\14\columns\size=4
  30. diff -r f0138e397b1a inc/dwarfstats.h
  31. --- a/inc/dwarfstats.h Wed Apr 18 18:15:20 2012 +0200
  32. +++ b/inc/dwarfstats.h Sat May 19 05:57:06 2012 -0700
  33. @@ -29,7 +29,7 @@
  34. {
  35.  
  36. public:
  37. - static float calc_cdf(float mean, float stdev, float rawValue);
  38. + static float calc_cdf(float mean, float stdev, float rawValue);
  39.  
  40. struct bin{
  41. int min;
  42. @@ -54,7 +54,7 @@
  43.  
  44. static QHash<ASPECT_TYPE, QList<bin> > m_attribute_bins;
  45.  
  46. - static float get_aspect_role_rating(int value, QList<bin> m_bins);
  47. + static float get_aspect_role_rating(float value, QList<bin> m_bins);
  48. };
  49.  
  50. #endif // DWARFSTATS_H
  51. diff -r f0138e397b1a inc/trait.h
  52. --- a/inc/trait.h Wed Apr 18 18:15:20 2012 +0200
  53. +++ b/inc/trait.h Sat May 19 05:57:06 2012 -0700
  54. @@ -28,62 +28,62 @@
  55. #include "dwarfstats.h"
  56.  
  57. class Trait : public QObject {
  58. - Q_OBJECT
  59. + Q_OBJECT
  60. public:
  61. Trait(int trait_id, const QSettings &s, QObject *parent = 0)
  62. - : QObject(parent)
  63. - {
  64. - name = s.value("name", "UNKNOWN").toString();
  65. + : QObject(parent)
  66. + {
  67. + name = s.value("name", "UNKNOWN").toString();
  68. this->trait_id = trait_id;// s.value("trait_id", -1).toInt();
  69. - m_level_string[0] = s.value("level_0", "UNKNOWN TRAIT 0(" + name + ")").toString();
  70. - m_level_string[10] = s.value("level_1", "UNKNOWN TRAIT 1(" + name + ")").toString();
  71. - m_level_string[25] = s.value("level_2", "UNKNOWN TRAIT 2(" + name + ")").toString();
  72. - m_level_string[61] = s.value("level_3", "UNKNOWN TRAIT 3(" + name + ")").toString();
  73. - m_level_string[76] = s.value("level_4", "UNKNOWN TRAIT 4(" + name + ")").toString();
  74. - m_level_string[91] = s.value("level_5", "UNKNOWN TRAIT 5(" + name + ")").toString();
  75. + m_level_string[0] = s.value("level_0", "UNKNOWN TRAIT 0(" + name + ")").toString();
  76. + m_level_string[10] = s.value("level_1", "UNKNOWN TRAIT 1(" + name + ")").toString();
  77. + m_level_string[25] = s.value("level_2", "UNKNOWN TRAIT 2(" + name + ")").toString();
  78. + m_level_string[61] = s.value("level_3", "UNKNOWN TRAIT 3(" + name + ")").toString();
  79. + m_level_string[76] = s.value("level_4", "UNKNOWN TRAIT 4(" + name + ")").toString();
  80. + m_level_string[91] = s.value("level_5", "UNKNOWN TRAIT 5(" + name + ")").toString();
  81.  
  82. //setup aspect types and load bins
  83. QList<int> raws;
  84. +
  85. + raws << 0 << 10 << 25 << 40 << 61 << 76 << 91 << 101;
  86. +
  87. //immoderation (urge) and straightforwardness (honesty are +
  88. - if(trait_id==5 || trait_id==20){
  89. + if(trait_id==4 || trait_id==19){
  90. m_aspect_type = positive;
  91. - raws << 0 << 11 << 27 << 44 << 65 << 78 << 92 << 100;
  92. DwarfStats::load_trait_bins(positive, raws);
  93. }
  94. //vulnerability (stress) is -
  95. - else if(trait_id==6){
  96. + else if(trait_id==5){
  97. m_aspect_type = negative;
  98. - raws << 0 << 9 << 22 << 36 << 57 << 73 << 90 << 101;
  99. DwarfStats::load_trait_bins(negative, raws);
  100. }
  101. //everything else
  102. else{
  103. m_aspect_type = average;
  104. - raws << 0 << 10 << 25 << 40 << 61 << 76 << 91 << 101;
  105. DwarfStats::load_trait_bins(average, raws);
  106. - }
  107. - }
  108. + }
  109. + }
  110.  
  111. - QString level_message(const short &val) {
  112. - if (val >= 91)
  113. - return m_level_string[91];
  114. - else if (val >= 76)
  115. - return m_level_string[76];
  116. - else if (val >= 61)
  117. - return m_level_string[61];
  118. - else if (val >= 25)
  119. - return m_level_string[25];
  120. - else if (val >= 10)
  121. - return m_level_string[10];
  122. - else
  123. - return m_level_string[0];
  124. - }
  125. + QString level_message(const short &val) {
  126. + if (val >= 91)
  127. + return m_level_string[91];
  128. + else if (val >= 76)
  129. + return m_level_string[76];
  130. + else if (val >= 61)
  131. + return m_level_string[61];
  132. + else if (val >= 25)
  133. + return m_level_string[25];
  134. + else if (val >= 10)
  135. + return m_level_string[10];
  136. + else
  137. + return m_level_string[0];
  138. + }
  139.  
  140. - QString name;
  141. - int trait_id;
  142. + QString name;
  143. + int trait_id;
  144. ASPECT_TYPE m_aspect_type;
  145. //! this map will hold the minimum_value -> string (e.g. level 76-90 of Nervousness is "Is always tense and jittery")
  146. - QMap<int, QString> m_level_string;
  147. + QMap<int, QString> m_level_string;
  148. };
  149.  
  150. #endif
  151. diff -r f0138e397b1a src/dfinstance.cpp
  152. --- a/src/dfinstance.cpp Wed Apr 18 18:15:20 2012 +0200
  153. +++ b/src/dfinstance.cpp Sat May 19 05:57:06 2012 -0700
  154. @@ -381,10 +381,10 @@
  155. }
  156. }
  157.  
  158. -void DFInstance::calc_done(){
  159. +void DFInstance::calc_done(){
  160. calc_progress ++;
  161. //emit progress_value(calc_progress);
  162. - emit progress_message(tr("Calculating roles...%1%").arg(QString::number(((float)calc_progress/(float)actual_dwarves.count())*100,'f',2)));
  163. + emit progress_message(tr("Calculating roles...%1%").arg(QString::number(((float)calc_progress/(float)actual_dwarves.count())*100,'f',2)));
  164. if(calc_progress == actual_dwarves.count()){
  165. foreach(Role *r, GameDataReader::ptr()->get_roles()){
  166. float mean = 0.0;
  167. @@ -400,14 +400,15 @@
  168. }
  169. stdev = sqrt(stdev / (count-1));
  170. foreach(Dwarf *d, actual_dwarves){
  171. - d->set_role_rating(r->name, DwarfStats::calc_cdf(mean,stdev,d->get_role_rating(r->name))*100);
  172. + //d->set_role_rating(r->name, DwarfStats::calc_cdf(mean,stdev,d->get_role_rating(r->name))*100);
  173. + d->set_role_rating(r->name, d->get_role_rating(r->name));
  174. }
  175.  
  176. }
  177. foreach(Dwarf *d, actual_dwarves){
  178. d->update_rating_list();
  179. }
  180. - actual_dwarves.clear();
  181. + actual_dwarves.clear();
  182. //emit progress_value(calc_progress+1);
  183. progress_message(QString("All roles loaded in %1 seconds.").arg(QString::number((float)t.elapsed()/1000,'f',2)));
  184.  
  185. diff -r f0138e397b1a src/dwarfstats.cpp
  186. --- a/src/dwarfstats.cpp Wed Apr 18 18:15:20 2012 +0200
  187. +++ b/src/dwarfstats.cpp Sat May 19 05:57:06 2012 -0700
  188. @@ -113,7 +113,7 @@
  189. if(i>0)
  190. temp.density = temp.density + 0.01;
  191. temp.min = raws[i];
  192. - temp.max = raws[i+1];
  193. + temp.max = raws[i+1]-1;
  194. m_bins.append(temp);
  195. }
  196. //adjust final bin's probability
  197. @@ -128,13 +128,13 @@
  198. }
  199.  
  200. //Normal
  201. -//0.00385 0 to 9
  202. -//0.01965 10 to 24
  203. -//0.0856 25 to 39
  204. -//0.7818 40 to 60
  205. -//0.0856 61 to 75
  206. -//0.01965 76 to 90
  207. -//0.00385 91 to 100
  208. +//0 to 9 .005
  209. +//10 to 24 .02
  210. +//25 to 39 .08
  211. +//40 to 60 .79
  212. +//61 to 75 .08
  213. +//76 to 90 .02
  214. +//91 to 100 .005
  215.  
  216. void DwarfStats::load_trait_bins(ASPECT_TYPE key, QList<int> raws){
  217. if(!m_trait_bins.contains(key))
  218. @@ -146,35 +146,36 @@
  219. switch(i){
  220. case 0:
  221. temp.density = 0;
  222. - temp.probability = 0.004527777766667;
  223. + temp.probability = 0.00375;
  224. break;
  225. case 1:
  226. - temp.density = 0.004527777766667;
  227. - temp.probability = 0.017646604933333;
  228. + temp.density = 0.00375;
  229. + temp.probability = 0.01925;
  230. break;
  231. case 2:
  232. - temp.density = 0.0221743827;
  233. - temp.probability = 0.0883287037;
  234. + temp.density = 0.023;
  235. + temp.probability = 0.08475;
  236. break;
  237. case 3:
  238. - temp.density = 0.1105030864;
  239. - temp.probability = 0.7853132716;
  240. + temp.density = 0.10775;
  241. + temp.probability = 0.7845;
  242. break;
  243. case 4:
  244. - temp.density = 0.895816358;
  245. - temp.probability = 0.080581790133333;
  246. + temp.density = 0.89225;
  247. + temp.probability = 0.08475;
  248. break;
  249. case 5:
  250. - temp.density = 0.976398148133333;
  251. - temp.probability = 0.0204845679;
  252. + temp.density = 0.977;
  253. + temp.probability = 0.01925;
  254. break;
  255. case 6:
  256. - temp.density = 0.996882716033333;
  257. - temp.probability = 0.003117283966667;
  258. + temp.density = 0.99625;
  259. + temp.probability = 0.00375;
  260. break;
  261. }
  262.  
  263. - temp.min = raws[i]-1;
  264. + //establishes lower bin and upper bin range
  265. + temp.min = raws[i];
  266. temp.max = raws[i+1]-1;
  267. m_bins.append(temp);
  268. }
  269. @@ -184,16 +185,61 @@
  270. }
  271.  
  272. float DwarfStats::get_trait_role_rating(ASPECT_TYPE key, int value){
  273. - return get_aspect_role_rating(value, m_trait_bins.value(key));
  274. +
  275. + //variables
  276. + float traitMiddle;
  277. + float newValue;
  278. +
  279. + //negative trait
  280. + if (key == -1){
  281. + traitMiddle = 45;
  282. +
  283. + if (value < traitMiddle) {
  284. + newValue = (((float)value / traitMiddle) /2)*100;
  285. + }
  286. + else
  287. + {
  288. + newValue = ( ( ( (value - traitMiddle) / (100 - traitMiddle) ) /2 ) +.5 ) *100;
  289. + }
  290. + return get_aspect_role_rating(newValue, m_trait_bins.value(key));
  291. + }
  292. +
  293. + //normal trait
  294. + else if (key == 0)
  295. + {
  296. + return get_aspect_role_rating((float)value, m_trait_bins.value(key));
  297. + }
  298. +
  299. + //positive trait
  300. + else if (key == 1)
  301. + {
  302. + traitMiddle = 55;
  303. +
  304. + if (value < traitMiddle) {
  305. + newValue = (((float)value / traitMiddle) /2)*100;
  306. + }
  307. + else
  308. + {
  309. + newValue = ( ( ( (value - traitMiddle) / (100 - traitMiddle) ) /2 ) +.5 ) *100;
  310. + }
  311. + return get_aspect_role_rating(newValue, m_trait_bins.value(key));
  312. + };
  313. +
  314. + //return's 0 if above conditions fail.
  315. + return 0;
  316. }
  317.  
  318. -float DwarfStats::get_aspect_role_rating(int value, QList<bin> m_bins){
  319. +float DwarfStats::get_aspect_role_rating(float value, QList<bin> m_bins){
  320. for(int i=0; i<m_bins.length(); i++){
  321. - if(value > m_bins[i].min && value <= m_bins[i].max){
  322. - return ((((double)(value-m_bins[i].min) / (double)(m_bins[i].max - m_bins[i].min))
  323. - * m_bins[i].probability)
  324. - + m_bins[i].density);
  325. - }
  326. +
  327. + int min = m_bins[i].min-1;
  328. + int max = m_bins[i].max;
  329. +
  330. + if(value > min && value <= max)
  331. + {
  332. +
  333. + return ((( (value - min) / (max - min) ) * m_bins[i].probability ) + m_bins[i].density);
  334. + }
  335. }
  336. return 0;
  337. }
  338. diff -r f0138e397b1a src/grid_view/laborcolumn.cpp
  339. --- a/src/grid_view/laborcolumn.cpp Wed Apr 18 18:15:20 2012 +0200
  340. +++ b/src/grid_view/laborcolumn.cpp Sat May 19 05:57:06 2012 -0700
  341. @@ -27,80 +27,162 @@
  342. #include "dwarfmodel.h"
  343. #include "dwarf.h"
  344. #include "viewcolumnset.h"
  345. +#include "dwarftherapist.h"
  346.  
  347. -LaborColumn::LaborColumn(QString title, int labor_id, int skill_id, ViewColumnSet *set, QObject *parent)
  348. - : ViewColumn(title, CT_LABOR, set, parent)
  349. - , m_labor_id(labor_id)
  350. - , m_skill_id(skill_id)
  351. +LaborColumn::LaborColumn(QString title, int labor_id, int skill_id, ViewColumnSet *set, QObject *parent)
  352. + : ViewColumn(title, CT_LABOR, set, parent)
  353. + , m_labor_id(labor_id)
  354. + , m_skill_id(skill_id)
  355. {}
  356.  
  357. -LaborColumn::LaborColumn(QSettings &s, ViewColumnSet *set, QObject *parent)
  358. - : ViewColumn(s, set, parent)
  359. - , m_labor_id(s.value("labor_id", -1).toInt())
  360. - , m_skill_id(s.value("skill_id", -1).toInt())
  361. +LaborColumn::LaborColumn(QSettings &s, ViewColumnSet *set, QObject *parent)
  362. + : ViewColumn(s, set, parent)
  363. + , m_labor_id(s.value("labor_id", -1).toInt())
  364. + , m_skill_id(s.value("skill_id", -1).toInt())
  365. {}
  366.  
  367. -LaborColumn::LaborColumn(const LaborColumn &to_copy)
  368. +LaborColumn::LaborColumn(const LaborColumn &to_copy)
  369. : ViewColumn(to_copy)
  370. , m_labor_id(to_copy.m_labor_id)
  371. , m_skill_id(to_copy.m_skill_id)
  372. {}
  373.  
  374. QStandardItem *LaborColumn::build_cell(Dwarf *d) {
  375. - GameDataReader *gdr = GameDataReader::ptr();
  376. - QStandardItem *item = init_cell(d);
  377.  
  378. - item->setData(CT_LABOR, DwarfModel::DR_COL_TYPE);
  379. + GameDataReader *gdr = GameDataReader::ptr();
  380. +
  381. + QStandardItem *item = init_cell(d);
  382. +
  383. + item->setData(CT_LABOR, DwarfModel::DR_COL_TYPE);
  384. +
  385. short rating = d->skill_rating(m_skill_id);
  386. - if (rating < 0 && d->labor_enabled(m_labor_id)) {
  387. - item->setData(float(rating + 0.5f), DwarfModel::DR_SORT_VALUE); // push assigned labors above no exp in sort order
  388. - } else {
  389. - item->setData(rating, DwarfModel::DR_SORT_VALUE);
  390. - }
  391. - item->setData(rating, DwarfModel::DR_RATING);
  392. - item->setData(m_labor_id, DwarfModel::DR_LABOR_ID);
  393. - item->setData(m_set->name(), DwarfModel::DR_SET_NAME);
  394. -
  395. - QString skill_str;
  396. - if (m_skill_id != -1 && rating > -1) {
  397. - QString adjusted_rating = QString::number(rating);
  398. - if (rating > 15)
  399. - adjusted_rating = QString("15 +%1").arg(rating - 15);
  400. - skill_str = tr("%1 %2<br/>[RAW LEVEL: <b><font color=blue>%3</font></b>]<br/><b>Experience:</b><br/>%4")
  401. - .arg(gdr->get_skill_level_name(rating))
  402. - .arg(gdr->get_skill_name(m_skill_id))
  403. - .arg(adjusted_rating)
  404. - .arg(d->get_skill(m_skill_id).exp_summary());
  405. - } else {
  406. - // either the skill isn't a valid id, or they have 0 experience in it
  407. - skill_str = "0 experience";
  408. - }
  409. - item->setToolTip(QString("<h3>%1</h3>%2<h4>%3</h4>").arg(m_title).arg(skill_str).arg(d->nice_name()));
  410. - return item;
  411. +
  412. + if (rating < 0 && d->labor_enabled(m_labor_id)) {
  413. +
  414. + item->setData(float(rating + 0.5f), DwarfModel::DR_SORT_VALUE); // push assigned labors above no exp in sort order
  415. +
  416. + } else {
  417. +
  418. + item->setData(rating, DwarfModel::DR_SORT_VALUE);
  419. +
  420. + }
  421. +
  422. + item->setData(rating, DwarfModel::DR_RATING);
  423. +
  424. + item->setData(m_labor_id, DwarfModel::DR_LABOR_ID);
  425. +
  426. + item->setData(m_set->name(), DwarfModel::DR_SET_NAME);
  427. +
  428. +
  429. +
  430. + QString role_str;
  431. +
  432. + float role_rating=0;
  433. +
  434. + if(m_skill_id != -1){
  435. +
  436. + bool found = false;
  437. +
  438. + foreach(Role *r, gdr->get_roles()){
  439. +
  440. + foreach(QString key, r->skills.uniqueKeys()){
  441. +
  442. + if(key.toInt()==m_skill_id){
  443. +
  444. + role_rating = d->get_role_rating(r->name);
  445. +
  446. + role_str = tr("<h4>Role: %1 (%2%)</h4>").arg(r->name).arg(QString::number(role_rating,'f',2));
  447. +
  448. + if(r->role_details=="")
  449. +
  450. + r->create_role_details(*DT->user_settings());
  451. +
  452. + role_str.append(r->role_details);
  453. +
  454. + float sortVal = role_rating;
  455. +
  456. + if(d->labor_enabled(m_labor_id))
  457. +
  458. + sortVal += 1000;
  459. +
  460. + item->setData(sortVal,DwarfModel::DR_SORT_VALUE);
  461. +
  462. + found = true;
  463. +
  464. + }
  465. +
  466. + if(found)
  467. +
  468. + break;
  469. +
  470. + }
  471. +
  472. + if(found)
  473. +
  474. + break;
  475. +
  476. + }
  477. +
  478. + }
  479. +
  480. + QString skill_str;
  481. +
  482. + if (m_skill_id != -1 && rating > -1) {
  483. +
  484. + QString adjusted_rating = QString::number(rating);
  485. +
  486. + if (rating > 15)
  487. +
  488. + adjusted_rating = QString("15 +%1").arg(rating - 15);
  489. +
  490. + skill_str = tr("%1 %2<br/>[RAW LEVEL: <b><font color=blue>%3</font></b>]<br/><b>Experience:</b><br/>%4")
  491. +
  492. + .arg(gdr->get_skill_level_name(rating))
  493. +
  494. + .arg(gdr->get_skill_name(m_skill_id))
  495. +
  496. + .arg(adjusted_rating)
  497. +
  498. + .arg(d->get_skill(m_skill_id).exp_summary());
  499. +
  500. + } else {
  501. +
  502. + // either the skill isn't a valid id, or they have 0 experience in it
  503. +
  504. + skill_str = "0 experience";
  505. +
  506. + }
  507. +
  508. + item->setToolTip(QString("<h3>%1</h3>%2<h4>%3</h4><br>%4").arg(m_title).arg(skill_str).arg(d->nice_name()).arg(role_str));
  509. +
  510. + return item;
  511. +
  512. }
  513.  
  514. +
  515. +
  516. QStandardItem *LaborColumn::build_aggregate(const QString &group_name, const QVector<Dwarf*> &) {
  517. - QStandardItem *item = new QStandardItem;
  518. - item->setStatusTip(m_title + " :: " + group_name);
  519. - QColor bg;
  520. - if (m_override_set_colors) {
  521. - bg = m_bg_color;
  522. - } else {
  523. - bg = set()->bg_color();
  524. - }
  525. - item->setData(CT_LABOR, DwarfModel::DR_COL_TYPE);
  526. - item->setData(bg, Qt::BackgroundColorRole);
  527. - item->setData(bg, DwarfModel::DR_DEFAULT_BG_COLOR);
  528. - item->setData(true, DwarfModel::DR_IS_AGGREGATE);
  529. - item->setData(m_labor_id, DwarfModel::DR_LABOR_ID);
  530. - item->setData(group_name, DwarfModel::DR_GROUP_NAME);
  531. - item->setData(0, DwarfModel::DR_RATING);
  532. - item->setData(m_set->name(), DwarfModel::DR_SET_NAME);
  533. - return item;
  534. + QStandardItem *item = new QStandardItem;
  535. + item->setStatusTip(m_title + " :: " + group_name);
  536. + QColor bg;
  537. + if (m_override_set_colors) {
  538. + bg = m_bg_color;
  539. + } else {
  540. + bg = set()->bg_color();
  541. + }
  542. + item->setData(CT_LABOR, DwarfModel::DR_COL_TYPE);
  543. + item->setData(bg, Qt::BackgroundColorRole);
  544. + item->setData(bg, DwarfModel::DR_DEFAULT_BG_COLOR);
  545. + item->setData(true, DwarfModel::DR_IS_AGGREGATE);
  546. + item->setData(m_labor_id, DwarfModel::DR_LABOR_ID);
  547. + item->setData(group_name, DwarfModel::DR_GROUP_NAME);
  548. + item->setData(0, DwarfModel::DR_RATING);
  549. + item->setData(m_set->name(), DwarfModel::DR_SET_NAME);
  550. + return item;
  551. }
  552.  
  553. void LaborColumn::write_to_ini(QSettings &s) {
  554. - ViewColumn::write_to_ini(s);
  555. - s.setValue("skill_id", m_skill_id);
  556. - s.setValue("labor_id", m_labor_id);
  557. + ViewColumn::write_to_ini(s);
  558. + s.setValue("skill_id", m_skill_id);
  559. + s.setValue("labor_id", m_labor_id);
  560. }
  561. diff -r f0138e397b1a src/roledialog.cpp
  562. --- a/src/roledialog.cpp Wed Apr 18 18:15:20 2012 +0200
  563. +++ b/src/roledialog.cpp Sat May 19 05:57:06 2012 -0700
  564. @@ -183,7 +183,7 @@
  565. for(int i= 0; i<table.rowCount(); i++){
  566. QString key = table.item(i,0)->data(Qt::UserRole).toString();
  567. float weight = static_cast<QDoubleSpinBox*>(table.cellWidget(i,1))->value();
  568. - a.weight = abs(weight);
  569. + a.weight = fabs(weight);
  570. a.is_neg = weight < 0 ? true : false;
  571. list.insert(key,a);
  572. }
Advertisement
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!