Coil64 v2.2.34 updated 2025-02-20

radioacoustick · Feb 20, 2025 · 42cff66 · 42cff66
1 parent 702ead6
commit 42cff66
Show file tree

Hide file tree

Showing 65 changed files with 21,764 additions and 20,800 deletions.
diff --git a/Coil64.pro b/Coil64.pro
@@ -59,6 +59,7 @@ SOURCES += main.cpp\
     scdockwidget.cpp
 
 HEADERS  += mainwindow.h \
+    proxystyle.h \
     resolves.h \
     bessel.h \
     resolve_q.h \

diff --git a/definitions.h b/definitions.h
@@ -19,7 +19,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses
 #define DEFINES
 
 #define APP_NAME "Coil64"
-#define VERSION "2.2.33"
+#define VERSION "2.2.34"
 #define PROGRAM_SITE "https://coil32.net"
 #define VERSION_FILE "qversion.txt"
 #define CLEAR_CHAR 0x274C

diff --git a/lang/Coil64_bg.ts b/lang/Coil64_bg.ts
diff --git a/lang/Coil64_cs.ts b/lang/Coil64_cs.ts
diff --git a/lang/Coil64_de.ts b/lang/Coil64_de.ts
diff --git a/lang/Coil64_el.ts b/lang/Coil64_el.ts
diff --git a/lang/Coil64_en.ts b/lang/Coil64_en.ts
diff --git a/lang/Coil64_es.ts b/lang/Coil64_es.ts
diff --git a/lang/Coil64_et.ts b/lang/Coil64_et.ts
diff --git a/lang/Coil64_fa.ts b/lang/Coil64_fa.ts
diff --git a/lang/Coil64_fr.ts b/lang/Coil64_fr.ts
diff --git a/lang/Coil64_hr.ts b/lang/Coil64_hr.ts
diff --git a/lang/Coil64_hu.ts b/lang/Coil64_hu.ts
diff --git a/lang/Coil64_it.ts b/lang/Coil64_it.ts
diff --git a/lang/Coil64_lt.ts b/lang/Coil64_lt.ts
diff --git a/lang/Coil64_mk.ts b/lang/Coil64_mk.ts
diff --git a/lang/Coil64_nl.ts b/lang/Coil64_nl.ts
diff --git a/lang/Coil64_pl.ts b/lang/Coil64_pl.ts
diff --git a/lang/Coil64_pt.ts b/lang/Coil64_pt.ts
diff --git a/lang/Coil64_ro.ts b/lang/Coil64_ro.ts
diff --git a/lang/Coil64_ru.ts b/lang/Coil64_ru.ts
diff --git a/lang/Coil64_sr.ts b/lang/Coil64_sr.ts
diff --git a/lang/Coil64_tr.ts b/lang/Coil64_tr.ts
diff --git a/lang/Coil64_uk.ts b/lang/Coil64_uk.ts
diff --git a/lang/Coil64_vi.ts b/lang/Coil64_vi.ts
diff --git a/lang/Coil64_zh.ts b/lang/Coil64_zh.ts
diff --git a/loop.cpp b/loop.cpp
@@ -52,6 +52,7 @@ Loop::~Loop()
     settings->setValue("a", a);
     settings->setValue("b", b);
     settings->setValue("d", dw);
+    settings->setValue("mu", mu);
     settings->setValue("isReverse", ui->checkBox_isReverce->isChecked());
     settings->setValue("loopKind", loopKind);
     settings->endGroup();
@@ -88,6 +89,7 @@ void Loop::getOpt(_OptionStruct gOpt){
     a = settings->value("a", 0).toDouble();
     b = settings->value("b", 0).toDouble();
     dw = settings->value("d", 0).toDouble();
+    mu = settings->value("mu", 1).toDouble();
     settings->endGroup();
     if (fOpt->isAWG){
         ui->label_03->setText(tr("AWG"));
@@ -98,11 +100,12 @@ void Loop::getOpt(_OptionStruct gOpt){
             ui->lineEdit_3->setText("");
     } else
         ui->lineEdit_3->setText(roundTo(dw / fOpt->dwLengthMultiplier, loc, fOpt->dwAccuracy));
+    ui->lineEdit_4->setText(roundTo(mu, loc, fOpt->dwAccuracy));
     resize(size);
     move(pos);
     ui->checkBox_isReverce->setChecked(isReverse);
-    QString tmpTxt = tr("Wire diameter") + " d:";
-    ui->label_3->setText(tmpTxt);
+    ui->label_3->setText(tr("Wire diameter") + " d:");
+    ui->label_4->setText(tr("Wire magnetic permeability") + " μ:");
     on_checkBox_isReverce_clicked();
     delete settings;
     if (fOpt->styleGUI == _DarkStyle){
@@ -250,6 +253,12 @@ void Loop::on_pushButton_clicked()
     QString sImage = "";
     QString sInput = "";
     QString sResult = "";
+    bool ok4;
+    mu = loc.toDouble(ui->lineEdit_4->text(), &ok4);
+    if(!ok4){
+        showWarning(tr("Warning"), tr("One or more inputs have an illegal format!"));
+        return;
+    }
     if(loopKind == 0){
         sCaption += " (" + ui->radioButton_round->text() +  + ")";
         sImage = "<img src=\":/images/res/loop0.png\">";
@@ -285,18 +294,18 @@ void Loop::on_pushButton_clicked()
         sInput += formattedOutput(fOpt, ui->label_3->text(), ui->lineEdit_3->text(), ui->label_03->text()) + "</p>";
         sResult = "<p><u>" + tr("Result") + ":</u><br/>";
         if(loopKind == 0){
-            a = findRoundLoop_D(ind, dw);
+            a = findRoundLoop_D(ind, dw, mu);
             sResult += formattedOutput(fOpt, tr("Loop diameter") + " D: ", roundTo(a / fOpt->dwLengthMultiplier, loc, fOpt->dwAccuracy),
                                        qApp->translate("Context", fOpt->ssLengthMeasureUnit.toUtf8())) + "<br/>";
             lw = a * M_PI;
         } else if (loopKind == 1){
-            a = findIsoIsoscelesTriangleLoop_a(ind, dw);
+            a = findIsoIsoscelesTriangleLoop_a(ind, dw, mu);
             b = a;
             sResult += formattedOutput(fOpt, tr("The side of the equilateral triangle") + " a = b: ", roundTo(a / fOpt->dwLengthMultiplier, loc, fOpt->dwAccuracy),
                                        qApp->translate("Context", fOpt->ssLengthMeasureUnit.toUtf8())) + "<br/>";
             lw = 3.0 * a;
         } else if (loopKind == 2){
-            a = findRectangleLoop_a(ind, dw);
+            a = findRectangleLoop_a(ind, dw, mu);
             b = a;
             sResult += formattedOutput(fOpt, tr("The side of quadrate") + " a = b: ", roundTo(a / fOpt->dwLengthMultiplier, loc, fOpt->dwAccuracy),
                                        qApp->translate("Context", fOpt->ssLengthMeasureUnit.toUtf8())) + "<br/>";
@@ -349,13 +358,13 @@ void Loop::on_pushButton_clicked()
             sInput += formattedOutput(fOpt, ui->label_2->text(), ui->lineEdit_2->text(), ui->label_02->text()) + "<br/>";
         sInput += formattedOutput(fOpt, ui->label_3->text(), ui->lineEdit_3->text(), ui->label_03->text()) + "</p>";
         if(loopKind == 0){
-            ind = findRoundLoop_I(a, dw);
+            ind = findRoundLoop_I(a, dw, mu);
             lw = a * M_PI;
         } else if (loopKind == 1){
-            ind = findIsoIsoscelesTriangleLoop_I(a, b, dw);
+            ind = findIsoIsoscelesTriangleLoop_I(a, b, dw, mu);
             lw = 2 * a + b;
         } else if (loopKind == 2){
-            ind = findRectangleLoop_I(a, b, dw);
+            ind = findRectangleLoop_I(a, b, dw, mu);
             lw = 2 * a + 2 * b;
         }
         sResult = "<p><u>" + tr("Result") + ":</u><br/>";

diff --git a/loop.h b/loop.h
@@ -65,7 +65,7 @@ private slots:
     QLocale loc;
 
     int loopKind;
-    double ind, a, b, dw, lw;
+    double ind, a, b, dw, lw, mu;
 };
 
 #endif // LOOP_H
diff --git a/loop.ui b/loop.ui
@@ -223,8 +223,8 @@
          <layout class="QVBoxLayout" name="verticalLayout_4">
           <item>
            <layout class="QGridLayout" name="gridLayout_2">
-            <item row="0" column="1">
-             <widget class="QLineEdit" name="lineEdit_1">
+            <item row="1" column="1">
+             <widget class="QLineEdit" name="lineEdit_2">
               <property name="sizePolicy">
                <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
                 <horstretch>0</horstretch>
@@ -233,8 +233,8 @@
               </property>
              </widget>
             </item>
-            <item row="1" column="2">
-             <widget class="QLabel" name="label_02">
+            <item row="0" column="2">
+             <widget class="QLabel" name="label_01">
               <property name="sizePolicy">
                <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
                 <horstretch>0</horstretch>
@@ -246,28 +246,31 @@
               </property>
              </widget>
             </item>
-            <item row="1" column="0">
-             <widget class="QLabel" name="label_2">
-              <property name="text">
-               <string notr="true">Side length b:</string>
+            <item row="2" column="2">
+             <widget class="QLabel" name="label_03">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
               </property>
-              <property name="wordWrap">
-               <bool>true</bool>
+              <property name="text">
+               <string notr="true">mm</string>
               </property>
              </widget>
             </item>
-            <item row="0" column="0">
-             <widget class="QLabel" name="label_1">
+            <item row="2" column="0">
+             <widget class="QLabel" name="label_3">
               <property name="text">
-               <string notr="true">Loop diameter D:</string>
+               <string notr="true">Wire diameter d:</string>
               </property>
               <property name="wordWrap">
                <bool>true</bool>
               </property>
              </widget>
             </item>
-            <item row="1" column="1">
-             <widget class="QLineEdit" name="lineEdit_2">
+            <item row="2" column="1">
+             <widget class="QLineEdit" name="lineEdit_3">
               <property name="sizePolicy">
                <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
                 <horstretch>0</horstretch>
@@ -276,49 +279,73 @@
               </property>
              </widget>
             </item>
-            <item row="0" column="2">
-             <widget class="QLabel" name="label_01">
+            <item row="0" column="1">
+             <widget class="QLineEdit" name="lineEdit_1">
               <property name="sizePolicy">
-               <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
+             </widget>
+            </item>
+            <item row="1" column="0">
+             <widget class="QLabel" name="label_2">
               <property name="text">
-               <string notr="true">mm</string>
+               <string notr="true">Side length b:</string>
+              </property>
+              <property name="wordWrap">
+               <bool>true</bool>
               </property>
              </widget>
             </item>
-            <item row="2" column="1">
-             <widget class="QLineEdit" name="lineEdit_3">
+            <item row="1" column="2">
+             <widget class="QLabel" name="label_02">
               <property name="sizePolicy">
-               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+               <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
+              <property name="text">
+               <string notr="true">mm</string>
+              </property>
              </widget>
             </item>
-            <item row="2" column="0">
-             <widget class="QLabel" name="label_3">
+            <item row="0" column="0">
+             <widget class="QLabel" name="label_1">
               <property name="text">
-               <string notr="true">Wire diameter d:</string>
+               <string notr="true">Loop diameter D:</string>
               </property>
               <property name="wordWrap">
                <bool>true</bool>
               </property>
              </widget>
             </item>
-            <item row="2" column="2">
-             <widget class="QLabel" name="label_03">
+            <item row="3" column="0">
+             <widget class="QLabel" name="label_4">
+              <property name="text">
+               <string notr="true">Wire magnetic permeability</string>
+              </property>
+              <property name="wordWrap">
+               <bool>true</bool>
+              </property>
+             </widget>
+            </item>
+            <item row="3" column="1">
+             <widget class="QLineEdit" name="lineEdit_4">
               <property name="sizePolicy">
-               <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
+             </widget>
+            </item>
+            <item row="3" column="2">
+             <widget class="QLabel" name="label_04">
               <property name="text">
-               <string notr="true">mm</string>
+               <string notr="true"/>
               </property>
              </widget>
             </item>