preview : draw SUBST & Pac, add 2D & true 3D depending on format, add…

… transparency, add themes
thomaslepoix · Sep 23, 2024 · 84dfd99 · 84dfd99
1 parent bca9cf8
commit 84dfd99
Show file tree

Hide file tree

Showing 8 changed files with 385 additions and 151 deletions.
diff --git a/doc/qucsrflayout.1.in b/doc/qucsrflayout.1.in
@@ -41,7 +41,7 @@ Use directory as output (default current directory).
 \fB-f\fR \fIFORMAT\fR
 Use format as output layout format.
 
-FORMAT can be:
+\fIFORMAT\fR can be:
 .PD 0
 .RS
 .TP
@@ -111,6 +111,31 @@ Order metal resolution mesh lines by edge coordinate. Default is grouped by comp
 .TP
     \fB--oems-pkg\fR
 Look for 'openems' and 'csxcad' Octave packages. Requires properly packaged Octaves packages such as 'octave-openems' and 'octave-csxcad' from Debian repositories.
+.TP
+    \fB--gui-theme\fR \fITHEME\fR
+Choose GUI color theme.
+
+\fITHEME\fR can be:
+.PD 0
+.RS
+.TP
+	\fBFlashy\fR (default theme)
+.".TP
+."	\fBCAD\fR
+.TP
+	\fBHighContrast\fR
+.TP
+	\fBHighContrast2\fR
+.TP
+	\fBQucsGUI\fR
+.TP
+	\fBQucsIcon\fR
+.TP
+	\fBSolvespace\fR
+.TP
+	\fBTranscalc\fR
+.RE
+.PD
 
 .SH NOTES
 Microstrip components are supported except the lange coupler. Coplanar waveguide components are not yet. Any other component is not supported.

diff --git a/src/data.hpp b/src/data.hpp
@@ -85,6 +85,9 @@ class Data {
 	bool oems_sort_metalresmesh;
 	bool oems_pkg;
 
+#ifndef QRFL_MINIMAL
+	std::string gui_theme;
+#endif // QRFL_MINIMAL
 	Data();
 
 	void reset();

diff --git a/src/main.cpp b/src/main.cpp
@@ -103,7 +103,19 @@ int main(int argc, char* argv[]) {
 				        "                                     Default is grouped by component label.\n"
 				        "      --oems-pkg                     Look for 'openems' and 'csxcad' Octave packages. Requires properly\n"
 				        "                                     packaged Octaves packages such as 'octave-openems' and 'octave-csxcad'\n"
-				        "                                     from Debian repositories.\n";
+				        "                                     from Debian repositories.\n"
+#ifndef QRFL_MINIMAL
+				        "      --gui-theme THEME              Choose GUI color theme.\n"
+				        "                                     THEME can be:\n"
+				        "                                     - Flashy (default theme)\n"
+				        "                                     - HighContrast\n"
+				        "                                     - HighContrast2\n"
+				        "                                     - QucsGUI\n"
+				        "                                     - QucsIcon\n"
+				        "                                     - Solvespace\n"
+				        "                                     - Transcalc\n"
+#endif // QRFL_MINIMAL
+				        ;
 				return EXIT_SUCCESS;
 			} else if(string(argv[i])=="--version") {
 				cout << "Qucs-RFlayout " << VERSION
@@ -193,6 +205,11 @@ int main(int argc, char* argv[]) {
 				data.oems_sort_metalresmesh=true;
 			} else if(string(argv[i])=="--oems-pkg") {
 				data.oems_pkg=true;
+#ifndef QRFL_MINIMAL
+			} else if(string(argv[i])=="--gui-theme" && argv[i+1]) {
+				i++;
+				data.gui_theme=string(argv[i]);
+#endif // QRFL_MINIMAL
 			} else if(string(argv[i])=="-v" || string(argv[i])=="--verbose") {
 				verbose=true;
 #ifndef QRFL_MINIMAL

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -43,6 +43,8 @@ MainWindow::MainWindow(Data& _data, QWidget* parent) :
 	ui->le_oems_timeres->setText(QString::number(data.oems_timeres));
 	ui->cb_oems_pkg->setCheckState(_data.oems_pkg ? Qt::Checked : Qt::Unchecked);
 	ui->cb_oems_sort_metalresmesh->setCheckState(_data.oems_sort_metalresmesh ? Qt::Checked : Qt::Unchecked);
+	ui->cb_transparency->setCheckState(Qt::Unchecked);
+	ui->glw_preview->setTheme(_data.gui_theme);
 	ui->tw_actions->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);
 
 	for(std::tuple<unsigned long, std::string, std::string> arg : data.port_shift_args) {
@@ -190,6 +192,12 @@ void MainWindow::write() {
 //******************************************************************************
 void MainWindow::on_cb_format_currentTextChanged(QString const& out_format) {
 	ui->gb_oems->setEnabled((out_format==".m") ? true : false);
+	ui->glw_preview->setF2D((out_format==".kicad_pcb"
+	                       ||out_format==".kicad_mod"
+	                       ||out_format==".lht"
+	                       ||out_format==".svg")
+	                       ? true : false);
+	ui->glw_preview->resetView();
 	data.out_format=out_format.toStdString();
 	}
 
@@ -208,6 +216,15 @@ void MainWindow::on_cb_specify_netlist_stateChanged(int const state) {
 		}
 	}
 
+//******************************************************************************
+void MainWindow::on_cb_transparency_stateChanged(int const state) {
+	if(state==Qt::Unchecked) {
+		ui->glw_preview->setTransparency(false);
+	} else if(state==Qt::Checked) {
+		ui->glw_preview->setTransparency(true);
+		}
+	}
+
 //******************************************************************************
 void MainWindow::on_cb_oems_pkg_stateChanged(int const state) {
 	if(state==Qt::Unchecked) {

diff --git a/src/mainwindow.hpp b/src/mainwindow.hpp
@@ -41,6 +41,7 @@ class MainWindow : public QMainWindow, public Loggable {
 private slots:
 	void on_cb_format_currentTextChanged(QString const& out_format);
 	void on_cb_specify_netlist_stateChanged(int const state);
+	void on_cb_transparency_stateChanged(int const state);
 	void on_cb_oems_pkg_stateChanged(int const state);
 	void on_cb_oems_sort_metalresmesh_stateChanged(int const state);
 	void on_le_oems_end_criteria_textChanged(QString const& oems_end_criteria);

diff --git a/src/mainwindow.ui b/src/mainwindow.ui
@@ -239,9 +239,39 @@ Should be a component label</string>
       </property>
      </widget>
     </item>
+
     <item row="2" column="0" rowspan="16" colspan="2">
-     <widget class="Preview" name="glw_preview" native="true"/>
+     <widget class="QFrame" name="f_preview">
+      <layout class="QGridLayout" name="gl_preview">
+       <property name="leftMargin">
+        <number>0</number>
+       </property>
+       <property name="topMargin">
+        <number>0</number>
+       </property>
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
+        <number>0</number>
+       </property>
+       <item row="0" column="0" rowspan="1" colspan="1">
+        <widget class="QCheckBox" name="cb_transparency">
+         <property name="focusPolicy">
+          <enum>Qt::NoFocus</enum>
+         </property>
+         <property name="text">
+          <string>Transparency</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0" rowspan="15" colspan="2">
+        <widget class="Preview" name="glw_preview" native="true"/>
+       </item>
+      </layout>
+     </widget>
     </item>
+
     <item row="0" column="2" colspan="2">
      <widget class="QPushButton" name="pb_browse_in">
       <property name="text">