правки по ShutDown

Sh3.pro

@@ -45,7 +45,8 @@ SOURCES += main.cpp\
     checkboxmod.cpp \
     grairobject.cpp \
     vvod2z.cpp \
-    table2z.cpp
+    table2z.cpp \
+    graphicscrossitem.cpp
 
 HEADERS  += widget.h \
     zerkus.h \
@@ -82,7 +83,8 @@ HEADERS  += widget.h \
     checkboxmod.h \
     grairobject.h \
     vvod2z.h \
-    table2z.h
+    table2z.h \
+    graphicscrossitem.h
 
 FORMS    += widget.ui \
     zerkus.ui \

pics.qrc

@@ -17,5 +17,6 @@
     </qresource>
     <qresource prefix="/fon">
         <file>pics/loading.png</file>
+        <file>pics/shutdown.png</file>
     </qresource>
 </RCC>

widget.h

@@ -16,6 +16,7 @@
 #include "graphicsviewmod.h"
 #include "graphicsarcitem.h"
 #include "graphicslineitem.h"
+#include "graphicscrossitem.h"
 #include <QGraphicsColorizeEffect>
 #include "grairobject.h"
 
@@ -180,6 +181,10 @@ public:
     void initParams();
     void setGraph();
 
+    void setGrabFocus(int d);
+    QTimer *tmrFocus;
+    QTimer *tmrSyncr, *tmrReport;
+
     void setVCU(int id);
 	void clearVCU();
     int findTargetFromId(int id);
@@ -216,7 +221,7 @@ public:
     bool resetCVS[3];
 
     int splashIsOn;
-
+    bool systemHalt;
     bool meteoAvtonom, meteoSred;
     void setMeteo(bool m1, bool m2);
 
@@ -228,6 +233,7 @@ public:
     void    setRezhimGAG(int pos);
 
     int     rezhimZerk;
+    int     cvsRezhim;
 
     T_geoPoint ts, reper;
     T_metAv metAv;
@@ -264,10 +270,6 @@ public:
     qreal AS_t1, AS_t2, VCU_t1, VCU_t2, R_N_t1, R_N_t2, R_V_t1, R_V_t2;
     qreal AS_par;
 
-//    qreal grCrossAzim, grCrossDist;
-//   QGraphicsItem grCross;
-
-
     qreal azimutRLS;
     graphicsLineItem *grAzimutRLS;
     graphicsLineItem *grAzimutRLSnormal;
@@ -285,6 +287,8 @@ public:
     graphicsLineItem *grVCU;
     int lastKO;
 
+    graphicsCrossItem *grCross;
+    qreal grCrossX, grCrossY;
 
     bool autoZAdefault;
 
@@ -297,6 +301,7 @@ public:
 
 
     QTimer *loadScreenTmr;
+    QGraphicsRectItem *blackRect;
     int loadingPos;
     int loadingShift;
 
@@ -317,7 +322,7 @@ public slots:
     void switchWidget(int);
 
     void showSplash(int d=1);
-    void hideSplash() {showSplash(0);};
+    void hideSplash() {showSplash(0);}
 
     void msMeteoSredShow(void);
     void msVvodMA(void);
@@ -360,6 +365,8 @@ public slots:
 
 
     void closeSlot();
+    void MyClose();
+    void rebootSlot();
     void reCalculate();
 
     void processSendingDatagrams(QByteArray buf, int port=45460);
@@ -398,6 +405,9 @@ private slots:
     void on_comboBox_2_currentIndexChanged(int index);
 
     void on_pushButton_4_clicked();
+    void on_pushButton_3_clicked();
+    void on_pushButton_5_clicked();
+    void on_pushButton_6_clicked();
 
     void on_comboBox_currentIndexChanged(int index);
 
@@ -418,7 +428,7 @@ private slots:
 private:
     void putDate();
 
-
+    bool keyPressEnabled;
     virtual void	keyPressEvent ( QKeyEvent * e );
 
     Ui::Widget *ui;