Dev - Remove pointer flag from divider meta - not used

trevorsandy · Dec 3, 2018 · d2aae3d · d2aae3d
1 parent d153440
commit d2aae3d
Show file tree

Hide file tree

Showing 14 changed files with 20 additions and 25 deletions.
diff --git a/README.md b/README.md
@@ -143,9 +143,9 @@ LEGO® is a trademark of the LEGO Group of companies which does not sponsor, aut
 [univention-icon]:     https://raw.githubusercontent.com/trevorsandy/lpub3d/master/builds/utilities/icons/univention.png
 [windows-icon]:        https://raw.githubusercontent.com/trevorsandy/lpub3d/master/builds/utilities/icons/windows.png
 
-[windows-url]:         https://github.com/trevorsandy/lpub3d/releases/download/v2.3.4/LPub3D-2.3.4.1.1071_20181203.exe
-[macos-url]:           https://github.com/trevorsandy/lpub3d/releases/download/v2.3.4/LPub3D-2.3.4.1.1071_20181203-macos.dmg
-[appimage-url]:        https://github.com/trevorsandy/lpub3d/releases/download/v2.3.4/LPub3D-2.3.4.1.1071_20181203-x86_64.AppImage
+[windows-url]:         https://github.com/trevorsandy/lpub3d/releases/download/v2.3.4/LPub3D-2.3.4.1.1072_20181203.exe
+[macos-url]:           https://github.com/trevorsandy/lpub3d/releases/download/v2.3.4/LPub3D-2.3.4.1.1072_20181203-macos.dmg
+[appimage-url]:        https://github.com/trevorsandy/lpub3d/releases/download/v2.3.4/LPub3D-2.3.4.1.1072_20181203-x86_64.AppImage
 
 [arch-url]:            https://download.opensuse.org/repositories/home:/trevorsandy/Arch_Extra/
 [centos-url]:          https://download.opensuse.org/repositories/home:/trevorsandy/CentOS_7/

diff --git a/builds/linux/obs/alldeps/PKGBUILD b/builds/linux/obs/alldeps/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Trevor SANDY <trevor[dot]sandy[at]gmail[dot]com>
 # Last Update October 02, 2018
 pkgname=lpub3d
-pkgver=2.3.4.1071
+pkgver=2.3.4.1072
 pkgrel=1
 pkgdesc="An LDraw Building Instruction Editor"
 url="https://github.com/trevorsandy/lpub3d.git"

diff --git a/builds/linux/obs/alldeps/debian/changelog b/builds/linux/obs/alldeps/debian/changelog
@@ -1,5 +1,5 @@
-lpub3d (2.3.4.1071) debian; urgency=medium
+lpub3d (2.3.4.1072) debian; urgency=medium
 
-  * LPub3D version 2.3.4.1.1071_20181203 for Linux
+  * LPub3D version 2.3.4.1.1072_20181203 for Linux
 
- -- Trevor SANDY <trevor.sandy@gmail.com>  Mon, 03 Dec 2018 07:01:37 +0100
+ -- Trevor SANDY <trevor.sandy@gmail.com>  Mon, 03 Dec 2018 07:03:52 +0100
diff --git a/builds/linux/obs/alldeps/debian/lpub3d.dsc b/builds/linux/obs/alldeps/debian/lpub3d.dsc
@@ -2,7 +2,7 @@ Format: 1.0
 Source: lpub3d
 Binary: lpub3d
 Architecture: any
-Version: 2.3.4.1071
+Version: 2.3.4.1072
 Maintainer: Trevor SANDY <trevor.sandy@gmail.com>
 Homepage: https://trevorsandy.github.io/lpub3d/
 Standards-Version: 3.9.7

diff --git a/builds/linux/obs/alldeps/lpub3d.spec b/builds/linux/obs/alldeps/lpub3d.spec
@@ -115,7 +115,7 @@ BuildRequires: fdupes
 Summary: An LDraw Building Instruction Editor
 Name: lpub3d
 Icon: lpub3d.xpm
-Version: 2.3.4.1071
+Version: 2.3.4.1072
 Release: <B_CNT>%{?dist}
 URL: https://trevorsandy.github.io/lpub3d
 Vendor: Trevor SANDY
@@ -711,5 +711,5 @@ update-mime-database /usr/share/mime >/dev/null || true
 update-desktop-database || true
 %endif
 
-* Mon Dec 03 2018 - trevor.dot.sandy.at.gmail.dot.com 2.3.4.1071
+* Mon Dec 03 2018 - trevor.dot.sandy.at.gmail.dot.com 2.3.4.1072
 - LPub3D Linux package (rpm) release
diff --git a/builds/utilities/ci/secure/.secrets.tar.enc b/builds/utilities/ci/secure/.secrets.tar.enc
diff --git a/builds/utilities/version.info b/builds/utilities/version.info
@@ -1 +1 @@
-2 3 4 1 1071 5a0aefa
+2 3 4 1 1072 d153440
diff --git a/mainApp/docs/README.txt b/mainApp/docs/README.txt
@@ -1,4 +1,4 @@
-LPub3D 2.3.4.1.1071 (03 12 2018 07:01:37)
+LPub3D 2.3.4.1.1072 (03 12 2018 07:03:52)
 
 Features, enhancements, fixes and changes
 ------------

diff --git a/mainApp/docs/RELEASE_NOTES.html b/mainApp/docs/RELEASE_NOTES.html
@@ -9,7 +9,7 @@
 <table class="tg">
   <tr>
     <th class="tg-0pky">
-      <h4><a id="LPub3D_0"></a>LPub3D 2.3.4.1.1071 (03 12 2018 07:01:37)</h4>
+      <h4><a id="LPub3D_0"></a>LPub3D 2.3.4.1.1072 (03 12 2018 07:03:52)</h4>
         <hr>
           <p>
              LPub3D version 2.3.3<br>

diff --git a/mainApp/meta.cpp b/mainApp/meta.cpp
@@ -3421,7 +3421,7 @@ CalloutMeta::CalloutMeta() : BranchMeta()
   stepNum.color.setValue("black");
   // stepNum.font - default
   stepNum.placement.setValue(LeftTopOutside,PartsListType);
-  sep.setValueInches("Black",DEFAULT_THICKNESS,DEFAULT_MARGINS, false);
+  sep.setValueInches("Black",DEFAULT_THICKNESS,DEFAULT_MARGINS);
   BorderData borderData;
   borderData.type = BorderData::BdrSquare;
   borderData.line = BorderData::BdrLnSolid;
@@ -3518,7 +3518,7 @@ MultiStepMeta::MultiStepMeta() : BranchMeta()
   stepNum.color.setValue("black");
   // stepNum.font - default
   placement.setValue(CenterCenter,PageType);
-  sep.setValue("black",DEFAULT_THICKNESS,DEFAULT_MARGINS,false);
+  sep.setValue("black",DEFAULT_THICKNESS,DEFAULT_MARGINS);
   // subModelFont - default
   subModelFontColor.setValue("black");
   // freeform

diff --git a/mainApp/meta.h b/mainApp/meta.h
@@ -1634,8 +1634,7 @@ class SepMeta : public LeafMeta
   void setValue(QString color, 
                 float thickness,
                 float margin0,
-                float margin1,
-                bool  haspointer)
+                float margin1)
   {
     if (resolutionType() == DPCM) {
       thickness = centimeters2inches(thickness);
@@ -1646,7 +1645,6 @@ class SepMeta : public LeafMeta
     _value[pushed].thickness = thickness;
     _value[pushed].margin[0] = margin0;
     _value[pushed].margin[1] = margin1;
-    _value[pushed].haspointer= haspointer;
   }
   void setValue(SepData goods)
   {
@@ -1668,14 +1666,12 @@ class SepMeta : public LeafMeta
   void setValueInches(QString color, 
                 float thickness,
                 float margin0,
-                float margin1,
-                bool  haspointer)
+                float margin1)
   {
     _value[pushed].color = color;
     _value[pushed].thickness = thickness;
     _value[pushed].margin[0] = margin0;
     _value[pushed].margin[1] = margin1;
-    _value[pushed].haspointer= haspointer;
   }
   void setValueInches(SepData &sepData)
   {

diff --git a/mainApp/metatypes.h b/mainApp/metatypes.h
@@ -462,13 +462,11 @@ class SepData
   float   thickness;  // in units
   QString color;
   float   margin[2];  // in units
-  bool    haspointer;
   SepData()
   {
     thickness  = 0.125;
     margin[0]  = 0;
     margin[1]  = 0;
-    haspointer = false;
   }
 };
 

diff --git a/mainApp/org.trevorsandy.lpub3d.appdata.xml b/mainApp/org.trevorsandy.lpub3d.appdata.xml
@@ -68,7 +68,7 @@
         <binary>lpub3d23</binary>
     </provides>
     <releases>
-        <release version="2.3.4.1071" date="2018-12-03">
+        <release version="2.3.4.1072" date="2018-12-03">
             <description>
                 <p>LPub3D Linux AppImage package</p>
             </description>

diff --git a/mainApp/ranges.cpp b/mainApp/ranges.cpp
@@ -534,7 +534,8 @@ void Steps::addGraphicsItems(
 
               DividerItem *divider = new DividerItem(step,&meta,oX,oY);
               divider->setParentItem(parent);
-              //   add the divider pointers to the graphics scene
+
+              //   add divider pointers (if any) to the graphics scene
               for (int i = 0; i < range->dividerPointerList.size(); i++) {
                   Pointer *pointer = range->dividerPointerList[i];
                   divider->addGraphicsPointerItem(pointer,range->view);