Merge branch 'master' into release

perdrix52 · perdrix52 · commit 93efef80157f · 2023-11-10T10:18:18.000Z
diff --git a/DeepSkyStacker/AskRegistering.h b/DeepSkyStacker/AskRegistering.h
@@ -1,5 +1,4 @@
 #pragma once
-#include <QDialog>
 
 namespace Ui {
 	class AskRegistering;
diff --git a/DeepSkyStackerKernel/DSSProgress.h b/DeepSkyStackerKernel/DSSProgress.h
@@ -36,8 +36,6 @@
 ****************************************************************************/
 // DSSProgress.h : Header file
 //
-#include <QObject>
-#include <QString>
 namespace DSS
 {
 	class ProgressBase
diff --git a/DeepSkyStackerLive/ChartTab.h b/DeepSkyStackerLive/ChartTab.h
@@ -1,10 +1,6 @@
 #pragma once
 
-#include <QWidget>
 #include "ui_ChartTab.h"
-#include <QLineSeries>
-#include <QValueAxis>
-#include <QScatterSeries>
 
 namespace DSS
 {
diff --git a/DeepSkyStackerLive/DeepSkyStackerLive.h b/DeepSkyStackerLive/DeepSkyStackerLive.h
@@ -38,7 +38,6 @@
 //
 #include "dssbase.h"
 #include "ui/ui_DeepSkyStackerLive.h"
-#include <QStyledItemDelegate>
 
 class QWinHost;
 class CLightFrameInfo;
diff --git a/DeepSkyStackerLive/EmailSettings.h b/DeepSkyStackerLive/EmailSettings.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <QDialog>
 #include "ui_EmailSettings.h"
 
 namespace DSS
diff --git a/DeepSkyStackerLive/RestartMonitoring.h b/DeepSkyStackerLive/RestartMonitoring.h
@@ -37,7 +37,6 @@
 // RestartMonitoring.h : Dialog header
 //
 
-#include <QDialog>
 #include "ui_RestartMonitoring.h"
 
 namespace DSS
diff --git a/DeepSkyStackerLive/fileregistrar.h b/DeepSkyStackerLive/fileregistrar.h
@@ -36,9 +36,6 @@
 ****************************************************************************/
 // FileRegistrar.h : Header file
 //
-#include <deque>
-#include <QObject>
-
 class CMemoryBitmap;
 class CLightFrameInfo;
 class LoadedImage;
diff --git a/DeepSkyStackerLive/filestacker.h b/DeepSkyStackerLive/filestacker.h
@@ -36,8 +36,6 @@
 ****************************************************************************/
 // FileStacker.h : Header file
 //
-#include <deque>
-#include <QThread>
 #include "RunningStackingEngine.h"
 
 class CLightFrameInfo;
diff --git a/DeepSkyStackerLive/foldermonitor.h b/DeepSkyStackerLive/foldermonitor.h
@@ -36,7 +36,6 @@
 ****************************************************************************/
 // FolderMonitor.h : Header file
 //
-#include <QObject>
 namespace DSS
 {
 	class FolderMonitor : public QObject, public QRunnable
diff --git a/DeepSkyStackerLive/footprint.h b/DeepSkyStackerLive/footprint.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <QWidget>
-
 namespace DSS
 {
 	class ImageView;
diff --git a/DeepSkyStackerLive/imageviewer.h b/DeepSkyStackerLive/imageviewer.h
@@ -36,7 +36,6 @@
 ****************************************************************************/
 // ImageViewer.h : Declares the class behaviors for the application.
 //
-#include <QWidget>
 #include "ui_ImageViewer.h"
 #include "BitmapExt.h"
 #include "imageloader.h"
diff --git a/DeepSkyStackerLive/progresslive.h b/DeepSkyStackerLive/progresslive.h
@@ -36,7 +36,6 @@
 ****************************************************************************/
 // ProgressLive.h : Defines the DSS Live Progress class
 //
-#include <QObject>
 #include "DSSProgress.h"
 
 namespace DSS
diff --git a/DeepSkyStackerLive/stdafx.h b/DeepSkyStackerLive/stdafx.h
@@ -14,8 +14,14 @@
 #endif
 
 // Qt Files
+#include <QDialog>
 #include <QtWidgets>
 #include <QNetworkReply>
+#include <QLineSeries>
+#include <QValueAxis>
+#include <QScatterSeries>
+#include <QStyledItemDelegate>
+#include <QThread>
 
 // ZClass Files
 #include <zexcept.h>
diff --git a/Help/Aide DeepSkyStacker.wcp b/Help/Aide DeepSkyStacker.wcp
diff --git a/Help/french/userguide.htm b/Help/french/userguide.htm
@@ -500,20 +500,132 @@
     <td width="50%">
     <IMG border=0 alt ="Histogramme RGB" src="userguide_files/Histogram.jpg" width=389 height=233 ></td>
   </tr>
-</tbody></table>
-<p><font size="2" face="Arial">
-<b>Enregistrement/Chargement des param�tres d'ajustement</b><br>
-<b>Annuler/R� appliquer les param�tres d'ajustement<br>
-</b>En bas de chacun des trois onglets se trouvent les boutons permettant :<br>
+</tbody></table><FONT face=Arial>
+    <h4 align=justify >
+<FONT face=Arial>
+Utilisation pratique de l'�diteur :</FONT></h4>
+<p style="MARGIN-RIGHT: 0px" dir=ltr align=justify><FONT face="Arial" > Voici quelques recommandations sur la fa�on 
+d'obtenir les meilleurs r�sultats de l'�diteur :</FONT></p><OL><LI> 
+  <p class=MsoNormal style="MARGIN: 0cm" align="justify" 
+  DESIGNTIMESP="19568"><SPAN style='FONT-SIZE: 12pt; COLOR: black; mso-fareast-font-family: "Times New Roman"' 
+ >        
+          
+   <FONT face=Calibri>
+Commencez sur 
+  l�onglet Niveaux RVB/K.</FONT>
+      </SPAN></p><LI> 
+  <p class=MsoNormal style="MARGIN: 0cm" align="justify" 
+  DESIGNTIMESP="19568"><SPAN style='FONT-SIZE: 12pt; COLOR: black; mso-fareast-font-family: "Times New Roman"' 
+ >        
+          
+   <FONT face=Calibri>
+Utilisez le curseur 
+  "point noir" pour �largir les courbes au maximum.</FONT>
+      </SPAN></p><LI> 
+  <p class=MsoNormal style="MARGIN: 0cm" align="justify" 
+  DESIGNTIMESP="19568"><SPAN style='FONT-SIZE: 12pt; COLOR: black; mso-fareast-font-family: "Times New Roman"' 
+ >        
+          
+   <FONT face=Calibri>
+Utilisez le curseur 
+  du milieu pour les d�placer vers la gauche et les aligner.</FONT>
+      </SPAN></p><LI> 
+  <p class=MsoNormal style="MARGIN: 0cm" align="justify" 
+  DESIGNTIMESP="19568"><SPAN style='FONT-SIZE: 12pt; COLOR: black; mso-fareast-font-family: "Times New Roman"' 
+ >        
+          
+   <FONT face=Calibri>
+Si n�cessaire, 
+  effectuez des ajustements mineurs avec les curseurs � point blanc 
+  �.</FONT>
+      </SPAN></p><LI> 
+  <p class=MsoNormal style="MARGIN: 0cm" align="justify" 
+  DESIGNTIMESP="19568"><SPAN style='FONT-SIZE: 12pt; COLOR: black; mso-fareast-font-family: "Times New Roman"' 
+ >        
+          
+   <FONT face=Calibri>
+Passez � l'onglet 
+  Luminance.</FONT>
+      </SPAN></p><LI> 
+  <p class=MsoNormal style="MARGIN: 0cm" align="justify" 
+  DESIGNTIMESP="19568"><SPAN style='FONT-SIZE: 12pt; COLOR: black; mso-fareast-font-family: "Times New Roman"' 
+ >        
+          
+   <FONT face=Calibri>
+Ajustez la courbe 
+  pour obtenir une courbe en "S" qui monte � travers les 
+  sommets.</FONT>
+      </SPAN></p><LI> 
+  <p class=MsoNormal style="MARGIN: 0cm" align="justify" 
+  DESIGNTIMESP="19568"><SPAN style='FONT-SIZE: 12pt; COLOR: black; mso-fareast-font-family: "Times New Roman"' 
+ >        
+          
+   <FONT face=Calibri>
+Passez � l'onglet 
+  Saturation.</FONT>
+      </SPAN></p><LI> 
+  <p class=MsoNormal style="MARGIN: 0cm" align="justify" 
+  DESIGNTIMESP="19568"><SPAN style='FONT-SIZE: 12pt; COLOR: black; mso-fareast-font-family: "Times New Roman"' 
+ >        
+          
+   <FONT face=Calibri>
+Ajustez le niveau 
+  de saturation entre (g�n�ralement) entre 20 et 25 pour cent.Start 
+  on&nbsp;RGB/K Levels tab.</FONT>
+      </SPAN>
+    <o:p ></p></LI>
+</OL><P class=MsoNormal style="MARGIN: 0cm">
+  <SPAN 
+style='FONT-SIZE: 12pt; COLOR: black; mso-fareast-font-family: "Times New Roman"'>
+    <SPAN style='FONT-SIZE: 12pt; FONT-FAMILY: "Calibri",sans-serif; COLOR: black; mso-fareast-font-family: "Times New Roman"; mso-ansi-language: EN-GB; mso-fareast-language: JA; mso-bidi-language: AR-SA'><SPAN style='FONT-SIZE: 12pt; COLOR: black; mso-fareast-font-family: "Times New Roman"'>
+    <FONT face=Arial><SPAN style='FONT-SIZE: 11pt; FONT-FAMILY: "Calibri",sans-serif; mso-fareast-font-family: "Yu Gothic"; mso-ansi-language: EN-GB; mso-fareast-language: JA; mso-bidi-language: AR-SA; mso-ascii-theme-font: minor-latin; mso-fareast-theme-font: minor-fareast; mso-hansi-theme-font: minor-latin; mso-bidi-font-family: "Times New Roman"; mso-bidi-theme-font: minor-bidi'>
+  <FONT size=2 face=Arial>
+    Remarque : Les 
+    curseurs sont 
+les petits triangles situ�s sous les barres de couleur. Celui de gauche est pour le 
+point noir et celui de droite pour le point blanc.
+  </FONT>      
+      </SPAN></FONT></SPAN></SPAN>
+  </SPAN>      
+      </P>
+    <P class=MsoNormal style="MARGIN: 0cm"><SPAN style='FONT-SIZE: 12pt; COLOR: black; mso-fareast-font-family: "Times New Roman"'>
+    <SPAN style='FONT-SIZE: 12pt; FONT-FAMILY: "Calibri",sans-serif; COLOR: black; mso-fareast-font-family: "Times New Roman"; mso-ansi-language: EN-GB; mso-fareast-language: JA; mso-bidi-language: AR-SA'><SPAN style='FONT-SIZE: 12pt; COLOR: black; mso-fareast-font-family: "Times New Roman"'>
+  <FONT face=Arial>
+    <FONT size=3><SPAN style='FONT-SIZE: 11pt; FONT-FAMILY: "Calibri",sans-serif; mso-fareast-font-family: "Yu Gothic"; mso-ansi-language: EN-GB; mso-fareast-language: JA; mso-bidi-language: AR-SA; mso-ascii-theme-font: minor-latin; mso-fareast-theme-font: minor-fareast; mso-hansi-theme-font: minor-latin; mso-bidi-font-family: "Times New Roman"; mso-bidi-theme-font: minor-bidi'></SPAN></FONT>
+  </FONT>    </SPAN></SPAN></SPAN>&nbsp;</P>
+    <P class=MsoNormal style="MARGIN: 0cm"><SPAN style='FONT-SIZE: 12pt; COLOR: black; mso-fareast-font-family: "Times New Roman"'>
+  <SPAN 
+style='FONT-SIZE: 12pt; FONT-FAMILY: "Calibri",sans-serif; COLOR: black; mso-fareast-font-family: "Times New Roman"; mso-ansi-language: EN-GB; mso-fareast-language: JA; mso-bidi-language: AR-SA'>
+    <SPAN style='FONT-SIZE: 12pt; COLOR: black; mso-fareast-font-family: "Times New Roman"'><FONT face="Arial" >
+    <FONT size=3 ><SPAN style='FONT-SIZE: 11pt; FONT-FAMILY: "Calibri",sans-serif; mso-fareast-font-family: "Yu Gothic"; mso-ansi-language: EN-GB; mso-fareast-language: JA; mso-bidi-language: AR-SA; mso-ascii-theme-font: minor-latin; mso-fareast-theme-font: minor-fareast; mso-hansi-theme-font: minor-latin; mso-bidi-font-family: "Times New Roman"; mso-bidi-theme-font: minor-bidi'></SPAN>Voici     
+          un film que j'ai cr�� montrant comment proc�der avec 
+    une image r�elle : <SPAN style='FONT-SIZE: 12pt; FONT-FAMILY: "Calibri",sans-serif; COLOR: black; mso-fareast-font-family: "Times New Roman"; mso-ansi-language: EN-GB; mso-fareast-language: JA; mso-bidi-language: AR-SA'>
+  <SPAN 
+style='FONT-SIZE: 12pt; COLOR: black; mso-fareast-font-family: "Times New Roman"'>
+    <A href="../DSS Editing.mp4" >Regardez le film sur l'utilisation de 
+l'�diteur</A>
+  </SPAN>  </SPAN></FONT></FONT></SPAN>
+  </SPAN>     
+      </SPAN></P>
+   
+ </O:P>
+   
+ </FONT>
+<h4><FONT face=Arial>Enregistrement/Chargement des 
+param�tres d'ajustement<br>
+Annuler/R� appliquer les 
+param�tres d'ajustement</FONT></h4>
+<p><FONT face=Arial>En bas de chacun des trois onglets se trouvent les boutons permettant :<br>
 - d'appliquer les derni�res modifications � l'image<br>
 - d'annuler les derni�res modifications appliqu�es<br>
 - de r� appliquer les derni�res modification annuler<br>
 - de r�initialiser compl�tement les valeurs<br>
 - d'acc�der � un dialogue permettant d'enregistrer/charger des configurations 
-d'ajustements nomm�es<br>
-<br>
-<b><br>
-Chargement d'une image<br>
+d'ajustements nomm�es<br></FONT></p>
+<h4>Chargement d'une image</h4>
+<p><font size="2" face="Arial">
+<b>
+  <br>
 </b>DeepSkyStacker permet de charger des images au format DSImage (<a href="http://deepskystacker.free.fr/french/faq.htm#autosave">enregistr�es 
 uniquement</a> � la fin du processus d'empilement), TIFF (8, 16 et 32 bits, 
 monochrome ou couleurs RGB) ou FITS (8, 16, 32 et 64 bits, monochrome ou 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`#pragma once`
`2`		`-#include <QDialog>`
`3`	`2`
`4`	`3`	`namespace Ui {`
`5`	`4`	`class AskRegistering;`
Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,6 @@`
`36`	`36`	`****************************************************************************/`
`37`	`37`	`// DSSProgress.h : Header file`
`38`	`38`	`//`
`39`		`-#include <QObject>`
`40`		`-#include <QString>`
`41`	`39`	`namespace DSS`
`42`	`40`	`{`
`43`	`41`	`class ProgressBase`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,6 @@`
`1`	`1`	`#pragma once`
`2`	`2`
`3`		`-#include <QWidget>`
`4`	`3`	`#include "ui_ChartTab.h"`
`5`		`-#include <QLineSeries>`
`6`		`-#include <QValueAxis>`
`7`		`-#include <QScatterSeries>`
`8`	`4`
`9`	`5`	`namespace DSS`
`10`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,6 @@`
`36`	`36`	`****************************************************************************/`
`37`	`37`	`// FolderMonitor.h : Header file`
`38`	`38`	`//`
`39`		`-#include <QObject>`
`40`	`39`	`namespace DSS`
`41`	`40`	`{`
`42`	`41`	`class FolderMonitor : public QObject, public QRunnable`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,5 @@`
`1`	`1`	`#pragma once`
`2`	`2`
`3`		`-#include <QWidget>`
`4`		`-`
`5`	`3`	`namespace DSS`
`6`	`4`	`{`
`7`	`5`	`class ImageView;`