Marker notation follows diagram number notation #383

ra3xdh · Dec 1, 2023 · 06a82a1 · 06a82a1
1 parent b5921f2
commit 06a82a1
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 5 deletions.
diff --git a/qucs/diagrams/marker.cpp b/qucs/diagrams/marker.cpp
@@ -210,8 +210,14 @@ void Marker::createText()
   pz[1] = VarDep[1];
 
   // now actually create text.
+  bool engNotation = pGraph->parentDiagram()->engineeringNotation;
   for(unsigned ii=0; (pD=pGraph->axis(ii)); ++ii) {
-    Text += pD->Var + ": " + QString::number(VarPos[ii],'g',Precision) + "\n";
+    Text += pD->Var + ": ";
+    if (engNotation) {
+        Text += misc::num2str(VarPos[ii],Precision) + "\n";
+    } else {
+        Text += QString::number(VarPos[ii],'g',Precision) + "\n";
+    }
   }
 
   Text += pGraph->Var + ": ";
@@ -230,7 +236,11 @@ void Marker::createText()
   } else {
       double mag = sqrt(pz[0]*pz[0] + pz[1]*pz[1]);
       double val = qucs::num2db(mag,ax->Units);
-      Text += QString::number(val,'g',Precision);
+      if (engNotation) {
+          Text += misc::num2str(val,Precision) + "\n";
+      } else {
+          Text += QString::number(val,'g',Precision);
+      }
   }
 
   assert(diag());

diff --git a/qucs/misc.cpp b/qucs/misc.cpp
@@ -270,7 +270,7 @@ void misc::str2num(const QString& s_, double& Number, QString& Unit, double& Fac
 }
 
 // #########################################################################
-QString misc::num2str(double Num)
+QString misc::num2str(double Num, int Precision)
 {
   char c = 0;
   double cal = fabs(Num);
@@ -295,7 +295,13 @@ QString misc::num2str(double Num)
     if(c)  Num /= pow(10.0, double(3*Expo));
   }
 
-  QString Str = QString::number(Num);
+  QString Str;
+  if (Precision == -1) {
+      Str = QString::number(Num);
+  } else {
+      Str = QString::number(Num,'f',Precision);
+  }
+
   if(c)  Str += c;
 
   return Str;

diff --git a/qucs/misc.h b/qucs/misc.h
@@ -50,7 +50,7 @@ namespace misc {
   QString complexRad (double, double, int Precision=3);
   QString StringNum  (double, char form='g', int Precision=3);
   void    str2num    (const QString&, double&, QString&, double&);
-  QString num2str    (double);
+  QString num2str    (double, int Precision = -1);
   QColor ColorFromString(const QString& color);
   QString StringNiceNum(double);
   void    convert2Unicode(QString&);