Revision 116
1.10/trunk/extensions/ext3Dgui/build.number | ||
---|---|---|
1 |
build.number=15 |
|
1 |
build.number=16 |
1.10/trunk/extensions/ext3Dgui/src/org/gvsig/gvsig3dgui/display/FullScreenPanel.java | ||
---|---|---|
139 | 139 |
jSpinner4 = new javax.swing.JSpinner(); |
140 | 140 |
jSpinner5 = new javax.swing.JSpinner(); |
141 | 141 |
wowjCheckBox = new JCheckBox(); |
142 |
xyzjCheckBox = new JCheckBox(); |
|
142 |
// xyzjCheckBox = new JCheckBox();
|
|
143 | 143 |
|
144 | 144 |
setLayout(new java.awt.GridBagLayout()); |
145 | 145 |
|
... | ... | |
207 | 207 |
jPanel1.add(wowjCheckBox, gridBagConstraints); |
208 | 208 |
wowjCheckBox.setSelected(false); |
209 | 209 |
|
210 |
xyzjCheckBox.setText(PluginServices.getText(this, "Activar_XYZ")); |
|
211 |
xyzjCheckBox.setToolTipText(PluginServices.getText(this, |
|
212 |
"Activar_XYZ_tooltip")); |
|
210 |
// xyzjCheckBox.setText(PluginServices.getText(this, "Activar_XYZ"));
|
|
211 |
// xyzjCheckBox.setToolTipText(PluginServices.getText(this,
|
|
212 |
// "Activar_XYZ_tooltip"));
|
|
213 | 213 |
gridBagConstraints = new java.awt.GridBagConstraints(); |
214 | 214 |
gridBagConstraints.gridx = 0; |
215 | 215 |
gridBagConstraints.gridy = 8; |
216 | 216 |
gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; |
217 | 217 |
gridBagConstraints.insets = new java.awt.Insets(0, 0, 11, 0); |
218 |
jPanel1.add(xyzjCheckBox, gridBagConstraints); |
|
219 |
xyzjCheckBox.setSelected(false); |
|
218 |
// jPanel1.add(xyzjCheckBox, gridBagConstraints);
|
|
219 |
//xyzjCheckBox.setSelected(false);
|
|
220 | 220 |
|
221 | 221 |
jCheckBox3.setText(PluginServices.getText(this, "Modo_ventana")); |
222 | 222 |
gridBagConstraints = new java.awt.GridBagConstraints(); |
... | ... | |
570 | 570 |
runViewer(); |
571 | 571 |
} else { |
572 | 572 |
if (!jCheckBox2.isSelected()) { |
573 |
if (xyzjCheckBox.isSelected()) { |
|
574 |
enableXYZDisplay(); |
|
575 |
} |
|
573 |
// if (xyzjCheckBox.isSelected()) {
|
|
574 |
// enableXYZDisplay();
|
|
575 |
// }
|
|
576 | 576 |
frame.setUndecorated(true); |
577 | 577 |
frame.requestFocus(); |
578 | 578 |
// Dimension dim = |
... | ... | |
583 | 583 |
} |
584 | 584 |
|
585 | 585 |
else { |
586 |
if (xyzjCheckBox.isSelected()) { |
|
587 |
enableXYZDisplay(); |
|
588 |
} |
|
586 |
// if (xyzjCheckBox.isSelected()) {
|
|
587 |
// enableXYZDisplay();
|
|
588 |
// }
|
|
589 | 589 |
frame.setUndecorated(true); |
590 | 590 |
frame.requestFocus(); |
591 | 591 |
// Dimension dim = |
... | ... | |
680 | 680 |
wow_factor, wow_offset, wow_Zd, wow_vz, wow_M, wow_C); |
681 | 681 |
} |
682 | 682 |
|
683 |
protected void enableXYZDisplay() { |
|
684 |
// int screenNum = ((SpinnerNumberModel) jSpinner1 |
|
685 |
// .getModel()).getNumber().intValue(); |
|
686 |
// _fullScreenViewer.setUpViewOnSingleScreen(screenNum); |
|
687 |
Node n = _fullScreenViewer.getSceneData(); |
|
688 |
Node multiview = osgDB.readNodeFileNoException(String.valueOf(n |
|
689 |
.getCPtr()) |
|
690 |
+ ".multiview"); |
|
691 |
_fullScreenViewer.setSceneData(multiview); |
|
692 |
} |
|
683 |
// protected void enableXYZDisplay() {
|
|
684 |
// // int screenNum = ((SpinnerNumberModel) jSpinner1
|
|
685 |
// // .getModel()).getNumber().intValue();
|
|
686 |
// // _fullScreenViewer.setUpViewOnSingleScreen(screenNum);
|
|
687 |
// Node n = _fullScreenViewer.getSceneData();
|
|
688 |
// Node multiview = osgDB.readNodeFileNoException(String.valueOf(n
|
|
689 |
// .getCPtr())
|
|
690 |
// + ".multiview");
|
|
691 |
// _fullScreenViewer.setSceneData(multiview);
|
|
692 |
// }
|
|
693 | 693 |
|
694 | 694 |
protected void enableQUADBUFFERDisplay() { |
695 | 695 |
if (!_fullScreenViewer.setUpViewerWithQuadBuffer(0, 0, _screenWidth, |
1.10/trunk/extensions/ext3Dgui/pom.xml | ||
---|---|---|
183 | 183 |
</property> |
184 | 184 |
</activation> |
185 | 185 |
<properties> |
186 |
<bversion>15</bversion>
|
|
186 |
<bversion>16</bversion>
|
|
187 | 187 |
<application-name>gvSIG3D</application-name> |
188 | 188 |
<output-dir_installers>target/installers/</output-dir_installers> |
189 | 189 |
</properties> |
1.10/trunk/extensions/ext3Dgui/config/about.htm | ||
---|---|---|
12 | 12 |
</tr> |
13 | 13 |
<tr> |
14 | 14 |
<td colspan="2"><font face="Arial, Helvetica, sans-serif">© Copyright |
15 |
Generalitat Valenciana, IVER T.I and AI2 2008.</font></td>
|
|
15 |
Generalitat Valenciana, AI2 and IVER T.I. 2008.</font></td>
|
|
16 | 16 |
</tr> |
17 | 17 |
</table> |
18 | 18 |
<h2>Plugin 3D para gvSIG</h2> |
19 |
<p><b>Iver T.I y AI2</b> ha añadido la <b>Extensión 3D</b>
|
|
19 |
<p><b>AI2 e IVER</b> ha añadido la <b>Extensión 3D</b>
|
|
20 | 20 |
a GvSIG.</p> |
21 | 21 |
|
22 | 22 |
<p><b>Desarrollo:</b></p> |
23 | 23 |
|
24 | 24 |
<p>Directores del proyecto:</p> |
25 | 25 |
<ul> |
26 |
<li>Javier Lluch</li> |
|
26 | 27 |
<li>Salvador Bayarri</li> |
27 |
<li>Javier Lluch</li> |
|
28 | 28 |
</ul> |
29 | 29 |
<p>Equipo de desarrollo:</p> |
30 | 30 |
<ul> |
... | ... | |
35 | 35 |
<li>Angel Fraile,</li> |
36 | 36 |
<li>Jesús Zarzoso</li> |
37 | 37 |
</ul> |
38 |
<p><b> Build Number: 15</b></p>
|
|
38 |
<p><b> Build Number: 16</b></p>
|
|
39 | 39 |
</body> |
40 | 40 |
</html> |
1.10/trunk/extensions/ext3Dgui/distribution/linux-distribution/install.xml | ||
---|---|---|
88 | 88 |
<include name="**/*" /> |
89 | 89 |
<exclude name="*.head" /> |
90 | 90 |
</fileset> |
91 |
<fileset targetdir="$INSTALL_PATH/libs" |
|
92 |
dir="../../../binaries/linux/raster/gdal" override="true" |
|
93 |
os="unix"> |
|
94 |
<include name="libz.so.1" /> |
|
95 |
</fileset> |
|
96 |
|
|
91 | 97 |
|
92 | 98 |
|
93 | 99 |
<!-- <fileset targetdir="$INSTALL_PATH/libs"--> |
Also available in: Unified diff