Merge pull request #268 from dmpas/feature/fix-filepath-encoding

Кодировки в путях

Author: dmpas

src/gtool1cd/BlobViewer/blob_viewer.cpp

@@ -146,7 +146,14 @@ void BlobViewer::on_treeView_doubleClicked(const QModelIndex &index)
 	auto as_stream = static_cast<StreamDevice*>(data.value<QIODevice*>());
 	if (as_stream != nullptr) {
 		QString elementName = model->data(index, Qt::DisplayRole).toString();
-		BlobViewer *new_window = new BlobViewer(nullptr);
+		BlobViewer *new_window;
+		auto found_widget = widgets.find(elementName);
+		if (found_widget == widgets.end()) {
+			new_window = new BlobViewer(nullptr);
+			widgets[elementName] = new_window;
+		} else {
+			new_window = static_cast<BlobViewer *>(*found_widget);
+		}
 		new_window->setStream(as_stream->get_stream(), rootName + QString(" / ") + elementName);
 		new_window->show();
 	}

src/gtool1cd/BlobViewer/blob_viewer.h

@@ -3,6 +3,7 @@
 
 #include <QWidget>
 #include <TStream.hpp>
+#include <QMap>
 
 namespace Ui {
 class BlobViewer;
@@ -29,6 +30,7 @@ private slots:
 
 private:
 	QString rootName;
+	QMap<QString, QWidget *> widgets;
 	Ui::BlobViewer *ui;
 };
 

src/gtool1cd/configurations_window.cpp

@@ -11,7 +11,7 @@ ConfigurationsWindow::ConfigurationsWindow(T_1CD *db, QWidget *parent) :
     db(db)
 {
 	ui->setupUi(this);
-	setWindowTitle(QString::fromStdString(db->get_filename()));
+	setWindowTitle(QString::fromStdWString(db->get_filepath().wstring()));
 	ui->vendorsTable->setModel(new VendorConfigurationsTableModel(db));
 }
 
@@ -27,7 +27,7 @@ void ConfigurationsWindow::on_saveConfigButton_clicked()
 		return;
 	}
 
-	db->save_configsave(targetFileName.toStdString());
+	db->save_configsave(boost::filesystem::path(targetFileName.toStdWString()));
 }
 
 void ConfigurationsWindow::on_saveDbConfigButton_clicked()
@@ -37,7 +37,7 @@ void ConfigurationsWindow::on_saveDbConfigButton_clicked()
 		return;
 	}
 
-	db->save_config(targetFileName.toStdString());
+	db->save_config(boost::filesystem::path(targetFileName.toStdWString()));
 }
 
 void ConfigurationsWindow::on_saveVendorConfigButton_clicked()

src/gtool1cd/container_form.cpp

@@ -18,7 +18,8 @@ ContainerForm::~ContainerForm()
 void ContainerForm::open(const QString &filename)
 {
 	QFileInfo finfo(filename);
-	auto stream = new TFileStream(filename.toStdString(), fmOpenRead);
+	boost::filesystem::path filepath(filename.toStdWString());
+	auto stream = new TFileStream(filepath, fmOpenRead);
 	ui->widget->setStream(stream, finfo.baseName());
 	setWindowTitle(filename);
 }

src/gtool1cd/mainwindow.cpp

@@ -42,7 +42,7 @@ void MainWindow::open(T_1CD *database)
 {
 	db = database;
 	ui->tableListView->setModel(new TablesListModel(db));
-	setWindowTitle(QString::fromStdString(db->get_filename()));
+	setWindowTitle(QString::fromStdWString(db->get_filepath().wstring()));
 	// refresh data
 }
 

src/gtool1cd/models/vendor_configurations_table_model.cpp

@@ -69,6 +69,6 @@ void VendorConfigurationsTableModel::saveSupplierConfigToFile(const QModelIndex
 		return;
 	}
 	auto config = db->supplier_configs().at(index.row());
-	config->save_to_file(filename.toStdString());
+	config->save_to_file(boost::filesystem::path(filename.toStdWString()));
 }
 

src/gtool1cd/starter.cpp

@@ -108,7 +108,7 @@ bool StarterWindow::openDatabase(const QString &filename)
 	T_1CD *db = nullptr;
 	try {
 
-		db = new T_1CD(filename.toStdString(), reg);
+		db = new T_1CD(boost::filesystem::path(filename.toStdWString()), reg);
 		if (!db->is_open()) {
 			lw->show();
 			return false;

src/tool1cd/Class_1CD.cpp

@@ -207,8 +207,14 @@ T_1CD::~T_1CD()
 	if(pagemap) delete[] pagemap;
 }
 
+T_1CD::T_1CD(const boost::filesystem::path &_filename, MessageRegistrator *mess, bool _monopoly)
+{
+	msreg_m.AddMessageRegistrator(mess);
+	open(_filename, _monopoly);
+}
+
 //---------------------------------------------------------------------------
-T_1CD::T_1CD(const string &_filename, MessageRegistrator *mess, bool _monopoly)
+void T_1CD::open(const boost::filesystem::path &_filename, bool _monopoly)
 {
 	char* b = nullptr;
 	uint32_t* table_blocks = nullptr;
@@ -217,17 +223,15 @@ T_1CD::T_1CD(const string &_filename, MessageRegistrator *mess, bool _monopoly)
 	root_80* root80 = nullptr;
 	root_81* root81 = nullptr;
 
-	msreg_m.AddMessageRegistrator(mess);
-
 	init();
 
-	filename = System::Ioutils::TPath::GetFullPath(_filename);
+	filename = boost::filesystem::absolute(_filename).string();
 
 	std::shared_ptr<TFileStream> base_file;
 	try
 	{
 		base_file.reset(
-				new TFileStream(boost::filesystem::path(filename),
+				new TFileStream(_filename,
 								_monopoly ? (fmOpenReadWrite | fmShareDenyWrite)
 										  : (fmOpenRead | fmShareDenyNone)));
 	}
@@ -2157,6 +2161,11 @@ bool T_1CD::test_block_by_template(uint32_t testblock, char* tt, uint32_t num, i
 }
 
 std::string T_1CD::get_filename() const
+{
+	return filename.string();
+}
+
+const boost::filesystem::path &T_1CD::get_filepath() const
 {
 	return filename;
 }

src/tool1cd/Class_1CD.h

@@ -20,6 +20,7 @@
 #include "cfapi/TV8FileStream.h"
 #include "SupplierConfig.h"
 #include "TableRecord.h"
+#include <boost/filesystem.hpp>
 
 //---------------------------------------------------------------------------
 
@@ -186,9 +187,11 @@ class T_1CD
 
 	std::string ver;
 
-	T_1CD(const std::string &_filename, MessageRegistrator *mess = nullptr, bool monopoly = true);
+	T_1CD(const boost::filesystem::path &_filename, MessageRegistrator *mess = nullptr, bool monopoly = true);
 	T_1CD();
 	~T_1CD();
+	void open(const boost::filesystem::path &filename, bool monopoly);
+
 	bool is_open();
 	bool is_infobase() const;
 	int32_t get_numtables();
@@ -219,6 +222,7 @@ class T_1CD
 	void restore_DATA_allocation_table(Table* tab);
 	bool test_block_by_template(uint32_t testblock, char* tt, uint32_t num, int32_t rlen, int32_t len);
 	std::string get_filename() const;
+	const boost::filesystem::path &get_filepath() const;
 	uint32_t get_pagesize() const;
 
 	SupplierConfigs& supplier_configs();
@@ -234,7 +238,7 @@ class T_1CD
 private:
 	mutable Registrator msreg_m;
 	mutable MemBlockManager memBlockManager;
-	std::string filename;
+	boost::filesystem::path filename;
 	std::shared_ptr<TFileStream> fs;
 
 	db_ver version; // версия базы