From d78dbadd96983721894345b10d896f737be0158a Mon Sep 17 00:00:00 2001
From: chfab <f.buissart@hautsdefrance.cci.fr>
Date: Fri, 22 Dec 2017 19:15:29 +0100
Subject: [PATCH] =?UTF-8?q?Derni=C3=A8re=20version?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Compilation/system files/changecharacteristics.cpp | 10 +++++-----
Compilation/system files/changeparameterclass.cpp | 3 ++-
Compilation/system files/consultdata.cpp | 10 +++++-----
Compilation/system files/expanddataconsult.cpp | 4 ++--
Compilation/system files/expanddatainput.cpp | 2 +-
Compilation/system files/exportallslot.cpp | 8 ++++----
Compilation/system files/modifiesinputtable.cpp | 2 +-
7 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/Compilation/system files/changecharacteristics.cpp b/Compilation/system files/changecharacteristics.cpp
index f76c613..2111422 100644
--- a/Compilation/system files/changecharacteristics.cpp
+++ b/Compilation/system files/changecharacteristics.cpp
@@ -546,27 +546,27 @@ void MainWindow::changeCharacteristics()
tab0->setItem(countLine, 0, cell);
cell = new QTableWidgetItem;
cell->setData(Qt::UserRole, it.value());
- if (it.size() > 6) cell->setText(statusFollowed[it.value().at(6).toInt()]);
+ if (it.value().size() > 6) cell->setText(statusFollowed[it.value().at(6).toInt()]);
cell->setFlags(cell->flags() & ~ Qt::ItemIsEditable);
tab0->setItem(countLine, 1, cell);
cell = new QTableWidgetItem;
cell->setData(Qt::UserRole, it.value());
- if (it.size() > 7) cell->setText(it.value().at(7).toString());
+ if (it.value().size() > 7) cell->setText(it.value().at(7).toString());
cell->setFlags(cell->flags() & ~ Qt::ItemIsEditable);
tab0->setItem(countLine, 2, cell);
cell = new QTableWidgetItem;
cell->setData(Qt::UserRole, it.value());
- if (it.size() > 8) cell->setText(it.value().at(8).toString());
+ if (it.value().size() > 8) cell->setText(it.value().at(8).toString());
cell->setFlags(cell->flags() & ~ Qt::ItemIsEditable);
tab0->setItem(countLine, 3, cell);
cell = new QTableWidgetItem;
cell->setData(Qt::UserRole, it.value());
- if (it.size() > 9) cell->setText(it.value().at(9).toDate().toString("dd/MM/yyyy"));
+ if (it.value().size() > 9) cell->setText(it.value().at(9).toDate().toString("dd/MM/yyyy"));
cell->setFlags(cell->flags() & ~ Qt::ItemIsEditable);
tab0->setItem(countLine, 4, cell);
cell = new QTableWidgetItem;
cell->setData(Qt::UserRole, it.value());
- if (it.size() > 10) cell->setText(it.value().at(10).toDate().toString("dd/MM/yyyy"));
+ if (it.value().size() > 10) cell->setText(it.value().at(10).toDate().toString("dd/MM/yyyy"));
cell->setFlags(cell->flags() & ~ Qt::ItemIsEditable);
tab0->setItem(countLine, 5, cell);
if (charactMap.keys().contains(it.value().at(0).toInt()))
diff --git a/Compilation/system files/changeparameterclass.cpp b/Compilation/system files/changeparameterclass.cpp
index 91982a8..4ba6017 100644
--- a/Compilation/system files/changeparameterclass.cpp
+++ b/Compilation/system files/changeparameterclass.cpp
@@ -230,13 +230,14 @@ changeParameterClass::changeParameterClass(QVariant param, QString previousName,
axisMap.insert(Id, dataRow);
}
}
- if (dataRow.size() > axisPosition["Id1"] && dataRow.size() > axisPosition["IdPos"] && dataRow.size() > axisPosition["IdExp"] && dataRow.size() > axisPostion["IdDom"] && dataRow.size() > axisPosition["NRam"])
+ if (dataRow.size() > axisPosition["Id1"] && dataRow.size() > axisPosition["IdPos"] && dataRow.size() > axisPosition["IdExp"] && dataRow.size() > axisPosition["IdDom"] && dataRow.size() > axisPosition["NRam"])
{
if (posMap[dataRow.at(axisPosition["IdPos"]).toInt()].size() > posPosition["ShortNamePosition"] && expMap[dataRow.at(axisPosition["IdExp"]).toInt()].size() > expPosition["ShortNameExposition"] && domMap[dataRow.at(axisPosition["IdDom"]).toInt()].size() > domPosition["ShortNameDominance"])
{
axisNames.append(QString("%1 %2%3 %4%5").arg(treeNames[dataRow.at(axisPosition["Id1"]).toInt()]).arg(posMap[dataRow.at(axisPosition["IdPos"]).toInt()].at(posPosition["ShortNamePosition"])).arg(expMap[dataRow.at(axisPosition["IdExp"]).toInt()].at(expPosition["ShortNameExposition"])).arg(domMap[dataRow.at(axisPosition["IdDom"]).toInt()].at(domPosition["ShortNameDominance"])).arg(dataRow.at(axisPosition["NRam"])));
}
}
+ }
}
// -> now we load axis names from axischaracteristics
QFile paramFile("bin/axisCharacteristics");
diff --git a/Compilation/system files/consultdata.cpp b/Compilation/system files/consultdata.cpp
index 88c8a08..538d99a 100644
--- a/Compilation/system files/consultdata.cpp
+++ b/Compilation/system files/consultdata.cpp
@@ -606,27 +606,27 @@ void MainWindow::consultData()
tab2->setItem(countLine, 0, cell);
cell = new QTableWidgetItem;
cell->setData(Qt::UserRole, it.value());
- if (it.value() > 6) cell->setText(statusAbandonned[it.value().at(6).toInt()]);
+ if (it.value().size() > 6) cell->setText(statusAbandonned[it.value().at(6).toInt()]);
cell->setFlags(cell->flags() & ~ Qt::ItemIsEditable);
tab2->setItem(countLine, 1, cell);
cell = new QTableWidgetItem;
cell->setData(Qt::UserRole, it.value());
- if (it.value() > 7) cell->setText(it.value().at(7).toString());
+ if (it.value().size() > 7) cell->setText(it.value().at(7).toString());
cell->setFlags(cell->flags() & ~ Qt::ItemIsEditable);
tab2->setItem(countLine, 2, cell);
cell = new QTableWidgetItem;
cell->setData(Qt::UserRole, it.value());
- if (it.value() > 8) cell->setText(it.value().at(8).toString());
+ if (it.value().size() > 8) cell->setText(it.value().at(8).toString());
cell->setFlags(cell->flags() & ~ Qt::ItemIsEditable);
tab2->setItem(countLine, 3, cell);
cell = new QTableWidgetItem;
cell->setData(Qt::UserRole, it.value());
- if (it.value() > 9) cell->setText(it.value().at(9).toDate().toString("dd/MM/yyyy"));
+ if (it.value().size() > 9) cell->setText(it.value().at(9).toDate().toString("dd/MM/yyyy"));
cell->setFlags(cell->flags() & ~ Qt::ItemIsEditable);
tab2->setItem(countLine, 4, cell);
cell = new QTableWidgetItem;
cell->setData(Qt::UserRole, it.value());
- if (it.value() > 10) cell->setText(it.value().at(10).toDate().toString("dd/MM/yyyy"));
+ if (it.value().size() > 10) cell->setText(it.value().at(10).toDate().toString("dd/MM/yyyy"));
cell->setFlags(cell->flags() & ~ Qt::ItemIsEditable);
tab2->setItem(countLine, 5, cell);
countLine++;
diff --git a/Compilation/system files/expanddataconsult.cpp b/Compilation/system files/expanddataconsult.cpp
index c22b0a3..517fd81 100644
--- a/Compilation/system files/expanddataconsult.cpp
+++ b/Compilation/system files/expanddataconsult.cpp
@@ -274,7 +274,7 @@ void MainWindow::expandDataConsult(int a, int b)
}
}
tempFile->close();
- if (varMarp[Id].size() > varPosition["Name"])
+ if (varMap[Id].size() > varPosition["Name"])
{
factorPosition.insert(varMap[Id].at(varPosition["Name"]), tempPosition);
factorMap.insert(varMap[Id].at(varPosition["Name"]), tempMap);
@@ -545,7 +545,7 @@ void MainWindow::expandDataConsult(int a, int b)
{
if (var->size() > varPosition["Name"])
{
- if (measureMap[measure.value()].size() > var->at(varPosition["Name"]))
+ if (measureMap[measure.value()].size() > measurePosition[var->at(varPosition["Name"])])
{
if (measureMap[measure.value()].at(measurePosition[var->at(varPosition["Name"])]) != "")
{
diff --git a/Compilation/system files/expanddatainput.cpp b/Compilation/system files/expanddatainput.cpp
index bd3fc14..586644a 100644
--- a/Compilation/system files/expanddatainput.cpp
+++ b/Compilation/system files/expanddatainput.cpp
@@ -367,7 +367,7 @@ void MainWindow::expandDataInput(int a, int b)
if (reproVarMap[Id].at(reproreproVar["TypeVar"]).startsWith("eKEY"))
{
// factor variable
- if (dataRow.size() > reprorepro["TypeVar"]) if (dataRow.at(reproreproVar["TypeVar"]).split(":").size() > 1) tempFile = new QFile(QString("bin/%1").arg(dataRow.at(reproreproVar["TypeVar"]).split(":").at(1)));
+ if (dataRow.size() > reproreproVar["TypeVar"]) if (dataRow.at(reproreproVar["TypeVar"]).split(":").size() > 1) tempFile = new QFile(QString("bin/%1").arg(dataRow.at(reproreproVar["TypeVar"]).split(":").at(1)));
countLine = -1;
tempPosition.clear();
tempMap.clear();
diff --git a/Compilation/system files/exportallslot.cpp b/Compilation/system files/exportallslot.cpp
index 393519e..5c4695d 100644
--- a/Compilation/system files/exportallslot.cpp
+++ b/Compilation/system files/exportallslot.cpp
@@ -895,7 +895,7 @@ void MainWindow::exportAllSlot()
}else{
if (axisMap[axis.key()].size() > charactPosition["IdPos"])
{
- if (posMap[axisMap[axis.key()].at(axisPosition["IdPos"]).toInt()] > posPosition["LongNamePosition"])
+ if (posMap[axisMap[axis.key()].at(axisPosition["IdPos"]).toInt()].size() > posPosition["LongNamePosition"])
{
outputStream << posMap[axisMap[axis.key()].at(axisPosition["IdPos"]).toInt()].at(posPosition["LongNamePosition"]) << "\t";
}else{
@@ -1333,21 +1333,21 @@ void MainWindow::exportAllSlot()
if (treeMap[tree.key()].size() > treePosition["NumArb"]) outputStream << treeMap[tree.key()].at(treePosition["NumArb"]) << "\t";
if (axisMap[axis.key()].size() > axisPosition["IdPos"])
{
- if (osMap[axisMap[axis.key()].at(axisPosition["IdPos"]).toInt()].size() > posPosition["LongNamePosition"])
+ if (posMap[axisMap[axis.key()].at(axisPosition["IdPos"]).toInt()].size() > posPosition["LongNamePosition"])
{
outputStream << posMap[axisMap[axis.key()].at(axisPosition["IdPos"]).toInt()].at(posPosition["LongNamePosition"]) << "\t";
}
}
if (axisMap[axis.key()].size() > axisPosition["IdExp"])
{
- if (osMap[axisMap[axis.key()].at(axisPosition["IdExp"]).toInt()].size() > posPosition["LongNameExposition"])
+ if (posMap[axisMap[axis.key()].at(axisPosition["IdExp"]).toInt()].size() > posPosition["LongNameExposition"])
{
outputStream << expMap[axisMap[axis.key()].at(axisPosition["IdExp"]).toInt()].at(expPosition["LongNameExposition"]) << "\t";
}
}
if (axisMap[axis.key()].size() > axisPosition["IdDom"])
{
- if (osMap[axisMap[axis.key()].at(axisPosition["IdDom"]).toInt()].size() > posPosition["LongNameDominance"])
+ if (posMap[axisMap[axis.key()].at(axisPosition["IdDom"]).toInt()].size() > posPosition["LongNameDominance"])
{
outputStream << domMap[axisMap[axis.key()].at(axisPosition["IdDom"]).toInt()].at(domPosition["LongNameDominance"]) << "\t";
}
diff --git a/Compilation/system files/modifiesinputtable.cpp b/Compilation/system files/modifiesinputtable.cpp
index 9ce7c0c..3a2434c 100644
--- a/Compilation/system files/modifiesinputtable.cpp
+++ b/Compilation/system files/modifiesinputtable.cpp
@@ -1281,7 +1281,7 @@ void MainWindow::modifiesInputTable(int b)
datas = *(new QMap<QString, QVariant>);
historic = "";
historic = "%1" + historic;
- if (var->size() > reproreprovar["TypeVar"])
+ if (var->size() > reproreproVar["TypeVar"])
{
if (var->at(reproreproVar["TypeVar"]) == "INTEGER")
{
--
GitLab