diff --git a/app/Operations/QuantificationDialog.cpp b/app/Operations/QuantificationDialog.cpp
index cc9b1caa1eaae0359d69606fcd674520d5aa0507..dbcf5faf6329dc8ecbc927a2718bcf8677fe8d3d 100644
--- a/app/Operations/QuantificationDialog.cpp
+++ b/app/Operations/QuantificationDialog.cpp
@@ -104,25 +104,25 @@ Quantification QuantificationDialog::getQuantif(const Image* image, unsigned int
if(_editorOnly) return Quantification::linearQuant(size);
switch(_quantBox->currentIndex()) {
case 1:
- to_print = "Quantification non lineaire a valeurs centrees :";
+ to_print = QString(tr("Quantification non lineaire a valeurs centrees :")).toStdString();
return Quantification::nonLinearQuant(size, image, c);
break;
case 2:
- to_print = "Quantification non lineaire a valeurs moyennes : ";
+ to_print = QString(tr("Quantification non lineaire a valeurs moyennes :")).toStdString();
return Quantification::nonLinearQuantOptimized(size, image, c);
break;
case 3:
- to_print = "Quantification personnalisee :";
+ to_print = QString(tr("Quantification personnalisee :")).toStdString();
return _quantWidget->getQuantif();
break;
case 4:
- to_print = "Quantification LloydMax :";
+ to_print = QString(tr("Quantification LloydMax :")).toStdString();
*checkOptiQuant = true;
return Quantification::lloydMaxQuant(size, image, c);
break;
default:
- to_print = "Quantification lineaire a valeurs centrees :";
+ to_print = QString(tr("Quantification lineaire a valeurs centrees :")).toStdString();
return Quantification::linearQuant(size);
break;
}
diff --git a/app/Operations/QuantificationOp.cpp b/app/Operations/QuantificationOp.cpp
index b841bb231387aad5004987c864b4b44c6a7e385d..0bf81449b0ca891ee5f8af906e87f413bbf93921 100644
--- a/app/Operations/QuantificationOp.cpp
+++ b/app/Operations/QuantificationOp.cpp
@@ -41,10 +41,12 @@ string QuantificationOp::quantificationOpLog(unsigned int c, Quantification * qu
char buffer[30];
string output_msg;
int val;
- sprintf(buffer, "\nCanal %d : \n", c);
+ QString bob(qApp->translate("Operations", "\nCanal%d : \n"));
+
+ sprintf(buffer, bob.toUtf8(), c);
output_msg += buffer;
- output_msg += " Valeurs : ";
+ output_msg += QString(qApp->translate("Operations"," Valeurs : ")).toStdString();
for(int i = 0; i < quant->nbValues(); ++i) {
@@ -59,7 +61,7 @@ string QuantificationOp::quantificationOpLog(unsigned int c, Quantification * qu
}
output_msg += "\n";
- output_msg += " Seuils : ";
+ output_msg += QString(qApp->translate("Operations"," Seuils : ")).toStdString();
for(int i = 0; i < quant->nbThresholds(); ++i) {
val =(int)quant->threshold(i);
@@ -135,7 +137,7 @@ string checkOptimumQuantizier(const imagein::Image* image, Quantification * quan
if( quant->nbValues() == 2) centroid = centroid / 2;
else centroid = centroid / ( quant->nbThresholds() - 1 );
- sprintf(buffer, "Canal : %d Centroïd : %.2f % Plus proche voisin : %.2f %\n", c, (100-centroid), (100-neighbor));
+ sprintf(buffer, QString(qApp->translate("Operations","Canal : %d Centroïd : %.2f % Plus proche voisin : %.2f %\n")).toUtf8(), c, (100-centroid), (100-neighbor));
return buffer;
}
@@ -194,23 +196,12 @@ void QuantificationOp::operator()(const imagein::Image* image, const std::map<co
outText(quantType);
outText(output_msg);
if(checkOptiQuant){
- outText("Respect des proprietes du quantificateur optimal : ");
+ outText(QString(qApp->translate("Operations","Respect des proprietes du quantificateur optimal : ")).toStdString());
outText(optiQuant);
}
- QString windowName;
QString imgName;
- if(quantType=="Quantification non lineaire a valeurs centrees :")
- windowName = QString(qApp->translate("QuantificationOp","Quantification non lineaire a valeur centree"));
- else if(quantType=="Quantification non lineaire a valeurs moyennes : ")
- windowName = QString(qApp->translate("QuantificationOp","Quantification non lineaire a moyennes"));
- else if(quantType=="Quantification personnalisee :")
- windowName = QString(qApp->translate("QuantificationOp","Quantification personnalisee"));
- else if(quantType=="Quantification LloydMax :")
- windowName = QString(qApp->translate("QuantificationOp","Quantification LloydMax"));
- else windowName = QString(qApp->translate("QuantificationOp","Quantification lineaire a valeurs centrees"));
-
if(image!=NULL){
imgName = QString::fromStdString(imgList.find(image)->second);
@@ -219,7 +210,9 @@ void QuantificationOp::operator()(const imagein::Image* image, const std::map<co
else{
imgName = QString("");
}
- outImage(resImg, imgName.toStdString() + windowName.toStdString());
+
+
+ outImage(resImg, imgName.toStdString() + quantType.erase(quantType.length()-2, quantType.length()));
}
}
diff --git a/app/imageinsa_en.ts b/app/imageinsa_en.ts
index 3c6848a7109ab383c0469617f6850b37fc957d60..b637bd437e57e250e800e77553e67b4eb6d1de35 100644
--- a/app/imageinsa_en.ts
+++ b/app/imageinsa_en.ts
@@ -1207,6 +1207,37 @@ Number of classes = %1 </translation>
<source>Quantification</source>
<translation>Quantization</translation>
</message>
+ <message>
+ <location filename="Operations/QuantificationOp.cpp" line="44"/>
+ <source>
+Canal%d :
+</source>
+ <translation>
+Channel %d :
+</translation>
+ </message>
+ <message>
+ <location filename="Operations/QuantificationOp.cpp" line="49"/>
+ <source> Valeurs : </source>
+ <translation> Values : </translation>
+ </message>
+ <message>
+ <location filename="Operations/QuantificationOp.cpp" line="64"/>
+ <source> Seuils : </source>
+ <translation> Thresholds : </translation>
+ </message>
+ <message>
+ <location filename="Operations/QuantificationOp.cpp" line="140"/>
+ <source>Canal : %d Centroïd : %.2f % Plus proche voisin : %.2f %
+</source>
+ <translation>Channel : %d Centroid : %.2f % Nearest neighbor : %.2f %
+</translation>
+ </message>
+ <message>
+ <location filename="Operations/QuantificationOp.cpp" line="199"/>
+ <source>Respect des proprietes du quantificateur optimal : </source>
+ <translation>Respect of the optimal quantizer properties : </translation>
+ </message>
<message>
<location filename="Operations/RandomImgOp.cpp" line="37"/>
<source>Generate random image</source>
@@ -1611,7 +1642,7 @@ Number of classes = %1 </translation>
<message>
<location filename="Operations/QuantificationDialog.cpp" line="59"/>
<source>LloydMax</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location filename="Operations/QuantificationDialog.cpp" line="61"/>
@@ -1633,6 +1664,33 @@ Number of classes = %1 </translation>
<source>Apply</source>
<translation>Apply</translation>
</message>
+ <message>
+ <location filename="Operations/QuantificationDialog.cpp" line="107"/>
+ <source>Quantification non lineaire a valeurs centrees :</source>
+ <oldsource>quantificiatQuantification non lineaire a valeurs centrees :</oldsource>
+ <translation>Non-linear quantization with centered values :</translation>
+ </message>
+ <message>
+ <location filename="Operations/QuantificationDialog.cpp" line="111"/>
+ <source>Quantification non lineaire a valeurs moyennes :</source>
+ <oldsource>Quantification non lineaire a valeurs moyennes : </oldsource>
+ <translation>Non-linear quantization with mean values :</translation>
+ </message>
+ <message>
+ <location filename="Operations/QuantificationDialog.cpp" line="115"/>
+ <source>Quantification personnalisee :</source>
+ <translation>Custom quantization :</translation>
+ </message>
+ <message>
+ <location filename="Operations/QuantificationDialog.cpp" line="119"/>
+ <source>Quantification LloydMax :</source>
+ <translation>LloydMax quantization :</translation>
+ </message>
+ <message>
+ <location filename="Operations/QuantificationDialog.cpp" line="125"/>
+ <source>Quantification lineaire a valeurs centrees :</source>
+ <translation>Linear quantization with centered values :</translation>
+ </message>
<message>
<location filename="Operations/QuantificationDialog.cpp" line="142"/>
<source>Open a file</source>
@@ -1657,29 +1715,24 @@ Number of classes = %1 </translation>
<translation type="vanished">quantified</translation>
</message>
<message>
- <location filename="Operations/QuantificationOp.cpp" line="203"/>
<source>Quantification non lineaire a valeur centree</source>
- <translation>Non linear quantization with centered values</translation>
+ <translation type="vanished">Non linear quantization with centered values</translation>
</message>
<message>
- <location filename="Operations/QuantificationOp.cpp" line="205"/>
<source>Quantification non lineaire a moyennes</source>
- <translation>Non linear quantization with mean values</translation>
+ <translation type="vanished">Non linear quantization with mean values</translation>
</message>
<message>
- <location filename="Operations/QuantificationOp.cpp" line="207"/>
<source>Quantification personnalisee</source>
- <translation>Custom quantization</translation>
+ <translation type="vanished">Custom quantization</translation>
</message>
<message>
- <location filename="Operations/QuantificationOp.cpp" line="209"/>
<source>Quantification LloydMax</source>
- <translation>LloydMax quantization</translation>
+ <translation type="vanished">LloydMax quantization</translation>
</message>
<message>
- <location filename="Operations/QuantificationOp.cpp" line="210"/>
<source>Quantification lineaire a valeurs centrees</source>
- <translation>Linear quantization with centered values</translation>
+ <translation type="vanished">Linear quantization with centered values</translation>
</message>
</context>
<context>
diff --git a/app/imageinsa_fr.ts b/app/imageinsa_fr.ts
index 01d9f56ac0cb1231b2452ec3821f02573f72a5d1..64a4b47ab884f8f76388ce5d8f3255dde4a24daa 100644
--- a/app/imageinsa_fr.ts
+++ b/app/imageinsa_fr.ts
@@ -1190,6 +1190,37 @@ Nombre de classes = %1 </translation>
<source>Quantification</source>
<translation>Quantification</translation>
</message>
+ <message>
+ <location filename="Operations/QuantificationOp.cpp" line="44"/>
+ <source>
+Canal%d :
+</source>
+ <translation>
+Canal %d :
+</translation>
+ </message>
+ <message>
+ <location filename="Operations/QuantificationOp.cpp" line="49"/>
+ <source> Valeurs : </source>
+ <translation> Valeurs : </translation>
+ </message>
+ <message>
+ <location filename="Operations/QuantificationOp.cpp" line="64"/>
+ <source> Seuils : </source>
+ <translation> Seuils : </translation>
+ </message>
+ <message>
+ <location filename="Operations/QuantificationOp.cpp" line="140"/>
+ <source>Canal : %d Centroïd : %.2f % Plus proche voisin : %.2f %
+</source>
+ <translation>Canal : %d Centroïd : %.2f % Plus proche voisin : %.2f %
+</translation>
+ </message>
+ <message>
+ <location filename="Operations/QuantificationOp.cpp" line="199"/>
+ <source>Respect des proprietes du quantificateur optimal : </source>
+ <translation>Respect des propriétés du quantificateur optimal : </translation>
+ </message>
<message>
<location filename="Operations/RandomImgOp.cpp" line="37"/>
<source>Generate random image</source>
@@ -1599,7 +1630,7 @@ Nombre de classes = %1 </translation>
<message>
<location filename="Operations/QuantificationDialog.cpp" line="59"/>
<source>LloydMax</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location filename="Operations/QuantificationDialog.cpp" line="61"/>
@@ -1621,6 +1652,33 @@ Nombre de classes = %1 </translation>
<source>Apply</source>
<translation>Appliquer</translation>
</message>
+ <message>
+ <location filename="Operations/QuantificationDialog.cpp" line="107"/>
+ <source>Quantification non lineaire a valeurs centrees :</source>
+ <oldsource>quantificiatQuantification non lineaire a valeurs centrees :</oldsource>
+ <translation>Quantification non linéaire à valeurs centrées :</translation>
+ </message>
+ <message>
+ <location filename="Operations/QuantificationDialog.cpp" line="111"/>
+ <source>Quantification non lineaire a valeurs moyennes :</source>
+ <oldsource>Quantification non lineaire a valeurs moyennes : </oldsource>
+ <translation>Quantification non linéaire à valeurs moyennes :</translation>
+ </message>
+ <message>
+ <location filename="Operations/QuantificationDialog.cpp" line="115"/>
+ <source>Quantification personnalisee :</source>
+ <translation>Quantification personnalisée :</translation>
+ </message>
+ <message>
+ <location filename="Operations/QuantificationDialog.cpp" line="119"/>
+ <source>Quantification LloydMax :</source>
+ <translation>Quantification LloydMax :</translation>
+ </message>
+ <message>
+ <location filename="Operations/QuantificationDialog.cpp" line="125"/>
+ <source>Quantification lineaire a valeurs centrees :</source>
+ <translation>Quantification linéaire à valeurs centrées :</translation>
+ </message>
<message>
<location filename="Operations/QuantificationDialog.cpp" line="142"/>
<source>Open a file</source>
@@ -1645,29 +1703,24 @@ Nombre de classes = %1 </translation>
<translation type="vanished">quantifiée</translation>
</message>
<message>
- <location filename="Operations/QuantificationOp.cpp" line="203"/>
<source>Quantification non lineaire a valeur centree</source>
- <translation>Quantification non-linéaire à valeurs centrées</translation>
+ <translation type="vanished">Quantification non-linéaire à valeurs centrées</translation>
</message>
<message>
- <location filename="Operations/QuantificationOp.cpp" line="205"/>
<source>Quantification non lineaire a moyennes</source>
- <translation>Quantification non linéaire à valeurs moyennes</translation>
+ <translation type="vanished">Quantification non linéaire à valeurs moyennes</translation>
</message>
<message>
- <location filename="Operations/QuantificationOp.cpp" line="207"/>
<source>Quantification personnalisee</source>
- <translation>Quantification personnalisée</translation>
+ <translation type="vanished">Quantification personnalisée</translation>
</message>
<message>
- <location filename="Operations/QuantificationOp.cpp" line="209"/>
<source>Quantification LloydMax</source>
- <translation>Quantification LloydMax</translation>
+ <translation type="vanished">Quantification LloydMax</translation>
</message>
<message>
- <location filename="Operations/QuantificationOp.cpp" line="210"/>
<source>Quantification lineaire a valeurs centrees</source>
- <translation>Quantification linéaire à valeurs centrées</translation>
+ <translation type="vanished">Quantification linéaire à valeurs centrées</translation>
</message>
</context>
<context>