WebSVN - OpenInventory - Различия - Редакция 201 и 202


#include "fileform.h"
#include "ui_fileform.h"
#include "mainwindow.h"

FileForm::FileForm(QWidget *parent) :
    QWidget(parent),
    ui(new Ui::FileForm)
{
    ui->setupUi(this);
    FileForm::fdataIsChanged = false;
}

FileForm::~FileForm()
{
    delete ui;
}

void FileForm::changeEvent(QEvent *e)
{
    QWidget::changeEvent(e);
    switch (e->type()) {
    case QEvent::LanguageChange:
        ui->retranslateUi(this);
        break;
    default:
        break;
    }
}



void FileForm::on_pushButton_clicked(){          // îáðàáîò÷èê íàæàòèÿ êíîïêè "Îòêðûòü ôàéë"
    QString  fileName;
    QFile file;
    QByteArray data_tmp;

        fileName = QFileDialog::getOpenFileName(this,
         tr("Open Image"), "", tr("All Files (*.*);;Image Files (*.png *.jpg *.bmp);;Text files (*.txt);;XML files (*.xml)")); //Images (*.png *.xpm *.jpg);;Text files (*.txt);;XML files (*.xml)

    if (fileName.isEmpty()) return;
    file.setFileName(fileName);
    if (!file.open(QIODevice::ReadOnly)) return;
    Data.clear();
    // Data = file.readAll();
    QDataStream out(&Data,QIODevice::ReadWrite);
    out << fileName;
    data_tmp = file.readAll();
    out << data_tmp;
    file.close();
    FileForm::fdataIsChanged = true;

}

void FileForm::on_pushButton_2_clicked(){          // îáðàáîò÷èê íàæàòèÿ êíîïêè "Óäàëèòü ôàéë"

    Data.clear();
    FileForm::fdataIsChanged = true;

}

void FileForm::on_pushButton_3_clicked(){          // îáðàáîò÷èê íàæàòèÿ êíîïêè "Ñîõðàíèòü ôàéë"

    QByteArray data_tmp;
    QFile file;
    QDataStream out(&Data,QIODevice::ReadOnly);
    QString fileName;
   // QString fileName_tmp;
    if (Data.isEmpty()) return;
    out.device()->reset();
    out >> fileName;
    fileName = QFileDialog::getSaveFileName(this, tr("Save File"),
                                                     fileName,
                                                     tr("All Files (*.*);;Image Files (*.png *.jpg *.bmp);;Text files (*.txt);;XML files (*.xml)"));


    if (fileName.isEmpty()) return;


        file.setFileName(fileName);
        if (!file.open(QIODevice::WriteOnly)) return;


    // Data = file.readAll();

  //  out.device()->reset();



    data_tmp.clear();
    out >> data_tmp;
    int count;
    count = file.write(data_tmp);
    int size;
    size = file.size();
    file.close();
    FileForm::fdataIsChanged = true;



}

 void FileForm::setData(QByteArray new_data){
        int i;

     Data = new_data;

     i++;
 }
 

Редакция 201	Редакция 202
1	#include "fileform.h"	1	#include "fileform.h"
2	#include "ui_fileform.h"	2	#include "ui_fileform.h"
3	#include "mainwindow.h"	3	#include "mainwindow.h"
4		4
5	FileForm::FileForm(QWidget *parent) :	5	FileForm::FileForm(QWidget *parent) :
6	QWidget(parent),	6	QWidget(parent),
7	ui(new Ui::FileForm)	7	ui(new Ui::FileForm)
8	{	8	{
9	ui->setupUi(this);	9	ui->setupUi(this);
10	FileForm::fdataIsChanged = false;	10	FileForm::fdataIsChanged = false;
11	}	11	}
12		12
13	FileForm::~FileForm()	13	FileForm::~FileForm()
14	{	14	{
15	delete ui;	15	delete ui;
16	}	16	}
17		17
18	void FileForm::changeEvent(QEvent *e)	18	void FileForm::changeEvent(QEvent *e)
19	{	19	{
20	QWidget::changeEvent(e);	20	QWidget::changeEvent(e);
21	switch (e->type()) {	21	switch (e->type()) {
22	case QEvent::LanguageChange:	22	case QEvent::LanguageChange:
23	ui->retranslateUi(this);	23	ui->retranslateUi(this);
24	break;	24	break;
25	default:	25	default:
26	break;	26	break;
27	}	27	}
28	}	28	}
29		29
30		30
31		31
32	void FileForm::on_pushButton_clicked(){ // îáðàáîò÷èê íàæàòèÿ êíîïêè "Îòêðûòü ôàéë"	32	void FileForm::on_pushButton_clicked(){ // îáðàáîò÷èê íàæàòèÿ êíîïêè "Îòêðûòü ôàéë"
33	QString fileName;	33	QString fileName;
34	QFile file;	34	QFile file;
35	QByteArray data_tmp;	35	QByteArray data_tmp;
36		36
37	fileName = QFileDialog::getOpenFileName(this,	37	fileName = QFileDialog::getOpenFileName(this,
38	tr("Open Image"), "", tr("All Files (.);;Image Files (.png .jpg .bmp);;Text files (.txt);;XML files (.xml)")); //Images (.png .xpm .jpg);;Text files (.txt);;XML files (.xml)	38	tr("Open Image"), "", tr("All Files (.);;Image Files (.png .jpg .bmp);;Text files (.txt);;XML files (.xml)")); //Images (.png .xpm .jpg);;Text files (.txt);;XML files (.xml)
39		39
40	if (fileName.isEmpty()) return;	40	if (fileName.isEmpty()) return;
41	file.setFileName(fileName);	41	file.setFileName(fileName);
42	if (!file.open(QIODevice::ReadOnly)) return;	42	if (!file.open(QIODevice::ReadOnly)) return;
43	Data.clear();	43	Data.clear();
44	// Data = file.readAll();	44	// Data = file.readAll();
45	QDataStream out(&Data,QIODevice::ReadWrite);	45	QDataStream out(&Data,QIODevice::ReadWrite);
46	out << fileName;	46	out << fileName;
47	data_tmp = file.readAll();	47	data_tmp = file.readAll();
48	out << data_tmp;	48	out << data_tmp;
49	file.close();	49	file.close();
50	FileForm::fdataIsChanged = true;	50	FileForm::fdataIsChanged = true;
51		51
52	}	52	}
53		53
54	void FileForm::on_pushButton_2_clicked(){ // îáðàáîò÷èê íàæàòèÿ êíîïêè "Óäàëèòü ôàéë"	54	void FileForm::on_pushButton_2_clicked(){ // îáðàáîò÷èê íàæàòèÿ êíîïêè "Óäàëèòü ôàéë"
55		55
56	Data.clear();	56	Data.clear();
57	FileForm::fdataIsChanged = true;	57	FileForm::fdataIsChanged = true;
58		58
59	}	59	}
60		60
61	void FileForm::on_pushButton_3_clicked(){ // îáðàáîò÷èê íàæàòèÿ êíîïêè "Ñîõðàíèòü ôàéë"	61	void FileForm::on_pushButton_3_clicked(){ // îáðàáîò÷èê íàæàòèÿ êíîïêè "Ñîõðàíèòü ôàéë"
62		62
63	QByteArray data_tmp;	63	QByteArray data_tmp;
64	QFile file;	64	QFile file;
65	QDataStream out(&Data,QIODevice::ReadOnly);	65	QDataStream out(&Data,QIODevice::ReadOnly);
66	QString fileName;	66	QString fileName;
-		67	// QString fileName_tmp;
67	if (Data.isEmpty()) return;	68	if (Data.isEmpty()) return;
-		69	out.device()->reset();
68	out >> fileName;	70	out >> fileName;
69	fileName = QFileDialog::getSaveFileName(this, tr("Save File"),	71	fileName = QFileDialog::getSaveFileName(this, tr("Save File"),
70	fileName,	72	fileName,
71	tr("All Files (.);;Image Files (.png .jpg .bmp);;Text files (.txt);;XML files (*.xml)"));	73	tr("All Files (.);;Image Files (.png .jpg .bmp);;Text files (.txt);;XML files (*.xml)"));
72		74
73		75
74	if (fileName.isEmpty()) return;	76	if (fileName.isEmpty()) return;
75		77
76		78
77	file.setFileName(fileName);	79	file.setFileName(fileName);
78	if (!file.open(QIODevice::WriteOnly)) return;	80	if (!file.open(QIODevice::WriteOnly)) return;
79		81
80		82
81	// Data = file.readAll();	83	// Data = file.readAll();
82		84
83	// out.device()->reset();	85	// out.device()->reset();
84		86
85		87
86		88
87	data_tmp.clear();	89	data_tmp.clear();
88	out >> data_tmp;	90	out >> data_tmp;
89	int count;	91	int count;
90	count = file.write(data_tmp);	92	count = file.write(data_tmp);
91	int size;	93	int size;
92	size = file.size();	94	size = file.size();
93	file.close();	95	file.close();
94	FileForm::fdataIsChanged = true;	96	FileForm::fdataIsChanged = true;
95		97
96		98
97		99
98	}	100	}
-		101
-		102	void FileForm::setData(QByteArray new_data){
-		103	int i;
-		104
-		105	Data = new_data;
-		106
-		107	i++;
-		108	}
99		109

Хранилища Subversion OpenInventory

(root)/trunk/DBViewer/fileform.cpp @ 227 - Редакция 201 → 202