Add QT GUI #159

hryniuk · 2017-07-19T18:48:56Z

Includes #17, eventually providing a tileset preview and options editor in a window.

hryniuk · 2017-07-19T18:53:07Z

hryniuk · 2017-07-19T18:58:49Z

@serin-delaunay could you for now only check, whether this branch compiles and shows a window on your machine? Path to options directory is temporarily hard-coded, so you have to change it in code and recompile to generate a tileset using button.

Note that in CMakeLists.txt I've just included wangscape-main library. I wasn't sure, whether it's a good idea to split Wangscape into small libraries, one for each directory at that time; now we can just include different main.cpp file and create a GUI using this that lib 😃.

hryniuk · 2017-07-19T19:00:04Z

WangscapeGui/CMakeLists.txt

+# Use the Widgets module from Qt 5.
+target_link_libraries(WangscapeGui wangscape-main)
+
+target_link_libraries(WangscapeGui Qt5::Widgets)


~~It should try to find a Qt5 library, instead of assuming that it's installed (I mean it should use if clause here, cause find_package(Qt5Widgets) is already at line 8).~~

Separate issue. Qt5 it required anyway.

hryniuk · 2017-07-19T19:01:45Z

WangscapeGui/mainwindow.cpp

+
+#include <boost/program_options/options_description.hpp>
+#include <boost/program_options/parsers.hpp>
+#include <boost/program_options/variables_map.hpp>


It's not needed, cause it doesn't use program_options.

hryniuk · 2017-07-19T19:02:09Z

WangscapeGui/mainwindow.cpp

+{
+    logging::addAppender(std::make_unique<logging::ConsoleAppender>("console", logging::Level::Debug));
+
+    std::string filename = "/home/hryniuk/projekty/Wangscape/doc/examples/example2/example_options.json";


It have to be read form a text field.

Can we get the filename from a standard file selector dialogue?

Yes, of course, I've only meant that it will be read from GUI.

hryniuk · 2017-07-19T19:02:45Z

WangscapeGui/mainwindow.cpp

+
+void MainWindow::clickPushButton()
+{
+    logging::addAppender(std::make_unique<logging::ConsoleAppender>("console", logging::Level::Debug));


Do we need to use a logger? We could think about notifications using Qt windows.

I think while it's in the experimental stage we should use a logger. Log output should be viewable through something like a log widget or nonmodal window before public release.

hryniuk · 2017-07-19T19:02:59Z

WangscapeGui/mainwindow.cpp

+
+    tilegen::TilesetGenerator tg(options, std::move(tp));
+
+    std::cout << "generating tiles..." << std::endl;


Remove this debug print.

serin-delaunay · 2017-07-19T21:13:48Z

WangscapeGui/mainwindow.cpp

+
+#include <iostream>
+
+#include <iostream>


The second #include <iostream> can be removed.

hryniuk · 2017-07-25T23:01:44Z

Screenshot :).

Last update: 2017-08-27.

serin-delaunay · 2017-07-26T23:43:38Z

I made a project file for d2794d8, and it compiles and writes tilesets. However, it does use individual invocations of uic and moc for each file, which might not scale well. Screenshot:

I've pushed the changes to a side-branch: serin-delaunay/gui-vs.

serin-delaunay · 2017-07-26T23:47:34Z

(Also, this is awesome!)

hryniuk · 2017-08-17T05:44:34Z

Build on Linux finished successfully, so I'm removing "(WIP)" prefix. Two things left: green osx build and small refactoring (probably).

hryniuk · 2017-08-18T00:16:11Z

I've just noticed that Options can be easily copied and MainWindow can work on the copy by recreating TilePartitioner and TilesetGenerator after each change of e.g. alpha options. One of the problems I've seen was that MetaOutput::createOutputDirectory was called with options loaded from a file, but the directory can be created independently. I'll add an editor of options I've mentioned above to the GUI.

hryniuk · 2017-08-18T21:03:51Z

I've find out, which flag I'm supposed to pass to cmake to build Qt 5 Widgets project 😃, but there's another problem as I've mentioned in checkbox - linking failure make build green anyway, see e.g. https://travis-ci.org/hryniuk/Wangscape/jobs/266115590.

serin-delaunay · 2017-08-18T21:49:09Z

We have a similar problem on Appveyor (#150). I think it's to do with how CI interprets program return values, see eg. travis-ci/travis-ci#6768 .

hryniuk · 2017-08-18T22:44:50Z

@serin-delaunay yes, it should be easy to fix on Linux and OS X - just by saving return value and adding one if.

hryniuk · 2017-08-18T22:52:41Z

I've moved buttons to menu, it looks better. I plan to add another action in menu, opening a window with options editor, one per tab. First tab: Alpha Calculator Mode.

hryniuk · 2017-08-27T21:23:47Z

There's a problem with OSX build connected to stdlib. I thought that it should be fixed with -DCMAKE_CXX_FLAGS="-stdlib=libc++" flag, but it failed. I'll try to find a solution tomorrow.

See:
https://stackoverflow.com/questions/10991274/initializer-list-in-clang
https://stackoverflow.com/questions/14790354/is-initializer-list-like-this-legal-in-c11
and, of course, Travis build:
https://travis-ci.org/Wangscape/Wangscape/jobs/268994710

hryniuk · 2017-08-28T19:27:34Z

~~I've just move constructing the map to a function, resigning of initializer_list for now.~~ same problem :S

serin-delaunay · 2017-08-28T23:26:47Z

Wangscape/tilegen/alpha/CalculatorMode.h

@@ -13,5 +15,7 @@ enum class CalculatorMode
    Dither
 };

+extern const std::map<std::string, CalculatorMode> calculatorModeByName;


You need #include <string>. Clang's error messages for this are terribly unhelpful :(

Eh... I was misled by a fact it builds on gcc. Headers seemed to be OK.

serin-delaunay · 2017-08-29T21:51:41Z

WangscapeGui/MainWindow.cpp

+    const sf::Vector2u output_image_size = source_image.getSize();
+    QImage output_image(output_image_size.x, output_image_size.y, QImage::Format_RGB32);
+
+    for (int y = 0; y < output_image_size.y; ++y)


unsigned int y to match output_image_size.y; same for x.

I think we should build it with -Wall enabled and probably, when all warnings will be fixed, with -Werror.

We used to have a warning from googletest during WangscapeTest compilation, but in the latest master build that error seems to be gone :)

Add CalculatorMode.cpp to Wangscape VS project.

serin-delaunay · 2017-08-29T22:48:28Z

I've adapted the VS project to the new changes, and it builds fine. A few comments on the interface (probably they should be separate issues):

"Select options file" is hidden behind the "File" menu; should be an obvious button.
When loading the options file, a label at the bottom has text set to a file path. If the path is long, the whole window expands to allow it to be displayed. The effect is quite jarring, and very long paths could cause problems, so I think the path should be cut off, or the label should have multiple lines.
The program becomes unresponsive during tileset generation; could that be done in a separate thread?
alphaCalculatorTopTwoPower should be in the Alpha tab of the options editor when TopTwo or Dither is selected.
With "Use default output directory" turned off, if I try to save the tileset I get a folder selector widget named "Select output directory". If I type the name of a nonexistent folder there, an error message is displayed. Instead, it should create the folder and return that path.
When quitting the program (after triggering the above message and saving successfully to a non-default output directory), I get a boost::filesystem::filesystem_error, apparently generated at MainWindow.cpp:95 (boost::filesystem::create_directories(image_dir);), with image_dir=="". This was from a release build, so the error may in fact occur on a different line.
CalculatorMode.cpp should be included in the Wangscape VS project.
Finally, this is really awesome!

I think 6. and 7. should be fixed, and then I'm happy to merge this. If you want to include a QtCreator project or my VS project files (https://github.com/serin-delaunay/Wangscape/tree/gui-vs-2) for WangscapeGui, that's OK too.

hryniuk · 2017-08-30T17:31:37Z

Thanks a lot for testing. I've included your commit and fixed 6. issue. I'll create separate issues for all points you mentioned and my suggestions I've wrote down during implementation.

serin-delaunay · 2017-08-30T18:11:27Z

Looks like my VS project isn't working on AppVeyor. It's fixed in 3a0ae18.

This should allow uic and moc to run.

serin-delaunay · 2017-08-30T19:34:02Z

Merged. Great work! 🎉

hryniuk requested a review from serin-delaunay July 19, 2017 18:48

hryniuk commented Jul 19, 2017

View reviewed changes

serin-delaunay reviewed Jul 19, 2017

View reviewed changes

hryniuk mentioned this pull request Aug 16, 2017

Add qt5-default package Wangscape/wangscape-build-dockerfile#4

Merged

hryniuk changed the title ~~(WIP) Add QT GUI~~ Add QT GUI Aug 17, 2017

hryniuk changed the title ~~Add QT GUI~~ (WIP) Add QT GUI Aug 18, 2017

Łukasz Hryniuk added 9 commits August 27, 2017 17:06

Add basic project setting for GUI in QT

7d5409d

Add button for generating tileset

17d80b7

Add options file selection button

f5d169b

Add image preview widget

f2820f7

Add output image preview with progress bar

260da5c

Add combo box with all generated cliques' previews

f881890

Remove status bar

a9234c7

Add label with current options path

5b58622

Add save button

2817acb

Łukasz Hryniuk added 11 commits August 27, 2017 22:33

Add Qt5 to OSX build and README

d0695b9

Do cleanup and refactoring

2f3591f

Move loading and saving buttons to menu

2bcc2eb

Add string - alpha calculator mode mapping

688e9b8

Add dockable options editor

e7f70dd

Rename MainWindow methods

8abed02

Fix spelling

c96a708

Use boost::filesystem to get filename

2b211da

Make mOptions shared_ptr

772118d

Switch to global OptionsManager

d28a0f1

Fix case of source filenames

803e91d

serin-delaunay reviewed Aug 28, 2017

View reviewed changes

Fix compilation error on OSX.

6a84e9b

serin-delaunay reviewed Aug 29, 2017

View reviewed changes

Make VS project for WangscapeGui

7406581

Add CalculatorMode.cpp to Wangscape VS project.

Łukasz Hryniuk added 2 commits August 30, 2017 19:17

Fix indices' types in loops

fceae9f

Add early return on empty output directory

a58ef38

serin-delaunay mentioned this pull request Aug 30, 2017

VS project for Qt GUI #172

Closed

Add Qt bin folder to AppVeyor $Path

a975aaf

This should allow uic and moc to run.

serin-delaunay merged commit 741b3a9 into Wangscape:master Aug 30, 2017

hryniuk deleted the gui branch August 30, 2017 19:35

This was referenced Aug 30, 2017

Cut off options' path label #180

Open

Create an output directory, when user enters nonexistent one #182

Open

serin-delaunay mentioned this pull request Aug 31, 2017

GUI interface for option specification #17

Closed

3 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add QT GUI #159

Add QT GUI #159

hryniuk commented Jul 19, 2017

hryniuk commented Jul 19, 2017 •

edited

Loading

hryniuk commented Jul 19, 2017

hryniuk Jul 19, 2017 •

edited

Loading

hryniuk Jul 19, 2017

hryniuk Jul 19, 2017

serin-delaunay Jul 19, 2017

hryniuk Jul 19, 2017

hryniuk Jul 19, 2017

serin-delaunay Jul 19, 2017

hryniuk Jul 19, 2017

serin-delaunay Jul 19, 2017

hryniuk commented Jul 25, 2017 •

edited

Loading

serin-delaunay commented Jul 26, 2017 •

edited

Loading

serin-delaunay commented Jul 26, 2017

hryniuk commented Aug 17, 2017

hryniuk commented Aug 18, 2017

hryniuk commented Aug 18, 2017

serin-delaunay commented Aug 18, 2017

hryniuk commented Aug 18, 2017

hryniuk commented Aug 18, 2017

hryniuk commented Aug 27, 2017

hryniuk commented Aug 28, 2017 •

edited

Loading

serin-delaunay Aug 28, 2017

hryniuk Aug 29, 2017

serin-delaunay Aug 29, 2017

hryniuk Aug 29, 2017

serin-delaunay Aug 29, 2017

serin-delaunay commented Aug 29, 2017 •

edited

Loading

hryniuk commented Aug 30, 2017

serin-delaunay commented Aug 30, 2017

serin-delaunay commented Aug 30, 2017


		tilegen::TilesetGenerator tg(options, std::move(tp));

		std::cout << "generating tiles..." << std::endl;


		#include <iostream>

		#include <iostream>

Add QT GUI #159

Add QT GUI #159

Conversation

hryniuk commented Jul 19, 2017

hryniuk commented Jul 19, 2017 • edited Loading

Things to do

hryniuk commented Jul 19, 2017

hryniuk Jul 19, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hryniuk commented Jul 25, 2017 • edited Loading

serin-delaunay commented Jul 26, 2017 • edited Loading

serin-delaunay commented Jul 26, 2017

hryniuk commented Aug 17, 2017

hryniuk commented Aug 18, 2017

hryniuk commented Aug 18, 2017

serin-delaunay commented Aug 18, 2017

hryniuk commented Aug 18, 2017

hryniuk commented Aug 18, 2017

hryniuk commented Aug 27, 2017

hryniuk commented Aug 28, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

serin-delaunay commented Aug 29, 2017 • edited Loading

hryniuk commented Aug 30, 2017

serin-delaunay commented Aug 30, 2017

serin-delaunay commented Aug 30, 2017

hryniuk commented Jul 19, 2017 •

edited

Loading

hryniuk Jul 19, 2017 •

edited

Loading

hryniuk commented Jul 25, 2017 •

edited

Loading

serin-delaunay commented Jul 26, 2017 •

edited

Loading

hryniuk commented Aug 28, 2017 •

edited

Loading

serin-delaunay commented Aug 29, 2017 •

edited

Loading