omar/panopainter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

prepare UI for release, disable unused features, rename file format to .ppi

Browse Source
This commit is contained in:
omigamedev
2018-09-20 13:25:56 +02:00
parent 27ab21ccdb
commit 4a6e69e182
10 changed files with 94 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app_cloud.cpp
View File

@@ -23,7 +23,7 @@ void App::cloud_upload()
else
{
std::thread([this] {
std::string path = data_path + "/" + doc_name + ".pano";
std::string path = data_path + "/" + doc_name + ".ppi";
if (ui::Canvas::I->m_unsaved)
{
Canvas::I->project_save_thread(path);
@@ -34,7 +34,7 @@ void App::cloud_upload()
async_redraw();
async_end();
upload(path, doc_name + ".pano", [this,pb](float p){
upload(path, doc_name + ".ppi", [this,pb](float p){
async_start();
pb->m_progress->SetWidthP(p * 100.f);
async_redraw();
@@ -59,7 +59,7 @@ void App::cloud_upload()
void App::cloud_upload_all()
{
std::thread([this] {
auto names = Asset::list_files(data_path, false, ".*\\.pano");
auto names = Asset::list_files(data_path, false, ".*\\.ppi");
gl_state gl;
std::shared_ptr<NodeProgressBar> pb;

8
src/app_dialogs.cpp
View File

@@ -36,7 +36,7 @@ void App::dialog_newdoc()
dialog->btn_ok->on_click = [this, dialog](Node*)
{
std::string name = dialog->input->m_string;
std::string path = data_path + "/" + name + ".pano";
std::string path = data_path + "/" + name + ".ppi";
auto action = [this, dialog, name] {
std::array<int, 4> resolutions{ 512, 1024, 1536, 2048 };
@@ -255,14 +255,14 @@ void App::dialog_save_ver()
static char tmp_name[256];
sprintf(tmp_name, "%s.%02d", base.c_str(), i);
next = tmp_name;
if (Asset::exist(data_path + "/" + next + ".pano", false))
if (Asset::exist(data_path + "/" + next + ".ppi", false))
continue;
break;
}
doc_name = next;
title_update();
canvas->m_canvas->project_save(data_path + "/" + next + ".pano");
canvas->m_canvas->project_save(data_path + "/" + next + ".ppi");
}
void App::dialog_save()
@@ -281,7 +281,7 @@ void App::dialog_save()
dialog->btn_ok->on_click = [this, dialog](Node*)
{
std::string name = dialog->input->m_string;
std::string path = data_path + "/" + name + ".pano";
std::string path = data_path + "/" + name + ".ppi";
if (name.empty())
{

8
src/canvas.cpp
View File

@@ -1483,7 +1483,7 @@ void ui::Canvas::export_cubes(std::string data_path)
static char name[128];
sprintf(name, "%s.zip", data_path.c_str());
auto zip_path = [NSString stringWithUTF8String : name];
[SSZipArchive createZipFileAtPath:zip_path withFilesAtPaths:files];
//[SSZipArchive createZipFileAtPath:zip_path withFilesAtPaths:files];
for (NSString* f : files)
[[NSFileManager defaultManager] removeItemAtPath:f error:nil];
#endif
@@ -1494,7 +1494,7 @@ void ui::Canvas::project_save(std::function<void()> on_complete)
if (App::I.check_license())
{
std::thread t([=] {
project_save_thread(App::I.data_path + "/" + App::I.doc_name + ".pano");
project_save_thread(App::I.data_path + "/" + App::I.doc_name + ".ppi");
if (on_complete)
on_complete();
});
@@ -1524,7 +1524,7 @@ void ui::Canvas::project_save_thread(std::string file_path)
return;
// static char name[128];
// sprintf(name, "%s/latlong.pano", data_path.c_str());
// sprintf(name, "%s/latlong.ppi", data_path.c_str());
FILE* fp = fopen(file_path.c_str(), "wb");
if (!fp)
{
@@ -1836,7 +1836,7 @@ ui::Image ui::Canvas::thumbnail_generate(int w, int h)
ui::Image ui::Canvas::thumbnail_read(std::string data_path)
{
// static char name[128];
// sprintf(name, "%s/latlong.pano", data_path.c_str());
// sprintf(name, "%s/latlong.ppi", data_path.c_str());
FILE* fp = fopen(data_path.c_str(), "rb");
if (!fp)
{

2
src/main.cpp
View File

@@ -272,7 +272,7 @@ static void SetupExceptionHandler()
BT_SetPreErrHandler([](INT_PTR){
if (ui::Canvas::I)
{
auto path = App::I.data_path + "/recovery.pano";
auto path = App::I.data_path + "/recovery.ppi";
ui::Canvas::I->project_save_thread(path);
static char abspath[MAX_PATH];
GetFullPathNameA(path.c_str(), MAX_PATH, abspath, NULL);

2
src/node_dialog_browse.cpp
View File

@@ -69,7 +69,7 @@ void NodeDialogBrowse::init_controls()
root()->update();
};
container = find<Node>("files-list");
auto names = Asset::list_files(data_path, false, ".*\\.pano");
auto names = Asset::list_files(data_path, false, ".*\\.ppi");
for (const auto& n : names)
{
auto node = new NodeDialogBrowseItem;

2
src/node_dialog_open.cpp
View File

@@ -69,7 +69,7 @@ void NodeDialogOpen::init_controls()
root()->update();
};
container = find<Node>("files-list");
auto names = Asset::list_files(data_path, false, ".*\\.pano");
auto names = Asset::list_files(data_path, false, ".*\\.ppi");
for (const auto& n : names)
{
auto node = new NodeDialogOpenItem;