WebSVN - OpenInventory - Различия - Редакция 106 и 107


#ifndef MAINWINDOW_H
#define MAINWINDOW_H


//#include "mysql.h"
#include <QMainWindow>
#include <QStandardItemModel>
#include <QStandardItem>
#include <QTreeWidgetItem>
#include <QTextCodec>
#include <QSqlDatabase>

#include <QtGui>
#include <QString>
#include <QtSql>


/*
#include <QSqlField>
#include <QSqlRecord>
#include <QSqlTableModel>
#include <QSqlQueryModel>
#include <QTableView>
#include <QSqlDriverPlugin>
#include <QIcon>
#include <QVariant>
#include <QProcess>
#include <QByteArray>
*/

typedef struct Class {
        QString name;
        QString ID;

} TClass;




namespace Ui {
    class MainWindow;
}

class MainWindow : public QMainWindow {
    Q_OBJECT
public:
    MainWindow(QWidget *parent = 0);
    ~MainWindow();

protected:
    void changeEvent(QEvent *e);

private:
    Ui::MainWindow *ui;

    QList<QTreeWidgetItem *> root_items_list;
    QStandardItemModel *model;
    QStandardItem *item;
    QTreeWidgetItem *rootItem1, *rootItem2;
    void openBase();
    bool readModel();
    void setupModelData(const QStringList &lines, QTreeWidgetItem *parent);
    void creatModelString();
    QString modelString; // ñòðîêà, îïèñûâàþùàÿ ìîäåëü ïðåäñòàâëåíèÿ
    void addChildsString(QTreeWidgetItem *parentItem, int level);

    QSqlDatabase sql;

    bool openDataBase();
    bool buildPreviewModel(QString modelName, QString rootClassID);

    bool rebuildPreviewModel(QTreeWidgetItem* root_item, QString rootClassID);

    QString ClassName(QString class_id); //âîçâðàùàåò èìÿ êëàññà ïî åãî ID
    void addChildsItems(QTreeWidgetItem *perent_class_item); // äîáîâëÿåì ê ýëåìåíòó äåðåâà â êà÷åñòâå äî÷åðíèõ ýëåìåíòîâ âñå êëàññû, äëÿ êîòîðûõ êëàññ ýëåìåíòà ÿâëÿåòñÿ êîíòåéíåðîì
    QStringList classChields(QString class_id);
    QMap <QString, QString> getClassList(); // ïîëó÷àåì ñïèñîê êëàññîâ
    void initComboBox();
    QList<QTreeWidgetItem *> rootItems; // ñïèñîê óêàçàòåëåé êîðíåâûõ óçëîâ (ìîäåëåé)
    QMap <QString, QString> class_list_map;


private slots:
    void on_comboBox_currentIndexChanged( int index );
    void on_treeWidget_itemChanged ( QTreeWidgetItem * item, int column );
    void on_treeWidget_itemClicked ( QTreeWidgetItem * item, int column );
};




#endif // MAINWINDOW_H
 

Редакция 106	Редакция 107
1	#ifndef MAINWINDOW_H	1	#ifndef MAINWINDOW_H
2	#define MAINWINDOW_H	2	#define MAINWINDOW_H
3		3
4		4
5	//#include "mysql.h"	5	//#include "mysql.h"
6	#include <QMainWindow>	6	#include <QMainWindow>
7	#include <QStandardItemModel>	7	#include <QStandardItemModel>
8	#include <QStandardItem>	8	#include <QStandardItem>
9	#include <QTreeWidgetItem>	9	#include <QTreeWidgetItem>
10	#include <QTextCodec>	10	#include <QTextCodec>
11	#include <QSqlDatabase>	11	#include <QSqlDatabase>
12		12
13	#include <QtGui>	13	#include <QtGui>
14	#include <QString>	14	#include <QString>
15	#include <QtSql>	15	#include <QtSql>
16		16
17		17
18	/*	18	/*
19	#include <QSqlField>	19	#include <QSqlField>
20	#include <QSqlRecord>	20	#include <QSqlRecord>
21	#include <QSqlTableModel>	21	#include <QSqlTableModel>
22	#include <QSqlQueryModel>	22	#include <QSqlQueryModel>
23	#include <QTableView>	23	#include <QTableView>
24	#include <QSqlDriverPlugin>	24	#include <QSqlDriverPlugin>
25	#include <QIcon>	25	#include <QIcon>
26	#include <QVariant>	26	#include <QVariant>
27	#include <QProcess>	27	#include <QProcess>
28	#include <QByteArray>	28	#include <QByteArray>
29	*/	29	*/
30		30
31	typedef struct Class {	31	typedef struct Class {
32	QString name;	32	QString name;
33	QString ID;	33	QString ID;
34		34
35	} TClass;	35	} TClass;
36		36
37		37
38		38
39		39
40	namespace Ui {	40	namespace Ui {
41	class MainWindow;	41	class MainWindow;
42	}	42	}
43		43
44	class MainWindow : public QMainWindow {	44	class MainWindow : public QMainWindow {
45	Q_OBJECT	45	Q_OBJECT
46	public:	46	public:
47	MainWindow(QWidget *parent = 0);	47	MainWindow(QWidget *parent = 0);
48	~MainWindow();	48	~MainWindow();
49		49
50	protected:	50	protected:
51	void changeEvent(QEvent *e);	51	void changeEvent(QEvent *e);
52		52
53	private:	53	private:
54	Ui::MainWindow *ui;	54	Ui::MainWindow *ui;
55		55
56	QList<QTreeWidgetItem *> root_items_list;	56	QList<QTreeWidgetItem *> root_items_list;
57	QStandardItemModel *model;	57	QStandardItemModel *model;
58	QStandardItem *item;	58	QStandardItem *item;
59	QTreeWidgetItem rootItem1, rootItem2;	59	QTreeWidgetItem rootItem1, rootItem2;
60	void openBase();	60	void openBase();
61	bool readModel();	61	bool readModel();
62	void setupModelData(const QStringList &lines, QTreeWidgetItem *parent);	62	void setupModelData(const QStringList &lines, QTreeWidgetItem *parent);
63	void creatModelString();	63	void creatModelString();
64	QString modelString; // ñòðîêà, îïèñûâàþùàÿ ìîäåëü ïðåäñòàâëåíèÿ	64	QString modelString; // ñòðîêà, îïèñûâàþùàÿ ìîäåëü ïðåäñòàâëåíèÿ
65	void addChildsString(QTreeWidgetItem *parentItem, int level);	65	void addChildsString(QTreeWidgetItem *parentItem, int level);
66		66
67	QSqlDatabase sql;	67	QSqlDatabase sql;
68		68
69	bool openDataBase();	69	bool openDataBase();
70	bool buildPreviewModel(QString modelName, QString rootClassID);	70	bool buildPreviewModel(QString modelName, QString rootClassID);
-		71
-		72	bool rebuildPreviewModel(QTreeWidgetItem* root_item, QString rootClassID);
-		73
71	QString ClassName(QString class_id); //âîçâðàùàåò èìÿ êëàññà ïî åãî ID	74	QString ClassName(QString class_id); //âîçâðàùàåò èìÿ êëàññà ïî åãî ID
72	void addChildsItems(QTreeWidgetItem *perent_class_item); // äîáîâëÿåì ê ýëåìåíòó äåðåâà â êà÷åñòâå äî÷åðíèõ ýëåìåíòîâ âñå êëàññû, äëÿ êîòîðûõ êëàññ ýëåìåíòà ÿâëÿåòñÿ êîíòåéíåðîì	75	void addChildsItems(QTreeWidgetItem *perent_class_item); // äîáîâëÿåì ê ýëåìåíòó äåðåâà â êà÷åñòâå äî÷åðíèõ ýëåìåíòîâ âñå êëàññû, äëÿ êîòîðûõ êëàññ ýëåìåíòà ÿâëÿåòñÿ êîíòåéíåðîì
73	QStringList classChields(QString class_id);	76	QStringList classChields(QString class_id);
74	QMap <QString, QString> getClassList(); // ïîëó÷àåì ñïèñîê êëàññîâ	77	QMap <QString, QString> getClassList(); // ïîëó÷àåì ñïèñîê êëàññîâ
75	void initComboBox();	78	void initComboBox();
76	QList<QTreeWidgetItem *> rootItems; // ñïèñîê óêàçàòåëåé êîðíåâûõ óçëîâ (ìîäåëåé)	79	QList<QTreeWidgetItem *> rootItems; // ñïèñîê óêàçàòåëåé êîðíåâûõ óçëîâ (ìîäåëåé)
77	QMap <QString, QString> class_list_map;	80	QMap <QString, QString> class_list_map;
78		81
79		82
80	private slots:	83	private slots:
81	void on_comboBox_currentIndexChanged( int index );	84	void on_comboBox_currentIndexChanged( int index );
82	void on_treeWidget_itemChanged ( QTreeWidgetItem * item, int column );	85	void on_treeWidget_itemChanged ( QTreeWidgetItem * item, int column );
83	void on_treeWidget_itemClicked ( QTreeWidgetItem * item, int column );	86	void on_treeWidget_itemClicked ( QTreeWidgetItem * item, int column );
84	};	87	};
85		88
86		89
87		90
88		91
89	#endif // MAINWINDOW_H	92	#endif // MAINWINDOW_H
90		93

Хранилища Subversion OpenInventory

(root)/trunk/DBViewer/mainwindow.h - Редакция 106 → 107