Commit 15e4d05e authored by Claes Sjofors's avatar Claes Sjofors

Merge branch 'master' of pwrcvs:/data1/git/pwr

parents f7c7a5c3 31ab74c2
......@@ -102,11 +102,11 @@ public class HistSender {
try {
out = new ObjectOutputStream( socket.getOutputStream() );
out.flush();
//varför???
//why???
in = new ObjectInputStream( socket.getInputStream() );
}
catch(Exception e) {
System.out.println("IOException vid skapande av strömmar mot server");
System.out.println("IOException at server stream creation");
//errh.error("DataStream failed");
return new MhData(100,100);
}
......
......@@ -65,10 +65,10 @@ public class JopApplet extends JApplet implements GdhApplIfc
engine = new JopEngine(1000, this);
session = new JopSession( engine, (Object)this);
if ( instance != null && instance.length() != 0) {
// Substitutes for åäö because of mozilla...
instance = instance.replace( '\\', ');
instance = instance.replace( '/', ');
instance = instance.replace( '@', ');
// Substitutes for local char because of mozilla...
instance = instance.replace( '\\', (char)229);
instance = instance.replace( '/', (char)228);
instance = instance.replace( '@', (char)246);
System.out.println( "Parameter instance: " + instance);
engine.gdh.logString("Parameter instance: " + instance);
......
......@@ -588,7 +588,7 @@ public class MhTable extends JPanel
public final Object[] longValues = {"A", "Acknowledge",
"10-12-31 12:12:12.98",
"QWERTYUIOPAAOLK_JHGFDSAZXCVBNM__POIUYTRQWERTYUIOPAAOL",
"QWERTYUIOPAAOLK_JHGFDSAZXCVBNM__POAIUYTRQWERTYUIOPAAOL",
"QWERTYUIOPAAOLK"};
......
......@@ -813,10 +813,10 @@ public class GdhServer
long K = 1024;
long freeMem = Runtime.getRuntime().freeMemory() / K;
long totalMem = Runtime.getRuntime().totalMemory() / K;
System.out.println("Slut på minne, storlek på thSub: " + thSub.size() +
"storlek på sub: " + subscriptions.size() +
"Tillgängligt minne: " + freeMem + " KB" +
"Totalt minne: " + totalMem + " KB");
System.out.println("Out of memory, size of thSub: " + thSub.size() +
"size of sub: " + subscriptions.size() +
"Available memory: " + freeMem + " KB" +
"Total memory: " + totalMem + " KB");
}
catch(IOException e)
......@@ -1806,9 +1806,9 @@ public class GdhServer
{
long freeMem = Runtime.getRuntime().freeMemory();
long totalMem = Runtime.getRuntime().totalMemory();
System.out.println("Slut på minne, storlek på subcp: " + subscriptions.size() +
"Tillgängligt minne: " + freeMem +
"Totalt minne: " + totalMem);
System.out.println("Out of memory, size of subcp: " + subscriptions.size() +
"Available memory: " + freeMem +
"Total memory: " + totalMem);
}
catch(IOException e)
{
......@@ -1975,7 +1975,7 @@ public class GdhServer
{
}
}
//minska storleken på subscriptions för att spara minne
// Reduce subscription size to save memory
this.trimRefObjectList();
threadCount--;
setCurrentConnections(threadCount);
......
......@@ -189,7 +189,7 @@ public class GdhServerMonitor extends JFrame implements ActionListener
totalMem = totalMem / 1024;
labelMessage.setText("Ledigt minne(av allokerat): " + freeMem + " Allokerat minne: " + totalMem +
" Antal prenumerationer: " + nrOfSubscriptions);
//qqq behvs detta???
// is this needed???
data = new Object[size][5];
for(int i = 0; i < size;i++)
{
......
......@@ -269,7 +269,7 @@ public class Mh
lastMhrEvent = evItem;
newAlarmArrived = true;
nrOfAlarmsArrived++; //behövs ej
nrOfAlarmsArrived++; // not needed
}
......
......@@ -182,7 +182,7 @@ public class MhServer
maxConnections = cdhrMaxCon.value;
maxAlarms = cdhrMaxAlarms.value;
maxEvents = cdhrMaxEvents.value;
//pga bugg i proview, MaxNoOfAlarms syns ej i arbetsbnken
// because if Proview bugg, MaxNoOfAlarms is not visible in wb
if(maxAlarms == 0) maxAlarms = 100;
if(maxEvents == 0) maxEvents = 200;
//currentConnectionsStr = cdhrString.str + ".CurrentConnections";
......@@ -407,13 +407,12 @@ public class MhServer
//System.out.println("efter insertNewMess");
for(int i = 0;i < totalThreadCount && i < mhThread.length;i++)
{
//System.out.println("Nu skall sendMess anropas");
//det kan ju vara s att ngon klient har avslutats
// Some client may have been terminated
if(mhThread[i] == null)
{
if(log)
{
System.out.println("mhThread[" + i + "] r null");
System.out.println("mhThread[" + i + "] is null");
}
continue;
}
......@@ -462,7 +461,7 @@ public class MhServer
catch(IOException e)
{
this.keepRunning = false;
System.out.println("IOException vid skapande av strmmar mot klient");
System.out.println("IOException at client stream creation");
errh.error("DataStream failed");
threadCount--;
//setCurrentConnections(threadCount);
......@@ -494,7 +493,7 @@ public class MhServer
out.writeInt(nrOfEvents);
if(log)
{
System.out.println("Hndelsestorlek: " + nrOfEvents);
System.out.println("Event size: " + nrOfEvents);
}
if(nrOfEvents > 0)
{
......@@ -515,22 +514,21 @@ public class MhServer
while(this.keepRunning)
{
//hr skall vi ligga och vnta p meddelanden frn klienterna
//typ alarmkvittens och dylikt
// Wait for client messages, alarm ack and so
try
{
MhrsEventId id = (MhrsEventId)in.readObject();
if(log)
{
System.out.println("ftt meddelande" + id.idx + " " + id.nix + " " +
System.out.println("Message received " + id.idx + " " + id.nix + " " +
id.birthTime);
}
PwrtStatus sts = mh.outunitAck(id);
}
catch(Exception e)
{
System.out.println("Exception i receivemesstrd " + e.toString());
System.out.println("Exception i receive message thread " + e.toString());
this.keepRunning = false;
}
Thread.sleep(3);
......@@ -538,8 +536,8 @@ public class MhServer
}
catch(Exception e)
{
System.out.println("exception i run MhThread");
System.out.println("avslutar trden");
System.out.println("exception in run MhThread");
System.out.println("Terminate thread");
}
finally
{
......@@ -571,7 +569,7 @@ public class MhServer
}
}
/**
* Anropas var gng ett nytt meddelande skall skickas till klienterna
* Called every time a new message is sent to the clients
*/
public void sendMess(MhrEvent event)
{
......
......@@ -122,14 +122,14 @@ public class RtUtilities {
int offs1;
int offs2;
// Replace in instance name because mozilla can't pass them as
// Replace local char in instance name because mozilla can't pass them as
// parameter
for ( int i = 0; i < instance.length(); i++) {
if ( instanceBuff[i] == '' || instanceBuff[i] == '')
if ( instanceBuff[i] == 229 || instanceBuff[i] == 197)
instanceBuff[i] = '\\';
if ( instanceBuff[i] == '' || instanceBuff[i] == '')
if ( instanceBuff[i] == 228 || instanceBuff[i] == 196)
instanceBuff[i] = '/';
if ( instanceBuff[i] == '' || instanceBuff[i] == '')
if ( instanceBuff[i] == 246 || instanceBuff[i] == 214)
instanceBuff[i] = '@';
}
......
......@@ -101,6 +101,7 @@ echo "-- Building pwr$ver"
# Create directories
mkdir -p $pkgroot/DEBIAN
mkdir -p $pkgroot/usr/share/doc/pwr$ver
mkdir -p $pkgroot/usr/share/applications
mkdir -p $pkgroot/usr/pwrp
mkdir -p $pkgroot/etc
......@@ -193,6 +194,8 @@ cp $pwre_sroot/tools/pkg/deb/user/wtt_init1.pwr_com $pkgroot/usr/pwr$ver/$pwre_t
echo "Categories=GNOME;GTK;Application;"
} > $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf/user/proview$ver.desktop
cp $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf/user/proview$ver.desktop $pkgroot/usr/share/applications/
# Create package
echo "-- Building package"
if which fakeroot > /dev/null; then
......
Package: pwr51
Version: 5.1.0-4
Package: pwr53
Version: 5.3.1-1
Section: base
Priority: optional
Architecture: i386
Depends: libc6 (>= 2.13-38), libgtk2.0-0 (>= 2.24.10-2), libasound2 (>= 1.0.25-4), libdb5.1 (>=5.1.29-5), libdb5.1++ (>= 5.1.29-5), libmysql++3 (>= 3.1.0-2+b1), libsqlite3-0 (>= 3.7.13-1+deb7u1), librsvg2-2 (>= 2.36.1-1), g++ (>= 4:4.7.2-1)
Replaces: pwrrt,pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47,pwr48,pwr50
Depends: libc6 (>= 2.19-18+deb8u1), libgtk2.0-0 (>= 2.24.25-3), libasound2 (>= 1.0.28-1), libdb5.3 (>=5.3.28-9), libdb5.3++ (>= 5.3.28-9), libmysql++3 (>= 3.2.1+pristine-1), libsqlite3-0 (>= 3.8.7.1-1+deb8u1), librsvg2-2 (>= 2.40.5-1), g++ (>= 4:4.9.2-2)
Replaces: pwrrt,pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47,pwr48,pwr50,pwr51,pwr52
Maintainer: Proview <postmaster@proview.se>
Description: Proview development and runtime environment package
Proview development and runtime environment
5.1.0-1 Base release
5.1.0-2
- Wb history html file size limited to 1000 rows.
- Ge polyline draw bugfix for subwindows.
- Web, open graph from pwg-files as default, methods for pwg-graphs added.
5.1.0-3
- Class AppLink added.
- Ge trend and xycurve fix for subwindows.
5.1.0-4
- Support for Gertbord and PiFace.
- wb load of DataArithmL bugfix.
- Ge bugfix for scale with snap to grid.
- Xtt read struct fix, element name buffer increased.
5.3.1-1 Base release
......@@ -22,6 +22,7 @@ echo "-- Building pwrdemo$ver"
# Create directories
mkdir -p $pkgroot/DEBIAN
mkdir -p $pkgroot/usr/share/doc/pwrdemo$ver
mkdir -p $pkgroot/usr/share/applications
mkdir -p $pkgroot/usr/pwrp
find $pkgroot -type d | xargs chmod 755
......@@ -81,6 +82,8 @@ cd $currentdir
echo "Categories=GNOME;GTK;Application;"
} > $pkgroot/usr/pwrp/pwrdemo$ver/cnf/proviewdemo$ver.desktop
cp $pkgroot/usr/pwrp/pwrdemo$ver/cnf/proviewdemo$ver.desktop $pkgroot/usr/share/applications/
# Create package
echo "-- Building package"
if which fakeroot > /dev/null; then
......
Package: pwrdemo51
Version: 5.1.0-4
Package: pwrdemo53
Version: 5.3.1-1
Section: base
Priority: optional
Architecture: i386
Depends: pwr51 (>= 5.1.0-4)
Depends: sudo, pwr53 (>= 5.3.1-1)
Maintainer: Proview <postmaster@proview.se>
Description: Proview Demo Project package
Proview Demo Project
5.1.0-1 Base release
5.3.1-1 Base release
Package: pwrrt
Version: 5.1.0-4
Version: 5.3.1-1
Section: base
Priority: optional
Architecture: i386
Depends: libc6 (>= 2.13-38), libgtk2.0-0 (>= 2.24.10-2), libasound2 (>= 1.0.25-4), libsqlite3-0 (>= 3.7.13-1+deb7u1), libdb5.1 (>=5.1.29-5)
Replaces: pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47,pwr48,pwr50
Depends: libc6 (>= 2.19-18+deb8u1), libgtk2.0-0 (>= 2.24.25-3), libasound2 (>= 1.0.28-1), libsqlite3-0 (>= 3.5.7.1-1+deb8u1), libdb5.3 (>=5.3.28-9)
Replaces: pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47,pwr48,pwr50,pwr51,pwr52
Maintainer: Proview <postmaster@proview.se>
Description:
Proview runtime environment
5.1.0-1 Base release
5.1.0-2
- Wb history html file size limited to 1000 rows.
- Ge polyline draw bugfix for subwindows.
- Web, open graph from pwg-files as default, methods for pwg-graphs added.
5.1.0-3
- Class AppLink added.
- Ge trend and xycurve fix for subwindows.
5.1.0-4
- Support for Gertbord and PiFace.
- wb load of DataArithmL bugfix.
- Ge bugfix for scale with snap to grid.
- Xtt read struct fix, element name buffer increased.
5.3.1-1 Base release
......@@ -143,7 +143,7 @@ currentdir="`eval pwd`"
tarfile=$pwre_broot/$pwre_target/bld/pkg/pwrtmp.tar
cd $pwre_broot/$pwre_target/exp
echo "-- Copy release to package tree"
tar -cf $tarfile exe/rt_qmon exe/rt_prio exe/sev_ini exe/sev_xtt exe/sev_xtt_gtk exe/sev_server exe/sev_repair exe/*.gif exe/*.png exe/sev_xtt_version_help.dat exe/pwr_pkg.sh exe/en_us/*.txt doc/*
tar -cf $tarfile exe/rt_qmon exe/rt_prio exe/sev_ini exe/sev_xtt exe/sev_xtt_gtk exe/sev_server exe/sev_repair exe/*.gif exe/*.png load/sev_xtt_version_help.dat exe/pwr_pkg.sh exe/en_us/*.txt doc/*
cd $pkgroot/usr/pwrsev
mkdir cnf
tar -xf $tarfile
......
Package: pwrsev
Version: 5.1.0-4
Version: 5.3.1-1
Section: base
Priority: optional
Architecture: i386
Depends: libc6 (>= 2.13-38), libgtk2.0-0 (>= 2.24.10-2), libasound2 (>= 1.0.25-4), libsqlite3-0 (>= 3.7.13-1+deb7u1), libdb5.1 (>=5.1.29-5), libmysqlclient18 (>= 5.5.31+dfsg-0+wheezy1)
Replaces: pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47,pwr48,pwr50
Depends: libc6 (>= 2.19-18+deb8u1), libgtk2.0-0 (>= 2.24.25-3), libasound2 (>= 1.0.28-1), libsqlite3-0 (>= 3.8.7.1-1+deb8u1), libdb5.3 (>=5.3.28-9), libmysqlclient18 (>= 5.5.44-0+deb8u1)
Replaces: pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47,pwr48,pwr50,pwr51,pwr52
Maintainer: Proview <postmaster@proview.se>
Description:
Proview storage environment
5.1.0-1 Base release
5.3.1-1 Base release
......@@ -102,6 +102,7 @@ echo "-- Building pwr$ver"
# Create directories
mkdir -p $pkgroot/DEBIAN
mkdir -p $pkgroot/usr/share/doc/pwr$ver
mkdir -p $pkgroot/usr/share/applications
mkdir -p $pkgroot/usr/pwrp
mkdir -p $pkgroot/etc
......@@ -194,6 +195,8 @@ cp $pwre_sroot/tools/pkg/$hw/user/wtt_init1.pwr_com $pkgroot/usr/pwr$ver/$pwre_t
echo "Categories=GNOME;GTK;Application;"
} > $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf/user/proview$ver.desktop
cp $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf/user/proview$ver.desktop $pkgroot/usr/share/applications/
# Create package
echo "-- Building package"
if which fakeroot > /dev/null; then
......
Package: pwr53
Version: 5.3.0-1
Version: 5.3.1-1
Section: base
Priority: optional
Architecture: amd64
Depends: libc6 (>= 2.13-38), libgtk2.0-0 (>= 2.24.10-2), libasound2 (>= 1.0.25-4), libdb5.1 (>=5.1.29-5), libdb5.1++ (>= 5.1.29-5), libmysql++3 (>= 3.1.0-2+b1), libsqlite3-0 (>= 3.7.13-1+deb7u1), librsvg2-2 (>= 2.36.1-2), g++ (>= 4:4.7.2-1)
Depends: libc6 (>= 2.19-18+deb8u1), libgtk2.0-0 (>= 2.24.25-3), libasound2 (>= 1.0.28-1), libdb5.3 (>=5.3.28-9), libdb5.3++ (>= 5.3.28-9), libmysql++3 (>= 3.2.1+pristine-1), libsqlite3-0 (>= 3.8.7.1-1+deb8u1), librsvg2-2 (>= 2.40.5-1), g++ (>= 4:4.9.2-2)
Replaces: pwrrt,pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47,pwr48,pwr50,pwr51,pwr52
Maintainer: Proview <postmaster@proview.se>
Description: Proview development and runtime environment package
Proview development and runtime environment
- 5.3.0-1 Base release
5.3.1-1 Base release
......@@ -23,6 +23,7 @@ echo "-- Building pwrdemo$ver"
# Create directories
mkdir -p $pkgroot/DEBIAN
mkdir -p $pkgroot/usr/share/doc/pwrdemo$ver
mkdir -p $pkgroot/usr/share/applications
mkdir -p $pkgroot/usr/pwrp
find $pkgroot -type d | xargs chmod 755
......@@ -82,6 +83,8 @@ cd $currentdir
echo "Categories=GNOME;GTK;Application;"
} > $pkgroot/usr/pwrp/pwrdemo$ver/cnf/proviewdemo$ver.desktop
cp $pkgroot/usr/pwrp/pwrdemo$ver/cnf/proviewdemo$ver.desktop $pkgroot/usr/share/applications/
# Create package
echo "-- Building package"
if which fakeroot > /dev/null; then
......
Package: pwrdemo53
Version: 5.3.0-1
Version: 5.3.1-1
Section: base
Priority: optional
Architecture: amd64
Depends: pwr53 (>= 5.3.0-1)
Depends: sudo, pwr53 (>= 5.3.1-1)
Maintainer: Proview <postmaster@proview.se>
Description: Proview Demo Project package
Proview Demo Project
5.3.0-1 Base release
5.3.1-1 Base release
Package: pwrrt
Version: 5.3.0-1
Version: 5.3.1-1
Section: base
Priority: optional
Architecture: amd64
Depends: libc6 (>= 2.13-38), libgtk2.0-0 (>= 2.24.10-2), libasound2 (>= 1.0.25-4), libsqlite3-0 (>= 3.7.13-1+deb7u1), libdb5.1 (>=5.1.29-5), libmysqlclient18 (>= 5.5.43-0+deb7u1), libhdf5-openmpi-7 (>= 1.8.8-9+b1)
Depends: libc6 (>= 2.19-18+deb8u1), libgtk2.0-0 (>= 2.24.25-3), libasound2 (>= 1.0.28-1), libsqlite3-0 (>= 3.5.7.1-1+deb8u1), libdb5.3 (>=5.3.28-9)
Replaces: pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47,pwr48,pwr50,pwr51,pwr52
Maintainer: Proview <postmaster@proview.se>
Description:
Proview runtime environment
5.3.0-1 Base release
5.3.1-1 Base release
......@@ -145,7 +145,7 @@ currentdir="`eval pwd`"
tarfile=$pwre_broot/$pwre_target/bld/pkg/pwrtmp.tar
cd $pwre_broot/$pwre_target/exp
echo "-- Copy release to package tree"
tar -cf $tarfile exe/rt_qmon exe/rt_prio exe/sev_ini exe/sev_xtt exe/sev_xtt_gtk exe/sev_server exe/sev_repair exe/*.gif exe/*.png exe/sev_xtt_version_help.dat exe/pwr_pkg.sh exe/en_us/*.txt doc/*
tar -cf $tarfile exe/rt_qmon exe/rt_prio exe/sev_ini exe/sev_xtt exe/sev_xtt_gtk exe/sev_server exe/sev_repair exe/*.gif exe/*.png load/sev_xtt_version_help.dat exe/pwr_pkg.sh exe/en_us/*.txt doc/*
cd $pkgroot/usr/pwrsev
mkdir cnf
tar -xf $tarfile
......
Package: pwrsev
Version: 5.3.0-1
Version: 5.3.1-1
Section: base
Priority: optional
Architecture: amd64
Depends: libc6 (>= 2.13-38), libgtk2.0-0 (>= 2.24.10-2), libasound2 (>= 1.0.25-4), libsqlite3-0 (>= 3.7.13-1+deb7u1), libdb5.1 (>=5.1.29-5), libmysqlclient18 (>= 5.5.43-0+deb7u1)
Depends: libc6 (>= 2.19-18+deb8u1), libgtk2.0-0 (>= 2.24.25-3), libasound2 (>= 1.0.28-1), libsqlite3-0 (>= 3.8.7.1-1+deb8u1), libdb5.3 (>=5.3.28-9), libmysqlclient18 (>= 5.5.44-0+deb8u1)
Replaces: pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47,pwr48,pwr50,pwr51,pwr52
Maintainer: Proview <postmaster@proview.se>
Description:
Proview storage environment
5.3.0-1 Base release
5.3.1-1 Base release
......@@ -143,7 +143,7 @@ currentdir="`eval pwd`"
tarfile=$pwre_broot/$pwre_target/bld/pkg/pwrtmp.tar
cd $pwre_broot/$pwre_target/exp
echo "-- Copy release to package tree"
tar -cf $tarfile exe/rt_qmon exe/rt_prio exe/sev_ini exe/sev_xtt exe/sev_xtt_gtk exe/sev_server exe/sev_repair exe/*.gif exe/*.png exe/sev_xtt_version_help.dat exe/pwr_pkg.sh exe/en_us/*.txt doc/*
tar -cf $tarfile exe/rt_qmon exe/rt_prio exe/sev_ini exe/sev_xtt exe/sev_xtt_gtk exe/sev_server exe/sev_repair exe/*.gif exe/*.png load/sev_xtt_version_help.dat exe/pwr_pkg.sh exe/en_us/*.txt doc/*
cd $pkgroot/usr/pwrsev
mkdir cnf
tar -xf $tarfile
......
......@@ -101,6 +101,7 @@ echo "-- Building pwr$ver"
# Create directories
mkdir -p $pkgroot/DEBIAN
mkdir -p $pkgroot/usr/share/doc/pwr$ver
mkdir -p $pkgroot/usr/share/applications
mkdir -p $pkgroot/usr/pwrp
mkdir -p $pkgroot/etc
......@@ -193,6 +194,8 @@ cp $pwre_sroot/tools/pkg/deb/user/wtt_init1.pwr_com $pkgroot/usr/pwr$ver/$pwre_t
echo "Categories=GNOME;GTK;Application;"
} > $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf/user/proview$ver.desktop
cp $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf/user/proview$ver.desktop $pkgroot/usr/share/applications/
# Create package
echo "-- Building package"
if which fakeroot > /dev/null; then
......
Source: pwrsrc
Section: devel
Package: pwr52
Package: pwr53
Priority: optional
Maintainer: Proview <postmaster@proview.se>
Version: 5.2.1-1
Version: 5.3.1-1
Architecture: i386
Depends: libc6 (>= 2.19-0ubuntu6), libgtk2.0-0 (>= 2.24.23-0ubuntu1.1), libasound2 (>= 1.0.27.2-3ubuntu7), libdb5.3 (>=5.3.28-3ubuntu3), libdb5.3++ (>=5.3.28-3ubuntu3), libmysql++3 (>= 3.2.0+pristine-1), libsqlite3-0 (>= 3.8.2-1ubuntu2), librsvg2-2 (>= 2.40.2-1), g++ (>= 4:4.8.2-1ubuntu6), xfonts-100dpi
Replaces: pwrrt,pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47,pwr48,pwr50,pwr51
Replaces: pwrrt,pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47,pwr48,pwr50,pwr51,pwr52
Homepage: http://www.proview.se
Installed-Size: 1114020
Description: Proview development and runtime environment package
Proview development and runtime environment
5.2.0-1 Base release
5.3.1-1 Base release
......@@ -22,6 +22,7 @@ echo "-- Building pwrdemo$ver"
# Create directories
mkdir -p $pkgroot/DEBIAN
mkdir -p $pkgroot/usr/share/doc/pwrdemo$ver
mkdir -p $pkgroot/usr/share/applications
mkdir -p $pkgroot/usr/pwrp
find $pkgroot -type d | xargs chmod 755
......@@ -82,6 +83,8 @@ cd $currentdir
echo "Categories=GNOME;GTK;Application;"
} > $pkgroot/usr/pwrp/pwrdemo$ver/cnf/proviewdemo$ver.desktop
cp $pkgroot/usr/pwrp/pwrdemo$ver/cnf/proviewdemo$ver.desktop $pkgroot/usr/share/applications/
# Create package
echo "-- Building package"
if which fakeroot > /dev/null; then
......
Package: pwrdemo52
Version: 5.2.1-1
Package: pwrdemo53
Version: 5.3.1-1
Section: base
Priority: optional
Architecture: i386
Depends: pwr52 (>= 5.2.1-1)
Depends: pwr53 (>= 5.3.1-1)
Replaces:
Maintainer: Proview <postmaster@proview.se>
Homepage: http://www.proview.se
Installed-Size: 70464
Description: Proview Demo Project package
Proview Demo Project
5.2.0-1 Base release
5.3.1-1 Base release
Package: pwrrpi51
Version: 5.1.0-4
Package: pwrrpi53
Version: 5.3.1-1
Section: base
Priority: optional
Architecture: i386
Depends: pwr51 (>= 5.1.0-4)
Replaces: pwr51
Depends: pwr53 (>= 5.3.1-1)
Replaces: pwr53
Maintainer: Proview <postmaster@proview.se>
Description: Proview RPI development package
Proview RPI development environment
5.1.0-1 Base release
5.1.0-2
- Wb history html file size limited to 1000 rows.
- Ge polyline draw bugfix for subwindows.
- Web, open graph from pwg-files as default, methods for pwg-graphs added.
5.1.0-3
- Class AppLink added.
- Ge trend and xycurve fix for subwindows.
5.1.0-4
- Support for Gertbord and PiFace.
- wb load of DataArithmL bugfix.
- Ge bugfix for scale with snap to grid.
- Xtt read struct fix, element name buffer increased.
5.3.1-1 Base release
Package: pwrrt
Version: 5.2.1-1
Version: 5.3.1-1
Section: base
Priority: optional
Architecture: i386
Depends: libc6 (>= 2.19-0ubuntu6), libgtk2.0-0 (>= 2.24.23-0ubuntu1.1), libasound2 (>= 1.0.27.2-3ubuntu7), libdb5.3 (>=5.3.28-3ubuntu3), libsqlite3-0 (>= 3.8.2-1ubuntu2), librsvg2-2 (>= 2.40.2-1), xfonts-100dpi
Replaces: pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47,pwr48,pwr50,pwr51
Replaces: pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47,pwr48,pwr50,pwr51,pwr52
Maintainer: Proview <postmaster@proview.se>
Homepage: http://www.proview.se
Installed-Size: 955344
Description:
Proview runtime environment
5.2.0-1 Base release
5.3.1-1 Base release
......@@ -143,7 +143,7 @@ currentdir="`eval pwd`"
tarfile=$pwre_broot/$pwre_target/bld/pkg/pwrtmp.tar
cd $pwre_broot/$pwre_target/exp
echo "-- Copy release to package tree"
tar -cf $tarfile exe/rt_qmon exe/rt_prio exe/sev_ini exe/sev_xtt exe/sev_xtt_gtk exe/sev_server exe/sev_repair exe/*.gif exe/*.png exe/sev_xtt_version_help.dat exe/pwr_pkg.sh exe/en_us/*.txt doc/*
tar -cf $tarfile exe/rt_qmon exe/rt_prio exe/sev_ini exe/sev_xtt exe/sev_xtt_gtk exe/sev_server exe/sev_repair exe/*.gif exe/*.png load/sev_xtt_version_help.dat exe/pwr_pkg.sh exe/en_us/*.txt doc/*
cd $pkgroot/usr/pwrsev
mkdir cnf
tar -xf $tarfile
......
Package: pwrsev
Version: 5.2.1-1
Version: 5.3.1-1
Section: base
Priority: optional
Architecture: i386
Depends: libc6 (>= 2.19-0ubuntu6), libgtk2.0-0 (>= 2.24.23-0ubuntu1.1), libasound2 (>= 1.0.27.2-3ubuntu7), libdb5.3 (>=5.3.28-3ubuntu3), libmysql++3 (>= 3.2.0+pristine-1), libsqlite3-0 (>= 3.8.2-1ubuntu2), xfonts-100dpi
Replaces: pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47,pwr48,pwr50,pwr51
Replaces: pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47,pwr48,pwr50,pwr51,pwr52
Maintainer: Proview <postmaster@proview.se>
Description:
Proview storage environment
5.2.0-1 Base release
5.3.1-1 Base release
......@@ -101,6 +101,7 @@ echo "-- Building pwr$ver"
# Create directories
mkdir -p $pkgroot/DEBIAN
mkdir -p $pkgroot/usr/share/doc/pwr$ver
mkdir -p $pkgroot/usr/share/applications
mkdir -p $pkgroot/usr/pwrp
mkdir -p $pkgroot/etc
......@@ -193,6 +194,8 @@ cp $pwre_sroot/tools/pkg/deb/user/wtt_init1.pwr_com $pkgroot/usr/pwr$ver/$pwre_t
echo "Categories=GNOME;GTK;Application;"
} > $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf/user/proview$ver.desktop
cp $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf/user/proview$ver.desktop $pkgroot/usr/share/applications/
# Create package
echo "-- Building package"
if which fakeroot > /dev/null; then
......
Source: pwrsrc
Section: devel
Package: pwr52
Package: pwr53
Priority: optional
Maintainer: Proview <postmaster@proview.se>
Version: 5.2.1-1
Version: 5.3.1-1
Architecture: amd64
Depends: libc6 (>= 2.19-0ubuntu6), libgtk2.0-0 (>= 2.24.23-0ubuntu1.1), libasound2 (>= 1.0.27.2-3ubuntu7), libdb5.3 (>=5.3.28-3ubuntu3), libdb5.3++ (>=5.3.28-3ubuntu3), libmysql++3 (>= 3.2.0+pristine-1), libsqlite3-0 (>= 3.8.2-1ubuntu2), librsvg2-2 (>= 2.40.2-1), g++ (>= 4:4.8.2-1ubuntu6), xfonts-100dpi
Replaces: pwrrt,pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47,pwr48,pwr50,pwr51
Replaces: pwrrt,pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47,pwr48,pwr50,pwr51,pwr52
Homepage: http://www.proview.se
Installed-Size: 1114020
Description: Proview development and runtime environment package
Proview development and runtime environment
5.2.0-1 Base release
5.3.1-1 Base release
......@@ -23,6 +23,7 @@ echo "-- Building pwrdemo$ver"
# Create directories
mkdir -p $pkgroot/DEBIAN
mkdir -p $pkgroot/usr/share/doc/pwrdemo$ver
mkdir -p $pkgroot/usr/share/applications
mkdir -p $pkgroot/usr/pwrp
find $pkgroot -type d | xargs chmod 755
......@@ -83,6 +84,8 @@ cd $currentdir
echo "Categories=GNOME;GTK;Application;"
} > $pkgroot/usr/pwrp/pwrdemo$ver/cnf/proviewdemo$ver.desktop
cp $pkgroot/usr/pwrp/pwrdemo$ver/cnf/proviewdemo$ver.desktop $pkgroot/usr/share/applications/
# Create package
echo "-- Building package"
if which fakeroot > /dev/null; then
......
Package: pwrdemo52
Version: 5.2.1-1
Package: pwrdemo53
Version: 5.3.1-1
Section: base
Priority: optional
Architecture: amd64
Depends: pwr52 (>= 5.2.1-1)
Depends: pwr53 (>= 5.3.1-1)
Replaces:
Maintainer: Proview <postmaster@proview.se>
Description: Proview Demo Project package
Proview Demo Project
5.2.0-1 Base release
5.3.1-1 Base release
Package: pwrrpi51
Version: 5.1.0-4
Package: pwrrpi53
Version: 5.3.1-1
Section: base
Priority: optional
Architecture: amd64
Depends: pwr51 (>= 5.1.0-4)
Replaces: pwr51
Depends: pwr53 (>= 5.3.1-1)
Replaces: pwr53
Maintainer: Proview <postmaster@proview.se>
Description: Proview RPI development package
Proview RPI development environment
5.1.0-1 Base release
5.1.0-2
- Wb history html file size limited to 1000 rows.
- Ge polyline draw bugfix for subwindows.
- Web, open graph from pwg-files as default, methods for pwg-graphs added.
5.1.0-3
- Class AppLink added.
- Ge trend and xycurve fix for subwindows.
5.1.0-4
- Support for Gertbord and PiFace.
- wb load of DataArithmL bugfix.
- Ge bugfix for scale with snap to grid.
- Xtt read struct fix, element name buffer increased.
5.3.1-1 Base release
Package: pwrrt
Version: 5.2.1-1
Version: 5.3.1-1
Section: base
Priority: optional
Architecture: amd64
Depends: libc6 (>= 2.19-93ubuntu4), libgtk2.0-0 (>= 2.24.20-1ubuntu1), libasound2 (>= 1.0.27.2-1ubuntu6), libdb5.3 (>=5.3.21-2), libsqlite3-0 (>= 3.7.17-1ubuntu1), librsvg2-2 (>= 2.36.4-2), xfonts-100dpi
Replaces: pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47,pwr48,pwr50,pwr51
Replaces: pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47,pwr48,pwr50,pwr51,pwr52
Maintainer: Proview <postmaster@proview.se>
Homepage: http://www.proview.se
Installed-Size: 955344
Description:
Proview runtime environment
5.2.0-1 Base release
5.3.1-1 Base release
......@@ -145,7 +145,7 @@ currentdir="`eval pwd`"
tarfile=$pwre_broot/$pwre_target/bld/pkg/pwrtmp.tar
cd $pwre_broot/$pwre_target/exp
echo "-- Copy release to package tree"
tar -cf $tarfile exe/rt_qmon exe/rt_prio exe/sev_ini exe/sev_xtt exe/sev_xtt_gtk exe/sev_server exe/sev_repair exe/*.gif exe/*.png exe/sev_xtt_version_help.dat exe/pwr_pkg.sh exe/en_us/*.txt doc/*
tar -cf $tarfile exe/rt_qmon exe/rt_prio exe/sev_ini exe/sev_xtt exe/sev_xtt_gtk exe/sev_server exe/sev_repair exe/*.gif exe/*.png load/sev_xtt_version_help.dat exe/pwr_pkg.sh exe/en_us/*.txt doc/*
cd $pkgroot/usr/pwrsev
mkdir cnf
tar -xf $tarfile
......
Package: pwrsev
Version: 5.2.1-1
Version: 5.3.1-1
Section: base
Priority: optional
Architecture: amd64
Depends: libc6 (>= 2.19-0ubuntu6), libgtk2.0-0 (>= 2.24.23-0ubuntu1.1), libasound2 (>= 1.0.27.2-3ubuntu7), libdb5.3 (>=5.3.28-3ubuntu3), libmysql++3 (>= 3.2.0+pristine-1), libsqlite3-0 (>= 3.8.2-1ubuntu2), xfonts-100dpi
Replaces: pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47,pwr48,pwr50,pwr51
Replaces: pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47,pwr48,pwr50,pwr51,pwr52
Maintainer: Proview <postmaster@proview.se>
Description:
Proview storage environment
5.2.0-1 Base release
5.3.1-1 Base release
......@@ -459,8 +459,8 @@ else
pwre_config_check_lib mysql MYSQL lib lib 1 "/usr/lib/libmysqlclient.so:/usr/lib/mysql/libmysqlclient.so:/usr/lib/$hwpl-linux-$gnu/libmysqlclient.so"
pwre_config_check_include sqlite3 SQLITE3 1 "/usr/include/sqlite3.h"
pwre_config_check_lib libsqlite3 LIBSQLITE3 lib lib 0 "/usr/lib/libsqlite3.so:/usr/lib/$hwpl-linux-$gnu/libsqlite3.so"
pwre_config_check_include hdf5 HDF5 1 "/usr/lib/openmpi/include/mpi.h"
pwre_config_check_lib libhdf5 LIBHDF5 lib lib 0 "/usr/lib/libhdf5.so:/usr/lib/$hwpl-linux-$gnu/libhdf5.so"
pwre_config_check_include hdf5 HDF5 1 "/usr/lib/openmpi/include/mpi.h.no"
pwre_config_check_lib libhdf5 LIBHDF5 lib lib 0 "/usr/lib/libhdf5.so:/usr/lib/$hwpl-linux-$gnu/libhdf5_openmpi.so"
pwre_config_check_lib mq MQ lib mq 1 "/usr/lib/libdmq.so:/usr/local/dmq/lib/libdmq.so"
pwre_config_check_lib wmq WMQ lib wmq 1 "/usr/lib/libmqic.so"
pwre_config_check_lib libprofinet PNAK lib pnak 1 "/usr/lib/libprofinet.a"
......
......@@ -201,6 +201,7 @@ void WGeGtk::action_resize( GtkWidget *w, GtkAllocation *allocation, gpointer da
{
WGe *ge = (WGe *)data;
if ( ge->graph && !ge->scrollbar && !ge->navigator && ge->graph->grow)
ge->graph->set_default_layout();
}
......@@ -228,8 +229,8 @@ void WGeGtk::set_size( int width, int height)
gtk_window_resize( GTK_WINDOW(toplevel), default_width, default_height);
geometry.min_aspect = gdouble(default_width)/default_height;
geometry.max_aspect = gdouble(default_width)/default_height * 1.02;
geometry.min_aspect = gdouble(default_width)/default_height * 0.95;
geometry.max_aspect = gdouble(default_width)/default_height * 1.05;
gtk_window_set_geometry_hints( GTK_WINDOW(toplevel), GTK_WIDGET(toplevel),
&geometry, GDK_HINT_ASPECT);
......@@ -293,8 +294,8 @@ WGeGtk::WGeGtk( GtkWidget *wge_parent_wid, void *wge_parent_ctx, char *wge_name,
CoWowGtk::SetWindowIcon( toplevel);
geometry.min_aspect = gdouble(window_width)/window_height;
geometry.max_aspect = gdouble(window_width)/window_height * 1.02;
geometry.min_aspect = gdouble(window_width)/window_height * 0.95;
geometry.max_aspect = gdouble(window_width)/window_height * 1.05;
gtk_window_set_geometry_hints( GTK_WINDOW(toplevel), GTK_WIDGET(toplevel),
&geometry, GDK_HINT_ASPECT);
......
......@@ -78,17 +78,20 @@ void XttGeGtk::set_size( int width, int height)
int default_width;
int default_height;
GdkGeometry geometry;
float rd = 0.05;;
default_width = width + 20;
default_height = height + 20;
if ( width < 300 || height < 300)
rd = 0.2;
gtk_window_resize( GTK_WINDOW(toplevel), default_width, default_height);
// This condition is due to a bug in Reflection X 11.0.5...
if ( !((XNav *)parent_ctx)->gbl.no_graph_ratio) {
// Note, equal min and max aspect will cause recursive resize on LXDE
geometry.min_aspect = gdouble(default_width)/default_height;
geometry.max_aspect = gdouble(default_width)/default_height * 1.02;
geometry.min_aspect = gdouble(default_width)/default_height * (1.0 - rd);
geometry.max_aspect = gdouble(default_width)/default_height * (1.0 + rd);
gtk_window_set_geometry_hints( GTK_WINDOW(toplevel), GTK_WIDGET(toplevel),
&geometry, GDK_HINT_ASPECT);
}
......@@ -329,8 +332,12 @@ XttGeGtk::XttGeGtk( GtkWidget *xg_parent_wid, void *xg_parent_ctx, const char *x
NULL);
g_free( titleutf8);
geometry.min_aspect = gdouble(window_width)/window_height;
geometry.max_aspect = gdouble(window_width)/window_height * 1.02;
float rd = 0.05;
if ( window_width < 300 || window_height < 300)
rd = 0.2;
geometry.min_aspect = gdouble(window_width)/window_height * (1.0 - rd);
geometry.max_aspect = gdouble(window_width)/window_height * (1.0 + rd);
gtk_window_set_geometry_hints( GTK_WINDOW(toplevel), GTK_WIDGET(toplevel),
&geometry, GDK_HINT_ASPECT);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment