Merge branch 'master' into martin-mac-encore-performance

mcallegari · Feb 27, 2019 · c25a74b · c25a74b
2 parents a32447a + 30bd707
commit c25a74b
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 13 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 4.12.1.{build}
+version: 4.12.2.{build}
 
 environment:
     MSYSTEM: MSYS
@@ -59,4 +59,4 @@ build_script:
 
 artifacts:
   - path: QLC+_$(APPVEYOR_BUILD_VERSION).exe
-    name: qlcplus_4_12_1
+    name: qlcplus_4_12_2
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,7 @@
+qlcplus (4.12.2) stable; urgency=low
+
+ -- Massimo Callegari <massimocallegari@yahoo.it>  Sun, 26 May 2019 12:13:14 +0200
+
 qlcplus (4.12.1) stable; urgency=low
 
   * engine/RGBMatrix: fix crash when a fixture group has out of bounds heads

diff --git a/fixtureeditor/editphysical.ui b/fixtureeditor/editphysical.ui
@@ -195,19 +195,29 @@
         </property>
         <item>
          <property name="text">
-          <string notr="true">5-pin</string>
+          <string notr="true">3-pin</string>
          </property>
         </item>
         <item>
          <property name="text">
-          <string notr="true">3-pin</string>
+          <string notr="true">5-pin</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string notr="true">3-pin and 5-pin</string>
          </property>
         </item>
+        <item>
+         <property name="text">
+          <string notr="true">3-pin IP65</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string notr="true">5-pin IP65</string>
+         </property>
+        </item>
         <item>
          <property name="text">
           <string notr="true">3.5 mm stereo jack</string>

diff --git a/platforms/windows/qlcplus4Qt4.nsi b/platforms/windows/qlcplus4Qt4.nsi
@@ -15,7 +15,7 @@
 ;--------------------------------
 ;General
 Name "Q Light Controller Plus"
-OutFile "QLC+_4.12.1.exe"
+OutFile "QLC+_4.12.2.exe"
 InstallDir C:\QLC+
 InstallDirRegKey HKCU "Software\qlcplus" "Install_Dir"
 RequestExecutionLevel user

diff --git a/platforms/windows/qlcplus4Qt5.nsi b/platforms/windows/qlcplus4Qt5.nsi
@@ -15,7 +15,7 @@
 ;--------------------------------
 ;General
 Name "Q Light Controller Plus"
-OutFile "QLC+_4.12.1.exe"
+OutFile "QLC+_4.12.2.exe"
 InstallDir C:\QLC+
 InstallDirRegKey HKCU "Software\qlcplus" "Install_Dir"
 RequestExecutionLevel user

diff --git a/resources/docs/html_en_EN/pdf_cover.html b/resources/docs/html_en_EN/pdf_cover.html
@@ -13,8 +13,8 @@ <H1><img src="qrc:/qlcplus.png" align="absmiddle">
 User Documentation</H1>
 
 <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
-Updated to version 4.12.1<br>
-February, 10th 2019
+Updated to version 4.12.2<br>
+May, 26th 2019
 </CENTER>
 
 </BODY>

diff --git a/resources/docs/html_ja_JP/pdf_cover.html b/resources/docs/html_ja_JP/pdf_cover.html
@@ -13,8 +13,8 @@ <H1><img src="qrc:/qlcplus.png" align="absmiddle">
 日本語訳版</h1>
 
 <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
-Updated to version 4.12.1<br>
-February, 10th 2019
+Updated to version 4.12.2<br>
+May, 26th 2019
 </center>
 
 </BODY>

diff --git a/resources/docs/make_docs.rb b/resources/docs/make_docs.rb
@@ -19,7 +19,7 @@
 end.parse!
 
 VERSION = (File.read('../../variables.pri') =~ /APPVERSION = (.*?)$/) ? $1 : "Unknown"
-GIT_COMMIT = `git describe`.strip
+GIT_COMMIT = `git rev-parse --short HEAD`.strip
 
 if !options[:destination].empty?
   FileUtils.mkdir_p options[:destination]

diff --git a/resources/fixtures/scripts/fixtures-tool.py b/resources/fixtures/scripts/fixtures-tool.py
@@ -490,6 +490,7 @@ def validate_fixture(path, filename):
     ###################################### CHECK MODES ###################################
 
     modeCount = 0
+    global_phy_tag = root.find('{' + namespace + '}Physical')
 
     for mode in root.findall('{' + namespace + '}Mode'):
 
@@ -539,6 +540,12 @@ def validate_fixture(path, filename):
 #        if modeHeadsCount > 3:
 #            print absname + "/" + modeName + ": Heads found: " + str(modeHeadsCount)
 
+        phy_tag = mode.find('{' + namespace + '}Physical')
+
+        if phy_tag is None and global_phy_tag is None:
+            print absname + "/" + modeName + ": No physical data found"
+            errNum += 1
+
         errNum += check_physical(absname, mode, hasPan, hasTilt)
 
         modeCount += 1

diff --git a/resources/schemas/fixture.xsd b/resources/schemas/fixture.xsd
@@ -41,7 +41,7 @@ elementFormDefault="qualified"
             <xs:element name="Type" type="typeType"/>
             <xs:element name="Channel" type="channelType" maxOccurs="unbounded"/>
             <xs:element name="Mode" type="modeType" maxOccurs="unbounded"/>
-            <xs:element name="Physical" type="physicalType"/>
+            <xs:element name="Physical" type="physicalType" minOccurs="0"/>
         </xs:sequence>
      </xs:complexType>
 </xs:element>
@@ -359,6 +359,8 @@ when changing this list -->
         <xs:enumeration value="3-pin"/>
         <xs:enumeration value="5-pin"/>
         <xs:enumeration value="3-pin and 5-pin"/>
+        <xs:enumeration value="3-pin IP65"/>
+        <xs:enumeration value="5-pin IP65"/>
         <xs:enumeration value="3.5 mm stereo jack"/>
         <xs:enumeration value="Other"/>
     </xs:restriction>

diff --git a/variables.pri b/variables.pri
@@ -4,7 +4,7 @@
 
 APPNAME    = Q Light Controller Plus
 FXEDNAME   = Fixture Definition Editor
-APPVERSION = 4.12.1 GIT
+APPVERSION = 4.12.2 GIT
 
 # Disable these if you don't want to see GIT short hash in the About Box
 #unix:REVISION = $$system(git log --pretty=format:'%h' -n 1)