Hatch: show hatched area during edit properties

LibreCAD · Sep 25, 2023 · 74732d0 · 74732d0
1 parent a49817f
commit 74732d0
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -28,7 +28,7 @@ endif()
 
 set(FINAL_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}")
 
-if(EXISTS "${CMAKE_SOURCE_DIR}/conan_toolchain.cmake")
+if(MSVC AND EXISTS "${CMAKE_SOURCE_DIR}/conan_toolchain.cmake")
     set(FINAL_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}")
     set(CMAKE_INSTALL_BINDIR "bin")
 

diff --git a/lcUI/lcadmodelviewer.cpp b/lcUI/lcadmodelviewer.cpp
@@ -4,7 +4,7 @@ using namespace lc::ui;
 using namespace lc::viewer;
 
 LCADModelViewer::LCADModelViewer(QWidget* parent,int id = 0):LCADViewer(parent),_id(id) {
-    _gradientBackground = std::make_shared<drawable::GradientBackground>(lc::Color(0x07, 0x15, 0x11), lc::Color(0x06, 0x35, 0x06));
+    _gradientBackground = std::make_shared<drawable::GradientBackground>(lc::Color(0x07, 0x15, 0xe1), lc::Color(0x06, 0x35, 0x06));
     _grid = std::make_shared<drawable::Grid>(20, lc::Color(0x40, 0x48, 0x40), lc::Color(0x80, 0x90, 0x80));
     _cursor = std::make_shared<drawable::Cursor>(40, this->documentCanvas(), lc::Color(0xff, 0x00, 0x00), lc::Color(0x00, 0xff, 0x00));
     connect(this, SIGNAL(mouseMoveEvent()), this, SLOT(onMouseMoveEvent()));
@@ -42,4 +42,4 @@ void LCADModelViewer::setDocument(std::shared_ptr<lc::storage::Document> documen
 
 void LCADModelViewer::onMouseMoveEvent() {
     emit setActive(_id);
-};
+};
diff --git a/lcviewernoqt/documentcanvas.cpp b/lcviewernoqt/documentcanvas.cpp
@@ -416,6 +416,7 @@ void DocumentCanvas::drawCachedEntity(LcPainter& painter, const LCVDrawItem_CSPt
     painter.save();
     // Decide what color to render the entity into
     auto color = drawColor(ce, insert, drawable->selected());
+    std::cout<<"color="<<std::hex<<colr<<std::endl<<std::dec;
     painter.source_rgba(
         color.red(),
         color.green(),

diff --git a/scripts/ubuntu-install/createAppImage.sh b/scripts/ubuntu-install/createAppImage.sh
@@ -20,4 +20,5 @@ VERSION=`git describe ` ./$QTDEPLOY --appdir AppDir \
 --executable AppDir/usr/bin/librecad \
 --desktop-file AppDir/librecad.desktop \
 --icon-file AppDir/librecad.svg --plugin qt
+sudo mv AppDir/usr/translation
 mv LibreCAD*.AppImage LibreCAD3-$(git describe --always).AppImage